meshtastic 0.0.52 → 0.0.55

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5656d74b5db708a5326543863dcbedc9fa101d7a61e8fd3d0136f095ab108ab4
-  data.tar.gz: f18672f97ef7721d575ab07bd5e7cf019c38b11bf6486a132b35264ab8fdc978
+  metadata.gz: 6e5fa2b876003694039c7b9e869e3ae165f4f9c89023ef9936e059d55fb88f77
+  data.tar.gz: 7b7b7a348051bb55b232e0dc974d9dbb182a85a6680fa9575f19832dbc48685f
 SHA512:
-  metadata.gz: c3eb1b0c0484564d25a9eafba5ab9a281bbab340e09472d9e3e9a173f9bea7d3d1cd65f173af5397cb54e6705b2d576638f80c3c96d5b95e958317e4ec5b751b
-  data.tar.gz: 5a8f975dd695e868569daa7d45c954f422d970becbfd42ed2ebc96b038b3056d9638c4c14f56ea1db2f72e7bea22d589026b17973027816f6b212a1a4526f7f0
+  metadata.gz: 99bd471d591581d107dcb38ea258d48b468cc3c124b276d7d1b6e935b1a78d12d4e555d15f6e426a93f372f97576482a15fb2bcd39b05f5873c0958c51da5110
+  data.tar.gz: 0a0e1c273cad423c52a1e4d00fab66e59936951e35d0be5cf37fd4677ea971d56ea57dfd9ab2c41d1c62e3393101730d86286443602c54728d101ef09849337b

data/lib/meshtastic/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Meshtastic
-  VERSION = '0.0.52'
+  VERSION = '0.0.55'
 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
@@ -95,11 +97,12 @@ module Meshtastic
     data.payload = text
     data.portnum = port_num
     data.want_response = want_response
-    puts data.to_h
+    # puts data.to_h
 
     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
@@ -230,12 +238,23 @@ module Meshtastic
 
       mesh_packet.encrypted = encrypted_payload
     end
-    puts mesh_packet.to_h
-
-    to_radio = Meshtastic::ToRadio.new
-    to_radio.packet = mesh_packet
-
-    send_to_radio(to_radio: to_radio)
+    # puts mesh_packet.to_h
+
+    # 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
@@ -265,6 +284,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.52
+  version: 0.0.55
 platform: ruby
 authors:
 - 0day Inc.