balboa_worldwide_app 1.2.5 → 2.0.2

data/lib/bwa/proxy.rb

@@ -1,31 +1,31 @@
-require 'socket'
-require 'bwa/message'
+# frozen_string_literal: true
+
+require "socket"
+require "bwa/logger"
+require "bwa/message"
 
 module BWA
   class Proxy
-    def initialize(host, port: 4257, listen_port: 4257)
+    def initialize(host, port: 4257)
       @host, @port = host, port
       @listen_socket = TCPServer.open(port)
     end
 
     def run
-      loop do
-        client_socket = @listen_socket.accept
-        server_socket = TCPSocket.new(@host, @port)
-        t1 = Thread.new do
-          shuffle_messages(client_socket, server_socket, "Client")
-        end
-        t2 = Thread.new do
-          shuffle_messages(server_socket, client_socket, "Server")
-        end
-        t1.join
-        t2.join
-        break
+      client_socket = @listen_socket.accept
+      server_socket = TCPSocket.new(@host, @port)
+      t1 = Thread.new do
+        shuffle_messages(client_socket, server_socket, "Client")
+      end
+      t2 = Thread.new do
+        shuffle_messages(server_socket, client_socket, "Server")
       end
+      t1.join
+      t2.join
     end
 
     def shuffle_messages(socket1, socket2, tag)
-      leftover_data = "".force_encoding(Encoding::ASCII_8BIT)
+      leftover_data = (+"").force_encoding(Encoding::ASCII_8BIT)
       loop do
         if leftover_data.length < 2 || leftover_data.length < leftover_data[1].ord + 2
           begin
@@ -41,12 +41,12 @@ module BWA
         end
         data_length = leftover_data[1].ord
         data = leftover_data[0...(data_length + 2)]
-        leftover_data = leftover_data[(data_length + 2)..-1] || ''
+        leftover_data = leftover_data[(data_length + 2)..-1] || ""
         begin
           message = Message.parse(data)
-          puts "#{tag}: #{message.inspect}"
+          BWA.logger.info "#{tag}: #{message.inspect}"
         rescue InvalidMessage => e
-          puts "#{tag}: #{e}"
+          BWA.logger.info "#{tag}: #{e}"
         end
         socket2.send(data, 0)
       end

data/lib/bwa/server.rb

@@ -1,5 +1,8 @@
-require 'socket'
-require 'bwa/message'
+# frozen_string_literal: true
+
+require "socket"
+require "bwa/logger"
+require "bwa/message"
 
 module BWA
   class Server
@@ -11,42 +14,40 @@ module BWA
     def run
       loop do
         socket = @listen_socket.accept
-        #Thread.new do
-          run_client(socket)
-        #end
-        break
+        run_client(socket)
       end
     end
 
     def send_message(socket, message)
       length = message.length + 2
-      full_message = "#{length.chr}#{message}".force_encoding(Encoding::ASCII_8BIT)
+      full_message = (+"#{length.chr}#{message}").force_encoding(Encoding::ASCII_8BIT)
       checksum = CRC.checksum(full_message)
-      socket.send("\x7e#{full_message}#{checksum.chr}\x7e".force_encoding(Encoding::ASCII_8BIT), 0)
+      socket.send((+"\x7e#{full_message}#{checksum.chr}\x7e").force_encoding(Encoding::ASCII_8BIT), 0)
     end
 
     def run_client(socket)
-      puts "Received connection from #{socket.remote_address.inspect}"
+      BWA.logger.info "Received connection from #{socket.remote_address.inspect}"
 
       send_status(socket)
       loop do
-        if IO.select([socket], nil, nil, 1)
+        if socket.wait_readable(1)
           data = socket.recv(128)
           break if data.empty?
+
           begin
             message = Message.parse(data)
-            puts message.raw_data.unpack("H*").first.scan(/[0-9a-f]{2}/).join(' ')
-            puts message.inspect
+            BWA.logger.info BWA.raw2str(message.raw_data)
+            BWA.logger.info message.inspect
 
             case message
             when Messages::ConfigurationRequest
               send_configuration(socket)
             when Messages::ControlConfigurationRequest
               message.type == 1 ? send_control_configuration(socket) : send_control_configuration2(socket)
-            when Messages::SetTemperature
+            when Messages::SetTargetTemperature
               temperature = message.temperature
               temperature /= 2.0 if @status.temperature_scale == :celsius
-              @status.set_temperature = temperature
+              @status.target_temperature = temperature
             when Messages::SetTemperatureScale
               @status.temperature_scale = message.scale
             when Messages::ToggleItem
@@ -64,8 +65,8 @@ module BWA
               end
             end
           rescue BWA::InvalidMessage => e
-            puts e.message
-            puts e.raw_data.unpack("H*").first.scan(/[0-9a-f]{2}/).join(' ')
+            BWA.logger.warn e.message
+            BWA.logger.warn BWA.raw2str(e.raw_data)
           end
         else
           send_status(socket)
@@ -74,16 +75,18 @@ module BWA
     end
 
     def send_status(socket)
-      puts "sending #{@status.inspect}"
+      BWA.logger.info "sending #{@status.inspect}"
       socket.send(@status.serialize, 0)
     end
 
     def send_configuration(socket)
-      send_message(socket, "\x0a\xbf\x94\x02\x02\x80\x00\x15\x27\x10\xab\xd2\x00\x00\x00\x00\x00\x00\x00\x00\x00\x15\x27\xff\xff\x10\xab\xd2")
+      send_message(socket,
+                   "\x0a\xbf\x94\x02\x02\x80\x00\x15\x27\x10\xab\xd2\x00\x00\x00\x00\x00\x00\x00\x00\x00\x15\x27\xff\xff\x10\xab\xd2") # rubocop:disable Layout/LineLength
     end
 
     def send_control_configuration(socket)
-      send_message(socket, "\x0a\xbf\x24\x64\xdc\x11\x00\x42\x46\x42\x50\x32\x30\x20\x20\x01\x3d\x12\x38\x2e\x01\x0a\x04\x00")
+      send_message(socket,
+                   "\x0a\xbf\x24\x64\xdc\x11\x00\x42\x46\x42\x50\x32\x30\x20\x20\x01\x3d\x12\x38\x2e\x01\x0a\x04\x00")
     end
 
     def send_control_configuration2(socket)

data/lib/bwa/version.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module BWA
-  VERSION = '1.2.5'
+  VERSION = "2.0.2"
 end

metadata

@@ -1,71 +1,77 @@
 --- !ruby/object:Gem::Specification
 name: balboa_worldwide_app
 version: !ruby/object:Gem::Version
-  version: 1.2.5
+  version: 2.0.2
 platform: ruby
 authors:
 - Cody Cutrer
 autorequire: 
-bindir: bin
+bindir: exe
 cert_chain: []
-date: 2021-10-27 00:00:00.000000000 Z
+date: 2021-12-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: digest-crc
+  name: ccutrer-serialport
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.4'
+        version: 1.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.4'
+        version: 1.0.0
 - !ruby/object:Gem::Dependency
-  name: mqtt
+  name: digest-crc
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.5.0
+        version: '0.4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.5.0
+        version: '0.4'
 - !ruby/object:Gem::Dependency
-  name: net-telnet-rfc2217
+  name: mqtt-homeassistant
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.0.3
+        version: '0.1'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.1.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.0.3
+        version: '0.1'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.1.3
 - !ruby/object:Gem::Dependency
-  name: ccutrer-serialport
+  name: net-telnet-rfc2217
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: 0.0.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: 0.0.3
 - !ruby/object:Gem::Dependency
   name: sd_notify
   requirement: !ruby/object:Gem::Requirement
@@ -86,14 +92,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '9.0'
+        version: '11.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '9.0'
+        version: '11.0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -108,21 +114,67 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '13.0'
+- !ruby/object:Gem::Dependency
+  name: rubocop
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.23'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.23'
+- !ruby/object:Gem::Dependency
+  name: rubocop-performance
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.12'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.12'
+- !ruby/object:Gem::Dependency
+  name: rubocop-rake
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.6'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.6'
 description: 
 email: cody@cutrer.com'
 executables:
+- bwa_client
+- bwa_server
+- bwa_proxy
 - bwa_mqtt_bridge
 extensions: []
 extra_rdoc_files: []
 files:
-- bin/bwa_client
-- bin/bwa_mqtt_bridge
-- bin/bwa_proxy
-- bin/bwa_server
+- exe/bwa_client
+- exe/bwa_mqtt_bridge
+- exe/bwa_proxy
+- exe/bwa_server
 - lib/balboa_worldwide_app.rb
 - lib/bwa/client.rb
 - lib/bwa/crc.rb
 - lib/bwa/discovery.rb
+- lib/bwa/logger.rb
 - lib/bwa/message.rb
 - lib/bwa/messages/configuration.rb
 - lib/bwa/messages/configuration_request.rb
@@ -130,7 +182,7 @@ files:
 - lib/bwa/messages/control_configuration_request.rb
 - lib/bwa/messages/filter_cycles.rb
 - lib/bwa/messages/ready.rb
-- lib/bwa/messages/set_temperature.rb
+- lib/bwa/messages/set_target_temperature.rb
 - lib/bwa/messages/set_temperature_scale.rb
 - lib/bwa/messages/set_time.rb
 - lib/bwa/messages/status.rb
@@ -141,7 +193,8 @@ files:
 homepage: https://github.com/ccutrer/bwa
 licenses:
 - MIT
-metadata: {}
+metadata:
+  rubygems_mfa_required: 'true'
 post_install_message: 
 rdoc_options: []
 require_paths:
@@ -150,7 +203,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: '2.5'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="

data/bin/bwa_client

@@ -1,43 +0,0 @@
-#!/usr/bin/env ruby
-
-require 'bwa/client'
-require 'bwa/discovery'
-
-def watch(spa)
-  loop do
-    begin
-      message = spa.poll
-      next if message.is_a?(BWA::Messages::Ready)
-      puts message.raw_data.unpack("H*").first.scan(/[0-9a-f]{2}/).join(' ')
-      puts message.inspect
-      if block_given?
-        break if yield
-      end
-    rescue BWA::InvalidMessage => e
-      puts e.message
-      puts e.raw_data.unpack("H*").first.scan(/[0-9a-f]{2}/).join(' ')
-      break
-    end
-  end
-end
-
-if ARGV.empty?
-  spas = BWA::Discovery.discover
-  if spas.empty?
-    $stderr.puts "Could not find spa!"
-    exit 1
-  end
-  spa_ip = spas.first.first
-else
-  spa_ip = ARGV[0]
-end
-
-spa = BWA::Client.new(spa_ip)
-
-spa.request_configuration
-spa.request_control_info
-watch(spa) do
-  spa.last_status
-end
-
-watch(spa)