saal 0.3.4 → 0.3.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1a86991bf6a2c0ddf03cab4c239953c2c4e819f5019145398f4b7a527e928852
-  data.tar.gz: de08c727c732e4afb86cafcdcadfeec1f16fb127d675714b03bf388956bc6646
+  metadata.gz: '097e00e7d501d49e8b411d07a6a7eff6afe0adf220c3e1757304428c4cc059f1'
+  data.tar.gz: 398f11226d5a182aa92417448afd7b3adf0e6a3d1ab120b8f903eb952e6c131b
 SHA512:
-  metadata.gz: db0fe9ccfd6e51da7bec292c9cd44c0b8c994ca238772cd817941f22f823f8ac8098ef005373e2f86dfcd9d121dc6470bdd3615ba961d1c514c620e8cf399095
-  data.tar.gz: fa64aa3d8cea43fc12e07db8d84def9ba45ca27655dbb95251e7b7c45e8c322b5c8ee0f58b02b4c63c9799f15a5db1316e0e174a6b246ee4725887d3ce12d823
+  metadata.gz: ce014accc32521fb1fad84ed552fe92d6ed3798aef83b30769b03244703d80c205d5463c5ebf9b5ad0fff418663d3293add9291d7344b51db4201a634ee0308e
+  data.tar.gz: 3aaeb5d0825733dd3e87d4eb9fb9900f6f7cb5a78c9be3a8168ba7b7afef7ce379d51d8e4a267c59f1fcce86e33075c6a55eb18cfcba65932d138d718f534dd0

data/lib/envoy.rb

@@ -15,6 +15,7 @@ module SAAL
 
     class PowerEnergy
       DEFAULT_HOST = "envoy.local"
+      DEFAULT_TOKEN = ""
       DEFAULT_TIMEOUT = 2
       DEFAULT_CACHE_TIMEOUT = 5
       DEFAULT_SOURCES = [
@@ -30,6 +31,7 @@ module SAAL
 
       def initialize(defs, opts={})
         @host = defs[:host] || defs['host'] || DEFAULT_HOST
+        @token = defs[:token] || defs['token'] || DEFAULT_TOKEN
         @timeout = opts[:timeout] || opts['timeout'] || DEFAULT_TIMEOUT
         @cache_timeout = opts[:cache_timeout] || opts['cache_timeout'] || DEFAULT_CACHE_TIMEOUT
         @cache = nil
@@ -85,7 +87,7 @@ module SAAL
       end
 
       def read_all
-        response = SAAL::do_http_get(@host, 80, "/production.json?details=1", nil, nil, @timeout)
+        response = SAAL::do_https_get_token(@host, "/production.json?details=1", @token, @timeout)
         return nil if !response
 
         values = JSON.parse(response.body)
@@ -139,6 +141,7 @@ module SAAL
 
     class ACQuality
       DEFAULT_HOST = "envoy.local"
+      DEFAULT_TOKEN = ""
       DEFAULT_TIMEOUT = 2
       DEFAULT_CACHE_TIMEOUT = 5
       DEFAULT_SOURCES = ["total","phase1","phase2","phase3",]
@@ -147,6 +150,7 @@ module SAAL
 
       def initialize(defs, opts={})
         @host = defs[:host] || defs['host'] || DEFAULT_HOST
+        @token = defs[:token] || defs['token'] || DEFAULT_TOKEN
         @timeout = opts[:timeout] || opts['timeout'] || DEFAULT_TIMEOUT
         @cache_timeout = opts[:cache_timeout] || opts['cache_timeout'] || DEFAULT_CACHE_TIMEOUT
         @cache = nil
@@ -184,7 +188,7 @@ module SAAL
       end
 
       def read_all
-        response = SAAL::do_http_get(@host, 80, "/ivp/meters/readings", nil, nil, @timeout)
+        response = SAAL::do_https_get_token(@host, "/ivp/meters/readings", @token, @timeout)
         return nil if !response
 
         values = JSON.parse(response.body)
@@ -213,19 +217,18 @@ module SAAL
     end
 
     class Inverters
+      DEFAULT_HOST = "envoy.local"
+      DEFAULT_TOKEN = nil
       DEFAULT_TIMEOUT = 2
       DEFAULT_CACHE_TIMEOUT = 50
       DEFAULT_SOURCES = []
       DEFAULT_TYPES = ["w_now"] # "last_report_date", "w_max"
-      DEFAULT_USER = nil
-      DEFAULT_PASSWORD = nil
       DEFAULT_PREFIX = "inverters"
       attr_reader :inverters
 
       def initialize(defs, opts={})
         @host = defs[:host] || defs['host'] || DEFAULT_HOST
-        @user = defs[:user] || defs['user'] || DEFAULT_USER
-        @password = defs[:password] || defs['password'] || DEFAULT_PASSWORD
+        @token = defs[:token] || defs['token'] || DEFAULT_TOKEN
         @timeout = opts[:timeout] || opts['timeout'] || DEFAULT_TIMEOUT
         @cache_timeout = opts[:cache_timeout] || opts['cache_timeout'] || DEFAULT_CACHE_TIMEOUT
         @cache = nil
@@ -264,7 +267,7 @@ module SAAL
 
       private
       def read_all
-        response = SAAL::do_http_get_digest(@host, 80, "/api/v1/production/inverters", @user, @password, @timeout)
+        response = SAAL::do_https_get_token(@host, "/api/v1/production/inverters", @token, @timeout)
         return nil if !response
 
         values = JSON.parse(response.body)

data/lib/http.rb

@@ -1,6 +1,6 @@
 require 'uri'
 require 'net/http'
-require 'net/http/digest_auth'
+require 'openssl'
 
 def SAAL::do_http_get(host, port, path, user, pass, timeout)
   begin
@@ -22,26 +22,21 @@ def SAAL::do_http_get(host, port, path, user, pass, timeout)
   end
 end
 
-def SAAL::do_http_get_digest(host, port, path, user, pass, timeout)
+def SAAL::do_https_get_token(host, path, token, timeout)
   begin
-    uri = URI.parse "http://#{host}:#{port}/#{path}"
-    digest_auth = Net::HTTP::DigestAuth.new
-    uri.user = user
-    uri.password = pass
-    http = Net::HTTP.new(host,port)
+    http = Net::HTTP.new(host,443)
     # Timeout faster when the other side doesn't respond
     http.open_timeout = timeout
     http.read_timeout = timeout
+    http.use_ssl = true
+    http.verify_mode = OpenSSL::SSL::VERIFY_NONE
     req = Net::HTTP::Get.new(path)
+    req['Accept'] = "application/json"
+    req['Authorization'] = "Bearer #{token}"
     response = http.request(req)
-    if response.code == "401" && user && pass
-      auth = digest_auth.auth_header uri, response['www-authenticate'], 'GET'
-      req.add_field 'Authorization', auth
-      response = http.request(req)
-    end
     if response.code != "200"
-      #$stderr.puts "ERROR: Code #{response.code}"
-      #$stderr.puts response.body
+      $stderr.puts "ERROR: Code #{response.code}"
+      $stderr.puts response.body
       return nil
     end
     return response

data/lib/saal.rb

@@ -10,7 +10,7 @@ module SAAL
     DBCONF = CONFDIR+"database.yml"
     CHARTSCONF = CONFDIR+"charts.yml"
 
-    VERSION = '0.3.4'
+    VERSION = '0.3.5'
 end
 
 require File.dirname(__FILE__)+'/dbstore.rb'

data/saal.gemspec

@@ -6,8 +6,8 @@ Gem::Specification.new do |s|
   s.platform = Gem::Platform::RUBY
 
   s.name              = 'saal'
-  s.version           = '0.3.4'
-  s.date              = '2021-04-04'
+  s.version           = '0.3.5'
+  s.date              = '2024-02-08'
 
   s.summary     = "Thin abstraction layer for interfacing and recording sensors (currently onewire) and actuators (currently dinrelay)"
   s.description = <<EOF

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: saal
 version: !ruby/object:Gem::Version
-  version: 0.3.4
+  version: 0.3.5
 platform: ruby
 authors:
 - Pedro Côrte-Real
-autorequire:
+autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-04-04 00:00:00.000000000 Z
+date: 2024-02-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ownet
@@ -71,16 +71,16 @@ description: "A daemon and libraries to create an abstraction layer that interfa
   current and historical values, and allowing changes of state.\n"
 email: pedro@pedrocr.net
 executables:
-- dinrelaystatus
 - dinrelayset
-- saal_import_mysql
-- saal_dump_database
-- saal_readall
-- saal_denkovi_relays
+- dinrelaystatus
 - saal_chart
 - saal_daemon
+- saal_denkovi_relays
+- saal_dump_database
 - saal_envoy_generate_config
 - saal_envoy_read
+- saal_import_mysql
+- saal_readall
 extensions: []
 extra_rdoc_files:
 - README.rdoc
@@ -140,7 +140,7 @@ homepage: https://github.com/pedrocr/saal
 licenses:
 - LGPL-2.1
 metadata: {}
-post_install_message:
+post_install_message: 
 rdoc_options:
 - "-S"
 - "-w 2"
@@ -159,8 +159,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
-signing_key:
+rubygems_version: 3.3.5
+signing_key: 
 specification_version: 2
 summary: Thin abstraction layer for interfacing and recording sensors (currently onewire)
   and actuators (currently dinrelay)