somfy_sdn 2.1.0 → 2.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: df44cc648ee7fa0079f6067deee6b8fa488c1cbdc31acc252d9803eb1a32cdf3
-  data.tar.gz: 17cda1e8629bc58d88cb202286a7d9b5bb4d88de28d3a9c133c669796b979c60
+  metadata.gz: 636b137221c1ccd49cd089e38447f59625be071352da630a61bb3b85c73a9b93
+  data.tar.gz: cd9bd4040fe5b209d56c7e1a7c70ee98f068b3da044e3f82ac3680fceafac781
 SHA512:
-  metadata.gz: 7915001ae78047ac6e0669d2f362bcb165db06fe6ca29c8a155150c04093044abd9f158b89ee81c836dcece92114a60a39ca139f30317791f08bb99a132b5ad1
-  data.tar.gz: 7f97633393e8daeefdf9bafb8e12f4534e1c724939b161357543df808a630815ff34dc42af5fc172dc45d09101bf9bf4bccd24fb53cb181eebb37447287bd32e
+  metadata.gz: 612535efe5bb8cbe7191e8b8ac318a4192def9689743f0387df25e7c75a86856457ba97dc8693b6329bdbc45024f66068c5838b651b0af834eddc075d98f62a5
+  data.tar.gz: 81eaced8fc720b9ba2b3a11b9578d13691038fc2962a4a4940fecc5fc710488860ea1bc04293ebcb0ea7f56c4851f833992fea6f00f40d6b366132e2fcebb527

data/lib/sdn/cli/mqtt.rb

@@ -25,7 +25,7 @@ module SDN
       def initialize(port, mqtt_uri, device_id: "somfy", base_topic: "homie", auto_discover: true)
         @base_topic = "#{base_topic}/#{device_id}"
         @mqtt = ::MQTT::Client.new(mqtt_uri)
-        @mqtt.set_will("#{@base_topic}/$state", "lost", true)
+        @mqtt.set_will("#{@base_topic}/$state", "lost", retain: true)
         @mqtt.connect
 
         @motors = {}
@@ -45,9 +45,10 @@ module SDN
 
         @sdn = Client.new(port)
 
+        Thread.abort_on_exception = true
         read_thread = Thread.new { read }
         write_thread = Thread.new { write }
-        @mqtt.get { |topic, value| handle_message(topic, value) }
+        @mqtt.get { |packet| handle_message(packet.topic, packet.payload) }
       end
 
       def publish(topic, value)
@@ -72,14 +73,14 @@ module SDN
         @mqtt.subscribe("#{topic}/#")
         @mqtt.unsubscribe("#{topic}/#", wait_for_ack: true)
         while !@mqtt.queue_empty?
-          topic, value = @mqtt.get
-          @mqtt.publish(topic, nil, retain: true)
+          packet = @mqtt.get
+          @mqtt.publish(packet.topic, nil, retain: true)
         end
       end
 
       def publish_basic_attributes
         @mqtt.batch_publish do
-          publish("$homie", "v4.0.0")
+          publish("$homie", "4.0.0")
           publish("$name", "Somfy SDN Network")
           publish("$state", "init")
           publish("$nodes", "FFFFFF")
@@ -94,29 +95,39 @@ module SDN
           publish("FFFFFF/discover/$settable", "true")
           publish("FFFFFF/discover/$retained", "false")
 
-          subscribe("+/discover/set")
-          subscribe("+/label/set")
-          subscribe("+/control/set")
-          subscribe("+/jog-ms/set")
-          subscribe("+/jog-pulses/set")
-          subscribe("+/position-pulses/set")
-          subscribe("+/position-percent/set")
-          subscribe("+/ip/set")
-          subscribe("+/reset/set")
-          subscribe("+/direction/set")
-          subscribe("+/up-speed/set")
-          subscribe("+/down-speed/set")
-          subscribe("+/slow-speed/set")
-          subscribe("+/up-limit/set")
-          subscribe("+/down-limit/set")
-          subscribe("+/groups/set")
-          (1..16).each do |ip|
-            subscribe("+/ip#{ip}-pulses/set")
-            subscribe("+/ip#{ip}-percent/set")
-          end
+          subscribe_all
 
           publish("$state", "ready")
         end
+
+        @mqtt.on_reconnect do
+          subscribe_all
+          publish("$state", :init)
+          publish("$state", :ready)
+        end
+      end
+
+      def subscribe_all
+        subscribe("+/discover/set")
+        subscribe("+/label/set")
+        subscribe("+/control/set")
+        subscribe("+/jog-ms/set")
+        subscribe("+/jog-pulses/set")
+        subscribe("+/position-pulses/set")
+        subscribe("+/position-percent/set")
+        subscribe("+/ip/set")
+        subscribe("+/reset/set")
+        subscribe("+/direction/set")
+        subscribe("+/up-speed/set")
+        subscribe("+/down-speed/set")
+        subscribe("+/slow-speed/set")
+        subscribe("+/up-limit/set")
+        subscribe("+/down-limit/set")
+        subscribe("+/groups/set")
+        (1..16).each do |ip|
+          subscribe("+/ip#{ip}-pulses/set")
+          subscribe("+/ip#{ip}-percent/set")
+        end
       end
 
       def publish_motor(addr, node_type)

data/lib/sdn/client.rb

@@ -58,18 +58,30 @@ module SDN
         unless message
           break unless messages.empty?
 
+          # one EOF is just serial ports saying they have no data;
+          # several EOFs in a row is the file is dead and gone
+          eofs = 0
           begin
             block = @io.read_nonblock(64 * 1024)
             SDN.logger.debug "read #{block.unpack("H*").first.gsub(/\h{2}/, "\\0 ")}"
             @buffer.concat(block)
             next
-          rescue IO::WaitReadable, EOFError
+          rescue IO::WaitReadable, EOFError => e
+            if e.is_a?(EOFError)
+              eofs += 1
+            else
+              eofs = 0
+            end
+            raise if eofs == 5
+
             wait = @buffer.empty? ? timeout : WAIT_TIME
             if @io.wait_readable(wait).nil?
               # timed out; just discard everything
               SDN.logger.debug "discarding #{@buffer.unpack("H*").first.gsub(/\h{2}/, "\\0 ")} due to timeout"
               @buffer = ""
             end
+
+            retry
           end
           next
         end

data/lib/sdn/version.rb

@@ -1,3 +1,3 @@
 module SDN
-  VERSION = '2.1.0'
+  VERSION = '2.1.4'
 end

metadata

@@ -1,17 +1,17 @@
 --- !ruby/object:Gem::Specification
 name: somfy_sdn
 version: !ruby/object:Gem::Version
-  version: 2.1.0
+  version: 2.1.4
 platform: ruby
 authors:
 - Cody Cutrer
-autorequire:
+autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-02-16 00:00:00.000000000 Z
+date: 2022-01-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: ccutrer-mqtt
+  name: mqtt-ccutrer
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
@@ -108,7 +108,7 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '13.0'
-description:
+description: 
 email: cody@cutrer.com'
 executables:
 - somfy_sdn
@@ -142,7 +142,7 @@ homepage: https://github.com/ccutrer/somfy_sdn
 licenses:
 - MIT
 metadata: {}
-post_install_message:
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -157,8 +157,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.4
-signing_key:
+rubygems_version: 3.1.2
+signing_key: 
 specification_version: 4
 summary: Library for communication with Somfy SDN RS-485 motorized shades
 test_files: []