lita-sonos-commander 0.1.0 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 55efde944b8f8f55076c00839759350d66dd869d
-  data.tar.gz: c983877fd0ba9b854dcee313c250b0f5b306b14e
+  metadata.gz: 71a47b802acd8b74a12165728bd3b0fded035ab5
+  data.tar.gz: 49ecca4439098ff7827f4d2b6ac78ddde816e4e3
 SHA512:
-  metadata.gz: a51ab068605b560102c40fc6d806eefccdc3407682f82760672d977f3d08bb04e9182b3b888e7af49abda24bb0a88dacc9b431adf4a897cdd980e7ab46b1e5d0
-  data.tar.gz: cf4e1b01326609908b1301d099c036c6bac58709421ecf098d73d86b07f0defb7334b7803693c55b2767c3e61c36218fe1626c31609674d7bd91a0d65aa8cfc4
+  metadata.gz: dae726c2765371f5459269bc7c95a6468f224d32cf0f64de0656c932241e3bc24c36028959114135512adcfa876a26ed2d390fb85acd500fe9bb22f8f9f106fd
+  data.tar.gz: 4d22468f6a65ea06c68d426628d1908d68c53606c2cbc301ad0b26e3f6e776593a55099ce71eeea8d04e518a09f0e5dd016d8d1784720d4aa0e6353f6e5a926d

data/example/client.rb

@@ -2,7 +2,6 @@ require 'faye/websocket'
 require 'eventmachine'
 
 EM.run {
-#  ws = Faye::WebSocket::Client.new('ws://localhost:9292')
   ws = Faye::WebSocket::Client.new('ws://localhost:8080/sonos/listen')
 
   ws.on :open do |event|

data/lib/lita-sonos-commander.rb

@@ -5,6 +5,7 @@ Lita.load_locales Dir[File.expand_path(
 )]
 
 require "lita/handlers/sonos_commander"
+require "lita/commander_middleware"
 
 Lita::Handlers::SonosCommander.template_root File.expand_path(
   File.join("..", "..", "templates"),

data/lib/lita/commander_middleware.rb

@@ -0,0 +1,47 @@
+Lita::CommanderMiddleware = lambda do |env|
+
+  if Faye::WebSocket.websocket?(env)
+    ws = Faye::WebSocket.new(env)
+
+    Lita::Handlers::SonosCommander.add_socket(ws)
+
+    ws.on :open do |event|
+    end
+
+    ws.on :connect do |event|
+    end
+
+    ws.on :message do |event|
+      ws.send({ message: event.data }.to_json)
+
+      sleep 0.5
+      ws.send({ message: 'WE DID IT TWITCH', command: 'echo' }.to_json)
+    end
+
+    ws.on :close do |event|
+      Lita::Handlers::SonosCommander.drop_socket(ws)
+
+      p [:close, event.code, event.reason]
+      ws = nil
+    end
+
+    # Return async Rack response
+    ws.rack_response
+
+  else
+    # Normal HTTP request
+    [200, {'Content-Type' => 'text/plain'}, ['Hello']]
+  end
+end
+
+def register_faye(arg)
+  @@_sockets ||= []
+  middleware = robot.registry.config.http.middleware
+  result = middleware.use App
+end
+
+def sonos_connector(request, response)
+  middlewares.each do |mw|
+    mw.middleware.call(request.env)
+  end
+end

data/lib/lita/handlers/sonos_commander.rb

@@ -1,68 +1,71 @@
-require 'pry'
+require 'json'
+require 'faye/websocket'
+require 'uri'
+
 module Lita
   module Handlers
     class SonosCommander < Handler
-      # insert handler code here
-
-      require 'faye/websocket'
-
 
       http.get '/sonos/listen', :sonos_connector
 
-      route /^sonos (.+)/, :send_to_sonos
-      route /^explore/, :call_explorer
+      route /^play_url (.+)/, :sonos_play_url
+      route /^say_text (.+)/, :sonos_say_text
 
       on :loaded, :register_faye
 
-      def middlewares
-        robot.registry.config.http.middleware
+      def sonos_play_url(message)
+        text = message.matches.last.last
+        emit_message command: 'play_url', data: URI.escape(text)
       end
 
-      App = lambda do |env|
-        if Faye::WebSocket.websocket?(env)
-          ws = Faye::WebSocket.new(env)
-
-          ws.on :message do |event|
-            ws.send(event.data)
+      def sonos_say_text(message)
+        text = message.matches.last.last
+        emit_message command: 'play_text', data: text
+      end
 
-            sleep 2
-            ws.send "WE DID IT TWITCH"
-          end
+      def emit_message(command:, data:)
+        puts "emitting #{command} \t #{data}"
+        sockets.each do |ws|
+          ws.send(
+            { command: command, data: { text: data, volume: 20 } }.to_json
+          )
+        end
+      end
 
-          ws.on :close do |event|
-            p [:close, event.code, event.reason]
-            ws = nil
-          end
+      def middlewares
+        robot.registry.config.http.middleware
+      end
 
-          # Return async Rack response
-          ws.rack_response
+      def sockets
+        self.class.sockets
+      end
 
-        else
-          # Normal HTTP request
-          [200, {'Content-Type' => 'text/plain'}, ['Hello']]
-        end
+      def self.sockets
+        @@_sockets ||= []
       end
 
-      def register_faye(arg)
-        middleware = robot.registry.config.http.middleware
-        result = middleware.use App
-#        binding.pry
+      def self.add_socket(socket)
+        puts "Tracking socket #{socket}"
+        @@_sockets ||= []
+        @@_sockets << socket
       end
 
-      def send_to_sonos(message)
-        #binding.pry
+      def self.drop_socket(socket)
+        puts "Forgetting socket #{socket}"
+        sockets.delete_if { |s| s == socket }
       end
 
-      def call_explorer(_message); explorer; end
+      def self.serialize(message)
+      end
 
-      def explorer
+      def register_faye(arg)
+        @@_sockets ||= []
         middleware = robot.registry.config.http.middleware
+        result = middleware.use Lita::CommanderMiddleware
       end
 
       def sonos_connector(request, response)
-        #binding.pry
         middlewares.each do |mw|
-        #  binding.pry
           mw.middleware.call(request.env)
         end
       end

data/lita-sonos-commander.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |spec|
   spec.name          = 'lita-sonos-commander'
-  spec.version       = '0.1.0'
+  spec.version       = '1.0.0'
   spec.authors       = ['Daniel J. Pritchett']
   spec.email         = ['dpritchett@gmail.com']
   spec.description   = 'Control your Sonos with Lita chatbot commands'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: lita-sonos-commander
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 1.0.0
 platform: ruby
 authors:
 - Daniel J. Pritchett
@@ -152,6 +152,7 @@ files:
 - Rakefile
 - example/client.rb
 - lib/lita-sonos-commander.rb
+- lib/lita/commander_middleware.rb
 - lib/lita/handlers/sonos_commander.rb
 - lita-sonos-commander.gemspec
 - locales/en.yml