meshtastic 0.0.44 → 0.0.46

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5dec0934f3c9c639e3af0cf5f8b88447dd83a96c5ed8082ff954ce13c5b758dd
-  data.tar.gz: c4a3e692fdc5f92a8e1ddf997ae9d5f7c6e33915dd239546d52f3adcee690a44
+  metadata.gz: 7627b4cf871e12c62a30d8c7a90c9680a9a775d0dcc30fccb49cb0aecd2e3de8
+  data.tar.gz: ca83b3e9916ec33319250ce639801c63ef5b325d7d6a9222e8cf1481b0f2fc2c
 SHA512:
-  metadata.gz: 8c20d4c63ffdf13b5903f2e5605d5296268613b7bd7cc3380f48e4405e7b4aabda8216775f6664b42e5886dffdac42cfcb66b13bc1a48068e19f3152e1fa9598
-  data.tar.gz: a2ff5b9076561cb0b43b798d4bc6471f7ee2a4387be99bd53b98b389b4344954fbf451ce41be341c6e3a945b12adc02ba531883466fbb46cde30d8f7e0651c02
+  metadata.gz: ba16787d5ae6f67bfc6e506526d37ae36efcb93bf2045f6fec161a77b8bb41a3e8ae41bc14dabb3553493de6122215e0d704d0108754782351721623921a0c26
+  data.tar.gz: 2134adcb77a859cac8b381b7e07633c1d3ec577d9122d101e731ff9eda6cfee9f519d38f225a418585bd1fd19cb8dc5d9fccb0be9404152a21dda3990b25a27a

data/lib/meshtastic/mqtt.rb

@@ -127,6 +127,9 @@ module Meshtastic
         decoder = Meshtastic::Waypoint
         # when :ZPS_APP
         # decoder = Meshtastic::Zps
+      else
+        puts "WARNING: Can't decode\n#{payload}\nw/ portnum: #{msg_type.inspect}"
+        return payload
       end
 
       payload = decoder.decode(payload).to_h
@@ -145,7 +148,7 @@ module Meshtastic
         mac_raw = payload[:macaddr]
         mac_hex_arr = mac_raw.bytes.map { |byte| byte.to_s(16).rjust(2, '0') }
         mac_hex_str = mac_hex_arr.join(':')
-        payload[:macaddr_hex] = mac_hex_str
+        payload[:macaddr] = mac_hex_str
       end
 
       if payload.keys.include?(:time)
@@ -227,6 +230,8 @@ module Meshtastic
             decoded_payload_hash = decoded_payload.to_h
           end
 
+          next unless decoded_payload_hash[:packet].is_a?(Hash)
+
           message = decoded_payload_hash[:packet] if decoded_payload_hash.keys.include?(:packet)
           message[:topic] = raw_topic
           message[:node_id_from] = "!#{message[:from].to_i.to_s(16)}"
@@ -293,24 +298,26 @@ module Meshtastic
           next
         ensure
           filter_arr = [message[:id].to_s] if filter.nil?
-          flat_message = message.values.join(' ')
-
-          disp = true if filter_arr.first == message[:id] ||
-                         filter_arr.all? { |filter| flat_message.include?(filter) }
-
-          if disp
-            if block_given?
-              yield decoded_payload_hash
-            else
-              puts "\n"
-              puts '-' * 80
-              puts 'MSG:'
-              puts stdout_message
-              puts '-' * 80
-              puts "\n\n\n"
+          if message.is_a?(Hash)
+            flat_message = message.values.join(' ')
+
+            disp = true if filter_arr.first == message[:id] ||
+                           filter_arr.all? { |filter| flat_message.include?(filter) }
+
+            if disp
+              if block_given?
+                yield decoded_payload_hash
+              else
+                puts "\n"
+                puts '-' * 80
+                puts 'MSG:'
+                puts stdout_message
+                puts '-' * 80
+                puts "\n\n\n"
+              end
+              # else
+              # print '.'
             end
-          else
-            print '.'
           end
         end
       end

data/lib/meshtastic/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Meshtastic
-  VERSION = '0.0.44'
+  VERSION = '0.0.46'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: meshtastic
 version: !ruby/object:Gem::Version
-  version: 0.0.44
+  version: 0.0.46
 platform: ruby
 authors:
 - 0day Inc.
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-05-07 00:00:00.000000000 Z
+date: 2024-05-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler