Merge remote-tracking branch 'origin/main' into feat/model-train

Signed-off-by: Nasfame <laciferin@gmail.com>

Took 7 minutes

Author: Nasfame

.dockerignore

@@ -0,0 +1,6 @@
+node_modules/
+.idea/
+.github/
+.run/
+.next/
+.vercel/

.github/workflows/cross.yaml

@@ -16,6 +16,7 @@ concurrency:
   cancel-in-progress: true
 
 env:
+  envfile: ${{secrets.ENV}}
   MODE: test
   NODE_ENV: testing
 
@@ -83,8 +84,15 @@ jobs:
           architecture: ${{ matrix.architecture }}
           check-latest: true
 
+      - name: Write environment #TODO: add coachroach ssl certificate
+        run: |
+          echo $envfile > .env.tmp
+          sed 's/ /\n/g' .env.tmp > .env
+          source .env
+
       - name: Install dependencies
         run: pnpm install
 
+
 #      - name: Run tests for ${{runner.os}} TODO: once jest tests pass
 #        run: npm run test

.github/workflows/docker.yaml

@@ -0,0 +1,38 @@
+name: Docker
+
+on:
+  push:
+    branches:
+      - main
+    #      - "*"
+    #      - "**"
+    tags:
+      - '*'
+      - '**'
+
+  pull_request:
+    branches:
+      - main
+  merge_group:
+    types: [checks_requested]
+
+  workflow_dispatch:
+
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
+
+env:
+  envfile: ${{secrets.ENV}}
+  MODE: test
+  NODE_ENV: testing
+
+jobs:
+  build-docker:
+    runs-on: ubuntu-latest
+
+    steps:
+      - uses: actions/checkout@v3
+
+      - name: Build Docker
+        run: docker build .

.github/workflows/e2e.yaml

@@ -0,0 +1,70 @@
+name: E2E
+
+on:
+  push:
+    branches:
+      - main
+    tags:
+  pull_request:
+    branches:
+      - main
+  merge_group:
+    types: [checks_requested]
+  workflow_dispatch:
+
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
+
+env:
+  envfile: ${{secrets.ENV}}
+  MODE: test
+  NODE_ENV: testing
+
+jobs:
+  build-and-test:
+    concurrency: db-test
+    runs-on: ubuntu-latest
+
+    steps:
+      - uses: actions/checkout@v3
+
+      - uses: pnpm/action-setup@v2
+        with:
+          version: 8.6.6
+
+      - uses: actions/setup-node@v3
+        with:
+          cache: 'pnpm'
+          node-version: 19
+          check-latest: true
+
+      - name: Write environment
+        run: |
+          echo $envfile > .env
+          sed -i 's/ /\n/g' .env
+          source .env
+
+      - name: Install dependencies
+        run: pnpm install
+
+      - name: Build
+        run: npm run build
+
+      - name: Prisma Migration
+        continue-on-error: true
+        run: |
+          echo "Migrating DB"
+          #npx prisma migrate reset --force
+          npx prisma migrate deploy
+
+      - name: Reset the DB
+        if: ${{ failure() }}
+        run: |
+          npx prisma migrate dev
+
+      - name: Run tests
+        run: npm run test
+
+      - name: E2E
+        run: npm run test:e2e

.gitignore

@@ -40,4 +40,5 @@ next-env.d.ts
 
 build/
 
-.vercel/
+.vercel/
+prisma/generated/

Dockerfile

@@ -0,0 +1,36 @@
+# Build stage
+FROM node:19 AS builder
+WORKDIR /app
+
+#COPY package*.json pnpm-lock.yaml ./
+
+COPY . .
+
+RUN sed -i '/provider = "prisma-client-js"/a \ \ binaryTargets = ["native", "linux-musl-openssl-3.0.x"]' prisma/schema.prisma
+
+RUN npm install -g pnpm
+RUN pnpm install
+
+RUN #npm run build already post-install
+
+# Deploy stage
+FROM node:19-alpine
+
+#only required for railway deployment
+
+ENV PORT=8080
+ENV NODE_ENV="production"
+ENV MODE="prod"
+ENV DATABASE_URL=""
+
+WORKDIR /app
+
+EXPOSE $PORT
+
+COPY --from=builder /app ./
+
+CMD ["sh", "-c", "npm run test && npm run test:e2e"]
+
+ENTRYPOINT ["npm", "run", "start:prod"]
+
+LABEL maintainer="Hiro <laciferin@gmail.com>"

enums/ipfsProviders.ts

@@ -0,0 +1,6 @@
+export type IPFSProvider = string
+
+export const LIGHTHOUSE:IPFSProvider = "LIGHTHOUSE"
+export const IPFS:IPFSProvider = "IPFS"
+export const INFURA:IPFSProvider = "INFURA"
+export const S3:IPFSProvider = "S3"

jest.config.ts

@@ -1,16 +1,16 @@
-import { pathsToModuleNameMapper } from 'ts-jest'
-import { compilerOptions } from './tsconfig.node.json'
+import {pathsToModuleNameMapper} from 'ts-jest'
+import {compilerOptions} from './tsconfig.node.json'
 
 const jestConfig = {
-  // preset: 'ts-jest',
+  preset: 'ts-jest',
   moduleNameMapper: pathsToModuleNameMapper(compilerOptions.paths, {
     prefix: '<rootDir>/',
   }),
   testEnvironment: 'node',
   collectCoverageFrom: ['**/*.(t|j|mj)s'],
   coverageDirectory: '../coverage',
-  testRegex: '.*\\.spec\\.(t|j|mj)s$',
-  moduleFileExtensions: ['js', 'json', 'ts', 'mjs'],
+  testRegex: '.*\\.spec\\.(t|j)s$',
+  moduleFileExtensions: ['js', 'json', 'ts'],
   // automock: true,
   verbose: true,
 }

package.json

@@ -5,19 +5,38 @@
   "author": "laciferin@gmail.com",
   "license": "MIT",
   "private": true,
+  "prisma": {
+    "seed": "ts-node --transpile-only prisma/seed.ts"
+  },
   "scripts": {
     "postinstall": "npm run build",
     "dev": "next dev",
+    "start:dev": "concurrently \"pnpm:dev\" \"pnpm:prisma:generate:watch\"",
+    "prebuild": "npm run prisma:generate",
     "build": "next build",
     "start": "next start",
     "lint": "next lint",
     "test": "jest --passWithNoTests",
-    "run-cid": "ts-node utils/archived/cid.ts",
-    "clean": "rimraf .next build"
+    "run-cid-archived": "ts-node utils/archived/cid.ts",
+    "run-cid": "ts-node utils/cid.ts",
+    "run-compute": "ts-node utils/compute.ts",
+    "clean": "rimraf .next build",
+    "prisma:seed": "prisma db seed",
+    "prisma:generate": "prisma generate",
+    "prisma:generate:watch": "prisma generate --watch",
+    "prisma:test:deploy": "cp .env.test .env && prisma migrate deploy && rm .env",
+    "prisma:local:deploy": "cp .env.local .env && prisma migrate dev && rm .env",
+    "prisma:deploy": "DEBUG=* prisma migrate deploy",
+    "test:watch": "MODE=test jest --watch",
+    "test:cov": "MODE=test jest --coverage",
+    "test:debug": "node --inspect-brk -r tsconfig-paths/register -r ts-node/register node_modules/.bin/jest --runInBand",
+    "test:e2e": "MODE=test jest --config ./test/jest-e2e.json",
+    "test:e2e:watch": "MODE=test jest --watch --no-cache --config ./test/jest-e2e.json"
   },
   "dependencies": {
     "@jest/globals": "^29.7.0",
     "@lighthouse-web3/sdk": "^0.2.8",
+    "@prisma/client": "^5.4.2",
     "@rainbow-me/rainbowkit": "^1.1.1",
     "@types/node": "20.6.2",
     "@types/react": "18.2.21",
@@ -27,6 +46,7 @@
     "@web3auth/ethereum-provider": "^7.0.4",
     "@web3auth/no-modal": "^7.0.4",
     "@web3auth/openlogin-adapter": "^7.0.4",
+    "argon2": "^0.31.1",
     "autoprefixer": "10.4.15",
     "axios": "^1.5.1",
     "blob-to-buffer": "^1.2.9",
@@ -64,7 +84,10 @@
     "@types/file-saver": "^2.0.5",
     "@types/jest": "^29.5.5",
     "@types/mocha": "^10.0.2",
+    "concurrently": "^8.2.1",
+    "is-ipfs": "^8.0.1",
     "jest": "^29.7.0",
+    "prisma": "^5.4.2",
     "react-devtools": "^4.28.4",
     "rimraf": "^5.0.5",
     "ts-jest": "^29.1.1",