wrap_it_ruby 0.2.0 → 0.3.1

data/lib/wrap_it_ruby/middleware/websocket_proxy.rb

@@ -0,0 +1,92 @@
+# frozen_string_literal: true
+
+require "async/http/client"
+require "async/http/endpoint"
+
+module WrapItRuby
+  module Middleware
+    # Protocol::HTTP middleware that intercepts WebSocket upgrade requests
+    # BEFORE the Rack adapter, proxying them directly at the HTTP protocol
+    # level. This preserves the Upgrade/Connection headers that Rack strips.
+    #
+    # Must be inserted as Falcon middleware, not as Rack middleware.
+    # For non-WebSocket requests, passes through to the Rack app.
+    #
+    class WebSocketProxy < Protocol::HTTP::Middleware
+      PROXY_PATTERN = %r{\A/_proxy/(?<host>[^/]+)(?<path>/.*)?\z}
+
+      HOP_HEADERS = %w[
+        connection keep-alive proxy-authenticate proxy-authorization
+        te trailers transfer-encoding upgrade
+      ].freeze
+
+      def initialize(app)
+        super(app)
+        @clients = {}
+      end
+
+      def call(request)
+        if websocket?(request) && (match = PROXY_PATTERN.match(request.path))
+          host = match[:host].delete_suffix(".")
+          proxy_websocket(request, host)
+        else
+          super(request)
+        end
+      end
+
+      private
+
+      def websocket?(request)
+        # HTTP/2: protocol pseudo-header
+        if Array(request.protocol).any? { |p| p.casecmp?("websocket") }
+          return true
+        end
+        # HTTP/1.1: Upgrade header
+        if upgrade = request.headers["upgrade"]
+          return Array(upgrade).any? { |u| u.casecmp?("websocket") }
+        end
+        false
+      end
+
+      def proxy_websocket(request, host)
+        # Strip /_proxy/{host} prefix from the path
+        match = PROXY_PATTERN.match(request.path)
+        request.path = match[:path] || "/"
+
+        # Rewrite authority/host to upstream — write_request adds host
+        # from authority automatically, so just delete it from headers.
+        request.authority = host
+        request.headers.delete("host")
+
+        # Set protocol as string (not array) for write_upgrade_body,
+        # and remove upgrade/connection headers to avoid duplicates.
+        request.protocol = "websocket"
+        request.headers.delete("upgrade")
+        request.headers.delete("connection")
+
+        # Rewrite origin
+        if request.headers["origin"]
+          request.headers.delete("origin")
+          request.headers.add("origin", "https://#{host}")
+        end
+
+        client = client_for(host)
+        client.call(request)
+      rescue => error
+        $stderr.puts "[ws-proxy] upstream error: #{error.class}: #{error.message}"
+        Protocol::HTTP::Response[502, {}, ["WebSocket proxy error: #{error.message}"]]
+      end
+
+      def client_for(host)
+        # Force HTTP/1.1 — upstream (Traefik/code-server) returns 405
+        # for HTTP/2 WebSocket CONNECT but accepts HTTP/1.1 Upgrade.
+        @clients[host] ||= Async::HTTP::Client.new(
+          Async::HTTP::Endpoint.parse("https://#{host}",
+            alpn_protocols: Async::HTTP::Protocol::HTTP11.names
+          ),
+          retries: 0
+        )
+      end
+    end
+  end
+end

data/lib/wrap_it_ruby/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module WrapItRuby
-  VERSION = "0.2.0"
+  VERSION = "0.3.1"
 end

data/lib/wrap_it_ruby.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
-require "wrap_it_ruby/version"
-require "wrap_it_ruby/engine"
+require 'wrap_it_ruby/version'
+require 'wrap_it_ruby/engine'
 
 module WrapItRuby
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: wrap_it_ruby
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.1
 platform: ruby
 authors:
 - Nathan Kidd
@@ -105,10 +105,14 @@ files:
 - Rakefile
 - app/assets/javascripts/wrap_it_ruby/interception.js
 - app/assets/stylesheets/wrap_it_ruby/application.css
+- app/controllers/wrap_it_ruby/menu_settings_controller.rb
 - app/controllers/wrap_it_ruby/proxy_controller.rb
 - app/helpers/wrap_it_ruby/iframe_helper.rb
 - app/helpers/wrap_it_ruby/menu_helper.rb
 - app/javascript/wrap_it_ruby/controllers/iframe_proxy_controller.js
+- app/javascript/wrap_it_ruby/controllers/sortable_tree_controller.js
+- app/views/wrap_it_ruby/menu_settings/_tree.html.erb
+- app/views/wrap_it_ruby/menu_settings/index.html.erb
 - app/views/wrap_it_ruby/proxy/show.html.ruby
 - config/importmap.rb
 - config/routes.rb
@@ -119,6 +123,7 @@ files:
 - lib/wrap_it_ruby/middleware/proxy_middleware.rb
 - lib/wrap_it_ruby/middleware/root_relative_proxy_middleware.rb
 - lib/wrap_it_ruby/middleware/script_injection_middleware.rb
+- lib/wrap_it_ruby/middleware/websocket_proxy.rb
 - lib/wrap_it_ruby/version.rb
 - lib/wrap_it_ruby/version.rb.erb
 homepage: https://github.com/n-at-han-k/wrap-it-ruby