tesla_api 3.0.2 → 3.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4379e187bc321aa06bf2675be264b8f7dba76d33d08ae2088b5491e718aeb387
-  data.tar.gz: d0efa66690fa5ed2edb6b624c77ea1fef140e88c7a4aa177cb6f68c82fe4e88a
+  metadata.gz: 36800b87fde594b317de4423717ddddde20b02a89a29dcc3030da421c857961d
+  data.tar.gz: a7578ddecc3e79faaf4b91eec431196fdd42cc6b2697d8a47c115a9839beb13d
 SHA512:
-  metadata.gz: d705d155f086cbd9e8476575973d45b346f29dd3b77f7df29295e88bf1dc0563841e745e6f3e79fb33db59fa2d03bec4ce8f3cd6b9e06d849309a6c9709b0575
-  data.tar.gz: ea8910775ee4536f95249ffe0fedb1a8468d9996ebaaab01fab5569955053e515a937c920cff817d76c508d4b3c32b682b5a24b4863a1487f46f01c0cba15339
+  metadata.gz: 4cefac51f88134ddb5cf93567046c63249c48aac76c19ea95006f7a8f98e97ad2258c1d4969be3cedc3dd8e3ec8ad21513cc1b29913982f11b2263ca44e2bc2e
+  data.tar.gz: 3724b8215a83bd514ab27ddc02165793052f54dfb1bfc45cfe3f90c18fd50395dcedadd4e7070c3469d2f5557fb3354c02e97a3850e33c2d1ed8c397b4e8cef9

data/lib/tesla_api.rb

@@ -3,8 +3,10 @@ require 'base64'
 
 require 'faraday'
 require 'faraday_middleware'
-require 'eventmachine'
-require 'faye/websocket'
+
+require 'async'
+require 'async/http/endpoint'
+require 'async/websocket/client'
 
 require 'tesla_api/version'
 require 'tesla_api/client'

data/lib/tesla_api/autopark.rb

@@ -1,60 +1,42 @@
 module TeslaApi
   module Autopark
     def start_autopark(&handler)
-      EventMachine.run do
-        autopark_socket.on(:message) do |event|
-          message = if event.data.is_a?(Array)
-            JSON.parse(event.data.map(&:chr).join)
-          else
-            JSON.parse(event.data)
-          end
-
-          default_handler(message)
-          handler.call(message.delete('msg_type'), message)
-        end
+      Async do |task|
+        Async::WebSocket::Client.connect(endpoint, headers: headers) do |connection|
+          while message = connection.read
+            case message[:msg_type]
+            when 'control:hello'
+              interval = message[:autopark][:heartbeat_frequency] / 1000.0
+              task.async do |subtask|
+                subtask.sleep interval
+                connection.write({ msg_type: 'autopark:heartbeat_app', timestamp: Time.now.to_i }.to_json)
+              end
+            end
 
-        autopark_socket.on(:close) do |_|
-          @autopark_socket = nil
-          @heartbeat && @heartbeat.cancel
-          EventMachine.stop
+            handler.call(message)
+          end
         end
       end
     end
 
     private
 
-    def default_handler(message)
-      case message['msg_type']
-        when 'control:hello'
-          interval = message['autopark']['heartbeat_frequency'] / 1000.0
-          @heartbeat = EventMachine::Timer.new(interval) do
-            beat = {
-                msg_type: 'autopark:heartbeat_app',
-                timestamp: Time.now.to_i
-            }
-            autopark_socket.send(beat.to_json)
-          end
-      end
+    def endpoint
+      Async::HTTP::Endpoint.parse(autopark_socket_endpoint)
+    end
+
+    def autopark_socket_endpoint
+      "wss://streaming.vn.teslamotors.com/connect/#{self['vehicle_id']}"
     end
 
-    def autopark_socket
-      @autopark_socket ||= Faye::WebSocket::Client.new(
-          autopark_socket_endpoint,
-          nil,
-          {
-              headers: {
-                  'Authorization' => "Basic #{socket_auth}"
-              }
-          }
-      )
+    def headers
+      {
+          'Authorization' => "Basic #{socket_auth}"
+      }
     end
 
     def socket_auth
       Base64.strict_encode64("#{email}:#{self['tokens'].first}")
     end
-
-    def autopark_socket_endpoint
-      "wss://streaming.vn.teslamotors.com/connect/#{self['vehicle_id']}"
-    end
   end
 end

data/lib/tesla_api/stream.rb

@@ -1,47 +1,53 @@
 module TeslaApi
   module Stream
     def stream(&receiver)
-      EventMachine.run do
-        socket = create_streaming_socket
+      Async do |task|
+        Async::WebSocket::Client.connect(endpoint) do |connection|
+          on_timeout = ->(subtask) do
+            subtask.sleep TIMEOUT
+            task.stop
+          end
 
-        socket.on(:open) do |event|
-          socket.send(JSON.generate(stream_connect_message))
-        end
+          connection.write(stream_connect_message)
+          timeout = task.async(&on_timeout)
 
-        socket.on(:message) do |event|
-          data = JSON.parse(event.data.pack('c*'))
-
-          if data['msg_type'] == 'data:update'
-            attributes = data['value'].split(',')
-
-            receiver.call({
-              time: DateTime.strptime((attributes[0].to_i/1000).to_s, '%s'),
-              speed: attributes[1].to_f,
-              odometer: attributes[2].to_f,
-              soc: attributes[3].to_f,
-              elevation: attributes[4].to_f,
-              est_heading: attributes[5].to_f,
-              est_lat: attributes[6].to_f,
-              est_lng: attributes[7].to_f,
-              power: attributes[8].to_f,
-              shift_state: attributes[9].to_s,
-              range: attributes[10].to_f,
-              est_range: attributes[11].to_f,
-              heading: attributes[12].to_f
-            })
-          end
-        end
+          while message = connection.read
+            timeout.stop
+            timeout = task.async(&on_timeout)
 
-        socket.on(:close) do |event|
-          EventMachine.stop
+            case message[:msg_type]
+            when 'data:update'
+              attributes = message[:value].split(',')
+
+              receiver.call({
+                time: DateTime.strptime((attributes[0].to_i/1000).to_s, '%s'),
+                speed: attributes[1].to_f,
+                odometer: attributes[2].to_f,
+                soc: attributes[3].to_f,
+                elevation: attributes[4].to_f,
+                est_heading: attributes[5].to_f,
+                est_lat: attributes[6].to_f,
+                est_lng: attributes[7].to_f,
+                power: attributes[8].to_f,
+                shift_state: attributes[9].to_s,
+                range: attributes[10].to_f,
+                est_range: attributes[11].to_f,
+                heading: attributes[12].to_f
+              })
+            when 'data:error'
+              task.stop
+            end
+          end
         end
       end
     end
 
     private
 
-    def create_streaming_socket
-      Faye::WebSocket::Client.new(streaming_endpoint)
+    TIMEOUT = 30
+
+    def endpoint
+      Async::HTTP::Endpoint.parse(streaming_endpoint)
     end
 
     def streaming_endpoint

data/lib/tesla_api/version.rb

@@ -1,3 +1,3 @@
 module TeslaApi
-  VERSION = '3.0.2'
+  VERSION = '3.0.3'
 end

data/tesla_api.gemspec

@@ -14,9 +14,9 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ['lib']
 
+  spec.add_dependency 'async-websocket'
   spec.add_dependency 'faraday'
   spec.add_dependency 'faraday_middleware'
-  spec.add_dependency 'faye-websocket'
 
   spec.add_development_dependency 'bundler', '~> 2.0'
   spec.add_development_dependency 'rake', '~> 12.0'

metadata

@@ -1,17 +1,17 @@
 --- !ruby/object:Gem::Specification
 name: tesla_api
 version: !ruby/object:Gem::Version
-  version: 3.0.2
+  version: 3.0.3
 platform: ruby
 authors:
 - Tim Dorr
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-10-04 00:00:00.000000000 Z
+date: 2019-10-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: faraday
+  name: async-websocket
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -25,7 +25,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: faraday_middleware
+  name: faraday
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -39,7 +39,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: faye-websocket
+  name: faraday_middleware
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="