alpha_ess 1.1 → 1.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a773748c595dfdcf98ba7926107950335b88449a1b1900176d368fa7be3f14df
-  data.tar.gz: '049f52e33928d370ebd5245da4a226c298f50fd18ace2c9af519837e02035dba'
+  metadata.gz: fed25ff583048344b8da4a15dcd92510abf9d69d5adec2e0da030bf23478ef35
+  data.tar.gz: b2cba2ad069290c82b1e4849ac4c1ce588c19abca72a62fcdf4458033e36f365
 SHA512:
-  metadata.gz: f8aa05186e306f0372b60c99b20975b13987b6c3bca0a84790e4a7ef5fa2c4d07a6cd20c6dbe4245aaebc97dbf27a3a39367fe15ecddd3482b354abf288a6f6a
-  data.tar.gz: e1613f50c9228a65edacc729cfa5c16320999916d446ee86681f46a41d0979e5f4ae957409e0fd87fab28279fd217838dad34c6169a6fe0610c47ad0dd1c5d33
+  metadata.gz: 86208124094f59312e88bf877c29b946da0fbc0b865a77e3d1948c110d832de8712b3a420d08e499bfc615ab38ab20c41d970825d1194efa01a0c29b22ae6cf5
+  data.tar.gz: cf071266cb4443e6f83918a0b936c5f6d269fb20d796578782b064d3d73b13b802ef19a5dad6bdab45edbf2ccea88e83f25488b644c45006abbcf89922d29a09

data/README.md

@@ -112,7 +112,6 @@ puts "
     Batteriebezug / Ladung: #{data["pbat"]}
     Verbrauch: #{data["pbat"] + data["ppv1"].to_f + netz}
 
-    
 "
 ```
 
@@ -120,7 +119,6 @@ Hier die Ausgabe und der Vergleich zur Website:
 
 ![picture 1](images/b965404834760626afe73785811995faa1629d2ab66a53f966443fbf22463a67.png)  
 
-
 ## pushover Alarm auslösen, wenn die PV-Anlage einen speziellen Status hat
 
 ```ruby
@@ -154,8 +152,14 @@ bat_min = ae.get_custom_use_ess_setting()["bat_use_cap"]
 puts "Batterie-Minimum neu: #{bat_min}"
 ```
 
-## Statischtische Daten des letzten Monats abfragen
+## Statischtische Daten über einen Zeitraum abfragen
 
-```
+```ruby
 require "alpha_ess"
 ae = AlphaEss.new
+# aktueller Tag
+ae.get_stics_by_period()
+# letzte 3 Tage, ohne den aktuellen Tag
+ae.get_stics_by_period( (Time.now-86400*3).strftime("%Y-%m-%d"), (Time.now-86400).strftime("%Y-%m-%d"))
+```
+

data/alpha_ess.gemspec

@@ -1,7 +1,7 @@
 Gem::Specification.new do |spec|
   spec.name = 'alpha_ess'
-  spec.version = '1.1'
-  spec.date = '2022-10-02'
+  spec.version = '1.2.1'
+  spec.date = '2022-10-31'
   spec.summary = "Alpha Ess API Calls"
   spec.description = "a Ruby class for Alpha-Ess-API-Calls"
   spec.authors = ["Oliver Gaida"]
@@ -10,6 +10,7 @@ Gem::Specification.new do |spec|
   spec.homepage = 'https://github.com/ogaida/alpha_ess'
   #spec.executables = %w(rusdc)
   spec.add_runtime_dependency 'httparty'
+  spec.add_runtime_dependency 'digest'
   #spec.add_runtime_dependency 'json', '~> 2.1', '>= 2.1.0'
   spec.license = 'MIT'
 end

data/lib/alpha_ess.rb

@@ -1,7 +1,12 @@
 require "httparty"
+require "digest"
 
 class AlphaEss
 
+    AUTHPREFIX = "al8e4s"
+    AUTHCONSTANT = "LS885ZYDA95JVFQKUIUUUV7PQNODZRDZIS4ERREDS0EED8BCWSS"
+    AUTHSUFFIX = "ui893ed"
+
     def initialize(sn = ENV["ess_serial"], u = ENV["ess_username"], p = ENV["ess_password"])
         @serial, @username, @password = sn, u, p
         get_token()
@@ -21,12 +26,13 @@ class AlphaEss
     end
 
     def get_last_power_data()
-        body = {
-            "sys_sn" => @serial,
-            "noLoading" => true
-        }
-        url = "https://cloud.alphaess.com/api/ESS/GetLastPowerDataBySN"
-        res = HTTParty.post(url, headers: header(), body: body.to_json)
+        #body = {
+        #    "sys_sn" => @serial,
+        #    "noLoading" => true
+        #}
+        url = "https://cloud.alphaess.com/api/ESS/GetLastPowerDataBySN?sys_sn=#{@serial}&noLoading=true"
+        #res = HTTParty.post(url, headers: header(), body: body.to_json)
+        res = HTTParty.get(url, headers: header())
         res.parsed_response["data"]
     end
 
@@ -71,7 +77,7 @@ class AlphaEss
         }, body: body.to_json)
     end
 
-    private
+    private 
 
     def get_token()
         Dir.mkdir "#{ENV["HOME"]}/.alpha_ess" if ! (Dir.exists?"#{ENV["HOME"]}/.alpha_ess")
@@ -97,24 +103,53 @@ class AlphaEss
             "username" => @username,
             "password" => @password
         }
-        res = HTTParty.post(url, headers: {
+        header = {
             "Accept" => "application/json",
             "Content-Type" => "application/json;charset=UTF-8"
-        }, body: body.to_json)
+        }.update(secure_header_addon())
+        res = HTTParty.post(url, headers: header, body: body.to_json)
         @token = res.parsed_response["data"]["AccessToken"]
         @token_valid_to = Time.now.to_i+36000
         save_token()
     end
 
+    def secure_header_addon()
+        # thanks to https://github.com/CharlesGillanders
+        t = Time.now.to_i
+        { 
+            "authtimestamp" => t.to_s,
+            "authsignature" => "#{AUTHPREFIX}#{Digest::SHA2.new(512).hexdigest("#{AUTHCONSTANT}#{t}")}#{AUTHSUFFIX}"
+        }
+    end
+
     def header(hash={})
         get_token()
-        hash = {
+        {
             "Accept" => "application/json",
             "Content-Type" => "application/json;charset=UTF-8",
             "Authorization" => "Bearer #{@token}"
-        }.update hash
-        hash
+        }.update(hash).update(secure_header_addon())
     end
 end
 
+# some extensions for easier visualise data in irb
+
+module Jsonpretty
+    def jp
+        # return in json_pretty
+        JSON.pretty_generate(self)
+    end
+    def jpp
+        # print in json_pretty
+        puts JSON.pretty_generate(self)
+    end
+end
+
+class Hash
+    include Jsonpretty
+end
+
+class Array
+    include Jsonpretty
+end  
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: alpha_ess
 version: !ruby/object:Gem::Version
-  version: '1.1'
+  version: 1.2.1
 platform: ruby
 authors:
 - Oliver Gaida
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-10-02 00:00:00.000000000 Z
+date: 2022-10-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: httparty
@@ -24,6 +24,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: digest
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: a Ruby class for Alpha-Ess-API-Calls
 email: ogaida@t-online.de
 executables: []