meshtastic 0.0.57 → 0.0.59

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9c950c4dd7c5c5b76373381e77531db84bfb6ec00e98b0dcae8e984487d2cb82
-  data.tar.gz: d68fad3bf9b66447e8b0264f80fa1cc4eeb36229f4a5d97d6dac811ebe8044ce
+  metadata.gz: 4bee0bc9cf63a72bf400763d93004424baa89bf5c6252a53d594cd472a09ee0a
+  data.tar.gz: 4bfa4ff0b53b434da3624a55d5dc26934b1edb641a5a6c32101dc5029cf6df58
 SHA512:
-  metadata.gz: 635762544aabd1b1650a61e97f61d3e8cf124c279d83119b73f79cd906dda5181a0653844a6d64431c7675aebe80ba53c3b90014226501a0345b8db85873a7cf
-  data.tar.gz: 51671cf96cc04abf10d870610a54cef4f040258f369b3f8e25fbdd77d2f3c9eefcb8f7704184bf43ca8df1630c0c71f60c9b603c2a124daaa1f41f13aac69db1
+  metadata.gz: 5abc75249f2f677b1bfdc96f21a1a3ce76b5ab0b6ee38968f1f20cc436c45423702e5445fd89e2f6aa2a64ea8b1a6f5eddf71dca03e5808eddf33b87d19bed2e
+  data.tar.gz: 0610bbc1cd020aa4dcf01fae92430006eb3c2150c0b9971b3270ab1e67133bbcbd1488348ffce1260960270c61219a1a7c93365a61ebce3c4682ef41e545ccb6

data/lib/meshtastic/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Meshtastic
-  VERSION = '0.0.57'
+  VERSION = '0.0.59'
 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)
@@ -273,8 +276,10 @@ module Meshtastic
     last_packet_id = opts[:last_packet_id] ||= 0
     last_packet_id = 0 if last_packet_id.negative?
 
-    Random.rand(0xffffffff) if last_packet_id.zero?
-    (last_packet_id + 1) & 0xffffffff if last_packet_id.positive?
+    packet_id = Random.rand(0xffffffff) if last_packet_id.zero?
+    packet_id = (last_packet_id + 1) & 0xffffffff if last_packet_id.positive?
+
+    packet_id
   end
 
   # Supported Method Parameters::

metadata

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