saal 0.3.0 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 39379f2c03a4d1dfe41a1d481d2d90484b9d4e11b2c498f03c0f9ec064918850
-  data.tar.gz: ab741ee35c0c4528b89dbdbf32e17ca591d134f126db27e7a6974ce51e4a9723
+  metadata.gz: 62d7f9b51083356448d50bcb5ad66c729d84a38e152f85470ca4fa5f9f5fed15
+  data.tar.gz: 73f51e4736d14ee249531535577a8ff0568e0c19fb3115a4cf76bb0801d8e504
 SHA512:
-  metadata.gz: b2532eff01ab6a191106abe8984b46aa0f9b9b0ca461b87b6b09b5174334c4d054ea8ac335e17551e5c733ca0a1dd31356bc25d68b0d38140b27f89b041f257b
-  data.tar.gz: 4bc1474527de78d0a7c80248376f0ae56a4fbc680cbfa991851f41931b5f2bd78c5073ae6ea4217d4edb3b55fec8e105963026b3ca229b90d0868e7f0cfc7179
+  metadata.gz: 349eed054b1fd37de656840840b92e1be279e77fe677b92cc47864fe96079f88e6dc784e608bf5a7843b08cc0025b1f141d1bf88be1cef553e18f104cc0c3d74
+  data.tar.gz: e07a22761c8f4f6c01d631abb29b01c63d6888c449fd67762e558ddd7693cd1bdfdf5b8bd7cdc35575006c6cb2fc9cbef49329bf08b754d5101d5dfc20d3421d

data/bin/saal_envoy_generate_config

@@ -0,0 +1,53 @@
+#!/usr/bin/env ruby
+
+require File.dirname(__FILE__)+'/../lib/saal.rb'
+
+if ARGV.size != 1 && ARGV.size != 3
+  $stderr.puts "USAGE: saal_envoy_generate_config <host> [<user> <password>]"
+  exit(1)
+end
+
+puts "power:"
+puts "  envoy_power_energy:"
+puts "    host: \"#{ARGV[0]}\""
+puts
+puts "ac:"
+puts "  envoy_ac_quality:"
+puts "    host: \"#{ARGV[0]}\""
+
+user = "envoy"
+password = nil
+
+if ARGV[2]
+  user = ARGV[1]
+  password = ARGV[2]
+else
+  Net::HTTP.get(ARGV[0], '/home').split("\n").each do |line|
+    if line.include?("serial:")
+      password = line.split('"')[1][-6..-1]
+    end
+  end
+  if !password
+    $stderr.puts "Couldn't find serial number for envoy"
+    exit 2
+  end
+end
+
+envoy = SAAL::Envoy::Inverters::new(
+  :host => ARGV[0],
+  :user => user,
+  :password => password,
+)
+envoy.set_all_inverters!
+exit 0 if envoy.inverters.size <= 0
+
+puts
+puts "inverters:"
+puts "  envoy_inverters:"
+puts "    host: \"#{ARGV[0]}\""
+puts "    user: \"#{user}\""
+puts "    password: \"#{password}\""
+puts "    inverters:"
+envoy.inverters.each do |serial|
+  puts "    - #{serial}"
+end

data/bin/saal_envoy_read

@@ -0,0 +1,143 @@
+#!/usr/bin/env ruby
+
+require File.dirname(__FILE__)+'/../lib/saal.rb'
+
+if ARGV.size != 3
+  $stderr.puts "USAGE: saal_envoy_read <host> <user> <password>"
+  exit(1)
+end
+
+def fdisp(val)
+  if val
+    '%10.0f' % val
+  else
+    "       n/a"
+  end
+end
+
+def fdispk(val)
+  if val
+    '%10.2f' % (val / 1000.0)
+  else
+    "       n/a"
+  end
+end
+
+def fdisp_dec(val)
+  if val
+    '%10.2f' % val
+  else
+    "       n/a"
+  end
+end
+
+def l(vals, name)
+  sensor = vals[name]
+  if sensor
+    sensor.read
+  else
+    nil
+  end
+end
+
+def lratio(vals, name1, name2)
+  v1 = l(vals, name1)
+  v2 = l(vals, name2)
+  if v1 && v2
+    v1 / v2
+  else
+    nil
+  end
+end
+
+ac_quality = SAAL::Envoy::ACQuality::new(:host => ARGV[0]).create_sensors
+
+puts " ========= AC QUALITY ========"
+puts "        voltage (V)  freq (Hz)"
+def qual_line(vals,name, type)
+  puts " #{name} \
+#{fdisp_dec(l(vals,"ac_#{type}_voltage"))} \
+#{fdisp_dec(l(vals,"ac_#{type}_frequency"))} \
+"
+end
+qual_line(ac_quality, "Total: ", "total")
+qual_line(ac_quality, "Phase1:", "phase1")
+qual_line(ac_quality, "Phase2:", "phase2")
+qual_line(ac_quality, "Phase3:", "phase3")
+
+production = SAAL::Envoy::PowerEnergy::new(:host => ARGV[0]).create_sensors
+
+puts ""
+puts " ============ TRUE POWER (W) ============  ======= TRUE ENERGY (kWh) ======="
+puts "        consumption production        net  consumption production        net"
+def p_line(vals, name, type, metric)
+  puts " #{name} \
+#{fdisp(l(vals,"pv_total_consumption_#{type}_#{metric}_now"))} \
+#{fdisp(l(vals,"pv_production_#{type}_#{metric}_now"))} \
+#{fdisp(l(vals,"pv_net_consumption_#{type}_#{metric}_now"))}   \
+#{fdispk(l(vals,"pv_total_consumption_#{type}_#{metric}h_lifetime"))} \
+#{fdispk(l(vals,"pv_production_#{type}_#{metric}h_lifetime"))} \
+#{fdispk(l(vals,"pv_net_consumption_#{type}_#{metric}h_lifetime"))} \
+"
+end
+p_line(production, "Total: ", "total", "w")
+p_line(production, "Phase1:", "phase1", "w")
+p_line(production, "Phase2:", "phase2", "w")
+p_line(production, "Phase3:", "phase3", "w")
+puts " Total Inverters:   \
+#{fdisp(l(production,"pv_production_inverters_w_now"))} \
+                        \
+#{fdispk(l(production,"pv_production_inverters_wh_lifetime"))} \
+"
+
+puts ""
+puts " ========== APPARENT POWER (VA) ========= ===== APPARENT ENERGY (kVAh) ===="
+puts "        consumption production        net  consumption production        net"
+p_line(production, "Total: ", "total", "va")
+p_line(production, "Phase1:", "phase1", "va")
+p_line(production, "Phase2:", "phase2", "va")
+p_line(production, "Phase3:", "phase3", "va")
+
+def pf_line(vals, name, type, metric)
+  pf_total_consumption_instant = lratio(vals,"pv_total_consumption_#{type}_w_now","pv_total_consumption_#{type}_va_now")
+  pf_total_production_instant = lratio(vals,"pv_production_#{type}_w_now","pv_production_#{type}_va_now")
+  pf_net_production_instant = lratio(vals,"pv_net_consumption_#{type}_w_now","pv_net_consumption_#{type}_va_now")
+
+  pf_total_consumption_lifetime = lratio(vals,"pv_total_consumption_#{type}_wh_lifetime","pv_total_consumption_#{type}_vah_lifetime")
+  pf_total_production_lifetime = lratio(vals,"pv_production_#{type}_wh_lifetime","pv_production_#{type}_vah_lifetime")
+  pf_net_production_lifetime = lratio(vals,"pv_net_consumption_#{type}_wh_lifetime","pv_net_consumption_#{type}_vah_lifetime")
+
+  puts " #{name} \
+#{fdisp_dec(pf_total_consumption_instant)} \
+#{fdisp_dec(pf_total_production_instant)} \
+#{fdisp_dec(pf_net_production_instant)}   \
+#{fdisp_dec(pf_total_consumption_lifetime)} \
+#{fdisp_dec(pf_total_production_lifetime)} \
+#{fdisp_dec(pf_net_production_lifetime)} \
+"
+end
+
+puts ""
+puts " ========= INSTANT POWER FACTOR ========= ====== LIFETIME POWER FACTOR ====="
+puts "        consumption production        net  consumption production        net"
+pf_line(production, "Total: ", "total", "va")
+pf_line(production, "Phase1:", "phase1", "va")
+pf_line(production, "Phase2:", "phase2", "va")
+pf_line(production, "Phase3:", "phase3", "va")
+
+puts ""
+envoy = SAAL::Envoy::Inverters::new(
+  :host => ARGV[0],
+  :user => ARGV[1],
+  :password => ARGV[2],
+)
+envoy.set_all_inverters!
+inverters = envoy.create_sensors
+puts "Found #{envoy.inverters.size} inverters"
+envoy.inverters.each do |serial|
+  puts "INVERTER: #{serial} \
+date:#{l(inverters,"inverter_#{serial}_last_report_date")} \
+lastWatts:#{l(inverters,"inverter_#{serial}_w_now")} \
+maxWatts:#{l(inverters,"inverter_#{serial}_w_max")} \
+"
+end

data/lib/dinrelay.rb

@@ -61,25 +61,8 @@ module SAAL
 
       private
       def do_get(path)
-        begin
-          http = Net::HTTP.new(@host,@port)
-          # Timeout faster when the other side doesn't respond
-          http.open_timeout = @timeout
-          http.read_timeout = @timeout
-          req = Net::HTTP::Get.new(path)
-          req.basic_auth @user, @pass
-          response = http.request(req)
-          if response.code != "200"
-            #$stderr.puts "ERROR: Code #{response.code}"
-            #$stderr.puts response.body
-            return nil
-          end
-          return response
-        rescue Exception
-          return nil
-        end
+        SAAL::do_http_get(@host, @port, path, @user, @pass, @timeout)
       end
-
       def parse_index_html(str)
         doc = Nokogiri::HTML(str)
         outlets = doc.css('tr[bgcolor="#F4F4F4"]')

data/lib/envoy.rb

@@ -0,0 +1,284 @@
+require 'json'
+
+module SAAL
+  module Envoy
+    class PowerEnergyUnderlying < SensorUnderlying
+      def initialize(key, production)
+        @key = key
+        @production = production
+      end
+
+      def read(uncached = false)
+        @production.read_val(@key)
+      end
+    end
+
+    class PowerEnergy
+      DEFAULT_HOST = "envoy.local"
+      DEFAULT_TIMEOUT = 2
+      DEFAULT_CACHE_TIMEOUT = 50
+      DEFAULT_SOURCES = [
+        "production_inverters",
+        "production_phase1", "production_phase2", "production_phase3", "production_total",
+        "net_consumption_phase1", "net_consumption_phase2", "net_consumption_phase3", "net_consumption_total",
+        "total_consumption_phase1", "total_consumption_phase2", "total_consumption_phase3", "total_consumption_total",
+      ]
+      DEFAULT_TYPES = [
+        "w_now", "wh_lifetime", "va_now", "vah_lifetime",
+      ]
+      DEFAULT_PREFIX = "pv"
+
+      def initialize(defs, opts={})
+        @host = defs[:host] || defs['host'] || DEFAULT_HOST
+        @timeout = opts[:timeout] || opts['timeout'] || DEFAULT_TIMEOUT
+        @cache_timeout = opts[:cache_timeout] || opts['cache_timeout'] || DEFAULT_CACHE_TIMEOUT
+        @cache = nil
+        @cachetime = nil
+        @sources = defs[:sources] || defs['source'] || DEFAULT_SOURCES
+        @types = defs[:types] || defs['types'] || DEFAULT_TYPES
+        @prefix = defs[:prefix] || defs['prefix'] || DEFAULT_PREFIX
+      end
+
+      def read_val(name)
+        if !@cachetime or @cachetime < Time.now - @cache_timeout
+          @cache = read_all()
+          @cachetime = Time.now
+        end
+        return @cache ? @cache[name] : nil
+      end
+
+      def create_sensors
+        sensors = {}
+        @sources.product(@types).each do |source, type|
+          key = "#{@prefix}_#{source}_#{type}"
+          sensors[key] = PowerEnergyUnderlying.new(key, self)
+        end
+        sensors
+      end
+
+      private
+      def save_vals(dest, name, source)
+        {
+         "wNow" => "w_now",
+         "apprntPwr" => "va_now",
+         "whLifetime" => "wh_lifetime",
+         "vahLifetime" => "vah_lifetime",
+        }.each do |type, label|
+          dest["#{@prefix}_#{name}_#{label}"] = source[type]
+        end
+
+        # Hack around the fact that apprntPwr is broken on the total consumption
+        # calculation for the three-phase sum at least
+        # In those cases it seems to be missing a divide by three, so when the
+        # calculation for voltage and current alone is close do the extra divide
+        va_now = dest["#{@prefix}_#{name}_va_now"]
+        if va_now && !name.include?("phase")
+          voltage = source["rmsVoltage"]
+          current = source["rmsCurrent"]
+          if voltage && current
+            va_alt = voltage * current
+            if ((va_alt / va_now) - 1.0).abs < 0.05
+              dest["#{@prefix}_#{name}_va_now"] = va_now / 3.0
+            end
+          end
+        end
+      end
+
+      def read_all
+        response = SAAL::do_http_get(@host, 80, "/production.json?details=1", nil, nil, @timeout)
+        return nil if !response
+
+        values = JSON.parse(response.body)
+        outputs = {}
+
+        values["production"].each do |source|
+          type = source["type"]
+          case type
+          when "inverters"
+            save_vals(outputs, "production_inverters", source)
+          when "eim"
+            if source["lines"]
+              save_vals(outputs, "production_phase1", source["lines"][0])
+              save_vals(outputs, "production_phase2", source["lines"][1])
+              save_vals(outputs, "production_phase3", source["lines"][2])
+            end
+            save_vals(outputs, "production_total", source)
+          else
+            $stderr.puts "WARNING: ENVOY: don't know source type #{type}"
+          end
+        end
+
+        values["consumption"].each do |source|
+          type = {
+            "total-consumption" => "total",
+            "net-consumption" => "net",
+          }[source["measurementType"]] || "unknown";
+
+          if source["lines"]
+            save_vals(outputs, "#{type}_consumption_phase1", source["lines"][0])
+            save_vals(outputs, "#{type}_consumption_phase2", source["lines"][1])
+            save_vals(outputs, "#{type}_consumption_phase3", source["lines"][2])
+          end
+          save_vals(outputs, "#{type}_consumption_total", source)
+        end
+
+        outputs
+      end
+    end
+
+    class ACQualityUnderlying < SensorUnderlying
+      def initialize(key, production)
+        @key = key
+        @production = production
+      end
+
+      def read(uncached = false)
+        @production.read_val(@key)
+      end
+    end
+
+    class ACQuality
+      DEFAULT_HOST = "envoy.local"
+      DEFAULT_TIMEOUT = 2
+      DEFAULT_CACHE_TIMEOUT = 50
+      DEFAULT_SOURCES = ["total","phase1","phase2","phase3",]
+      DEFAULT_TYPES = ["frequency","voltage"]
+      DEFAULT_PREFIX = "ac"
+
+      def initialize(defs, opts={})
+        @host = defs[:host] || defs['host'] || DEFAULT_HOST
+        @timeout = opts[:timeout] || opts['timeout'] || DEFAULT_TIMEOUT
+        @cache_timeout = opts[:cache_timeout] || opts['cache_timeout'] || DEFAULT_CACHE_TIMEOUT
+        @cache = nil
+        @cachetime = nil
+        @sources = defs[:sources] || defs['source'] || DEFAULT_SOURCES
+        @types = defs[:types] || defs['types'] || DEFAULT_TYPES
+        @prefix = defs[:prefix] || defs['prefix'] || DEFAULT_PREFIX
+      end
+
+      def read_val(name)
+        if !@cachetime or @cachetime < Time.now - @cache_timeout
+          @cache = read_all()
+          @cachetime = Time.now
+        end
+        return @cache ? @cache[name] : nil
+      end
+
+      def create_sensors
+        sensors = {}
+        @sources.product(@types).each do |source, type|
+          key = "#{@prefix}_#{source}_#{type}"
+          sensors[key] = ACQualityUnderlying.new(key, self)
+        end
+        sensors
+      end
+
+      private
+      def save_vals(dest, name, source)
+        {
+         "voltage" => "voltage",
+         "freq" => "frequency",
+        }.each do |type, label|
+          dest["#{@prefix}_#{name}_#{label}"] = source[type]
+        end
+      end
+
+      def read_all
+        response = SAAL::do_http_get(@host, 80, "/ivp/meters/readings", nil, nil, @timeout)
+        return nil if !response
+
+        values = JSON.parse(response.body)
+        outputs = {}
+        source = values[0]
+        save_vals(outputs, "total", source)
+        if source["channels"]
+          save_vals(outputs, "phase1", source["channels"][0])
+          save_vals(outputs, "phase2", source["channels"][1])
+          save_vals(outputs, "phase3", source["channels"][2])
+        end
+
+        outputs
+      end
+    end
+
+    class InverterUnderlying < SensorUnderlying
+      def initialize(key, inverters)
+        @key = key
+        @inverters = inverters
+      end
+
+      def read(uncached = false)
+        @inverters.read_val(@key)
+      end
+    end
+
+    class Inverters
+      DEFAULT_TIMEOUT = 2
+      DEFAULT_CACHE_TIMEOUT = 50
+      DEFAULT_SOURCES = []
+      DEFAULT_TYPES = ["last_report_date", "watts_now", "watts_max"]
+      DEFAULT_USER = nil
+      DEFAULT_PASSWORD = nil
+      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
+        @timeout = opts[:timeout] || opts['timeout'] || DEFAULT_TIMEOUT
+        @cache_timeout = opts[:cache_timeout] || opts['cache_timeout'] || DEFAULT_CACHE_TIMEOUT
+        @cache = nil
+        @cachetime = nil
+        @inverters_list = {}
+        @inverters = defs[:inverters] || defs['inverters'] || DEFAULT_SOURCES
+        @types = defs[:types] || defs['types'] || DEFAULT_TYPES
+      end
+
+      def read_val(name)
+        if !@cachetime or @cachetime < Time.now - @cache_timeout
+          @cache = read_all()
+          @cachetime = Time.now
+        end
+        return @cache ? @cache[name] : nil
+      end
+
+      def enumerate
+        read_val("foo") # Force a read to make sure the inverter serials are stored
+        @inverters_list.keys
+      end
+
+      def set_all_inverters!
+        @inverters = self.enumerate
+      end
+
+      def create_sensors
+        sensors = {}
+        @inverters.product(@types).each do |source, type|
+          key = "inverter_#{source}_#{type}"
+          sensors[key] = InverterUnderlying.new(key, self)
+        end
+        sensors
+      end
+
+      private
+      def read_all
+        response = SAAL::do_http_get_digest(@host, 80, "/api/v1/production/inverters", @user, @password, @timeout)
+        return nil if !response
+
+        values = JSON.parse(response.body)
+        inverters = {}
+        values.each do |inverter|
+          {"lastReportDate" => "last_report_date",
+           "lastReportWatts" => "watts_now",
+           "maxReportWatts" => "watts_max",
+          }.each do |type, label|
+            inverters["inverter_#{inverter["serialNumber"]}_#{label}"] = inverter[type]
+            @inverters_list[inverter["serialNumber"]] = true
+          end
+        end
+
+        inverters
+      end
+    end
+  end
+end

data/lib/http.rb

@@ -0,0 +1,51 @@
+require 'uri'
+require 'net/http'
+require 'net/http/digest_auth'
+
+def SAAL::do_http_get(host, port, path, user, pass, timeout)
+  begin
+    http = Net::HTTP.new(host,port)
+    # Timeout faster when the other side doesn't respond
+    http.open_timeout = timeout
+    http.read_timeout = timeout
+    req = Net::HTTP::Get.new(path)
+    req.basic_auth(user, pass) if user && pass
+    response = http.request(req)
+    if response.code != "200"
+      #$stderr.puts "ERROR: Code #{response.code}"
+      #$stderr.puts response.body
+      return nil
+    end
+    return response
+  rescue Exception
+    return nil
+  end
+end
+
+def SAAL::do_http_get_digest(host, port, path, user, pass, 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)
+    # Timeout faster when the other side doesn't respond
+    http.open_timeout = timeout
+    http.read_timeout = timeout
+    req = Net::HTTP::Get.new(path)
+    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
+      return nil
+    end
+    return response
+  rescue Exception
+    return nil
+  end
+end

data/lib/saal.rb

@@ -10,7 +10,7 @@ module SAAL
     DBCONF = CONFDIR+"database.yml"
     CHARTSCONF = CONFDIR+"charts.yml"
 
-    VERSION = '0.3.0'
+    VERSION = '0.3.1'
 end
 
 require File.dirname(__FILE__)+'/dbstore.rb'
@@ -23,4 +23,6 @@ require File.dirname(__FILE__)+'/chart.rb'
 require File.dirname(__FILE__)+'/chart_data.rb'
 require File.dirname(__FILE__)+'/outliercache.rb'
 require File.dirname(__FILE__)+'/dinrelay.rb'
+require File.dirname(__FILE__)+'/envoy.rb'
+require File.dirname(__FILE__)+'/http.rb'
   

data/lib/sensors.rb

@@ -40,9 +40,23 @@ module SAAL
           defs.merge!('name' => outlet_descriptions[num])
           Sensor.new(dbstore, oname, DINRelay::Outlet.new(num.to_i, og), defs, opts)
         end
+      elsif defs['envoy_power_energy']
+        defs = defs['envoy_power_energy'].merge('prefix' => name)
+        pe = SAAL::Envoy::PowerEnergy::new(defs)
+        sensors = pe.create_sensors
+        return sensors.map do |name, underlying|
+          Sensor.new(dbstore, name, underlying, defs, opts)
+        end
+      elsif defs['envoy_ac_quality']
+        defs = defs['envoy_ac_quality'].merge('prefix' => name)
+        pe = SAAL::Envoy::ACQuality::new(defs)
+        sensors = pe.create_sensors
+        return sensors.map do |name, underlying|
+          Sensor.new(dbstore, name, underlying, defs, opts)
+        end
       else
-        raise UnknownSensorType, "Couldn't figure out a valid sensor type "
-                                 "from the configuration for #{name}"
+        p defs, name
+        raise UnknownSensorType, "Couldn't figure out a valid sensor type for #{name}"
       end
     end
   end

data/saal.gemspec

@@ -6,8 +6,8 @@ Gem::Specification.new do |s|
   s.platform = Gem::Platform::RUBY
 
   s.name              = 'saal'
-  s.version           = '0.3.0'
-  s.date              = '2018-06-02'
+  s.version           = '0.3.1'
+  s.date              = '2020-12-19'
 
   s.summary     = "Thin abstraction layer for interfacing and recording sensors (currently onewire) and actuators (currently dinrelay)"
   s.description = <<EOF
@@ -32,6 +32,7 @@ EOF
   s.add_runtime_dependency 'ownet', "~>0.2"
   s.add_runtime_dependency 'mysql2', "~>0.5"
   s.add_runtime_dependency 'nokogiri', '~>1.8'
+  s.add_runtime_dependency 'net-http-digest_auth', '~>1.4'
 
   # = MANIFEST =
   s.files = %w[
@@ -45,6 +46,7 @@ EOF
     bin/saal_chart
     bin/saal_daemon
     bin/saal_dump_database
+    bin/saal_envoy_read
     bin/saal_import_mysql
     bin/saal_readall
     lib/chart.rb
@@ -53,6 +55,8 @@ EOF
     lib/daemon.rb
     lib/dbstore.rb
     lib/dinrelay.rb
+    lib/envoy.rb
+    lib/http.rb
     lib/outliercache.rb
     lib/owsensor.rb
     lib/saal.rb

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: saal
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.1
 platform: ruby
 authors:
 - Pedro Côrte-Real
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2018-06-02 00:00:00.000000000 Z
+date: 2020-12-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ownet
@@ -52,6 +52,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.8'
+- !ruby/object:Gem::Dependency
+  name: net-http-digest_auth
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.4'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.4'
 description: "A daemon and libraries to create an abstraction layer that interfaces
   with \nsensors and actuators, recording their state, responding to requests \nfor
   current and historical values, and allowing changes of state.\n"
@@ -60,12 +74,12 @@ executables:
 - dinrelaystatus
 - dinrelayset
 - saal_import_mysql
-- saal_chart~
-- saal_daemon~
 - saal_dump_database
 - saal_readall
 - saal_chart
 - saal_daemon
+- saal_envoy_generate_config
+- saal_envoy_read
 extensions: []
 extra_rdoc_files:
 - README.rdoc
@@ -79,10 +93,10 @@ files:
 - bin/dinrelayset
 - bin/dinrelaystatus
 - bin/saal_chart
-- bin/saal_chart~
 - bin/saal_daemon
-- bin/saal_daemon~
 - bin/saal_dump_database
+- bin/saal_envoy_generate_config
+- bin/saal_envoy_read
 - bin/saal_import_mysql
 - bin/saal_readall
 - lib/chart.rb
@@ -91,6 +105,8 @@ files:
 - lib/daemon.rb
 - lib/dbstore.rb
 - lib/dinrelay.rb
+- lib/envoy.rb
+- lib/http.rb
 - lib/outliercache.rb
 - lib/owsensor.rb
 - lib/saal.rb
@@ -118,7 +134,7 @@ homepage: https://github.com/pedrocr/saal
 licenses:
 - LGPL-2.1
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options:
 - "-S"
 - "-w 2"
@@ -137,9 +153,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6
-signing_key: 
+rubygems_version: 3.1.2
+signing_key:
 specification_version: 2
 summary: Thin abstraction layer for interfacing and recording sensors (currently onewire)
   and actuators (currently dinrelay)

data/bin/saal_chart~

@@ -1,90 +0,0 @@
-#!/usr/bin/env ruby
-
-NUM_VALUES_SMALL = 500 # Datapoints in "small" charts
-NUM_VALUES_LARGE = 150 # Datapoints in "large" charts
-LARGE_CHART_THRESHOLD = 30*24*60*60 # Threshold for a large chart (in seconds)
-
-require File.dirname(__FILE__)+'/../lib/saal.rb'
-
-def usage
-  $stderr.puts("Usage: saal_chart <chart dir>")
-end
-
-if ARGV.size != 1
-  usage
-  exit (2)
-end
-
-SENSOR_RANGES = {:temperature=>[-15, 45], :humidity=>[0,100], :pressure=>[950,1050]}
-
-
-SAAL::Charts.new.each do |chart|
-  $stderr.puts "Generating chart #{chart.name}"
-
-  pngfile = ARGV[0]+'/chart-'+chart.name.to_s+'.png'
-  ymlfile = ARGV[0]+'/chart-'+chart.name.to_s+'.yml'
-
-  @mins = chart.minimum
-  @maxs = chart.maximum
-  @avgs = chart.average
-  @minmax = {}
-  chart.sensors.each do |s|
-    s = s.name.to_sym
-    @minmax[s] = {:maximum => @maxs[s], :minimum => @mins[s], :average => @avgs[s]}
-  end
-
-  File.open(ymlfile, 'w').write(YAML::dump(@minmax))
-
-  def normalize_data(data, min, max)
-    data.map do |i|
-      if i.nil?
-        -1.0
-      elsif i < min
-        0.0
-      elsif i > max
-        100.0
-      else
-        (((i-min)/(max-min).to_f)*1000).round/10.0
-      end
-    end
-  end
-
-  @periodnames = chart.periodnames
-  @numperiods = @periodnames.size
-  num_values = ((chart.to-chart.from)>LARGE_CHART_THRESHOLD) ?
-               NUM_VALUES_LARGE : 
-               NUM_VALUES_SMALL
-
-  @averages = chart.average(num_values)
-
-  @data = chart.sensors.map do |sensor|
-    normalize_data(@averages[sensor.name.to_sym], *(SENSOR_RANGES[sensor.sensor_type]))
-  end
-
-  @dataurl = @data.map {|values| values.join(",")}.join('|')
-
-  r = {}
-  case chart.alignlabels
-  when :center
-    @periodnamesurl = "||"+@periodnames.join('||')+"||"
-  when :left
-    @periodnamesurl = "|"+@periodnames.join('|')+"||"
-    r[:chxs] = "0,555555,11,-1,lt"
-  end
-  @xincr = 100.0/@numperiods.to_f*10000.truncate.to_f/10000
-
-  r[:chof] = "png"
-  r[:chs] = "700x300"
-  r[:cht] = "lc"
-  r[:chco] = "00ff00,ff0000,0000ff,ff9933,800080"
-  r[:chxt] = "x,y,y,r"
-  r[:chxl] = "0:#{@periodnamesurl}1:|-15ºC||0||15||30||45ºC|2:|0%|25|50|75|100%|3:|950||975||1000||1025||1050 hPa"
-  r[:chg] = "#{@xincr},12.5,1,5"
-  r[:chd] = "t:#{@dataurl}"
-
-  @url = "http://chart.apis.google.com/chart?&"
-  @postdata = r.map{|k,v| k.to_s+"="+v}.join("&")
-
-
-  system "wget --quiet \"#{@url}\" --post-data=\"#{@postdata}\" -O #{pngfile}"
-end

data/bin/saal_daemon~

@@ -1,31 +0,0 @@
-#!/usr/bin/env ruby
-
-SENSOR_INTERVAL = 60 # seconds between consecutive measurements of the sensors
-DBCONF = "/etc/saal/database.yml"
-SENSORSCONF = "/etc/saal/sensors.yml"
-
-require File.dirname(__FILE__)+'/../lib/saal.rb'
-
-def usage
-  $stderr.puts "Usage: saal_daemon <pidfile|--foreground>"
-end
-
-if ARGV.size != 1
-  usage
-  exit 2
-else
-  pidfile = ARGV[0]
-  foreground = (ARGV[0] == '--foreground')
-  d = SAAL::Daemon.new(:interval => SENSOR_INTERVAL,
-                       :sensorconf => SENSORSCONF,
-                       :dbconf => DBCONF,
-                       :foreground => foreground,
-                       :keep_stdin => true)
-  pid = d.run
-  if !foreground
-    File.open(pidfile, 'w') do |f|
-      f.write(pid)
-      f.close
-    end
-  end
-end