nchan_tools 0.1.7 → 0.1.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9cce7f7cc54b6764afddca855f9e1a58d929f05a81b7d364489ff87d9f298e81
-  data.tar.gz: 9892571bd84b6779007eaf94a151f1d0e42209396848bddf22e3bcfabe83475d
+  metadata.gz: 2c506959c2eba296db96ed5e1598412798117f4e33bae4a909e223148a829b4a
+  data.tar.gz: 4f178a9eac6fa954d06b5f9f4d6d21cb5c3e6320390e3f422fdcb0589e5276d9
 SHA512:
-  metadata.gz: 23fb2e18d4885b2cdff8fbb8e79ed1b99fd65ff51f247ba908b24bb604c0a541c7d553e264578a8d799c7edd35c545bb9275e50704ea20b2009c363f459ec425
-  data.tar.gz: fbdfd34328967212fcbff8f491cf2109da6ba5b3856d07abe654992197fad874bb844a5a7ec7ac26b4db0b177d2e37bfb1b8d45c33c4ecc4a3cb60192818bf07
+  metadata.gz: 183363cebe229289e9c3eb0c0989a2816b7bb06c2f3650a81fdad8b5a22c1a2502bd182081a49bbcdf076d0eef219f0ae8f3ccff6a31252e8a137d1940347231
+  data.tar.gz: e5c09c1e6759dd835fb9699a96e63e6d2bbb7ae7adefac324cae19083f0921d3699fc88bdeb54dde4810153ed9cf528d22f9829688c8f9a02fb2f547f507debf

data/exe/nchan-redis-debug

@@ -4,32 +4,31 @@ require "redis"
 require "optparse"
 require 'nchan_tools/rdsck'
 
-$opt = {
+opt = {
   url: "redis://127.0.0.1:6379/",
   verbose: false,
   command: nil
 }
 
-def dbg(...)
-  if $opt[:verbose]
-    print("# ")
-    puts(...)
-  end
-end
-
 opt_parser=OptionParser.new do |opts|
-  opts.on("--url", "--url REDIS_URL (#{$opt[:url]})", "Redis server and port..") do |v|
-    $opt[:url]=v
+  opts.on("--url", "--url REDIS_URL (#{opt[:url]})", "Redis server and port..") do |v|
+    opt[:url]=v
   end
   opts.on("-q", "--quiet", "output only results without any other information") do
-    $opt[:quiet]=false
+    opt[:quiet]=true
   end
   opts.on("--list-channels", "list all Nchan channels on Redis server or cluster") do |v|
-    $opt[:command]=:filter_channels
+    opt[:command]=:filter_channels
   end
+  opts.on("--watch-channels", "watch for changes in Nchan channels on Redis server or cluster") do |v|
+    opt[:command]=:watch_channels
+  end
+  opts.on("--set-notify-keyspace-events", "when using --watch-channels, sets the notify-keyspace-events Redis config before starting. May not be possible if the redis 'config' command is disabled") do
+    opt[:set_notify_keyspace_events] = true
+end
   opts.on("--filter-channels-min-subscribers=[NUMBER]") do |v|
-    $opt[:command]=:filter_channels
-    $opt[:min_subscribers]=v.to_i
+    opt[:command]||=:filter_channels
+    opt[:min_subscribers]=v.to_i
   end
 end
 opt_parser.banner= <<~EOB
@@ -46,18 +45,23 @@ opt_parser.banner= <<~EOB
 EOB
 opt_parser.parse!
 
-rdsck = Rdsck.new $opt
+opt[:verbose] = !opt[:quiet]
+
+rdsck = Rdsck.new opt
 if not rdsck.connect
-  STDERR.puts "failed to connect to #{$opt[:url]}"
+  STDERR.puts "failed to connect to #{opt[:url]}"
   exit 1
 end
 
-case $opt[:command]
+case opt[:command]
 when :filter_channels
-  puts "# scanning for channels #{$opt[:min_subscribers] && "with subscribers >= #{$opt[:min_subscribers]}"}"
-  chans = rdsck.filter_channels(min_subscribers: $opt[:min_subscribers])
-  puts "# found #{chans.count} channel#{chans.count != 1 && "s"}#{chans.count == 0 ? "." : ":"}"
+  rdsck.dbg "scanning for channels #{opt[:min_subscribers] && "with subscribers >= #{opt[:min_subscribers]}"}"
+  chans = rdsck.filter_channels(min_subscribers: opt[:min_subscribers])
+  rdsck.dbg "found #{chans.count} channel#{chans.count != 1 && "s"}#{chans.count == 0 ? "." : ":"}"
   puts chans.join("\n")
+when :watch_channels
+  rdsck.dbg "watching for channels #{opt[:min_subscribers] && "with subscribers >= #{opt[:min_subscribers]}"}"
+  rdsck.watch_channels({min_subscribers: opt[:min_subscribers]}, opt[:set_notify_keyspace_events])
 else
   puts "Nothing to do"
 end

data/lib/nchan_tools/rdsck.rb

@@ -1,10 +1,55 @@
 class Rdsck
+  require "async"
+  require "async/redis"
+  
+  #doesn't support psubscribe by default. can you believe it?!
+  class Async::Redis::Context::Psubscribe < Async::Redis::Context::Subscribe
+    MESSAGE = 'pmessage'
+  
+    def listen
+      while response = @connection.read_response
+        return response if response.first == MESSAGE
+      end
+    end
+    
+    def subscribe(channels)
+      @connection.write_request ['PSUBSCRIBE', *channels]
+      @connection.flush
+    end
+    
+    def unsubscribe(channels)
+      @connection.write_request ['PUNSUBSCRIBE', *channels]
+      @connection.flush
+    end
+  end
+  
+  class Async::Redis::Client
+    def psubscribe(*channels)                                                                                                                                             
+      context = Async::Redis::Context::Psubscribe.new(@pool, channels)                                                                                                            
+      return context unless block_given?                                                                                                                           
+      begin                                                                                                                                                        
+        yield context                                                                                                                                        
+      ensure                                                                                                                                                       
+        context.close                                                                                                                                        
+      end                                                                                                                                                          
+    end 
+  end
+  
   attr_accessor :url, :verbose, :namespace
   attr_accessor :redis, :masters
+  
+  def dbg(*args)
+    if @verbose
+      print("# ")
+      puts(*args)
+    end
+  end
+  
   def initialize(opt)
     @url=opt[:url]
     @verbose=opt[:verbose]
     @namespace=opt[:namespace]
+    @channel_id=opt[:channel_id]
   end
   
   def cluster?
@@ -13,8 +58,10 @@ class Rdsck
   
   def connect
     begin
-      @redis=Redis.new url: $opt[:url]
+      @redis=Redis.new url: @url
+      
       mode = redis.info["redis_mode"]
+      
     rescue StandardError => e
       STDERR.puts e.message
       return false
@@ -23,7 +70,7 @@ class Rdsck
     if mode == "cluster"
       @redis.close
       begin
-        @redis=Redis.new cluster: [$opt[:url]]
+        @redis=Redis.new cluster: [@url]
         @redis.ping
       rescue StandardError => e
         STDERR.puts e.message
@@ -49,7 +96,7 @@ class Rdsck
   end
   
   def key(subkey=nil)
-    k = "{channel:#{$opt[:namespace]}/#{$opt[:channel_id]}}"
+    k = "{channel:#{@namespace}/#{@channel_id}}"
     return subkey ? "#{k}:#{subkey}" : k
   end
   
@@ -60,6 +107,90 @@ class Rdsck
     #...
   end
   
+  class Watch
+    def initialize(rdsck, node, filters, set_notify_config = nil)
+      @rdsck = rdsck
+      @sync = node
+      @filters = filters
+      @set_notify_config = set_notify_config
+      @host, @port, @location = @sync.connection[:host], @sync.connection[:port]
+      @url = @sync.connection[:id]
+      @async = Async::Redis::Client.new(Async::IO::Endpoint.tcp(@host, @port))
+      if set_notify_config
+        @rdsck.dbg "set #{@url} notify-keyspace-events to \"Kh\""
+        @prev_notify_keyspace_event_config = @sync.config("get", "notify-keyspace-events")
+        @prev_notify_keyspace_event_config = @prev_notify_keyspace_event_config[1] if @prev_notify_keyspace_event_config
+        
+        @sync.config :set, "notify-keyspace-events", "Kh"
+      end
+    end
+    
+    def watch(task)
+      task.async do
+        #puts "subscribeme"
+        while true do
+          @async.psubscribe "__keyspace*__:{channel:*}" do |ctx|
+            type, pattern, name, msg = ctx.listen
+            #puts "TYPE: #{type}, PAT:#{pattern}, NAME:#{name}, MSG:#{msg}"
+            m=name.match(/^__.*__:(\{.*\})/)
+            if m && m[1]
+              key = m[1]
+              
+              filtered = false
+              subs = nil
+              
+              if @filters[:min_subscribers]
+                subs = @sync.hget key, "fake_subscribers"
+                subs = subs.to_i
+                filtered = true if subs < @filters[:min_subscribers]
+              end
+              
+              if !filtered
+                if subs
+                  puts "#{key} subscribers: #{subs}"
+                else
+                  puts "#{key}"
+                end
+              end
+              
+            end
+          end
+        end
+      end
+    end
+    
+    def stop
+      @async.close
+      if @set_notify_config
+        @rdsck.dbg "set #{@url} notify-keyspace-events back to #{@prev_notify_keyspace_event_config}"
+        @sync.config(:set, "notify-keyspace-events", @prev_notify_keyspace_event_config)
+      end
+    end
+  end
+  
+  def watch_channels(filters={}, set_notify_keyspace_events=nil)
+    watchers = []
+    @masters.each do |m|
+      watchers << Watch.new(self, m, filters, set_notify_keyspace_events)
+    end
+
+
+    begin
+      Async do |task|
+        watchers.each do |watcher|
+          watcher.watch(task)
+        end
+      end
+    rescue Interrupt => e
+      dbg "stopping watch"
+    ensure
+      watchers.each do |watcher|
+        watcher.stop
+      end
+    end
+    
+  end
+  
   def filter_channels(filters={})
     script = <<~EOF
       local prev_cursor = ARGV[1]
@@ -91,7 +222,7 @@ class Rdsck
     
     results = []
     batch_size=500
-    masters.each do |m|
+    @masters.each do |m|
       hash = m.script "load", script
       cursor, pattern = "0", "{channel:*}"
       loop do

data/lib/nchan_tools/version.rb

@@ -1,3 +1,3 @@
 module NchanTools
-  VERSION = "0.1.7"
+  VERSION = "0.1.12"
 end

data/nchan_tools.gemspec

@@ -29,6 +29,9 @@ Gem::Specification.new do |spec|
   spec.add_dependency "celluloid"
   spec.add_dependency "celluloid-io"
   spec.add_dependency "HDRHistogram"
+  spec.add_dependency "redis", "~>4.2.0"
+  spec.add_dependency "async"
+  spec.add_dependency "async-redis"
   
   spec.add_dependency "websocket-driver"
   spec.add_dependency 'websocket-extensions'
@@ -38,6 +41,6 @@ Gem::Specification.new do |spec|
     spec.add_dependency 'http-2'
   end  
   spec.add_development_dependency "pry"
-  spec.add_development_dependency "bundler", "~> 1.16"
-  spec.add_development_dependency "rake", "~> 10.0"
+  spec.add_development_dependency "bundler"
+  spec.add_development_dependency "rake"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: nchan_tools
 version: !ruby/object:Gem::Version
-  version: 0.1.7
+  version: 0.1.12
 platform: ruby
 authors:
 - Leo Ponomarev
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2020-12-29 00:00:00.000000000 Z
+date: 2021-02-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: typhoeus
@@ -94,6 +94,48 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: redis
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 4.2.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 4.2.0
+- !ruby/object:Gem::Dependency
+  name: async
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: async-redis
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: websocket-driver
   requirement: !ruby/object:Gem::Requirement
@@ -182,30 +224,30 @@ dependencies:
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.16'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.16'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '0'
 description: publishing, subscribing, testing, and benchmarking utilities for Nchan.
 email:
 - leo@nchan.io
@@ -254,7 +296,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.4
+rubygems_version: 3.2.7
 signing_key:
 specification_version: 4
 summary: Development and testing utilities for Nchan