meshtastic 0.0.59 → 0.0.61

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4bee0bc9cf63a72bf400763d93004424baa89bf5c6252a53d594cd472a09ee0a
-  data.tar.gz: 4bfa4ff0b53b434da3624a55d5dc26934b1edb641a5a6c32101dc5029cf6df58
+  metadata.gz: dceeac29deeac96282b54784e35f07c58b94eefa80d90e52c99fa13d34abe359
+  data.tar.gz: 8a30e46f08215d9c681506e9e138856b442f97af1f9bdcb28b3a2c3defd02a14
 SHA512:
-  metadata.gz: 5abc75249f2f677b1bfdc96f21a1a3ce76b5ab0b6ee38968f1f20cc436c45423702e5445fd89e2f6aa2a64ea8b1a6f5eddf71dca03e5808eddf33b87d19bed2e
-  data.tar.gz: 0610bbc1cd020aa4dcf01fae92430006eb3c2150c0b9971b3270ab1e67133bbcbd1488348ffce1260960270c61219a1a7c93365a61ebce3c4682ef41e545ccb6
+  metadata.gz: ac41b52aa5c8069b6da7b8ce6e27f09643604c0b2978230dde661612e50a1656e6740d7ede4f4c8bf27a0230b807e4b98f305897e293053f0450d5f8a793aa52
+  data.tar.gz: 760a90c99e4618a3b1448e13d5a2fd0434a5c169d7235629c8c18a128bc8761bd81135a131e6aa4cce84f823dd27eb15aa77a077a1b3ed4fd761e2cf3a54e6e8

data/lib/meshtastic/mqtt.rb

@@ -167,7 +167,8 @@ module Meshtastic
       end
 
       payload
-    rescue Google::Protobuf::ParseError
+    rescue Encoding::CompatibilityError,
+           Google::Protobuf::ParseError
       payload
     rescue StandardError => e
       raise e
@@ -291,18 +292,21 @@ module Meshtastic
             message[:stdout] = 'pretty'
             stdout_message = JSON.pretty_generate(decoded_payload_hash)
           end
-        rescue Google::Protobuf::ParseError,
+        rescue Encoding::CompatibilityError,
+               Google::Protobuf::ParseError,
                JSON::GeneratorError,
                ArgumentError => e
 
-          message[:decrypted] = e.message if e.message.include?('key must be')
-          message[:decrypted] = 'unable to decrypt - psk?' if e.message.include?('occurred during parsing')
-          decoded_payload_hash[:packet] = message
-          unless block_given?
-            puts "WARNING: #{e.inspect} - MSG IS >>>"
-            # puts e.backtrace
-            message[:stdout] = 'inspect'
-            stdout_message = decoded_payload_hash.inspect
+          unless e.is_a?(Encoding::CompatibilityError)
+            message[:decrypted] = e.message if e.message.include?('key must be')
+            message[:decrypted] = 'unable to decrypt - psk?' if e.message.include?('occurred during parsing')
+            decoded_payload_hash[:packet] = message
+            unless block_given?
+              puts "WARNING: #{e.inspect} - MSG IS >>>"
+              # puts e.backtrace
+              message[:stdout] = 'inspect'
+              stdout_message = decoded_payload_hash.inspect
+            end
           end
 
           next
@@ -339,6 +343,32 @@ module Meshtastic
       mqtt_obj.disconnect if mqtt_obj
     end
 
+    # Supported Method Parameters::
+    # Meshtastic.send_text(
+    #   mqtt_obj: 'required - mqtt_obj returned from #connect method',
+    #   from: ' required - From ID (String or Integer)',
+    #   to: 'optional - Destination ID (Default: 0xFFFFFFFF)',
+    #   topic: 'optional - topic to publish to (default: "msh/US/2/e/LongFast/1")',
+    #   channel: 'optional - channel ID (Default: 6)',
+    #   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',
+    #   psks: 'optional - hash of :channel => psk key value pairs (default: { LongFast: "AQ==" })'
+    # )
+    public_class_method def self.send_text(opts = {})
+      mqtt_obj = opts[:mqtt_obj]
+      topic = opts[:topic] ||= 'msh/US/2/e/LongFast/#'
+      opts[:via] = :mqtt
+
+      protobuf_text = Meshtastic.send_text(opts)
+
+      mqtt_obj.publish(topic, protobuf_text)
+    rescue StandardError => e
+      raise e
+    end
+
     # Supported Method Parameters::
     # mqtt_obj = Meshtastic.gps_search(
     #   lat: 'required - latitude float (e.g. 37.7749)',

data/lib/meshtastic/version.rb

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

data/lib/meshtastic.rb

@@ -55,7 +55,7 @@ module Meshtastic
   #   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)',
+  #   channel: 'optional - Channel ID (Default: 6)',
   #   text: 'optional - Text Message (Default: SYN)',
   #   want_ack: 'optional - Want Acknowledgement (Default: false)',
   #   want_response: 'optional - Want Response (Default: false)',
@@ -76,7 +76,7 @@ module Meshtastic
 
     last_packet_id = opts[:last_packet_id] ||= 0
     via = opts[:via] ||= :radio
-    channel = opts[:channel] ||= 0
+    channel = opts[:channel] ||= 6
     text = opts[:text] ||= 'SYN'
     want_ack = opts[:want_ack] ||= false
     want_response = opts[:want_response] ||= false

metadata

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