isomorfeus-transport 2.5.5 → 22.9.0.rc1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 16c005ef83762a989f11a8e850b5b2ff1c10f03a6abf4a3ae55a24e262c90422
-  data.tar.gz: 9871afe7e5dfaa0a934ec45911a6fd45c3d814d88c8535d74413d0480ce0279d
+  metadata.gz: f5c65f1c3f946008bde44c8e04b002cb6b51e5b9a0df8137d16bab6a72948c7c
+  data.tar.gz: 993ea2712d8cf4f825563020155f40175d63b5678e917aaa04ac72efa9a28274
 SHA512:
-  metadata.gz: 4a9702cc66b2426308552d616fbeacc75230cd310a7a0a6bb37cee6ad9401f9b5b4f12ee55526559306526d0d04cc7aabab9498279509c1725195d0e67292e58
-  data.tar.gz: 5367eef720648edc76b41aa8c405a0b4dfb04daa8ff15ce5cf21eda696c1c3b52dbb6e0751a3380fed8aa288c650000c39f017b1f3fd17f948cd04bb22eafd65
+  metadata.gz: 7129f7c878945e52e82887355b7561c24dfbf418b647285f58676494ba4939c8fd5230a4a9afd808bf42e8cb7e03fc5103825ac33a838fdf2e16c03925f19373
+  data.tar.gz: 4dffaf95a186c9c46a8593074aff9dcc6e14daa593b75c195d86469f08340f9876a835ff212c74dde1d920a6a1bb0d4772e14a3170b15354073ec6ef8dc4daa2

data/lib/isomorfeus/core_ext/hash/deep_merge.rb

@@ -0,0 +1,34 @@
+# originally taken from: https://github.com/rails/rails/blob/master/activesupport/lib/active_support/core_ext/hash/deep_merge.rb
+
+class Hash
+  # Returns a new hash with +self+ and +other_hash+ merged recursively.
+  #
+  #   h1 = { a: true, b: { c: [1, 2, 3] } }
+  #   h2 = { a: false, b: { x: [3, 4, 5] } }
+  #
+  #   h1.deep_merge(h2) # => { a: false, b: { c: [1, 2, 3], x: [3, 4, 5] } }
+  #
+  # Like with Hash#merge in the standard library, a block can be provided
+  # to merge values:
+  #
+  #   h1 = { a: 100, b: 200, c: { c1: 100 } }
+  #   h2 = { b: 250, c: { c1: 200 } }
+  #   h1.deep_merge(h2) { |key, this_val, other_val| this_val + other_val }
+  #   # => { a: 100, b: 450, c: { c1: 300 } }
+  def deep_merge(other_hash, &block)
+    dup.deep_merge!(other_hash, &block)
+  end
+
+  # Same as +deep_merge+, but modifies +self+.
+  def deep_merge!(other_hash, &block)
+    merge!(other_hash) do |key, this_val, other_val|
+      if this_val.is_a?(Hash) && other_val.is_a?(Hash)
+        this_val.deep_merge(other_val, &block)
+      elsif block_given?
+        block.call(key, this_val, other_val)
+      else
+        other_val
+      end
+    end
+  end
+end

data/lib/isomorfeus/core_ext/kernel.rb

@@ -0,0 +1,56 @@
+module Kernel
+  def promise(&block)
+    p = Promise.new
+
+    begin
+      result = block.call
+      return p.resolve(result) if result
+    rescue => e
+      return p.reject(e)
+    end
+
+    pr = proc do
+      begin
+        res = block.call
+        res ? p.resolve(res) : after(10, &pr)
+      rescue => e
+        p.reject(e)
+      end
+    end
+
+    after(10, &pr)
+    p
+  end
+
+  if RUBY_ENGINE == 'opal'
+    def on_browser?; true; end
+    def on_desktop?; false; end
+    def on_mobile?; false; end
+    def on_tablet?; false; end
+    def on_tv?; false; end
+    def on_server?; false; end
+
+    def after(time_ms, &block)
+      `setTimeout(#{block.to_n}, time_ms)`
+    end
+
+    # TODO remove before release
+    %x{
+      Opal.s = function() {
+        return Opal.Isomorfeus.store.$get_state().$to_n();
+      }
+    }
+  else
+    def on_browser?; false; end
+    def on_desktop?; false; end
+    def on_mobile?;  false; end
+    def on_tablet?;  false; end
+    def on_tv?;      false; end
+    def on_server?;  true;  end
+
+    def after(time_ms, &block)
+      sleep time_ms/1000
+      block.call
+    end
+  end
+end

data/lib/isomorfeus/core_ext/object/deep_dup.rb

@@ -0,0 +1,53 @@
+# originally taken from: https://github.com/rails/rails/blob/main/activesupport/lib/active_support/core_ext/object/deep_dup.rb
+
+class Object
+  # Returns a deep copy of object if it's duplicable. If it's
+  # not duplicable, returns +self+.
+  #
+  #   object = Object.new
+  #   dup    = object.deep_dup
+  #   dup.instance_variable_set(:@a, 1)
+  #
+  #   object.instance_variable_defined?(:@a) # => false
+  #   dup.instance_variable_defined?(:@a)    # => true
+  def deep_dup
+    duplicable? ? dup : self
+  end
+end
+
+class Array
+  # Returns a deep copy of array.
+  #
+  #   array = [1, [2, 3]]
+  #   dup   = array.deep_dup
+  #   dup[1][2] = 4
+  #
+  #   array[1][2] # => nil
+  #   dup[1][2]   # => 4
+  def deep_dup
+    map(&:deep_dup)
+  end
+end
+
+class Hash
+  # Returns a deep copy of hash.
+  #
+  #   hash = { a: { b: 'b' } }
+  #   dup  = hash.deep_dup
+  #   dup[:a][:c] = 'c'
+  #
+  #   hash[:a][:c] # => nil
+  #   dup[:a][:c]  # => "c"
+  def deep_dup
+    hash = dup
+    each_pair do |key, value|
+      if ::String === key || ::Symbol === key
+        hash[key] = value.deep_dup
+      else
+        hash.delete(key)
+        hash[key.deep_dup] = value.deep_dup
+      end
+    end
+    hash
+  end
+end

data/lib/isomorfeus/core_ext/object/duplicable.rb

@@ -0,0 +1,60 @@
+# originally taken from: https://github.com/rails/rails/blob/main/activesupport/lib/active_support/core_ext/object/duplicable.rb
+
+#--
+# Most objects are cloneable, but not all. For example you can't dup methods:
+#
+#   method(:puts).dup # => TypeError: allocator undefined for Method
+#
+# Classes may signal their instances are not duplicable removing +dup+/+clone+
+# or raising exceptions from them. So, to dup an arbitrary object you normally
+# use an optimistic approach and are ready to catch an exception, say:
+#
+#   arbitrary_object.dup rescue object
+#
+# Rails dups objects in a few critical spots where they are not that arbitrary.
+# That rescue is very expensive (like 40 times slower than a predicate), and it
+# is often triggered.
+#
+# That's why we hardcode the following cases and check duplicable? instead of
+# using that rescue idiom.
+#++
+class Object
+  # Can you safely dup this object?
+  #
+  # False for method objects;
+  # true otherwise.
+  def duplicable?
+    true
+  end
+end
+
+class Method
+  # Methods are not duplicable:
+  #
+  #  method(:puts).duplicable? # => false
+  #  method(:puts).dup         # => TypeError: allocator undefined for Method
+  def duplicable?
+    false
+  end
+end
+
+class UnboundMethod
+  # Unbound methods are not duplicable:
+  #
+  #  method(:puts).unbind.duplicable? # => false
+  #  method(:puts).unbind.dup         # => TypeError: allocator undefined for UnboundMethod
+  def duplicable?
+    false
+  end
+end
+
+require "singleton"
+
+module Singleton
+  # Singleton instances are not duplicable:
+  #
+  # Class.new.include(Singleton).instance.dup # TypeError (can't dup instance of singleton
+  def duplicable?
+    false
+  end
+end

data/lib/isomorfeus/transport/compressor_rack.rb

@@ -11,7 +11,7 @@ module Isomorfeus
 
       def call(env)
         status, headers, body = @app.call(env)
-        headers = Rack::Utils::HeaderHash[headers]
+        headers = Rack::Headers[headers]
 
 
         unless should_deflate?(env, status, headers, body)

data/lib/isomorfeus/transport/config.rb

@@ -1,6 +1,19 @@
 module Isomorfeus
   # available settings
   class << self
+    def add_client_option(key, value = nil)
+      self.class.attr_accessor(key)
+      send("#{key}=", value)
+    end
+
+    def client_init_class_names
+      @client_init_class_names ||= []
+    end
+
+    def add_client_init_class_name(init_class_name)
+      client_init_class_names << init_class_name
+    end
+
     def cached_channel_classes
       @cached_channel_classes ||= {}
     end
@@ -35,6 +48,28 @@ module Isomorfeus
     add_client_option(:transport_init_class_names, [])
 
     class << self
+      attr_accessor :zeitwerk
+
+      # server side env is set in isomorfeus-asset-manager
+      def env=(env_string)
+        @env = env_string ? env_string : 'development'
+        @development = (@env == 'development') ? true : false
+        @production = (@env == 'production') ? true : false
+        @test = (@env == 'test') ? true : false
+      end
+
+      def development?
+        @development
+      end
+
+      def production?
+        @production
+      end
+
+      def test?
+        @test
+      end
+
       def valid_channel_class_name?(class_name)
         cached_channel_class(class_name) # because of autoloader
         valid_channel_class_names.include?(class_name)
@@ -51,6 +86,8 @@ module Isomorfeus
       attr_accessor :api_websocket_path
       attr_accessor :api_logout_path
       attr_accessor :cookie_eater_path
+      attr_accessor :zeitwerk
+      attr_accessor :zeitwerk_lock
 
       def valid_channel_class_name?(class_name)
         valid_channel_class_names.include?(class_name)

data/lib/isomorfeus/transport/rack_middleware.rb

@@ -3,13 +3,9 @@
 module Isomorfeus
   module Transport
     class RackMiddleware
-      WS_RESPONSE = [0, {}, []]
+      WS_RESPONSE = [0, {}, []].freeze
 
-      def initialize(app)
-        @app = app
-      end
-
-      def user_from_env(env)
+      def self.user_from_env(env)
         cookies = env['HTTP_COOKIE']
         if cookies
           cookies = cookies.split('; ')
@@ -25,11 +21,21 @@ module Isomorfeus
         [Anonymous.new, nil]
       end
 
+      def initialize(app)
+        @app = app
+      end
+
       def call(env)
+        unless env['isomorfeus_store_initialized']
+          Isomorfeus.init_store
+          Isomorfeus.store.clear!
+          env['isomorfeus_store_initialized'] = true
+        end
+
         case env['PATH_INFO']
         when Isomorfeus.api_websocket_path
           if env['rack.upgrade?'] == :websocket
-            user, session_id = user_from_env(env)
+            user, session_id = self.class.user_from_env(env)
             env['rack.upgrade'] = Isomorfeus::Transport::ServerSocketProcessor.new(user, session_id)
           end
           WS_RESPONSE
@@ -46,7 +52,7 @@ module Isomorfeus
             [404, {}, ["Must specify relative path!"]]
           end
         when Isomorfeus.api_logout_path
-          user, session_id = user_from_env(env)
+          user, session_id = self.class.user_from_env(env)
           if user
             begin
               Isomorfeus.session_class&.remove(session_id: session_id)
@@ -59,7 +65,8 @@ module Isomorfeus
           end
           return [302, { 'Location' => '/', 'Set-Cookie' => cookie }, ["Tried to log out!"]]
         else
-          user, session_id = user_from_env(env)
+          env['isomorfeus_user_session'] = self.class.user_from_env(env) unless env.key?('isomorfeus_user_session')
+          user, session_id = env['isomorfeus_user_session']
           if user
             Thread.current[:isomorfeus_user] = user
             Thread.current[:isomorfeus_session_id] = session_id

data/lib/isomorfeus/transport/request_agent.rb

@@ -20,6 +20,7 @@ module Isomorfeus
       attr_accessor :response
       attr_accessor :full_response
       attr_accessor :sent
+      attr_accessor :queued
       attr_reader :id
       attr_reader :promise
       attr_reader :request

data/lib/isomorfeus/transport/server_socket_processor.rb

@@ -1,6 +1,7 @@
 module Isomorfeus
   module Transport
     class ServerSocketProcessor
+      OJ_OBJ_RE = /"(\^c|\^o|\^u)":/
       include Isomorfeus::Transport::ServerProcessor
 
       def initialize(user, session_id)
@@ -20,8 +21,19 @@ module Isomorfeus
           end
           Isomorfeus.zeitwerk_lock.acquire_read_lock
         end
-        request_hash = Oj.load(data, mode: :strict)
+        Isomorfeus.init_store
+        Isomorfeus.store.clear!
+        if user.respond_to?(:reload)
+          cu = Thread.current[:isomorfeus_user]
+          Thread.current[:isomorfeus_user] = LocalSystem.new
+          begin
+            user.reload
+          ensure
+            Thread.current[:isomorfeus_user] = cu
+          end
+        end
         Thread.current[:isomorfeus_user] = user
+        request_hash = Oj.load(data, mode: :strict)
         unless request_hash.key?(:iso_ping)
           handler_instance_cache = {}
           response_agent_array = []

data/lib/isomorfeus/transport/version.rb

@@ -1,5 +1,5 @@
 module Isomorfeus
   module Transport
-    VERSION = '2.5.5'
+    VERSION = '22.9.0.rc1'
   end
 end

data/lib/isomorfeus/transport.rb

@@ -8,7 +8,9 @@ module Isomorfeus
 
         def init
           @socket = nil
-          promise_connect if Isomorfeus.on_browser? || Isomorfeus.on_mobile?
+          @actions = []
+          @actions_promise = Promise.new
+          promise_connect
           true
         end
 
@@ -18,29 +20,22 @@ module Isomorfeus
             promise.resolve(true)
             return promise
           end
-          if on_browser?
-            window_protocol = `window.location.protocol`
-            ws_protocol = window_protocol == 'https:' ? 'wss:' : 'ws:'
-            ws_url = "#{ws_protocol}//#{`window.location.host`}#{Isomorfeus.api_websocket_path}"
-          else
-            ws_url = "#{Isomorfeus::TopLevel.transport_ws_url}"
-          end
+
+          window_protocol = `window.location.protocol`
+          ws_protocol = window_protocol == 'https:' ? 'wss:' : 'ws:'
+          ws_url = "#{ws_protocol}//#{`window.location.host`}#{Isomorfeus.api_websocket_path}"
+
           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 on_browser?
-              `console.warn('Isomorfeus::Transport: Will try again, but so far error connecting:', error)`
-              @socket.close
-              after 1000 do
-                Isomorfeus::Transport.promise_connect(session_id, promise)
-              end
-            else
-              Isomorfeus.raise_error(message: error.JS[:message], stack: error.JS[:stack])
-              promise.reject
+            `console.warn('Isomorfeus::Transport: Will try again, but so far error connecting:', error)`
+            @socket.close
+            after 1000 do
+              Isomorfeus::Transport.promise_connect(session_id, promise)
             end
           end
           @socket.on_message do |event|
-            json_hash = `Opal.Hash.$new(JSON.parse(event.data))`
+            json_hash = JSON.parse(`event.data`)
             Isomorfeus::Transport::ClientProcessor.process(json_hash)
           end
           @socket.on_open do |event|
@@ -59,7 +54,7 @@ module Isomorfeus
               open_promise.then { promise_send_request(request) } if agent && !agent.sent
             end
             open_promise.then { promise.resolve(true) }
-            keep_session_alive if on_browser?
+            keep_session_alive
           end
           promise
         end
@@ -76,52 +71,64 @@ module Isomorfeus
           @socket = nil
         end
 
-        def promise_send_path(*path, &block)
+        def promise_send_path(*path)
           request = {}
           inject_path = path[0...-1]
           last_inject_path_el = inject_path.last
           last_path_el = path.last
           inject_path.inject(request) do |memo, key|
             if key == last_inject_path_el
-              memo[key] = last_path_el
+              if last_path_el.is_a?(Hash)
+                memo[key] = last_path_el
+              else
+                memo[key] = { last_path_el => nil }
+              end
             else
               memo[key] = {}
             end
           end
-          Isomorfeus::Transport.promise_send_request(request, &block)
+          self.promise_send_request(request)
+        end
+
+        def promise_send_action(action)
+          @actions.push(action)
+          if @actions.length == 1
+            after(0) do
+              acts = @actions
+              @actions = []
+              pr = @actions_promise
+              @actions_promise = Promise.new
+              promise_send_request('Isomorfeus::Redux::Handler' => acts).then do |agnt|
+                pr.resolve(agnt)
+              end
+            end
+          end
+          @actions_promise
         end
 
-        def promise_send_request(request, &block)
+        def promise_send_request(request)
           agent = if request_in_progress?(request)
                     get_agent_for_request_in_progress(request)
                   else
                     Isomorfeus::Transport::RequestAgent.new(request)
                   end
-          unless agent.sent
-            if block_given?
-              agent.promise.then do |response|
-                block.call(response)
-              end
-            end
+          unless agent.queued || agent.sent
+            agent.queued = true
             register_request_in_progress(request, agent.id)
-            Isomorfeus.raise_error(message: 'No socket!') unless @socket
             begin
-              @socket.send(`JSON.stringify(#{{request: { agent_ids: { agent.id => request }}}.to_n})`)
+              Isomorfeus.raise_error(message: 'No socket!') unless @socket
+              @socket.send(JSON.dump({request: { agent_ids: { agent.id => request }}}))
               agent.sent = true
-              after(Isomorfeus.on_ssr? ? 5000 : 20000) do
+              after(20000) do
                 unless agent.promise.realized?
                   agent.promise.reject({agent_response: { error: 'Request timeout!' }, full_response: {}})
                 end
               end
             rescue
               @socket.close
-              after (Isomorfeus.on_ssr? ? 10 : 3000) do
+              after(3000) do
                 @reconnect = true
-                if on_browser?
-                  Isomorfeus::Transport.promise_connect
-                else
-                  Isomorfeus.raise_error(message: 'Transport lost connection!')
-                end
+                Isomorfeus::Transport.promise_connect
               end
             end
           end

data/lib/isomorfeus-transport.rb

@@ -1,5 +1,14 @@
-require 'isomorfeus-policy'
+require 'isomorfeus/core_ext/kernel'
+require 'isomorfeus/core_ext/object/duplicable'
+require 'isomorfeus/core_ext/object/deep_dup'
+require 'isomorfeus/core_ext/hash/deep_merge'
+require 'active_support/core_ext/string'
+
+require 'zeitwerk'
+
 if RUBY_ENGINE == 'opal'
+  require 'native'
+  require 'promise'
   require 'json'
   require 'isomorfeus/transport/version'
   require 'isomorfeus/transport/config'
@@ -8,8 +17,8 @@ if RUBY_ENGINE == 'opal'
   require 'isomorfeus/transport/websocket_client'
   require 'isomorfeus/transport'
 
-  require 'lucid_channel/mixin'
-  require 'lucid_channel/base'
+  require 'lucid_channel'
+  Isomorfeus.zeitwerk = Zeitwerk::Loader.new
   Isomorfeus.zeitwerk.push_dir('channels')
   Isomorfeus.add_client_init_class_name('Isomorfeus::Transport')
 else
@@ -20,7 +29,6 @@ else
   require 'fileutils'
   require 'ostruct'
   require 'socket'
-  require 'sorted_set'
   require 'time'
   require 'brotli'
   require 'zlib'
@@ -29,7 +37,11 @@ else
   require 'rack/body_proxy'
   require 'rack/request'
   require 'rack/utils'
+  require 'rackup'
   require 'active_support'
+  require 'opal-activesupport'
+  require 'opal-zeitwerk'
+
   require 'isomorfeus-asset-manager'
   opal_path = Gem::Specification.find_by_name('opal').full_gem_path
   promise_path = File.join(opal_path, 'stdlib', 'promise.rb')
@@ -37,6 +49,12 @@ else
   require 'isomorfeus/transport/version'
   require 'isomorfeus/transport/response_agent'
   require 'isomorfeus/transport/config'
+
+  require 'concurrent/atomic/atomic_fixnum'
+  require 'concurrent/atomic/reentrant_read_write_lock'
+  Isomorfeus.zeitwerk = Zeitwerk::Loader.new
+  Isomorfeus.zeitwerk_lock = Concurrent::ReentrantReadWriteLock.new if Isomorfeus.development?
+
   require 'isomorfeus/transport/middlewares'
   require 'isomorfeus/transport/request_agent'
   require 'isomorfeus/transport/server_processor'
@@ -51,26 +69,17 @@ else
   Isomorfeus.add_middleware(Isomorfeus::Transport::CompressorRack)
   Isomorfeus.add_middleware(Isomorfeus::Transport::RackMiddleware)
 
-  require 'lucid_handler/mixin'
-  require 'lucid_handler/base'
-  require 'lucid_channel/mixin'
-  require 'lucid_channel/base'
-
-  require 'isomorfeus/transport/handler/authentication_handler'
+  require 'lucid_handler'
+  require 'lucid_channel'
 
   require 'iso_opal'
   Opal.append_path(__dir__.untaint) unless IsoOpal.paths_include?(__dir__.untaint)
 
+
   %w[channels handlers server].each do |dir|
     path =  File.expand_path(File.join('app', dir))
     if Dir.exist?(path)
       Isomorfeus.zeitwerk.push_dir(path)
     end
   end
-
-  require 'isomorfeus-speednode'
-  Isomorfeus.node_paths << File.expand_path(File.join(File.dirname(__FILE__), '..', 'node_modules'))
-
-  require 'isomorfeus/transport/imports'
-  Isomorfeus::Transport::Imports.add
 end