isomorfeus-transport 1.0.0.zeta25 → 2.0.0.rc1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 650383d49c2b3d85ceab1ba50f081d83951393390a5a6cb2db9837e7261c8c70
-  data.tar.gz: 8dc79b2037d59d5fc41e8f69fc0ac913f569abcb1e823f975fda3e37d2a358d1
+  metadata.gz: cd6bcb0fc97804f50a51cfb715eaeedac9e58a48924a1a141b1eeee961992699
+  data.tar.gz: 36cce06dd43f7cfd57c4b30623f5ac914e291e98e957ad6a39787bf3504b5052
 SHA512:
-  metadata.gz: 5feea1467c33f7efa7452dedf08fe859f7daa90354e621750d82b9d99c33e63e0bc5b2651e0556f301dc0d7cd9ad8fbcae028503ae2d1bfb9d620c60f8574802
-  data.tar.gz: d7582e45abab5eeaffebfca8473ed0ca74664faddd57be5e21cff0d484713a221a30ae07c55c2b9f1230acf9030e847628218fe8b060d7d9e8cc243111f25eae
+  metadata.gz: fb5c37666f091a021b5b167c317132eb3bf300c9fef46f3f42260c3a8d635d63ccf18ca3c2284fb484db8c4b90a3ca1ff1d93ddc63945a2de34ff586eb42a47e
+  data.tar.gz: 59c4b3927030fdfcf9383bd6296c4c4709b4425d875f26a8170d37f575be3622162e4a46c01c92d20ccf8f392542e56a5c25c95dcbea9b4b0ec15640ee2a8932

data/LICENSE

@@ -1,21 +1,21 @@
-MIT License
-
-Copyright (c) 2018, 2019 Jan Biedermann
-
-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.
+MIT License
+
+Copyright (c) 2018, 2019 Jan Biedermann
+
+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.

data/README.md

@@ -1,36 +1,27 @@
-# isomorfeus-transport
-
-Transport and PubSub for Isomorfeus.
-
-### Community and Support
-At the [Isomorfeus Framework Project](http://isomorfeus.com) 
-
-## Installation
-isomorfeus-transport is usually installed with the installer.
-Otherwise add to your Gemfile:
-```ruby
-gem 'isomorfeus-transport'
-```
-and bundle install/update
-
-## Server Side Rendering
-`yarn add ws`
-
-The 'ws' module then needs to be imported in application_ssr.js:
-```
-import WebSocket from 'ws';
-global.WebSocket = WebSocket;
-```
-
-## Configuration options
-
-Client and Server:
-- Isomorfeus.api_websocket_path - path for server side endpoint, default: `/isomorfeus/api/websocket`
-
-Server only:
-- Isomorfeus.middlewares - all the rack middlewares to load
-
-## Usage
-
-- [Authentication and Current User](https://github.com/isomorfeus/isomorfeus-project/blob/master/ruby/isomorfeus-transport/docs/authentication.md)
-- [Channels (PubSub)](https://github.com/isomorfeus/isomorfeus-project/blob/master/ruby/isomorfeus-transport/docs/channels.md)
+# isomorfeus-transport
+
+Transport and PubSub for Isomorfeus.
+
+### Community and Support
+At the [Isomorfeus Framework Project](http://isomorfeus.com) 
+
+## Installation
+isomorfeus-transport is usually installed with the installer.
+Otherwise add to your Gemfile:
+```ruby
+gem 'isomorfeus-transport'
+```
+and bundle install/update
+
+## Configuration options
+
+Client and Server:
+- Isomorfeus.api_websocket_path - path for server side endpoint, default: `/isomorfeus/api/websocket`
+
+Server only:
+- Isomorfeus.middlewares - all the rack middlewares to load
+
+## Usage
+
+- [Authentication and Current User](https://github.com/isomorfeus/isomorfeus-project/blob/master/ruby/isomorfeus-transport/docs/authentication.md)
+- [Channels (PubSub)](https://github.com/isomorfeus/isomorfeus-project/blob/master/ruby/isomorfeus-transport/docs/channels.md)

data/lib/isomorfeus/transport/client_processor.rb

@@ -1,35 +1,35 @@
-module Isomorfeus
-  module Transport
-    class ClientProcessor
-      def self.process(json_hash)
-        if json_hash.key?(:response)
-          process_response(json_hash)
-        elsif json_hash.key?(:notification)
-          process_message(json_hash)
-        end
-      end
-
-      def self.process_message(message_hash)
-        processor_class_name = message_hash[:notification][:class]
-        Isomorfeus.raise_error(message: "Not a valid channel class #{processor_class_name}!") unless Isomorfeus.valid_channel_class_name?(processor_class_name)
-        processor_class = Isomorfeus.cached_channel_class(processor_class_name)
-        unless processor_class.respond_to?(:process_message)
-          Isomorfeus.raise_error(message: "Cannot process message, #{processor_class} must be a Channel and must have the on_message block defined!")
-        end
-        processor_class.process_message(message_hash[:notification][:message], message_hash[:notification][:error], message_hash[:notification][:channel])
-      end
-
-      def self.process_response(response_hash)
-        response_hash[:response][:agent_ids].keys.each do |agent_id|
-          agent = Isomorfeus::Transport::RequestAgent.get!(agent_id)
-          Isomorfeus::Transport.unregister_request_in_progress(agent_id)
-          unless agent.promise.realized?
-            agent.full_response = response_hash
-            agent.response = response_hash[:response][:agent_ids][agent_id]
-            agent.promise.resolve(agent)
-          end
-        end
-      end
-    end
-  end
-end
+module Isomorfeus
+  module Transport
+    class ClientProcessor
+      def self.process(json_hash)
+        if json_hash.key?(:response)
+          process_response(json_hash)
+        elsif json_hash.key?(:notification)
+          process_message(json_hash)
+        end
+      end
+
+      def self.process_message(message_hash)
+        processor_class_name = message_hash[:notification][:class]
+        Isomorfeus.raise_error(message: "Not a valid channel class #{processor_class_name}!") unless Isomorfeus.valid_channel_class_name?(processor_class_name)
+        processor_class = Isomorfeus.cached_channel_class(processor_class_name)
+        unless processor_class.respond_to?(:process_message)
+          Isomorfeus.raise_error(message: "Cannot process message, #{processor_class} must be a Channel and must have the on_message block defined!")
+        end
+        processor_class.process_message(message_hash[:notification][:message], message_hash[:notification][:error], message_hash[:notification][:channel])
+      end
+
+      def self.process_response(response_hash)
+        response_hash[:response][:agent_ids].keys.each do |agent_id|
+          agent = Isomorfeus::Transport::RequestAgent.get!(agent_id)
+          Isomorfeus::Transport.unregister_request_in_progress(agent_id)
+          unless agent.promise.realized?
+            agent.full_response = response_hash
+            agent.response = response_hash[:response][:agent_ids][agent_id]
+            agent.promise.resolve(agent)
+          end
+        end
+      end
+    end
+  end
+end

data/lib/isomorfeus/transport/config.rb

@@ -1,166 +1,182 @@
-module Isomorfeus
-  # available settings
-  class << self
-    def cached_channel_classes
-      @cached_channel_classes ||= {}
-    end
-
-    def cached_channel_class(class_name)
-      return "::#{class_name}".constantize if Isomorfeus.development?
-      return cached_channel_classes[class_name] if cached_channel_classes.key?(class_name)
-      cached_channel_classes[class_name] = "::#{class_name}".constantize
-    end
-
-    def valid_channel_class_names
-      @valid_channel_class_names ||= Set.new
-    end
-
-    def add_valid_channel_class(klass)
-      valid_channel_class_names << raw_class_name(klass)
-    end
-
-    def raw_class_name(klass)
-      class_name = klass.name
-      class_name = class_name.split('>::').last if class_name.start_with?('#<')
-      class_name
-    end
-  end
-
-  if RUBY_ENGINE == 'opal'
-    add_client_option(:api_websocket_path)
-    add_client_option(:cookie_eater_path)
-    add_client_option(:transport_init_class_names, [])
-
-    class << self
-      def valid_channel_class_name?(class_name)
-        cached_channel_class(class_name) # because of autoloader
-        valid_channel_class_names.include?(class_name)
-      end
-
-      def add_transport_init_class_name(init_class_name)
-        transport_init_class_names << init_class_name
-      end
-
-      def current_user
-        @current_user ||= init_current_user
-      end
-
-      def init_current_user
-        if Isomorfeus.current_user_sid
-          Isomorfeus.instance_from_sid(Isomorfeus.current_user_sid)
-        else
-          Anonymous.new
-        end
-      end
-
-      def set_current_user(user)
-        if user
-          @current_user = user
-          Isomorfeus.current_user_sid = user.to_sid
-        else
-          @current_user = Anonymous.new
-        end
-      end
-    end
-  else
-    class << self
-      attr_accessor :api_websocket_path
-      attr_accessor :cookie_eater_path
-      attr_accessor :session_store
-      attr_accessor :cookie_dbm_path
-
-      def valid_channel_class_name?(class_name)
-        valid_channel_class_names.include?(class_name)
-      end
-
-      def add_middleware(middleware)
-        Isomorfeus.middlewares << middleware
-      end
-
-      def insert_middleware_after(existing_middleware, new_middleware)
-        index_of_existing = Isomorfeus.middlewares.index(existing_middleware)
-        unless Isomorfeus.middlewares.include?(new_middleware)
-          if index_of_existing
-            Isomorfeus.middlewares.insert(index_of_existing + 1, new_middleware)
-          else
-            Isomorfeus.middlewares << new_middleware
-          end
-        end
-      end
-
-      def insert_middleware_before(existing_middleware, new_middleware)
-        index_of_existing = Isomorfeus.middlewares.index(existing_middleware)
-        unless Isomorfeus.middlewares.include?(new_middleware)
-          if index_of_existing
-            Isomorfeus.middlewares.insert(index_of_existing, new_middleware)
-          else
-            Isomorfeus.middlewares << new_middleware
-          end
-        end
-      end
-
-      def middlewares
-        @middlewares ||= Set.new
-      end
-
-      def valid_handler_class_names
-        @valid_handler_class_names ||= Set.new
-      end
-
-      def valid_handler_class_name?(class_name)
-        valid_handler_class_names.include?(class_name)
-      end
-
-      def add_valid_handler_class(klass)
-        valid_handler_class_names << raw_class_name(klass)
-      end
-
-      def cached_handler_classes
-        @cached_handler_classes ||= {}
-      end
-
-      def cached_handler_class(class_name)
-        return "::#{class_name}".constantize if Isomorfeus.development?
-        return cached_handler_classes[class_name] if cached_handler_classes.key?(class_name)
-        cached_handler_classes[class_name] = "::#{class_name}".constantize
-      end
-
-      def valid_user_class_names
-        @valid_user_class_names ||= Set.new
-      end
-
-      def valid_user_class_name?(class_name)
-        valid_user_class_names.include?(class_name)
-      end
-
-      def add_valid_user_class(klass)
-        valid_user_class_names << raw_class_name(klass)
-      end
-
-      def cached_user_classes
-        @cached_user_classes ||= {}
-      end
-
-      def cached_user_class(class_name)
-        return "::#{class_name}".constantize if Isomorfeus.development?
-        return cached_user_classes[class_name] if cached_user_classes.key?(class_name)
-        cached_user_classes[class_name] = "::#{class_name}".constantize
-      end
-
-      def current_user
-        Thread.current[:isomorfeus_user]
-      end
-
-      def pub_sub_client
-        Thread.current[:isomorfeus_pub_sub_client]
-      end
-    end
-
-    self.cookie_dbm_path = 'cookie'
-    self.session_store = Isomorfeus::Transport::DbmSessionStore.new # dont use this one, but we keep it here to have at least something
-  end
-
-  # defaults
-  self.api_websocket_path = '/isomorfeus/api/websocket'
-  self.cookie_eater_path = '/isomorfeus/cookie/eat'
-end
+module Isomorfeus
+  # available settings
+  class << self
+    def cached_channel_classes
+      @cached_channel_classes ||= {}
+    end
+
+    def cached_channel_class(class_name)
+      return "::#{class_name}".constantize if Isomorfeus.development?
+      return cached_channel_classes[class_name] if cached_channel_classes.key?(class_name)
+      cached_channel_classes[class_name] = "::#{class_name}".constantize
+    end
+
+    def valid_channel_class_names
+      @valid_channel_class_names ||= Set.new
+    end
+
+    def add_valid_channel_class(klass)
+      valid_channel_class_names << raw_class_name(klass)
+    end
+
+    def raw_class_name(klass)
+      class_name = klass.name
+      class_name = class_name.split('>::').last if class_name.start_with?('#<')
+      class_name
+    end
+  end
+
+  if RUBY_ENGINE == 'opal'
+    add_client_option(:api_websocket_host)
+    add_client_option(:api_websocket_port)
+    add_client_option(:api_websocket_path)
+    add_client_option(:cookie_eater_path)
+    add_client_option(:transport_init_class_names, [])
+
+    class << self
+      def valid_channel_class_name?(class_name)
+        cached_channel_class(class_name) # because of autoloader
+        valid_channel_class_names.include?(class_name)
+      end
+
+      def add_transport_init_class_name(init_class_name)
+        transport_init_class_names << init_class_name
+      end
+
+      def current_user
+        @current_user ||= init_current_user
+      end
+
+      def init_current_user
+        if Isomorfeus.current_user_sid
+          Isomorfeus.instance_from_sid(Isomorfeus.current_user_sid)
+        else
+          Anonymous.new
+        end
+      end
+
+      def set_current_user(user)
+        if user
+          @current_user = user
+          Isomorfeus.current_user_sid = user.sid
+        else
+          @current_user = Anonymous.new
+        end
+      end
+    end
+  else
+    class << self
+      attr_accessor :api_websocket_host
+      attr_accessor :api_websocket_port
+      attr_accessor :api_websocket_path
+      attr_accessor :cookie_eater_path
+      attr_reader :session_store
+
+      def valid_channel_class_name?(class_name)
+        valid_channel_class_names.include?(class_name)
+      end
+
+      def add_middleware(middleware)
+        Isomorfeus.middlewares << middleware
+      end
+
+      def insert_middleware_after(existing_middleware, new_middleware)
+        index_of_existing = Isomorfeus.middlewares.index(existing_middleware)
+        unless Isomorfeus.middlewares.include?(new_middleware)
+          if index_of_existing
+            Isomorfeus.middlewares.insert(index_of_existing + 1, new_middleware)
+          else
+            Isomorfeus.middlewares << new_middleware
+          end
+        end
+      end
+
+      def insert_middleware_before(existing_middleware, new_middleware)
+        index_of_existing = Isomorfeus.middlewares.index(existing_middleware)
+        unless Isomorfeus.middlewares.include?(new_middleware)
+          if index_of_existing
+            Isomorfeus.middlewares.insert(index_of_existing, new_middleware)
+          else
+            Isomorfeus.middlewares << new_middleware
+          end
+        end
+      end
+
+      def middlewares
+        @middlewares ||= Set.new
+      end
+
+      def valid_handler_class_names
+        @valid_handler_class_names ||= Set.new
+      end
+
+      def valid_handler_class_name?(class_name)
+        valid_handler_class_names.include?(class_name)
+      end
+
+      def add_valid_handler_class(klass)
+        valid_handler_class_names << raw_class_name(klass)
+      end
+
+      def cached_handler_classes
+        @cached_handler_classes ||= {}
+      end
+
+      def cached_handler_class(class_name)
+        return "::#{class_name}".constantize if Isomorfeus.development?
+        return cached_handler_classes[class_name] if cached_handler_classes.key?(class_name)
+        cached_handler_classes[class_name] = "::#{class_name}".constantize
+      end
+
+      def valid_user_class_names
+        @valid_user_class_names ||= Set.new
+      end
+
+      def valid_user_class_name?(class_name)
+        valid_user_class_names.include?(class_name)
+      end
+
+      def add_valid_user_class(klass)
+        valid_user_class_names << raw_class_name(klass)
+      end
+
+      def cached_user_classes
+        @cached_user_classes ||= {}
+      end
+
+      def cached_user_class(class_name)
+        return "::#{class_name}".constantize if Isomorfeus.development?
+        return cached_user_classes[class_name] if cached_user_classes.key?(class_name)
+        cached_user_classes[class_name] = "::#{class_name}".constantize
+      end
+
+      def current_user
+        Thread.current[:isomorfeus_user]
+      end
+
+      def pub_sub_client
+        Thread.current[:isomorfeus_pub_sub_client]
+      end
+
+      def session_store
+        @session_store ||= @session_store_init.call
+      end
+
+      def session_store_init(&block)
+        @session_store_init = block
+      end
+    end
+
+    self.session_store_init do
+      store_path = File.expand_path(File.join(Isomorfeus.root, 'data', Isomorfeus.env), 'session_store')
+      Isomorfeus::Transport::HamsterSessionStore.new(store_path) # dont use this one, but we keep it here to have at least something
+    end
+  end
+
+  # defaults
+  self.api_websocket_host = 'localhost'
+  self.api_websocket_port = '5000'
+  self.api_websocket_path = '/isomorfeus/api/websocket'
+
+  self.cookie_eater_path = '/isomorfeus/cookie/eat'
+end

data/lib/isomorfeus/transport/hamster_session_store.rb

@@ -0,0 +1,96 @@
+module Isomorfeus
+  module Transport
+    class HamsterSessionStore
+      class << self
+        def environment
+          @environment
+        end
+
+        def environment=(env)
+          @environment = env
+        end
+
+        def ref
+          @ref ||= 0
+        end
+
+        def ref=(val)
+          @ref = val
+        end
+
+        def refa
+          self.ref += 1
+        end
+
+        def refs
+          self.ref -= 1 if self.ref > 0
+        end
+
+        def finalize(cls)
+          proc do
+            cls.refs
+            if cls.ref == 0
+              cls.environment.close rescue nil
+            end
+          end
+        end
+      end
+
+      def initialize(cookie_hamster_path)
+        @cookie_hamster_path = cookie_hamster_path
+        open_environment
+        @db = self.class.environment.database('cookies', create: true)
+        ObjectSpace.define_finalizer(self, self.class.finalize(self.class))
+      end
+
+      def add(session_id:, cookie:, user:, accessor:)
+        @db.env.transaction do
+          @db.put(session_id, Oj.dump([user.class.to_s, user.key], mode: :strict))
+          @db.put(accessor, cookie)
+        end
+      end
+
+      def take_cookie(accessor:)
+        @db.env.transaction do
+          cookie = @db.get(accessor)
+          if cookie
+            session_info = cookie.split('; ').first
+            session_id = session_info.split('=').last.strip
+            @db.put("eaten_#{accessor}", session_id)
+            @db.delete(accessor)
+          else
+            # asked for the same cookie a second time
+            # can probably only be due to session hijacking
+            # so delete all sessions associated with that accessor
+            session_id = @db.get("eaten_#{accessor}")
+            @db.delete(session_id) if session_id
+          end
+          cookie
+        end
+      end
+
+      def get_user(session_id:)
+        json = @db.get(session_id)
+        if json
+          user_info = Oj.load(json, mode: :strict)
+          user_info[0].constantize.load(key: user_info[1]) if user_info
+        end
+      end
+
+      def remove(session_id:)
+        @db.env.transaction do
+          @db.delete(session_id)
+        end
+      end
+
+      private
+
+      def open_environment
+        return self.class.refa if self.class.environment
+        FileUtils.mkdir_p(@cookie_hamster_path) unless Dir.exist?(@cookie_hamster_path)
+        self.class.environment = Isomorfeus::Hamster.new(@cookie_hamster_path)
+        self.class.refa
+      end
+    end
+  end
+end