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

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/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

data/react_on_rails_pro/sig/react_on_rails_pro/cache.rbs

@@ -0,0 +1,13 @@
+module ReactOnRailsPro
+  class Cache
+    def self.fetch_react_component: (String component_name, Hash[Symbol, untyped] options) { () -> untyped } -> untyped
+
+    def self.use_cache?: (Hash[Symbol, untyped] options) -> bool
+
+    def self.base_cache_key: (String type, ?prerender: bool?) -> Array[String]
+
+    def self.dependencies_cache_key: () -> String?
+
+    def self.react_component_cache_key: (String component_name, Hash[Symbol, untyped] options) -> Array[untyped]
+  end
+end

data/react_on_rails_pro/sig/react_on_rails_pro/configuration.rbs

@@ -0,0 +1,100 @@
+module ReactOnRailsPro
+  class Configuration
+    DEFAULT_RENDERER_URL: String
+    DEFAULT_RENDERER_METHOD: String
+    DEFAULT_RENDERER_FALLBACK_EXEC_JS: bool
+    DEFAULT_RENDERER_HTTP_POOL_SIZE: Integer
+    DEFAULT_RENDERER_HTTP_POOL_TIMEOUT: Integer
+    DEFAULT_RENDERER_HTTP_POOL_WARN_TIMEOUT: Float
+    DEFAULT_SSR_TIMEOUT: Integer
+    DEFAULT_PRERENDER_CACHING: bool
+    DEFAULT_TRACING: bool
+    DEFAULT_DEPENDENCY_GLOBS: Array[String]
+    DEFAULT_EXCLUDED_DEPENDENCY_GLOBS: Array[String]
+    DEFAULT_REMOTE_BUNDLE_CACHE_ADAPTER: nil
+    DEFAULT_RENDERER_REQUEST_RETRY_LIMIT: Integer
+    DEFAULT_THROW_JS_ERRORS: bool
+    DEFAULT_RENDERING_RETURNS_PROMISES: bool
+    DEFAULT_PROFILE_SERVER_RENDERING_JS_CODE: bool
+    DEFAULT_RAISE_NON_SHELL_SERVER_RENDERING_ERRORS: bool
+    DEFAULT_ENABLE_RSC_SUPPORT: bool
+    DEFAULT_RSC_PAYLOAD_GENERATION_URL_PATH: String
+    DEFAULT_RSC_BUNDLE_JS_FILE: String
+    DEFAULT_REACT_CLIENT_MANIFEST_FILE: String
+    DEFAULT_REACT_SERVER_CLIENT_MANIFEST_FILE: String
+
+    attr_accessor renderer_url: String?
+    attr_accessor renderer_password: String?
+    attr_accessor tracing: bool?
+    attr_accessor server_renderer: String?
+    attr_accessor renderer_use_fallback_exec_js: bool?
+    attr_accessor prerender_caching: bool?
+    attr_accessor renderer_http_pool_size: Integer?
+    attr_accessor renderer_http_pool_timeout: Integer?
+    attr_accessor renderer_http_pool_warn_timeout: Float?
+    attr_accessor dependency_globs: Array[String]?
+    attr_accessor excluded_dependency_globs: Array[String]?
+    attr_accessor rendering_returns_promises: bool?
+    attr_accessor remote_bundle_cache_adapter: Module?
+    attr_accessor ssr_pre_hook_js: String?
+    attr_accessor assets_to_copy: Array[String]?
+    attr_accessor renderer_request_retry_limit: Integer?
+    attr_accessor throw_js_errors: bool?
+    attr_accessor ssr_timeout: Integer?
+    attr_accessor profile_server_rendering_js_code: bool?
+    attr_accessor raise_non_shell_server_rendering_errors: bool?
+    attr_accessor enable_rsc_support: bool?
+    attr_accessor rsc_payload_generation_url_path: String?
+    attr_accessor rsc_bundle_js_file: String?
+    attr_accessor react_client_manifest_file: String?
+    attr_accessor react_server_client_manifest_file: String?
+
+    def initialize: (
+      ?renderer_url: String?,
+      ?renderer_password: String?,
+      ?server_renderer: String?,
+      ?renderer_use_fallback_exec_js: bool?,
+      ?prerender_caching: bool?,
+      ?renderer_http_pool_size: Integer?,
+      ?renderer_http_pool_timeout: Integer?,
+      ?renderer_http_pool_warn_timeout: Float?,
+      ?tracing: bool?,
+      ?dependency_globs: Array[String]?,
+      ?excluded_dependency_globs: Array[String]?,
+      ?rendering_returns_promises: bool?,
+      ?remote_bundle_cache_adapter: Module?,
+      ?ssr_pre_hook_js: String?,
+      ?assets_to_copy: Array[String]?,
+      ?renderer_request_retry_limit: Integer?,
+      ?throw_js_errors: bool?,
+      ?ssr_timeout: Integer?,
+      ?profile_server_rendering_js_code: bool?,
+      ?raise_non_shell_server_rendering_errors: bool?,
+      ?enable_rsc_support: bool?,
+      ?rsc_payload_generation_url_path: String?,
+      ?rsc_bundle_js_file: String?,
+      ?react_client_manifest_file: String?,
+      ?react_server_client_manifest_file: String?
+    ) -> void
+
+    def setup_config_values: () -> void
+
+    def check_react_on_rails_support_for_rsc: () -> void
+
+    def setup_execjs_profiler_if_needed: () -> void
+
+    def node_renderer?: () -> bool
+
+    private
+
+    def setup_assets_to_copy: () -> void
+
+    def configure_default_url_if_not_provided: () -> void
+
+    def validate_url: () -> void
+
+    def validate_remote_bundle_cache_adapter: () -> void
+
+    def setup_renderer_password: () -> void
+  end
+end

data/react_on_rails_pro/sig/react_on_rails_pro/error.rbs

@@ -0,0 +1,4 @@
+module ReactOnRailsPro
+  class Error < StandardError
+  end
+end

data/react_on_rails_pro/sig/react_on_rails_pro/utils.rbs

@@ -0,0 +1,7 @@
+module ReactOnRailsPro
+  module Utils
+    def self.bundle_js_file_path: (String bundle_name) -> String
+
+    def self.running_on_windows?: () -> bool
+  end
+end

data/react_on_rails_pro/sig/react_on_rails_pro.rbs

@@ -0,0 +1,5 @@
+module ReactOnRailsPro
+  def self.configure: () { (Configuration) -> void } -> void
+
+  def self.configuration: () -> Configuration
+end

data/react_on_rails_pro/spec/dummy/Gemfile.lock

@@ -9,7 +9,7 @@ GIT
 PATH
   remote: ../../..
   specs:
-    react_on_rails (16.2.0.beta.3)
+    react_on_rails (16.2.0.beta.4)
       addressable
       connection_pool
       execjs (~> 2.5)
@@ -20,14 +20,14 @@ PATH
 PATH
   remote: ../..
   specs:
-    react_on_rails_pro (16.2.0.beta.3)
+    react_on_rails_pro (16.2.0.beta.4)
       addressable
       connection_pool
       execjs (~> 2.9)
       httpx (~> 1.5)
       jwt (~> 2.7)
       rainbow
-      react_on_rails (= 16.2.0.beta.3)
+      react_on_rails (= 16.2.0.beta.4)
 
 GEM
   remote: https://rubygems.org/
@@ -327,6 +327,8 @@ GEM
     rb-fsevent (0.11.2)
     rb-inotify (0.11.1)
       ffi (~> 1.0)
+    rbs (3.9.5)
+      logger
     rdoc (6.12.0)
       psych (>= 4.0.0)
     redis (5.4.0)
@@ -524,6 +526,7 @@ DEPENDENCIES
   pry-theme
   puma (~> 6)
   rails (~> 7.1)
+  rbs
   react_on_rails!
   react_on_rails_pro!
   redis

data/react_on_rails_pro/spec/dummy/client/node-renderer.js

@@ -29,7 +29,7 @@ require('@shakacode-tools/react-on-rails-pro-node-renderer/integrations/sentry')
 
 const config = {
   // This is the default but avoids searching for the Rails root
-  bundlePath: path.resolve(__dirname, '../.node-renderer-bundles'),
+  serverBundleCachePath: path.resolve(__dirname, '../.node-renderer-bundles'),
   port: env.RENDERER_PORT || 3800, // Listen at RENDERER_PORT env value or default port 3800
   logLevel: env.RENDERER_LOG_LEVEL || 'info',