meshtastic 0.0.112 → 0.0.113

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7200eec80ec91cb140cd1d3601ec51805518ea92226f5bc6059121a476bd2ea9
-  data.tar.gz: b83f2d2f30ad0f4ee56f11e6800852df1b2f65b6cc617848e39f91ea1a5e52a5
+  metadata.gz: 2e838a5ad607ba7d6a0d5babe727ce2366d2cc6f384d0c658202d8ff52b0b788
+  data.tar.gz: d02409916db5899c662e6435b7d3dcc59093b837889e3da12173f9e1b989ffca
 SHA512:
-  metadata.gz: '008f3c27d34852e0c836e0d9277839423931b19ee565ed7982644037754c5e97a443bab3b7046ea7309bfc77554e823f1c9f403a69296efc097c3175ea44e200'
-  data.tar.gz: 803b1f36e00d8fa4be008530bcb8aa72c1fde33f7dc37db195cd39d9957233c0c0198a892b5d6e8eb2028f340c997c58f6227a1d3fe09ea4551bca864bcc6add
+  metadata.gz: ff60ebb000eb556d282f2c733f55e1bbfd62e1eebe6bb29369c9092eeb8aaf50d910c174deb8fa3c5bed7501dd5dc285096c64c4eff16feacd11c7dfac57db34
+  data.tar.gz: 9569a7668378b563f1bdfecc7ca761ab47b0e24d9cdba2eda359d0661dede59b4c3c74f20582f1b6e8e044e14d0778b152cf5915d05634d00eddde8bd02032ad

data/lib/meshtastic/mqtt.rb

@@ -65,6 +65,7 @@ module Meshtastic
     #   channel_topic: 'optional - channel ID path e.g. "2/stat/#" (default: "2/e/LongFast/#")',
     #   psks: 'optional - hash of :channel_id => psk key value pairs (default: { LongFast: "AQ==" })',
     #   qos: 'optional - quality of service (default: 0)',
+    #   exclude: 'optional - comma-delimited string(s) to exclude in message (default: nil)',
     #   filter: 'optional - comma-delimited string(s) to filter on in message (default: nil)',
     #   gps_metadata: 'optional - include GPS metadata in output (default: false)',
     #   include_raw: 'optional - include raw packet data in output (default: false)'
@@ -86,6 +87,7 @@ module Meshtastic
 
       qos = opts[:qos] ||= 0
       json = opts[:json] ||= false
+      exclude = opts[:exclude]
       filter = opts[:filter]
       gps_metadata = opts[:gps_metadata] ||= false
       include_raw = opts[:include_raw] ||= false
@@ -99,6 +101,7 @@ module Meshtastic
       # MQTT::ProtocolException: No Ping Response received for 23 seconds (MQTT::ProtocolException)
 
       filter_arr = filter.to_s.split(',').map(&:strip)
+      exclude_arr = exclude.to_s.split(',').map(&:strip)
       mqtt_obj.get_packet do |packet_bytes|
         raw_packet = packet_bytes.to_s if include_raw
         raw_topic = packet_bytes.topic ||= ''
@@ -196,10 +199,14 @@ module Meshtastic
 
           next
         ensure
+          exclude_arr = [message[:id].to_s] if exclude.nil?
           filter_arr = [message[:id].to_s] if filter.nil?
           if message.is_a?(Hash)
             flat_message = message.values.join(' ')
 
+            disp = false if exclude_arr.first == message[:id] ||
+                            exclude_arr.all? { |exclude| flat_message.include?(exclude) }
+
             disp = true if filter_arr.first == message[:id] ||
                            filter_arr.all? { |filter| flat_message.include?(filter) }
 
@@ -299,6 +306,7 @@ module Meshtastic
           psks: 'optional - hash of :channel_id => psk key value pairs (default: { LongFast: 'AQ==' })',
           qos: 'optional - quality of service (default: 0)',
           json: 'optional - JSON output (default: false)',
+          exclude: 'optional - comma-delimited string(s) to exclude in message (default: nil)',
           filter: 'optional - comma-delimited string(s) to filter on in message (default: nil)',
           gps_metadata: 'optional - include GPS metadata in output (default: false)'
         )

data/lib/meshtastic/version.rb

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

data/lib/meshtastic.rb

@@ -441,6 +441,11 @@ module Meshtastic
       payload[:macaddr] = mac_hex_str
     end
 
+    if payload.keys.include?(:public_key)
+      public_key_raw = payload[:public_key]
+      payload[:public_key] = Base64.strict_encode64(public_key_raw)
+    end
+
     if payload.keys.include?(:time)
       time_int = payload[:time]
       if time_int.is_a?(Integer)

metadata

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