isomorfeus-transport 1.0.0.zeta24 → 2.0.0.rc3

data/lib/isomorfeus-transport.rb

@@ -1,61 +1,70 @@
-require 'isomorfeus-policy'
-require 'lucid_authentication/mixin'
-if RUBY_ENGINE == 'opal'
-  require 'json'
-  require 'isomorfeus/transport/version'
-  require 'isomorfeus/transport/config'
-  require 'isomorfeus/transport/request_agent'
-  require 'isomorfeus/transport/client_processor'
-  require 'isomorfeus/transport/websocket'
-  require 'isomorfeus/transport'
-  require 'isomorfeus/transport/ssr_login'
-  require 'lucid_channel/mixin'
-  require 'lucid_channel/base'
-  Isomorfeus.zeitwerk.push_dir('channels')
-  Isomorfeus.add_client_init_class_name('Isomorfeus::Transport')
-  Isomorfeus.add_transport_init_class_name('Isomorfeus::Transport::SsrLogin') if Isomorfeus.on_ssr?
-else
-  require 'base64'
-  require 'digest'
-  require 'bcrypt'
-  require 'ostruct'
-  require 'socket'
-  require 'oj'
-  require 'websocket/driver'
-  require 'active_support'
-  require 'iodine'
-  require 'dbm'
-  require 'isomorfeus/transport/dbm_session_store'
-  opal_path = Gem::Specification.find_by_name('opal').full_gem_path
-  promise_path = File.join(opal_path, 'stdlib', 'promise.rb')
-  require promise_path
-  require 'isomorfeus/transport/version'
-  require 'isomorfeus/transport/response_agent'
-  require 'isomorfeus/transport/config'
-  require 'isomorfeus/transport/middlewares'
-  require 'isomorfeus/transport/request_agent'
-  require 'isomorfeus/transport/server_processor'
-  require 'isomorfeus/transport/server_socket_processor'
-  require 'isomorfeus/transport/websocket'
-  require 'isomorfeus/transport'
-  require 'isomorfeus/transport/rack_middleware'
-  require 'isomorfeus/transport/middlewares'
-
-  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'
-
-  Opal.append_path(__dir__.untaint) unless Opal.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
-end
+require 'isomorfeus-policy'
+require 'lucid_authentication/mixin'
+if RUBY_ENGINE == 'opal'
+  require 'json'
+  require 'isomorfeus/transport/version'
+  require 'isomorfeus/transport/config'
+  require 'isomorfeus/transport/request_agent'
+  require 'isomorfeus/transport/client_processor'
+  require 'isomorfeus/transport/websocket_client'
+  require 'isomorfeus/transport'
+  require 'isomorfeus/transport/ssr_login'
+  require 'lucid_channel/mixin'
+  require 'lucid_channel/base'
+  Isomorfeus.zeitwerk.push_dir('channels')
+  Isomorfeus.add_client_init_class_name('Isomorfeus::Transport')
+  Isomorfeus.add_transport_init_class_name('Isomorfeus::Transport::SsrLogin') if Isomorfeus.on_ssr?
+else
+  require 'base64'
+  require 'digest'
+  require 'bcrypt'
+  require 'securerandom'
+  require 'fileutils'
+  require 'ostruct'
+  require 'socket'
+  require 'sorted_set'
+  require 'oj'
+  require 'active_support'
+  require 'isomorfeus-asset-manager'
+  require 'isomorfeus/transport/hamster_session_store'
+  opal_path = Gem::Specification.find_by_name('opal').full_gem_path
+  promise_path = File.join(opal_path, 'stdlib', 'promise.rb')
+  require promise_path
+  require 'isomorfeus/transport/version'
+  require 'isomorfeus/transport/response_agent'
+  require 'isomorfeus/transport/config'
+  require 'isomorfeus/transport/middlewares'
+  require 'isomorfeus/transport/request_agent'
+  require 'isomorfeus/transport/server_processor'
+  require 'isomorfeus/transport/server_socket_processor'
+  require 'isomorfeus/transport/websocket_client'
+  require 'isomorfeus/transport'
+  require 'isomorfeus/transport/rack_middleware'
+  require 'isomorfeus/transport/middlewares'
+
+  Isomorfeus.add_middleware(Isomorfeus::Transport::RackMiddleware)
+  Isomorfeus.add_middleware(Isomorfeus::AssetManager::RackMiddleware)
+
+  require 'lucid_handler/mixin'
+  require 'lucid_handler/base'
+  require 'lucid_channel/mixin'
+  require 'lucid_channel/base'
+
+  require 'isomorfeus/transport/handler/authentication_handler'
+
+  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

data/lib/lucid_authentication/mixin.rb

@@ -1,122 +1,122 @@
-module LucidAuthentication
-  module Mixin
-    def anonymous?
-      self.class == Anonymous
-    end
-
-    if RUBY_ENGINE == 'opal'
-      def self.included(base)
-        base.instance_exec do
-          def execute_login(&block)
-          end
-
-          def promise_login(user: nil, pass: nil, scheme: :isomorfeus, &block)
-            send("promise_authentication_with_#{scheme}", user: user, pass: pass, &block)
-          end
-
-          def promise_authentication_with_isomorfeus(user: nil, pass: nil, &block)
-            if Isomorfeus.production?
-              Isomorfeus.raise_error(message: "Connection not secure, can't login!") unless Isomorfeus::Transport.socket.url.start_with?('wss:')
-            else
-              `console.warn("Connection not secure, ensure a secure connection in production, otherwise login will fail!")` unless Isomorfeus::Transport.socket.url.start_with?('wss:')
-            end
-            Isomorfeus::Transport.promise_send_path('Isomorfeus::Transport::Handler::AuthenticationHandler', 'login', self.name, user, pass).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)
-                  cookie_accessor = agent.response[:session_cookie_accessor]
-                  begin
-                    target = if block_given?
-                               block.call(logged_in_user)
-                             else
-                               `window.location.pathname`
-                             end
-                    unless target.class == String && target.start_with?('/')
-                      Isomorfeus.raise_error(message: "A path must be returned as string starting with '/', returned was #{target}!")
-                    end
-                  rescue
-                    target = `window.location.pathname`
-                  end
-                  cookie_query = "#{Isomorfeus.cookie_eater_path}?#{cookie_accessor}=#{target}"
-                  `window.location = cookie_query` # doing page load and redirect
-                  nil
-                else
-                  Isomorfeus.raise_error(message: "Login failed with '#{agent.response[:error]}'!") # triggers .fail
-                end
-              end
-            end
-          end
-        end
-      end
-
-      def promise_logout(scheme: :isomorfeus)
-        send("promise_deauthentication_with_#{scheme}")
-      end
-
-      def promise_deauthentication_with_isomorfeus
-        Isomorfeus::Transport.promise_send_path('Isomorfeus::Transport::Handler::AuthenticationHandler', 'logout', 'logout').then do |agent|
-          `document.cookie = "session="`
-          Isomorfeus.set_current_user(nil)
-          Isomorfeus.force_init_store!
-          agent.processed = true
-          agent.response.key?(:success) ? true : raise('Logout failed!')
-        end
-      end
-    else
-      def self.included(base)
-        Isomorfeus.add_valid_user_class(base)
-
-        base.instance_exec do
-          def execute_login(&block)
-            @execute_login_block = block
-          end
-
-          def promise_login(user: nil, pass: nil, scheme: :isomorfeus, &block)
-            send("promise_authentication_with_#{scheme}", user: user, pass: pass, &block)
-          end
-
-          def promise_authentication_with_isomorfeus(user: nil, pass: nil, &block)
-            promise_or_user = @execute_login_block.call(user: user, pass: pass)
-            if promise_or_user.class == Promise
-              if block_given?
-                promise_or_user.then do |user|
-                  block.call(user)
-                  user
-                end
-              else
-                promise_or_user
-              end
-            else
-              block.call(user) if block_given?
-              Promise.new.resolve(promise_or_user)
-            end
-          end
-        end
-      end
-
-      def encrypt_password(password, password_confirmation)
-        raise "Password and confirmation don't match!" unless password == password_confirmation
-        BCrypt::Password.create(password).to_s
-      end
-
-      def passwords_match?(encrypted_password, given_password)
-        bcrypt_pass = BCrypt::Password.new(encrypted_password)
-        bcrypt_pass == given_password
-      end
-
-      def promise_logout(scheme: :isomorfeus)
-        send("promise_deauthentication_with_#{scheme}")
-      end
-
-      def promise_deauthentication_with_isomorfeus
-        Promise.new.resolve(true)
-      end
-    end
-  end
-end
+module LucidAuthentication
+  module Mixin
+    def anonymous?
+      self.class == Anonymous
+    end
+
+    if RUBY_ENGINE == 'opal'
+      def self.included(base)
+        base.instance_exec do
+          def execute_login(&block)
+          end
+
+          def promise_login(user: nil, pass: nil, scheme: :isomorfeus, &block)
+            send("promise_authentication_with_#{scheme}", user: user, pass: pass, &block)
+          end
+
+          def promise_authentication_with_isomorfeus(user: nil, pass: nil, &block)
+            if Isomorfeus.production?
+              Isomorfeus.raise_error(message: "Connection not secure, can't login!") unless Isomorfeus::Transport.socket.url.start_with?('wss:')
+            else
+              `console.warn("Connection not secure, ensure a secure connection in production, otherwise login will fail!")` unless Isomorfeus::Transport.socket.url.start_with?('wss:')
+            end
+            Isomorfeus::Transport.promise_send_path('Isomorfeus::Transport::Handler::AuthenticationHandler', 'login', self.name, user, pass).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)
+                  cookie_accessor = agent.response[:session_cookie_accessor]
+                  begin
+                    target = if block_given?
+                               block.call(logged_in_user)
+                             else
+                               `window.location.pathname`
+                             end
+                    unless target.class == String && target.start_with?('/')
+                      Isomorfeus.raise_error(message: "A path must be returned as string starting with '/', returned was #{target}!")
+                    end
+                  rescue
+                    target = `window.location.pathname`
+                  end
+                  cookie_query = "#{Isomorfeus.cookie_eater_path}?#{cookie_accessor}=#{target}"
+                  `window.location = cookie_query` # doing page load and redirect
+                  nil
+                else
+                  Isomorfeus.raise_error(message: "Login failed with '#{agent.response[:error]}'!") # triggers .fail
+                end
+              end
+            end
+          end
+        end
+      end
+
+      def promise_logout(scheme: :isomorfeus)
+        send("promise_deauthentication_with_#{scheme}")
+      end
+
+      def promise_deauthentication_with_isomorfeus
+        Isomorfeus::Transport.promise_send_path('Isomorfeus::Transport::Handler::AuthenticationHandler', 'logout', 'logout').then do |agent|
+          `document.cookie = "session="`
+          Isomorfeus.set_current_user(nil)
+          Isomorfeus.force_init_store!
+          agent.processed = true
+          agent.response.key?(:success) ? true : raise('Logout failed!')
+        end
+      end
+    else
+      def self.included(base)
+        Isomorfeus.add_valid_user_class(base)
+
+        base.instance_exec do
+          def execute_login(&block)
+            @execute_login_block = block
+          end
+
+          def promise_login(user: nil, pass: nil, scheme: :isomorfeus, &block)
+            send("promise_authentication_with_#{scheme}", user: user, pass: pass, &block)
+          end
+
+          def promise_authentication_with_isomorfeus(user: nil, pass: nil, &block)
+            promise_or_user = @execute_login_block.call(user: user, pass: pass)
+            if promise_or_user.class == Promise
+              if block_given?
+                promise_or_user.then do |user|
+                  block.call(user)
+                  user
+                end
+              else
+                promise_or_user
+              end
+            else
+              block.call(user) if block_given?
+              Promise.new.resolve(promise_or_user)
+            end
+          end
+        end
+      end
+
+      def encrypt_password(password, password_confirmation)
+        raise "Password and confirmation don't match!" unless password == password_confirmation
+        BCrypt::Password.create(password).to_s
+      end
+
+      def passwords_match?(encrypted_password, given_password)
+        bcrypt_pass = BCrypt::Password.new(encrypted_password)
+        bcrypt_pass == given_password
+      end
+
+      def promise_logout(scheme: :isomorfeus)
+        send("promise_deauthentication_with_#{scheme}")
+      end
+
+      def promise_deauthentication_with_isomorfeus
+        Promise.new.resolve(true)
+      end
+    end
+  end
+end

data/lib/lucid_channel/base.rb

@@ -1,9 +1,8 @@
-module LucidChannel
-  class Base
-    def self.inherited(base)
-      Isomorfeus.add_valid_channel_class(base)
-    end
-
-    include LucidChannel::Mixin
-  end
-end
+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 +1,105 @@
-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
+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,9 +1,8 @@
-module LucidHandler
-  class Base
-    def self.inherited(base)
-      Isomorfeus.add_valid_handler_class(base)
-    end
-
-    include LucidHandler::Mixin
-  end
-end
+module LucidHandler
+  class Base
+    def self.inherited(base)
+      base.include LucidHandler::Mixin
+      Isomorfeus.add_valid_handler_class(base)
+    end
+  end
+end