isomorfeus-transport 1.0.0.zeta24 → 2.0.0.rc3

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

@@ -1,70 +1,70 @@
-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_logout|
-            if login_or_logout == '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_user, user)
-                  Isomorfeus.pub_sub_client.instance_variable_set(:@isomorfeus_authentication_tries, nil)
-                  Isomorfeus.pub_sub_client.instance_variable_set(:@isomorfeus_session_cookie, session_cookie)
-                  Isomorfeus.session_store.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_logout == 'ssr_login'
-              response_agent.agent_result = { error: 'Authentication failed' }
-              session_id = response_agent.request['ssr_login']
-              user = Isomorfeus.session_store.get_user(session_id: session_id)
-              if user
-                Isomorfeus.pub_sub_client.instance_variable_set(:@isomorfeus_user, user)
-                Isomorfeus.pub_sub_client.instance_variable_set(:@isomorfeus_authentication_tries, nil)
-                Isomorfeus.pub_sub_client.instance_variable_set(:@isomorfeus_session_cookie, nil)
-                response_agent.agent_result = { success: 'ok', data: user.to_transport }
-              end
-            elsif login_or_logout == 'logout'
-              begin
-                # bogus
-                session_cookie = nil
-              ensure
-                Isomorfeus.pub_sub_client.instance_variable_set(:@isomorfeus_user, nil)
-                Isomorfeus.pub_sub_client.instance_variable_set(:@isomorfeus_authentication_tries, nil)
-                Isomorfeus.pub_sub_client.instance_variable_set(:@isomorfeus_session_cookie, nil)
-                Isomorfeus.session_store.remove(cookie: session_cookie)
-                response_agent.agent_result = { success: 'ok' }
-              end
-            end
-          end
-        end
-      end
-    end
-  end
-end
+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_logout|
+            if login_or_logout == '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_user, user)
+                  Isomorfeus.pub_sub_client.instance_variable_set(:@isomorfeus_authentication_tries, nil)
+                  Isomorfeus.pub_sub_client.instance_variable_set(:@isomorfeus_session_cookie, session_cookie)
+                  Isomorfeus.session_store.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_logout == 'ssr_login'
+              response_agent.agent_result = { error: 'Authentication failed' }
+              session_id = response_agent.request['ssr_login']
+              user = Isomorfeus.session_store.get_user(session_id: session_id)
+              if user
+                Isomorfeus.pub_sub_client.instance_variable_set(:@isomorfeus_user, user)
+                Isomorfeus.pub_sub_client.instance_variable_set(:@isomorfeus_authentication_tries, nil)
+                Isomorfeus.pub_sub_client.instance_variable_set(:@isomorfeus_session_cookie, nil)
+                response_agent.agent_result = { success: 'ok', data: user.to_transport }
+              end
+            elsif login_or_logout == 'logout'
+              begin
+                # bogus
+                session_cookie = nil
+              ensure
+                Isomorfeus.pub_sub_client.instance_variable_set(:@isomorfeus_user, nil)
+                Isomorfeus.pub_sub_client.instance_variable_set(:@isomorfeus_authentication_tries, nil)
+                Isomorfeus.pub_sub_client.instance_variable_set(:@isomorfeus_session_cookie, nil)
+                Isomorfeus.session_store.remove(cookie: session_cookie)
+                response_agent.agent_result = { success: 'ok' }
+              end
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/lib/isomorfeus/transport/imports.rb

@@ -0,0 +1,9 @@
+module Isomorfeus
+  module Transport
+    module Imports
+      def self.add
+        Isomorfeus.add_ssr_js_import('ws', 'WebSocket')
+      end
+    end
+  end
+end

data/lib/isomorfeus/transport/middlewares.rb

@@ -1,13 +1,13 @@
-module Isomorfeus
-  module Transport
-    module Middlewares
-      def use_isomorfeus_middlewares
-        STDOUT.puts "Isomorfeus is using the following middlewares:"
-        Isomorfeus.middlewares.each do |isomorfeus_middleware|
-          STDOUT.puts "#{isomorfeus_middleware}"
-          use isomorfeus_middleware
-        end
-      end
-    end
-  end
-end
+module Isomorfeus
+  module Transport
+    module Middlewares
+      def use_isomorfeus_middlewares
+        puts "Isomorfeus is using the following middlewares:"
+        Isomorfeus.middlewares.each do |isomorfeus_middleware|
+          puts "#{isomorfeus_middleware}"
+          use isomorfeus_middleware
+        end
+      end
+    end
+  end
+end

data/lib/isomorfeus/transport/rack_middleware.rb

@@ -1,55 +1,59 @@
-# frozen_string_literal: true
-
-module Isomorfeus
-  module Transport
-    class RackMiddleware
-      WS_RESPONSE = [0, {}, []]
-
-      def initialize(app)
-        @app = app
-      end
-
-      def call(env)
-        if env['PATH_INFO'] == Isomorfeus.api_websocket_path
-          if env['rack.upgrade?'] == :websocket
-            env['rack.upgrade'] = Isomorfeus::Transport::ServerSocketProcessor.new
-          end
-          WS_RESPONSE
-        elsif env['PATH_INFO'] == Isomorfeus.cookie_eater_path
-          cookie_accessor, new_path = env['QUERY_STRING'].split('=')
-          cookie = Isomorfeus.session_store.take_cookie(accessor: cookie_accessor)
-          if new_path.start_with?('/')
-            if cookie
-              [302, { 'Location' => new_path, 'Set-Cookie' => cookie }, ["Cookie eaten!"]]
-            else
-              [302, { 'Location' => new_path }, ["No Cookie!"]]
-            end
-          else
-            [404, {}, ["Must specify relative path!"]]
-          end
-        else
-          cookies = env['HTTP_COOKIE']
-          if cookies
-            cookies = cookies.split('; ')
-            cookie = cookies.detect { |c| c.start_with?('session=') }
-            if cookie
-              session_id = cookie[8..-1]
-              user = Isomorfeus.session_store.get_user(session_id: session_id)
-              if user
-                Thread.current[:isomorfeus_user] = user
-                Thread.current[:isomorfeus_session_id] = session_id
-              end
-            end
-          end
-          begin
-            result = @app.call(env)
-          ensure
-            Thread.current[:isomorfeus_user] = nil
-            Thread.current[:isomorfeus_session_id] = nil
-          end
-          result
-        end
-      end
-    end
-  end
-end
+# frozen_string_literal: true
+
+module Isomorfeus
+  module Transport
+    class RackMiddleware
+      WS_RESPONSE = [0, {}, []]
+
+      def initialize(app)
+        @app = app
+      end
+
+      def call(env)
+        if env['PATH_INFO'] == Isomorfeus.api_websocket_path
+          if env['rack.upgrade?'] == :websocket
+            env['rack.upgrade'] = Isomorfeus::Transport::ServerSocketProcessor.new
+          end
+          WS_RESPONSE
+        elsif env['PATH_INFO'] == Isomorfeus.cookie_eater_path
+          cookie_accessor, new_path = env['QUERY_STRING'].split('=')
+          cookie = Isomorfeus.session_store.take_cookie(accessor: cookie_accessor)
+          if new_path.start_with?('/')
+            if cookie
+              [302, { 'Location' => new_path, 'Set-Cookie' => cookie }, ["Cookie eaten!"]]
+            else
+              [302, { 'Location' => new_path }, ["No Cookie!"]]
+            end
+          else
+            [404, {}, ["Must specify relative path!"]]
+          end
+        else
+          cookies = env['HTTP_COOKIE']
+          if cookies
+            cookies = cookies.split('; ')
+            cookie = cookies.detect { |c| c.start_with?('session=') }
+            if cookie
+              session_id = cookie[8..-1]
+              user = Isomorfeus.session_store.get_user(session_id: session_id)
+              if user
+                Thread.current[:isomorfeus_user] = user
+                Thread.current[:isomorfeus_session_id] = session_id
+              end
+            end
+          end
+          begin
+            result = @app.call(env)
+          ensure
+            Thread.current[:isomorfeus_user] = nil
+            Thread.current[:isomorfeus_session_id] = nil
+          end
+          result
+        end
+      rescue Exception => e
+        # TODO
+        Isomorfeus.raise_error(error: e)
+        return [500, {}, '']
+      end
+    end
+  end
+end

data/lib/isomorfeus/transport/request_agent.rb

@@ -1,34 +1,34 @@
-module Isomorfeus
-  module Transport
-    class RequestAgent
-      def self.agents
-        @_agents ||= {}
-      end
-
-      def self.get(object_id)
-        agents[object_id]
-      end
-
-      def self.get!(object_id)
-        agents.delete(object_id.to_s)
-      end
-
-      attr_accessor :processed
-      attr_accessor :result
-      attr_accessor :response
-      attr_accessor :full_response
-      attr_accessor :sent
-      attr_reader :id
-      attr_reader :promise
-      attr_reader :request
-
-      def initialize(request = nil)
-        @id = object_id.to_s
-        self.class.agents[@id] = self
-        @promise = Promise.new
-        @request = request
-        @sent = false
-      end
-    end
-  end
-end
+module Isomorfeus
+  module Transport
+    class RequestAgent
+      def self.agents
+        @_agents ||= {}
+      end
+
+      def self.get(object_id)
+        agents[object_id]
+      end
+
+      def self.get!(object_id)
+        agents.delete(object_id.to_s)
+      end
+
+      attr_accessor :processed
+      attr_accessor :result
+      attr_accessor :response
+      attr_accessor :full_response
+      attr_accessor :sent
+      attr_reader :id
+      attr_reader :promise
+      attr_reader :request
+
+      def initialize(request = nil)
+        @id = object_id.to_s
+        self.class.agents[@id] = self
+        @promise = Promise.new
+        @request = request
+        @sent = false
+      end
+    end
+  end
+end

data/lib/isomorfeus/transport/response_agent.rb

@@ -1,23 +1,23 @@
-module Isomorfeus
-  module Transport
-    class ResponseAgent
-      attr_reader :agent_id
-      attr_reader :request
-      attr_accessor :agent_result
-      attr_accessor :outer_result
-      attr_accessor :error
-
-      def initialize(agent_id, request)
-        @agent_id = agent_id
-        @request = request
-      end
-
-      def result
-        return { response: { agent_ids: { @agent_id => @error }}} if @error
-        response = { response: { agent_ids: { @agent_id => @agent_result }}}
-        response.deep_merge!(@outer_result) if @outer_result
-        return response
-      end
-    end
-  end
-end
+module Isomorfeus
+  module Transport
+    class ResponseAgent
+      attr_reader :agent_id
+      attr_reader :request
+      attr_accessor :agent_result
+      attr_accessor :outer_result
+      attr_accessor :error
+
+      def initialize(agent_id, request)
+        @agent_id = agent_id
+        @request = request
+      end
+
+      def result
+        return { response: { agent_ids: { @agent_id => @error }}} if @error
+        response = { response: { agent_ids: { @agent_id => @agent_result }}}
+        response.deep_merge!(@outer_result) if @outer_result
+        return response
+      end
+    end
+  end
+end