frosty 0.0.148 → 0.0.150

package/package.json

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

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

@@ -43,6 +43,8 @@ print_usage() {
   echo "  -b, --build-only           Only build, do not run the server"
   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"
@@ -53,6 +55,7 @@ print_usage() {
   echo ""
   echo "Examples:"
   echo "  frosty run app.js"
+  echo "  frosty run -n 4 app.js"
 }
 
 POSITIONAL_ARGS=()
@@ -63,6 +66,8 @@ while [ $# -gt 0 ]; do
     -b|--build-only) BUILD_ONLY=true; shift ;;
     -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 ;;
@@ -110,6 +115,8 @@ if [ "$NO_BUILD" != "true" ]; then
   fi
   [ -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

@@ -24,5 +24,8 @@
 //
 
 import _ from 'lodash';
+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

@@ -26,41 +26,83 @@
 import _ from 'lodash';
 import fs from 'fs';
 import path from 'path';
+import cluster from 'cluster';
 import { Server } from '@o2ter/server-js';
 import { FrostyRoute } from './route';
 import * as __SERVER__ from '__SERVER__';
 import * as __APPLICATIONS__ from '__APPLICATIONS__';
-import { PORT } from './env';
+import { PORT, NUM_WORKERS, INSTANCE_VAR } from './env';
 
-const app = 'serverOptions' in __SERVER__ ? new Server(__SERVER__.serverOptions) : new Server;
+if (cluster.isPrimary && NUM_WORKERS > 1) {
+  console.info(`Primary ${process.pid} is running`);
 
-app.use(Server.static(path.join(__dirname, 'public'), { cacheControl: true }));
+  // 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 server_env = {};
-if ('default' in __SERVER__) await __SERVER__.default(app, server_env);
+  const spawnWorker = (instance) => {
+    const worker = cluster.fork({ [INSTANCE_VAR]: instance });
+    workerInstances.set(worker.id, instance);
+    return worker;
+  };
 
-for (const [name, { path: pathname }] of _.toPairs(__applications__)) {
-  const { default: App } = __APPLICATIONS__[name];
-  if (!_.isFunction(App)) {
-    throw new Error(
-      `Failed to load client app "${name}": default export is not a function.\n` +
-      `Please ensure "${name}" exports a valid Frosty component as its default export.`
-    );
-  }
-  const cssExists = fs.existsSync(path.join(__dirname, `public/css/${name}_bundle.css`));
-  const route = FrostyRoute(App, {
-    jsSrc: `/${name}_bundle.js`,
-    cssSrc: cssExists ? `/css/${name}_bundle.css` : undefined,
+  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.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);
+      });
+    }
   });
-  if (_.isEmpty(pathname) || pathname === '/') {
-    app.use(route);
-  } else {
-    app.use(pathname, route);
+
+} else {
+
+  const app = 'serverOptions' in __SERVER__ ? new Server(__SERVER__.serverOptions) : new Server;
+
+  app.use(Server.static(path.join(__dirname, 'public'), { cacheControl: true }));
+
+  const server_env = {};
+  if ('default' in __SERVER__) await __SERVER__.default(app, server_env);
+
+  for (const [name, { path: pathname }] of _.toPairs(__applications__)) {
+    const { default: App } = __APPLICATIONS__[name];
+    if (!_.isFunction(App)) {
+      throw new Error(
+        `Failed to load client app "${name}": default export is not a function.\n` +
+        `Please ensure "${name}" exports a valid Frosty component as its default export.`
+      );
+    }
+    const cssExists = fs.existsSync(path.join(__dirname, `public/css/${name}_bundle.css`));
+    const route = FrostyRoute(App, {
+      jsSrc: `/${name}_bundle.js`,
+      cssSrc: cssExists ? `/css/${name}_bundle.css` : undefined,
+    });
+    if (_.isEmpty(pathname) || pathname === '/') {
+      app.use(route);
+    } else {
+      app.use(pathname, route);
+    }
   }
-}
 
-app.use((err, req, res, next) => {
-  res.status(500).json(err instanceof Error ? { message: err.message } : err);
-});
+  app.use((err, req, res, next) => {
+    res.status(500).json(err instanceof Error ? { message: err.message } : err);
+  });
 
-app.listen(PORT, () => console.info(`listening on port ${PORT}`));
+  app.listen(PORT, () => console.info(`Process ${process.pid} listening on port ${PORT}`));
+}

package/packages/frosty-cli/webpack.mjs

@@ -42,6 +42,8 @@ export default async (env, argv) => {
     CONFIG_FILE = 'server.config.js',
     INPUT_FILE,
     PORT = 8080,
+    NUM_WORKERS,
+    INSTANCE_VAR,
   } = env;
 
   const serverConfig = await (async () => {
@@ -253,7 +255,7 @@ export default async (env, argv) => {
       optimization: webpackOptimization({ server: true }),
       plugins: _.compact([
         ...webpackPlugins,
-        new webpack.EnvironmentPlugin({ PORT }),
+        new webpack.EnvironmentPlugin({ PORT, NUM_WORKERS, INSTANCE_VAR }),
         new webpack.DefinePlugin({
           __applications__: JSON.stringify(_.mapValues(inputs, x => ({
             path: x.basepath,