isomorfeus-transport 2.5.5 → 22.9.0.rc2

data/lib/lucid_channel.rb

@@ -0,0 +1,103 @@
+class LucidChannel
+  class << self
+    def inherited(base)
+      Isomorfeus.add_valid_channel_class(base)
+    end
+
+    def subscription_channels
+      @subscription_channels ||= {}
+    end
+
+    def channel(name, options = {})
+      subscription_channels[name.to_s] = options
+    end
+
+    def valid_channel?(name)
+      name = name.to_s
+      subscription_channels.key?(name) || name == self.name
+    end
+
+    def process_message(message, error, channel = nil)
+      channel = self.name unless channel
+      channel = channel.to_s
+      unless valid_channel?(channel)
+        Isomorfeus.raise_error(message: "No such channel '#{channel}' declared for #{self.name}! Cannot process message")
+      end
+      block = subscription_channels[channel][:block]
+      Isomorfeus.raise_error(message: "#{self} received: #{channel} #{message}, but no 'on_message' block defined!") unless block
+      block.call(message, error)
+      nil
+    end
+
+    def on_message(channel = nil, &block)
+      channel = self.name unless channel
+      channel = channel.to_s
+      unless valid_channel?(channel)
+        Isomorfeus.raise_error(message: "No such channel #{channel} declared, please declare it first!")
+      end
+      subscription_channels[channel] = {} unless subscription_channels.key?(channel)
+      subscription_channels[channel][:block] = block
+    end
+
+    def send_message(message, channel = nil)
+      channel = self.name unless channel
+      unless valid_channel?(channel)
+        Isomorfeus.raise_error(message: "No such channel '#{channel}' declared for #{self.name}! Cannot send message")
+      end
+      Isomorfeus::Transport.send_message(self, channel, message)
+    end
+
+    def subscribe(channel = nil)
+      promise_subscribe(channel)
+      nil
+    end
+
+    def promise_subscribe(channel = nil)
+      channel = channel ? channel : self.name
+      Isomorfeus::Transport.promise_subscribe(self.name, channel)
+    end
+
+    def unsubscribe(channel = nil)
+      promise_unsubscribe(channel)
+      nil
+    end
+
+    def promise_unsubscribe(channel = nil)
+      channel = channel ? channel : self.name
+      Isomorfeus::Transport.promise_unsubscribe(self.name, channel)
+    end
+
+    if RUBY_ENGINE == 'opal'
+      def server_subscription_channels; end
+      def server_process_message(message, channel = nil); end
+      def server_on_message(channel = nil, &block); end
+    else
+      def server_is_processing_messages?(channel)
+        return false if server_subscription_channels.empty?
+        return true if server_subscription_channels.key?(channel) && server_subscription_channels[channel].key?(:block)
+        false
+      end
+
+      def server_subscription_channels
+        @server_subscription_channels ||= {}
+      end
+
+      def server_process_message(message, channel = nil)
+        channel = self.name unless channel
+        channel = channel.to_s
+        block = server_subscription_channels[channel][:block]
+        block.call(message)
+      end
+
+      def server_on_message(channel = nil, &block)
+        channel = self.name unless channel
+        channel = channel.to_s
+        unless valid_channel?(channel)
+          Isomorfeus.raise_error(message: "No such channel #{channel} declared, please declare it first!")
+        end
+        server_subscription_channels[channel] = {} unless server_subscription_channels.key?(channel)
+        server_subscription_channels[channel][:block] = block
+      end
+    end
+  end
+end

data/lib/lucid_handler.rb

@@ -0,0 +1,25 @@
+class LucidHandler
+  class << self
+    def inherited(base)
+      Isomorfeus.add_valid_handler_class(base)
+    end
+
+    def on_request(&block)
+      define_method :process_request do |*args|
+        instance_exec(*args, &block)
+      end
+    end
+  end
+
+  def resolving?
+    false
+  end
+
+  def current_user
+    Isomorfeus.current_user
+  end
+
+  def pub_sub_client
+    Isomorfeus.pub_sub_client
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: isomorfeus-transport
 version: !ruby/object:Gem::Version
-  version: 2.5.5
+  version: 22.9.0.rc2
 platform: ruby
 authors:
 - Jan Biedermann
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-06-01 00:00:00.000000000 Z
+date: 2022-09-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -16,28 +16,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 7.0.2
+        version: 7.0.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 7.0.2
+        version: 7.0.3
 - !ruby/object:Gem::Dependency
   name: bcrypt
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.1.16
+        version: 3.1.18
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.1.16
+        version: 3.1.18
 - !ruby/object:Gem::Dependency
   name: brotli
   requirement: !ruby/object:Gem::Requirement
@@ -53,145 +53,117 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 0.4.0
 - !ruby/object:Gem::Dependency
-  name: isomorfeus-iodine
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.7.50
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.7.50
-- !ruby/object:Gem::Dependency
-  name: oj
+  name: concurrent-ruby
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.13.13
+        version: 1.1.10
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.13.13
+        version: 1.1.10
 - !ruby/object:Gem::Dependency
-  name: opal
+  name: isomorfeus-iodine
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.5.0
+        version: 0.8.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.5.0
+        version: 0.8.0
 - !ruby/object:Gem::Dependency
-  name: isomorfeus-asset-manager
+  name: oj
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.14.24
+        version: 3.13.21
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.14.24
+        version: 3.13.21
 - !ruby/object:Gem::Dependency
-  name: isomorfeus-preact
+  name: opal
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 10.7.2
+        version: 1.5.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 10.7.2
-- !ruby/object:Gem::Dependency
-  name: isomorfeus-policy
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 2.5.5
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 2.5.5
+        version: 1.5.1
 - !ruby/object:Gem::Dependency
-  name: isomorfeus-redux
+  name: opal-zeitwerk
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.2.0
+        version: 0.4.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.2.0
+        version: 0.4.1
 - !ruby/object:Gem::Dependency
-  name: isomorfeus-speednode
+  name: rack
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.5.3
+        version: 3.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.5.3
+        version: 3.0.0
 - !ruby/object:Gem::Dependency
-  name: rack
+  name: rackup
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.2.3
+        version: 0.2.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.2.3
+        version: 0.2.2
 - !ruby/object:Gem::Dependency
-  name: sorted_set
+  name: zeitwerk
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.3
+        version: 2.5.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.3
+        version: 2.5.4
 - !ruby/object:Gem::Dependency
   name: zlib
   requirement: !ruby/object:Gem::Requirement
@@ -212,14 +184,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.5.5
+        version: 22.9.0.rc2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.5.5
+        version: 22.9.0.rc2
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -257,46 +229,24 @@ files:
 - LICENSE
 - README.md
 - lib/isomorfeus-transport.rb
+- lib/isomorfeus/core_ext/hash/deep_merge.rb
+- lib/isomorfeus/core_ext/kernel.rb
+- lib/isomorfeus/core_ext/object/deep_dup.rb
+- lib/isomorfeus/core_ext/object/duplicable.rb
 - lib/isomorfeus/transport.rb
 - lib/isomorfeus/transport/client_processor.rb
 - lib/isomorfeus/transport/compressor_rack.rb
 - lib/isomorfeus/transport/config.rb
-- lib/isomorfeus/transport/handler/authentication_handler.rb
-- lib/isomorfeus/transport/imports.rb
 - lib/isomorfeus/transport/middlewares.rb
 - lib/isomorfeus/transport/rack_middleware.rb
 - lib/isomorfeus/transport/request_agent.rb
 - lib/isomorfeus/transport/response_agent.rb
 - lib/isomorfeus/transport/server_processor.rb
 - lib/isomorfeus/transport/server_socket_processor.rb
-- lib/isomorfeus/transport/ssr_login.rb
 - lib/isomorfeus/transport/version.rb
 - lib/isomorfeus/transport/websocket_client.rb
-- lib/lucid_channel/base.rb
-- lib/lucid_channel/mixin.rb
-- lib/lucid_handler/base.rb
-- lib/lucid_handler/mixin.rb
-- node_modules/.package-lock.json
-- node_modules/ws/LICENSE
-- node_modules/ws/README.md
-- node_modules/ws/browser.js
-- node_modules/ws/index.js
-- node_modules/ws/lib/buffer-util.js
-- node_modules/ws/lib/constants.js
-- node_modules/ws/lib/event-target.js
-- node_modules/ws/lib/extension.js
-- node_modules/ws/lib/limiter.js
-- node_modules/ws/lib/permessage-deflate.js
-- node_modules/ws/lib/receiver.js
-- node_modules/ws/lib/sender.js
-- node_modules/ws/lib/stream.js
-- node_modules/ws/lib/subprotocol.js
-- node_modules/ws/lib/validation.js
-- node_modules/ws/lib/websocket-server.js
-- node_modules/ws/lib/websocket.js
-- node_modules/ws/package.json
-- node_modules/ws/wrapper.mjs
-- package.json
+- lib/lucid_channel.rb
+- lib/lucid_handler.rb
 homepage: https://isomorfeus.com
 licenses:
 - MIT
@@ -314,9 +264,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubygems_version: 3.3.7
 signing_key:

data/lib/isomorfeus/transport/handler/authentication_handler.rb

@@ -1,55 +0,0 @@
-module Isomorfeus
-  module Transport
-    module Handler
-      class AuthenticationHandler < LucidHandler::Base
-        TIMEOUT = 30
-
-        on_request do |response_agent|
-          # promise_send_path('Isomorfeus::Transport::Handler::AuthenticationHandler', 'login', user_class_name, user_identifier, user_password)
-          response_agent.request.each_key do |login_or_ssr_login|
-            if login_or_ssr_login == 'login'
-              response_agent.agent_result = { error: 'Authentication failed' }
-              tries = pub_sub_client.instance_variable_get(:@isomorfeus_authentication_tries)
-              tries = 0 unless tries
-              tries += 1
-              sleep(5) if tries > 3 # TODO, this needs a better solution (store data in user/session)
-              Isomorfeus.pub_sub_client.instance_variable_set(:@isomorfeus_authentication_tries, tries)
-              response_agent.request['login'].each_key do |user_class_name|
-                user = nil
-                if Isomorfeus.valid_user_class_name?(user_class_name)
-                  user_class = Isomorfeus.cached_user_class(user_class_name)
-                  user_identifier = response_agent.request['login'][user_class_name].keys.first
-                  promise = user_class.promise_login(user: user_identifier, pass: response_agent.request['login'][user_class_name][user_identifier])
-                  unless promise.realized?
-                    start = Time.now
-                    until promise.realized?
-                      break if (Time.now - start) > TIMEOUT
-                      sleep 0.01
-                    end
-                  end
-                  user = promise.value
-                end
-                if user
-                  session_id = SecureRandom.uuid
-                  session_cookie = "session=#{session_id}; SameSite=Strict; HttpOnly; Path=/; Max-Age=2592000#{'; Secure' if Isomorfeus.production?}"
-                  session_cookie_accessor = SecureRandom.uuid
-                  Isomorfeus.pub_sub_client.instance_variable_set(:@isomorfeus_authentication_tries, nil)
-                  Isomorfeus.session_class.add(session_id: session_id, cookie: session_cookie, user: user, accessor: session_cookie_accessor)
-                  response_agent.agent_result = { success: 'ok', data: user.to_transport, session_cookie_accessor: session_cookie_accessor }
-                end
-              end
-            elsif login_or_ssr_login == 'ssr_login'
-              response_agent.agent_result = { error: 'Authentication failed' }
-              session_id = response_agent.request['ssr_login']
-              user = Isomorfeus.session_class.get_user(session_id: session_id)
-              if user
-                Isomorfeus.pub_sub_client.instance_variable_set(:@isomorfeus_authentication_tries, nil)
-                response_agent.agent_result = { success: 'ok', data: user.to_transport }
-              end
-            end
-          end
-        end
-      end
-    end
-  end
-end

data/lib/isomorfeus/transport/imports.rb

@@ -1,10 +0,0 @@
-module Isomorfeus
-  module Transport
-    module Imports
-      def self.add
-        Isomorfeus.add_ssr_js_import('ws', 'WebSocket')
-        Isomorfeus.add_ssr_ruby_import('isomorfeus/transport/ssr_login')
-      end
-    end
-  end
-end

data/lib/isomorfeus/transport/ssr_login.rb

@@ -1,30 +0,0 @@
-module Isomorfeus
-  module Transport
-    class SsrLogin
-      def self.init
-        session_id = `global.IsomorfeusSessionId`
-        if session_id && session_id.size > 0
-          Isomorfeus::Transport.promise_send_path('Isomorfeus::Transport::Handler::AuthenticationHandler', 'ssr_login', session_id).then do |agent|
-            if agent.processed
-              agent.result
-            else
-              agent.processed = true
-              if agent.response.key?(:success)
-                Isomorfeus.store.dispatch(type: 'DATA_LOAD', data: agent.response[:data])
-                class_name = agent.response[:data].keys.first
-                key = agent.response[:data][class_name].keys.first
-                logged_in_user = Isomorfeus.cached_data_class(class_name).new(key: key)
-                Isomorfeus.set_current_user(logged_in_user)
-              else
-                error = agent.response[:error]
-                Isomorfeus.raise_error(message: "SSR Login failed, #{error}!") # triggers .fail
-              end
-            end
-          end
-        end
-      end
-    end
-  end
-end
-
-Isomorfeus.add_transport_init_class_name('Isomorfeus::Transport::SsrLogin')

data/lib/lucid_channel/base.rb

@@ -1,8 +0,0 @@
-module LucidChannel
-  class Base
-    def self.inherited(base)
-      base.include LucidChannel::Mixin
-      Isomorfeus.add_valid_channel_class(base)
-    end
-  end
-end

data/lib/lucid_channel/mixin.rb

@@ -1,105 +0,0 @@
-module LucidChannel
-  module Mixin
-    def self.included(base)
-      Isomorfeus.add_valid_channel_class(base) unless base == LucidChannel::Base
-
-      base.instance_exec do
-        def subscription_channels
-          @subscription_channels ||= {}
-        end
-
-        def channel(name, options = {})
-          subscription_channels[name.to_s] = options
-        end
-
-        def valid_channel?(name)
-          name = name.to_s
-          subscription_channels.key?(name) || name == self.name
-        end
-
-        def process_message(message, error, channel = nil)
-          channel = self.name unless channel
-          channel = channel.to_s
-          unless valid_channel?(channel)
-            Isomorfeus.raise_error(message: "No such channel '#{channel}' declared for #{self.name}! Cannot process message")
-          end
-          block = subscription_channels[channel][:block]
-          Isomorfeus.raise_error(message: "#{self} received: #{channel} #{message}, but no 'on_message' block defined!") unless block
-          block.call(message, error)
-          nil
-        end
-
-        def on_message(channel = nil, &block)
-          channel = self.name unless channel
-          channel = channel.to_s
-          unless valid_channel?(channel)
-            Isomorfeus.raise_error(message: "No such channel #{channel} declared, please declare it first!")
-          end
-          subscription_channels[channel] = {} unless subscription_channels.key?(channel)
-          subscription_channels[channel][:block] = block
-        end
-
-        def send_message(message, channel = nil)
-          channel = self.name unless channel
-          unless valid_channel?(channel)
-            Isomorfeus.raise_error(message: "No such channel '#{channel}' declared for #{self.name}! Cannot send message")
-          end
-          Isomorfeus::Transport.send_message(self, channel, message)
-        end
-
-        def subscribe(channel = nil)
-          promise_subscribe(channel)
-          nil
-        end
-
-        def promise_subscribe(channel = nil)
-          channel = channel ? channel : self.name
-          Isomorfeus::Transport.promise_subscribe(self.name, channel)
-        end
-
-        def unsubscribe(channel = nil)
-          promise_unsubscribe(channel)
-          nil
-        end
-
-        def promise_unsubscribe(channel = nil)
-          channel = channel ? channel : self.name
-          Isomorfeus::Transport.promise_unsubscribe(self.name, channel)
-        end
-
-        if RUBY_ENGINE == 'opal'
-          def server_subscription_channels; end
-          def server_process_message(message, channel = nil); end
-          def server_on_message(channel = nil, &block); end
-        else
-          def server_is_processing_messages?(channel)
-            return false if server_subscription_channels.empty?
-            return true if server_subscription_channels.key?(channel) && server_subscription_channels[channel].key?(:block)
-            false
-          end
-
-          def server_subscription_channels
-            @server_subscription_channels ||= {}
-          end
-
-          def server_process_message(message, channel = nil)
-            channel = self.name unless channel
-            channel = channel.to_s
-            block = server_subscription_channels[channel][:block]
-            block.call(message)
-          end
-
-          def server_on_message(channel = nil, &block)
-            channel = self.name unless channel
-            channel = channel.to_s
-            unless valid_channel?(channel)
-              Isomorfeus.raise_error(message: "No such channel #{channel} declared, please declare it first!")
-            end
-            server_subscription_channels[channel] = {} unless server_subscription_channels.key?(channel)
-            server_subscription_channels[channel][:block] = block
-          end
-        end
-      end
-    end
-  end
-end

data/lib/lucid_handler/base.rb

@@ -1,8 +0,0 @@
-module LucidHandler
-  class Base
-    def self.inherited(base)
-      base.include LucidHandler::Mixin
-      Isomorfeus.add_valid_handler_class(base)
-    end
-  end
-end

data/lib/lucid_handler/mixin.rb

@@ -1,27 +0,0 @@
-module LucidHandler
-  module Mixin
-    def self.included(base)
-      Isomorfeus.add_valid_handler_class(base) unless base == LucidHandler::Base
-
-      base.instance_exec do
-        def on_request(&block)
-          define_method :process_request do |*args|
-            instance_exec(*args, &block)
-          end
-        end
-      end
-    end
-
-    def resolving?
-      false
-    end
-
-    def current_user
-      Isomorfeus.current_user
-    end
-
-    def pub_sub_client
-      Isomorfeus.pub_sub_client
-    end
-  end
-end