meshtastic 0.0.58 → 0.0.60

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a264d9893fbd8e3aa81eee241844cdf976374859a1e43c8bbca68e6b8e906781
-  data.tar.gz: 77849c92d27e23c9aabc8ac69c4b56add82a6204207622c3383ab15cdef48c19
+  metadata.gz: eeece01e7acf9c7a1da3ce75b799d101ad6b4a543203e220c8d8ef67c66980ae
+  data.tar.gz: 0ca6e337660d31a51421aab3f1fcf62fda73f8e9178b4b1bcb165c3d5eebce3c
 SHA512:
-  metadata.gz: a12dc68ece20d389402fe79492ec2ebcf109ac30eecc2d0d4e1ed228b2b3292a355bed10ddf0397f7589a41780765599e0a88fabc5944ccb4d979e14d87cbb1b
-  data.tar.gz: 61f56c89bca4d7fee23336a1502b196b711f39190b31acc0667e672456ed5194fb20122bbdc323d22491dfec25d7e6d9c2315b63de4961e90871819d0c4cbad8
+  metadata.gz: 002f3c6cb87c0ae8174986a3b0b834c71e04b26d5ecc5553ea45a453b8ffb2e18fe0990819088153fdf72fae6638042696d8b4c95a3612c6070f15bf0b72dc9c
+  data.tar.gz: 6015c2daf7cccdd2fc1d2e109de4d1379ba13916b3d9431d14d279499fea56e7dd861b9867ca87d1e02879511be2fc915399cdeefcbd2461fe2022eba8b079b0

data/lib/meshtastic/mqtt.rb

@@ -291,18 +291,21 @@ module Meshtastic
             message[:stdout] = 'pretty'
             stdout_message = JSON.pretty_generate(decoded_payload_hash)
           end
-        rescue Google::Protobuf::ParseError,
+        rescue Encoding::CompatibilityError,
+               Google::Protobuf::ParseError,
                JSON::GeneratorError,
                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
+          unless e.is_a?(Encoding::CompatibilityError)
+            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
           end
 
           next

data/lib/meshtastic/version.rb

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

data/lib/meshtastic.rb

@@ -53,6 +53,7 @@ module Meshtastic
   # Meshtastic.send_text(
   #   from: 'required - From ID (String or Integer)',
   #   to: 'optional - Destination ID (Default: 0xFFFFFFFF)',
+  #   last_packet_id: 'optional - Last Packet ID (Default: 0)',
   #   via: 'optional - :radio || :mqtt (Default: :radio)',
   #   channel: 'optional - Channel ID (Default: 0)',
   #   text: 'optional - Text Message (Default: SYN)',
@@ -73,6 +74,7 @@ module Meshtastic
     to_hex = to.delete('!').bytes.map { |b| b.to_s(16).rjust(2, '0') }.join if to.is_a?(String)
     to = to_hex.to_i(16) if to_hex
 
+    last_packet_id = opts[:last_packet_id] ||= 0
     via = opts[:via] ||= :radio
     channel = opts[:channel] ||= 0
     text = opts[:text] ||= 'SYN'
@@ -102,6 +104,7 @@ module Meshtastic
     send_data(
       from: from,
       to: to,
+      last_packet_id: last_packet_id,
       via: via,
       channel: channel,
       data: data,
@@ -120,6 +123,7 @@ module Meshtastic
   # Meshtastic.send_data(
   #   from: 'required - From ID (String or Integer)',
   #   to: 'optional - Destination ID (Default: 0xFFFFFFFF)',
+  #   last_packet_id: 'optional - Last Packet ID (Default: 0)',
   #   via: 'optional - :radio || :mqtt (Default: :radio)',
   #   channel: 'optional - Channel ID (Default: 0)',
   #   data: 'required - Data to Send',
@@ -139,6 +143,7 @@ module Meshtastic
     to_hex = to.delete('!').bytes.map { |b| b.to_s(16).rjust(2, '0') }.join if to.is_a?(String)
     to = to_hex.to_i(16) if to_hex
 
+    last_packet_id = opts[:last_packet_id] ||= 0
     via = opts[:via] ||= :radio
     channel = opts[:channel] ||= 0
     data = opts[:data]
@@ -165,6 +170,7 @@ module Meshtastic
       mesh_packet: mesh_packet,
       from: from,
       to: to,
+      last_packet_id: last_packet_id,
       via: via,
       channel: channel,
       want_ack: want_ack,
@@ -180,6 +186,7 @@ module Meshtastic
   #   mesh_packet: 'required - Mesh Packet to Send',
   #   from: 'required - From ID (String or Integer)',
   #   to: 'optional - Destination ID (Default: 0xFFFFFFFF)',
+  #   last_packet_id: 'optional - Last Packet ID (Default: 0)',
   #   via: 'optional - :radio || :mqtt (Default: :radio)',
   #   channel: 'optional - Channel ID (Default: 0)',
   #   want_ack: 'optional - Want Acknowledgement (Default: false)',
@@ -197,6 +204,7 @@ module Meshtastic
     to_hex = to.delete('!').bytes.map { |b| b.to_s(16).rjust(2, '0') }.join if to.is_a?(String)
     to = to_hex.to_i(16) if to_hex
 
+    last_packet_id = opts[:last_packet_id] ||= 0
     via = opts[:via] ||= :radio
     channel = opts[:channel] ||= 0
     want_ack = opts[:want_ack] ||= false
@@ -216,15 +224,7 @@ module Meshtastic
     mesh_packet.channel = channel
     mesh_packet.want_ack = want_ack
     mesh_packet.hop_limit = hop_limit
-
-    # TODO: Implement strategy for obtaining last packet id
-    packet_id = 0
-    if mesh_packet.id.zero?
-      packet_id = generate_packet_id(
-        last_packet_id: mesh_packet.id
-      )
-    end
-    mesh_packet.id = packet_id
+    mesh_packet.id = generate_packet_id(last_packet_id: last_packet_id)
 
     if psks
       nonce_packet_id = [mesh_packet.id].pack('V').ljust(8, "\x00")
@@ -249,6 +249,9 @@ module Meshtastic
     # puts "Sending Packet via: #{via}"
     case via
     when :radio
+      # Sending a to_radio message over mqtt
+      # causes unpredictable behavior
+      # (e.g. disconnecting node(s) from bluetooth)
       to_radio = Meshtastic::ToRadio.new
       to_radio.packet = mesh_packet
       send_to_radio(to_radio: to_radio)

metadata

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