Merge pull request #59 from BuidlGuidl/staging

Merge Staging
BuidlGuidl · Jul 25, 2024 · 73fdee8 · 73fdee8
2 parents 2e2aa69 + 1c5e846
commit 73fdee8
Show file tree

Hide file tree

Showing 17 changed files with 21,222 additions and 20 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/packages/backend/.dockerignore b/packages/backend/.dockerignore
@@ -0,0 +1,9 @@
+node_modules
+.env
+coverage
+coverage.json
+typechain
+typechain-types
+temp
+
+
diff --git a/packages/backend/Dockerfile b/packages/backend/Dockerfile
@@ -0,0 +1,39 @@
+# syntax = docker/dockerfile:1
+
+# Adjust NODE_VERSION as desired
+ARG NODE_VERSION=20.11.0
+FROM node:${NODE_VERSION}-slim as base
+
+LABEL fly_launch_runtime="Node.js"
+
+# Node.js app lives here
+WORKDIR /app
+
+# Set production environment
+ENV NODE_ENV="production"
+
+
+# Throw-away build stage to reduce size of final image
+FROM base as build
+
+# Install packages needed to build node modules
+RUN apt-get update -qq && \
+    apt-get install --no-install-recommends -y build-essential node-gyp pkg-config python-is-python3
+
+# Install node modules
+COPY --link package.json ./
+RUN npm install
+
+# Copy application code
+COPY --link . .
+
+
+# Final stage for app image
+FROM base
+
+# Copy built application
+COPY --from=build /app /app
+
+# Start the server by default, this can be overwritten at runtime
+EXPOSE 3000
+CMD [ "npm", "run", "start" ]
diff --git a/packages/backend/controllers/Admin.ts b/packages/backend/controllers/Admin.ts
@@ -1,7 +1,6 @@
 import Game from "../models/Game";
 import Invites from "../models/Invites";
 import bcrypt from "bcrypt";
-import { Request, Response } from "express";
 import jwt from "jsonwebtoken";
 import { ably } from "..";
 import backendConfig from "../backend.config";
@@ -40,7 +39,7 @@ async function generateUniqueInvite(length: number) {
   }
 }
 
-export const createGame = async (req: Request, res: Response) => {
+export const createGame = async (req: any, res: any) => {
   try {
     const { diceCount, hiddenPrivateKey, mode, adminAddress } = req.body;
 
@@ -67,7 +66,7 @@ export const createGame = async (req: Request, res: Response) => {
   }
 };
 
-export const restartWithNewPk = async (req: Request, res: Response) => {
+export const restartWithNewPk = async (req: any, res: any) => {
   try {
     const { diceCount, hiddenPrivateKey, adminAddress } = req.body;
     const { id } = req.params;
@@ -95,7 +94,7 @@ export const restartWithNewPk = async (req: Request, res: Response) => {
   }
 };
 
-export const pauseGame = async (req: Request, res: Response) => {
+export const pauseGame = async (req: any, res: any) => {
   try {
     const { id } = req.params;
     const game = await Game.findById(id);
@@ -120,7 +119,7 @@ export const pauseGame = async (req: Request, res: Response) => {
   }
 };
 
-export const resumeGame = async (req: Request, res: Response) => {
+export const resumeGame = async (req: any, res: any) => {
   try {
     const { id } = req.params;
     const game = await Game.findById(id);
@@ -149,7 +148,7 @@ export const resumeGame = async (req: Request, res: Response) => {
   }
 };
 
-export const endGame = async (req: Request, res: Response) => {
+export const endGame = async (req: any, res: any) => {
   try {
     const { id } = req.params;
     const game = await Game.findById(id);
@@ -179,7 +178,7 @@ export const endGame = async (req: Request, res: Response) => {
   }
 };
 
-export const changeGameMode = async (req: Request, res: Response) => {
+export const changeGameMode = async (req: any, res: any) => {
   try {
     const { id } = req.params;
     const { mode } = req.body;
@@ -211,7 +210,7 @@ export const changeGameMode = async (req: Request, res: Response) => {
   }
 };
 
-export const kickPlayer = async (req: Request, res: Response) => {
+export const kickPlayer = async (req: any, res: any) => {
   try {
     const { id } = req.params;
     const { playerAddress } = req.body;
@@ -241,7 +240,7 @@ export const kickPlayer = async (req: Request, res: Response) => {
   }
 };
 
-export const varyHiddenPrivatekey = async (req: Request, res: Response) => {
+export const varyHiddenPrivatekey = async (req: any, res: any) => {
   try {
     const { id } = req.params;
     const { hiddenPrivateKey, diceCount } = req.body;

diff --git a/packages/backend/controllers/Player.ts b/packages/backend/controllers/Player.ts
@@ -1,12 +1,11 @@
 import Game from "../models/Game";
-import { Response, Request } from "express";
 import jwt from "jsonwebtoken";
 import { ably } from "..";
 import backendConfig from "../backend.config";
 
 const JWT_SECRET = process.env.JWT_SECRET || backendConfig.jwt_secret;
 
-export const join = async (req: Request, res: Response) => {
+export const join = async (req: any, res: any) => {
   try {
     const { inviteCode, playerAddress } = req.body;
     const game = await Game.findOne({ inviteCode });

diff --git a/packages/backend/fly.toml b/packages/backend/fly.toml
@@ -0,0 +1,22 @@
+# fly.toml app configuration file generated for pkdice-backend on 2024-07-25T12:07:55+01:00
+#
+# See https://fly.io/docs/reference/configuration/ for information about how to use this file.
+#
+
+app = 'pkdice-backend'
+primary_region = 'ams'
+
+[build]
+
+[http_service]
+  internal_port = 3000
+  force_https = true
+  auto_stop_machines = true
+  auto_start_machines = true
+  min_machines_running = 0
+  processes = ['app']
+
+[[vm]]
+  memory = '1gb'
+  cpu_kind = 'shared'
+  cpus = 1
diff --git a/packages/backend/middleware/auth.ts b/packages/backend/middleware/auth.ts
@@ -1,10 +1,9 @@
 import jwt from "jsonwebtoken";
-import { Request, Response } from "express";
 import backendConfig from "../backend.config";
 
 const JWT_SECRET = process.env.JWT_SECRET || backendConfig.jwt_secret;
 
-export const verifyToken = async (req: Request, res: Response, next: () => void) => {
+export const verifyToken = async (req: any, res: any, next: () => void) => {
   try {
     let token = req.header("Authorization");
 

diff --git a/packages/backend/package.json b/packages/backend/package.json
@@ -17,11 +17,18 @@
     "ts-node": "^10.9.1"
   },
   "devDependencies": {
+    "@flydotio/dockerfile": "^0.5.8",
     "@types/bcrypt": "^5.0.0",
     "@types/cors": "^2.8.14",
+    "@types/eslint": "^9",
     "@types/express": "^4.17.18",
     "@types/jsonwebtoken": "^9.0.3",
     "@types/node": "^20.4.2",
+    "@typescript-eslint/eslint-plugin": "latest",
+    "@typescript-eslint/parser": "latest",
+    "eslint": "^8.15.0",
+    "eslint-config-prettier": "^9.1.0",
+    "eslint-plugin-prettier": "^5.2.1",
     "types": "^0.1.1",
     "typescript": "^5.1.6"
   }

diff --git a/packages/backend/tsconfig.json b/packages/backend/tsconfig.json
@@ -1,10 +1,16 @@
 {
   "compilerOptions": {
-    "target": "es2020",
+    "target": "ES2020",
     "module": "commonjs",
+    "strict": true,
     "esModuleInterop": true,
+    "skipLibCheck": true,
     "forceConsistentCasingInFileNames": true,
-    "strict": true,
-    "skipLibCheck": true
-  }
+    "typeRoots": ["./types", "./node_modules/@types"],
+    "paths": {
+      "~~/*": ["./*"]
+    }
+  },
+  "include": ["**/*.ts", "types/**/*.ts"],
+  "exclude": ["node_modules"]
 }
diff --git a/packages/backend/tsconfig.tsbuildinfo b/packages/backend/tsconfig.tsbuildinfo
diff --git a/packages/backend/types/bcrypt.d.ts b/packages/backend/types/bcrypt.d.ts
@@ -0,0 +1,2 @@
+declare module "bcrypt";
+
diff --git a/packages/backend/types/cors.d.ts b/packages/backend/types/cors.d.ts
@@ -0,0 +1 @@
+declare module 'cors';
diff --git a/packages/backend/types/express.d.ts b/packages/backend/types/express.d.ts
@@ -0,0 +1 @@
+declare module 'express';
diff --git a/packages/backend/types/jsonwebtoken.d.ts b/packages/backend/types/jsonwebtoken.d.ts
@@ -0,0 +1 @@
+declare module 'jsonwebtoken';
diff --git a/packages/backend/vercel.json b/packages/backend/vercel.json
@@ -1,6 +1,6 @@
 {
   "version": 2,
-  "name": "dice-demo-backend",
+  "name": "pkdice-backend",
   "builds": [
     {
       "src": "index.ts",

diff --git a/packages/nextjs/server.config.ts b/packages/nextjs/server.config.ts
@@ -1,7 +1,7 @@
 const serverConfig = {
   isLocal: false,
   localUrl: "http://localhost:6001",
-  liveUrl: "https://dicedemo-backend.fly.dev",
+  liveUrl: "https://pkdice-backend.fly.dev",
   ably_api_key: "Fbq6sA.xC_GgQ:a9uQJKCunyvMmh1nVvcZaZFuZw_2LYbcHvTno5uPV5c",
 };