seriamp 0.1.14 → 0.2.0

data/lib/seriamp/sonamp/app.rb

@@ -22,6 +22,13 @@ module Seriamp
         render_json(client.get_zone_power)
       end
 
+      post '/off' do
+        1.upto(4) do |zone|
+          client.set_zone_power(zone, false)
+        end
+        render_json(client.get_zone_power)
+      end
+
       get '/volume' do
         payload = {
           zone_volume: client.get_zone_volume,
@@ -46,7 +53,7 @@ module Seriamp
       end
 
       put '/zone/:zone/volume' do |zone|
-        volume = request.body.read.to_i
+        volume = Integer(request.body.read)
         client.set_zone_volume(Integer(zone), volume)
       end
 
@@ -60,7 +67,7 @@ module Seriamp
       end
 
       put '/channel/:channel/volume' do |channel|
-        volume = request.body.read.to_i
+        volume = Integer(request.body.read)
         client.set_channel_volume(Integer(channel), volume)
       end
 
@@ -70,13 +77,19 @@ module Seriamp
       end
 
       post '/' do
+        executor = Executor.new
+        request.body.read.split("\n").each do |line|
+          args = line.strip.split(/\s+/)
+          executor.run_command(args)
+        end
+        render_json({})
       end
 
       private
 
       def client
         settings.client || begin
-          @client ||= Sonamp::Client.new(settings.device,
+          @client ||= Sonamp::Client.new(device: settings.device,
             logger: settings.logger, retries: settings.retries, thread_safe: true)
         end
       end

data/lib/seriamp/sonamp/auto_power.rb

@@ -0,0 +1,167 @@
+autoload :JSON, 'json'
+autoload :FileUtils, 'fileutils'
+require 'seriamp/faraday_facade'
+require 'seriamp/utils'
+
+module Seriamp
+  module Sonamp
+    class AutoPower
+      def initialize(**opts)
+        @options = opts.dup.freeze
+
+        unless options[:sonamp_url]
+          raise ArgumentError, 'Sonamp URL is required'
+        end
+        unless options[:yamaha_url]
+          raise ArgumentError, 'Yamaha URL is required'
+        end
+      end
+
+      attr_reader :options
+
+      def logger
+        options[:logger]
+      end
+
+      def run
+        if (state_path = options[:state_path]) && File.exist?(state_path)
+          begin
+            @stored_sonamp_power = File.open(state_path) do |f|
+              JSON.load(f)
+            end
+          rescue JSON::ParserError => exc
+            logger&.warn("Failed to load state: #{exc.class}: #{exc}")
+          end
+        end
+
+        bump('application start')
+
+        prev_sonamp_power = nil
+        prev_sonamp_on = nil
+        handle_exceptions do
+          prev_sonamp_power = sonamp_client.get_json('power')
+          store_sonamp_power(prev_sonamp_power, prev_sonamp_power)
+          prev_sonamp_on = prev_sonamp_power.values.any? { |v| v == true }
+        end
+
+        loop do
+          sonamp_power = nil
+          sonamp_on = nil
+          handle_exceptions do
+            sonamp_power = sonamp_client.get_json('power')
+            sonamp_on = sonamp_power.values.any? { |v| v == true }
+            if sonamp_on && prev_sonamp_on == false
+              bump('amplifier turned on')
+            end
+            store_sonamp_power(prev_sonamp_power, sonamp_power)
+            prev_sonamp_power = sonamp_power
+            prev_sonamp_on = sonamp_on
+          end
+
+          # If we cannot query the receiver, assume it is on to prevent unintended
+          # turn-offs.
+          receiver_power = nil
+          handle_exceptions do
+            receiver_power = case resp = yamaha_client.get!('power')
+              when 'true'
+                true
+              when 'false'
+                false
+              else
+                raise "Unknown yamaha power response: #{resp}"
+              end
+          end
+          case receiver_power
+          when true
+            bump('receiver is on')
+            if sonamp_on == false
+              puts("turning on amplifier")
+              sonamp_set_on
+            end
+          when nil
+            bump('failed to communicate with receiver - assuming it is on')
+          end
+
+          delta = (@alive_through - Utils.monotime).to_i
+          if delta < 0 && sonamp_on
+            logger&.info("Turning amplifier off")
+            handle_exceptions do
+              sonamp_client.post!('off')
+            end
+          elsif ttl > 0
+            puts "TTL: #{delta / 60}:#{'%02d' % (delta % 60)}"
+          end
+
+          sleep 20
+        end
+      end
+
+      private
+
+      attr_reader :stored_sonamp_power
+
+      def handle_exceptions
+        yield
+      rescue Interrupt, SystemExit, NoMemoryError
+        raise
+      rescue => exc
+        logger&.warn("Unhandled exception: #{exc.class}: #{exc}")
+      end
+
+      def bump(reason)
+        if ttl > 0
+          logger&.debug("Bumping #{ttl} seconds: #{reason}")
+        end
+        @alive_through = Utils.monotime + ttl*60
+      end
+
+      def sonamp_client
+        @sonamp_client ||= FaradayFacade.new(
+          url: options.fetch(:sonamp_url),
+          timeout: options[:sonamp_timeout] || 3,
+        )
+      end
+
+      def yamaha_client
+        @yamaha_client ||= FaradayFacade.new(
+          url: options.fetch(:yamaha_url),
+          timeout: options[:yamaha_timeout] || 5,
+        )
+      end
+
+      def ttl
+        @ttl ||= begin
+          options[:ttl] || 0
+        end
+      end
+
+      def store_sonamp_power(prev_sonamp_power, sonamp_power)
+        # Wait for the power state to be stable - both readings should be
+        # the same.
+        if prev_sonamp_power == sonamp_power && sonamp_power.values.any? { |v| v == true }
+          @stored_sonamp_power = sonamp_power
+          if state_path = options[:state_path]
+            File.open(state_path + '.part', 'w') do |f|
+              f << JSON.dump(sonamp_power)
+            end
+            FileUtils.mv(state_path + '.part', state_path)
+          end
+        end
+      end
+
+      def sonamp_set_on
+        if stored_sonamp_power
+          logger&.debug("sonamp on")
+          stored_sonamp_power.each do |zone, value|
+            if value
+              logger&.debug("Sonamp: zone #{zone} on")
+              sonamp_client.put!("zone/#{zone}/power", body: 'true')
+            end
+          end
+        else
+          logger&.warn("No stored sonamp power")
+        end
+      end
+    end
+  end
+end

data/lib/seriamp/sonamp/client.rb

@@ -2,7 +2,7 @@
 
 require 'timeout'
 require 'seriamp/error'
-require 'seriamp/backend/serial_port'
+require 'seriamp/backend'
 
 module Seriamp
   module Sonamp
@@ -224,14 +224,8 @@ module Seriamp
         logger&.debug("Opening #{device}")
         @io = Backend::SerialPortBackend::Device.new(device, logger: logger)
 
-        warned = false
-        while IO.select([@io.io], nil, nil, 0)
-          unless warned
-            logger&.warn("Serial device readable after opening - unread previous response?")
-            warned = true
-          end
-          IO.read(1)
-        end
+        Utils.consume_data(@io.io, logger,
+          "Serial device readable after opening - unread previous response?")
 
         begin
           yield @io
@@ -275,9 +269,8 @@ module Seriamp
               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
+            Utils.consume_data(@io.io, logger,
+              "Serial device readable after completely reading status response - concurrent access?")
 
             if resp_lines_range_or_count == 1
               resp.first
@@ -318,15 +311,23 @@ module Seriamp
       def read_line(f, cmd)
         with_timeout do
           resp = +''
+          deadline = Utils.monotime + 1
           loop do
-            ch = f.sysread(1)
-            if ch
-              break if ch == ?\r
-              resp << ch
-            else
-              sleep 0.1
+            begin
+              buf = f.read_nonblock(1024)
+              if buf
+                resp += buf
+                break if buf[-1] == ?\r
+              end
+            rescue IO::WaitReadable
+              budget = deadline - Utils.monotime
+              if budget < 0
+                raise CommunicationTimeout
+              end
+              IO.select([f.io], nil, nil, budget)
             end
           end
+          resp.strip!
           if resp == 'ERR'
             raise InvalidCommand, "Invalid command: #{cmd}"
           elsif resp == 'N/A'

data/lib/seriamp/sonamp/cmd.rb

@@ -5,11 +5,12 @@ require 'logger'
 require 'seriamp/utils'
 require 'seriamp/detect'
 require 'seriamp/sonamp/client'
+require 'seriamp/sonamp/executor'
 
 module Seriamp
   module Sonamp
     class Cmd
-      def initialize(args)
+      def initialize(args = ARGV, stdin = STDIN)
         args = args.dup
 
         options = {}
@@ -27,16 +28,18 @@ module Seriamp
         @client = Sonamp::Client.new(device: options[:device], logger: @logger)
 
         @args = args
+        @stdin = stdin
       end
 
       attr_reader :args
+      attr_reader :stdin
       attr_reader :logger
 
       def run
         if args.any?
           run_command(args)
         else
-          STDIN.each_line do |line|
+          stdin.each_line do |line|
             line.strip!
             line.sub!(/#.*/, '')
             next if line.empty?
@@ -54,43 +57,18 @@ module Seriamp
 
         case cmd
         when 'detect'
-          device = Seriamp.detect_device(Sonamp, *args, logger: logger)
+          device = Seriamp.detect_device(Yamaha, *args, logger: logger)
           if device
             puts device
             exit 0
           else
-            STDERR.puts("Sonamp amplifier not found")
+            STDERR.puts("Yamaha receiver not found")
             exit 3
           end
-        when 'off'
-          client.set_zone_power(1, false)
-          client.set_zone_power(2, false)
-          client.set_zone_power(3, false)
-          client.set_zone_power(4, false)
-        when 'power'
-          zone = args.shift.to_i
-          state = Utils.parse_on_off(args.shift)
-          client.set_zone_power(zone, state)
-        when 'zvol'
-          zone = args.shift.to_i
-          volume = args.shift.to_i
-          client.set_zone_volume(zone, volume)
-        when 'cvol'
-          channel = args.shift.to_i
-          volume = args.shift.to_i
-          client.set_channel_volume(channel, volume)
-        when 'zmute'
-          zone = args.shift.to_i
-          mute = args.shift.to_i
-          client.set_zone_mute(zone, mute)
-        when 'cmute'
-          channel = args.shift.to_i
-          mute = args.shift.to_i
-          client.set_channel_mute(channel, mute)
         when 'status'
           pp client.status
         else
-          raise ArgumentError, "Unknown command: #{cmd}"
+          executor.run_command(cmd, *args)
         end
       end
 

data/lib/seriamp/sonamp/executor.rb

@@ -0,0 +1,56 @@
+# frozen_string_literal: true
+
+module Seriamp
+  module Sonamp
+    class Executor
+      def initialize(client)
+        @client = client
+      end
+
+      attr_reader :client
+
+      def run_command(cmd, *args)
+        case cmd
+        when 'detect'
+          device = Seriamp.detect_device(Sonamp, *args, logger: logger)
+          if device
+            puts device
+            exit 0
+          else
+            STDERR.puts("Yamaha receiver not found")
+            exit 3
+          end
+        when 'off'
+          client.set_zone_power(1, false)
+          client.set_zone_power(2, false)
+          client.set_zone_power(3, false)
+          client.set_zone_power(4, false)
+        when 'power'
+          zone = Integer(args.shift)
+          state = Utils.parse_on_off(args.shift)
+          client.set_zone_power(zone, state)
+        when 'zvol'
+          zone = Integer(args.shift)
+          volume = Integer(args.shift)
+          client.set_zone_volume(zone, volume)
+        when 'cvol'
+          channel = Integer(args.shift)
+          volume = Integer(args.shift)
+          client.set_channel_volume(channel, volume)
+        when 'zmute'
+          zone = Integer(args.shift)
+          mute = Integer(args.shift)
+          client.set_zone_mute(zone, mute)
+        when 'cmute'
+          channel = Integer(args.shift)
+          mute = Integer(args.shift)
+          client.set_channel_mute(channel, mute)
+        when 'status'
+          client.status
+        else
+          raise ArgumentError, "Unknown command: #{cmd}"
+        end
+      end
+    end
+  end
+end

data/lib/seriamp/utils.rb

@@ -17,5 +17,22 @@ module Seriamp
     module_function def monotime
       Process.clock_gettime(Process::CLOCK_MONOTONIC)
     end
+
+    module_function def consume_data(io, logger, msg)
+      warned = false
+      read_bytes = 0
+      while IO.select([io], nil, nil, 0)
+        unless warned
+          logger&.warn(msg)
+          warned = true
+        end
+        buf = io.read_nonblock(1024)
+        read_bytes += buf.length
+      end
+      if read_bytes > 0
+        logger&.warn("Consumed #{read_bytes} bytes")
+      end
+      nil
+    end
   end
 end

data/lib/seriamp/version.rb

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

data/lib/seriamp/yamaha/client.rb

@@ -2,7 +2,7 @@
 
 require 'timeout'
 require 'seriamp/utils'
-require 'seriamp/backend/serial_port'
+require 'seriamp/backend'
 require 'seriamp/yamaha/protocol/methods'
 
 module Seriamp
@@ -197,14 +197,8 @@ module Seriamp
         logger&.debug("Opening #{device}")
         @io = Backend::SerialPortBackend::Device.new(device, logger: logger)
 
-        warned = false
-        while IO.select([@io.io], nil, nil, 0)
-          unless warned
-            logger&.warn("Serial device readable after opening - unread previous response?")
-            warned = true
-          end
-          IO.read(1)
-        end
+        Utils.consume_data(@io.io, logger,
+          "Serial device readable after opening - unread previous response?")
 
         begin
           tries = 0
@@ -251,15 +245,20 @@ module Seriamp
 
       def read_response
         resp = +''
-        Timeout.timeout(2, CommunicationTimeout) do
-          loop do
-            ch = @io.sysread(1)
-            if ch
-              resp << ch
-              break if ch == ETX
-            else
-              sleep 0.1
+        deadline = Utils.monotime + 1
+        loop do
+          begin
+            chunk = @io.read_nonblock(1000)
+            if chunk
+              resp += chunk
+              break if chunk[-1] == ETX
             end
+          rescue IO::WaitReadable
+            budget = deadline - Utils.monotime
+            if budget < 0
+              raise CommunicationTimeout
+            end
+            IO.select([@io.io], nil, nil, budget)
           end
         end
         resp
@@ -296,16 +295,9 @@ module Seriamp
       def do_status
         with_retry do
           resp = nil
-          loop do
-            resp = dispatch(STATUS_REQ)
-            again = false
-            while @io && IO.select([@io.io], nil, nil, 0)
-              logger&.warn("Serial device readable after completely reading status response - concurrent access?")
-              read_response
-              again = true
-            end
-            break unless again
-          end
+          resp = dispatch(STATUS_REQ)
+          Utils.consume_data(@io.io, logger,
+            "Serial device readable after completely reading status response - concurrent access?")
           if resp.length < 10
             raise HandshakeFailure, "Broken status response: expected at least 10 bytes, got #{resp.length} bytes; concurrent operation on device?"
           end

data/lib/seriamp/yamaha/cmd.rb

@@ -11,7 +11,7 @@ require 'seriamp/yamaha/executor'
 module Seriamp
   module Yamaha
     class Cmd
-      def initialize(args)
+      def initialize(args = ARGV, stdin = STDIN)
         options = {}
         OptionParser.new do |opts|
           opts.banner = "Usage: yamaha [-d device] command arg..."
@@ -27,16 +27,18 @@ module Seriamp
         @client = Yamaha::Client.new(device: options[:device], logger: @logger)
 
         @args = args
+        @stdin = stdin
       end
 
       attr_reader :args
+      attr_reader :stdin
       attr_reader :logger
 
       def run
         if args.any?
           run_command(args)
         else
-          STDIN.each_line do |line|
+          stdin.each_line do |line|
             line.strip!
             line.sub!(/#.*/, '')
             next if line.empty?

data/lib/seriamp/yamaha/executor.rb

@@ -10,6 +10,7 @@ module Seriamp
       attr_reader :client
 
       def run_command(cmd, *args)
+        cmd = cmd.gsub('_', '-')
         case cmd
         when 'detect'
           device = Seriamp.detect_device(Yamaha, *args, logger: logger)

data/seriamp.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |spec|
   spec.name          = "seriamp"
-  spec.version       = '0.1.14'
+  spec.version       = '0.2.0'
   spec.authors       = ['Oleg Pudeyev']
   spec.email         = ['code@olegp.name']
   spec.summary       = %q{Serial control for amplifiers & A/V receivers}
@@ -15,7 +15,11 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
   
-  spec.add_runtime_dependency 'serialport', '~> 1.0'
+  spec.add_runtime_dependency 'serialport', '~> 1.3'
+  
+  spec.add_development_dependency 'rspec-core', '~> 3.12'
+  spec.add_development_dependency 'rspec-expectations', '~> 3.12'
+  spec.add_development_dependency 'rspec-mocks', '~> 3.12'
   
   # Optional dependencies: sinatra for the web apps
 end

data/spec/sonamp/app_spec.rb

@@ -0,0 +1,42 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+describe Seriamp::Sonamp::App do
+  include Rack::Test::Methods
+
+  describe '#initialize' do
+    it 'works' do
+      described_class.new
+    end
+  end
+
+  let(:app) do
+    described_class.tap do |app|
+      app.client = client
+    end
+  end
+
+  let(:client_cls) { Seriamp::Sonamp::Client }
+  let(:client) { double('sonamp client') }
+
+  describe '/off' do
+    let(:final_state) do
+      {'1' => false, '2' => false, '3' => false, '4' => false}
+    end
+
+    it 'works' do
+
+      client.should receive(:set_zone_power).with(1, false)
+      client.should receive(:set_zone_power).with(2, false)
+      client.should receive(:set_zone_power).with(3, false)
+      client.should receive(:set_zone_power).with(4, false)
+      client.should receive(:get_zone_power).and_return(final_state)
+
+      post '/off'
+
+      last_response.status.should == 200
+      JSON.parse(last_response.body).should == final_state
+    end
+  end
+end

data/spec/sonamp/client_spec.rb

@@ -0,0 +1,11 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+describe Seriamp::Sonamp::Client do
+  describe '#initialize' do
+    it 'works' do
+      described_class.new
+    end
+  end
+end

data/spec/sonamp/cmd_spec.rb

@@ -0,0 +1,11 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+describe Seriamp::Sonamp::Cmd do
+  describe '#initialize' do
+    it 'works' do
+      described_class.new
+    end
+  end
+end

data/spec/spec_helper.rb

@@ -0,0 +1,16 @@
+# frozen_string_literal: true
+
+ENV['RACK_ENV'] = 'test'
+
+require 'byebug'
+require 'seriamp/all'
+require 'rack/test'
+
+RSpec.configure do |rspec|
+  rspec.expect_with(:rspec) do |c|
+    c.syntax = [:should, :expect]
+  end
+  rspec.mock_with(:rspec) do |mocks|
+    mocks.syntax = [:should, :expect]
+  end
+end