slack-rtm-receiver 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1821e8e1626538c67c4d4decf64cd3535011a2af
-  data.tar.gz: ab3b8e9761278e7988ecc4455d798f1522fa22c9
+  metadata.gz: 17f671256581c72171b3a58c97fc77da2da06320
+  data.tar.gz: 0183ff7477014ba33ed88078c0f222af1a12a52c
 SHA512:
-  metadata.gz: 49680d9a6a7fd5221a7f5d5f904c0c401c65b719c018de616742cbff52dc6899e2a573f7b31bedbff5653e85d12d685aa68b5d6dc8ef59ca2a2b2c96ae0c27eb
-  data.tar.gz: c4c5d3750d586452ef925e7cd0abaf5edb75934d8c8c2aaa57a441db00caaad2a1d2b2712e688ced049167f4e2a4746fa4aae901752a27b563c636e99441d7f3
+  metadata.gz: b4504c86920010d1e1f1d94c53ad7aad13df93d66d64db291b3bef15562e013a9283dd1610fc1754fb970d12c034869249a9ac4a5c2ef98ff237d9808c10966c
+  data.tar.gz: f530c30d2241548e823075f287ab60389c982738db526f0a8c05e95a6c4134b73ee3a301b8fb37727851645d2f43686781e60a8a3004f20d8cdda763b2f18d77

data/lib/slack-rtm-receiver/session.rb

@@ -1,3 +1,4 @@
+require 'json'
 require 'faye/websocket'
 
 
@@ -7,6 +8,7 @@ module SlackRTMReceiver
   class Session
 
     attr_reader :logger
+    attr_reader :self_uid
     attr_reader :websocket
     alias_method :ws, :websocket
     attr_reader :last_timestamp
@@ -15,6 +17,11 @@ module SlackRTMReceiver
     def initialize
       @logger = SlackRTMReceiver.logger
       logger.debug 'Initializing Session...'
+      reset_vars
+    end
+
+    def reset_vars
+      @self_uid = nil
       @websocket = nil
       @last_timestamp = nil
       @ping = nil
@@ -22,13 +29,18 @@ module SlackRTMReceiver
     end
 
     # Start RTM websocket session
-    # @param url [String] websocket URL
+    # @param json [String] rtm.start response from Starter
     # @return [Boolean] false if a session is already up
-    def start(url)
-      return false if ws
-      logger.debug "Connecting to websocket...\n URL: #{url}"
+    def start(json)
+      if ws
+        logger.info 'RTM session start requested, but already running. Ignoring...'
+        return false
+      end
+      h = parse_rtm_start_res(json)
+      @self_uid = h[:self_id]
+      logger.debug "I am Slack ID: #{self_uid}. Connecting to websocket...\n URL: #{h[:url]}"
       opts = {ping: 60}
-      @websocket = Faye::WebSocket::Client.new(url, nil, opts)
+      @websocket = Faye::WebSocket::Client.new(h[:url], nil, opts)
 
       ws.on :open do
         logger.debug 'Websocket opened'
@@ -62,7 +74,7 @@ module SlackRTMReceiver
     # @param event [Hash] RTM event; 'id' will be added automatically
     # @return [Hash] the event that was sent
     def send_event(event)
-      return nil unless ws
+      return nil unless alive?
       event[:id] = new_event_id
       ws.send(JSON.fast_generate(event))
       logger.info "Event sent with id: #{event[:id]} type: #{event[:type]}"
@@ -72,7 +84,6 @@ module SlackRTMReceiver
 
     # True if RTM session is alive
     def alive?
-      # return true if ws && ts && Time.now - ts < 30
       return true if ws && ts
       return false
     end
@@ -141,6 +152,11 @@ module SlackRTMReceiver
 
     private
 
+    def parse_rtm_start_res(json)
+      hash = JSON.parse(json, {symbolize_names: true})
+      return {url: hash[:url], self_id: hash[:self][:id]}
+    end
+
     # Handle RTM hello
     def hello_handler(event)
       @stats[:hello_time] = Time.now
@@ -185,12 +201,8 @@ module SlackRTMReceiver
 
     # Reset instance variables
     def cleanup
-      @hellotime = 0
-      @websocket = nil
-      @last_timestamp = nil
-      @ping = nil
       stats({log: true})
-      @stats = {}
+      reset_vars
       logger.warn 'RTM session closed'
     end
 

data/lib/slack-rtm-receiver/starter.rb

@@ -1,5 +1,4 @@
 require 'em-http'
-require 'json'
 
 
 module SlackRTMReceiver
@@ -63,7 +62,7 @@ module SlackRTMReceiver
       status = http.response_header.status
       raise "Web API rtm.start failed: received HTTP status code #{status}" unless status == 200
       logger.info 'Recived rtm.start response'
-      session.start(JSON.parse(http.response)['url'])
+      session.start(http.response)
     end
 
     # EM::HttpRequest error callback handler

data/lib/slack-rtm-receiver/version.rb

@@ -1,5 +1,5 @@
 module SlackRTMReceiver
 
-  Version = '0.0.1'
+  Version = '0.0.2'
 
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: slack-rtm-receiver
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - Ken J.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-03 00:00:00.000000000 Z
+date: 2016-02-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: eventmachine