sunnycarcharger-agent 1.1.0 → 1.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 74fbebb7d35be601f1f1c0f5c2bf102f71fbf5c571e709fb86253de8025dc02c
-  data.tar.gz: '008397000fb1cf8cac6c17e4cf427fa5f1a6a0f904b1968cc6d02b2c8bd6052c'
+  metadata.gz: e597967d1cfd8c1ee46871b7a305827914023f8beeb15e79b3a6aaf1b0682d1b
+  data.tar.gz: d59ea067d905fc3f28b5c25f330bf91351bd41574fd8eb8b3030799417633fb0
 SHA512:
-  metadata.gz: b2093e938beaa6e0a89f540505ba364aeb975343cd5f8eb5bd03df2dba77006c6ae189c0993f83bc9cfb71dce49a358cd3bc057b42c10c01a684010144f99d6b
-  data.tar.gz: abc63c83d4a0d46305b22a2f264649cfa0ebe7b2520e96c8c56e1f498d6bfdf77058a16684596b60bc1299d7f82008327e3939986bb11498500ee14a01790103
+  metadata.gz: 71a65178b4a571925bed92ef6b3cc4b59a9804ae3e9dde69def469183a666c23535e417e6f33da634c33f817e1502199bc22089b1c0db3bd2aed0bc045dc56d8
+  data.tar.gz: 1b2a926d280593da53996986ed39d8e32c9b6a99393560321b9a1c3044b1990262afb016e31c5850b0382cbbb4929a70e173ec4d5dc1dbb72fd27a5a8b842a41

data/README.md

@@ -20,9 +20,13 @@ gem install sunnycarcharger-agent
 ## Usage
 
 ```plain
-FRONIUS_IP=192.168.1.2 WEB_TOKEN=<token from sunnycarcharger.com> sunnycarcharger-agent
+FRONIUS_IP=192.168.1.2:5757 WEB_TOKEN=<token from sunnycarcharger.com> sunnycarcharger-agent
+# or
+FRONIUS_IPS=192.168.1.2:5757,192.168.1.3:5757 WEB_TOKEN=<token from sunnycarcharger.com> sunnycarcharger-agent
 ```
 
+Use either `$FRONIUS_IPS` or `$FRONIUS_IP` to provide a comma separated list of IP address that the Fronius inverter might be available on. Include the `:port` if its not the default port of `80`.
+
 ## License
 
 The gem is available as open source under the terms of the [MIT License](https://opensource.org/licenses/MIT).

data/exe/sunnycarcharger-agent

@@ -2,14 +2,16 @@
 
 require "sunnycarcharger/agent"
 
-puts "Fronius IP address: #{Config.fronius_ip}"
+puts "Fronius IP addresses: #{Config.fronius_ips.join(", ")}"
 puts "Web URL: #{Config.web_url}"
 
 startup_errors = false
 
 fronius_client = Sunnycarcharger::Agent::Fronius.new
 unless fronius_client.connected?
-  warn "ERROR: Fronius #{Config.fronius_ip} could not be connected"
+  Config.fronius_ips.each do |ip|
+    warn "ERROR: Fronius #{ip} could not be connected"
+  end
   startup_errors = true
 end
 web_client = Sunnycarcharger::Agent::Web.new
@@ -24,7 +26,9 @@ loop do
   begin
     invertor_data = fronius_client.fetch
   rescue Faraday::ConnectionFailed, Errno::ECONNREFUSED
-    warn "ERROR: Fronius #{Config.fronius_ip} could not be connected"
+    Config.fronius_ips.each do |ip|
+      warn "ERROR: Fronius #{ip} could not be connected"
+    end
   end
 
   begin

data/lib/sunnycarcharger/agent/config.rb

@@ -8,12 +8,23 @@ class AgentConfig < Anyway::Config
   attr_config refresh_interval: 1 # minutes
 
   attr_config :fronius_ip
+  attr_config fronius_ips: []
 
   extend_options do |parser, config|
     parser.on_tail "-h", "--help" do
       puts parser
     end
   end
+
+  on_load do
+    if fronius_ip
+      if fronius_ip.is_a?(Array)
+        self.fronius_ips = fronius_ip
+      elsif fronius_ip.is_a?(String)
+        self.fronius_ips = [fronius_ip]
+      end
+    end
+  end
 end
 
 Config = AgentConfig.new

data/lib/sunnycarcharger/agent/fronius.rb

@@ -1,22 +1,31 @@
 require "faraday"
 
 class Sunnycarcharger::Agent::Fronius
-  def initialize(ip: Config.fronius_ip)
-    raise ArgumentError, "Missing Fronius IP address" unless ip
-    @ip = ip
+  def initialize(ips: Config.fronius_ips)
+    raise ArgumentError, "Missing Fronius IP addresses" unless ips
+    @ips = ips
   end
 
   def client
-    @client ||= Faraday.new(
-      "http://" + @ip,
-      headers: {"User-Agent" => "sunnycarcharger-agent"}
-    ) do |conn|
-      conn.request :json
-      conn.response :json
-      conn.response :raise_error
-      # conn.request :retry, retry_options if retry_options # Must be registered after :raise_error
-      conn.adapter Faraday.default_adapter
-      conn.options.timeout = 3
+    @client ||= begin
+      successful_client = nil
+      @ips.find do |ip|
+        successful_client = Faraday.new(
+          "http://" + ip,
+          headers: {"User-Agent" => "sunnycarcharger-agent"}
+        ) do |conn|
+          conn.request :json
+          conn.response :json
+          conn.response :raise_error
+          # conn.request :retry, retry_options if retry_options # Must be registered after :raise_error
+          conn.adapter Faraday.default_adapter
+          conn.options.timeout = 3
+        end
+        true
+      rescue Faraday::ConnectionFailed, Errno::ECONNREFUSED
+        false
+      end
+      successful_client || raise("Could not connect to any of the provided Fronius IP addresses")
     end
   end
 
@@ -35,6 +44,7 @@ class Sunnycarcharger::Agent::Fronius
       body = response.dig("Body", "Data", "0")
       data.energy_consumed = body.dig("EnergyReal_WAC_Sum_Consumed").to_i
       data.energy_produced = body.dig("EnergyReal_WAC_Sum_Produced").to_i
+      data.serial = body.dig("Details", "Serial")
     rescue => e
       puts "Error fetching energy_consumed and energy_produced: #{e}"
     end

data/lib/sunnycarcharger/agent/invertor_data.rb

@@ -1,4 +1,5 @@
 class Sunnycarcharger::Agent::InvertorData
+  attr_accessor :serial
   attr_accessor :power_from_grid, :power_to_load, :power_from_solar, :solar_energy_today
   attr_accessor :energy_consumed, :energy_produced
 
@@ -8,6 +9,7 @@ class Sunnycarcharger::Agent::InvertorData
 
   def as_json
     {
+      serial: serial,
       power_from_grid: power_from_grid,
       power_to_load: power_to_load,
       power_from_solar: power_from_solar,

data/lib/sunnycarcharger/agent/version.rb

@@ -2,6 +2,6 @@
 
 module Sunnycarcharger
   module Agent
-    VERSION = "1.1.0"
+    VERSION = "1.1.1"
   end
 end

data/test/sunnycarcharger/agent/fronius_test.rb

@@ -4,8 +4,8 @@ require "test_helper"
 
 describe Sunnycarcharger::Agent::Fronius do
   it "fetches from fronius" do
-    fronius_ip = "192.168.86.26"
-    agent = Sunnycarcharger::Agent::Fronius.new(ip: fronius_ip)
+    fronius_ips = ["192.168.86.26"]
+    agent = Sunnycarcharger::Agent::Fronius.new(ips: fronius_ips)
     VCR.use_cassette("fronius-midday") do
       data = agent.fetch
 
@@ -14,14 +14,15 @@ describe Sunnycarcharger::Agent::Fronius do
       assert_equal(6444, data.power_from_solar.to_i)
       assert_equal(2844, data.power_to_load.to_i)
       assert_equal(38601, data.solar_energy_today.to_i)
+      assert_equal("745995", data.serial)
       assert data.energy_consumed
       assert data.energy_produced
     end
   end
 
   it "fetches from fronius at night" do
-    fronius_ip = "192.168.86.26"
-    agent = Sunnycarcharger::Agent::Fronius.new(ip: fronius_ip)
+    fronius_ips = ["192.168.86.26"]
+    agent = Sunnycarcharger::Agent::Fronius.new(ips: fronius_ips)
     VCR.use_cassette("fronius-night") do
       data = agent.fetch
 
@@ -29,6 +30,7 @@ describe Sunnycarcharger::Agent::Fronius do
       assert_equal(0, data.power_from_solar.to_i)
       assert_equal(335, data.power_to_load.to_i)
       assert_equal(62134, data.solar_energy_today.to_i)
+      assert_equal("745995", data.serial)
       assert data.energy_consumed
       assert data.energy_produced
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sunnycarcharger-agent
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.1.1
 platform: ruby
 authors:
 - Dr Nic Williams
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-07-30 00:00:00.000000000 Z
+date: 2023-10-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: anyway_config
@@ -129,7 +129,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.17
+rubygems_version: 3.4.20
 signing_key:
 specification_version: 4
 summary: Run agent within home network to get solar invertor data and upload to Sunny