meshtastic 0.0.35 → 0.0.37

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bca28989f9cdb4c958571d59ea70d035154bb4c796017bbd948dea5987dfbc8d
-  data.tar.gz: 4dd3be1a0ccde5cab5711fe2e31c8d9dd869a4f4f204b2af5916ee6b731b47aa
+  metadata.gz: 41d11712815ee1680ff3929084cbe63bc0500d400bbdf7d2f087709a9ded258f
+  data.tar.gz: 817138fd986e7a7f7267e69861f866dedad4ac95de8194e7a6e3edcdd6b028ac
 SHA512:
-  metadata.gz: 34639b023c2ae75cb76f627fb0af84c08703f112a4da326fd14ef2103a8667dc376260617ba905275f047a78e3086e6d62586f65b84848caa92b816951dcca8d
-  data.tar.gz: 83b59c484395c04983c6ca4c20624e14101369345c5ae09db8e2d7879410556e21615aadeb2865959c37bf851b147424c3970e71ff6ea29d690dfae006b260c8
+  metadata.gz: 31ce0114b3ad6e1a03ad185b2706f44ee303c7d8ed1f5fa258ad96b5b6422bdde6d62352fcb7ea71005aa242d99a50eaa2917ef94c063c4a4d6c5f2f04a129e2
+  data.tar.gz: 2caacc5276cb34442c07af78fd8539620b613a3021b84893be243299c0ebd2bdbbdd303a2c65edd3286128c26792fa8e02b2d2be8e51e250b11323307817d6cb

data/lib/meshtastic/mqtt.rb

@@ -46,11 +46,10 @@ module Meshtastic
     # Meshtastic::MQQT.subscribe(
     #   mqtt_obj: 'required - mqtt_obj returned from #connect method'
     #   root_topic: 'optional - root topic (default: msh)',
-    #   region: 'optional - region (default: US)',
-    #   channel: 'optional - channel name (default: LongFast)',
+    #   region: 'optional - region e.g. 'US/VA', etc (default: US)',
+    #   channel: 'optional - channel name (default: "2/c/LongFast/#")',
     #   psk: 'optional - channel pre-shared key (default: AQ==)',
     #   qos: 'optional - quality of service (default: 0)',
-    #   json: 'optional - JSON output (default: false)',
     #   filter: 'optional - comma-delimited string(s) to filter on in message (default: nil)',
     #   gps_metadata: 'optional - include GPS metadata in output (default: false)'
     # )
@@ -59,7 +58,7 @@ module Meshtastic
       mqtt_obj = opts[:mqtt_obj]
       root_topic = opts[:root_topic] ||= 'msh'
       region = opts[:region] ||= 'US'
-      channel = opts[:channel] ||= 'LongFast'
+      channel = opts[:channel] ||= '2/e/LongFast/#'
       psk = opts[:psk] ||= 'AQ=='
       qos = opts[:qos] ||= 0
       json = opts[:json] ||= false
@@ -67,8 +66,7 @@ module Meshtastic
       gps_metadata = opts[:gps_metadata] ||= false
 
       # TODO: Find JSON URI for this
-      full_topic = "#{root_topic}/#{region}/2/json/#{channel}/#" if json
-      full_topic = "#{root_topic}/#{region}/2/c/#{channel}/#" unless json
+      full_topic = "#{root_topic}/#{region}/#{channel}"
       puts "Subscribing to: #{full_topic}"
       mqtt_obj.subscribe(full_topic, qos)
 
@@ -76,7 +74,7 @@ module Meshtastic
       # Our AES key is 128 or 256 bits, shared as part of the 'Channel' specification.
 
       # Actual pre-shared key for LongFast channel
-      psk = '1PG7OiApB1nwvP+rz05pAQ==' if channel == 'LongFast'
+      psk = '1PG7OiApB1nwvP+rz05pAQ==' if channel.include?('LongFast')
       padded_psk = psk.ljust(psk.length + ((4 - (psk.length % 4)) % 4), '=')
       replaced_psk = padded_psk.gsub('-', '+').gsub('_', '/')
       psk = replaced_psk
@@ -86,21 +84,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 +124,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
 
@@ -215,17 +218,21 @@ module Meshtastic
             # message[:decoded][:pb_obj] = pb_obj
           end
 
-          message[:raw_packet] = raw_packet if block_given?
+          # message[:raw_packet] = raw_packet if block_given?
+          decoded_payload_hash[:packet] = message
           unless block_given?
             message[:stdout] = 'pretty'
-            stdout_message = JSON.pretty_generate(message)
+            stdout_message = JSON.pretty_generate(decoded_payload_hash)
           end
         rescue Google::Protobuf::ParseError,
-               JSON::GeneratorError
+               JSON::GeneratorError,
+               ArgumentError => e
 
+          message[:decrypted] = e.message if ArgumentError
+          decoded_payload_hash[:packet] = message
           unless block_given?
             message[:stdout] = 'inspect'
-            stdout_message = message.inspect
+            stdout_message = decoded_payload_hash.inspect
           end
 
           next
@@ -238,7 +245,7 @@ module Meshtastic
 
           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.35'
+  VERSION = '0.0.37'
 end

metadata

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