meshtastic 0.0.45 → 0.0.47

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b2d188ac05f244ce12a4825659a327bb883a51cb601875e5c21e8b45b4528741
-  data.tar.gz: 535ab977c36d067eb9c6a2a3be242b96efa1e3ed0864e2e4d3517970c806d870
+  metadata.gz: 8c8b90d169f041f15fe64d36133a7ed30606c98bb7377c1f783e222c57b805bc
+  data.tar.gz: b8fc0fc381efecc813bf0c622638c73a2d3edd016f124f8636822324329b307a
 SHA512:
-  metadata.gz: c46cdbb49616cc18ddf12a06f11e2dcd981581455146923571601a16ca417a7ddf18b3d769a6182b874ae01aafb526ed6d967c453dfedb30142ed995b398728c
-  data.tar.gz: df15c9aa4b5084734e3db4122647242ed16d89ddc45d8a54bc163602b86ca5cf93a110ca064d90052698f726dc01910023ac8506bbc1b88ce50609dd825f0abc
+  metadata.gz: ec4a0d4ecf315388482c71b51edb9213e03ac56ed2fad87a62c7bd715ba8071be85700d207646aa28392a52cbee9b0d431e8911ae7924ae8455ab51481219330
+  data.tar.gz: 17d1662d12d303ff0824b5716fa00829275d3fd8169a86f48d84960e207dc8e80fdd17337f240d4b6d52326cf98e2d2a851013306d7bd60e85bfae479eae35cd

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
@@ -205,6 +208,7 @@ module Meshtastic
 
       # NOTE: Use MQTT Explorer for topic discovery
       full_topic = "#{root_topic}/#{region}/#{channel}"
+      full_topic = "#{root_topic}/#{region}" if region == '#'
       puts "Subscribing to: #{full_topic}"
       mqtt_obj.subscribe(full_topic, qos)
 
@@ -227,6 +231,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 +299,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.45'
+  VERSION = '0.0.47'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: meshtastic
 version: !ruby/object:Gem::Version
-  version: 0.0.45
+  version: 0.0.47
 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