ruby-mqtt3 1.0.0 → 1.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 68bf5d092ad9497fd2bce86c75325cb00438f89b6bc5cb92f6c0ae2221f9e379
-  data.tar.gz: f7fe2882e4e2fe44013ed4e235dbdebdb892fcd28351d112708e00214abef7d5
+  metadata.gz: bf4fecfb1b300b770fb8a8cfe9477270e225d485cb5c51e73c34583f9321e116
+  data.tar.gz: 851e771ca32a9594e59f31e8fb5d9ce3bcbe69f3fc70ba7d222a0c5c1a9afe07
 SHA512:
-  metadata.gz: d71f5787b3b639396050432b001220f4f46571aea8af362673c2c6f3fdf1d82e382b40a1534c08907610f18f3a7a652885c44a5863d5edfac5c28b81e9e4f344
-  data.tar.gz: fe9545a26a3135d7e8ab0ceb91c62bf0ae2d7189600b0fa5c04a58dd0405a86171b63301bff9d670b85ecc9954b2da133704091f22615a6d502f0ebfb2743a5d
+  metadata.gz: f22d1ceca6e946b08bae7b79f8257b291db2d6f3f44e611c9e7c7fb38ea8a8b96f08ca17d682c36032676fbabecd4b55732c73974e8aa0fe191dba26834f7f27
+  data.tar.gz: c9ccf312d52c591ce6a8cce6bede49a2e57880d7c2bc348ed2704eadf3bfdbaed33cf6d7979251045413ee748864a3ef09d0a06fb2b09373bbcfd3cf43049db9

data/lib/ruby-mqtt3.rb

@@ -3,6 +3,9 @@ require 'openssl'
 class Mqtt3NormalExitException < Exception
 end
 
+class Mqtt3AbnormalExitException < Exception
+end
+
 class Mqtt3
   attr_accessor :debug
 
@@ -229,25 +232,25 @@ class Mqtt3
   end
 
   def puback(packet_id)
-    packet = "\x42\x02".force_encoding('ASCII-8BIT') #PUBACK
+    packet = "\x40\x02".force_encoding('ASCII-8BIT') #PUBACK
     packet += encode_short(packet_id)
     send_packet(packet)
   end
 
   def pubrec(packet_id)
-    packet = "\x52\x02".force_encoding('ASCII-8BIT') #PUBREC
+    packet = "\x50\x02".force_encoding('ASCII-8BIT') #PUBREC
     packet += encode_short(packet_id)
     send_packet(packet)
   end
 
   def pubrel(packet_id)
-    packet = "\x62\x02".force_encoding('ASCII-8BIT') #PUBREL
+    packet = "\x60\x02".force_encoding('ASCII-8BIT') #PUBREL
     packet += encode_short(packet_id)
     send_packet(packet)
   end
 
   def pubcomp(packet_id)
-    packet = "\x72\x02".force_encoding('ASCII-8BIT') #PUBCOMP
+    packet = "\x70\x02".force_encoding('ASCII-8BIT') #PUBCOMP
     packet += encode_short(packet_id)
     send_packet(packet)
   end
@@ -488,7 +491,7 @@ class Mqtt3
       #TODO rescue
       chunk = @socket.read(count - buffer.length)
       if chunk == '' || chunk.nil?
-        raise Mqtt3NormalExitException
+        raise Mqtt3AbnormalExitException
       else
         buffer += chunk
       end
@@ -540,7 +543,7 @@ class Mqtt3
       @fiber_main = Fiber.current
       #debug 'entering main fiber' + @fiber_main.inspect
       counter = 0
-      while @reconnect do
+      loop do
         ret = tcp_connect()
         if ret.is_a? (Exception)
           @on_tcp_connect_error_block.call(e,counter) unless @on_tcp_connect_error_block.nil?
@@ -557,6 +560,7 @@ class Mqtt3
             e = read_from_socket_loop()
           rescue Mqtt3NormalExitException
             @reconnect = false
+          rescue Mqtt3AbnormalExitException
           rescue
           end
 
@@ -583,6 +587,7 @@ class Mqtt3
             end
           end
         end
+        break unless @reconnect
       end
       #debug 'exiting main fiber' + @fiber_main.inspect
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ruby-mqtt3
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.1
 platform: ruby
 authors:
 - jsaak
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-05-11 00:00:00.000000000 Z
+date: 2022-05-29 00:00:00.000000000 Z
 dependencies: []
 description: Using Fibers and Fiber.scheduler, so needs ruby 3
 email: fake@fake.com
@@ -29,14 +29,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: '3'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.15
+rubygems_version: 3.2.22
 signing_key: 
 specification_version: 4
 summary: Ruby implementation of MQTT 3.1.1 protocol