react_on_rails 16.2.0.beta.3 → 16.2.0.beta.8

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) {

data/react_on_rails_pro/packages/node-renderer/src/worker/handleGracefulShutdown.ts

@@ -0,0 +1,49 @@
+import cluster from 'cluster';
+import { FastifyInstance } from './types';
+import { SHUTDOWN_WORKER_MESSAGE } from '../shared/utils';
+import log from '../shared/log';
+
+const handleGracefulShutdown = (app: FastifyInstance) => {
+  const { worker } = cluster;
+  if (!worker) {
+    log.error('handleGracefulShutdown is called on master, expected to call it on worker only');
+    return;
+  }
+
+  let activeRequestsCount = 0;
+  let isShuttingDown = false;
+
+  process.on('message', (msg) => {
+    if (msg === SHUTDOWN_WORKER_MESSAGE) {
+      log.debug('Worker #%d received graceful shutdown message', worker.id);
+      isShuttingDown = true;
+      if (activeRequestsCount === 0) {
+        log.debug('Worker #%d has no active requests, killing the worker', worker.id);
+        worker.destroy();
+      } else {
+        log.debug(
+          'Worker #%d has "%d" active requests, disconnecting the worker',
+          worker.id,
+          activeRequestsCount,
+        );
+        worker.disconnect();
+      }
+    }
+  });
+
+  app.addHook('onRequest', (_req, _reply, done) => {
+    activeRequestsCount += 1;
+    done();
+  });
+
+  app.addHook('onResponse', (_req, _reply, done) => {
+    activeRequestsCount -= 1;
+    if (isShuttingDown && activeRequestsCount === 0) {
+      log.debug('Worker #%d served all active requests and going to be killed', worker.id);
+      worker.destroy();
+    }
+    done();
+  });
+};
+
+export default handleGracefulShutdown;

data/react_on_rails_pro/packages/node-renderer/src/worker/vm.ts

@@ -112,7 +112,7 @@ export async function runInVM(
   filePath: string,
   vmCluster?: typeof cluster,
 ): Promise<RenderResult> {
-  const { bundlePath } = getConfig();
+  const { serverBundleCachePath } = getConfig();
 
   try {
     // Wait for VM creation if it's in progress
@@ -137,7 +137,7 @@ export async function runInVM(
       const workerId = vmCluster?.worker?.id;
       log.debug(`worker ${workerId ? `${workerId} ` : ''}received render request for bundle ${filePath} with code
 ${smartTrim(renderingRequest)}`);
-      const debugOutputPathCode = path.join(bundlePath, 'code.js');
+      const debugOutputPathCode = path.join(serverBundleCachePath, 'code.js');
       log.debug(`Full code executed written to: ${debugOutputPathCode}`);
       await writeFileAsync(debugOutputPathCode, renderingRequest);
     }
@@ -165,7 +165,7 @@ ${smartTrim(renderingRequest)}`);
     if (log.level === 'debug') {
       log.debug(`result from JS:
 ${smartTrim(result)}`);
-      const debugOutputPathResult = path.join(bundlePath, 'result.json');
+      const debugOutputPathResult = path.join(serverBundleCachePath, 'result.json');
       log.debug(`Wrote result to file: ${debugOutputPathResult}`);
       await writeFileAsync(debugOutputPathResult, result);
     }

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

@@ -17,6 +17,7 @@ import type { FastifyInstance, FastifyReply, FastifyRequest } from './worker/typ
 import checkProtocolVersion from './worker/checkProtocolVersionHandler';
 import authenticate from './worker/authHandler';
 import { handleRenderRequest, type ProvidedNewBundle } from './worker/handleRenderRequest';
+import handleGracefulShutdown from './worker/handleGracefulShutdown';
 import {
   errorResponseResult,
   formatExceptionMessage,
@@ -117,7 +118,7 @@ export default function run(config: Partial<Config>) {
   // getConfig():
   buildConfig(config);
 
-  const { bundlePath, logHttpLevel, port, fastifyServerOptions, workersCount } = getConfig();
+  const { serverBundleCachePath, logHttpLevel, port, fastifyServerOptions, workersCount } = getConfig();
 
   const app = fastify({
     http2: useHttp2 as true,
@@ -127,6 +128,8 @@ export default function run(config: Partial<Config>) {
     ...fastifyServerOptions,
   });
 
+  handleGracefulShutdown(app);
+
   // We shouldn't have unhandled errors here, but just in case
   app.addHook('onError', (req, res, err, done) => {
     // Not errorReporter.error so that integrations can decide how to log the errors.
@@ -148,7 +151,7 @@ export default function run(config: Partial<Config>) {
       fileSize: Infinity,
     },
     onFile: async (part) => {
-      const destinationPath = path.join(bundlePath, 'uploads', part.filename);
+      const destinationPath = path.join(serverBundleCachePath, 'uploads', part.filename);
       // TODO: inline here
       await saveMultipartFile(part, destinationPath);
       // eslint-disable-next-line no-param-reassign

data/react_on_rails_pro/packages/node-renderer/tests/helper.ts

@@ -35,23 +35,23 @@ export function getOtherFixtureAsset() {
   return path.resolve(__dirname, `./fixtures/${ASSET_UPLOAD_OTHER_FILE}`);
 }
 
-export function bundlePath(testName: string) {
+export function serverBundleCachePath(testName: string) {
   return path.resolve(__dirname, 'tmp', testName);
 }
 
 export function setConfig(testName: string) {
   buildConfig({
-    bundlePath: bundlePath(testName),
+    serverBundleCachePath: serverBundleCachePath(testName),
   });
 }
 
 export function vmBundlePath(testName: string) {
-  return path.resolve(bundlePath(testName), `${BUNDLE_TIMESTAMP}`, `${BUNDLE_TIMESTAMP}.js`);
+  return path.resolve(serverBundleCachePath(testName), `${BUNDLE_TIMESTAMP}`, `${BUNDLE_TIMESTAMP}.js`);
 }
 
 export function vmSecondaryBundlePath(testName: string) {
   return path.resolve(
-    bundlePath(testName),
+    serverBundleCachePath(testName),
     `${SECONDARY_BUNDLE_TIMESTAMP}`,
     `${SECONDARY_BUNDLE_TIMESTAMP}.js`,
   );
@@ -76,7 +76,7 @@ export function secondaryLockfilePath(testName: string) {
 }
 
 export function uploadedBundleDir(testName: string) {
-  return path.resolve(bundlePath(testName), 'uploads');
+  return path.resolve(serverBundleCachePath(testName), 'uploads');
 }
 
 export function uploadedBundlePath(testName: string) {
@@ -96,11 +96,11 @@ export function uploadedAssetOtherPath(testName: string) {
 }
 
 export function assetPath(testName: string, bundleTimestamp: string) {
-  return path.resolve(bundlePath(testName), bundleTimestamp, ASSET_UPLOAD_FILE);
+  return path.resolve(serverBundleCachePath(testName), bundleTimestamp, ASSET_UPLOAD_FILE);
 }
 
 export function assetPathOther(testName: string, bundleTimestamp: string) {
-  return path.resolve(bundlePath(testName), bundleTimestamp, ASSET_UPLOAD_OTHER_FILE);
+  return path.resolve(serverBundleCachePath(testName), bundleTimestamp, ASSET_UPLOAD_OTHER_FILE);
 }
 
 export async function createUploadedBundle(testName: string) {
@@ -129,7 +129,7 @@ export async function createAsset(testName: string, bundleTimestamp: string) {
 }
 
 export async function resetForTest(testName: string) {
-  await fsExtra.emptyDir(bundlePath(testName));
+  await fsExtra.emptyDir(serverBundleCachePath(testName));
   resetVM();
   setConfig(testName);
 }

data/react_on_rails_pro/packages/node-renderer/tests/testingNodeRendererConfigs.js

@@ -8,7 +8,7 @@ if (fs.existsSync(BUNDLE_PATH)) {
 
 const config = {
   // This is the default but avoids searching for the Rails root
-  bundlePath: BUNDLE_PATH,
+  serverBundleCachePath: BUNDLE_PATH,
   port: env.RENDERER_PORT || 3800, // Listen at RENDERER_PORT env value or default port 3800
   logLevel: env.RENDERER_LOG_LEVEL || 'info',
 

data/react_on_rails_pro/packages/node-renderer/tests/worker.test.ts

@@ -15,14 +15,14 @@ import {
   getFixtureAsset,
   getOtherFixtureAsset,
   createAsset,
-  bundlePath,
+  serverBundleCachePath,
   assetPath,
   assetPathOther,
 } from './helper';
 
 const testName = 'worker';
 const createVmBundleForTest = () => createVmBundle(testName);
-const bundlePathForTest = () => bundlePath(testName);
+const serverBundleCachePathForTest = () => serverBundleCachePath(testName);
 
 const gemVersion = packageJson.version;
 const { protocolVersion } = packageJson;
@@ -41,7 +41,7 @@ describe('worker', () => {
 
   test('POST /bundles/:bundleTimestamp/render/:renderRequestDigest when bundle is provided and did not yet exist', async () => {
     const app = worker({
-      bundlePath: bundlePathForTest(),
+      serverBundleCachePath: serverBundleCachePathForTest(),
     });
 
     const form = formAutoContent({
@@ -69,7 +69,7 @@ describe('worker', () => {
 
   test('POST /bundles/:bundleTimestamp/render/:renderRequestDigest', async () => {
     const app = worker({
-      bundlePath: bundlePathForTest(),
+      serverBundleCachePath: serverBundleCachePathForTest(),
     });
 
     const form = formAutoContent({
@@ -105,7 +105,7 @@ describe('worker', () => {
       await createVmBundleForTest();
 
       const app = worker({
-        bundlePath: bundlePathForTest(),
+        serverBundleCachePath: serverBundleCachePathForTest(),
         password: 'password',
       });
 
@@ -132,7 +132,7 @@ describe('worker', () => {
       await createVmBundleForTest();
 
       const app = worker({
-        bundlePath: bundlePathForTest(),
+        serverBundleCachePath: serverBundleCachePathForTest(),
         password: 'password',
       });
 
@@ -159,7 +159,7 @@ describe('worker', () => {
       await createVmBundleForTest();
 
       const app = worker({
-        bundlePath: bundlePathForTest(),
+        serverBundleCachePath: serverBundleCachePathForTest(),
         password: 'my_password',
       });
 
@@ -187,7 +187,7 @@ describe('worker', () => {
       await createVmBundleForTest();
 
       const app = worker({
-        bundlePath: bundlePathForTest(),
+        serverBundleCachePath: serverBundleCachePathForTest(),
       });
 
       const res = await app
@@ -211,7 +211,7 @@ describe('worker', () => {
     await createAsset(testName, bundleHash);
 
     const app = worker({
-      bundlePath: bundlePathForTest(),
+      serverBundleCachePath: serverBundleCachePathForTest(),
       password: 'my_password',
     });
 
@@ -237,7 +237,7 @@ describe('worker', () => {
     await createAsset(testName, bundleHash);
 
     const app = worker({
-      bundlePath: bundlePathForTest(),
+      serverBundleCachePath: serverBundleCachePathForTest(),
       password: 'my_password',
     });
 
@@ -261,7 +261,7 @@ describe('worker', () => {
   test('post /asset-exists requires targetBundles (protocol version 2.0.0)', async () => {
     await createAsset(testName, String(BUNDLE_TIMESTAMP));
     const app = worker({
-      bundlePath: bundlePathForTest(),
+      serverBundleCachePath: serverBundleCachePathForTest(),
       password: 'my_password',
     });
 
@@ -283,7 +283,7 @@ describe('worker', () => {
     const bundleHash = 'some-bundle-hash';
 
     const app = worker({
-      bundlePath: bundlePathForTest(),
+      serverBundleCachePath: serverBundleCachePathForTest(),
       password: 'my_password',
     });
 
@@ -307,7 +307,7 @@ describe('worker', () => {
     const bundleHashOther = 'some-other-bundle-hash';
 
     const app = worker({
-      bundlePath: bundlePathForTest(),
+      serverBundleCachePath: serverBundleCachePathForTest(),
       password: 'my_password',
     });
 
@@ -334,7 +334,7 @@ describe('worker', () => {
       await createVmBundleForTest();
 
       const app = worker({
-        bundlePath: bundlePathForTest(),
+        serverBundleCachePath: serverBundleCachePathForTest(),
       });
 
       const res = await app
@@ -355,7 +355,7 @@ describe('worker', () => {
       await createVmBundleForTest();
 
       const app = worker({
-        bundlePath: bundlePathForTest(),
+        serverBundleCachePath: serverBundleCachePathForTest(),
       });
 
       const res = await app
@@ -379,7 +379,7 @@ describe('worker', () => {
       await createVmBundleForTest();
 
       const app = worker({
-        bundlePath: bundlePathForTest(),
+        serverBundleCachePath: serverBundleCachePathForTest(),
       });
 
       const res = await app
@@ -400,7 +400,7 @@ describe('worker', () => {
       await createVmBundleForTest();
 
       const app = worker({
-        bundlePath: bundlePathForTest(),
+        serverBundleCachePath: serverBundleCachePathForTest(),
       });
 
       // If package version is 4.0.0, this tests that 4.0.0.rc.1 gets normalized to 4.0.0-rc.1
@@ -426,7 +426,7 @@ describe('worker', () => {
       await createVmBundleForTest();
 
       const app = worker({
-        bundlePath: bundlePathForTest(),
+        serverBundleCachePath: serverBundleCachePathForTest(),
       });
 
       const gemVersionUpperCase = packageJson.version.toUpperCase();
@@ -449,7 +449,7 @@ describe('worker', () => {
       await createVmBundleForTest();
 
       const app = worker({
-        bundlePath: bundlePathForTest(),
+        serverBundleCachePath: serverBundleCachePathForTest(),
       });
 
       const gemVersionWithWhitespace = `  ${packageJson.version}  `;

data/react_on_rails_pro/rakelib/public_key_management.rake

@@ -13,9 +13,9 @@ require "uri"
 #   rake react_on_rails_pro:verify_public_key              # Verify current configuration
 #   rake react_on_rails_pro:public_key_help                # Show help
 
-namespace :react_on_rails_pro do
+namespace :react_on_rails_pro do # rubocop:disable Metrics/BlockLength
   desc "Update the public key for React on Rails Pro license validation"
-  task :update_public_key, [:source] do |_task, args|
+  task :update_public_key, [:source] do |_task, args| # rubocop:disable Metrics/BlockLength
     source = args[:source] || "production"
 
     # Determine the API URL based on the source
@@ -68,7 +68,7 @@ namespace :react_on_rails_pro do
             # ShakaCode's public key for React on Rails Pro license verification
             # The private key corresponding to this public key is held by ShakaCode
             # and is never committed to the repository
-            # Last updated: #{Time.now.utc.strftime("%Y-%m-%d %H:%M:%S UTC")}
+            # Last updated: #{Time.now.utc.strftime('%Y-%m-%d %H:%M:%S UTC')}
             # Source: #{api_url}
             #
             # You can update this public key by running the rake task:
@@ -86,12 +86,13 @@ namespace :react_on_rails_pro do
       puts "✅ Updated Ruby public key: #{ruby_file_path}"
 
       # Update Node/TypeScript public key file
-      node_file_path = File.join(File.dirname(__FILE__), "..", "packages", "node-renderer", "src", "shared", "licensePublicKey.ts")
+      node_file_path = File.join(File.dirname(__FILE__), "..", "packages", "node-renderer", "src", "shared",
+                                 "licensePublicKey.ts")
       node_content = <<~TYPESCRIPT
         // ShakaCode's public key for React on Rails Pro license verification
         // The private key corresponding to this public key is held by ShakaCode
         // and is never committed to the repository
-        // Last updated: #{Time.now.utc.strftime("%Y-%m-%d %H:%M:%S UTC")}
+        // Last updated: #{Time.now.utc.strftime('%Y-%m-%d %H:%M:%S UTC')}
         // Source: #{api_url}
         //
         // You can update this public key by running the rake task:

data/react_on_rails_pro/rakelib/rbs.rake

@@ -0,0 +1,47 @@
+# frozen_string_literal: true
+
+require "open3"
+require "timeout"
+
+# NOTE: Pro package does not include Steep tasks (:steep, :all) as it does not
+# use Steep type checker. Only RBS validation is performed.
+# rubocop:disable Metrics/BlockLength
+namespace :rbs do
+  desc "Validate RBS type signatures"
+  task :validate do
+    require "rbs"
+    require "rbs/cli"
+
+    puts "Validating RBS type signatures..."
+
+    # Use Open3 for better error handling - captures stdout, stderr, and exit status separately
+    # This allows us to distinguish between actual validation errors and warnings
+    # Note: Must use bundle exec even though rake runs in bundle context because
+    # spawned shell commands via Open3.capture3() do NOT inherit bundle context
+    # Wrap in Timeout to prevent hung processes in CI environments (60 second timeout)
+    stdout, stderr, status = Timeout.timeout(60) do
+      Open3.capture3("bundle exec rbs -I sig validate")
+    end
+
+    if status.success?
+      puts "✓ RBS validation passed"
+    else
+      puts "✗ RBS validation failed"
+      puts stdout unless stdout.empty?
+      warn stderr unless stderr.empty?
+      exit 1
+    end
+  end
+
+  desc "Check RBS type signatures (alias for validate)"
+  task check: :validate
+
+  desc "List all RBS files"
+  task :list do
+    sig_files = Dir.glob("sig/**/*.rbs")
+    puts "RBS type signature files:"
+    sig_files.each { |f| puts "  #{f}" }
+    puts "\nTotal: #{sig_files.count} files"
+  end
+end
+# rubocop:enable Metrics/BlockLength