meshtastic 0.0.33 → 0.0.35

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5cc77b2e88470456485851d5721eeffe6e236272135f59e8e9f9ff3cba390cb6
-  data.tar.gz: 7404c0e767b75ba26c36f84d5ed0b3c66a2f40c14faf7f5e0d3e0e96cef506a9
+  metadata.gz: bca28989f9cdb4c958571d59ea70d035154bb4c796017bbd948dea5987dfbc8d
+  data.tar.gz: 4dd3be1a0ccde5cab5711fe2e31c8d9dd869a4f4f204b2af5916ee6b731b47aa
 SHA512:
-  metadata.gz: 1c2fe7fd8d6b2dd057a12491f62d0fdaec47fe64b90a1237e4880a035e6e8608a3ac78f8f0910b8b9a8250133a4404dddf9b8515b1f77515c6c8e61fcb2a1b51
-  data.tar.gz: a3330f2c01d5bddeba52d5c781c57b3ff0667712d8df94733ec87795abf5b23d27831b2717d10071214460f96f1a39bbdee162a5d39d5b64c271fb68bb7c3d2f
+  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
@@ -203,24 +204,38 @@ module Meshtastic
                 lon: longitude
               ).first.data
             end
+
+            # If we there's a mac address, make it look like one.
+            if message[:decoded][:payload].keys.include?(:macaddr)
+              macaddr = message[:decoded][:payload][:macaddr]
+              macaddr_fmt = macaddr.bytes.map { |byte| byte.to_s(16).rjust(2, '0') }.join(':')
+              message[:decoded][:payload][:macaddr] = macaddr_fmt
+            end
             # puts pb_obj.public_methods
             # 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.33'
+  VERSION = '0.0.35'
 end

metadata

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