oceanex-slanger 0.7.1.4 → 0.7.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b8d982e2c189e52f3905e70cdcb0b4c9c00cbbe2cc7b173769ad547cecc58773
-  data.tar.gz: 8e045a72b30957002c11ba9015d5dc9fd06dbfe0b29274bbbd03cd67fa6a457e
+  metadata.gz: c29aabb135c13b3f60f650980b9472e0c14658d64e54054727fef3c14939d886
+  data.tar.gz: 512bc1d00c219b385cacf852d023eca1f52aa6b18eded305729ac832399917db
 SHA512:
-  metadata.gz: 883726b3449fa3f622aa9dbf5a380e7cfc7688bf660d6420d5bdeefdd8247049e958943ac0442d2d17591eca06993f77d1c532189b9bd5f520ef2839ee58e70d
-  data.tar.gz: ca574e7bec766e86e5d3ef783c46f7cfaa558e7be5b0fed6a81f6985859d222ab21a907537c04f7b5ed322f79c456e8c5cca3cb0dc6fddb2dabc6868ef3a0f4a
+  metadata.gz: bcdd9a96fc8de94b85bf9f8b438146127b474464c8a5e6bb235c85e5c76af2b05bd6ffa5ab92ab16257afed4a065fdc3e47e74b486903ba2e7ca44f6c6887b3b
+  data.tar.gz: e3b06bcc9e8fd6540f058be92c91f9027b205dd227fdd87afd896d6bf0bc52cc4ae55fa6a0a416ce74ec499cd6e48b5f57f1fe3cfbb2db00a36c0263d482790f

data/README.md

@@ -18,7 +18,7 @@ OceanEx Slanger is a standalone server ruby implementation of the Pusher protoco
 
 ## Requirements
 
-- Ruby 2.6.3 or greater
+- Ruby 3.0.1 or greater
 - Redis
 
 ## Server setup
@@ -218,8 +218,9 @@ OceanEx Slanger supports several configuration options, which can be supplied as
 # Current Core Team and Contributor
 - Joblee
 - Steve
-- Yao
 - Meng
+- Sniper
+- Jiayu
 
 
-© 2020 a OceanEx joint.
+© 2021 a OceanEx joint.

data/lib/slanger/api/server.rb

@@ -17,8 +17,8 @@ module Slanger
       set :raise_errors, lambda { false }
       set :show_exceptions, false
 
-      error(Signature::AuthenticationError) { |e| halt 401, "401 UNAUTHORIZED" }
-      error(Slanger::Api::InvalidRequest) { |c| halt 400, "400 Bad Request" }
+      error(Signature::AuthenticationError) { |_| halt 401, "401 UNAUTHORIZED" }
+      error(Slanger::Api::InvalidRequest) { |_| halt 400, "400 Bad Request" }
 
       before do
         valid_request
@@ -32,7 +32,7 @@ module Slanger
         EventPublisher.publish(valid_request.channels, event)
 
         status 202
-        return Oj.dump({}, mode: :compat)
+        Oj.dump({}, mode: :compat)
       end
 
       post "/apps/:app_id/channels/:channel_id/events" do
@@ -42,7 +42,7 @@ module Slanger
         EventPublisher.publish(valid_request.channels, event)
 
         status 202
-        return Oj.dump({}, mode: :compat)
+        Oj.dump({}, mode: :compat)
       end
 
       def valid_request

data/lib/slanger/channel.rb

@@ -12,7 +12,8 @@ require "oj"
 module Slanger
   class Channel
     extend Forwardable
-
+    CHANNEL_SUBSCRIBER_COUNT_KEY = "channel_subscriber_count"
+    CHANNEL_VACATED_DICT = "channel_vacated_dict"
     def_delegators :channel, :push
     attr_reader :channel_id
 
@@ -24,15 +25,17 @@ module Slanger
       end
 
       def lookup(channel_id)
-        all.detect { |o| o.channel_id == channel_id }
+        all[channel_id]
       end
 
       def create(params = {})
-        new(params).tap { |r| all << r }
+        new(params).tap do |channel|
+          all[channel.channel_id] = channel
+        end
       end
 
       def all
-        @all ||= []
+        @all ||= {}
       end
 
       def unsubscribe(channel_id, subscription_id)
@@ -54,7 +57,7 @@ module Slanger
     end
 
     def subscribe(*a, &blk)
-      Slanger::Redis.hincrby("channel_subscriber_count", channel_id, 1).
+      Slanger::Redis.channel_attend([CHANNEL_SUBSCRIBER_COUNT_KEY], [channel_id]).
         callback do |value|
         Slanger::Webhook.post name: "channel_occupied", channel: channel_id if value == 1
       end
@@ -63,9 +66,9 @@ module Slanger
     end
 
     def unsubscribe(*a, &blk)
-      Slanger::Redis.hincrby("channel_subscriber_count", channel_id, -1).
+      Slanger::Redis.channel_leave([CHANNEL_SUBSCRIBER_COUNT_KEY], [channel_id]).
         callback do |value|
-        Slanger::Webhook.post name: "channel_vacated", channel: channel_id if value == 0
+        Slanger::Webhook.post name: "channel_vacated", channel: channel_id if value == 1
       end
 
       channel.unsubscribe *a, &blk
@@ -93,7 +96,7 @@ module Slanger
     private
 
     def perform_client_webhook!(message)
-      if (message["event"].start_with?("client-"))
+      if message["event"].start_with?("client-")
         event = message.merge({ "name" => "client_event" })
         event["data"] = Oj.dump(event["data"])
 

data/lib/slanger/config.rb

@@ -12,9 +12,15 @@ module Slanger
 
     def options
       @options ||= {
-        api_host: "0.0.0.0", api_port: "4567", websocket_host: "0.0.0.0",
-        websocket_port: "8080", debug: false, redis_address: "redis://0.0.0.0:6379/0",
-        socket_handler: Slanger::Handler, require: [], activity_timeout: 120,
+        api_host: "0.0.0.0",
+        api_port: "4567",
+        websocket_host: "0.0.0.0",
+        websocket_port: "8080",
+        debug: false,
+        redis_address: "redis://0.0.0.0:6379/0",
+        socket_handler: Slanger::Handler,
+        require: [],
+        activity_timeout: 120,
       }
     end
 

data/lib/slanger/connection.rb

@@ -22,7 +22,7 @@ module Slanger
       begin
         send_payload nil, "pusher:error", e
       rescue EventMachine::WebSocket::WebSocketError
-        # Raised if connecection already closed. Only seen with Thor load testing tool
+        # Raised if connection already closed. Only seen with Thor load testing tool
       end
     end
 

data/lib/slanger/handler.rb

@@ -59,7 +59,7 @@ module Slanger
         error({ code: 4007, message: "Unsupported protocol version" })
         @socket.close_websocket
       else
-        return connection.establish
+        connection.establish
       end
     end
 

data/lib/slanger/lua/channel_attend.lua

@@ -0,0 +1,9 @@
+local key = KEYS[1]
+local filed = ARGV[1]
+local number = redis.call('hincrby', key, filed, 1)
+if number <= 0 then
+  redis.call('hset', key, filed, 1)
+  return 1
+else
+  return number
+end

data/lib/slanger/lua/channel_leave.lua

@@ -0,0 +1,8 @@
+local key = KEYS[1]
+local filed = ARGV[1]
+local number = redis.call('hincrby', key, filed, -1)
+if number <= 0 then
+  return redis.call('hdel', key, filed)
+else
+  return 0
+end

data/lib/slanger/presence_channel.rb

@@ -65,7 +65,7 @@ module Slanger
     end
 
     def unsubscribe(public_subscription_id)
-      # Unsubcribe from EM::Channel
+      # Unsubscribe from EM::Channel
       channel.unsubscribe(internal_subscription_table.delete(public_subscription_id)) # if internal_subscription_table[public_subscription_id]
       # Remove subscription data from Redis
       roster_remove public_subscription_id

data/lib/slanger/redis.rb

@@ -34,6 +34,14 @@ module Slanger
       send_command :hdel, *arg
     end
 
+    def channel_leave(*arg)
+      send_command :channel_leave, *arg
+    end
+
+    def channel_attend(*arg)
+      send_command :channel_attend, *arg
+    end
+
     def hgetall(*arg)
       send_command :hgetall, *arg
     end

data/lib/slanger/version.rb

@@ -1,3 +1,3 @@
 module Slanger
-  VERSION = "0.7.1.4"
+  VERSION = "0.7.3.0"
 end

data/lib/slanger/web_socket_server.rb

@@ -1,3 +1,5 @@
+$:.unshift(File.expand_path('../../lib', __FILE__))
+require 'em-hiredis'
 require "eventmachine"
 require "em-websocket"
 
@@ -10,6 +12,8 @@ module Slanger
       end
 
       EM.run do
+        scripts_dir = File.expand_path("../lua", __FILE__)
+        EM::Hiredis::Client.load_scripts_from(scripts_dir)
         options = {
           host: Slanger::Config[:websocket_host],
           port: Slanger::Config[:websocket_port],
@@ -24,7 +28,7 @@ module Slanger
 
         EM::WebSocket.start options do |ws|
           # Keep track of handler instance in instance of EM::Connection to ensure a unique handler instance is used per connection.
-          ws.class_eval { attr_accessor :connection_handler }
+          ws.class.class_eval { attr_accessor :connection_handler } unless ws.respond_to?(:connection_handler)
           # Delegate connection management to handler instance.
           ws.onopen { |handshake| ws.connection_handler = Slanger::Config.socket_handler.new ws, handshake }
           ws.onmessage { |msg| ws.connection_handler.onmessage msg }

data/spec/integration/replaced_handler_spec.rb

@@ -8,7 +8,7 @@ class ReplacedHandler < Slanger::Handler
   end
 end
 
-describe "Replacable handler" do
+describe "Replaceable handler" do
   it "says welcome" do
     start_slanger_with_options socket_handler: ReplacedHandler
 

metadata

@@ -1,17 +1,18 @@
 --- !ruby/object:Gem::Specification
 name: oceanex-slanger
 version: !ruby/object:Gem::Version
-  version: 0.7.1.4
+  version: 0.7.3.0
 platform: ruby
 authors:
 - Joblee
 - Steve
-- Yao
 - Meng
+- Sniper
+- Jiayu
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-09-15 00:00:00.000000000 Z
+date: 2022-03-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: eventmachine
@@ -47,28 +48,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.5.1
+        version: 0.5.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.5.1
+        version: 0.5.2
 - !ruby/object:Gem::Dependency
   name: rack
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.2'
+        version: 2.2.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.2'
+        version: 2.2.3
 - !ruby/object:Gem::Dependency
   name: rack-fiber_pool
   requirement: !ruby/object:Gem::Requirement
@@ -103,14 +104,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 6.0.3
+        version: 6.1.3.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 6.0.3
+        version: 6.1.3.2
 - !ruby/object:Gem::Dependency
   name: sinatra
   requirement: !ruby/object:Gem::Requirement
@@ -131,14 +132,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.7.2
+        version: 1.8.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.7.2
+        version: 1.8.1
 - !ruby/object:Gem::Dependency
   name: em-http-request
   requirement: !ruby/object:Gem::Requirement
@@ -159,98 +160,98 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.10.14
+        version: 3.11.6
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.10.14
+        version: 3.11.6
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.9.0
+        version: 3.10.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.9.0
+        version: 3.10.0
 - !ruby/object:Gem::Dependency
   name: pusher
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3.3
+        version: 2.0.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3.3
+        version: 2.0.1
 - !ruby/object:Gem::Dependency
   name: haml
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 5.1.2
+        version: 5.2.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 5.1.2
+        version: 5.2.1
 - !ruby/object:Gem::Dependency
   name: timecop
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.9.1
+        version: 0.9.4
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.9.1
+        version: 0.9.4
 - !ruby/object:Gem::Dependency
   name: webmock
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.8.3
+        version: 3.13.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.8.3
+        version: 3.13.0
 - !ruby/object:Gem::Dependency
   name: mocha
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.11.2
+        version: 1.12.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.11.2
+        version: 1.12.0
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
@@ -285,28 +286,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.1.4
+        version: 2.2.20
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.1.4
+        version: 2.2.20
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 13.0.1
+        version: 13.0.3
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 13.0.1
+        version: 13.0.3
 description: The Oceanex Slanger inherits from unmaintained project Slanger and continue
   to provide update and fixes
 email:
@@ -328,6 +329,8 @@ files:
 - lib/slanger/connection.rb
 - lib/slanger/handler.rb
 - lib/slanger/logger.rb
+- lib/slanger/lua/channel_attend.lua
+- lib/slanger/lua/channel_leave.lua
 - lib/slanger/presence_channel.rb
 - lib/slanger/presence_subscription.rb
 - lib/slanger/private_subscription.rb
@@ -357,7 +360,7 @@ licenses:
 - MIT
 metadata:
   homepage_uri: https://github.com/OceanEx/slanger
-  source_code_uri: https://github.com/OceanEx/slanger/archive/v0.7.1.4.zip
+  source_code_uri: https://github.com/OceanEx/slanger/archive/v0.7.3.0.zip
   changelog_uri: https://github.com/OceanEx/slanger/releases
 post_install_message: 
 rdoc_options: []