frosty 0.0.149 → 0.0.151

package/README.md

@@ -117,6 +117,16 @@ module.exports = {
       basepath: '/',         // (Optional) URL base path for this entry
     }
   },
+  workers: {                 // (Optional) Worker entry points
+    myClientWorker: {
+      entry: 'src/workers/myClientWorker.js', // Path to worker entry file
+      client: true,                           // true = browser worker (bundled into public/workers/)
+    },
+    myServerWorker: {
+      entry: 'src/workers/myServerWorker.js', // Path to worker entry file
+      client: false,                          // false = server worker (bundled into workers/)
+    }
+  },
   moduleSuffixes: {          // (Optional) Custom module resolution suffixes
     client: ['.browser', '.web', ''],
     server: ['.node', '.server', '.web', '']

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "frosty",
-  "version": "0.0.149",
+  "version": "0.0.151",
   "main": "dist/index",
   "module": "dist/index",
   "types": "dist/index",

package/packages/frosty-cli/scripts/bin/run.sh

@@ -44,6 +44,7 @@ print_usage() {
   echo "  -B, --no-build             Skip build step"
   echo "  -p, --port <port>          Specify port for the server (default: 8080)"
   echo "  -n, --num-workers <count>  Specify number of worker processes"
+  echo "  -i, --instance-var <name>  Specify the env variable name for worker instance index (default: NODE_APP_INSTANCE)"
   echo "  -c, --configuration <file> Specify configuration file to use (default: server.config.js)"
   echo "  -s, --src <dir>            Specify source root directory"
   echo "  -o, --output <dir>         Specify output directory for build artifacts"
@@ -66,6 +67,7 @@ while [ $# -gt 0 ]; do
     -B|--no-build) NO_BUILD=true; shift ;;
     -p|--port) PORT="$2"; shift 2 ;;
     -n|--num-workers) NUM_WORKERS="$2"; shift 2 ;;
+    -i|--instance-var) INSTANCE_VAR="$2"; shift 2 ;;
     -c|--configuration) CONFIG_FILE="$2"; shift 2 ;;
     -s|--src) SRCROOT="$2"; shift 2 ;;
     -o|--output) OUTPUT_DIR="$2"; shift 2 ;;
@@ -114,6 +116,7 @@ if [ "$NO_BUILD" != "true" ]; then
   [ -n "$INPUT_FILE" ] && BUILD_OPTS="$BUILD_OPTS --env INPUT_FILE="$INPUT_FILE""
   [ -n "$SRCROOT" ] && BUILD_OPTS="$BUILD_OPTS --env SRCROOT="$SRCROOT""
   [ -n "$NUM_WORKERS" ] && BUILD_OPTS="$BUILD_OPTS --env NUM_WORKERS="$NUM_WORKERS""
+  [ -n "$INSTANCE_VAR" ] && BUILD_OPTS="$BUILD_OPTS --env INSTANCE_VAR="$INSTANCE_VAR""
   [ -n "$PORT" ] && BUILD_OPTS="$BUILD_OPTS --env PORT="$PORT""
   if [ "$WATCH_MODE" = "true" ]; then
     node "$FROSTY_CLI_ROOT/node_modules/webpack-cli/bin/cli.js" $BUILD_OPTS --watch &

package/packages/frosty-cli/src/server/env.ts

@@ -28,3 +28,4 @@ import { availableParallelism } from 'os';
 
 export const PORT = process.env.PORT ? parseInt(process.env.PORT) : 8080;
 export const NUM_WORKERS = process.env.NUM_WORKERS ? parseInt(process.env.NUM_WORKERS) : availableParallelism();
+export const INSTANCE_VAR = process.env.INSTANCE_VAR || 'NODE_APP_INSTANCE';

package/packages/frosty-cli/src/server/index.js

@@ -31,18 +31,44 @@ import { Server } from '@o2ter/server-js';
 import { FrostyRoute } from './route';
 import * as __SERVER__ from '__SERVER__';
 import * as __APPLICATIONS__ from '__APPLICATIONS__';
-import { PORT, NUM_WORKERS } from './env';
+import { PORT, NUM_WORKERS, INSTANCE_VAR } from './env';
 
 if (cluster.isPrimary && NUM_WORKERS > 1) {
-  console.log(`Primary ${process.pid} is running`);
+  console.info(`Primary ${process.pid} is running`);
 
-  // Fork workers.
-  for (let i = 0; i < NUM_WORKERS; i++) {
-    cluster.fork();
-  }
+  // Fork workers one by one, waiting for each to come online before starting the next.
+  let forked = 0;
+  const workerInstances = new Map(); // worker.id -> instance index
+  const startedWorkers = new Set(); // worker IDs that have successfully started
+
+  const spawnWorker = (instance) => {
+    const worker = cluster.fork({ [INSTANCE_VAR]: instance });
+    workerInstances.set(worker.id, instance);
+    return worker;
+  };
+
+  const forkNext = () => {
+    if (forked >= NUM_WORKERS) return;
+    const instance = forked++;
+    const worker = spawnWorker(instance);
+    worker.once('listening', () => {
+      startedWorkers.add(worker.id);
+      forkNext();
+    });
+  };
+  forkNext();
 
   cluster.on('exit', (worker, code, signal) => {
-    console.log(`Worker ${worker.process.pid} died`);
+    console.info(`Process ${worker.process.pid} exited with code ${code} (${signal})`);
+    const instance = workerInstances.get(worker.id);
+    workerInstances.delete(worker.id);
+    if (startedWorkers.delete(worker.id)) {
+      // Worker had started successfully; restart it
+      const newWorker = spawnWorker(instance);
+      newWorker.once('listening', () => {
+        startedWorkers.add(newWorker.id);
+      });
+    }
   });
 
 } else {

package/packages/frosty-cli/webpack.mjs

@@ -43,6 +43,7 @@ export default async (env, argv) => {
     INPUT_FILE,
     PORT = 8080,
     NUM_WORKERS,
+    INSTANCE_VAR,
   } = env;
 
   const serverConfig = await (async () => {
@@ -213,6 +214,16 @@ export default async (env, argv) => {
     server: config.moduleSuffixes?.server ?? ['.node', '.server', '.web', ''],
   };
 
+  const clientWorkers = [];
+  const serverWorkers = [];
+  for (const [name, { entry, client }] of _.entries(config.workers || {})) {
+    if (client) {
+      clientWorkers.push({ name, entry });
+    } else {
+      serverWorkers.push({ name, entry });
+    }
+  }
+
   return [
     ..._.map(inputs, ({ entry }, name) => ({
       ...webpackConfiguration,
@@ -249,12 +260,40 @@ export default async (env, argv) => {
         ]
       }
     })),
+    {
+      ...webpackConfiguration,
+      optimization: webpackOptimization({ server: false }),
+      plugins: webpackPlugins,
+      entry: {
+        ..._.fromPairs(clientWorkers.map(({ name, entry }) => ([`workers/${name}`, [
+          path.resolve(__dirname, 'node_modules/core-js/stable'),
+          path.resolve(process.cwd(), entry),
+        ]]))),
+      },
+      output: {
+        path: path.join(OUTPUT_DIR, 'public'),
+      },
+      resolve: {
+        ...webpackConfiguration.resolve,
+        extensions: [
+          ...moduleSuffixes.client.flatMap(x => [`${x}.tsx`, `${x}.jsx`]),
+          ...moduleSuffixes.client.flatMap(x => [`${x}.ts`, `${x}.mjs`, `${x}.js`]),
+          '...'
+        ],
+      },
+      module: {
+        rules: [
+          babelLoaderConfiguration({ server: false }),
+          ...config.options?.module?.rules ?? [],
+        ]
+      }
+    },
     {
       ...webpackConfiguration,
       optimization: webpackOptimization({ server: true }),
       plugins: _.compact([
         ...webpackPlugins,
-        new webpack.EnvironmentPlugin({ PORT, NUM_WORKERS }),
+        new webpack.EnvironmentPlugin({ PORT, NUM_WORKERS, INSTANCE_VAR }),
         new webpack.DefinePlugin({
           __applications__: JSON.stringify(_.mapValues(inputs, x => ({
             path: x.basepath,
@@ -268,6 +307,10 @@ export default async (env, argv) => {
           path.resolve(__dirname, 'node_modules/core-js/stable'),
           path.resolve(__dirname, 'src/server/index.js'),
         ],
+        ..._.fromPairs(serverWorkers.map(({ name, entry }) => ([`workers/${name}`, [
+          path.resolve(__dirname, 'node_modules/core-js/stable'),
+          path.resolve(process.cwd(), entry),
+        ]]))),
       },
       output: {
         path: OUTPUT_DIR,