Enable clustering

Dockerfile

@@ -13,6 +13,9 @@ RUN apt-get update && apt-get install -y \
 # Install kaggle silently
 RUN yes | pip3 install kaggle --exists-action i --break-system-packages
 
+# Install pm2
+RUN npm install pm2 -g
+
 # Switch to the "user" user
 USER user
 
@@ -43,4 +46,5 @@ RUN --mount=type=secret,id=KAGGLE_USERNAME,mode=0444,required=true \
     kaggle datasets download -d andrewmvd/bone-marrow-cell-classification --unzip -p $HOME/app/dist/app/marrow-cell-data
 
 EXPOSE 7860
-CMD [ "npm", "run", "start" ]
+# CMD [ "npm", "run", "start" ]
+CMD ["pm2-runtime", "processes.json"]

processes.json

@@ -0,0 +1,8 @@
+[
+  {
+    "script": "dist/server.js",
+    "instances": "max",
+    "exec_mode": "cluster",
+    "node_args": "--experimental-specifier-resolution=node"
+  }
+]

src/lib/helper.ts

@@ -56,3 +56,11 @@ export function wrap(
     }
   };
 }
+
+export function log(...args: unknown[]) {
+  console.log(`[${process.env.pm_id ?? ''}]`, ...args);
+}
+
+export function warn(...args: unknown[]) {
+  console.warn(`[${process.env.pm_id ?? ''}]`, ...args);
+}

src/lib/marrow-cells/data.ts

@@ -1,6 +1,7 @@
 import fs from 'fs/promises';
 import { CellTypes } from '../../marrow-cell-types';
 import { Glob } from 'glob';
+import { log } from '../helper';
 
 const DATA_DIR = 'dist/app/marrow-cell-data/';
 
@@ -8,7 +9,7 @@ export let cellTypes: CellTypes;
 export let cellImages: { [key: string]: string[] };
 
 export async function readData(): Promise<void> {
-  console.log('Marrow cells: Reading labels');
+  log('Marrow cells: Reading labels');
 
   cellTypes = {};
   const data = await fs.readFile(DATA_DIR + 'abbreviations.csv', {
@@ -22,7 +23,7 @@ export async function readData(): Promise<void> {
       cellTypes[key] = description;
     });
 
-  console.log('Marrow cells: Indexing images');
+  log('Marrow cells: Indexing images');
 
   cellImages = {};
   const directories = (

src/server.ts

@@ -6,6 +6,7 @@ import cors from 'cors';
 import { isBoom } from '@hapi/boom';
 import { fileURLToPath } from 'url';
 import { dirname, join } from 'path';
+import { log } from './lib/helper';
 
 const __filename = fileURLToPath(import.meta.url);
 const __dirname = dirname(__filename);
@@ -44,7 +45,7 @@ app.get('*', (_req, res) => {
 Promise.all([
   (async () => {
     await readData();
-    console.log(
+    log(
       `Marrow cells: ${
         Object.keys(cellImages).length
       } cell types and ${Object.values(cellImages).reduce(
@@ -55,6 +56,6 @@ Promise.all([
   })(),
 ]).then(() => {
   app.listen(PORT, () => {
-    console.log(`Server listening at http://localhost:${PORT}`);
+    log(`Server listening at http://localhost:${PORT}`);
   });
 });