meshtastic 0.0.34 → 0.0.35

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8bc079b846550e65c15013b3926d0680fbbb77e393484b2c001cd9ad95777f00
-  data.tar.gz: 47cde9a565ac4815bbeccf179269e1be1c982c107774b2790b3a7a2bd4cf883c
+  metadata.gz: bca28989f9cdb4c958571d59ea70d035154bb4c796017bbd948dea5987dfbc8d
+  data.tar.gz: 4dd3be1a0ccde5cab5711fe2e31c8d9dd869a4f4f204b2af5916ee6b731b47aa
 SHA512:
-  metadata.gz: 1b864230b6ab3db1c78955be811421ae7910cdbfeb962483a2b9c1afa7e9a7ec170e0eb1aae5f05c5f94049c7b122cfe9e8f719deb1c98d6b308d5b8ad3568a7
-  data.tar.gz: 8b5ab00dab82fdd351c9c7634765a121c316dfd1f0fb9dc319ab451073986d8c1a822cc95f421accd36db42a6e0c2ced4610f49a305692e667061ecc8b43f15e
+  metadata.gz: 34639b023c2ae75cb76f627fb0af84c08703f112a4da326fd14ef2103a8667dc376260617ba905275f047a78e3086e6d62586f65b84848caa92b816951dcca8d
+  data.tar.gz: 83b59c484395c04983c6ca4c20624e14101369345c5ae09db8e2d7879410556e21615aadeb2865959c37bf851b147424c3970e71ff6ea29d690dfae006b260c8

data/lib/meshtastic/mqtt.rb

@@ -175,7 +175,8 @@ module Meshtastic
               pb_obj = Meshtastic::StoreAndForward.decode(payload)
             when :TEXT_MESSAGE_APP
               # Unsure if this is the correct protobuf object
-              pb_obj = Meshtastic::MqttClientProxyMessage.decode(payload)
+              # pb_obj = Meshtastic::MqttClientProxyMessage.decode(payload)
+              pb_obj = Meshtastic::Data.decode(payload)
             when :TELEMETRY_APP
               pb_obj = Meshtastic::Telemetry.decode(payload)
             when :TRACEROUTE_APP
@@ -214,20 +215,27 @@ module Meshtastic
             # message[:decoded][:pb_obj] = pb_obj
           end
 
-          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) }
-
           message[:raw_packet] = raw_packet if block_given?
-          stdout_message = JSON.pretty_generate(message) unless block_given?
+          unless block_given?
+            message[:stdout] = 'pretty'
+            stdout_message = JSON.pretty_generate(message)
+          end
         rescue Google::Protobuf::ParseError,
                JSON::GeneratorError
 
-          stdout_message = message.inspect unless block_given?
+          unless block_given?
+            message[:stdout] = 'inspect'
+            stdout_message = message.inspect
+          end
+
           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 message

data/lib/meshtastic/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: meshtastic
 version: !ruby/object:Gem::Version
-  version: 0.0.34
+  version: 0.0.35
 platform: ruby
 authors:
 - 0day Inc.