react_on_rails 16.2.0.beta.3 → 16.2.0.beta.4

data/react_on_rails_pro/docs/installation.md

@@ -1,4 +1,5 @@
 # Installation
+
 Since the repository is private, you will get a **GitHub Personal Access Token** and an account that can access the packages. Substitute that value in the commands below. If you dont' have this, ask [justin@shakacode.com](mailto:justin@shakacode.com) to give you one.
 
 Check the [CHANGELOG](https://github.com/shakacode/react_on_rails_pro/blob/master/CHANGELOG.md) to see what version you want.
@@ -8,13 +9,16 @@ Check the [CHANGELOG](https://github.com/shakacode/react_on_rails_pro/blob/maste
 For the below docs, find the desired `<version>` in the CHANGELOG. Note, for pre-release versions, gems have all periods, and node packages uses a dash, like gem `3.0.0.rc.0` and node package `3.0.0-rc.0`.
 
 # Ruby
+
 ## Gem Installation
+
 1. Ensure your **Rails** app is using the **react_on_rails** gem, version greater than 11.0.7.
-1. Add the `react_on_rails_pro` gem to your **Gemfile**. Substitute the appropriate version number. 
-   
+1. Add the `react_on_rails_pro` gem to your **Gemfile**. Substitute the appropriate version number.
+
 ## Gemfile Change
 
 Replace the following in the snippet for the Gemfile
+
 1. `<account>` for the api key
 2. `<api-key>`
 3. `<version>` desired
@@ -33,6 +37,7 @@ source "https://rubygems.pkg.github.com/shakacode-tools" do
   gem "react_on_rails_pro", "<version>"
 end
 ```
+
 Or use the `gem install` command:
 
 ```bash
@@ -46,23 +51,27 @@ bundle config set rubygems.pkg.github.com <username>:<token>
 ```
 
 ## Using a branch in your Gemfile
+
 Note, you should probably use an ENV value for the token so that you don't check this into your source code.
-   ```ruby
-   gem "react_on_rails_pro", version: "<version>", git: "https://[your-github-token]:x-oauth-basic@github.com/shakacode/react_on_rails_pro.git", tag: "<version>"
-   ```
+
+```ruby
+gem "react_on_rails_pro", version: "<version>", git: "https://[your-github-token]:x-oauth-basic@github.com/shakacode/react_on_rails_pro.git", tag: "<version>"
+```
 
 ## Rails Configuration
-You don't need to create an initializer if you are satisfied with the default as described in 
+
+You don't need to create an initializer if you are satisfied with the default as described in
 [Configuration](./configuration.md)
 
 # Node Package
+
 Note, you only need to install the Node Package if you are using the standalone node renderer, `NodeRenderer`.
 
 ## Installation
 
 1. Create a subdirectory of your rails project for the Node renderer. Let's use `react-on-rails-pro`.
-   
 2. Create a file `react-on-rails-pro/.npmrc` with the following
+
 ```
 always-auth=true
 //npm.pkg.github.com/:_authToken=<token>
@@ -70,6 +79,7 @@ always-auth=true
 ```
 
 3. Create a `react-on-rails-pro/package.json`
+
 ```json
 {
   "private": true,
@@ -86,20 +96,18 @@ always-auth=true
 
 If you really want to use yarn, see [Yarn can't find private Github npm registry](https://stackoverflow.com/questions/58316109/yarn-cant-find-private-github-npm-registry)
 
-5. You can start the renderer with either the executable `node-renderer` or, preferably, with 
+5. You can start the renderer with either the executable `node-renderer` or, preferably, with
    a startup JS file, say called `react-on-rails-pro/react-on-rails-pro-node-renderer.js` with
-   these contents. _Note the use of the namespaced **`@shakacode-tools/react-on-rails-pro-node-renderer`** for the package.
+   these contents. \_Note the use of the namespaced **`@shakacode-tools/react-on-rails-pro-node-renderer`** for the package.
 
 ```js
-const path = require('path')
-const {
-  reactOnRailsProNodeRenderer,
-} = require('@shakacode-tools/react-on-rails-pro-node-renderer')
+const path = require('path');
+const { reactOnRailsProNodeRenderer } = require('@shakacode-tools/react-on-rails-pro-node-renderer');
 
-const env = process.env
+const env = process.env;
 
 const config = {
-  bundlePath: path.resolve(__dirname, '../.node-renderer-bundles'),
+  serverBundleCachePath: path.resolve(__dirname, '../.node-renderer-bundles'),
 
   // Listen at RENDERER_PORT env value or default port 3800
   logLevel: env.RENDERER_LOG_LEVEL || 'debug', // show all logs
@@ -129,21 +137,25 @@ const config = {
   // allWorkersRestartInterval: 15,
   // time in minutes between each worker restarting when restarting all workers
   // delayBetweenIndividualWorkerRestarts: 2,
-}
+  // Also, you can set he parameter gracefulWorkerRestartTimeout to force the worker to restart
+  // If it's the time for the worker to restart, the worker waits until it serves all active requests before restarting
+  // If a worker stuck because of a memory leakage or an infinite loop, you can set a timeout that master waits for it before killing the worker
+};
 
 // Renderer detects a total number of CPUs on virtual hostings like Heroku
 // or CircleCI instead of CPUs number allocated for current container. This
 // results in spawning many workers while only 1-2 of them really needed.
 if (env.CI) {
-  config.workersCount = 2
+  config.workersCount = 2;
 }
 
-reactOnRailsProNodeRenderer(config)
+reactOnRailsProNodeRenderer(config);
 ```
 
 ## Instructions for using a branch
 
 Install the node-renderer executable, possibly globally. Substitute the branch name or tag for `master`
+
 ```
 yarn global add https://<your-github-token>:x-oauth-basic@github.com/shakacode/react_on_rails_pro.git\#master
 ```
@@ -156,28 +168,34 @@ Login into npm
 
 ```bash
 npm install @shakacode-tools/react-on-rails-pro-node-renderer@<version>
-```                      
+```
 
 or edit package.json directly
+
 ```json
 "@shakacode-tools/react-on-rails-pro-node-renderer": "<version>"
-```                     
+```
 
 ### Configuration
+
 See [NodeRenderer JavaScript Configuration](./node-renderer/js-configuration.md).
 
 #### Webpack Configuration
+
 Set your server bundle webpack configuration to use a target of `node` per the [Webpack docs](https://webpack.js.org/concepts/targets/#usage).
 
 ## Authentication when using Github packages
+
 [Auth for the npm package](https://docs.github.com/en/packages/using-github-packages-with-your-projects-ecosystem/configuring-npm-for-use-with-github-packages#authenticating-to-github-packages)
 
 Create a new ~/.npmrc file if one doesn't exist.
+
 ```
 //npm.pkg.github.com/:_authToken=TOKEN
-```                  
+```
 
 To configure bundler if you don't want the token in your Gemfile:
+
 ```
 bundle config https://rubygems.pkg.github.com/OWNER USERNAME:TOKEN
-``` 
+```

data/react_on_rails_pro/docs/node-renderer/basics.md

@@ -1,23 +1,26 @@
 # Requirements
-* You must use React on Rails v11.0.7 or higher.
+
+- You must use React on Rails v11.0.7 or higher.
 
 # Install the Gem and the Node Module
+
 See [Installation](../installation.md).
 
 # Setup Node Renderer Server
+
 **node-renderer** is a standalone Node application to serve React SSR requests from a **Rails** client. You don't need any **Ruby** code to setup and launch it. You can configure with the command line or with a launch file.
 
 ## Simple Command Line for node-renderer
 
 1. ENV values for the default config are (See [JS Configuration](./js-configuration.md) for more details):
-    * `RENDERER_PORT`
-    * `RENDERER_LOG_LEVEL`
-    * `RENDERER_BUNDLE_PATH`
-    * `RENDERER_WORKERS_COUNT`
-    * `RENDERER_PASSWORD`
-    * `RENDERER_ALL_WORKERS_RESTART_INTERVAL`
-    * `RENDERER_DELAY_BETWEEN_INDIVIDUAL_WORKER_RESTARTS`
-    * `RENDERER_SUPPORT_MODULES`
+   - `RENDERER_PORT`
+   - `RENDERER_LOG_LEVEL`
+   - `RENDERER_BUNDLE_PATH`
+   - `RENDERER_WORKERS_COUNT`
+   - `RENDERER_PASSWORD`
+   - `RENDERER_ALL_WORKERS_RESTART_INTERVAL`
+   - `RENDERER_DELAY_BETWEEN_INDIVIDUAL_WORKER_RESTARTS`
+   - `RENDERER_SUPPORT_MODULES`
 2. Configure ENV values and run the command. Note, you can set port with args `-p <PORT>`. For example, assuming node-renderer is in your path:
    ```
    RENDERER_BUNDLE_PATH=/app/.node-renderer-bundles node-renderer
@@ -25,6 +28,7 @@ See [Installation](../installation.md).
 3. You can use a command line argument of `-p SOME_PORT` to override any ENV value for the PORT.
 
 ## JavaScript Configuration File
+
 For the most control over the setup, create a JavaScript file to start the NodeRenderer.
 
 1. Create some project directory, let's say `renderer-app`:
@@ -38,22 +42,24 @@ For the most control over the setup, create a JavaScript file to start the NodeR
    yarn init
    yarn add https://[your-github-token]:x-oauth-basic@github.com/shakacode/react_on_rails_pro.git\#master
    ```
-4. Configure a JavaScript file that will launch the rendering server per the docs in [Node Renderer JavaScript Configuration](./js-configuration.md). For example, create a file `node-renderer.js`. Here is a simple example that uses all the defaults except for bundlePath:
+4. Configure a JavaScript file that will launch the rendering server per the docs in [Node Renderer JavaScript Configuration](./js-configuration.md). For example, create a file `node-renderer.js`. Here is a simple example that uses all the defaults except for serverBundleCachePath:
 
    ```javascript
    import path from 'path';
    import reactOnRailsProNodeRenderer from '@shakacode-tools/react-on-rails-pro-node-renderer';
 
    const config = {
-     bundlePath: path.resolve(__dirname, '../.node-renderer-bundles'),
+     serverBundleCachePath: path.resolve(__dirname, '../.node-renderer-bundles'),
    };
 
    reactOnRailsProNodeRenderer(config);
    ```
+
 5. Now you can launch your renderer server with `node node-renderer.js`. You will probably add a script to your `package.json`.
 6. You can use a command line argument of `-p SOME_PORT` to override any configured or ENV value for the port.
 
 # Setup Rails Application
+
 Create `config/initializers/react_on_rails_pro.rb` and configure the **renderer server**. See configuration values in [Configuration](../configuration.md). Pay attention to:
 
 1. Set `config.server_renderer = "NodeRenderer"`
@@ -61,25 +67,26 @@ Create `config/initializers/react_on_rails_pro.rb` and configure the **renderer
 3. Configure values beginning with `renderer_`
 4. Use ENV values for values like `renderer_url` so that your deployed server is properly configured. If the ENV value is unset, the default for the renderer_url is `localhost:3800`.
 5. Here's a tiny example using mostly defaults:
+
 ```ruby
 ReactOnRailsPro.configure do |config|
  config.server_renderer = "NodeRenderer"
- 
- # when this ENV value is not defined, the local server at localhost:3800 is used 
- config.renderer_url = ENV["REACT_RENDERER_URL"] 
+
+ # when this ENV value is not defined, the local server at localhost:3800 is used
+ config.renderer_url = ENV["REACT_RENDERER_URL"]
 end
 ```
 
 ## Troublshooting
 
-* See [JS Memory Leaks](../js-memory-leaks.md).
-  
+- See [JS Memory Leaks](../js-memory-leaks.md).
+
 ## Upgrading
 
 The NodeRenderer has a protocol version on both the Rails and Node sides. If the Rails server sends a protocol version that does not match the Node side, an error is returned. Ideally, you want to keep both the Rails and Node sides at the same version.
 
 ## References
 
-* [Installation](../installation.md).
-* [Rails Options for node-renderer](../configuration.md)
-* [JS Options for node-renderer](./js-configuration.md)
+- [Installation](../installation.md).
+- [Rails Options for node-renderer](../configuration.md)
+- [JS Options for node-renderer](./js-configuration.md)

data/react_on_rails_pro/docs/node-renderer/js-configuration.md

@@ -8,39 +8,41 @@ The values in this file must be kept in sync with with the `config/initializers/
 
 Here are the options available for the JavaScript renderer configuration object, as well as the available default ENV values if using the command line program node-renderer.
 
-[//]: # (If you change text here, you may want to update comments in packages/node-renderer/src/shared/configBuilder.ts as well.)
+[//]: # 'If you change text here, you may want to update comments in packages/node-renderer/src/shared/configBuilder.ts as well.'
 
 1. **port** (default: `process.env.RENDERER_PORT || 3800`) - The port the renderer should listen to.
-[On Heroku](https://devcenter.heroku.com/articles/dyno-startup-behavior#port-binding-of-web-dynos) or [ControlPlane](https://docs.controlplane.com/reference/workload/containers#port-variable) you may want to use `process.env.PORT`.
+   [On Heroku](https://devcenter.heroku.com/articles/dyno-startup-behavior#port-binding-of-web-dynos) or [ControlPlane](https://docs.controlplane.com/reference/workload/containers#port-variable) you may want to use `process.env.PORT`.
 1. **logLevel** (default: `process.env.RENDERER_LOG_LEVEL || 'info'`) - The renderer log level. Set it to `silent` to turn logging off.
-[Available levels](https://getpino.io/#/docs/api?id=levels): `{ fatal: 60, error: 50, warn: 40, info: 30, debug: 20, trace: 10 }`. `silent` can be used as well.
+   [Available levels](https://getpino.io/#/docs/api?id=levels): `{ fatal: 60, error: 50, warn: 40, info: 30, debug: 20, trace: 10 }`. `silent` can be used as well.
 1. **logHttpLevel** (default: `process.env.RENDERER_LOG_HTTP_LEVEL || 'error'`) - The HTTP server log level (same allowed values as `logLevel`).
 1. **fastifyServerOptions** (default: `{}`) - Additional options to pass to the Fastify server factory. See [Fastify documentation](https://fastify.dev/docs/latest/Reference/Server/#factory).
-1. **bundlePath** (default: `process.env.RENDERER_BUNDLE_PATH || '/tmp/react-on-rails-pro-node-renderer-bundles'` ) - path to a temp directory where uploaded bundle files will be stored. For example you can set it to `path.resolve(__dirname, './.node-renderer-bundles')` if you configured renderer from the `/` directory of your app.
+1. **serverBundleCachePath** (default: `process.env.RENDERER_SERVER_BUNDLE_CACHE_PATH || process.env.RENDERER_BUNDLE_PATH || '/tmp/react-on-rails-pro-node-renderer-bundles'` ) - Path to a cache directory where uploaded server bundle files will be stored. This is distinct from Shakapacker's public asset directory. For example you can set it to `path.resolve(__dirname, './.node-renderer-bundles')` if you configured renderer from the `/` directory of your app.
 1. **workersCount** (default: `process.env.RENDERER_WORKERS_COUNT || defaultWorkersCount()` where default is your CPUs count - 1) - Number of workers that will be forked to serve rendering requests. If you set this manually make sure that value is a **Number** and is `>= 0`. Setting this to `0` will run the renderer in a single process mode without forking any workers, which is useful for debugging purposes. For production use, the value should be `>= 1`.
 1. **password** (default: `env.RENDERER_PASSWORD`) - The password expected to receive from the **Rails client** to authenticate rendering requests.
-If no password is set, no authentication will be required.
+   If no password is set, no authentication will be required.
 1. **allWorkersRestartInterval** (default: `env.RENDERER_ALL_WORKERS_RESTART_INTERVAL`) - Interval in minutes between scheduled restarts of all workers. By default restarts are not enabled. If restarts are enabled, `delayBetweenIndividualWorkerRestarts` should also be set.
 1. **delayBetweenIndividualWorkerRestarts** (default: `env.RENDERER_DELAY_BETWEEN_INDIVIDUAL_WORKER_RESTARTS`) - Interval in minutes between individual worker restarts (when cluster restart is triggered). By default restarts are not enabled. If restarts are enabled, `allWorkersRestartInterval` should also be set.
+1. **gracefulWorkerRestartTimeout**: (default: `env.GRACEFUL_WORKER_RESTART_TIMEOUT`) - Time in seconds that the master waits for a worker to gracefully restart (after serving all active requests) before killing it. Use this when you want to avoid situations where a worker gets stuck in an infinite loop and never restarts. This config is only usable if worker restart is enabled. The timeout starts when the worker should restart; if it elapses without a restart, the worker is killed.
 1. **maxDebugSnippetLength** (default: 1000) - If the rendering request is longer than this, it will be truncated in exception and logging messages.
-1. **supportModules** - (default: `env.RENDERER_SUPPORT_MODULES || null`) - If set to true, `supportModules` enables the server-bundle code to call a default set of NodeJS global objects and functions that get added to the VM context: 
-`{ Buffer, TextDecoder, TextEncoder, URLSearchParams, ReadableStream, process, setTimeout, setInterval, setImmediate, clearTimeout, clearInterval, clearImmediate, queueMicrotask }`.
-This option is required to equal `true` if you want to use loadable components.
-Setting this value to false causes the NodeRenderer to behave like ExecJS.
-See also `stubTimers`.
-1. **additionalContext** - (default: `null`) - additionalContext enables you to specify additional NodeJS objects (usually from https://nodejs.org/api/globals.html) to add to the VM context in addition to our `supportModules` defaults. 
-Object shorthand notation may be used, but is not required.
-Example: `{ URL, Crypto }`
-1. **stubTimers** - (default: `env.RENDERER_STUB_TIMERS` if that environment variable is set, `true` otherwise) - With this option set, use of functions `setTimeout`, `setInterval`, `setImmediate`, `clearTimeout`, `clearInterval`, `clearImmediate`, and `queueMicrotask` will do nothing during server-rendering. 
-This is useful when using dependencies like [react-virtuoso](https://github.com/petyosi/react-virtuoso) that use these functions during hydration.
-In RORP, hydration typically is synchronous and single-task (unless you use streaming) and thus callbacks passed to  task-scheduling functions should never run during server-side rendering.
-Because these functions are valid client-side, they are ignored on server-side rendering without errors or warnings.
-See also `supportModules`.
+1. **supportModules** - (default: `env.RENDERER_SUPPORT_MODULES || null`) - If set to true, `supportModules` enables the server-bundle code to call a default set of NodeJS global objects and functions that get added to the VM context:
+   `{ Buffer, TextDecoder, TextEncoder, URLSearchParams, ReadableStream, process, setTimeout, setInterval, setImmediate, clearTimeout, clearInterval, clearImmediate, queueMicrotask }`.
+   This option is required to equal `true` if you want to use loadable components.
+   Setting this value to false causes the NodeRenderer to behave like ExecJS.
+   See also `stubTimers`.
+1. **additionalContext** - (default: `null`) - additionalContext enables you to specify additional NodeJS objects (usually from https://nodejs.org/api/globals.html) to add to the VM context in addition to our `supportModules` defaults.
+   Object shorthand notation may be used, but is not required.
+   Example: `{ URL, Crypto }`
+1. **stubTimers** - (default: `env.RENDERER_STUB_TIMERS` if that environment variable is set, `true` otherwise) - With this option set, use of functions `setTimeout`, `setInterval`, `setImmediate`, `clearTimeout`, `clearInterval`, `clearImmediate`, and `queueMicrotask` will do nothing during server-rendering.
+   This is useful when using dependencies like [react-virtuoso](https://github.com/petyosi/react-virtuoso) that use these functions during hydration.
+   In RORP, hydration typically is synchronous and single-task (unless you use streaming) and thus callbacks passed to task-scheduling functions should never run during server-side rendering.
+   Because these functions are valid client-side, they are ignored on server-side rendering without errors or warnings.
+   See also `supportModules`.
 
 Deprecated options:
 
-1. **honeybadgerApiKey**, **sentryDsn**, **sentryTracing**, **sentryTracesSampleRate** - Deprecated and have no effect. 
-If you have any of them set, see [Error Reporting and Tracing](./error-reporting-and-tracing.md) for the new way to set up error reporting and tracing.
+1. **bundlePath** - Renamed to `serverBundleCachePath`. The old name will continue to work but will log a deprecation warning.
+1. **honeybadgerApiKey**, **sentryDsn**, **sentryTracing**, **sentryTracesSampleRate** - Deprecated and have no effect.
+   If you have any of them set, see [Error Reporting and Tracing](./error-reporting-and-tracing.md) for the new way to set up error reporting and tracing.
 1. **includeTimerPolyfills** - Renamed to `stubTimers`.
 
 ## Example Launch Files
@@ -52,13 +54,14 @@ If you have any of them set, see [Error Reporting and Tracing](./error-reporting
 ### Simple example:
 
 Create a file './node-renderer.js'
+
 ```js
 import path from 'path';
 import { reactOnRailsProNodeRenderer } from '@shakacode-tools/react-on-rails-pro-node-renderer';
 
 const config = {
   // Save bundles to relative "./.node-renderer-bundles" dir of our app
-  bundlePath: path.resolve(__dirname, './.node-renderer-bundles'),
+  serverBundleCachePath: path.resolve(__dirname, './.node-renderer-bundles'),
 
   // All other values are the defaults, as described above
 };
@@ -75,7 +78,6 @@ else if (process.env.CI) {
 }
 
 reactOnRailsProNodeRenderer(config);
-
 ```
 
 And add this line to your `scripts` section of `package.json`

data/react_on_rails_pro/docs/node-renderer/troubleshooting.md

@@ -1,3 +1,5 @@
 # Node Renderer Troubleshooting
 
 - If you enabled restarts (having `allWorkersRestartInterval` and `delayBetweenIndividualWorkerRestarts`), you should set it with a high number to avoid the app from crashing because all Node renderer workers are stopped/killed.
+
+- If your app contains streamed pages that take too much time to be streamed to the client, ensure to not set the `gracefulWorkerRestartTimeout` parameter or set to a high number, so the worker is not killed while it's still serving an active request.

data/react_on_rails_pro/lib/react_on_rails_pro/version.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
 module ReactOnRailsPro
-  VERSION = "16.2.0.beta.3"
+  VERSION = "16.2.0.beta.4"
   PROTOCOL_VERSION = "2.0.0"
 end

data/react_on_rails_pro/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@shakacode-tools/react-on-rails-pro-node-renderer",
-  "version": "16.2.0-beta.3",
+  "version": "16.2.0-beta.4",
   "protocolVersion": "2.0.0",
   "description": "react-on-rails-pro JavaScript for react_on_rails_pro Ruby gem",
   "exports": {

data/react_on_rails_pro/packages/node-renderer/src/master/restartWorkers.ts

@@ -5,6 +5,7 @@
 
 import cluster from 'cluster';
 import log from '../shared/log';
+import { SHUTDOWN_WORKER_MESSAGE } from '../shared/utils';
 
 const MILLISECONDS_IN_MINUTE = 60000;
 
@@ -14,26 +15,47 @@ declare module 'cluster' {
   }
 }
 
-export = function restartWorkers(delayBetweenIndividualWorkerRestarts: number) {
+export = async function restartWorkers(
+  delayBetweenIndividualWorkerRestarts: number,
+  gracefulWorkerRestartTimeout: number | undefined,
+) {
   log.info('Started scheduled restart of workers');
 
-  let delay = 0;
   if (!cluster.workers) {
     throw new Error('No workers to restart');
   }
-  Object.values(cluster.workers).forEach((worker) => {
-    const killWorker = () => {
-      if (!worker) return;
-      log.debug('Kill worker #%d', worker.id);
-      // eslint-disable-next-line no-param-reassign -- necessary change
-      worker.isScheduledRestart = true;
-      worker.destroy();
-    };
-    setTimeout(killWorker, delay);
-    delay += delayBetweenIndividualWorkerRestarts * MILLISECONDS_IN_MINUTE;
-  });
-
-  setTimeout(() => {
-    log.info('Finished scheduled restart of workers');
-  }, delay);
+  for (const worker of Object.values(cluster.workers).filter((w) => !!w)) {
+    log.debug('Kill worker #%d', worker.id);
+    worker.isScheduledRestart = true;
+
+    worker.send(SHUTDOWN_WORKER_MESSAGE);
+
+    // It's inteded to restart worker in sequence, it shouldn't happens in parallel
+    // eslint-disable-next-line no-await-in-loop
+    await new Promise<void>((resolve) => {
+      let timeout: NodeJS.Timeout;
+
+      const onExit = () => {
+        clearTimeout(timeout);
+        resolve();
+      };
+      worker.on('exit', onExit);
+
+      // Zero means no timeout
+      if (gracefulWorkerRestartTimeout) {
+        timeout = setTimeout(() => {
+          log.debug('Worker #%d timed out, forcing kill it', worker.id);
+          worker.destroy();
+          worker.off('exit', onExit);
+          resolve();
+        }, gracefulWorkerRestartTimeout);
+      }
+    });
+    // eslint-disable-next-line no-await-in-loop
+    await new Promise((resolve) => {
+      setTimeout(resolve, delayBetweenIndividualWorkerRestarts * MILLISECONDS_IN_MINUTE);
+    });
+  }
+
+  log.info('Finished scheduled restart of workers');
 };

data/react_on_rails_pro/packages/node-renderer/src/master.ts

@@ -19,7 +19,12 @@ export = function masterRun(runningConfig?: Partial<Config>) {
 
   // Store config in app state. From now it can be loaded by any module using getConfig():
   const config = buildConfig(runningConfig);
-  const { workersCount, allWorkersRestartInterval, delayBetweenIndividualWorkerRestarts } = config;
+  const {
+    workersCount,
+    allWorkersRestartInterval,
+    delayBetweenIndividualWorkerRestarts,
+    gracefulWorkerRestartTimeout,
+  } = config;
 
   logSanitizedConfig();
 
@@ -48,9 +53,15 @@ export = function masterRun(runningConfig?: Partial<Config>) {
       allWorkersRestartInterval,
       delayBetweenIndividualWorkerRestarts,
     );
-    setInterval(() => {
-      restartWorkers(delayBetweenIndividualWorkerRestarts);
-    }, allWorkersRestartInterval * MILLISECONDS_IN_MINUTE);
+
+    const allWorkersRestartIntervalMS = allWorkersRestartInterval * MILLISECONDS_IN_MINUTE;
+    const scheduleWorkersRestart = () => {
+      void restartWorkers(delayBetweenIndividualWorkerRestarts, gracefulWorkerRestartTimeout).finally(() => {
+        setTimeout(scheduleWorkersRestart, allWorkersRestartIntervalMS);
+      });
+    };
+
+    setTimeout(scheduleWorkersRestart, allWorkersRestartIntervalMS);
   } else if (allWorkersRestartInterval || delayBetweenIndividualWorkerRestarts) {
     log.error(
       "Misconfiguration, please provide both 'allWorkersRestartInterval' and " +

data/react_on_rails_pro/packages/node-renderer/src/shared/configBuilder.ts

@@ -34,8 +34,11 @@ export interface Config {
   // Additional options to pass to the Fastify server factory.
   // See https://fastify.dev/docs/latest/Reference/Server/#factory.
   fastifyServerOptions: FastifyServerOptions<http2.Http2Server>;
-  // Path to a temp directory where uploaded bundle files will be stored.
-  bundlePath: string;
+  // Path to a cache directory where uploaded server bundle files will be stored.
+  // This is distinct from Shakapacker's public asset directory.
+  serverBundleCachePath: string;
+  // @deprecated Use serverBundleCachePath instead. This will be removed in a future version.
+  bundlePath?: string;
   // If set to true, `supportModules` enables the server-bundle code to call a default set of NodeJS
   // global objects and functions that get added to the VM context:
   // `{ Buffer, TextDecoder, TextEncoder, URLSearchParams, ReadableStream, process, setTimeout, setInterval, setImmediate, clearTimeout, clearInterval, clearImmediate, queueMicrotask }`.
@@ -58,6 +61,9 @@ export interface Config {
   allWorkersRestartInterval: number | undefined;
   // Time in minutes between each worker restarting when restarting all workers
   delayBetweenIndividualWorkerRestarts: number | undefined;
+  // Time in seconds to wait for worker to restart before killing it
+  // Set it to 0 or undefined to never kill the worker
+  gracefulWorkerRestartTimeout: number | undefined;
   // If the rendering request is longer than this, it will be truncated in exception and logging messages
   maxDebugSnippetLength: number;
   // @deprecated See https://www.shakacode.com/react-on-rails-pro/docs/node-renderer/error-reporting-and-tracing.
@@ -99,7 +105,7 @@ function defaultWorkersCount() {
 }
 
 // Find the .node-renderer-bundles folder if it exists, otherwise use /tmp
-function defaultBundlePath() {
+function defaultServerBundleCachePath() {
   let currentDir = process.cwd();
   const maxDepth = 10;
   for (let i = 0; i < maxDepth; i += 1) {
@@ -145,7 +151,8 @@ const defaultConfig: Config = {
 
   fastifyServerOptions: {},
 
-  bundlePath: env.RENDERER_BUNDLE_PATH || defaultBundlePath(),
+  serverBundleCachePath:
+    env.RENDERER_SERVER_BUNDLE_CACHE_PATH || env.RENDERER_BUNDLE_PATH || defaultServerBundleCachePath(),
 
   supportModules: truthy(env.RENDERER_SUPPORT_MODULES),
 
@@ -165,6 +172,10 @@ const defaultConfig: Config = {
     ? parseInt(env.RENDERER_DELAY_BETWEEN_INDIVIDUAL_WORKER_RESTARTS, 10)
     : undefined,
 
+  gracefulWorkerRestartTimeout: env.GRACEFUL_WORKER_RESTART_TIMEOUT
+    ? parseInt(env.GRACEFUL_WORKER_RESTART_TIMEOUT, 10)
+    : undefined,
+
   maxDebugSnippetLength: MAX_DEBUG_SNIPPET_LENGTH,
 
   // default to true if empty, otherwise it is set to false
@@ -185,7 +196,10 @@ function envValuesUsed() {
     RENDERER_PORT: !userConfig.port && env.RENDERER_PORT,
     RENDERER_LOG_LEVEL: !userConfig.logLevel && env.RENDERER_LOG_LEVEL,
     RENDERER_LOG_HTTP_LEVEL: !userConfig.logHttpLevel && env.RENDERER_LOG_HTTP_LEVEL,
-    RENDERER_BUNDLE_PATH: !userConfig.bundlePath && env.RENDERER_BUNDLE_PATH,
+    RENDERER_SERVER_BUNDLE_CACHE_PATH:
+      !userConfig.serverBundleCachePath && env.RENDERER_SERVER_BUNDLE_CACHE_PATH,
+    RENDERER_BUNDLE_PATH:
+      !userConfig.serverBundleCachePath && !userConfig.bundlePath && env.RENDERER_BUNDLE_PATH,
     RENDERER_WORKERS_COUNT: !userConfig.workersCount && env.RENDERER_WORKERS_COUNT,
     RENDERER_PASSWORD: !userConfig.password && env.RENDERER_PASSWORD && '<MASKED>',
     RENDERER_SUPPORT_MODULES: !('supportModules' in userConfig) && env.RENDERER_SUPPORT_MODULES,
@@ -195,6 +209,8 @@ function envValuesUsed() {
     RENDERER_DELAY_BETWEEN_INDIVIDUAL_WORKER_RESTARTS:
       !userConfig.delayBetweenIndividualWorkerRestarts &&
       env.RENDERER_DELAY_BETWEEN_INDIVIDUAL_WORKER_RESTARTS,
+    GRACEFUL_WORKER_RESTART_TIMEOUT:
+      !userConfig.gracefulWorkerRestartTimeout && env.GRACEFUL_WORKER_RESTART_TIMEOUT,
     INCLUDE_TIMER_POLYFILLS: !('includeTimerPolyfills' in userConfig) && env.INCLUDE_TIMER_POLYFILLS,
     REPLAY_SERVER_ASYNC_OPERATION_LOGS:
       !userConfig.replayServerAsyncOperationLogs && env.REPLAY_SERVER_ASYNC_OPERATION_LOGS,
@@ -209,6 +225,7 @@ function sanitizedSettings(aConfig: Partial<Config> | undefined, defaultValue?:
         password: aConfig.password != null ? '<MASKED>' : defaultValue,
         allWorkersRestartInterval: aConfig.allWorkersRestartInterval || defaultValue,
         delayBetweenIndividualWorkerRestarts: aConfig.delayBetweenIndividualWorkerRestarts || defaultValue,
+        gracefulWorkerRestartTimeout: aConfig.gracefulWorkerRestartTimeout || defaultValue,
       }
     : {};
 }
@@ -231,6 +248,28 @@ export function buildConfig(providedUserConfig?: Partial<Config>): Config {
   userConfig = providedUserConfig || {};
   config = { ...defaultConfig, ...userConfig };
 
+  // Handle bundlePath deprecation
+  if ('bundlePath' in userConfig) {
+    log.warn(
+      'bundlePath is deprecated and will be removed in a future version. ' +
+        'Use serverBundleCachePath instead. This path stores uploaded server bundles for the node renderer, ' +
+        'not client-side webpack assets from Shakapacker.',
+    );
+    // If serverBundleCachePath is not set, use bundlePath as fallback
+    if (
+      userConfig.bundlePath &&
+      (!config.serverBundleCachePath || config.serverBundleCachePath === defaultConfig.serverBundleCachePath)
+    ) {
+      config.serverBundleCachePath = userConfig.bundlePath;
+    }
+  }
+  if (env.RENDERER_BUNDLE_PATH && !env.RENDERER_SERVER_BUNDLE_CACHE_PATH) {
+    log.warn(
+      'RENDERER_BUNDLE_PATH environment variable is deprecated and will be removed in a future version. ' +
+        'Use RENDERER_SERVER_BUNDLE_CACHE_PATH instead.',
+    );
+  }
+
   config.supportModules = truthy(config.supportModules);
 
   if (config.maxVMPoolSize <= 0 || !Number.isInteger(config.maxVMPoolSize)) {

data/react_on_rails_pro/packages/node-renderer/src/shared/utils.ts

@@ -11,6 +11,8 @@ import type { RenderResult } from '../worker/vm';
 
 export const TRUNCATION_FILLER = '\n... TRUNCATED ...\n';
 
+export const SHUTDOWN_WORKER_MESSAGE = 'NODE_RENDERER_SHUTDOWN_WORKER';
+
 export function workerIdLabel() {
   // eslint-disable-next-line @typescript-eslint/no-unnecessary-condition -- worker is nullable in the primary process
   return cluster?.worker?.id || 'NO WORKER ID';
@@ -155,8 +157,8 @@ export const delay = (milliseconds: number) =>
   });
 
 export function getBundleDirectory(bundleTimestamp: string | number) {
-  const { bundlePath } = getConfig();
-  return path.join(bundlePath, `${bundleTimestamp}`);
+  const { serverBundleCachePath } = getConfig();
+  return path.join(serverBundleCachePath, `${bundleTimestamp}`);
 }
 
 export function getRequestBundleFilePath(bundleTimestamp: string | number) {