loco-rails 4.1.1 → 6.1.0

data/lib/loco/sender.rb

@@ -2,43 +2,60 @@
 
 module Loco
   class Sender
-    def initialize(recipient, data = {})
-      @recipients = [*recipient]
-      @data = data
+    class << self
+      def call(recipient_s, payload = {})
+        payload = with_idempotency_key(payload)
+        recipients = recipient_s.is_a?(Array) ? recipient_s : [recipient_s]
+        new.(recipients, payload)
+      end
+
+      private
+
+      def with_idempotency_key(payload)
+        hash = payload.clone
+        hash[:loco] ||= {}
+        hash[:loco][:idempotency_key] ||= hash[:idempotency_key] || SecureRandom.hex
+        hash.delete(:idempotency_key)
+        hash
+      end
+    end
+
+    def initialize
+      @uuids = []
     end
 
-    def emit
-      uuids.each do |uuid|
-        NotificationCenterChannel.broadcast_to(uuid, payload)
+    def call(recipients, payload)
+      recipients.each do |recipient|
+        case recipient
+        when String then broadcast_to(recipient, payload)
+        when Hash then process_hash(recipient, payload)
+        else find_and_broadcast_to(recipient, payload)
+        end
       end
       payload[:loco][:idempotency_key]
     end
 
     private
 
-    def uuids
-      @recipients.map do |r|
-        if r.is_a? String
-          r
-        elsif r.is_a? Hub
-          recipients_from_hub r
-        else
-          WsConnectionManager.new(r).connected_uuids
-        end
-      end.flatten.uniq
+    def process_hash(recipient, payload)
+      if recipient.key?('token')
+        find_and_broadcast_to(recipient['token'], payload)
+      elsif recipient.key?('class')
+        find_and_broadcast_to(recipient['class'].constantize, payload)
+      end
     end
 
-    def recipients_from_hub(hub)
-      hub.raw_members.map do |m|
-        WsConnectionManager.new(m).connected_uuids
-      end.flatten.uniq
+    def find_and_broadcast_to(recipient, payload)
+      WsConnectionFinder.(recipient) do |uuid|
+        broadcast_to(uuid, payload)
+      end
     end
 
-    def payload
-      @data[:loco] ||= {}
-      @data[:loco][:idempotency_key] ||= @data[:idempotency_key] || SecureRandom.hex
-      @data.delete(:idempotency_key)
-      @data
+    def broadcast_to(uuid, payload)
+      return if @uuids.include?(uuid)
+
+      @uuids << uuid
+      NotificationCenterChannel.broadcast_to(uuid, payload)
     end
   end
 end

data/lib/loco/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Loco
-  VERSION = '4.1.1'
+  VERSION = '6.1.0'
 end

data/lib/loco/ws_connection_checker.rb

@@ -0,0 +1,16 @@
+# frozen_string_literal: true
+
+module Loco
+  module WsConnectionChecker
+    module_function
+
+    def call(identifier, skip: nil)
+      WsConnectionStorage.current.members(identifier).each do |uuid|
+        next if uuid == skip
+        next if WsConnectionStorage.current.get(uuid) == 'ok'
+
+        WsConnectionManager.new(identifier, identifier: true).del(uuid, skip_checker: true)
+      end
+    end
+  end
+end

data/lib/loco/ws_connection_finder.rb

@@ -0,0 +1,30 @@
+# frozen_string_literal: true
+
+module Loco
+  class WsConnectionFinder
+    class << self
+      def call(resources, &block)
+        storage = WsConnectionStorage.current
+        resources = [resources] unless resources.is_a?(Array)
+        resources.each do |resource|
+          case resource
+          when :all then storage.scan(all: true, &block)
+          when Hub then search_the_hub(resource, &block)
+          when Class
+            storage.scan(match: "#{WsConnectionIdentifier.(resource)}:*", &block)
+          else
+            storage.members(WsConnectionIdentifier.(resource)).each(&block)
+          end
+        end
+      end
+
+      private
+
+      def search_the_hub(resource, &block)
+        WsConnectionStorage.current.members(resource.full_name).map do |serialized|
+          WsConnectionStorage.current.members(serialized).each(&block)
+        end
+      end
+    end
+  end
+end

data/lib/loco/ws_connection_identifier.rb

@@ -0,0 +1,15 @@
+# frozen_string_literal: true
+
+module Loco
+  module WsConnectionIdentifier
+    module_function
+
+    def call(resource)
+      case resource
+      when String then resource
+      when Class then resource.name.downcase
+      else "#{resource.class.name.downcase}:#{resource.id}"
+      end
+    end
+  end
+end

data/lib/loco/ws_connection_manager.rb

@@ -2,92 +2,38 @@
 
 module Loco
   class WsConnectionManager
-    def initialize(resource)
-      @resource = resource
-    end
-
-    def identifier
-      return @resource if @resource.is_a?(String)
-
-      "#{@resource.class.name.downcase}:#{@resource.id}"
-    end
-
-    def connected?(uuid)
-      connected_uuids.include? uuid
-    end
+    EXPIRATION = 60 * 3
 
-    def connected_uuids
-      data.find_all { |_, v| v.is_a? String }.to_h.keys
+    def initialize(resource, opts = {})
+      if opts[:identifier]
+        @identifier = resource
+      else
+        @resource = resource
+      end
     end
 
     def add(uuid)
-      update uuid
-      check_connections
+      WsConnectionStorage.current.add(identifier, uuid)
+      WsConnectionStorage.current.add("uuid:#{uuid}", identifier)
+      update(uuid)
+      WsConnectionChecker.(identifier, skip: uuid)
     end
 
-    def del(uuid)
-      save(data.tap { |h| h.delete uuid })
-      check_connections
+    def del(uuid, skip_checker: false)
+      WsConnectionStorage.current.rem(identifier, uuid)
+      WsConnectionStorage.current.rem("uuid:#{uuid}", identifier)
+      WsConnectionStorage.current.del(uuid)
+      WsConnectionChecker.(identifier) unless skip_checker
     end
 
     def update(uuid)
-      save(data.tap { |h| h[uuid] = current_time })
+      WsConnectionStorage.current.set(uuid, 'ok', ex: EXPIRATION)
     end
 
-    def destroy
-      WsConnectionStorage.current.del identifier
-    end
-
-    protected
-
-    def data
-      serialized_uuids = WsConnectionStorage.current.get identifier
-      return {} if serialized_uuids.blank?
-
-      JSON.parse serialized_uuids
-    end
-
-    def uuids
-      data.keys
-    end
+    private
 
-    def save(hash)
-      WsConnectionStorage.current.set identifier, hash.to_json
-    end
-
-    def check_connections
-      hash = data.to_a.map do |arr|
-        uuid, val = check_connection arr.first, arr.last
-        [uuid, val]
-      end.to_h.compact
-      save hash
-    end
-
-    def check_connection(uuid, val)
-      case val
-      when String
-        val = check_connection_str uuid, val
-      when Hash
-        uuid, val = check_connection_hash uuid, val
-      end
-      [uuid, val]
-    end
-
-    def check_connection_str(uuid, val)
-      return val if Time.zone.parse(val) >= 3.minutes.ago
-
-      SenderJob.perform_later uuid, loco: { connection_check: true }
-      { 'check' => current_time }
-    end
-
-    def check_connection_hash(uuid, val)
-      return [uuid, val] if Time.zone.parse(val['check']) >= 5.seconds.ago
-
-      [nil, nil]
-    end
-
-    def current_time
-      Time.current.iso8601(6)
+    def identifier
+      @identifier ||= WsConnectionIdentifier.(@resource)
     end
   end
 end

data/lib/loco/ws_connection_storage.rb

@@ -13,37 +13,77 @@ module Loco
     end
 
     def initialize
-      @storage = Config.redis_instance || {}
+      @storage = Config.redis_instance
     end
 
-    def get(key)
-      case @storage
-      when Hash
-        storage[proper_key(key)]
+    def type(key)
+      storage.type(proper_key(key))
+    end
+
+    def exists?(key)
+      storage.exists?(proper_key(key))
+    end
+
+    def get(key, hkey = nil)
+      if hkey.nil?
+        storage.get(proper_key("k:#{key}"))
       else
-        storage.get proper_key(key)
+        storage.hget(proper_key("h:#{key}"), hkey)
       end
     end
 
-    def set(key, val)
-      case @storage
-      when Hash
-        storage[proper_key(key)] = val
+    def set(key, val, opts = {})
+      if val.is_a?(Hash)
+        storage.hset(proper_key("h:#{key}"), val)
       else
-        storage.set proper_key(key), val
+        storage.set(proper_key("k:#{key}"), val, ex: opts[:ex])
       end
     end
 
-    def del(key)
-      case @storage
-      when Hash
-        storage.delete proper_key(key)
+    def del(key, hkey = nil)
+      if hkey.nil?
+        storage.del(proper_key("k:#{key}"))
       else
-        storage.del proper_key(key)
+        storage.hdel(proper_key("h:#{key}"), hkey)
+      end
+    end
+
+    def scan(match: nil, all: false, &block)
+      match = 'uuid:*' if all
+      storage.scan_each(match: "#{proper_key('s:')}#{match}").each do |key|
+        if all
+          yield(key.split('uuid:').last)
+        else
+          storage.smembers(key).each(&block)
+        end
       end
     end
 
-    protected
+    def scan_hash(key, &block)
+      storage.hscan_each(proper_key("h:#{key}"), &block)
+    end
+
+    def hlen(key)
+      storage.hlen(proper_key("h:#{key}"))
+    end
+
+    def add(key, val)
+      storage.sadd(proper_key("s:#{key}"), val)
+    end
+
+    def members(key)
+      storage.smembers(proper_key("s:#{key}"))
+    end
+
+    def member?(key, val)
+      storage.sismember(proper_key("s:#{key}"), val)
+    end
+
+    def rem(key, val)
+      storage.srem(proper_key("s:#{key}"), val)
+    end
+
+    private
 
     def proper_key(key)
       "#{Config.app_name}:#{key}"

data/lib/loco-rails.rb

@@ -5,12 +5,15 @@ require 'loco-rails-core'
 require 'loco/broadcaster'
 require 'loco/config'
 require 'loco/emitter'
-require 'loco/engine'
+require 'loco/rails/engine'
 require 'loco/helpers'
 require 'loco/hub'
+require 'loco/permissions_presenter'
 require 'loco/sender'
+require 'loco/ws_connection_checker'
 require 'loco/ws_connection_manager'
-require 'loco/ws_connected_resources_manager'
+require 'loco/ws_connection_finder'
+require 'loco/ws_connection_identifier'
 require 'loco/ws_connection_storage'
 
 module Loco
@@ -22,4 +25,32 @@ module Loco
       Config.configure config
     end
   end
+
+  def emit(obj, event = nil, opts = {})
+    Broadcaster.(
+      obj,
+      event,
+      payload: opts[:payload] || opts[:data],
+      recipients: opts[opts[:for] ? :for : :to]
+    )
+  end
+
+  def emit_to(recipient_s, data)
+    Sender.(recipient_s, data)
+  end
+
+  def add_hub(name, members = [])
+    Hub.set(name, members)
+  end
+
+  def get_hub(name)
+    Hub.get(name)
+  end
+
+  def del_hub(name)
+    hub = Hub.get(name)
+    return false if hub.nil?
+
+    hub.destroy
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: loco-rails
 version: !ruby/object:Gem::Version
-  version: 4.1.1
+  version: 6.1.0
 platform: ruby
 authors:
 - Zbigniew Humeniuk
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-09-13 00:00:00.000000000 Z
+date: 2022-09-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: loco-rails-core
@@ -44,76 +44,70 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.1.12
+        version: 3.1.16
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.1.12
+        version: 3.1.16
 - !ruby/object:Gem::Dependency
   name: capybara
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.28.0
+        version: 3.36.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.28.0
+        version: 3.36.0
 - !ruby/object:Gem::Dependency
   name: database_cleaner
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.7.0
+        version: 2.0.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.7.0
+        version: 2.0.1
 - !ruby/object:Gem::Dependency
   name: jbuilder
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.10.0
+        version: 2.11.5
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.10.0
+        version: 2.11.5
 - !ruby/object:Gem::Dependency
   name: listen
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 3.1.5
-    - - "<"
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.2'
+        version: 3.7.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 3.1.5
-    - - "<"
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.2'
+        version: 3.7.1
 - !ruby/object:Gem::Dependency
   name: mysql2
   requirement: !ruby/object:Gem::Requirement
@@ -134,28 +128,56 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.2'
+        version: 5.6.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.2'
+        version: 5.6.2
 - !ruby/object:Gem::Dependency
   name: redis
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.1.2
+        version: 4.5.1
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 4.5.1
+- !ruby/object:Gem::Dependency
+  name: rspec-expectations
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 3.10.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.1.2
+        version: 3.10.2
+- !ruby/object:Gem::Dependency
+  name: rspec-mocks
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 3.10.2
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 3.10.2
 - !ruby/object:Gem::Dependency
   name: rubocop
   requirement: !ruby/object:Gem::Requirement
@@ -190,42 +212,42 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.142'
+        version: 4.1.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.142'
+        version: 4.1.0
 - !ruby/object:Gem::Dependency
-  name: source_maps_fixer
+  name: sprockets-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 3.4.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 3.4.2
 - !ruby/object:Gem::Dependency
   name: will_paginate
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.1.8
+        version: 3.3.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.1.8
+        version: 3.3.1
 description: Rails is awesome, but modern web needs Loco-motive.
 email:
 - hello@artofcode.co
@@ -239,7 +261,6 @@ files:
 - app/controllers/loco/application_controller.rb
 - app/controllers/loco/notification_center_controller.rb
 - app/jobs/loco/sender_job.rb
-- app/jobs/loco/uuid_job.rb
 - app/models/loco/notification.rb
 - app/services/loco/notification/fetcher.rb
 - config/routes.rb
@@ -260,19 +281,23 @@ files:
 - lib/loco/broadcaster.rb
 - lib/loco/config.rb
 - lib/loco/emitter.rb
-- lib/loco/engine.rb
 - lib/loco/helpers.rb
 - lib/loco/hub.rb
+- lib/loco/permissions_presenter.rb
+- lib/loco/rails/engine.rb
 - lib/loco/sender.rb
 - lib/loco/version.rb
-- lib/loco/ws_connected_resources_manager.rb
+- lib/loco/ws_connection_checker.rb
+- lib/loco/ws_connection_finder.rb
+- lib/loco/ws_connection_identifier.rb
 - lib/loco/ws_connection_manager.rb
 - lib/loco/ws_connection_storage.rb
 homepage: http://locoframework.org
 licenses:
 - MIT
-metadata: {}
-post_install_message: 
+metadata:
+  rubygems_mfa_required: 'true'
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -280,15 +305,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.6.0
+      version: 2.7.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
-signing_key: 
+rubygems_version: 3.3.7
+signing_key:
 specification_version: 4
 summary: Framework on top of Rails.
 test_files: []