isomorfeus-transport 2.0.7 → 2.0.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1dc1296b6ffdefe1be0adcb48a10c5ec7311b087963c2ef7c3424917c5e6dbaa
-  data.tar.gz: 31384438ced13457b8962adc9eb965250d657350d9a124bed644212ff4601d6c
+  metadata.gz: bf1dea81493377b7240d5477994ff555232c8820377e00bb82f99e14d0b6bc66
+  data.tar.gz: 2ec26078c4781aaf88230e40897b60d972cb5f7033a13d419f25ef1bd568da03
 SHA512:
-  metadata.gz: '08584ff6f096caa677e4a84aeeaafe3f13d45eb651a982169e96e6b1914e52a27848cd261d22638b2a3b8e10558db848dff54953cebf16492823dd1746dee426'
-  data.tar.gz: cca7c4de44c4c6332fddd24666d6edce0c0f8db66a73d95edbe02813bce7d85c7c6f3ac930d459d0fd303513be267b3da56e63bee3aca54fb7769e4df933af13
+  metadata.gz: ec77b7733bb07f1f78120ffe2fab9a6dc3fa453fada8b040c8cc1d4be33298f81accc8b3eff6f2ece66af7d6163d333c2b165c852b6d1a9e8e6de52f50f2500b
+  data.tar.gz: 7928c27a1ea898df1ca7498d46a8b2c19d3fb08fbde4872de5633a3bea5f26f546cb7a353980a556d34936a9ec6222c81ff9d7a6c28ebc50ae2866a38af263c4

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.7'
+    VERSION = '2.0.11'
   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.