spsclient_m2m 0.2.1 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c2bb26880801c34a293766aaf37bd27ad40efa2c
-  data.tar.gz: 490e3a0661fa27166eebb82d77a8cdcb525e0254
+  metadata.gz: 86bde5a369f2d808d30a1f8934ea12edd55352ff
+  data.tar.gz: fcea0d03dcdede5e2a60e95382c5a10f23864cee
 SHA512:
-  metadata.gz: a8e32b336468045bc1439503367e3fb5fcb82cf5a550d7180996d963aeb825e24314e29290505357ad94bc3883d241a2fe95d8af76ee6b92b0612d474efb0190
-  data.tar.gz: dc892b9bf1fc5ae2126dca4306edef5129fa0a5154dbcaa450647c9c9b84f2397083c6cd4dce1246358efa88bf0944dcc463714fe16fc9f3363b8bd72e734ce7
+  metadata.gz: ea430829a9fb735dcb8575ee5fa3be1e00645491042895f4a2086d4304c6d331b448f9a69f4bd542690f946f2b69e0a54c1e7f4c021ae6ff3ed927769e4592b2
+  data.tar.gz: 26980140de874d9090eca6b9564913d97a97077b47b1080798ab43caced0d0ed29fd0b3cdd44be3f58eb347ba3badda04b3c8d615fae76991032e7429975cb19

data/lib/spsclient_m2m.rb

@@ -6,106 +6,88 @@
 require 'logger'
 require 'polyrex'
 require 'spstrigger_execute'
-require 'websocket-eventmachine-client'    
+require 'sps-sub'    
 
 
 class SPSClientM2M
 
-  def initialize(rsc, reg, sps_keywords_url, px_url, logfile: nil, \
-                                          sps: {host: 'sps', port: '59000'})
+  def initialize(rsc, reg, keywords, px_url, logfile: nil, \
+                             sps_host: 'sps', sps_port: '59000', topic: '#')
           
     @rsc = rsc
     @log = Logger.new(logfile,'daily') if logfile
 
-    @sps_address = "%s:%s" % [sps[:host], sps[:port]]
+    @sps_address = "%s:%s" % [sps_host, sps_port]
+    @topic = topic
+    
+    @sps = SPSSub.new host: sps_host, port: sps_port
     
     px = Polyrex.new px_url
 
-    @ste = SPSTriggerExecute.new sps_keywords_url, reg, px, logfile: 'ste.log'
+    @ste = SPSTriggerExecute.new keywords, reg, px, logfile: 'ste.log'
 
   end
   
   def run()
-
+ 
     rsc = @rsc
     ste = @ste
-    sps_address = @sps_address
     
-    EM.run do
-
-      ws = WebSocket::EventMachine::Client.connect(:uri => 'ws://' + sps_address)
-
-      ws.onopen do
-        puts "Client connected"
-      end
-
-      ws.onmessage do |msg, type|
+    @sps.subscribe(topic: @topic) do |raw_message, topic|
 
-        log 'msg : ' + msg.inspect
-        topic, raw_message = msg.split(/\s*:\s*/,2)
-        puts "[%s] SPS M2M kywrd lstnr INFO %s: %s" % \
-                        [Time.now.strftime("%D %H:%M"), topic, raw_message]
+      puts "[%s] SPS M2M kywrd lstnr INFO %s: %s" % \
+                      [Time.now.strftime("%D %H:%M"), topic, raw_message]
 
-        a = ste.mae topic, raw_message
-        log 'a: ' + a.inspect
+      a = ste.mae topic, raw_message
+      log 'a: ' + a.inspect
 
-        # obj is the DRb object, r is the result from find_match, 
-        # a is the Dynarex lookup array, ws is the websocket.
+      # obj is the DRb object, r is the result from find_match, 
+      # a is the Dynarex lookup array
 
-        if a.length > 0 then
-          
-          h = {
+      if a.length > 0 then
+        
+        h = {
+        
+          rse: ->(x, rsc){
           
-            rse: ->(x){
+            job = x.shift[/\/\/job:(.*)/,1]                  
+            package_path = x.shift 
+            package = package_path[/([^\/]+)\.rsf$/,1]
             
-              job = x.shift[/\/\/job:(.*)/,1]                  
-              package_path = x.shift 
-              package = package_path[/([^\/]+)\.rsf$/,1]
-              
-              log "job: %s path: %s package: %s" % [job, package_path, package]
-              rsc.run_job package, job, {}, args=x, package_path: package_path
-            }, 
-            sps: ->(x){ ws.send x },
-            ste: ->(x){ ste.run x }
-          }
-
-        end
+            log "job: %s path: %s package: %s" % [job, package_path, package]
+            log 'foo: ' + rsc.r.hello
+            rsc.run_job package, job, {}, args=x, package_path: package_path
+          }, 
+          sps: ->(x, rsc){ @sps.notice x },
+          ste: ->(x, rsc){ log 'before ste run'; ste.run x }
+        }
+
+      end
+
+      EM.defer do          
         
-        EM.defer do  
+        a.each do |type, x| 
           
-          a.each do |type, x| 
+          Thread.new do
             
             begin
-              h[type].call x
+              h[type].call x, rsc
             rescue
               warning =  'SPSClientM2M warning: ' + ($!).inspect
               puts warning
               log warning
             end
             
-          end
+          end # /thread
           
-        end
-      end
-
-      ws.onclose do
-        puts "Client disconnected"
-      end
-
-      EventMachine.next_tick do
-        ws.send 'subscribe to topic: #'
-        ws.send 'rse_info: spsclient_m2m connected'
-      end
-      
-      EventMachine.error_handler{ |e|
-        puts "Error raised during event loop: #{e.message}"
+        end # /each
+        
+      end      
       
-      }
-
-    end
-  
+    end        
+    
   end
-  
+
   private
   
   def log(s)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: spsclient_m2m
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.3.0
 platform: ruby
 authors:
 - James Robertson
@@ -31,7 +31,7 @@ cert_chain:
   9PUm89FQvfRnzWxLuS4+ZXMo8Zo4MQHDdOuNAQpSDGVy1GIHrNU04foP5Bd86hc0
   78GKZWkTxeiOTA==
   -----END CERTIFICATE-----
-date: 2016-04-27 00:00:00.000000000 Z
+date: 2017-04-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: polyrex
@@ -39,20 +39,20 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '1.1'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.1.1
+        version: 1.1.12
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '1.1'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.1.1
+        version: 1.1.12
 - !ruby/object:Gem::Dependency
   name: spstrigger_execute
   requirement: !ruby/object:Gem::Requirement
@@ -74,27 +74,27 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 0.4.6
 - !ruby/object:Gem::Dependency
-  name: websocket-eventmachine-client
+  name: sps-sub
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '0.3'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.1.0
+        version: 0.3.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '0.3'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.1.0
+        version: 0.3.4
 description: 
-email: james@r0bertson.co.uk
+email: james@jamesrobertson.eu
 executables: []
 extensions: []
 extra_rdoc_files: []
@@ -120,7 +120,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.8
+rubygems_version: 2.6.8
 signing_key: 
 specification_version: 4
 summary: The SPSClient_M2M gem is designed to run as a service with the RSF_Services