frosty 0.0.147 → 0.0.149

package/README.md

@@ -114,7 +114,7 @@ module.exports = {
   client: {                  // (Optional) Client entry points
     main: {
       entry: 'src/app.js',   // Path to client entry file
-      uri: '/',              // (Optional) URI path
+      basepath: '/',         // (Optional) URL base path for this entry
     }
   },
   moduleSuffixes: {          // (Optional) Custom module resolution suffixes

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "frosty",
-  "version": "0.0.147",
+  "version": "0.0.149",
   "main": "dist/index",
   "module": "dist/index",
   "types": "dist/index",
@@ -37,7 +37,7 @@
     "@types/lodash": "^4.17.16",
     "csstype": "^3.1.3",
     "jsdom": "^27.0.0",
-    "lodash": ">=4.17.23",
+    "lodash": ">=4.18.1",
     "myers.js": "^0.0.22",
     "nextick": "^0.0.2",
     "postcss": "^8.5.6",

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

@@ -43,6 +43,7 @@ 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 "  -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 +54,7 @@ print_usage() {
   echo ""
   echo "Examples:"
   echo "  frosty run app.js"
+  echo "  frosty run -n 4 app.js"
 }
 
 POSITIONAL_ARGS=()
@@ -63,6 +65,7 @@ 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 ;;
     -c|--configuration) CONFIG_FILE="$2"; shift 2 ;;
     -s|--src) SRCROOT="$2"; shift 2 ;;
     -o|--output) OUTPUT_DIR="$2"; shift 2 ;;
@@ -110,6 +113,7 @@ 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 "$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,7 @@
 //
 
 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();

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

@@ -26,41 +26,57 @@
 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 } from './env';
 
-const app = 'serverOptions' in __SERVER__ ? new Server(__SERVER__.serverOptions) : new Server;
+if (cluster.isPrimary && NUM_WORKERS > 1) {
+  console.log(`Primary ${process.pid} is running`);
 
-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.`
-    );
+  // Fork workers.
+  for (let i = 0; i < NUM_WORKERS; i++) {
+    cluster.fork();
   }
-  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,
+
+  cluster.on('exit', (worker, code, signal) => {
+    console.log(`Worker ${worker.process.pid} died`);
   });
-  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,7 @@ export default async (env, argv) => {
     CONFIG_FILE = 'server.config.js',
     INPUT_FILE,
     PORT = 8080,
+    NUM_WORKERS,
   } = env;
 
   const serverConfig = await (async () => {
@@ -200,7 +201,7 @@ export default async (env, argv) => {
   const random = crypto.randomUUID();
   const tempDir = fs.mkdtempSync(`${os.tmpdir()}${path.sep}`);
   const applications = path.resolve(tempDir, `applications-${random}.js`);
-  const inputs = INPUT_FILE ? { main: { entry: path.join(process.cwd(), INPUT_FILE), uri: '/' } } : config.client;
+  const inputs = INPUT_FILE ? { main: { entry: path.join(process.cwd(), INPUT_FILE), basepath: '/' } } : config.client;
 
   fs.writeFileSync(applications, `
     ${_.map(inputs, ({ entry }, name) => `import * as ${name} from '${path.resolve(process.cwd(), entry)}';`).join('\n')}
@@ -253,10 +254,10 @@ export default async (env, argv) => {
       optimization: webpackOptimization({ server: true }),
       plugins: _.compact([
         ...webpackPlugins,
-        new webpack.EnvironmentPlugin({ PORT }),
+        new webpack.EnvironmentPlugin({ PORT, NUM_WORKERS }),
         new webpack.DefinePlugin({
           __applications__: JSON.stringify(_.mapValues(inputs, x => ({
-            path: x.uri,
+            path: x.basepath,
           }))),
         }),
         ...config.options?.server?.plugins ?? [],

package/packages/frosty-cli/yarn.lock

@@ -2961,9 +2961,9 @@ lodash.debounce@^4.0.8:
   integrity sha512-FT1yDzDYEoYWhnSGnpE/4Kj1fLZkDFyqRb7fNt6FdYOSxlUWAtp42Eh6Wb0rGIv/m9Bgo7x4GhQbm5Ys4SG5ow==
 
 lodash@>=4.17.21, lodash@^4.17.21:
-  version "4.17.23"
-  resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.23.tgz#f113b0378386103be4f6893388c73d0bde7f2c5a"
-  integrity sha512-LgVTMpQtIopCi79SJeDiP0TfWi5CNEc/L/aRdTh3yIvmZXTnheWpKjSZhnvMl8iXbC1tFg9gdHHDMLoV7CnG+w==
+  version "4.18.1"
+  resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.18.1.tgz#ff2b66c1f6326d59513de2407bf881439812771c"
+  integrity sha512-dMInicTPVE8d1e5otfwmmjlxkZoUpiVLwyeTdUsi/Caj/gfzzblBcCE5sRHV/AsjuCmxWrte2TNGSYuCeCq+0Q==
 
 lru-cache@^5.1.1:
   version "5.1.1"