isomorfeus-transport 2.0.8 → 2.0.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ab4b1f12d2e4f8f86744d97301bc46bc61eb9ada2bfbdfd0c67a153012ffe8c9
-  data.tar.gz: d7681201d6ea58d69250d68afd1a3a85bd928ea06657df6f6568ae60e89bf251
+  metadata.gz: dfb989717bad2a539ded3af16503ed5f693636af32b333427743963072610113
+  data.tar.gz: 3bf8e1c7ed7647b81f19c738e4547ff2f04d04c4b0de217c645f46d3f108d484
 SHA512:
-  metadata.gz: b724c1a8f0ff3db0e6dcf60c8fc6b651116b8603edd2d0b806f1f774c017652077abe7c49b63ef4e070b67559b4a0addf057fe4cc1d7eb20b521511d6dee9074
-  data.tar.gz: ca3daa5c4de3b0c0a721bbe23bf9f5c5e7b1e288a57cf30e87ee119bfa945c08cb246cf9b392402804e998d945028b129adbc148d268784a1cb27a2cc05e5a8a
+  metadata.gz: e6371968f720d463006b807925dc1799f2de8ee8f68888c2c888bd9b81a5ef5f011d7f82f8d239508fba390fe965030e61ebe8230bfd994ffef12f1bb1c0173d
+  data.tar.gz: ba702e433883347fc630ac2c9ef916c69aaaa77b9c4834375c8e7fd640429f1167e38d296b9d20825b33b555a837b3561f956a534327918a5650a16a65a9378f

data/lib/isomorfeus/transport/rack_middleware.rb

@@ -16,6 +16,7 @@ module Isomorfeus
           cookie = cookies.detect { |c| c.start_with?('session=') }
           if cookie
             session_id = cookie[8..-1]
+            return [Anonymous.new, nil] if session_id.nil? || session_id.empty?
             user = Isomorfeus.session_store.get_user(session_id: session_id)
             [user, session_id]
           end

data/lib/isomorfeus/transport/version.rb

@@ -1,5 +1,5 @@
 module Isomorfeus
   module Transport
-    VERSION = '2.0.8'
+    VERSION = '2.0.12'
   end
 end

data/lib/isomorfeus/transport/websocket_client.rb

@@ -11,10 +11,14 @@ module Isomorfeus
 
         class SendError < StandardError; end
 
-        def initialize(url, protocols = nil)
+        def initialize(url, protocols = nil, headers = nil)
           @url = url
-          @native_websocket = if protocols
+          @native_websocket = if protocols && headers
+                                `new Opal.global.WebSocket(url, protocols, {headers: #{headers.to_n}})`
+                              elsif protocols
                                 `new Opal.global.WebSocket(url, protocols)`
+                              elsif headers
+                                `new Opal.global.WebSocket(url, {headers: #{headers.to_n}})`
                               else
                                 `new Opal.global.WebSocket(url)`
                               end

data/lib/isomorfeus/transport.rb

@@ -11,7 +11,7 @@ module Isomorfeus
           true
         end
 
-        def promise_connect
+        def promise_connect(session_id = nil)
           promise = Promise.new
           if @socket && @socket.ready_state < 2
             promise.resolve(true)
@@ -24,7 +24,8 @@ module Isomorfeus
           else
             ws_url = "#{Isomorfeus::TopLevel.transport_ws_url}"
           end
-          @socket = Isomorfeus::Transport::WebsocketClient.new(ws_url)
+          headers = (session_id.nil? || session_id.empty?) ? nil : { 'Cookie': "session=#{session_id}" }
+          @socket = Isomorfeus::Transport::WebsocketClient.new(ws_url, nil, headers)
           @socket.on_error do |error|
             if Isomorfeus.on_browser?
               `console.warn('Isomorfeus::Transport: Will try again, but so far error connecting:', error)`

data/node_modules/.package-lock.json

@@ -1,27 +1,27 @@
-{
-  "name": "isomorfeus-transport",
-  "lockfileVersion": 2,
-  "requires": true,
-  "packages": {
-    "node_modules/ws": {
-      "version": "8.2.1",
-      "resolved": "https://registry.npmjs.org/ws/-/ws-8.2.1.tgz",
-      "integrity": "sha512-XkgWpJU3sHU7gX8f13NqTn6KQ85bd1WU7noBHTT8fSohx7OS1TPY8k+cyRPCzFkia7C4mM229yeHr1qK9sM4JQ==",
-      "engines": {
-        "node": ">=10.0.0"
-      },
-      "peerDependencies": {
-        "bufferutil": "^4.0.1",
-        "utf-8-validate": "^5.0.2"
-      },
-      "peerDependenciesMeta": {
-        "bufferutil": {
-          "optional": true
-        },
-        "utf-8-validate": {
-          "optional": true
-        }
-      }
-    }
-  }
-}
+{
+  "name": "isomorfeus-transport",
+  "lockfileVersion": 2,
+  "requires": true,
+  "packages": {
+    "node_modules/ws": {
+      "version": "8.4.2",
+      "resolved": "https://registry.npmjs.org/ws/-/ws-8.4.2.tgz",
+      "integrity": "sha512-Kbk4Nxyq7/ZWqr/tarI9yIt/+iNNFOjBXEWgTb4ydaNHBNGgvf2QHbS9fdfsndfjFlFwEd4Al+mw83YkaD10ZA==",
+      "engines": {
+        "node": ">=10.0.0"
+      },
+      "peerDependencies": {
+        "bufferutil": "^4.0.1",
+        "utf-8-validate": "^5.0.2"
+      },
+      "peerDependenciesMeta": {
+        "bufferutil": {
+          "optional": true
+        },
+        "utf-8-validate": {
+          "optional": true
+        }
+      }
+    }
+  }
+}

data/node_modules/ws/LICENSE

@@ -1,19 +1,19 @@
-Copyright (c) 2011 Einar Otto Stangvik <einaros@gmail.com>
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
+Copyright (c) 2011 Einar Otto Stangvik <einaros@gmail.com>
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.