seriamp 0.1.9 → 0.1.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 25ded6fbd5f32c13385dc7704f60d9d88c46bf528f79e7c67d41f295800b596d
-  data.tar.gz: 7c2cab83327cf081c73c28743d46406213bdfaccd18f177d632f3c0922b55466
+  metadata.gz: f9a46cb5fe16a4b24f54a6552e98db18e6e97281f7d12ce76c78f1ca5d18d8b8
+  data.tar.gz: '082c51ad737e37e237248acca21d9ee6d0b74bca0be135cf99f52fbf26679c31'
 SHA512:
-  metadata.gz: 5484fe172a3d65fb4d9778fc3734dd0a2aa5b24f459f864b5d8bc68a4766b06e5d6f2fd3ccc234b21b27fdc534abeb76655cdf29c68e1dca7afacf476e847186
-  data.tar.gz: 64cb7cfed4265a174020f59a04671e9865739d4f573b361f560c88051fad4a63355e2401cd0d84cc2aa394babed6cc5efa6ae775573362fb3da6e09dfa716840
+  metadata.gz: 2b450a12d445a5b9199212eee5dba2eac298a9aa19e0e826df2fd322cd1d86d78a05815d39b3f75e417afa357720edb5ead5d1c9bfff1efefc171cb0b7e73f6e
+  data.tar.gz: 9461488acf8478e6f7d52ea4f824042eede1a13a99f357092f37f55afddee6608e70a0306f23844a12a594e4658c5f87a40b1b2e090539a910f6ef963acd52ae

data/lib/seriamp/sonamp/client.rb

@@ -10,17 +10,28 @@ module Seriamp
     RS232_TIMEOUT = 3
 
     class Client
-      def initialize(device: nil, glob: nil, logger: nil)
+      def initialize(device: nil, glob: nil, logger: nil, retries: true)
         @logger = logger
 
         @device = device
         @detect_device = device.nil?
         @glob = glob
+        @retries = case retries
+          when nil, false
+            0
+          when true
+            1
+          when Integer
+            retries
+          else
+            raise ArgumentError, "retries must be an integer, true, false or nil: #{retries}"
+          end
       end
 
       attr_reader :device
       attr_reader :glob
       attr_reader :logger
+      attr_reader :retries
 
       def detect_device?
         @detect_device
@@ -134,7 +145,7 @@ module Seriamp
       end
 
       def get_voltage_trigger_input(zone = nil)
-        get_zone_state('VTI', zone)
+        get_zone_state('VTI', zone, include_all: true)
       end
 
       def get_firmware_version
@@ -148,7 +159,7 @@ module Seriamp
       def status
         # Reusing the opened device file makes :VTIG? fail even with a delay
         # in front.
-        #open_device do
+        with_device do
           {
             firmware_version: get_firmware_version,
             temperature: get_temperature,
@@ -165,13 +176,22 @@ module Seriamp
             voltage_trigger_input: get_voltage_trigger_input,
             channel_front_panel_level: get_channel_front_panel_level,
           }
-        #end
+        end
       end
 
       private
 
+      def with_device(&block)
+        if @io
+          yield @io
+        else
+          open_device(&block)
+        end
+      end
+
       def open_device
         if detect_device? && device.nil?
+          logger&.debug("Detecting device")
           @device = Seriamp.detect_device(Sonamp, *glob, logger: logger)
           if @device
             logger&.info("Using #{device} as TTY device")
@@ -180,31 +200,58 @@ module Seriamp
           end
         end
 
-        if @f
+        logger&.debug("Opening #{device}")
+        @io = Backend::SerialPortBackend::Device.new(device, logger: logger)
+
+        begin
+          yield @io
+        ensure
+          @io.close rescue nil
+          @io = nil
+        end
+      end
+
+      def with_retry
+        try = 1
+        begin
           yield
-        else
-          rv = nil
-          Backend::SerialPortBackend::Device.new(device) do |f|
-            @f = f
-            rv = yield
-            @f = nil
+        rescue Seriamp::Error => exc
+          if try <= retries
+            logger&.warn("Error during operation: #{exc.class}: #{exc} - will retry")
+            try += 1
+            @device = nil
+            retry
+          else
+            raise
           end
-          rv
         end
       end
 
-      def dispatch(cmd, resp_lines_count = 1)
-        open_device do
-          with_timeout do
-            @f.syswrite("#{cmd}\x0d")
-          end
-          resp = 1.upto(resp_lines_count).map do
-            read_line(@f, cmd)
-          end
-          if resp_lines_count == 1
-            resp.first
-          else
-            resp
+      def dispatch(cmd, resp_lines_range_or_count = 1)
+        resp_lines_range = if Range === resp_lines_range_or_count || Array === resp_lines_range_or_count
+          resp_lines_range_or_count
+        else
+          1..resp_lines_range_or_count
+        end
+
+        with_retry do
+          with_device do
+            with_timeout do
+              @io.syswrite("#{cmd}\x0d")
+            end
+            resp = resp_lines_range.map do
+              read_line(@io, cmd)
+            end
+
+            if @io && IO.select([@io.io], nil, nil, 0)
+              logger&.warn("Serial device readable after completely reading status response - concurrent access?")
+            end
+
+            if resp_lines_range_or_count == 1
+              resp.first
+            else
+              resp
+            end
           end
         end
       end
@@ -266,7 +313,7 @@ module Seriamp
         dispatch_assert(cmd, expected)
       end
 
-      def get_zone_value(cmd_prefix, zone, boolize: false)
+      def get_zone_value(cmd_prefix, zone, boolize: false, include_all: false)
         if zone
           if zone < 1 || zone > 4
             raise ArgumentError, "Zone must be between 1 and 4: #{zone}"
@@ -274,22 +321,23 @@ module Seriamp
           resp = dispatch(":#{cmd_prefix}#{zone}?")
           typecast_value(resp[cmd_prefix.length + 1..], boolize)
         else
-          hashize_query_result(dispatch(":#{cmd_prefix}G?", 4), cmd_prefix, boolize)
+          range = include_all ? [1, 2, 3, 4, 'A'] : (1..4).to_a
+          hashize_query_result(dispatch(":#{cmd_prefix}G?", range), cmd_prefix, boolize, range)
         end
       end
 
-      def hashize_query_result(resp_lines, cmd_prefix, boolize)
+      def hashize_query_result(resp_lines, cmd_prefix, boolize, range)
         index = 1
         Hash[resp_lines.map do |resp|
-          value = typecast_value(extract_suffix(resp, "#{cmd_prefix}#{index}"), boolize)
+          value = typecast_value(extract_suffix(resp, "#{cmd_prefix}#{range.to_a[index-1]}"), boolize)
           [index, value].tap do
             index += 1
           end
         end]
       end
 
-      def get_zone_state(cmd_prefix, zone)
-        get_zone_value(cmd_prefix, zone, boolize: true)
+      def get_zone_state(cmd_prefix, zone, include_all: false)
+        get_zone_value(cmd_prefix, zone, boolize: true, include_all: include_all)
       end
 
       def set_channel_value(cmd_prefix, channel, value)
@@ -309,7 +357,7 @@ module Seriamp
           typecast_value(dispatch_extract_suffix(":#{cmd_prefix}#{channel}?", "#{cmd_prefix}#{channel}"), boolize)
         else
           index = 1
-          hashize_query_result(dispatch(":#{cmd_prefix}G?", 8), cmd_prefix, boolize)
+          hashize_query_result(dispatch(":#{cmd_prefix}G?", 8), cmd_prefix, boolize, 1..8)
         end
       end
 

data/lib/seriamp/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Seriamp
-  VERSION = '0.1.9'
+  VERSION = '0.1.11'
 end

data/lib/seriamp/yamaha/app.rb

@@ -15,6 +15,7 @@ module Seriamp
       set :client, nil
 
       get '/' do
+        clear_cache
         render_json(client.last_status)
       end
 
@@ -142,6 +143,14 @@ module Seriamp
 
       private
 
+      def clear_cache
+        if settings.client
+          settings.client.clear_cache
+        else
+          @client&.clear_cache
+        end
+      end
+
       def client
         settings.client || begin
           @client ||= Yamaha::Client.new(settings.device, logger: settings.logger)

data/lib/seriamp/yamaha/client.rb

@@ -57,6 +57,9 @@ module Seriamp
       def last_status
         unless @status
           with_device do
+            unless @status
+              do_status
+            end
           end
         end
         @status.dup
@@ -75,6 +78,10 @@ module Seriamp
         last_status
       end
 
+      def clear_cache
+        @status = nil
+      end
+
       %i(
         model_code firmware_version system_status power main_power zone2_power
         zone3_power input input_name audio_select audio_select_name

data/seriamp.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |spec|
   spec.name          = "seriamp"
-  spec.version       = '0.1.9'
+  spec.version       = '0.1.11'
   spec.authors       = ['Oleg Pudeyev']
   spec.email         = ['code@olegp.name']
   spec.summary       = %q{Serial control for amplifiers & A/V receivers}

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: seriamp
 version: !ruby/object:Gem::Version
-  version: 0.1.9
+  version: 0.1.11
 platform: ruby
 authors:
 - Oleg Pudeyev
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-01-15 00:00:00.000000000 Z
+date: 2023-01-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: serialport