simplex-chat 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1dde8b2fbd228f72ec1b9cb4f95269401aa2fa68774b38fdbef43d8eec2b7d63
-  data.tar.gz: 1c54b1064c53ceeb06ae4b0f68715e773e96753208ec87b7ad445e2863649969
+  metadata.gz: 3f038bfb3c5cc7308a7c53d4a19e4152cfcc4e3f54088093d66b1947d2816f7c
+  data.tar.gz: 4e4fa59d7fa8c29225b64bf7856ce9dec9a5551df0038158e4c53e4a60c25b7c
 SHA512:
-  metadata.gz: 669c992a7cbab4e903581bae8def4f6a4dc6e269cc5041e8e0dd5901bc62e8d162aaf4aa95ab0f266932619e34c48d10400107dfd84d4a8cc60d64c51a40711a
-  data.tar.gz: f6c49bb438a61eb4015cd94e5f29197214b36a7eb3d18f5a8bee05ecc2d7cbcf284f10d792cb3b0aad8aa9f3c41be36a78875b5c38b13961770aa835b829823c
+  metadata.gz: c3d3091b7fdbc2ff66ed648dc27729860fd79b2434dbb3bbe3f3ec7473042975a8a8aa981b853e302259137aa7b88b1ad5233f4459f9ec1d09aab7d8eadfd165
+  data.tar.gz: c690575e7ad589694966f0ed69f3e62b2ce7d9e562cd419b49bed1bc8bcfb07d5dfefc43fed5b2905ceca1d9520d6c5a90153a67ebc52df853a3f3886ea5fe07

data/lib/simplex-chat/version.rb

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

data/lib/simplex-chat.rb

@@ -28,10 +28,18 @@ module SimpleXChat
     CONTACT_REQUEST = '<@'
   end
 
+  module GroupMemberRole
+    AUTHOR = 'author' # reserved and unused as of now, but added anyways
+    OWNER = 'owner'
+    ADMIN = 'admin'
+    MEMBER = 'member'
+    OBSERVER = 'observer'
+  end
+
   class ClientAgent
     attr_accessor :on_message
 
-    def initialize client_uri, connect: true, log_level: Logger::INFO
+    def initialize client_uri, connect: true, log_level: Logger::INFO, timeout_ms: 30_000, interval_ms: 100
       @uri = client_uri
       @message_queue = SizedQueue.new 4096
       @chat_message_queue = Queue.new
@@ -42,6 +50,8 @@ module SimpleXChat
       @listener_thread = nil
       @corr_id = Concurrent::AtomicFixnum.new(1) # Correlation ID for mapping client responses to command waiters
       @command_waiters = Concurrent::Hash.new
+      @timeout_ms = timeout_ms
+      @interval_ms = interval_ms
 
       @logger = Logger.new($stderr)
       @logger.level = log_level
@@ -50,9 +60,7 @@ module SimpleXChat
         "| [#{severity}] | #{datetime} | (#{progname}) :: #{msg}\n"
       }
 
-      if connect
-        self.connect
-      end
+      self.connect if connect
 
       @logger.debug("Initialized ClientAgent")
     end
@@ -144,8 +152,13 @@ module SimpleXChat
           group = nil
           sender = nil
           contact = nil
+          contact_role = nil
           if chat_type == ChatType::GROUP
-            contact = chat_item["chatItem"]["chatDir"]["groupMember"]["localDisplayName"]
+            # 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_role = chat_item.dig "chatItem", "chatDir", "groupMember", "memberRole"
             group = chat_item["chatInfo"]["groupInfo"]["localDisplayName"]
             sender = group
           else
@@ -159,6 +172,7 @@ module SimpleXChat
           chat_message = {
             :chat_type => chat_type,
             :sender => sender,
+            :contact_role => contact_role,
             :contact => contact,
             :group => group,
             :msg_text => msg_text,
@@ -182,7 +196,7 @@ module SimpleXChat
     end
 
     # Sends a raw command to the SimpleX Chat client
-    def send_command(cmd)
+    def send_command(cmd, timeout_ms: @timeout_ms, interval_ms: @interval_ms)
       corr_id = next_corr_id
       obj = {
         "corrId" => corr_id,
@@ -202,12 +216,16 @@ module SimpleXChat
       @socket.write frame.to_s
 
       msg = nil
-      100.times do
+      iterations = timeout_ms / interval_ms
+      iterations.times do
         begin
           msg = single_use_queue.pop(true)
           break
         rescue ThreadError
-          sleep 0.1
+          sleep(interval_ms / 1000.0)
+        ensure
+          # Clean up command_waiters
+          @command_waiters.delete corr_id
         end
       end
 
@@ -308,6 +326,48 @@ module SimpleXChat
       }
     end
 
+    def api_auto_accept is_enabled
+      onoff = is_enabled && "on" || "off"
+
+      resp = send_command "/auto_accept #{onoff}"
+      resp_type = resp["type"]
+      raise "Unexpected response: #{resp_type}" if resp_type != "userContactLinkUpdated"
+
+      nil
+    end
+
+    def api_kick_group_member(group, member)
+      resp = send_command "/remove #{group} #{member}"
+      resp_type = resp["type"]
+      raise "Unexpected response: #{resp_type}" unless resp_type == "userDeletedMember"
+    end
+
+    # Parameters for /network:
+    #   - socks: on/off/<[ipv4]:port>
+    #   - socks-mode: always/onion
+    #   - smp-proxy: always/unknown/unprotected/never
+    #   - smp-proxy-fallback: no/protected/yes
+    #   - timeout: <seconds>
+    def api_network(socks: nil, socks_mode: nil, smp_proxy: nil, smp_proxy_fallback: nil, timeout_secs: nil)
+      args = {
+        "socks" => socks,
+        "socks-mode" => socks_mode,
+        "smp-proxy" => smp_proxy,
+        "smp-proxy-fallback" => smp_proxy_fallback,
+        "timeout" => timeout_secs
+      }
+      command = '/network'
+      args.each do |param, value|
+        next if value == nil
+        command += " #{param}=#{value}"
+      end
+      resp = send_command command
+      resp_type = resp["type"]
+      raise "Unexpected response: #{resp_type}" if resp_type != "networkConfig"
+
+      resp["networkConfig"]
+    end
+
     private
 
     def next_corr_id

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: simplex-chat
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - rdbo
 bindir: exe
 cert_chain: []
-date: 2025-02-23 00:00:00.000000000 Z
+date: 2025-03-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: websocket