oceanex-slanger 0.7.2.0 → 0.7.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fd9b25eb92c9c65e280f5c95abacbd2017839495426d90c6bfcad80edb2eacb1
-  data.tar.gz: 347ccd8a7b564ae37bcce1ee0b42450f475c16a04516a4e32d2e884c3c956c40
+  metadata.gz: c29aabb135c13b3f60f650980b9472e0c14658d64e54054727fef3c14939d886
+  data.tar.gz: 512bc1d00c219b385cacf852d023eca1f52aa6b18eded305729ac832399917db
 SHA512:
-  metadata.gz: 202ffef21123fa3a76eccb2ba95332ce2c7412162dd46abf24bc599259f12988223ef2e458d9e9c8c0583459a1e44d10a0c4729842bd42ca0f455e3d280d6cb1
-  data.tar.gz: fe7251ce34692a9a57ab8b65d746324753860de89ec3f60e982b53f1ba85157ebf4c0471554b9b4edbe75690e8db8d985ee2acad900ee6d5a60ec219f9c8c901
+  metadata.gz: bcdd9a96fc8de94b85bf9f8b438146127b474464c8a5e6bb235c85e5c76af2b05bd6ffa5ab92ab16257afed4a065fdc3e47e74b486903ba2e7ca44f6c6887b3b
+  data.tar.gz: e3b06bcc9e8fd6540f058be92c91f9027b205dd227fdd87afd896d6bf0bc52cc4ae55fa6a0a416ce74ec499cd6e48b5f57f1fe3cfbb2db00a36c0263d482790f

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
 
@@ -56,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
@@ -65,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

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/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.2.0"
+  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],

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: oceanex-slanger
 version: !ruby/object:Gem::Version
-  version: 0.7.2.0
+  version: 0.7.3.0
 platform: ruby
 authors:
 - Joblee
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-06-15 00:00:00.000000000 Z
+date: 2022-03-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: eventmachine
@@ -329,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
@@ -358,7 +360,7 @@ licenses:
 - MIT
 metadata:
   homepage_uri: https://github.com/OceanEx/slanger
-  source_code_uri: https://github.com/OceanEx/slanger/archive/v0.7.2.0.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: []
@@ -368,14 +370,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 3.0.1
+      version: 2.6.3
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.20
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: A websocket service compatible with Pusher libraries