meshtastic 0.0.41 → 0.0.42

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 94567b95fcf287b1a47b7af7ea3efb4b6f15a5a0daf81137127b6f5dede9a8fd
-  data.tar.gz: aa07f4271ac1cb1953492ab508f2f8f4f2c7c0c51fb306195b096b950b917c25
+  metadata.gz: 3ffe0a1e8528090281aedce5b132f1f57aa82db0c8c46131cff53d00004e4dcd
+  data.tar.gz: 56bb82c58cdcbced0c401802180931aa4625e4314e4954ab30349811a614d399
 SHA512:
-  metadata.gz: 77093a3977ef63ad7c15d255c679771e5fe02448741147acbc608f19c057d9b9f8f47fe214e0f0a2799cca331726450f978bbda99248fb5d3f592e4d37b09a43
-  data.tar.gz: 4c617b139c876db4b3fff9f4357fba3785972e47e88e85a9a9a1656db8c5ced40e42699b737aa7b84f3cc86ced3f66480a3def02e6e1a2272bdd23ac70d82858
+  metadata.gz: dd84aa7e0607992de00be53a0f8ccb2d69077004dd21ebc2838be38582064a797c0f13317c0abd375ab67199dd494640187895384ea74110c77c9b478a218654
+  data.tar.gz: a1135c741f44f38765421ea2020173b40395478fffdbb24da760d75f8483920f99cf2f0d110f7173fb9617e7522a644dc418f937aef79a35f1b04d89ed94737c

data/Gemfile

@@ -13,7 +13,7 @@ gemspec
 # to review these custom flags (e.g. pg, serialport, etc).
 gem 'bundler', '>=2.5.3'
 gem 'bundle-audit', '0.1.0'
-gem 'geocoder', '1.8.2'
+gem 'geocoder', '1.8.3'
 gem 'google-protobuf', '3.21.12'
 gem 'mqtt', '0.6.0'
 gem 'rake', '13.2.1'
@@ -21,7 +21,7 @@ gem 'rdoc', '6.6.3.1'
 gem 'rspec', '3.13.0'
 gem 'rubocop', '1.63.4'
 gem 'rubocop-rake', '0.6.0'
-gem 'rubocop-rspec', '2.29.1'
+gem 'rubocop-rspec', '2.29.2'
 gem 'rvm', '1.11.3.9'
 gem 'tty-prompt', '0.23.1'
 gem 'yard', '0.9.36'

data/lib/meshtastic/mqtt.rb

@@ -63,6 +63,125 @@ module Meshtastic
       raise e
     end
 
+    # Supported Method Parameters::
+    # Meshtastic::MQQT.recursively_decode_payloads(
+    #   object: 'required - object to recursively decode',
+    #   msg_type: 'required - message type (e.g. :TEXT_MESSAGE_APP)',
+    #   gps_metadata: 'optional - include GPS metadata in output (default: false)'
+    # )
+
+    private_class_method def self.recursively_decode_payloads(opts = {})
+      object = opts[:object]
+      msg_type = opts[:msg_type]
+      gps_metadata = opts[:gps_metadata]
+
+      # puts "OBJECT: #{object.inspect}"
+      object = Meshtastic::Data.decode(object).to_h if object.is_a?(String)
+
+      object.each do |key, value|
+        if value.is_a?(Hash)
+          # Recursive call if the value is a hash
+          recursively_decode_payloads(object: value)
+        elsif value.is_a?(Array)
+          # Process each element if it's an array
+          value.each do |item|
+            recursively_decode_payloads(object: item) if item.is_a?(Hash)
+          end
+        end
+        # Check if the key matches 'payload' and decode
+        case key
+        when :latitude_i
+          object[:latitude] = object[:latitude_i] * 0.0000001
+        when :longitude_i
+          object[:longitude] = object[:longitude_i] * 0.0000001
+        when :macaddr
+          object[key] = object[key].bytes.map { |byte| byte.to_s(16).rjust(2, '0') }.join(':')
+        when :payload
+          case msg_type
+          when :ADMIN_APP
+            decoder = Meshtastic::AdminMessage.decode(payload)
+          when :ATAK_FORWARDER, :ATAK_PLUGIN
+            decoder = Meshtastic::TAKPacket
+            # when :AUDIO_APP
+            # decoder = Meshtastic::Audio
+          when :DETECTION_SENSOR_APP
+            decoder = Meshtastic::DeviceState
+            # when :IP_TUNNEL_APP
+            # decoder = Meshtastic::IpTunnel
+          when :MAP_REPORT_APP
+            decoder = Meshtastic::MapReport
+            # when :MAX
+            # decoder = Meshtastic::Max
+          when :NEIGHBORINFO_APP
+            decoder = Meshtastic::NeighborInfo
+          when :NODEINFO_APP
+            decoder = Meshtastic::User
+          when :PAXCOUNTER_APP
+            decoder = Meshtastic::Paxcount
+          when :POSITION_APP
+            decoder = Meshtastic::Position
+            # when :PRIVATE_APP
+            # decoder = Meshtastic::Private
+          when :RANGE_TEST_APP
+            # Unsure if this is the correct protobuf object
+            decoder = Meshtastic::FromRadio
+          when :REMOTE_HARDWARE_APP
+            decoder = Meshtastic::HardwareMessage
+            # when :REPLY_APP
+            # decoder = Meshtastic::Reply
+          when :ROUTING_APP
+            decoder = Meshtastic::Routing
+          when :SERIAL_APP
+            decoder = Meshtastic::SerialConnectionStatus
+          when :SIMULATOR_APP
+            decoder = Meshtastic::Compressed
+          when :STORE_FORWARD_APP
+            decoder = Meshtastic::StoreAndForward
+          when :TEXT_MESSAGE_APP
+            # Unsure if this is the correct protobuf object
+            # decoder = Meshtastic::MqttClientProxyMessage
+            decoder = Meshtastic::Data
+          when :TELEMETRY_APP
+            decoder = Meshtastic::Telemetry
+          when :TRACEROUTE_APP
+            decoder = Meshtastic::RouteDiscovery
+          when :UNKNOWN_APP
+            decoder = Meshtastic::Data.decode
+          when :WAYPOINT_APP
+            decoder = Meshtastic::Waypoint
+            # when :ZPS_APP
+            # decoder = Meshtastic::Zps
+          else
+            puts "WARNING: Unknown message type: #{msg_type}"
+            decoder = Meshtastic::Data.decode
+          end
+
+          # begin
+          # # If the value is base64 encoded, base64 decode and then decode
+          #   base64_decoded_value = Base64.strict_decode64(value)
+          #   object[key] = decoder.decode(base64_decoded_value).to_h
+          # rescue ArgumentError => e
+          #   # Otherwise, just decode the value
+          object[key] = decoder.decode(value).to_h
+          # end
+
+        end
+
+        next unless gps_metadata && object[:latitude] && object[:longitude]
+
+        object[:gps_metadata] = gps_search(
+          lat: object[:latitude],
+          lon: object[:longitude]
+        ).first.data
+      end
+
+      object
+    rescue Google::Protobuf::ParseError
+      object
+    rescue StandardError => e
+      raise e
+    end
+
     # Supported Method Parameters::
     # Meshtastic::MQQT.subscribe(
     #   mqtt_obj: 'required - mqtt_obj returned from #connect method'
@@ -72,7 +191,8 @@ module Meshtastic
     #   psks: 'optional - hash of :channel => psk key value pairs (default: { LongFast: "AQ==" })',
     #   qos: 'optional - quality of service (default: 0)',
     #   filter: 'optional - comma-delimited string(s) to filter on in message (default: nil)',
-    #   gps_metadata: 'optional - include GPS metadata in output (default: false)'
+    #   gps_metadata: 'optional - include GPS metadata in output (default: false)',
+    #   include_raw: 'optional - include raw packet data in output (default: false)'
     # )
 
     public_class_method def self.subscribe(opts = {})
@@ -93,6 +213,7 @@ module Meshtastic
       json = opts[:json] ||= false
       filter = opts[:filter]
       gps_metadata = opts[:gps_metadata] ||= false
+      include_raw = opts[:include_raw] ||= false
 
       # NOTE: Use MQTT Explorer for topic discovery
       full_topic = "#{root_topic}/#{region}/#{channel}"
@@ -101,7 +222,7 @@ module Meshtastic
 
       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 if include_raw
         raw_topic = packet_bytes.topic ||= ''
         raw_payload = packet_bytes.payload ||= ''
 
@@ -123,10 +244,10 @@ module Meshtastic
           message[:node_id_from] = "!#{message[:from].to_i.to_s(16)}"
           message[:node_id_to] = "!#{message[:to].to_i.to_s(16)}"
 
+          # If encrypted_message is not nil, then decrypt
+          # the message prior to decoding.
           encrypted_message = message[:encrypted]
-          # If encrypted_message is not nil, then decrypt the message
           if encrypted_message.to_s.length.positive?
-
             packet_id = message[:id]
             packet_from = message[:from]
 
@@ -146,99 +267,22 @@ module Meshtastic
             cipher.iv = nonce
 
             decrypted = cipher.update(encrypted_message) + cipher.final
-            message[:decrypted] = decrypted
+            message[:decoded] = Meshtastic::Data.decode(decrypted).to_h
+            message[:encrypted] = :decrypted
           end
 
           if message[:decoded]
+            # payload = Meshtastic::Data.decode(message[:decoded][:payload]).to_h
             payload = message[:decoded][:payload]
-
             msg_type = message[:decoded][:portnum]
-            case msg_type
-            when :ADMIN_APP
-              pb_obj = Meshtastic::AdminMessage.decode(payload)
-            when :ATAK_FORWARDER, :ATAK_PLUGIN
-              pb_obj = Meshtastic::TAKPacket.decode(payload)
-              # when :AUDIO_APP
-              # pb_obj = Meshtastic::Audio.decode(payload)
-            when :DETECTION_SENSOR_APP
-              pb_obj = Meshtastic::DeviceState.decode(payload)
-              # when :IP_TUNNEL_APP
-              # pb_obj = Meshtastic::IpTunnel.decode(payload)
-            when :MAP_REPORT_APP
-              pb_obj = Meshtastic::MapReport.decode(payload)
-              # when :MAX
-              # pb_obj = Meshtastic::Max.decode(payload)
-            when :NEIGHBORINFO_APP
-              pb_obj = Meshtastic::NeighborInfo.decode(payload)
-            when :NODEINFO_APP
-              pb_obj = Meshtastic::User.decode(payload)
-            when :PAXCOUNTER_APP
-              pb_obj = Meshtastic::Paxcount.decode(payload)
-            when :POSITION_APP
-              pb_obj = Meshtastic::Position.decode(payload)
-              # when :PRIVATE_APP
-              # pb_obj = Meshtastic::Private.decode(payload)
-            when :RANGE_TEST_APP
-              # Unsure if this is the correct protobuf object
-              pb_obj = Meshtastic::FromRadio.decode(payload)
-            when :REMOTE_HARDWARE_APP
-              pb_obj = Meshtastic::HardwareMessage.decode(payload)
-              # when :REPLY_APP
-              # pb_obj = Meshtastic::Reply.decode(payload)
-            when :ROUTING_APP
-              pb_obj = Meshtastic::Routing.decode(payload)
-            when :SERIAL_APP
-              pb_obj = Meshtastic::SerialConnectionStatus.decode(payload)
-            when :SIMULATOR_APP,
-                 :TEXT_MESSAGE_COMPRESSED_APP
-              # Unsure if this is the correct protobuf object
-              # for TEXT_MESSAGE_COMPRESSED_APP
-              pb_obj = Meshtastic::Compressed.decode(payload)
-            when :STORE_FORWARD_APP
-              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::Data.decode(payload)
-            when :TELEMETRY_APP
-              pb_obj = Meshtastic::Telemetry.decode(payload)
-            when :TRACEROUTE_APP
-              pb_obj = Meshtastic::RouteDiscovery.decode(payload)
-              # when :UNKNOWN_APP
-              # pb_obj = Meshtastic.Unknown.decode(payload)
-            when :WAYPOINT_APP
-              pb_obj = Meshtastic::Waypoint.decode(payload)
-              # when :ZPS_APP
-              # pb_obj = Meshtastic::Zps.decode(payload)
-            else
-              puts "WARNING: Unknown message type: #{msg_type}"
-            end
-            # Overwrite the payload with the decoded protobuf object
-            # message[:decoded][:payload] = pb_obj.to_h unless msg_type == :TRACEROUTE_APP
-            message[:decoded][:payload] = pb_obj.to_h
-            if message[:decoded][:payload].keys.include?(:latitude_i) &&
-               message[:decoded][:payload].keys.include?(:longitude_i) &&
-               gps_metadata
-
-              latitude = pb_obj.to_h[:latitude_i] * 0.0000001
-              longitude = pb_obj.to_h[:longitude_i] * 0.0000001
-              message[:decoded][:payload][:gps_metadata] = gps_search(
-                lat: latitude,
-                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
+            message[:decoded][:payload] = recursively_decode_payloads(
+              object: payload,
+              msg_type: msg_type,
+              gps_metadata: gps_metadata
+            )
           end
 
-          # message[:raw_packet] = raw_packet if block_given?
+          message[:raw_packet] = raw_packet if include_raw
           decoded_payload_hash[:packet] = message
           unless block_given?
             message[:stdout] = 'pretty'
@@ -249,8 +293,11 @@ module Meshtastic
                ArgumentError => e
 
           message[:decrypted] = e.message if e.message.include?('key must be')
+          message[:decrypted] = 'unable to decrypt - psk?' if e.message.include?('occurred during parsing')
           decoded_payload_hash[:packet] = message
           unless block_given?
+            puts "WARNING: #{e.inspect} - MSG IS >>>"
+            # puts e.backtrace
             message[:stdout] = 'inspect'
             stdout_message = decoded_payload_hash.inspect
           end

data/lib/meshtastic/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: meshtastic
 version: !ruby/object:Gem::Version
-  version: 0.0.41
+  version: 0.0.42
 platform: ruby
 authors:
 - 0day Inc.
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-05-02 00:00:00.000000000 Z
+date: 2024-05-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -44,14 +44,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.8.2
+        version: 1.8.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.8.2
+        version: 1.8.3
 - !ruby/object:Gem::Dependency
   name: google-protobuf
   requirement: !ruby/object:Gem::Requirement
@@ -156,14 +156,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.29.1
+        version: 2.29.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.29.1
+        version: 2.29.2
 - !ruby/object:Gem::Dependency
   name: rvm
   requirement: !ruby/object:Gem::Requirement