meshtastic 0.0.50 → 0.0.51

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 87f863cdd44f899cd5dac5c3dec132b88c4851d0e2a27642cfe1a2832e4b22b4
-  data.tar.gz: 7e1e8630780251ea8288a74572d8ea7a9ea3e1e53b524937245822667159f17f
+  metadata.gz: a3b25733439f146126ff2350cde20e82173b75f4a7118df83cbd7ac09715832a
+  data.tar.gz: f9296bf726f9399867171a02c5f261f3bd5c5fc264efc6323029d3a959d9a3e8
 SHA512:
-  metadata.gz: 121ec8034eb3620b36ea8ca360ea3c3698ea8d4953ea31f5aee35360865553879d6d635921e184c1b64692fdc422685241596cf4f6adec5dea8493f254585fe2
-  data.tar.gz: bf802728fea13ae6cbcdd6997f8eccf4b2947859dfb830edc685f68f32424c6c4e884f4cbabd5fca16a003bbf1e58c078a9b3d1fffe3907e1bb2d14c67dc56b2
+  metadata.gz: 7d1ab98506914f93b8fc3e6e5a792a7c8bd8e0c70cb8a88046ceaf7fb1f7617a127d1f450d175f90aec7bb22e7c605cd442e2d0db5efffcefb362a660ad65152
+  data.tar.gz: 114f31f2563fb18099ddfba9b915b1b540c1b463098648a70530f60c81891cd522ffe7adceef632f82320490b8bd8fcb0110a77a6f3b5fc5b00dc8e60e12f7f1

data/lib/meshtastic/mqtt.rb

@@ -248,7 +248,9 @@ module Meshtastic
           # If encrypted_message is not nil, then decrypt
           # the message prior to decoding.
           encrypted_message = message[:encrypted]
-          if encrypted_message.to_s.length.positive?
+          if encrypted_message.to_s.length.positive? &&
+             message[:topic]
+
             packet_id = message[:id]
             packet_from = message[:from]
 
@@ -257,8 +259,10 @@ module Meshtastic
             nonce = "#{nonce_packet_id}#{nonce_from_node}".b
 
             psk = psks[:LongFast]
-            target_channel = decoded_payload_hash[:channel_id].to_s.to_sym
+            target_channel = message[:topic].split('/')[-2].to_sym
+            puts "Target Channel: #{target_channel}"
             psk = psks[target_channel] if psks.keys.include?(target_channel)
+            puts "PSK: #{psk}"
             dec_psk = Base64.strict_decode64(psk)
 
             cipher = OpenSSL::Cipher.new('AES-128-CTR')

data/lib/meshtastic/version.rb

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

data/lib/meshtastic.rb

@@ -51,26 +51,40 @@ module Meshtastic
 
   # Supported Method Parameters::
   # Meshtastic.send_text(
-  #   from_id: 'optional - Source ID (Default: 0)',
-  #   dest_id: 'optional - Destination ID (Default: 0xFFFFFFFF)',
+  #   from: 'required - From ID (String or Integer)',
+  #   to: 'optional - Destination ID (Default: 0xFFFFFFFF)',
+  #   channel: 'optional - Channel ID (Default: 0)',
   #   text: 'optional - Text Message (Default: SYN)',
   #   want_ack: 'optional - Want Acknowledgement (Default: false)',
   #   want_response: 'optional - Want Response (Default: false)',
   #   hop_limit: 'optional - Hop Limit (Default: 3)',
   #   on_response: 'optional - Callback on Response',
-  #   psk: 'optional - Pre-Shared Key if Encrypted (Default: nil)'
+  #   psks: 'optional - hash of :channel => psk key value pairs (default: { LongFast: "AQ==" })'
   # )
   public_class_method def self.send_text(opts = {})
     # Send a text message to a node
-    from_id = opts[:from_id].to_i
-    dest_id = opts[:dest_id] ||= 0xFFFFFFFF
+    from = opts[:from]
+    from_hex = from.delete('!').bytes.map { |b| b.to_s(16).rjust(2, '0') }.join if from.is_a?(String)
+    from = from_hex.to_i(16) if from_hex
+    raise 'ERROR: from parameter is required.' unless from
+
+    to = opts[:to] ||= 0xFFFFFFFF
+    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
+
+    channel = opts[:channel] ||= 0
     text = opts[:text] ||= 'SYN'
     want_ack = opts[:want_ack] ||= false
     want_response = opts[:want_response] ||= false
     hop_limit = opts[:hop_limit] ||= 3
     on_response = opts[:on_response]
-    psk = opts[:psk]
-    
+
+    public_psk =  '1PG7OiApB1nwvP+rz05pAQ=='
+    psks = opts[:psks] ||= { LongFast: public_psk }
+    raise 'ERROR: psks parameter must be a hash of :channel => psk key value pairs' unless psks.is_a?(Hash)
+
+    psks[:LongFast] = public_psk if psks[:LongFast] == 'AQ=='
+
     # TODO: verify text length validity
     max_txt_len = Meshtastic::Constants::DATA_PAYLOAD_LEN
     raise "ERROR: Text Length > #{max_txt_len} Bytes" if text.length > max_txt_len
@@ -84,15 +98,16 @@ module Meshtastic
     puts data.to_h
 
     send_data(
-      from_id: from_id,
-      dest_id: dest_id,
+      from: from,
+      to: to,
+      channel: channel,
       data: data,
       want_ack: want_ack,
       want_response: want_response,
       hop_limit: hop_limit,
       port_num: port_num,
       on_response: on_response,
-      psk: psk
+      psks: psks
     )
   rescue StandardError => e
     raise e
@@ -100,18 +115,27 @@ module Meshtastic
 
   # Supported Method Parameters::
   # Meshtastic.send_data(
-  #   from_id: 'optional - Source ID (Default: 0)',
-  #   dest_id: 'optional - Destination ID (Default: 0xFFFFFFFF)',
+  #   from: 'required - From ID (String or Integer)',
+  #   to: 'optional - Destination ID (Default: 0xFFFFFFFF)',
+  #   channel: 'optional - Channel ID (Default: 0)',
   #   data: 'required - Data to Send',
   #   want_ack: 'optional - Want Acknowledgement (Default: false)',
   #   hop_limit: 'optional - Hop Limit (Default: 3)',
   #   port_num: 'optional - (Default: Meshtastic::PortNum::PRIVATE_APP)',
-  #   psk: 'optional - Pre-Shared Key if Encrypted (Default: nil)'
+  #   psks: 'optional - hash of :channel => psk key value pairs (default: { LongFast: "AQ==" })'
   # )
   public_class_method def self.send_data(opts = {})
     # Send a text message to a node
-    from_id = opts[:from_id].to_i
-    dest_id = opts[:dest_id] ||= 0xFFFFFFFF
+    from = opts[:from]
+    from_hex = from.delete('!').bytes.map { |b| b.to_s(16).rjust(2, '0') }.join if from.is_a?(String)
+    from = from_hex.to_i(16) if from_hex
+    raise 'ERROR: from parameter is required.' unless from
+
+    to = opts[:to] ||= 0xFFFFFFFF
+    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
+
+    channel = opts[:channel] ||= 0
     data = opts[:data]
     want_ack = opts[:want_ack] ||= false
     hop_limit = opts[:hop_limit] ||= 3
@@ -119,7 +143,11 @@ module Meshtastic
     max_port_num = Meshtastic::PortNum::MAX
     raise "ERROR: Invalid port_num" unless port_num.positive? && port_num < max_port_num
 
-    psk = opts[:psk]
+    public_psk =  '1PG7OiApB1nwvP+rz05pAQ=='
+    psks = opts[:psks] ||= { LongFast: public_psk }
+    raise 'ERROR: psks parameter must be a hash of :channel => psk key value pairs' unless psks.is_a?(Hash)
+
+    psks[:LongFast] = public_psk if psks[:LongFast] == 'AQ=='
 
     data_len = data.payload.length
     max_len = Meshtastic::Constants::DATA_PAYLOAD_LEN
@@ -130,11 +158,12 @@ module Meshtastic
 
     send_packet(
       mesh_packet: mesh_packet,
-      from_id: from_id,
-      dest_id: dest_id,
+      from: from,
+      to: to,
+      channel: channel,
       want_ack: want_ack,
       hop_limit: hop_limit,
-      psk: psk
+      psks: psks
     )
   rescue StandardError => e
     raise e
@@ -143,39 +172,52 @@ module Meshtastic
   # Supported Method Parameters::
   # Meshtastic.send_packet(
   #   mesh_packet: 'required - Mesh Packet to Send',
-  #   from_id: 'optional - Source ID (Default: 0)',
-  #   dest_id: 'optional - Destination ID (Default: 0xFFFFFFFF)',
+  #   from: 'required - From ID (String or Integer)',
+  #   to: 'optional - Destination ID (Default: 0xFFFFFFFF)',
+  #   channel: 'optional - Channel ID (Default: 0)',
   #   want_ack: 'optional - Want Acknowledgement (Default: false)',
   #   hop_limit: 'optional - Hop Limit (Default: 3)',
-  #   psk: 'optional - Pre-Shared Key if Encrypted (Default: nil)'
+  #   psks: 'optional - hash of :channel => psk key value pairs (default: { LongFast: "AQ==" })'
   # )
   public_class_method def self.send_packet(opts = {})
     mesh_packet = opts[:mesh_packet]
-    from_id = opts[:from_id] ||= 0
-    dest_id = opts[:dest_id] ||= 0xFFFFFFFF
+    from = opts[:from]
+    from_hex = from.delete('!').bytes.map { |b| b.to_s(16).rjust(2, '0') }.join if from.is_a?(String)
+    from = from_hex.to_i(16) if from_hex
+    raise 'ERROR: from parameter is required.' unless from
+
+    to = opts[:to] ||= 0xFFFFFFFF
+    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
+
+    channel = opts[:channel] ||= 0
     want_ack = opts[:want_ack] ||= false
     hop_limit = opts[:hop_limit] ||= 3
-    psk = opts[:psk]
+
+    public_psk = '1PG7OiApB1nwvP+rz05pAQ=='
+    psks = opts[:psks] ||= { LongFast: public_psk }
+    raise 'ERROR: psks parameter must be a hash of :channel => psk key value pairs' unless psks.is_a?(Hash)
+
+    psks[:LongFast] = public_psk if psks[:LongFast] == 'AQ=='
 
     # my_info = Meshtastic::FromRadio.my_info
-    # wait_connected if dest_id != my_info.my_node_num && my_info.is_a(Meshtastic::Deviceonly::MyInfo)
-    
-    node_num = dest_id
-    node_num_hex = dest_id.bytes.map { |b| b.to_s(16).rjust(2, '0') }.join if dest_id.is_a?(String)
-    node_num = node_num_hex.to_i(16) if node_num_hex
-
-    mesh_packet.from = from_id
-    mesh_packet.to = node_num
+    # wait_connected if to != my_info.my_node_num && my_info.is_a(Meshtastic::Deviceonly::MyInfo)
+
+    mesh_packet.from = from
+    mesh_packet.to = to
+    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}"
 
-    if psk
+    if psks
       nonce_packet_id = [mesh_packet.id].pack('V').ljust(8, "\x00")
-      nonce_from_node = [from_id].pack('V').ljust(8, "\x00")
+      nonce_from_node = [from].pack('V').ljust(8, "\x00")
       nonce = "#{nonce_packet_id}#{nonce_from_node}".b
 
+      psk = psks[psks.keys.first]
       dec_psk = Base64.strict_decode64(psk)
       cipher = OpenSSL::Cipher.new('AES-128-CTR')
       cipher = OpenSSL::Cipher.new('AES-256-CTR') if dec_psk.length == 32
@@ -183,18 +225,17 @@ module Meshtastic
       cipher.key = dec_psk
       cipher.iv = nonce
 
-      decrypted_payload = mesh_packet.decoded.to_s
+      decrypted_payload = mesh_packet.decoded.to_proto
       encrypted_payload = cipher.update(decrypted_payload) + cipher.final
 
       mesh_packet.encrypted = encrypted_payload
     end
-    # puts mesh_packet.to_h
+    puts mesh_packet.to_h
 
-    # to_radio = Meshtastic::ToRadio.new
-    # to_radio.packet = mesh_packet
-    # send_to_radio(to_radio: to_radio)
+    to_radio = Meshtastic::ToRadio.new
+    to_radio.packet = mesh_packet
 
-    mesh_packet
+    send_to_radio(to_radio: to_radio)
   rescue StandardError => e
     raise e
   end
@@ -205,11 +246,9 @@ module Meshtastic
   # )
   public_class_method def self.generate_packet_id(opts = {})
     last_packet_id = opts[:last_packet_id] ||= 0
+    last_packet_id = 0 if last_packet_id.negative?
 
-    packet_id = last_packet_id + 1 if last_packet_id.positive?
-    packet_id = rand(2**32) if last_packet_id.zero?
-
-    packet_id
+    (last_packet_id + 1) & 0xffffffff
   end
 
   # Supported Method Parameters::

metadata

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