homura-runtime 0.3.6 → 0.3.8

data/lib/homura/runtime/durable_object.rb

@@ -41,15 +41,17 @@
 # HTTP fetch-style interaction with DO instances, which is enough for
 # counters / session state / rate limiters.
 
-require 'json'
+require "json"
 
 module Cloudflare
   class DurableObjectError < StandardError
     attr_reader :operation, :do_class
     def initialize(message, operation: nil, do_class: nil)
       @operation = operation
-      @do_class  = do_class
-      super("[Cloudflare::DurableObject] class=#{do_class || '?'} op=#{operation || 'fetch'}: #{message}")
+      @do_class = do_class
+      super(
+        "[Cloudflare::DurableObject] class=#{do_class || "?"} op=#{operation || "fetch"}: #{message}"
+      )
     end
   end
 
@@ -136,7 +138,7 @@ module Cloudflare
     # responses — the 101 Response carries its WebSocket in a
     # `.webSocket` property that disappears if we reconstruct the
     # Response via the HTTPResponse wrapper.
-    def fetch_raw(url_or_request, method: 'GET', headers: nil, body: nil)
+    def fetch_raw(url_or_request, method: "GET", headers: nil, body: nil)
       hdrs = headers || {}
       method_str = method.to_s.upcase
       js_headers = Cloudflare::HTTP.ruby_headers_to_js(hdrs)
@@ -152,7 +154,7 @@ module Cloudflare
     # the prefix), so user code can use any pathname it wants as its
     # internal DO command channel. Returns a JS Promise the caller
     # `__await__`s to get a `Cloudflare::HTTPResponse`.
-    def fetch(url_or_request, method: 'GET', headers: nil, body: nil)
+    def fetch(url_or_request, method: "GET", headers: nil, body: nil)
       js_stub = @js
       hdrs = headers || {}
       method_str = method.to_s.upcase
@@ -161,11 +163,12 @@ module Cloudflare
       url_str = url_or_request.to_s
       err_klass = Cloudflare::DurableObjectError
       response_klass = Cloudflare::HTTPResponse
-      do_class_label = 'DurableObjectStub'
+      do_class_label = "DurableObjectStub"
 
       # Single-line IIFE — see `lib/homura/runtime/cache.rb#put`
       # for why Opal can silently drop a multi-line x-string Promise.
-      js_promise = `(async function(stub, url_str, method_str, js_headers, js_body, Kernel, err_klass, do_class_label) { var init = { method: method_str, headers: js_headers }; if (js_body !== null && js_body !== undefined && js_body !== Opal.nil) { init.body = js_body; } var resp; try { resp = await stub.fetch(url_str, init); } catch (e) { Kernel.$raise(err_klass.$new(e && e.message ? e.message : String(e), Opal.hash({ operation: 'stub.fetch', do_class: do_class_label }))); } var text = ''; try { text = await resp.text(); } catch (_) { text = ''; } var hk = []; var hv = []; if (resp.headers && typeof resp.headers.forEach === 'function') { resp.headers.forEach(function(v, k) { hk.push(String(k).toLowerCase()); hv.push(String(v)); }); } return { status: resp.status|0, text: text, hkeys: hk, hvals: hv }; })(#{js_stub}, #{url_str}, #{method_str}, #{js_headers}, #{js_body}, #{Kernel}, #{err_klass}, #{do_class_label})`
+      js_promise =
+        `(async function(stub, url_str, method_str, js_headers, js_body, Kernel, err_klass, do_class_label) { var init = { method: method_str, headers: js_headers }; if (js_body !== null && js_body !== undefined && js_body !== Opal.nil) { init.body = js_body; } var resp; try { resp = await stub.fetch(url_str, init); } catch (e) { Kernel.$raise(err_klass.$new(e && e.message ? e.message : String(e), Opal.hash({ operation: 'stub.fetch', do_class: do_class_label }))); } var text = ''; try { text = await resp.text(); } catch (_) { text = ''; } var hk = []; var hv = []; if (resp.headers && typeof resp.headers.forEach === 'function') { resp.headers.forEach(function(v, k) { hk.push(String(k).toLowerCase()); hv.push(String(v)); }); } return { status: resp.status|0, text: text, hkeys: hk, hvals: hv }; })(#{js_stub}, #{url_str}, #{method_str}, #{js_headers}, #{js_body}, #{Kernel}, #{err_klass}, #{do_class_label})`
 
       js_result = js_promise.__await__
       hkeys = `#{js_result}.hkeys`
@@ -179,39 +182,39 @@ module Cloudflare
       end
 
       response_klass.new(
-        status:  `#{js_result}.status`,
+        status: `#{js_result}.status`,
         headers: h,
-        body:    `#{js_result}.text`,
-        url:     url_str
+        body: `#{js_result}.text`,
+        url: url_str
       )
     end
 
-    def request(path, method: 'GET', headers: nil, body: nil)
+    def request(path, method: "GET", headers: nil, body: nil)
       hdrs = headers ? headers.dup : {}
       request_body = body
       if body.is_a?(Hash) || body.is_a?(Array)
         request_body = body.to_json
-        unless hdrs.key?('content-type') || hdrs.key?('Content-Type')
-          hdrs['content-type'] = 'application/json'
+        unless hdrs.key?("content-type") || hdrs.key?("Content-Type")
+          hdrs["content-type"] = "application/json"
         end
       end
       fetch(path, method: method, headers: hdrs, body: request_body)
     end
 
     def get(path, headers: nil)
-      request(path, method: 'GET', headers: headers)
+      request(path, method: "GET", headers: headers)
     end
 
     def post(path, body = nil, headers: nil)
-      request(path, method: 'POST', headers: headers, body: body)
+      request(path, method: "POST", headers: headers, body: body)
     end
 
     def put(path, body = nil, headers: nil)
-      request(path, method: 'PUT', headers: headers, body: body)
+      request(path, method: "PUT", headers: headers, body: body)
     end
 
     def delete(path, headers: nil)
-      request(path, method: 'DELETE', headers: headers)
+      request(path, method: "DELETE", headers: headers)
     end
   end
 
@@ -251,12 +254,15 @@ module Cloudflare
     # The block must return a Rack-style triple `[status, headers, body]`.
     # `body` may be a String or an object that responds to `to_s`.
     def self.define(class_name, &block)
-      raise ArgumentError, 'define requires a block' unless block
-      raise ArgumentError, 'class_name must be a String' unless class_name.is_a?(String)
+      raise ArgumentError, "define requires a block" unless block
+      unless class_name.is_a?(String)
+        raise ArgumentError, "class_name must be a String"
+      end
       @handlers ||= {}
       # Wrap via define_method so Opal's `# await: true` picks it up as
       # async (same trick Sinatra::Scheduled uses for its jobs).
-      method_name = "__do_handler_#{class_name.gsub(/[^A-Za-z0-9_]/, '_')}".to_sym
+      method_name =
+        "__do_handler_#{class_name.gsub(/[^A-Za-z0-9_]/, "_")}".to_sym
       DurableObjectRequestContext.send(:define_method, method_name, &block)
       unbound = DurableObjectRequestContext.instance_method(method_name)
       DurableObjectRequestContext.send(:remove_method, method_name)
@@ -279,12 +285,17 @@ module Cloudflare
     # class (wired by the exported HomuraCounterDO in
     # src/worker.mjs). Return value is ignored — the runtime doesn't
     # expect a body.
-    def self.define_web_socket_handlers(class_name, on_message: nil, on_close: nil, on_error: nil)
+    def self.define_web_socket_handlers(
+      class_name,
+      on_message: nil,
+      on_close: nil,
+      on_error: nil
+    )
       @ws_handlers ||= {}
       @ws_handlers[class_name] = {
         on_message: on_message,
-        on_close:   on_close,
-        on_error:   on_error
+        on_close: on_close,
+        on_error: on_error
       }.compact
       nil
     end
@@ -303,8 +314,12 @@ module Cloudflare
     def self.dispatch_js(class_name, js_state, js_env, js_request, body_text)
       handler = handler_for(class_name)
       if handler.nil?
-        body = { 'error' => "no Ruby handler for DurableObject class #{class_name}" }.to_json
-        return build_js_response(500, { 'content-type' => 'application/json' }, body)
+        body = {
+          "error" => "no Ruby handler for DurableObject class #{class_name}"
+        }.to_json
+        return(
+          build_js_response(500, { "content-type" => "application/json" }, body)
+        )
       end
 
       state = DurableObjectState.new(js_state)
@@ -334,12 +349,12 @@ module Cloudflare
         [result[0].to_i, result[1] || {}, result[2].to_s]
       elsif result.is_a?(Hash)
         [
-          (result['status'] || result[:status] || 200).to_i,
-          result['headers'] || result[:headers] || {},
-          (result['body'] || result[:body] || '').to_s
+          (result["status"] || result[:status] || 200).to_i,
+          result["headers"] || result[:headers] || {},
+          (result["body"] || result[:body] || "").to_s
         ]
       else
-        [200, { 'content-type' => 'text/plain; charset=utf-8' }, result.to_s]
+        [200, { "content-type" => "text/plain; charset=utf-8" }, result.to_s]
       end
     end
 
@@ -358,7 +373,13 @@ module Cloudflare
     # WebSocket dispatchers — called from the JS DO class's
     # `webSocketMessage` / `webSocketClose` / `webSocketError`
     # methods. Each returns a JS Promise that resolves to undefined.
-    def self.dispatch_ws_message(class_name, js_ws, js_message, js_state, js_env)
+    def self.dispatch_ws_message(
+      class_name,
+      js_ws,
+      js_message,
+      js_state,
+      js_env
+    )
       h = web_socket_handlers_for(class_name)
       return nil if h.nil? || h[:on_message].nil?
       state = DurableObjectState.new(js_state)
@@ -366,7 +387,15 @@ module Cloudflare
       nil
     end
 
-    def self.dispatch_ws_close(class_name, js_ws, code, reason, was_clean, js_state, js_env)
+    def self.dispatch_ws_close(
+      class_name,
+      js_ws,
+      code,
+      reason,
+      was_clean,
+      js_state,
+      js_env
+    )
       h = web_socket_handlers_for(class_name)
       return nil if h.nil? || h[:on_close].nil?
       state = DurableObjectState.new(js_state)
@@ -411,7 +440,7 @@ module Cloudflare
 
     def initialize(js_state)
       @js_state = js_state
-      @storage  = DurableObjectStorage.new(`#{js_state} && #{js_state}.storage`)
+      @storage = DurableObjectStorage.new(`#{js_state} && #{js_state}.storage`)
     end
 
     # Unique id of this DO instance as a hex String.
@@ -442,7 +471,10 @@ module Cloudflare
       js_state = @js_state
       if tags && !tags.empty?
         js_tags = `([])`
-        tags.each { |t| ts = t.to_s; `#{js_tags}.push(#{ts})` }
+        tags.each do |t|
+          ts = t.to_s
+          `#{js_tags}.push(#{ts})`
+        end
         `#{js_state}.acceptWebSocket(#{js_ws}, #{js_tags})`
       else
         `#{js_state}.acceptWebSocket(#{js_ws})`
@@ -455,12 +487,13 @@ module Cloudflare
     # `getWebSockets(tag)`.
     def web_sockets(tag: nil)
       js_state = @js_state
-      js_arr = if tag
-                 ts = tag.to_s
-                 `(#{js_state}.getWebSockets ? #{js_state}.getWebSockets(#{ts}) : [])`
-               else
-                 `(#{js_state}.getWebSockets ? #{js_state}.getWebSockets() : [])`
-               end
+      js_arr =
+        if tag
+          ts = tag.to_s
+          `(#{js_state}.getWebSockets ? #{js_state}.getWebSockets(#{ts}) : [])`
+        else
+          `(#{js_state}.getWebSockets ? #{js_state}.getWebSockets() : [])`
+        end
       out = []
       len = `#{js_arr}.length`
       i = 0
@@ -494,7 +527,7 @@ module Cloudflare
     def put(key, value)
       js = @js
       err_klass = Cloudflare::DurableObjectError
-      js_value = value.nil? ? 'null' : value.to_json
+      js_value = value.nil? ? "null" : value.to_json
       `#{js}.put(#{key.to_s}, #{js_value}).catch(function(e) { #{Kernel}.$raise(#{err_klass}.$new(e && e.message ? e.message : String(e), Opal.hash({ operation: 'storage.put' }))); })`
     end
 
@@ -530,11 +563,12 @@ module Cloudflare
       err_klass = Cloudflare::DurableObjectError
       js_opts = `({})`
       `#{js_opts}.prefix  = #{prefix.to_s}` unless prefix.nil?
-      `#{js_opts}.limit   = #{limit.to_i}`  unless limit.nil?
-      `#{js_opts}.reverse = #{!!reverse}`   unless reverse.nil?
-      `#{js_opts}.start   = #{start.to_s}`  unless start.nil?
+      `#{js_opts}.limit   = #{limit.to_i}` unless limit.nil?
+      `#{js_opts}.reverse = #{!!reverse}` unless reverse.nil?
+      `#{js_opts}.start   = #{start.to_s}` unless start.nil?
       `#{js_opts}.end     = #{end_key.to_s}` unless end_key.nil?
-      js_promise = `#{js}.list(#{js_opts}).catch(function(e) { #{Kernel}.$raise(#{err_klass}.$new(e && e.message ? e.message : String(e), Opal.hash({ operation: 'storage.list' }))); })`
+      js_promise =
+        `#{js}.list(#{js_opts}).catch(function(e) { #{Kernel}.$raise(#{err_klass}.$new(e && e.message ? e.message : String(e), Opal.hash({ operation: 'storage.list' }))); })`
       js_result = js_promise.__await__
       out = {}
       return out if `#{js_result} == null`
@@ -549,7 +583,7 @@ module Cloudflare
   class DurableObjectRequest
     attr_reader :js_request, :body
 
-    def initialize(js_request, body_text = '')
+    def initialize(js_request, body_text = "")
       @js_request = js_request
       @body = body_text.to_s
     end
@@ -566,7 +600,7 @@ module Cloudflare
 
     def path
       u = url
-      return '' if u.nil? || u.empty?
+      return "" if u.nil? || u.empty?
       begin
         # Extract pathname via URL() so relative paths aren't mangled.
         u_str = u
@@ -609,17 +643,37 @@ module Cloudflare
       @request = request
     end
 
-    def storage; @state.storage; end
-    def cf_env; env['cloudflare.env']; end
-    def cf_ctx; env['cloudflare.ctx']; end
+    def storage
+      @state.storage
+    end
+    def cf_env
+      env["cloudflare.env"]
+    end
+    def cf_ctx
+      env["cloudflare.ctx"]
+    end
 
-    def d1; env['cloudflare.DB']; end
-    def db; d1; end
-    def kv; env['cloudflare.KV']; end
-    def bucket; env['cloudflare.BUCKET']; end
-    def ai; Cloudflare::Bindings.ai(env); end
-    def send_email; env['cloudflare.SEND_EMAIL']; end
-    def jobs_queue; env['cloudflare.QUEUE_JOBS']; end
+    def d1
+      env["cloudflare.DB"]
+    end
+    def db
+      d1
+    end
+    def kv
+      env["cloudflare.KV"]
+    end
+    def bucket
+      env["cloudflare.BUCKET"]
+    end
+    def ai
+      Cloudflare::Bindings.ai(env)
+    end
+    def send_email
+      env["cloudflare.SEND_EMAIL"]
+    end
+    def jobs_queue
+      env["cloudflare.QUEUE_JOBS"]
+    end
     def durable_object(name, id_or_name = nil)
       Cloudflare::Bindings.durable_object(env, name, id_or_name)
     end

data/lib/homura/runtime/email.rb

@@ -42,19 +42,30 @@ module Cloudflare
     def send(to:, from:, subject:, text: nil, html: nil, reply_to: nil)
       js = @js
       err_klass = Cloudflare::Email::Error
-      raise Error, 'send_email binding not bound' unless available?
+      raise Error, "send_email binding not bound" unless available?
 
-      raise Error, 'subject is required' if subject.nil? || subject.to_s.strip.empty?
+      if subject.nil? || subject.to_s.strip.empty?
+        raise Error, "subject is required"
+      end
 
       has_text = !(text.nil? || text.to_s.empty?)
       has_html = !(html.nil? || html.to_s.empty?)
-      raise Error, 'text or html is required' unless has_text || has_html
-
-      payload = build_send_payload(to: to, from: from, subject: subject.to_s, text: text, html: html, reply_to: reply_to)
+      raise Error, "text or html is required" unless has_text || has_html
+
+      payload =
+        build_send_payload(
+          to: to,
+          from: from,
+          subject: subject.to_s,
+          text: text,
+          html: html,
+          reply_to: reply_to
+        )
 
       cf = Cloudflare
       # 多行 x-string をメソッド末尾に置くと Opal が Promise を返さない出力になることがあるため return を明示する。
-      return `(async function(binding, payload, Kernel, Err, cf) {
+      return(
+        `(async function(binding, payload, Kernel, Err, cf) {
         try {
           var r = await binding.send(payload);
           if (r == null || r === undefined) {
@@ -73,6 +84,7 @@ module Cloudflare
           Kernel.$raise(Err.$new(msg, Opal.hash({ code: code })));
         }
       })(#{js}, #{payload}, #{Kernel}, #{err_klass}, #{cf})`
+      )
     end
 
     private
@@ -103,7 +115,7 @@ module Cloudflare
     # Returns a JS array: mix of address strings and `{ email, name? }` objects (Workers API shape).
     def normalize_to_js(raw)
       entries = flatten_recipients(raw)
-      raise Error, 'to is empty' if entries.empty?
+      raise Error, "to is empty" if entries.empty?
 
       arr = `([])`
       entries.each do |e|
@@ -113,7 +125,9 @@ module Cloudflare
         when Hash
           js = `({})`
           `#{js}.email = #{e[:email]}`
-          `#{js}.name = #{e[:name].to_s}` if e[:name] && !e[:name].to_s.strip.empty?
+          if e[:name] && !e[:name].to_s.strip.empty?
+            `#{js}.name = #{e[:name].to_s}`
+          end
           `#{arr}.push(#{js})`
         end
       end
@@ -129,9 +143,9 @@ module Cloudflare
         s = raw.strip
         s.empty? ? [] : [s]
       when Hash
-        em = raw[:email] || raw['email']
+        em = raw[:email] || raw["email"]
         return [] if em.nil? || em.to_s.strip.empty?
-        nm = raw[:name] || raw['name']
+        nm = raw[:name] || raw["name"]
         if nm.nil? || nm.to_s.strip.empty?
           [em.to_s.strip]
         else
@@ -162,12 +176,12 @@ module Cloudflare
       case raw
       when String
         s = raw.strip
-        raise Error, 'from address is empty' if s.empty?
+        raise Error, "from address is empty" if s.empty?
         return s
       when Hash
-        em = raw[:email] || raw['email']
-        nm = raw[:name] || raw['name']
-        raise Error, 'from.email is required' if em.nil? || em.to_s.strip.empty?
+        em = raw[:email] || raw["email"]
+        nm = raw[:name] || raw["name"]
+        raise Error, "from.email is required" if em.nil? || em.to_s.strip.empty?
         js = `({})`
         `#{js}.email = #{em.to_s.strip}`
         `#{js}.name = #{nm.to_s}` unless nm.nil? || nm.to_s.strip.empty?

data/lib/homura/runtime/http.rb

@@ -15,7 +15,7 @@
 # goes through `globalThis.fetch`, because Cloudflare Workers does not
 # expose a TCP socket API.
 
-require 'json'
+require "json"
 
 module Cloudflare
   class HTTPError < StandardError
@@ -23,7 +23,7 @@ module Cloudflare
     def initialize(message, url: nil, method: nil)
       @url = url
       @method = method
-      super("[Cloudflare::HTTP] #{method || 'GET'} #{url}: #{message}")
+      super("[Cloudflare::HTTP] #{method || "GET"} #{url}: #{message}")
     end
   end
 
@@ -67,7 +67,7 @@ module Cloudflare
     #
     # The whole response body is awaited and returned as a String.
     # Use `Cloudflare::HTTPResponse#body` to access raw text.
-    def self.fetch(url, method: 'GET', headers: nil, body: nil)
+    def self.fetch(url, method: "GET", headers: nil, body: nil)
       hdrs = headers || DEFAULT_HEADERS
       method_str = method.to_s.upcase
       js_headers = ruby_headers_to_js(hdrs)
@@ -87,7 +87,8 @@ module Cloudflare
       # expression. See the single-line IIFE pattern used in
       # lib/homura/runtime/{cache,queue,durable_object}.rb#put for
       # the alternative that survives either position. (Phase 11B audit.)
-      js_promise = `
+      js_promise =
+        `
         (async function() {
           var init = { method: #{method_str}, headers: #{js_headers}, redirect: 'follow' };
           if (#{js_body} !== nil && #{js_body} != null) { init.body = #{js_body}; }

data/lib/homura/runtime/multipart.rb

@@ -43,12 +43,12 @@ module Cloudflare
   class UploadedFile
     attr_reader :filename, :content_type, :name, :head, :bytes_binstr
 
-    def initialize(filename:, content_type:, name:, head: '', bytes_binstr: '')
+    def initialize(filename:, content_type:, name:, head: "", bytes_binstr: "")
       @filename = filename
-      @content_type = content_type || 'application/octet-stream'
+      @content_type = content_type || "application/octet-stream"
       @name = name
       @head = head
-      @bytes_binstr = bytes_binstr || ''
+      @bytes_binstr = bytes_binstr || ""
     end
 
     # Byte length of the part (not the JS string length — they're the
@@ -100,9 +100,9 @@ module Cloudflare
     def to_h
       {
         filename: @filename,
-        type:     @content_type,
-        name:     @name,
-        head:     @head,
+        type: @content_type,
+        name: @name,
+        head: @head,
         tempfile: self
       }
     end
@@ -127,7 +127,7 @@ module Cloudflare
     def self.parse_boundary(content_type)
       return nil if content_type.nil?
       ct = content_type.to_s
-      return nil unless ct.downcase.include?('multipart/')
+      return nil unless ct.downcase.include?("multipart/")
       # Prefer the quoted form. The quoted value may contain any byte
       # except a literal `"` (RFC 2046 §5.1.1 bans `"` in the value).
       if (m = ct.match(/boundary="([^"]+)"/i))
@@ -151,20 +151,18 @@ module Cloudflare
       return {} if boundary.nil?
       return {} if body_binstr.nil? || body_binstr.empty?
 
-      sep       = '--' + boundary
-      term      = '--' + boundary + '--'
-      sep_line  = sep + CRLF
-      sep_last  = sep + CRLF  # the very first boundary may skip the leading CRLF
-      body      = body_binstr.to_s
+      sep = "--" + boundary
+      term = "--" + boundary + "--"
+      sep_line = sep + CRLF
+      sep_last = sep + CRLF # the very first boundary may skip the leading CRLF
+      body = body_binstr.to_s
 
       # Skip any preamble before the first boundary.
       start_idx = body.index(sep)
       return {} if start_idx.nil?
       cursor = start_idx + sep.length
       # consume possible CRLF right after the first boundary
-      if body[cursor, 2] == CRLF
-        cursor += 2
-      end
+      cursor += 2 if body[cursor, 2] == CRLF
 
       parts = {}
 
@@ -181,28 +179,32 @@ module Cloudflare
         headers_end = part.index(CRLF + CRLF)
         if headers_end
           raw_headers = part[0...headers_end]
-          raw_body    = part[(headers_end + 4)..-1] || ''
+          raw_body = part[(headers_end + 4)..-1] || ""
         else
           raw_headers = part
-          raw_body    = ''
+          raw_body = ""
         end
 
         disposition = nil
-        ctype       = nil
-        raw_headers.split(CRLF).each do |line|
-          name, value = line.split(':', 2)
-          next if name.nil? || value.nil?
-          name = name.strip.downcase
-          value = value.strip
-          case name
-          when 'content-disposition' then disposition = value
-          when 'content-type'        then ctype = value
+        ctype = nil
+        raw_headers
+          .split(CRLF)
+          .each do |line|
+            name, value = line.split(":", 2)
+            next if name.nil? || value.nil?
+            name = name.strip.downcase
+            value = value.strip
+            case name
+            when "content-disposition"
+              disposition = value
+            when "content-type"
+              ctype = value
+            end
           end
-        end
 
         if disposition
-          field_name = extract_disposition_param(disposition, 'name')
-          filename   = extract_disposition_param(disposition, 'filename')
+          field_name = extract_disposition_param(disposition, "name")
+          filename = extract_disposition_param(disposition, "filename")
           if field_name
             if filename && !filename.empty?
               parts[field_name] = UploadedFile.new(
@@ -220,12 +222,8 @@ module Cloudflare
 
         cursor = next_sep + CRLF.length + sep.length
         # Check whether this is the terminator `--boundary--`
-        if body[cursor, 2] == '--'
-          break
-        end
-        if body[cursor, 2] == CRLF
-          cursor += 2
-        end
+        break if body[cursor, 2] == "--"
+        cursor += 2 if body[cursor, 2] == CRLF
       end
 
       parts
@@ -274,14 +272,14 @@ module Cloudflare
     #
     # Called lazily from our patched Rack::Request#POST.
     def self.rack_params(env)
-      cached = env['cloudflare.multipart']
+      cached = env["cloudflare.multipart"]
       return cached if cached
 
-      ct = env['CONTENT_TYPE']
-      return ({}) unless ct && ct.to_s.downcase.include?('multipart/')
+      ct = env["CONTENT_TYPE"]
+      return({}) unless ct && ct.to_s.downcase.include?("multipart/")
 
-      io = env['rack.input']
-      return ({}) if io.nil?
+      io = env["rack.input"]
+      return({}) if io.nil?
 
       # `rack.input` is normally a StringIO wrapping the body_binstr
       # we staged in src/worker.mjs. Read the full body; it's already
@@ -290,14 +288,14 @@ module Cloudflare
       if io.respond_to?(:rewind)
         begin
           io.rewind
-        rescue
+        rescue StandardError
           # some stubs don't support rewind — ignore
         end
       end
-      body = io.respond_to?(:read) ? io.read.to_s : ''
+      body = io.respond_to?(:read) ? io.read.to_s : ""
 
       parsed = parse(body, ct)
-      env['cloudflare.multipart'] = parsed
+      env["cloudflare.multipart"] = parsed
       parsed
     end
   end
@@ -314,15 +312,17 @@ end
 # bespoke Cloudflare::Multipart parser for multipart requests, falling
 # back to the gem implementation for everything else.
 
-require 'rack/request'
+require "rack/request"
 
 module Rack
   class Request
-    alias_method :__homura_original_POST, :POST unless method_defined?(:__homura_original_POST)
+    unless method_defined?(:__homura_original_POST)
+      alias_method :__homura_original_POST, :POST
+    end
 
     def POST
-      ct = env['CONTENT_TYPE']
-      if ct && ct.to_s.downcase.include?('multipart/')
+      ct = env["CONTENT_TYPE"]
+      if ct && ct.to_s.downcase.include?("multipart/")
         ::Cloudflare::Multipart.rack_params(env)
       else
         __homura_original_POST