meshtastic 0.0.12 → 0.0.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 121b0a73d30f792b4da0cbd5b6ed91b648bc26ca3349cb47369fac738f837b03
-  data.tar.gz: a5ddf7b9969ab8c022107f84e192709c01441f5d78f4f011679b948dbe857006
+  metadata.gz: 3526ab71260935428991ee992ab7f28de3b0cfb3f94dea2849654eaa15aa924d
+  data.tar.gz: 878a6a3c9e051296f6fecf3719748bc1171e369ca4ae63b910ab2417494ca0c5
 SHA512:
-  metadata.gz: 110570d4591453df75c6d930df3c4ac3adcb06fd85e4354496fd093b080352754d6d8c7fb4e454989cd2ca0f27e4d53dd1664939b980fb3d59cb465d1afaec1e
-  data.tar.gz: 5be78bd5b710e9974708064eeccfd1563092051e66e1793b07fb34f3bc02687f4f483a79b3124d8d11cb43091bbc3076305bc8bf51b11373ab44686c1fd38496
+  metadata.gz: 1826305d9e558ad177c438378b43d67b9736f0113e826f04e1d0f2a2579f185a09a2a45f4525494a92a3199eb716e1a3a8754ae76958b5e639a11bc0737256a4
+  data.tar.gz: 6eea890ed77dea25e1c7bd303d5ad4ba4bbda641e64435fd9e8603062bee5511e085797dde5813a36b1fcd79976a28788c2e4ec36d4f46200eddc8a0548a82d3

data/Gemfile

@@ -16,7 +16,7 @@ gem 'bundler', '>=2.5.3'
 gem 'bundle-audit', '0.1.0'
 gem 'geocoder', '1.8.2'
 gem 'google-protobuf', '3.21.12'
-gem 'google-protobuf-z', '3.5.1'
+# gem 'google-protobuf-z', '3.5.1'
 gem 'mqtt', '0.6.0'
 gem 'rake', '13.2.1'
 gem 'rdoc', '6.6.3.1'

data/lib/meshtastic/mqtt.rb

@@ -78,20 +78,31 @@ module Meshtastic
 
       # cipher = OpenSSL::Cipher.new('AES-256-CTR')
       cipher = OpenSSL::Cipher.new('AES-128-CTR')
-      mqtt_obj.get_packet do |packet|
-        raw_packet = packet.to_s.b
-        raw_packet_len = raw_packet.length
+      mqtt_obj.get_packet do |packet_bytes|
+        # puts "Packet Bytes: #{packet_bytes.public_methods}"
+        raw_packet = packet_bytes.to_s.b
+        raw_packet_len = raw_packet.to_s.b.length
+        raw_topic = packet_bytes.topic
+        raw_payload = packet_bytes.payload
+        raw_payload_len = raw_payload.length
+
         begin
           puts '-' * 80
 
+          payload = {}
           if json
-            raw_payload = JSON.parse(packet.payload, symbolize_names: true)
-            payload = Meshtastic::ServiceEnvelope.json_decode(raw_payload)
-            map_report = Meshtastic::MapReport.json_decode(raw_payload)
+            json_payload = JSON.parse(raw_payload, symbolize_names: true)
+            payload = Meshtastic::ServiceEnvelope.json_decode(json_payload)
+            map_report = Meshtastic::MapReport.json_decode(json_payload)
           else
-            raw_payload = packet.payload.to_s
-            payload = Meshtastic::ServiceEnvelope.decode(raw_payload).to_hash[:packet]
-            map_report = Meshtastic::MapReport.decode(raw_payload).to_hash
+            svc_envl= Meshtastic::ServiceEnvelope.decode(raw_payload)
+            payload = svc_envl.to_h[:packet]
+            # puts "STILL GOOD: #{payload.inspect}"
+            # puts "Public Methods: #{Meshtastic::MapReport.public_methods}"
+            # puts "Public Methods: #{Meshtastic::MapReport.class}"
+            # map_report_decode = Meshtastic::MapReport.decode(raw_payload)
+            # map_report = map_report_decode.to_h
+            # puts "STILL GOOD: #{map_report.inspect}"
           end
 
           puts "*** MESSAGE ***"
@@ -103,8 +114,7 @@ module Meshtastic
           puts "Channel: #{channel}"
           packet_id = payload[:id]
           puts "Packet ID: #{packet_id}"
-          topic = packet.topic
-          puts "\nTopic: #{topic}"
+          puts "\nTopic: #{raw_topic}"
 
           decoded_payload = payload[:decoded]
           if decoded_payload
@@ -149,44 +159,49 @@ module Meshtastic
           end
           puts '*' * 20
 
-          map_long_name = map_report[:long_name].b
-          puts "\n*** MAP STATS ***"
-          puts "Map Long Name: #{map_long_name.inspect}"
-          map_short_name = map_report[:short_name]
-          puts "Map Short Name: #{map_short_name}"
-          role = map_report[:role]
-          puts "Role: #{role}"
-          hw_model = map_report[:hw_model]
-          puts "Hardware Model: #{hw_model}"
-          firmware_version = map_report[:firmware_version]
-          puts "Firmware Version: #{firmware_version}"
-          region = map_report[:region]
-          puts "Region: #{region}"
-          modem_preset = map_report[:modem_preset]
-          puts "Modem Preset: #{modem_preset}"
-          has_default_channel = map_report[:has_default_channel]
-          puts "Has Default Channel: #{has_default_channel}"
-          latitiude_i = map_report[:latitude_i]
-          puts "Latitude: #{latitiude_i}"
-          longitude_i = map_report[:longitude_i]
-          puts "Longitude: #{longitude_i}"
-          altitude = map_report[:altitude]
-          puts "Altitude: #{altitude}"
-          position_precision = map_report[:position_precision]
-          puts "Position Precision: #{position_precision}"
-          num_online_local_nodes = map_report[:num_online_local_nodes]
-          puts "Number of Online Local Nodes: #{num_online_local_nodes}"
-          puts '*' * 20
+          # map_long_name = map_report[:long_name].b
+          # puts "\n*** MAP STATS ***"
+          # puts "Map Long Name: #{map_long_name.inspect}"
+          # map_short_name = map_report[:short_name]
+          # puts "Map Short Name: #{map_short_name}"
+          # role = map_report[:role]
+          # puts "Role: #{role}"
+          # hw_model = map_report[:hw_model]
+          # puts "Hardware Model: #{hw_model}"
+          # firmware_version = map_report[:firmware_version]
+          # puts "Firmware Version: #{firmware_version}"
+          # region = map_report[:region]
+          # puts "Region: #{region}"
+          # modem_preset = map_report[:modem_preset]
+          # puts "Modem Preset: #{modem_preset}"
+          # has_default_channel = map_report[:has_default_channel]
+          # puts "Has Default Channel: #{has_default_channel}"
+          # latitiude_i = map_report[:latitude_i]
+          # puts "Latitude: #{latitiude_i}"
+          # longitude_i = map_report[:longitude_i]
+          # puts "Longitude: #{longitude_i}"
+          # altitude = map_report[:altitude]
+          # puts "Altitude: #{altitude}"
+          # position_precision = map_report[:position_precision]
+          # puts "Position Precision: #{position_precision}"
+          # num_online_local_nodes = map_report[:num_online_local_nodes]
+          # puts "Number of Online Local Nodes: #{num_online_local_nodes}"
+          # puts '*' * 20
 
           puts "\n*** PACKET DEBUGGING ***"
           puts "Payload: #{payload.inspect}"
-          puts "\nMap Report: #{map_report.inspect}"
+          # puts "\nMap Report: #{map_report.inspect}"
           puts "\nRaw Packet: #{raw_packet.inspect}"
           puts "Length: #{raw_packet_len}"
           puts '*' * 20
-        rescue Google::Protobuf::ParseError
+        rescue Google::Protobuf::ParseError => e
+          puts "ERROR: #{e.inspect}"
+          puts "\n*** PACKET DEBUGGING ***"
+          puts "Payload: #{payload.inspect}"
+          # puts "\nMap Report: #{map_report.inspect}"
           puts "\nRaw Packet: #{raw_packet.inspect}"
           puts "Length: #{raw_packet_len}"
+          puts '*' * 20
           next
         ensure
           puts '-' * 80

data/lib/meshtastic/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: meshtastic
 version: !ruby/object:Gem::Version
-  version: 0.0.12
+  version: 0.0.13
 platform: ruby
 authors:
 - 0day Inc.
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-04-25 00:00:00.000000000 Z
+date: 2024-04-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: brakeman
@@ -80,20 +80,6 @@ dependencies:
     - - '='
       - !ruby/object:Gem::Version
         version: 3.21.12
-- !ruby/object:Gem::Dependency
-  name: google-protobuf-z
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 3.5.1
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 3.5.1
 - !ruby/object:Gem::Dependency
   name: mqtt
   requirement: !ruby/object:Gem::Requirement