meshtastic 0.0.53 → 0.0.56

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a09f7af15af288d0de354979f38b5a976b3076b2756b4c3007b5948e6580c32c
-  data.tar.gz: 3fd9b22545978f2aeb468d5c5f61c5ea0623224e6c242472992be963f83376f3
+  metadata.gz: 587ec9cf838d9bc00fb0881bfb06e5baaf32b76cf92be0f1687dee8397cc372e
+  data.tar.gz: 4bf94458eae35a86738318fff4931094f943bd3afcacb967e2022809c0e211ac
 SHA512:
-  metadata.gz: f93cc53e204a5738e97450bd4697587feeed09539115c1591e0b1aa5432ed5c1ae83bc6175b4917653b93555cf374612f97a8081e59eba95b1cafff827dd2130
-  data.tar.gz: ff03ee0103b414b675d28ff934b7684f9c2b24a02721d3cbab37465852666e092286aee35d7c8f2642161aa3b48c294164aebacdd0c49dede081b277195756a1
+  metadata.gz: 1cb23efe67552373a15b746b6553951f6694fe64fd03a68f4db730b2c477a769999dba92146b8a40d85cd3c29ea71c931a5406b1d081367a3699eaf8358af8b2
+  data.tar.gz: 9c2733116cfaebcfa388a4211d519e0216ca1709d2752d197bc7175cb92e4a1246c4e5ff7baea6fcd5314ff69af458b90b24094eb5ff749861ad2d116aae1844

data/lib/meshtastic/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Meshtastic
-  VERSION = '0.0.53'
+  VERSION = '0.0.56'
 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)',
+  #   via: 'optional - :radio || :mqtt (Default: :radio)',
   #   channel: 'optional - Channel ID (Default: 0)',
   #   text: 'optional - Text Message (Default: SYN)',
   #   want_ack: 'optional - Want Acknowledgement (Default: false)',
@@ -72,6 +73,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
 
+    via = opts[:via] ||= :radio
     channel = opts[:channel] ||= 0
     text = opts[:text] ||= 'SYN'
     want_ack = opts[:want_ack] ||= false
@@ -100,6 +102,7 @@ module Meshtastic
     send_data(
       from: from,
       to: to,
+      via: via,
       channel: channel,
       data: data,
       want_ack: want_ack,
@@ -117,6 +120,7 @@ module Meshtastic
   # Meshtastic.send_data(
   #   from: 'required - From ID (String or Integer)',
   #   to: 'optional - Destination ID (Default: 0xFFFFFFFF)',
+  #   via: 'optional - :radio || :mqtt (Default: :radio)',
   #   channel: 'optional - Channel ID (Default: 0)',
   #   data: 'required - Data to Send',
   #   want_ack: 'optional - Want Acknowledgement (Default: false)',
@@ -135,6 +139,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
 
+    via = opts[:via] ||= :radio
     channel = opts[:channel] ||= 0
     data = opts[:data]
     want_ack = opts[:want_ack] ||= false
@@ -160,6 +165,7 @@ module Meshtastic
       mesh_packet: mesh_packet,
       from: from,
       to: to,
+      via: via,
       channel: channel,
       want_ack: want_ack,
       hop_limit: hop_limit,
@@ -174,6 +180,7 @@ module Meshtastic
   #   mesh_packet: 'required - Mesh Packet to Send',
   #   from: 'required - From ID (String or Integer)',
   #   to: 'optional - Destination ID (Default: 0xFFFFFFFF)',
+  #   via: 'optional - :radio || :mqtt (Default: :radio)',
   #   channel: 'optional - Channel ID (Default: 0)',
   #   want_ack: 'optional - Want Acknowledgement (Default: false)',
   #   hop_limit: 'optional - Hop Limit (Default: 3)',
@@ -190,6 +197,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
 
+    via = opts[:via] ||= :radio
     channel = opts[:channel] ||= 0
     want_ack = opts[:want_ack] ||= false
     hop_limit = opts[:hop_limit] ||= 3
@@ -208,9 +216,15 @@ module Meshtastic
     mesh_packet.channel = channel
     mesh_packet.want_ack = want_ack
     mesh_packet.hop_limit = hop_limit
-    mesh_packet.id = generate_packet_id if mesh_packet.id.zero?
-    # mesh_packet.channel_id = psks.keys.first
-    # mesh_packet.gateway_id = "!#{from.to_s(16).downcase}"
+
+    # TODO: Implement strategy for obtaining last packet id
+    packet_id = 0
+    if mesh_packet.id.zero?
+      packet_id = generate_packet_id(
+        last_packet_id: packet_id
+      )
+    end
+    mesh_packet.id = packet_id
 
     if psks
       nonce_packet_id = [mesh_packet.id].pack('V').ljust(8, "\x00")
@@ -232,10 +246,21 @@ module Meshtastic
     end
     # puts mesh_packet.to_h
 
-    to_radio = Meshtastic::ToRadio.new
-    to_radio.packet = mesh_packet
-
-    send_to_radio(to_radio: to_radio)
+    # puts "Sending Packet via: #{via}"
+    case via
+    when :radio
+      to_radio = Meshtastic::ToRadio.new
+      to_radio.packet = mesh_packet
+      send_to_radio(to_radio: to_radio)
+    when :mqtt
+      service_envelope = Meshtastic::ServiceEnvelope.new
+      service_envelope.packet = mesh_packet
+      service_envelope.channel_id = psks.keys.first
+      service_envelope.gateway_id = "!#{from.to_s(16).downcase}"
+      send_to_mqtt(service_envelope: service_envelope)
+    else
+      raise "ERROR: Invalid via parameter: #{via}"
+    end
   rescue StandardError => e
     raise e
   end
@@ -248,7 +273,8 @@ module Meshtastic
     last_packet_id = opts[:last_packet_id] ||= 0
     last_packet_id = 0 if last_packet_id.negative?
 
-    (last_packet_id + 1) & 0xffffffff
+    Random.rand(0xffffffff) if last_packet_id.zero?
+    (last_packet_id + 1) & 0xffffffff if last_packet_id.positive?
   end
 
   # Supported Method Parameters::
@@ -265,6 +291,20 @@ module Meshtastic
     raise e
   end
 
+  # Supported Method Parameters::
+  # Meshtastic.send_to_mqtt(
+  #   service_envelope: 'required - ServiceEnvelope Message to Send'
+  # )
+  public_class_method def self.send_to_mqtt(opts = {})
+    service_envelope = opts[:service_envelope]
+
+    raise 'ERROR: Invalid ServiceEnvelope Message' unless service_envelope.is_a?(Meshtastic::ServiceEnvelope)
+
+    service_envelope.to_proto
+  rescue StandardError => e
+    raise e
+  end
+
   # Author(s):: 0day Inc. <support@0dayinc.com>
 
   public_class_method def self.authors

metadata

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