meshtastic 0.0.19 → 0.0.21

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c86344c9da4b5ee0b8aa0ba59237e6117fd07ff7113cc41516ee9336542b2e9b
-  data.tar.gz: be245b738bddeadd9d46ccc62cc751de3fc4df3e802539498d1cefdcf3cc9221
+  metadata.gz: 749b55978ad13d4e2d04290919cef8522f7133e77f500a4ea2ecbdc15a0f232b
+  data.tar.gz: 753d6a0b90e582fd9e6d0a6e7c97e89a768dfa9c74af06f643f61e5f5cd7cf09
 SHA512:
-  metadata.gz: 94bfeb6caf399f255accbbf4507b2e6156bb4311c87c274411f9cceb6843126e48acfe15c874a603d9e2751696f177a8574ccac18a62d2c1e2e738b8b819e050
-  data.tar.gz: 80e35c0a6871b761a49bda7bb344e82a6d8af1347b8c0cffada6765aa19c9fcba6d7cb4a4af55de43492150d4cb3670147c0b0db8a4d8878662a75d14f8c572c
+  metadata.gz: c8d80c61a3175e099d1266de3617050363ce6263fc31481f685210f675faa19951ef2e580a7ccc6c391a6294216f0ae9ed53f7c4e6f9587e88a44e76ad0527d4
+  data.tar.gz: fed2e497a7376aa133b4e4a929eef84353f94eca60940fa959e02075217fa272490402feb2522b8695a7417f7ab80c377e79cc668ca5aca50efd0e223cd82d1b

data/Gemfile

@@ -11,12 +11,10 @@ gemspec
 # In some circumstances custom flags are passed to gems in order
 # to build appropriately.  Defer to ./reinstall_pwn_gemset.sh
 # to review these custom flags (e.g. pg, serialport, etc).
-gem 'brakeman', '6.1.2'
 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 'mqtt', '0.6.0'
 gem 'rake', '13.2.1'
 gem 'rdoc', '6.6.3.1'

data/lib/meshtastic/mqtt.rb

@@ -64,7 +64,6 @@ module Meshtastic
 
       # TODO: Find JSON URI for this
       root_topic = "msh/#{region}/2/json" if json
-      # root_topic = "msh/#{region}/2/e" unless json
       root_topic = "msh/#{region}/2/c" unless json
       mqtt_obj.subscribe("#{root_topic}/#{channel}/#", qos)
 
@@ -84,7 +83,7 @@ module Meshtastic
       mqtt_obj.get_packet do |packet_bytes|
         raw_packet = packet_bytes.to_s.b
         raw_packet_len = raw_packet.to_s.b.length
-        raw_topic = packet_bytes.topic
+        raw_topic = packet_bytes.topic ||= ''
         raw_payload = packet_bytes.payload
 
         begin
@@ -102,7 +101,7 @@ module Meshtastic
 
           encrypted_payload = payload[:encrypted]
           # If encrypted_payload is not nil, then decrypt the message
-          if encrypted_payload.length.positive?
+          if encrypted_payload.to_s.length.positive?
             packet_id = payload[:id]
             packet_from = payload[:from]
             nonce_packet_id = [packet_id].pack('V').ljust(8, "\x00")
@@ -130,7 +129,7 @@ module Meshtastic
           if disp
             puts "\n"
             puts '-' * 80
-            puts "\n*** DEBUGGING ***"
+            puts "*** DEBUGGING ***"
             puts "Payload:\n#{payload}"
             # puts "\nMap Report: #{map_report.inspect}"
             puts "\nRaw Packet: #{raw_packet.inspect}"
@@ -143,7 +142,7 @@ module Meshtastic
         rescue Google::Protobuf::ParseError
           puts "\n"
           puts '-' * 80
-          puts "\n*** DEBUGGING ***"
+          puts "*** DEBUGGING ***"
           puts "Payload:\n#{payload}"
           # puts "\nMap Report: #{map_report.inspect}"
           puts "\nRaw Packet: #{raw_packet.inspect}"
@@ -221,6 +220,11 @@ module Meshtastic
           filter: 'optional - comma-delimited string(s) to filter on in payload (default: nil)'
         )
 
+        #{self}.gps_search(
+          lat: 'required - latitude float (e.g. 37.7749)',
+          lon: 'required - longitude float (e.g. -122.4194)',
+        )
+
         mqtt_obj = #{self}.disconnect(
           mqtt_obj: 'required - mqtt_obj object returned from #connect method'
         )

data/lib/meshtastic/version.rb

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

data/lib/meshtastic.rb

@@ -3,9 +3,6 @@
 # Plugin used to interact with Meshtastic nodes
 module Meshtastic
   # Protocol Buffers for Meshtastic
-  # protobuf Modules commented out as a result of the following error:
-  # undefined method `proto3_optional' for an instance of 
-  # Google::Protobuf::Internal::MessageBuilderContext (NoMethodError)
   require 'meshtastic/admin_pb'
   require 'nanopb_pb'
   require 'meshtastic/apponly_pb'

metadata

@@ -1,29 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: meshtastic
 version: !ruby/object:Gem::Version
-  version: 0.0.19
+  version: 0.0.21
 platform: ruby
 authors:
 - 0day Inc.
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-04-26 00:00:00.000000000 Z
+date: 2024-04-27 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: brakeman
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 6.1.2
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 6.1.2
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement