meshtastic 0.0.34 → 0.0.36

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8bc079b846550e65c15013b3926d0680fbbb77e393484b2c001cd9ad95777f00
-  data.tar.gz: 47cde9a565ac4815bbeccf179269e1be1c982c107774b2790b3a7a2bd4cf883c
+  metadata.gz: a1557d6c023667935647acdf7bb90c4d1613bf048a1907b522849fb9f3a3c5d1
+  data.tar.gz: a26600a5afd502eeb0a7efe99c9df4cddf8f41635d1d53414f8d4a7d59c036f3
 SHA512:
-  metadata.gz: 1b864230b6ab3db1c78955be811421ae7910cdbfeb962483a2b9c1afa7e9a7ec170e0eb1aae5f05c5f94049c7b122cfe9e8f719deb1c98d6b308d5b8ad3568a7
-  data.tar.gz: 8b5ab00dab82fdd351c9c7634765a121c316dfd1f0fb9dc319ab451073986d8c1a822cc95f421accd36db42a6e0c2ced4610f49a305692e667061ecc8b43f15e
+  metadata.gz: 38f3941863fb6a984f0ea93e170435fdf9d6c9ff648b7b779cb476daf7c4d3e6fdae2c17ac1b28207a5e7a36088cf3eb9630478304059350a6edc9163538eb19
+  data.tar.gz: 356331a1d7daf23a56359108cf469e059fb5671660a8cea817b21ada22253e400e8879cc74cc0ff4197a0240c47f5416783d84cadba37374c7f4c823e947340d

data/lib/meshtastic/mqtt.rb

@@ -86,21 +86,24 @@ module Meshtastic
       cipher = OpenSSL::Cipher.new('AES-128-CTR')
       filter_arr = filter.to_s.split(',').map(&:strip)
       mqtt_obj.get_packet do |packet_bytes|
-        raw_packet = packet_bytes.to_s.b
+        # raw_packet = packet_bytes.to_s.b
         raw_topic = packet_bytes.topic ||= ''
-        raw_message = packet_bytes.payload
+        raw_payload = packet_bytes.payload
 
         begin
           disp = false
+          decoded_payload_hash = {}
           message = {}
           stdout_message = ''
 
           if json
-            message = JSON.parse(raw_message, symbolize_names: true)
+            decoded_payload_hash = JSON.parse(raw_payload, symbolize_names: true)
           else
-            decoded_packet = Meshtastic::ServiceEnvelope.decode(raw_message)
-            message = decoded_packet.to_h[:packet]
+            decoded_payload = Meshtastic::ServiceEnvelope.decode(raw_payload)
+            decoded_payload_hash = decoded_payload.to_h
           end
+
+          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)}"
           message[:node_id_to] = "!#{message[:to].to_i.to_s(16)}"
@@ -123,6 +126,8 @@ module Meshtastic
 
             decrypted = cipher.update(encrypted_message) + cipher.final
             message[:decrypted] = decrypted
+            # decoded_packet = Meshtastic::ServiceEnvelope.decode(decrypted)
+            # puts "Decoded Decrypted Packet: #{decoded_packet.display.to_h}"
             # Vvv Decode the decrypted message vvV
           end
 
@@ -175,7 +180,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,23 +220,32 @@ module Meshtastic
             # message[:decoded][:pb_obj] = pb_obj
           end
 
+          # message[:raw_packet] = raw_packet if block_given?
+          decoded_payload_hash[:packet] = message
+          unless block_given?
+            message[:stdout] = 'pretty'
+            stdout_message = JSON.pretty_generate(decoded_payload_hash)
+          end
+        rescue Google::Protobuf::ParseError,
+               JSON::GeneratorError
+
+          decoded_payload_hash[:packet] = message
+          unless block_given?
+            message[:stdout] = 'inspect'
+            stdout_message = decoded_payload_hash.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) }
 
-          message[:raw_packet] = raw_packet if block_given?
-          stdout_message = JSON.pretty_generate(message) unless block_given?
-        rescue Google::Protobuf::ParseError,
-               JSON::GeneratorError
-
-          stdout_message = message.inspect unless block_given?
-          next
-        ensure
           if disp
             if block_given?
-              yield message
+              yield decoded_payload_hash
             else
               puts "\n"
               puts '-' * 80

data/lib/meshtastic/version.rb

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

metadata

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