somfy_sdn 2.1.2 → 2.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: aab121215242974fc0570c9495954b8a8584fd02535fe6b758590e3e5baa7a21
-  data.tar.gz: f2130a9042156d347808409bab26bec3dcdd37ac27d4a5fcd156ed90a889ed6a
+  metadata.gz: 10f8660ac4681db000372dc97f6fe9a738d706f2751965a3556d5d6dcf22215a
+  data.tar.gz: 8659cf3dc75cf10d677b6329dc2ab65fec9367bb2a6c70da623557f0dfc113b5
 SHA512:
-  metadata.gz: a104e2ad0bba74257e89768c36ceba023208190074da12fe35420c451c981b9582521b6276fd342e6513d7949e7264b073c4975a66bbaacd4592577948ad3ed6
-  data.tar.gz: fce28168771816f6718d116fb0bc84daa02475b9a8318ddf65e16caa288c24303e2f57910d445d654c44b2dbb356ccf23b5b680b29120c3c9f751317ba661a6f
+  metadata.gz: 9432f5079edfa4a6a0d70845b4bf17140269c4608fa6a006de501eb68f59806e9f85c44658f41da857c7fbd7c8ae69c4781479de36d149f60649b3c3b9670f19
+  data.tar.gz: 25831ea7fa94905b3cab5062216118e9b74b861b2a1c93a7ed49ce4aa64fceba30bcb3e2e79675c43c019d4d639aa944561bb0af7414192a0e981f3649511351

data/lib/sdn/cli/mqtt.rb

@@ -45,6 +45,7 @@ module SDN
 
         @sdn = Client.new(port)
 
+        Thread.abort_on_exception = true
         read_thread = Thread.new { read }
         write_thread = Thread.new { write }
         @mqtt.get { |packet| handle_message(packet.topic, packet.payload) }

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;
+          # two 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 == 2
+
             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.2'
+  VERSION = '2.1.3'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: somfy_sdn
 version: !ruby/object:Gem::Version
-  version: 2.1.2
+  version: 2.1.3
 platform: ruby
 authors:
 - Cody Cutrer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-01-16 00:00:00.000000000 Z
+date: 2022-01-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mqtt-ccutrer