PEER-220: Add docker config

Signed-off-by: SeeuSim <[email protected]>

Author: SeeuSim

backend/matching/.env.compose

@@ -2,3 +2,11 @@
 # PEERPREP_UI_HOST="http://frontend:3000"
 
 EXPRESS_PORT=9004
+
+# MATCHING_DB_HOSTNAME="match-db"
+MATCHING_DB_PORT=6379
+
+MATCHING_DB_USERNAME="peerprep-match-express"
+MATCHING_DB_PASSWORD="G7jBgyz9wGAFQ5La"
+REDIS_ARGS="--requirepass G7jBgyz9wGAFQ5La --user ${MATCHING_DB_USERNAME} on >G7jBgyz9wGAFQ5La ~* allcommands --user default off nopass nocommands"
+

backend/matching/.env.docker

@@ -1,3 +1,9 @@
-PEERPREP_UI_HOST="http://host.docker.internal:5173"
+PEERPREP_UI_HOST=http://host.docker.internal:5173
 
 EXPRESS_PORT=9004
+
+MATCHING_DB_HOSTNAME=host.docker.internal
+MATCHING_DB_PORT=6379
+
+MATCHING_DB_USERNAME=peerprep-match-express
+MATCHING_DB_PASSWORD=G7jBgyz9wGAFQ5La

backend/matching/entrypoint.sh

@@ -1,5 +1,9 @@
 #!/bin/sh
 
-# To insert MQ health checks
+npm run db:seed:prod
+
+rm -rf src tsconfig.json
+
+npm uninstall tsx
 
 npm run start

backend/matching/express.Dockerfile

@@ -12,6 +12,9 @@ COPY --from=build --chown=node:node /data/match-express/dist ./dist
 
 RUN npm ci --omit=dev
 
+COPY src/lib/db ./src/lib/db
+COPY src/config.ts ./src
+COPY tsconfig.json .
 COPY entrypoint.sh .
 
 ARG port

backend/matching/package.json

@@ -9,6 +9,7 @@
     "build:local": "env-cmd -f .env.local tsc && tsc-alias",
     "start:local": "env-cmd -f .env.local node dist/index.js",
     "db:seed": "env-cmd -f .env.local tsx src/lib/db/seed.ts",
+    "db:seed:prod": "tsx src/lib/db/seed.ts",
     "fmt": "prettier --config .prettierrc src --write",
     "test": "echo \"Error: no test specified\" && exit 1"
   },
@@ -26,7 +27,8 @@
     "pino": "^9.4.0",
     "pino-http": "^10.3.0",
     "redis": "^4.7.0",
-    "socket.io": "^4.8.0"
+    "socket.io": "^4.8.0",
+    "tsx": "^4.19.1"
   },
   "devDependencies": {
     "@types/async": "^3.2.24",
@@ -36,7 +38,6 @@
     "nodemon": "^3.1.4",
     "pino-pretty": "^11.2.2",
     "ts-node": "^10.9.2",
-    "tsc-alias": "^1.8.10",
-    "tsx": "^4.19.1"
+    "tsc-alias": "^1.8.10"
   }
 }

backend/matching/src/index.ts

@@ -5,7 +5,7 @@ import { logger } from '@/lib/utils';
 import server, { io } from '@/server';
 import { initWorker } from '@/workers';
 
-const workers: ChildProcess[] = [];
+const workers: { controller: AbortController; worker: ChildProcess }[] = [];
 
 const port = Number.parseInt(EXPRESS_PORT || '8001');
 
@@ -18,7 +18,8 @@ server.listen(port, () => {
 });
 
 const shutdown = () => {
-  workers.forEach((worker) => {
+  workers.forEach(({ controller, worker }) => {
+    controller.abort();
     worker.kill();
   });
   io.close(() => {

backend/matching/src/workers/cleaner.ts

@@ -2,7 +2,7 @@ import { client } from '@/lib/db';
 import { STREAM_CLEANER, STREAM_GROUP, STREAM_NAME } from '@/lib/db/constants';
 import { decodePoolTicket, getPoolKey } from '@/lib/utils';
 import { MATCH_SVC_EVENT } from '@/ws';
-import { sendNotif } from './common';
+import { connectClient, sendNotif } from './common';
 
 const logger = {
   info: (message: unknown) => process.send && process.send(message),
@@ -25,11 +25,12 @@ const shutdown = () => {
     .then(process.exit(0));
 };
 
+process.on('exit', shutdown);
 process.on('SIGINT', shutdown);
 process.on('SIGTERM', shutdown);
 
 async function clean() {
-  const redisClient = client.isReady || client.isOpen ? client : await client.connect();
+  const redisClient = await connectClient(client);
   const response = await redisClient.xAutoClaim(
     STREAM_NAME,
     STREAM_GROUP,

backend/matching/src/workers/common.ts

@@ -1,3 +1,5 @@
+import { client } from '@/lib/db';
+import { logger } from '@/lib/utils';
 import type { IChildProcessMessage, IMatchEvent } from '@/ws';
 
 export const sendNotif = (roomIds: Array<string>, event: IMatchEvent, message?: unknown) => {
@@ -10,3 +12,20 @@ export const sendNotif = (roomIds: Array<string>, event: IMatchEvent, message?:
     process.send(payload);
   }
 };
+
+export const connectClient = async (importedClient: typeof client) => {
+  let redisClient: typeof client;
+  try {
+    redisClient =
+      importedClient.isOpen || importedClient.isReady
+        ? importedClient
+        : await importedClient.connect();
+  } catch (error) {
+    const { name, message, cause, stack } = error as Error;
+    logger.error(
+      `An error occurred in connecting: ${JSON.stringify({ name, message, cause, stack })}`
+    );
+    process.exit(1);
+  }
+  return redisClient;
+};

backend/matching/src/workers/index.ts

@@ -7,8 +7,9 @@ import { logger } from '@/lib/utils';
 import { MATCH_SVC_EVENT, type IChildProcessMessage } from '@/ws';
 
 export const initWorker = (name: string, io: Server) => {
+  const controller = new AbortController();
   const lCaseName = name.toLowerCase();
-  const worker = fork(path.join(__dirname, `${lCaseName}.js`));
+  const worker = fork(path.join(__dirname, `${lCaseName}.js`), { signal: controller.signal });
   const upperCaseName = name.replace(/^[A-Za-z]/, (c) => c.toUpperCase());
   worker.on('message', (message) => {
     logger.info(`Received message from '${upperCaseName}': ${JSON.stringify(message)}`);
@@ -23,5 +24,5 @@ export const initWorker = (name: string, io: Server) => {
   worker.on('exit', (code) => {
     logger.error(`${upperCaseName} exited with code ${code}.`);
   });
-  return worker;
+  return { worker, controller };
 };

backend/matching/src/workers/matcher.ts

@@ -3,7 +3,7 @@ import { POOL_INDEX, STREAM_GROUP, STREAM_NAME, STREAM_WORKER } from '@/lib/db/c
 import { decodePoolTicket, getPoolKey, getStreamId } from '@/lib/utils';
 import { getMatchItems } from '@/services';
 import { MATCH_SVC_EVENT } from '@/ws';
-import { sendNotif } from './common';
+import { connectClient, sendNotif } from './common';
 
 const logger = {
   info: (message: unknown) => process.send && process.send(message),
@@ -25,6 +25,7 @@ const shutdown = () => {
     .then(process.exit(0));
 };
 
+process.on('exit', shutdown);
 process.on('SIGINT', shutdown);
 process.on('SIGTERM', shutdown);
 
@@ -74,7 +75,7 @@ async function processMatch(
 }
 
 async function match() {
-  const redisClient = client.isReady || client.isOpen ? client : await client.connect();
+  const redisClient = await connectClient(client);
   const stream = await redisClient.xReadGroup(
     STREAM_GROUP,
     STREAM_WORKER,