sappho-heatmiser-proxy 0.0.7 → 0.0.8

data/lib/sappho-heatmiser-proxy.rb

@@ -21,7 +21,7 @@ module Sappho
           TraceLog.instance.info "#{NAME} version #{VERSION} - #{HOMEPAGE}"
           Thread.new do
             clients = ClientRegister.instance
-            port = Integer SystemConfiguration.instance.config['heatmiser.port']
+            port = SystemConfiguration.instance.port
             log = TraceLog.instance
             log.info "opening proxy server port #{port}"
             TCPServer.open port do | server |

data/lib/sappho-heatmiser-proxy/heatmiser.rb

@@ -21,19 +21,15 @@ module Sappho
           status = HeatmiserStatus.instance
           queue = CommandQueue.instance
           log = TraceLog.instance
-          config = SystemConfiguration.instance.config
-          hostname = config['heatmiser.address']
-          port = Integer config['heatmiser.port']
-          pin = Integer config['heatmiser.pin']
-          pinLo = pin & 0xFF
-          pinHi = (pin >> 8) & 0xFF
-          queryCommand = HeatmiserCRC.new([0x93, 0x0B, 0x00, pinLo, pinHi, 0x00, 0x00, 0xFF, 0xFF]).appendCRC
+          config = SystemConfiguration.instance
+          hostname = config.config['heatmiser.address']
+          queryCommand = HeatmiserCRC.new([0x93, 0x0B, 0x00, config.pinLo, config.pinHi, 0x00, 0x00, 0xFF, 0xFF]).appendCRC
           loop do
             status.invalidate
             begin
-              log.info "opening connection to heatmiser at #{hostname}:#{port}"
-              TCPSocket.open hostname, port do | socket |
-                log.info "connected to heatmiser at #{hostname}:#{port}"
+              log.info "opening connection to heatmiser at #{hostname}:#{config.port}"
+              TCPSocket.open hostname, config.port do | socket |
+                log.info "connected to heatmiser at #{hostname}:#{config.port}"
                 loop do
                   begin
                     sleep 5
@@ -45,7 +41,7 @@ module Sappho
                         timeNow = Time.now
                         dayOfWeek = timeNow.wday
                         dayOfWeek = 7 if dayOfWeek == 0
-                        command = HeatmiserCRC.new([0xA3, 0x12, 0x00, pinLo, pinHi, 0x01, 0x2B, 0x00, 0x07,
+                        command = HeatmiserCRC.new([0xA3, 0x12, 0x00, config.pinLo, config.pinHi, 0x01, 0x2B, 0x00, 0x07,
                                                    timeNow.year - 2000,
                                                    timeNow.month,
                                                    timeNow.day,
@@ -76,14 +72,14 @@ module Sappho
                       end
                     end
                   rescue Timeout::Error
-                    log.info "heatmiser at #{hostname}:#{port} is not responding - assuming connection down"
+                    log.info "heatmiser at #{hostname}:#{config.port} is not responding - assuming connection down"
                     break
                   rescue => error
                     log.error error
                     break
                   end
                 end
-                log.info "closing connection to heatmiser at #{hostname}:#{port}"
+                log.info "closing connection to heatmiser at #{hostname}:#{config.port}"
                 socket.close
               end
             rescue => error

data/lib/sappho-heatmiser-proxy/heatmiser_client.rb

@@ -12,6 +12,7 @@ module Sappho
       require 'sappho-heatmiser-proxy/heatmiser_status'
       require 'sappho-heatmiser-proxy/command_queue'
       require 'sappho-heatmiser-proxy/client_register'
+      require 'sappho-heatmiser-proxy/system_configuration'
 
       class HeatmiserClient
 
@@ -25,6 +26,7 @@ module Sappho
         end
 
         def communicate
+          config = SystemConfiguration.instance
           active = true
           while active do
             begin
@@ -36,13 +38,15 @@ module Sappho
                         'error: no response from heatmiser unit in last minute' :
                         @status.valid ? 'ok' : 'error: last response from heatmiser unit was invalid'
                   }
-                  @log.info "client check - reply: #{reply}"
+                  @log.info "client #{@ip} checking status - reply: #{reply}"
                   @client.write "#{reply}\r\n"
                   active = false
                 else
                   command = command.unpack('c*')
                   @log.debug "header: #{TraceLog.hex command}" if @log.debug?
-                  packetSize = (command[1] & 0xFF) | ((command[2] << 8) & 0x0F00)
+                  raise ClientDataError, "invalid pin" unless (command[3] & 0xFF) == config.pinLo and (command[4] & 0xFF) == config.pinHi
+                  packetSize = (command[1] & 0xFF) | ((command[2] << 8) & 0xFF00)
+                  raise ClientDataError, "invalid packet size" if packetSize < 7 or packetSize > 128
                   command += read(packetSize - 5).unpack('c*')
                   CommandQueue.instance.push @ip, command unless (command[0] & 0xFF) == 0x93
                   @status.get { @client.write @status.raw.pack('c*') if @status.valid }
@@ -50,10 +54,10 @@ module Sappho
                 end
               end
             rescue Timeout::Error
-              @log.info "no command received from client #{@ip} so presuming it dormant"
+              @log.info "timeout on client #{@ip} so presuming it dormant"
               active = false
-            rescue HeatmiserClient::ReadError
-              @log.info "unable to receive data from client #{@ip} so presuming it has disconnected"
+            rescue ClientDataError => error
+              @log.info "data error from client #{@ip}: #{error.message}"
               active = false
             rescue => error
               @log.error error
@@ -69,11 +73,11 @@ module Sappho
 
         def read size
           data = @client.read size
-          raise HeatmiserClient::ReadError unless data and data.size == size
+          raise ClientDataError, "nothing received so presuming it has disconnected" unless data and data.size == size
           data
         end
 
-        class ReadError < Interrupt
+        class ClientDataError < Interrupt
         end
 
       end

data/lib/sappho-heatmiser-proxy/system_configuration.rb

@@ -14,10 +14,14 @@ module Sappho
 
         include Singleton
 
-        attr_reader :config
+        attr_reader :config, :port, :pinLo, :pinHi
 
         def initialize
           @config = YAML.load_file(File.expand_path(ARGV[0] || 'heatmiser-proxy.yml'))
+          @port = Integer @config['heatmiser.port']
+          pin = Integer @config['heatmiser.pin']
+          @pinLo = pin & 0xFF
+          @pinHi = (pin >> 8) & 0xFF
         end
 
       end

data/lib/sappho-heatmiser-proxy/version.rb

@@ -7,7 +7,7 @@ module Sappho
   module Heatmiser
     module Proxy
       NAME = "sappho-heatmiser-proxy"
-      VERSION = "0.0.7"
+      VERSION = "0.0.8"
       AUTHORS = ["Andrew Heald"]
       EMAILS = ["andrew@heald.co.uk"]
       HOMEPAGE = "https://github.com/sappho/sappho-heatmiser-proxy/wiki"

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: sappho-heatmiser-proxy
 version: !ruby/object:Gem::Version 
-  hash: 17
+  hash: 15
   prerelease: 
   segments: 
   - 0
   - 0
-  - 7
-  version: 0.0.7
+  - 8
+  version: 0.0.8
 platform: ruby
 authors: 
 - Andrew Heald