homura-runtime 0.2.25 → 0.2.26

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: aa815fa7e02b0f798dd69003008576f264eb3a0e2532805a729fee6f4a5aca6b
-  data.tar.gz: e8af4871e543adc2ef6c6d8751272111c102987345ea6526ad1fa0e6e2192db8
+  metadata.gz: 961609130fd819224d263b877755bd615b98c27ec2677bb3842aaeeed13a131b
+  data.tar.gz: 4412446fe4defcfb5e65cbafc19f53c2bbdb7461a5e835a2a7fa7a09bf6da38e
 SHA512:
-  metadata.gz: c6f04b2b77f82131dd45148ff7d8467e0093ed005f49269ab2a2a37ab96ad957e6abd264c302331d37a4a95ac84885d9eef3882e51422fec7f6ed2f30aca25b1
-  data.tar.gz: ff80cbfcbc5b699eed8c7f79c1da2b40aab678163185b0471ec269c7fe55db06d14515aaa22ece20bbff019ff754bc38d398c3a812ea33a2df3716fbea395716
+  metadata.gz: 36b7a90afec547e760a751bf2dcfe1a3ef5a9718d64f31d00d740f9715291a5ce869c9845d3fe7d8b5aa6f99f9787254d77d4197a20fc0095106dcc6bc6959a1
+  data.tar.gz: fa08804d6bfcc39032f75889de9066105c46ceccecb7c91a9b2126bffe8db05af8ccf3dfaf02d6da9795cae82dbc987a55a61e86cf676a1aff8a06a3de342ef8

data/CHANGELOG.md

@@ -1,5 +1,20 @@
 # Changelog
 
+## 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.26'
 end

data/lib/cloudflare_workers.rb

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

metadata

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