homura-runtime 0.2.25 → 0.2.27

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: aa815fa7e02b0f798dd69003008576f264eb3a0e2532805a729fee6f4a5aca6b
-  data.tar.gz: e8af4871e543adc2ef6c6d8751272111c102987345ea6526ad1fa0e6e2192db8
+  metadata.gz: 17f9647265dd18252adf1bcfc4f73951db2b8c3300bf8e8fceb2e4a28d18ddd0
+  data.tar.gz: 0af103cb85483f3d2ecc3164579c0d8b784c2c0ece8cc8d584dd50735796cbb2
 SHA512:
-  metadata.gz: c6f04b2b77f82131dd45148ff7d8467e0093ed005f49269ab2a2a37ab96ad957e6abd264c302331d37a4a95ac84885d9eef3882e51422fec7f6ed2f30aca25b1
-  data.tar.gz: ff80cbfcbc5b699eed8c7f79c1da2b40aab678163185b0471ec269c7fe55db06d14515aaa22ece20bbff019ff754bc38d398c3a812ea33a2df3716fbea395716
+  metadata.gz: 911fee8fad91bdf26588b4f926c2edcae0d6f523dd43dfc571c8767a53acfc9b03214041e8f840d248072e16888cf3841dcb6ab67ae1d10d10b7d6f31772219d
+  data.tar.gz: 6c39b38063e532c3206ab0ebe027c234654908161d7e25934f618e26ebcd3efacd4b15a5baf2642e9f7d11cfec50d2e9ad40979c9b5ea0a89511d88547cb341e

data/CHANGELOG.md

@@ -1,5 +1,30 @@
 # Changelog
 
+## 0.2.27 (2026-04-29)
+
+- `Rack::Handler::CloudflareWorkers.run` now goes through
+  `ensure_dispatcher_installed!` instead of duplicating the JS
+  install snippet. Single source of truth for the dispatcher
+  installation; `@dispatcher_installed` correctly tracks the state
+  even when `run` is the first caller. Functionally identical from
+  the user's point of view (dispatcher ends up in `globalThis`
+  either way) — Copilot review on PR #34 spotted the duplication.
+
+## 0.2.26 (2026-04-29)
+
+- `Rack::Handler::CloudflareWorkers#call`: when `@app` is nil, fall
+  back to `Sinatra::CloudflareWorkers.ensure_rack_app!` to discover
+  the Sinatra app lazily on the first fetch. This is what lets
+  classic-style apps omit the trailing `run Sinatra::Application`
+  line (paired with `sinatra-homura >= 0.2.23`).
+- New `Rack::Handler::CloudflareWorkers.ensure_dispatcher_installed!`:
+  eagerly registers the JS-side dispatcher (`globalThis.__HOMURA_RACK_DISPATCH__`)
+  at script-load time, so a fetch arriving before `run` was called
+  still routes into our `call` method (where the lazy app discovery
+  above kicks in). On Workers `at_exit` is unreliable because the
+  isolate doesn't exit between requests; this eager install is the
+  reliable hook.
+
 ## 0.2.25 (2026-04-29)
 
 - `BuildSupport`: factor `opal_gem_paths` out of the path:-only

data/lib/cloudflare_workers/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module CloudflareWorkers
-  VERSION = '0.2.25'
+  VERSION = '0.2.27'
 end

data/lib/cloudflare_workers.rb

@@ -126,7 +126,7 @@ module Rack
 
       def self.run(app, **_options)
         @app = app
-        install_dispatcher
+        ensure_dispatcher_installed!
         app
       end
 
@@ -134,6 +134,34 @@ module Rack
         @app
       end
 
+      def self.app=(app)
+        @app = app
+      end
+
+      # Eagerly install the JS-side dispatcher so a fetch arriving
+      # before `run` was called (e.g. classic-style apps that omit the
+      # trailing `run Sinatra::Application`) still gets routed into our
+      # `call` method, which can then discover the user's Sinatra app
+      # lazily via `Sinatra::CloudflareWorkers.ensure_rack_app!`. This
+      # is what makes the canonical sinatrarb.com snippet work
+      # verbatim on Workers — `at_exit` is unreliable here because the
+      # isolate never actually exits between fetches.
+      def self.ensure_dispatcher_installed!
+        return true if @dispatcher_installed
+        handler = self
+        `
+          globalThis.__HOMURA_RACK_DISPATCH__ = async function(req, env, ctx, body_text) {
+            return await #{handler}.$call(req, env, ctx, body_text == null ? "" : body_text);
+          };
+          (function () {
+            var g = globalThis;
+            g.__OPAL_WORKERS__ = g.__OPAL_WORKERS__ || {};
+            g.__OPAL_WORKERS__.rack = g.__HOMURA_RACK_DISPATCH__;
+          })();
+        `
+        @dispatcher_installed = true
+      end
+
       # Entry point invoked from the Module Worker (src/worker.mjs) for
       # every fetch event. `js_req` is a Cloudflare Workers Request,
       # `js_env` is the bindings object (D1, KV, R2, secrets...),
@@ -141,7 +169,13 @@ module Rack
       # request body (the worker.mjs front awaits req.text() before
       # handing control to Ruby because Opal runs synchronously).
       def self.call(js_req, js_env, js_ctx, body_text = '')
-        raise '`run app` was never called from user code' if @app.nil?
+        if @app.nil?
+          if defined?(::Sinatra::CloudflareWorkers) &&
+             ::Sinatra::CloudflareWorkers.respond_to?(:ensure_rack_app!)
+            ::Sinatra::CloudflareWorkers.ensure_rack_app!
+          end
+          raise '`run app` was never called from user code, and no Sinatra app was discoverable (define `class App < Sinatra::Base` or use top-level classic Sinatra routes)' if @app.nil?
+        end
 
         env = build_rack_env(js_req, js_env, js_ctx, body_text)
         result = @app.call(env)
@@ -156,18 +190,13 @@ module Rack
       class << self
         private
 
+        # Legacy alias, kept so out-of-tree code calling
+        # `Rack::Handler::CloudflareWorkers.send(:install_dispatcher)`
+        # keeps working. New code should go through
+        # `ensure_dispatcher_installed!` (it's idempotent and tracks
+        # state via `@dispatcher_installed`).
         def install_dispatcher
-          handler = self
-          `
-            globalThis.__HOMURA_RACK_DISPATCH__ = async function(req, env, ctx, body_text) {
-              return await #{handler}.$call(req, env, ctx, body_text == null ? "" : body_text);
-            };
-            (function () {
-              var g = globalThis;
-              g.__OPAL_WORKERS__ = g.__OPAL_WORKERS__ || {};
-              g.__OPAL_WORKERS__.rack = g.__HOMURA_RACK_DISPATCH__;
-            })();
-          `
+          ensure_dispatcher_installed!
         end
 
         # Build a Rack-compliant env Hash from a Cloudflare Workers Request.

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: homura-runtime
 version: !ruby/object:Gem::Version
-  version: 0.2.25
+  version: 0.2.27
 platform: ruby
 authors:
 - Kazuhiro Homma