react_on_rails_pro 16.3.0.rc.1 → 16.3.0.rc.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9bcbae8e9b968c6c6b8b9f707f9c7595015c56af77c29e3b0c069063469bd812
-  data.tar.gz: a084d5851b315254056a147320f70c14a2052fe5c4dee0244171d0281ae75053
+  metadata.gz: cc236969b444c2c9f738559fd9a3e950c99ad2270916493938cf41fc336ba8bb
+  data.tar.gz: 2d11cd0f177d4a970c3304b9a039a9e4a9b8b0d4f5bff14c701f18e30636aa7a
 SHA512:
-  metadata.gz: 0a5a0c698d58a49260e31acd91ac9cc8d7135229e838dd890df0aa415bec027a39db2afaee1257218fecf0e85c82c468b9d37bd92b5a27abbbd78bc16ce2500f
-  data.tar.gz: 520c471a7c2bbd168664f2d719d1ca3e8dd1e8d028d8bc2b8ebadccd1fe633cf6bdfa3e9bb4adca916d351ecf22f42ddc58db00fe6976353913700ed16ecc393
+  metadata.gz: e7bd44d3915dc10bcfb2c26b46c20400e617273f666ab556e038ad336a6fc041cb783c30bf2d10cce509712cf6c6708fc3fdceb5af16c8d523ca28bd2ee184c7
+  data.tar.gz: f750769c29e546b39798de80bf16caa6adf1f707ed329d791cd56f38b8c6806afe8485a0be5e16adb245ffaf7c81d5d8aee2fcc502c2b0c5ff436ce636602637

data/CHANGELOG.md

@@ -25,6 +25,7 @@ Changes since the last non-beta release.
 
 ### Added
 
+- **Multiple License Plan Types**: License validation now supports multiple plan types beyond "paid": `startup`, `nonprofit`, `education`, `oss`, and `partner`. Non-paid plan types are displayed in the license validation success message (e.g., "License validated successfully (startup license)."). Includes thread-safe caching for plan type retrieval via `LicenseValidator.license_plan`. [PR 2334](https://github.com/shakacode/react_on_rails/pull/2334) by [justin808](https://github.com/justin808).
 - **Node Renderer Master/Worker Exports**: Added public `master` and `worker` exports to `react-on-rails-pro-node-renderer` package, allowing users to import from `react-on-rails-pro-node-renderer/master` and `react-on-rails-pro-node-renderer/worker`. [PR 2326](https://github.com/shakacode/react_on_rails/pull/2326) by [justin808](https://github.com/justin808).
 
 ## [16.2.0] - 2026-01-14

data/CONTRIBUTING.md

@@ -119,7 +119,7 @@ script/ci-changes-detector origin/master
 - Push Pro changes without testing locally first
 - Modify both Pro and main gem without running full tests
 
-For comprehensive CI documentation, see [`../docs/CI_OPTIMIZATION.md`](../docs/CI_OPTIMIZATION.md) in the repository root.
+For comprehensive CI documentation, see [`../docs/contributor-info/ci-optimization.md`](../docs/contributor-info/ci-optimization.md) in the repository root.
 
 # IDE/Editor Setup
 

data/Gemfile.lock

@@ -9,7 +9,7 @@ GIT
 PATH
   remote: ..
   specs:
-    react_on_rails (16.3.0.rc.1)
+    react_on_rails (16.3.0.rc.2)
       addressable
       connection_pool
       execjs (~> 2.5)
@@ -20,7 +20,7 @@ PATH
 PATH
   remote: .
   specs:
-    react_on_rails_pro (16.3.0.rc.1)
+    react_on_rails_pro (16.3.0.rc.2)
       addressable
       async (>= 2.6)
       connection_pool
@@ -29,7 +29,7 @@ PATH
       httpx (~> 1.5)
       jwt (~> 2.7)
       rainbow
-      react_on_rails (= 16.3.0.rc.1)
+      react_on_rails (= 16.3.0.rc.2)
 
 GEM
   remote: https://rubygems.org/

data/docs/caching.md

@@ -114,7 +114,7 @@ The reasons "why" and "why not" are the same as for basic Rails fragment caching
 ### Considerations for Determining Your Cache Key
 
 1. Consult the [Rails docs for cache keys](http://guides.rubyonrails.org/caching_with_rails.html#cache-keys) for help with cache key definitions.
-2. If your React code depends on any values from the [Rails Context](https://github.com/shakacode/react_on_rails/blob/master/docs/core-concepts/render-functions-and-railscontext.md#rails-context), such as the `locale` or the URL `location`, then be sure to include such values in your cache key. In other words, if you are using some JavaScript such as `react-router` that depends on your URL, or on a call to `toLocalString(locale)`, then be sure to include such values in your cache key. To find the values that React on Rails uses, use some code like this:
+2. If your React code depends on any values from the [Rails Context](../../docs/core-concepts/render-functions-and-railscontext.md#rails-context), such as the `locale` or the URL `location`, then be sure to include such values in your cache key. In other words, if you are using some JavaScript such as `react-router` that depends on your URL, or on a call to `toLocalString(locale)`, then be sure to include such values in your cache key. To find the values that React on Rails uses, use some code like this:
 
 ```ruby
 the_rails_context = rails_context

data/docs/home-pro.md

@@ -1,6 +1,6 @@
 # React on Rails Pro
 
-Node rendering and caching performance enhancements for [React on Rails](https://github.com/shakacode/react_on_rails). Now supports React 18 with updates to React on Rails! Check the [React on Rails CHANGELOG.md](https://github.com/shakacode/react_on_rails/blob/master/CHANGELOG.md) for details and the updates to the [loadable-components instructions](https://github.com/shakacode/react_on_rails_pro/blob/master/docs/code-splitting-loadable-components.md).
+Node rendering and caching performance enhancements for [React on Rails](https://github.com/shakacode/react_on_rails). Now supports React 18 with updates to React on Rails! Check the [React on Rails CHANGELOG.md](https://github.com/shakacode/react_on_rails/blob/master/CHANGELOG.md) for details and the updates to the [loadable-components instructions](./code-splitting-loadable-components.md).
 
 ## Getting Started
 
@@ -39,7 +39,7 @@ See [docs/caching](./caching.md) for more details.
 
 Suppose you detect that some library used in server-rendering is leaking state between calls to server render. In that case, you can set the `config.ssr_pre_hook_js` in your `config/initializers/react_on_rails_pro.rb` to run some JavaScript to clear the globally leaked state at the beginning of each call to server render.
 
-For more details, see [Rails Configuration](https://github.com/shakacode/react_on_rails/blob/master/docs/configuration/configuration.md).
+For more details, see [Rails Configuration](../../docs/configuration/configuration.md).
 
 ### React On Rails Pro Node Renderer
 

data/docs/installation.md

@@ -55,7 +55,7 @@ echo "your-license-token-here" > config/react_on_rails_pro_license.key
 
 ⚠️ **Security Warning**: Never commit your license token to version control. Add `config/react_on_rails_pro_license.key` to your `.gitignore`. For production, use environment variables or secure secret management systems (Rails credentials, Heroku config vars, AWS Secrets Manager, etc.).
 
-For complete license setup instructions, see [LICENSE_SETUP.md](../LICENSE_SETUP.md).
+For complete license setup instructions, see [LICENSE_SETUP.md](https://github.com/shakacode/react_on_rails/blob/master/react_on_rails_pro/LICENSE_SETUP.md).
 
 ## Rails Configuration
 

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

@@ -89,3 +89,75 @@ And add this line to your `scripts` section of `package.json`
 ```
 
 `yarn start` will run the renderer.
+
+## Custom Fastify Configuration
+
+For advanced use cases, you can customize the Fastify server instance by importing the `master` and `worker` modules directly. This is useful for:
+
+- Adding custom routes (e.g., `/health` for container health checks)
+- Registering Fastify plugins
+- Adding custom hooks for logging or monitoring
+
+### Adding a Health Check Endpoint
+
+When running the node-renderer in Docker or Kubernetes, you may need a `/health` endpoint for container health checks:
+
+```js
+import masterRun from 'react-on-rails-pro-node-renderer/master';
+import run, { configureFastify } from 'react-on-rails-pro-node-renderer/worker';
+import cluster from 'cluster';
+
+const config = {
+  // Your configuration options here
+};
+
+// Register a custom health check route
+configureFastify((app) => {
+  app.get('/health', (request, reply) => {
+    reply.send({ status: 'ok' });
+  });
+});
+
+// The node-renderer uses Node.js cluster module to fork worker processes.
+// The primary process manages workers; workers handle HTTP requests.
+if (cluster.isPrimary) {
+  masterRun(config);
+} else {
+  run(config);
+}
+```
+
+### Registering Fastify Plugins
+
+You can also register Fastify plugins. This example assumes you're using the same cluster setup pattern shown above:
+
+```js
+// In the worker branch of your cluster setup (see example above)
+import run, { configureFastify } from 'react-on-rails-pro-node-renderer/worker';
+import cors from '@fastify/cors';
+
+configureFastify((app) => {
+  // Register a plugin
+  app.register(cors, {
+    origin: true,
+  });
+});
+
+// Add request logging
+configureFastify((app) => {
+  app.addHook('onRequest', (request, reply, done) => {
+    try {
+      console.log(`Request: ${request.method} ${request.url}`);
+      done();
+    } catch (err) {
+      done(err);
+    }
+  });
+});
+```
+
+> **Note:** The `configureFastify` function must be called before calling `run()`. Multiple callbacks can be registered and will execute in order. You can use `app.ready()` in your callback to ensure all plugins are loaded before performing operations that depend on them.
+
+### API Stability
+
+The `./master` and `./worker` exports provide direct access to the node-renderer internals. While we strive to maintain backwards compatibility, these are considered advanced APIs. If you only need basic configuration, prefer using the standard `reactOnRailsProNodeRenderer` function with the configuration options documented above.

data/docs/updating.md

@@ -179,7 +179,7 @@ echo "your-license-token-here" > config/react_on_rails_pro_license.key
 
 **Where to get your license token:** Contact [justin@shakacode.com](mailto:justin@shakacode.com) if you don't have your license token.
 
-For complete license setup instructions, see [LICENSE_SETUP.md](../LICENSE_SETUP.md).
+For complete license setup instructions, see [LICENSE_SETUP.md](https://github.com/shakacode/react_on_rails/blob/master/react_on_rails_pro/LICENSE_SETUP.md).
 
 ### Verify Migration
 

data/lib/react_on_rails_pro/license_validator.rb

@@ -10,6 +10,12 @@ module ReactOnRailsPro
   class LicenseValidator
     # Valid license plan types.
     # Must match VALID_PLANS in packages/react-on-rails-pro-node-renderer/src/shared/licenseValidator.ts
+    # - paid: Standard commercial license
+    # - startup: Complimentary for qualifying startups
+    # - nonprofit: Complimentary for non-profits
+    # - education: For educational institutions
+    # - oss: For open source projects
+    # - partner: Strategic partners
     VALID_PLANS = %w[paid startup nonprofit education oss partner].freeze
 
     # Plans that require attribution by default (complimentary licenses)
@@ -72,7 +78,7 @@ module ReactOnRailsPro
       end
 
       # Returns the license plan type if available
-      # @return [String, nil] The plan type or nil if not available
+      # @return [String, nil] The plan type (e.g., "paid", "startup") or nil if not available
       def license_plan
         return @license_plan if defined?(@license_plan)
 
@@ -150,21 +156,17 @@ module ReactOnRailsPro
       # Determines the license expiration time from the decoded JWT
       # @return [Time, nil] The expiration time or nil if not available
       def determine_license_expiration
-        license_string = load_license_string
-        return nil unless license_string
-
-        decoded_data = decode_license(license_string)
-        return nil unless decoded_data
-
-        exp = decoded_data["exp"]
-        return nil unless exp
-
-        exp_time = if exp.is_a?(Numeric)
-                     exp.to_i
-                   else
-                     Integer(exp)
-                   end
-        Time.at(exp_time)
+        with_decoded_license do |decoded_data|
+          exp = decoded_data["exp"]
+          return nil unless exp
+
+          exp_time = if exp.is_a?(Numeric)
+                       exp.to_i
+                     else
+                       Integer(exp)
+                     end
+          Time.at(exp_time)
+        end
       rescue ArgumentError, TypeError
         nil
       end
@@ -184,19 +186,29 @@ module ReactOnRailsPro
         org.strip
       end
 
-      # Determines the license plan from the decoded JWT
-      # @return [String, nil] The plan type or nil if not available
+      # Determines the license plan type from the decoded JWT
+      # Returns nil for invalid/unknown plans - validation is handled by check_plan in license_status
+      # @return [String, nil] The plan type or nil if not available/invalid
       def determine_license_plan
+        with_decoded_license do |decoded_data|
+          plan = decoded_data["plan"]
+          return nil unless plan && VALID_PLANS.include?(plan)
+
+          plan
+        end
+      end
+
+      # Helper to load and decode license, yielding decoded data if successful
+      # @yield [Hash] The decoded license data
+      # @return [Object, nil] The block's return value or nil if license unavailable
+      def with_decoded_license
         license_string = load_license_string
         return nil unless license_string
 
         decoded_data = decode_license(license_string)
         return nil unless decoded_data
 
-        plan = decoded_data["plan"]
-        return nil unless plan.is_a?(String) && !plan.strip.empty?
-
-        plan.strip
+        yield decoded_data
       end
 
       # Determines if attribution is required based on license data
@@ -258,7 +270,8 @@ module ReactOnRailsPro
 
       # Checks if the license plan is valid for production use
       # Licenses without a plan field are considered valid (backwards compatibility with old paid licenses)
-      # Valid plans: paid, startup, nonprofit, education, oss, partner
+      # Plans in VALID_PLANS are valid; all other plans (e.g., "free") are invalid
+      # Note: Unknown plan types result in :invalid status, and license_plan returns nil
       # @return [Symbol] :valid or :invalid
       def check_plan(decoded_data)
         plan = decoded_data["plan"]

data/lib/react_on_rails_pro/version.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
 module ReactOnRailsPro
-  VERSION = "16.3.0.rc.1"
+  VERSION = "16.3.0.rc.2"
   PROTOCOL_VERSION = "2.0.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: react_on_rails_pro
 version: !ruby/object:Gem::Version
-  version: 16.3.0.rc.1
+  version: 16.3.0.rc.2
 platform: ruby
 authors:
 - Justin Gordon
@@ -128,14 +128,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 16.3.0.rc.1
+        version: 16.3.0.rc.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 16.3.0.rc.1
+        version: 16.3.0.rc.2
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement