consign 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8c62636b6885f9f8bff11cae0039659e05ce5808744d52fca7afee29d9616183
-  data.tar.gz: 73a23bf8e80a50b3d0f1e12d6323887a761aa5eb8ddb0d2d5ed73fbe93e9c562
+  metadata.gz: 2af068522055eed10550a052dedbe29953fb40fab23ff4dba2cf1c42291de934
+  data.tar.gz: 239717958e5d89627c3afd6d969f5d366cf2845de928dccf09596c21760974c5
 SHA512:
-  metadata.gz: b690e81fe0be9e0dc41a213db28dc094f78dd5a209301b0aabae1c3ce65b37cc0c4b0c5a82b0a68e269fa7be4ca06a61821003a547e608f0e649ff01ac877392
-  data.tar.gz: 5b9f940ceb11132378cd6ded5840a32ce80f015d74019ebd0c6878117f54e15415c8d867b2197030bbfd37b81692ebee14963bd238dd247c841797025c55ea42
+  metadata.gz: 48d13d19846e93b95b618a89c9acd89fe41115f5c041ec44aec93f77d2781c7e2ed33a3d0e2dc6644afa8127498029c1e80d04a8dcf8a381b3de95b942012e9a
+  data.tar.gz: 6800434ea9b2d0bc7d555cf28bb076f880ab015922a78d585989593ebc20066f915df8a52fee2d72f1c9965244bfc61a6df8bec5e335779c1e94766d7ead10b0

data/lib/consign/railtie.rb

@@ -2,9 +2,23 @@ module Consign
   class Railtie < ::Rails::Railtie
     config.before_configuration do
       Consign.api_key = ENV["CONSIGN_API_KEY"]
+    end
 
+    initializer "consign.hosts_and_settings" do |app|
       host = Consign.local_mode ? ".lvh.me" : ".consign.dev"
-      Rails.application.config.hosts << host
+      app.config.hosts << host
+
+      if Rails.env.development?
+        # Allow Action Cable from subdomains
+        cable_origin = Consign.local_mode ? /http:\/\/.*\.lvh\.me/ : /https:\/\/.*\.consign\.dev/
+        app.config.action_cable.allowed_request_origins ||= []
+        app.config.action_cable.allowed_request_origins << cable_origin
+
+        # Allow Web Console to render when accessed via tunnel
+        if app.config.respond_to?(:web_console)
+          app.config.web_console.permissions = "0.0.0.0/0"
+        end
+      end
     end
 
     server do

data/lib/consign/tunnel.rb

@@ -3,6 +3,7 @@ require "net/http"
 require "uri"
 require "json"
 require "openssl"
+require "base64"
 
 module Consign
   class Tunnel
@@ -15,6 +16,7 @@ module Consign
 
     def initialize(port: nil)
       @local_port = port || ENV.fetch("PORT", "3000").to_i
+      @write_mutex = Mutex.new
     end
 
     def start
@@ -104,9 +106,28 @@ module Consign
         Thread.new do
           begin
             response = forward_to_local(req)
-            socket.puts({ id: req['id'], status: response.code.to_i, headers: response.to_hash, body: response.body }.to_json)
+
+            # Sanitize headers and body for UTF-8 to prevent JSON generation/parsing errors
+            headers = response.to_hash.transform_values do |values|
+              values.map { |v| v.to_s.force_encoding("UTF-8").scrub }
+            end
+
+            body = response.body.to_s
+            is_base64 = false
+
+            if !body.dup.force_encoding("UTF-8").valid_encoding?
+              body = Base64.strict_encode64(body)
+              is_base64 = true
+            end
+
+            @write_mutex.synchronize do
+              socket.puts({ id: req['id'], status: response.code.to_i, headers: headers, body: body, base64: is_base64 }.to_json)
+            end
           rescue StandardError => e
-            socket.puts({ id: req['id'], status: 502, headers: {}, body: "Bad Gateway: #{e.message}" }.to_json)
+            log "⚠️  Error handling request #{req['id']}: #{e.message}", :error
+            @write_mutex.synchronize do
+              socket.puts({ id: req['id'], status: 502, headers: {}, body: "Bad Gateway: #{e.message}" }.to_json)
+            end
           end
         end
       end
@@ -144,7 +165,7 @@ module Consign
         attempts = 0
         begin
           yield
-        rescue StandardError => e
+        rescue StandardError
           attempts += 1
           if attempts < max
             sleep RETRY_DELAY

data/lib/consign/version.rb

@@ -1,3 +1,3 @@
 module Consign
-  VERSION = "0.1.1"
+  VERSION = "0.1.2"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: consign
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Consign Team