tina4ruby 3.13.141 → 3.13.143

data/lib/tina4/session_handlers/valkey_handler.rb

@@ -7,14 +7,19 @@
 
 require "json"
 require_relative "resp_client"
+require_relative "resp_session_handler"
 
 module Tina4
   module SessionHandlers
     # Valkey-backed session handler. Valkey speaks the RESP protocol, so it works
     # through the `redis` gem when installed (parity with Python/Node); otherwise
     # it speaks raw RESP over a TCP socket via RespClient — zero dependencies.
-    # Same as RedisHandler but reads VALKEY-prefixed configuration variables.
+    # Same behaviour as RedisHandler (read/write/destroy/cleanup and the
+    # gem-client build come from the shared RespSessionHandler) but reads
+    # VALKEY-prefixed configuration variables.
     class ValkeyHandler
+      include RespSessionHandler
+
       def initialize(options = {})
         @prefix = options[:prefix] || ENV["TINA4_SESSION_VALKEY_PREFIX"] || "tina4:session:"
         # TINA4_SESSION_VALKEY_TTL stays as the valkey-specific override, but it
@@ -29,56 +34,6 @@ module Tina4
         @redis = build_gem_client
         @resp = @redis ? nil : RespClient.new(host: @host, port: @port, password: @password, db: @db)
       end
-
-      def read(session_id)
-        key = "#{@prefix}#{session_id}"
-        data = @redis ? @redis.get(key) : @resp.get(key)
-        return nil unless data
-        JSON.parse(data)
-      rescue JSON::ParserError
-        nil
-      end
-
-      # Write session data. A per-call +ttl+ WINS over the handler default, so
-      # asking for a 60s session really gets 60s; 0 uses the default. Every
-      # handler in every Tina4 framework takes this third argument -- Session#write
-      # passes it, and a handler that did not accept it raised ArgumentError,
-      # which safe_write swallowed into a silent STALE write.
-      #
-      # @param session_id [String] the session id
-      # @param data [Hash] the payload to store
-      # @param ttl [Integer] per-call lifetime in seconds; 0 uses the handler default
-      def write(session_id, data, ttl = 0)
-        key = "#{@prefix}#{session_id}"
-        payload = JSON.generate(data)
-        effective_ttl = ttl.to_i.positive? ? ttl.to_i : @ttl
-        if @redis
-          @redis.setex(key, effective_ttl, payload)
-        else
-          @resp.setex(key, effective_ttl, payload)
-        end
-      end
-
-      def destroy(session_id)
-        key = "#{@prefix}#{session_id}"
-        @redis ? @redis.del(key) : @resp.del(key)
-      end
-
-      def cleanup
-        # Valkey handles TTL automatically (same as Redis)
-      end
-
-      private
-
-      # Use the official `redis` gem (RESP-compatible with Valkey) only when the
-      # REAL gem is loadable; otherwise nil so the caller falls back to raw RESP.
-      def build_gem_client
-        require "redis"
-        return nil unless defined?(::Redis::VERSION)
-        Redis.new(host: @host, port: @port, db: @db, password: @password)
-      rescue LoadError
-        nil
-      end
     end
   end
 end

data/lib/tina4/template.rb

@@ -56,7 +56,11 @@ module Tina4
       end
 
       def globals
-        @globals ||= {}
+        # csp_nonce() is a built-in template global (ADR-0088): a template can
+        # stamp the current response's CSP nonce on an inline <style>/<script>
+        # — <style nonce="{{ csp_nonce() }}">. Matches the Frond engine global
+        # and the value the security middleware names in the CSP header.
+        @globals ||= { "csp_nonce" => -> { Tina4::Csp.current_nonce } }
       end
 
       def add_global(key, value)
@@ -87,7 +91,11 @@ module Tina4
         error_dirs = TEMPLATE_DIRS.map { |d| File.join(Dir.pwd, d, "errors") }
         error_dirs << File.join(File.dirname(__FILE__), "templates", "errors")
 
-        context = { "code" => code }.merge(data.transform_keys(&:to_s))
+        # csp_nonce() (ADR-0088) so the error twigs can carry a nonce on their
+        # inline <style>; render_error builds its own context and does not merge
+        # globals, so inject it here explicitly.
+        context = { "code" => code, "csp_nonce" => -> { Tina4::Csp.current_nonce } }
+                  .merge(data.transform_keys(&:to_s))
 
         error_dirs.each do |dir|
           %w[.twig .html .erb].each do |ext|
@@ -152,7 +160,7 @@ module Tina4
 
       def error_overlay_css(color)
         <<~CSS
-          <style>
+          <style nonce="#{Tina4::Csp.current_nonce}">
           * { box-sizing: border-box; margin: 0; padding: 0; }
           body { font-family: system-ui, -apple-system, sans-serif; background: #0f172a; color: #e2e8f0; min-height: 100vh; display: flex; align-items: center; justify-content: center; }
           .error-card { background: #1e293b; border: 1px solid #334155; border-radius: 1rem; padding: 3rem; text-align: center; max-width: 520px; width: 90%; }

data/lib/tina4/templates/errors/302.twig

@@ -9,6 +9,6 @@
     <div class="spinner"></div>
     <div class="error-title">Redirecting…</div>
     <div class="error-msg">You are being redirected to a new location.</div>
-    <div class="error-path" style="color:var(--primary)">{{ redirect_url }}</div>
+    <div class="error-path c-primary">{{ redirect_url }}</div>
     <a href="{{ redirect_url }}" class="error-home">Click here if not redirected</a>
 {% endblock %}

data/lib/tina4/templates/errors/401.twig

@@ -1,9 +1,9 @@
 {% extends "errors/base.twig" %}
 {% block title %}401 — Unauthorized{% endblock %}
 {% block content %}
-    <div class="error-code" style="color:var(--danger)">401</div>
+    <div class="error-code c-danger">401</div>
     <div class="error-title">Unauthorized</div>
     <div class="error-msg">You need to sign in to access this resource.</div>
-    <div class="error-path" style="color:var(--danger)">{{ path }}</div>
+    <div class="error-path c-danger">{{ path }}</div>
     <a href="/" class="error-home">Go Home</a>
 {% endblock %}

data/lib/tina4/templates/errors/403.twig

@@ -4,7 +4,7 @@
 <meta charset="utf-8">
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <title>403 — Forbidden</title>
-<style>
+<style nonce="{{ csp_nonce() }}">
 * { box-sizing: border-box; margin: 0; padding: 0; }
 body { font-family: system-ui, -apple-system, sans-serif; background: #0f172a; color: #e2e8f0; min-height: 100vh; display: flex; align-items: center; justify-content: center; }
 .error-card { background: #1e293b; border: 1px solid #334155; border-radius: 1rem; padding: 3rem; text-align: center; max-width: 520px; width: 90%; }

data/lib/tina4/templates/errors/404.twig

@@ -4,7 +4,7 @@
 <meta charset="utf-8">
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <title>404 - Not Found</title>
-<style>
+<style nonce="{{ csp_nonce() }}">
 * { box-sizing: border-box; margin: 0; padding: 0; }
 body { font-family: system-ui, -apple-system, sans-serif; background: #0f172a; color: #e2e8f0; min-height: 100vh; display: flex; align-items: center; justify-content: center; }
 .error-card { background: #1e293b; border: 1px solid #334155; border-radius: 1rem; padding: 3rem; text-align: center; max-width: 520px; width: 90%; }

data/lib/tina4/templates/errors/500.twig

@@ -4,7 +4,7 @@
 <meta charset="utf-8">
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <title>500 - Server Error</title>
-<style>
+<style nonce="{{ csp_nonce() }}">
 * { box-sizing: border-box; margin: 0; padding: 0; }
 body { font-family: system-ui, -apple-system, sans-serif; background: #0f172a; color: #e2e8f0; min-height: 100vh; display: flex; align-items: center; justify-content: center; }
 .error-card { background: #1e293b; border: 1px solid #334155; border-radius: 1rem; padding: 3rem; text-align: left; max-width: 700px; width: 90%; }

data/lib/tina4/templates/errors/502.twig

@@ -1,9 +1,9 @@
 {% extends "errors/base.twig" %}
 {% block title %}502 — Bad Gateway{% endblock %}
 {% block content %}
-    <div class="error-code" style="color:var(--danger)">502</div>
+    <div class="error-code c-danger">502</div>
     <div class="error-title">Bad Gateway</div>
     <div class="error-msg">The upstream server returned an invalid response.</div>
-    <div class="error-path" style="color:var(--danger)">{{ path }}</div>
+    <div class="error-path c-danger">{{ path }}</div>
     <a href="/" class="error-home">Go Home</a>
 {% endblock %}

data/lib/tina4/templates/errors/503.twig

@@ -4,9 +4,9 @@
 .error-code { color: var(--warn); }
 {% endblock %}
 {% block content %}
-    <div class="error-code" style="color:var(--warn)">503</div>
+    <div class="error-code c-warn">503</div>
     <div class="error-title">Service Unavailable</div>
     <div class="error-msg">The server is temporarily unavailable. Please try again shortly.</div>
-    <div class="error-path" style="color:var(--warn)">{{ path }}</div>
+    <div class="error-path c-warn">{{ path }}</div>
     <a href="/" class="error-home">Go Home</a>
 {% endblock %}

data/lib/tina4/templates/errors/base.twig

@@ -5,7 +5,7 @@
 <meta name="viewport" content="width=device-width, initial-scale=1.0">
 {% block meta %}{% endblock %}
 <title>{% block title %}Error{% endblock %}</title>
-<style>
+<style nonce="{{ csp_nonce() }}">
 :root {
     --bg: #0f172a; --surface: #1e293b; --border: #334155;
     --text: #e2e8f0; --muted: #94a3b8; --primary: #3b82f6;
@@ -23,6 +23,9 @@ body { font-family: var(--font); background: var(--bg); color: var(--text); min-
 .error-home { display: inline-block; margin-top: 1.5rem; padding: 0.5rem 1.5rem; background: var(--primary); color: #fff; text-decoration: none; border-radius: 0.5rem; font-size: 0.85rem; }
 .error-home:hover { opacity: 0.9; }
 .logo { width: 3rem; height: 3rem; margin-bottom: 1rem; opacity: 0.5; }
+.c-danger { color: var(--danger); }
+.c-warn { color: var(--warn); }
+.c-primary { color: var(--primary); }
 {% block extra_styles %}{% endblock %}
 </style>
 </head>

data/lib/tina4/version.rb

@@ -7,5 +7,5 @@
 
 
 module Tina4
-  VERSION = "3.13.141"
+  VERSION = "3.13.143"
 end

data/lib/tina4/webserver.rb

@@ -126,20 +126,9 @@ module Tina4
       # drains in-flight requests (bounded by TINA4_SHUTDOWN_TIMEOUT).
       Tina4::Shutdown.setup(server: @server)
 
-      # Test port (port + 1000) — stable, no-browser
-      no_ai_port = %w[true 1 yes].include?(ENV.fetch("TINA4_NO_AI_PORT", "").downcase)
-      is_debug   = %w[true 1 yes].include?(ENV.fetch("TINA4_DEBUG", "").downcase)
-
-      if is_debug && !no_ai_port
-        ai_port = @port + 1000
-        begin
-          # Tagged so the pipeline suppresses live reload on this port.
-          @server.listen(@host, ai_port, Tina4::AiPortRackApp.new(@app))
-          puts "  Test Port: http://localhost:#{ai_port} (stable — no hot-reload)"
-        rescue Errno::EADDRINUSE
-          puts "  Test Port: SKIPPED (port #{ai_port} in use)"
-        end
-      end
+      # Test port (port + 1000) — stable, no-browser. Extracted so its bind
+      # rescue stays out of #start's cyclomatic complexity.
+      bind_auxiliary_ai_port
 
       @server.start
 
@@ -156,6 +145,33 @@ module Tina4
       Tina4::PortTakeover.remove_pidfile(@port)
     end
 
+    # Bind the auxiliary AI/test port (main port + 1000), a debug-only, stable,
+    # no-hot-reload sibling of the main port. It is a CONVENIENCE, never
+    # load-bearing: any bind failure here must DEGRADE to no-aux-port and leave
+    # the main server the operator asked for untouched. The rescue used to catch
+    # only Errno::EADDRINUSE, so any OTHER bind failure propagated out of #start
+    # and crashed the whole boot: a transient getaddrinfo/Socket::ResolutionError
+    # on a fresh host under process churn (a measured macOS artifact),
+    # Errno::EADDRNOTAVAIL, Errno::EACCES. Catch the broad bind-failure set
+    # (SocketError covers Socket::ResolutionError; SystemCallError covers every
+    # Errno::*), log LOUD so it is never silent, and carry on main-port only.
+    # Parity with Python (`except OSError`) and PHP (`\Throwable`).
+    def bind_auxiliary_ai_port
+      no_ai_port = %w[true 1 yes].include?(ENV.fetch("TINA4_NO_AI_PORT", "").downcase)
+      is_debug   = %w[true 1 yes].include?(ENV.fetch("TINA4_DEBUG", "").downcase)
+      return unless is_debug && !no_ai_port
+
+      ai_port = @port + 1000
+      # Tagged so the pipeline suppresses live reload on this port.
+      @server.listen(@host, ai_port, Tina4::AiPortRackApp.new(@app))
+      puts "  Test Port: http://localhost:#{ai_port} (stable — no hot-reload)"
+    rescue Errno::EADDRINUSE
+      puts "  Test Port: SKIPPED (port #{ai_port} in use)"
+    rescue SocketError, SystemCallError => e
+      Tina4::Log.error("Test Port: SKIPPED — auxiliary port #{ai_port} bind failed (#{e.class}: #{e.message})")
+      puts "  Test Port: SKIPPED (#{e.class})"
+    end
+
     # Dispatch a Rack-style env through the Tina4 app and return [status, headers, body].
     #
     # Useful for testing and embedding — does not require a running server.

data/lib/tina4/websocket.rb

@@ -691,6 +691,11 @@ module Tina4
 
       Thread.new do
         begin
+          # A large message (a pasted image in a chat, base64 inside JSON) arrives as a first frame with FIN clear,
+          # then CONTINUATION frames (RFC 6455 section 5.4); control frames may come in between. The first piece used
+          # to be emitted as the whole message and the rest ignored. Same design as the Python master (_handle_frame).
+          fragments = nil
+          fragment_opcode = nil
           loop do
             frame = connection.read_frame
             break unless frame
@@ -698,8 +703,26 @@ module Tina4
             connection.touch # mark activity for the idle reaper
 
             case frame[:opcode]
+            when 0x0 # Continuation - a stray one (no message started) is dropped
+              next unless fragments
+              fragments << frame[:data]
+              if frame[:fin]
+                emit(:message, connection, fragments) if fragment_opcode == 0x1
+                fragments = nil
+                fragment_opcode = nil
+              end
             when 0x1 # Text
-              emit(:message, connection, frame[:data])
+              if frame[:fin]
+                emit(:message, connection, frame[:data])
+              else
+                fragments = frame[:data].dup
+                fragment_opcode = 0x1
+              end
+            when 0x2 # Binary - not delivered (as before), but its pieces are one message, never text
+              unless frame[:fin]
+                fragments = frame[:data].dup
+                fragment_opcode = 0x2
+              end
             when 0x8 # Close
               break
             when 0x9 # Ping
@@ -867,6 +890,7 @@ module Tina4
       first_byte = @socket.getbyte
       return nil unless first_byte
 
+      fin = (first_byte & 0x80) != 0
       opcode = first_byte & 0x0F
       second_byte = @socket.getbyte
       return nil unless second_byte
@@ -887,7 +911,7 @@ module Tina4
         data = data.bytes.each_with_index.map { |b, i| b ^ mask_key[i % 4] }.pack("C*")
       end
 
-      { opcode: opcode, data: data }
+      { fin: fin, opcode: opcode, data: data }
     rescue IOError, EOFError
       nil
     end

data/lib/tina4/websocket_backplane.rb

@@ -175,25 +175,28 @@ module Tina4
 
     def subscribe(channel, &block)
       @mutex.synchronize do
-        sid = @nats.subscribe(channel) do |msg|
+        # NATS::Client#subscribe returns a NATS::Subscription. The client's own
+        # #unsubscribe is private in nats-pure 2.x, so we tear a subscription
+        # down through the subscription object, not the client (see #unsubscribe).
+        subscription = @nats.subscribe(channel) do |msg|
           block.call(msg.data) if @running
         end
-        @subs[channel] = sid
-
-        # Run NATS event processing in a background thread
-        @threads[channel] ||= Thread.new do
-          loop do
-            break unless @running
-            sleep 0.01
-          end
-        end
+        @subs[channel] = subscription
+
+        # The NATS client dispatches subscription callbacks on its own reader
+        # thread, so this keeper thread only has to stay alive until unsubscribe
+        # or close kills it. It blocks on an empty queue - nothing is ever
+        # pushed - so it waits at zero CPU. Before, it woke a hundred times a
+        # second on `sleep 0.01` just to re-check @running, burning energy to do
+        # nothing (Carbonah E004).
+        @threads[channel] ||= Thread.new { Thread::Queue.new.pop }
       end
     end
 
     def unsubscribe(channel)
       @mutex.synchronize do
-        sid = @subs.delete(channel)
-        @nats.unsubscribe(sid) if sid
+        subscription = @subs.delete(channel)
+        subscription&.unsubscribe
         thread = @threads.delete(channel)
         thread&.kill
       end
@@ -202,7 +205,7 @@ module Tina4
     def close
       @running = false
       @mutex.synchronize do
-        @subs.each_value { |sid| @nats.unsubscribe(sid) rescue nil }
+        @subs.each_value { |subscription| subscription.unsubscribe rescue nil }
         @subs.clear
         @threads.each_value { |t| t.kill }
         @threads.clear

data/lib/tina4.rb

@@ -12,6 +12,7 @@ require_relative "tina4/constants"
 require_relative "tina4/log"
 require_relative "tina4/debug"  # backward compat alias
 require_relative "tina4/env"
+require_relative "tina4/csp"  # per-response CSP nonce (ADR-0088) — before response
 require_relative "tina4/sqlite_path_resolver"
 require_relative "tina4/row_symbolizer"
 require_relative "tina4/router"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tina4ruby
 version: !ruby/object:Gem::Version
-  version: 3.13.141
+  version: 3.13.143
 platform: ruby
 authors:
 - Tina4 Team
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2026-09-29 00:00:00.000000000 Z
+date: 2026-10-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sqlite3
@@ -212,6 +212,7 @@ files:
 - lib/tina4/context/chunker.rb
 - lib/tina4/cors.rb
 - lib/tina4/crud.rb
+- lib/tina4/csp.rb
 - lib/tina4/database.rb
 - lib/tina4/database/sqlite3_adapter.rb
 - lib/tina4/database_adapter.rb
@@ -311,6 +312,7 @@ files:
 - lib/tina4/queue_backends/lite_backend.rb
 - lib/tina4/queue_backends/mongo_backend.rb
 - lib/tina4/queue_backends/rabbitmq_backend.rb
+- lib/tina4/queue_backends/republish_retry_policy.rb
 - lib/tina4/rack_app.rb
 - lib/tina4/rate_limiter.rb
 - lib/tina4/realtime.rb
@@ -340,6 +342,7 @@ files:
 - lib/tina4/session_handlers/mongo_wire_client.rb
 - lib/tina4/session_handlers/redis_handler.rb
 - lib/tina4/session_handlers/resp_client.rb
+- lib/tina4/session_handlers/resp_session_handler.rb
 - lib/tina4/session_handlers/valkey_handler.rb
 - lib/tina4/shutdown.rb
 - lib/tina4/smtp_client.rb