huginn_renault_ze_agent 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b6c82cb1b7fc09ef9a5b74fcf21d53554d286782deffd642f1e1c822963860ba
-  data.tar.gz: a92a61ef98519fb37eba57be92e13109d0804fa30f173cda8fb93311c46b6325
+  metadata.gz: ee53dc3638485bf02adf6c7693aa2cbd39cb414634f30050083f39da0480a40b
+  data.tar.gz: bec9b3518643d646a9f2473df83eb6beb05bf95acfed43bdee05b77a06a4a318
 SHA512:
-  metadata.gz: 7bae069a3481e4396fbbec077bf3b400d03a7ea9b6280af4296f648be08240d07a989f421e466e0197e8b0d644a49655eef22f9a417a6df6add04e5ad5962da6
-  data.tar.gz: edbaabe68939e7054a9123a5c7cd5a466d8357f7ef55ef9abc63e77fc299ab792d9a0e0abaafac2a9288966d1c477db51c85e73cc33829799a95c0327bc1f52c
+  metadata.gz: 7caec636dec762b4059a2059739d9ee9e7baa62b552e7e0dc61b159876076772965d20ffc92b549c8e01647c564d40b1edb17be9e308e10d713d3632d5294d57
+  data.tar.gz: 6e8cc50147ebc97127f9597f3011d1cb3d00e829bf0439673e874935376ab010d4c0c296b921a1e55720860c23c7a89b2bcf09b18e74130a3d6056b003203588

data/lib/huginn_renault_ze_agent/renault_ze_battery_agent.rb

@@ -1,7 +1,7 @@
 module Agents
   class RenaultZeBatteryAgent < Agent
     include FormConfigurable
-    
+
     default_schedule 'every_5h'
 
     cannot_receive_events!
@@ -13,6 +13,21 @@ module Agents
       provide credentials named `renault_ze_username` and `renault_ze_password`.
     MD
 
+    event_description <<-MD
+      Events look like this:
+
+      ```json
+      {
+        "charge_level": 40, 
+        "charging": false, 
+        "plugged": false,
+        "remaining_range": 115.0,
+        "last_update": 1554572276, 
+        "last_update_hours_ago": 5.12
+      }
+      ```
+    MD
+
     def default_options
       {
         "username" => "",
@@ -36,11 +51,22 @@ module Agents
       username = interpolated["username"].present? ? interpolated["username"] : credential("renault_ze_username")
       password = interpolated["password"].present? ? interpolated["password"] : credential("renault_ze_password")
       service = RenaultZE::Client.new(username, password)
-      content = service.get_battery(service.login())
 
-      return if memory["last_update"] == content["last_update"]
-      memory["last_update"] = content["last_update"]
-      create_event payload: content
+      begin
+        content = service.get_battery(service.login())
+      rescue
+        error("Could not fetch battery level: " + $!)
+        raise
+      end
+
+      if memory["last_update"] != content["last_update"]
+        created_event = create_event payload: content
+
+        log("Creating new event as newer data received, updated #{content["last_update_hours_ago"]}h ago.", :outbound_event => created_event)
+        memory["last_update"] = content["last_update"]
+      else
+        log("Not creating event as no update since last run. Last update was #{content["last_update_hours_ago"]}h ago.")
+      end
     end
 
   end

data/lib/renault_ze/renault_ze_connect.rb

@@ -11,7 +11,7 @@ module RenaultZE
         headers: {"Content-Type": "application/json"}, 
         body: {username: @username, password: @password}.to_json
       )
-      raise 'Unexpected response code: #{response}' unless response.code == 200
+      raise "Login - Unexpected response code: #{response}" unless response.code == 200
       
       content = JSON.parse response.body
       return {
@@ -21,14 +21,14 @@ module RenaultZE
     end
 
     def get_battery(creds)
-      raise 'Missing token in input: #{creds}' if creds[:token].nil?
-      raise 'Missing VIN in input: #{creds}' if creds[:vin].nil?
+      raise "Battery - Missing token in input: #{creds}" if creds[:token].nil?
+      raise "Battery - Missing VIN in input: #{creds}" if creds[:vin].nil?
 
       response = HTTParty.get(
         "https://www.services.renault-ze.com/api/vehicle/#{creds[:vin]}/battery",
         headers: {"Authorization": "Bearer #{creds[:token]}"}
       )
-      raise 'Unexpected response code: #{response}' unless response.code == 200
+      raise "Battery - Unexpected response code: #{response}" unless response.code == 200
 
       result = JSON.parse response.body
       unless result["last_update"].nil?

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: huginn_renault_ze_agent
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - Adrian Schoenig