simplex-chat 0.5.0 → 0.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a5abf1b7b550f998760cb68e89636e031dcf96aff3449e9422903db050521bd2
-  data.tar.gz: 4602313dfbf09bfd9b650c5668f16389d885cf16202b1896fc81f4dd71dfa869
+  metadata.gz: 1085de134ea131845256d9109e043629b6f83ab59adf94625c89287272c9966a
+  data.tar.gz: e2a1ac6403338b1cc07238d4dc6a2cdb15992a5e938b3df04c98d72d7cce3a93
 SHA512:
-  metadata.gz: 5f77b4edf376118de56ff6dde9a99ee06fc49c12f6ef348053a8ba1ec807b885fac6c2ef4c5c6fe48c21d95a10d7b3351a6ad07a8429603f0ec1ee997ea2923e
-  data.tar.gz: f59fb84f87c57f491eda4e3ab58c30451a376c1c8b79c8e6b190df433f53d4394c4c41b459e8e18940bea91c95517ebd82643cf1e3e65c6093462be3910455c1
+  metadata.gz: 516773178824c494adaa70bef60b323774c8775456eeef1de33ca3bc2131073808d85db998ebade717254286374db2f25b8bec2ba4fd903502b229a70ecc2467
+  data.tar.gz: 9c4848683f657f145538979603d2d5edfa83e32aaf030b6422b5d60ca38613ff8a517abd30f800c508744e255f48d4a172fa4297e2d9ae7d2f55b6ef948db5e1

data/lib/simplex-chat/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module SimpleXChat
-  VERSION = "0.5.0"
+  VERSION = "0.6.1"
 end

data/lib/simplex-chat.rb

@@ -18,7 +18,7 @@ module SimpleXChat
 
     def initialize(client_uri, connect: true, log_level: Logger::INFO, timeout_ms: 10_000, interval_ms: 100)
       @uri = client_uri
-      @message_queue = SizedQueue.new 4096
+      @message_queue = Queue.new
       @chat_message_queue = Queue.new
       @socket = nil
       @handshake = nil
@@ -74,8 +74,8 @@ module SimpleXChat
               single_use_queue.push(resp)
               @logger.debug("Message sent to waiter with corrId '#{corr_id}'")
             else
-              @logger.debug("Message put on message queue")
               @message_queue.push resp
+              @logger.debug("Message put on message queue (number of messages in queue: #{@message_queue.size})")
             end
           rescue IO::WaitReadable
             IO.select([@socket])
@@ -97,7 +97,9 @@ module SimpleXChat
     end
 
     def next_message
-      @message_queue.pop
+      msg = @message_queue.pop
+      @logger.debug("Message retrieved from queue (number of messages in queue: #{@message_queue.size})")
+      msg
     end
 
     def next_chat_message(
@@ -108,7 +110,13 @@ module SimpleXChat
       #       a chat message queue to insert one or
       #       more messages at a time, but poll just
       #       one at a time
-      return @chat_message_queue.pop if not @chat_message_queue.empty?
+      # NOTE: We use non-blocking pop for thread safety
+      begin
+        chat_msg = @chat_message_queue.pop(true)
+        return chat_msg
+      rescue ThreadError
+        @logger.debug("Chat message queue is empty, waiting for new messages...")
+      end
   
       loop do
         msg = next_message
@@ -133,9 +141,20 @@ module SimpleXChat
           end
 
           @chat_message_queue.push chat_message
+          @logger.debug("Chat message pushed to queue: #{chat_message}")
         end
 
-        return @chat_message_queue.pop
+        # NOTE: Even after parsing the messages, the
+        #       chat message queue can be empty because
+        #       all the messages are too old, so we have
+        #       to check again
+        begin
+          chat_msg = @chat_message_queue.pop(true)
+          @logger.debug("Chat message popped from queue")
+          return chat_msg
+        rescue ThreadError
+          @logger.debug("Chat message queue is still empty, waiting for new messages...")
+        end
       end
 
       nil
@@ -365,6 +384,19 @@ module SimpleXChat
       end.filter { |x| x != nil }
     end
 
+    # TODO: Add `/_reaction members` support, either on this
+    #       function or in a separate one
+    def api_reaction(chat_type, chat_id, message_item_id, add: true, emoji: '👍')
+      onoff = add ? "on" : "off"
+      param_obj = {
+        "type" => "emoji",
+        "emoji" => emoji
+      }
+      cmd = "/_reaction #{chat_type}#{chat_id} #{message_item_id} #{onoff} #{param_obj.to_json}"
+      resp = send_command cmd
+      check_response_type(resp, "chatItemReaction")
+    end
+
     private
 
     def check_response_type(resp, expected_resp_type)
@@ -389,35 +421,52 @@ module SimpleXChat
     def parse_chat_item(chat_item)
       chat_type = parse_chat_info_type chat_item["chatInfo"]["type"]
       group = nil
+      group_id = nil
       sender = nil
+      sender_id = nil
       contact = nil
+      contact_id = nil
       contact_role = nil
       if chat_type == ChatType::GROUP
         # NOTE: The group can "send messages" without a contact
         #       For example, when a member is removed, the group
         #       sends a message about his removal, with no contact
         contact = chat_item.dig "chatItem", "chatDir", "groupMember", "localDisplayName"
+        contact_id = chat_item.dig "chatItem", "chatDir", "groupMember", "groupMemberId"
         contact_role = chat_item.dig "chatItem", "chatDir", "groupMember", "memberRole"
         group = chat_item["chatInfo"]["groupInfo"]["localDisplayName"]
+        group_id = chat_item["chatInfo"]["groupInfo"]["groupId"]
         sender = group
+        sender_id = group_id
       else
         contact = chat_item["chatInfo"]["contact"]["localDisplayName"]
+        contact_id = chat_item["chatInfo"]["contact"]["contactId"]
         sender = contact
+        sender_id = contact_id
       end
 
       msg_text = chat_item["chatItem"]["meta"]["itemText"]
+      msg_item_id = chat_item["chatItem"]["meta"]["itemId"]
       timestamp = Time.parse(chat_item["chatItem"]["meta"]["updatedAt"])
-      image_preview = chat_item.dig "chatItem", "content", "msgContent", "image"
+      msg_image_preview = chat_item.dig "chatItem", "content", "msgContent", "image"
 
       chat_message = {
         :chat_type => chat_type,
+
         :sender => sender,
-        :contact_role => contact_role,
+        :sender_id => sender_id,
+
         :contact => contact,
+        :contact_id => contact_id,
+        :contact_role => contact_role,
+
         :group => group,
+        :group_id => group_id,
+
         :msg_text => msg_text,
+        :msg_item_id => msg_item_id,
         :msg_timestamp => timestamp,
-        :img_preview => image_preview
+        :msg_img_preview => msg_image_preview
       }
     end
   end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: simplex-chat
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.6.1
 platform: ruby
 authors:
 - rdbo
 bindir: exe
 cert_chain: []
-date: 2025-03-04 00:00:00.000000000 Z
+date: 2025-03-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: websocket