json-socket 1.0.4 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c5b25be9f8edfe3dadee684bfc30dcccc5195349a423f39c21d7dc89e88d876a
-  data.tar.gz: 12d01e5b7587929b7d1756ee54ab599eb03a2cefca37091d44f9b6b6a1eed1ec
+  metadata.gz: 875091899544dfd73d4014d91052776f04ef92c62acd78d233701baf82a2f01c
+  data.tar.gz: db3aedc20dabe6e640d83fe682cde75dbde60ddc601eda29269099e6f2fca52f
 SHA512:
-  metadata.gz: 8c6a5697b322807ed6676ca82e355705d455b83fd488fb0b3d57754c04c3d9eab4f90641fcc79d30b6e99e5f15738a99ad0f42c3e8c63cc9cc31f3a4d2c4fe74
-  data.tar.gz: 895a212c1c6a5ad27b7ba44676a2da45dd36e5c3d7d306413df10e823d27d841614dd9a45f830676ef0ae348f5984397842f0d1ff87d6722fa172790746a4534
+  metadata.gz: bc524ff94905b6f97ab70d6bbc6c0ee067737cededacb4eec6c2bfc5c2dd74ed76d2455fcc494c2abaa3c8ef2f4b74016941893e2f747715d3d3646f25b1d67e
+  data.tar.gz: 7a56e89c0320e7b494dafee28037567214b4663168d82eb08536e8c90c74a15074a35958d939b9cfe100b11c7f83e544eaf35287594ce891b2e2a7d2120679f4

data/lib/json-socket.rb

@@ -1,6 +1,8 @@
-require "socket"
+# require "socket"
 require "fileutils"
 require "oj"
+require "async/io"
+require 'async/io/unix_endpoint'
 
 Oj.default_options = { :mode => :strict }
 
@@ -25,32 +27,30 @@ module JSONSocket
     def initialize(host: "127.0.0.1", port: 1234, delimeter: "#", unix_socket: nil, oj_options: nil)
       Oj.default_options = oj_options if oj_options
       @delimeter = delimeter
-      @stop = false
       @server = if unix_socket
                   FileUtils.rm_f(unix_socket)
-                  UNIXServer.new unix_socket
+                  Async::IO::Endpoint.unix(unix_socket)
                 else
-                  TCPServer.new host, port
+                  Async::IO::Endpoint.tcp(host, port)
                 end
     end
 
-    def stop
-      @stop = true
-    end
-
     def listen
-      loop do
-        Thread.start(@server.accept) do |client|
-          begin
-            # https://stackoverflow.com/questions/25303943/how-to-send-a-utf-8-encoded-strings-via-tcpsocket-in-ruby/25305256
-            client.set_encoding 'UTF-8'
-            message_length = client.gets(@delimeter).to_i
+      Async do |task|
+        begin
+        @server.accept do |client|
+          client = client.set_encoding 'UTF-8'
+          # https://stackoverflow.com/questions/25303943/how-to-send-a-utf-8-encoded-strings-via-tcpsocket-in-ruby/25305256
+          message_length = client.gets(@delimeter).to_i
+          unless message_length == 0
             on_message(parse_json(client.read(message_length)), client)
-          rescue Exception => e
-            on_error e
+          else
+            client.close
           end
         end
-        break if @stop
+        rescue Exception => e
+          on_error e
+        end
       end
     end
 
@@ -104,14 +104,10 @@ module JSONSocket
     end
 
     def send(message)
-      begin
-        if @unix_socket
-          UNIXSocket.open(@unix_socket) {|socket| handle_send_receive(socket, message) }
-        else
-          TCPSocket.open(@host, @port) {|socket| handle_send_receive(socket, message) }
-        end
-      rescue Exception => e
-        STDERR.puts e
+      if @unix_socket
+        UNIXSocket.open(@unix_socket) {|socket| handle_send_receive(socket, message) }
+      else
+        TCPSocket.open(@host, @port) {|socket| handle_send_receive(socket, message) }
       end
     end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: json-socket
 version: !ruby/object:Gem::Version
-  version: 1.0.4
+  version: 2.0.0
 platform: ruby
 authors:
 - foi
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-02-04 00:00:00.000000000 Z
+date: 2023-02-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: oj
@@ -24,6 +24,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: async-io
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -38,8 +52,8 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-description: JSON-socket client & server implementation. Inspired by and compatible
-  with sebastianseilund/node-json-socket
+description: JSON-socket client & server implementation based on async-io. Inspired
+  by and compatible with sebastianseilund/node-json-socket
 email: foi@live.ru
 executables: []
 extensions: []