meshtastic 0.0.134 → 0.0.135

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2a019972ccb99e42fee81bb0b2f8a18d2c7c0223e579234a64239eb1f0d89652
-  data.tar.gz: b8882c221fb7d8faf2b927f596b78f54f9868917a8d5c6d889d31b1ab5114990
+  metadata.gz: b2450abd9bb6ac40987c0cae82e08c2ca1a8fb466a510185a12cf7af2c0b1115
+  data.tar.gz: cc6380613f57613b0d9920ce53caaa7149afe2e67ca6da7f0abd84912d76bb1c
 SHA512:
-  metadata.gz: 61346686f811a67bf81d68a94b3189aaf0b6232c59e0cbdbfba3cfaa6850284beec8f68616adbcbd92f3e88c8200f1134954bb40d25eed29303fb023b433b8ef
-  data.tar.gz: 7fec0467aca8ad1ad68afdcb67ef206dc76499285282f802fee25f938335c6092cb29cb6c4720e74e8481be0235ce225fbd1616e548cba8cb0076cbd278e0698
+  metadata.gz: 9f00a1b9e3061dc4592495957db02af2440f15580a8b84277d1ca809af67648ed7e57fe3c72017b8f1b02eafef5a0520767b17ec959c82f7f6394d72f901f5c0
+  data.tar.gz: c493f51bf1efd690e035571270860e10ac7aca0a020e60e58c501b5ba9ee5d99eb447076683d0409183cf02b4b9e57ee3088ec52e7a15b23a2af5ed46cd6b362

data/lib/meshtastic/mqtt.rb

@@ -278,29 +278,22 @@ module Meshtastic
       opts[:via] = :mqtt
 
       # TODO: Implement chunked message to deal with large messages
-      raw_text = opts[:text].to_s
-      max_bytes = 232
+      text = opts[:text].to_s
+      max_bytes = 233
       mui = Meshtastic::MeshInterface.new
 
-      if raw_text.bytesize > max_bytes
-        chunks = []
-        current_chunk = ''
-        raw_text.each_char do |char|
-          if (current_chunk + char).bytesize > max_bytes
-            chunks.push(current_chunk)
-            current_chunk = char
-          else
-            current_chunk += char
-          end
-        end
-        chunks.push(current_chunk) unless current_chunk.empty?
-
-        total_chunks = chunks.length
-        chunks.each_with_index do |chunk, index|
+      if text.bytesize > max_bytes
+        total_chunks = (text.bytesize.to_f / max_bytes).ceil
+        total_chunks.times do |i|
+          chunk_num = i + 1
+          chunk_prefix = "(#{chunk_num} of #{total_chunks})"
+          chunk_prefix_len = chunk_prefix.bytesize
+          start_index = i * (max_bytes - chunk_prefix_len)
+          end_index = (start_index + (max_bytes - chunk_prefix_len)) - 1
+          chunk = "#{chunk_prefix} #{text.byteslice(start_index..end_index)}"
           opts[:text] = chunk
-          opts[:text] = "[#{index + 1}/#{total_chunks}] #{chunk}"
           protobuf_chunk = mui.send_text(opts)
-          push(mqtt_obj.publish(absolute_topic, protobuf_chunk))
+          mqtt_obj.publish(absolute_topic, protobuf_chunk)
         end
       else
         protobuf_text = mui.send_text(opts)

data/lib/meshtastic/version.rb

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

metadata

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