json-socket 1.0.4 → 2.0.1

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (3) hide show
  1. checksums.yaml +4 -4
  2. data/lib/json-socket.rb +21 -25
  3. metadata +21 -10
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: c5b25be9f8edfe3dadee684bfc30dcccc5195349a423f39c21d7dc89e88d876a
4
- data.tar.gz: 12d01e5b7587929b7d1756ee54ab599eb03a2cefca37091d44f9b6b6a1eed1ec
3
+ metadata.gz: 8142adeef351f84c9221c5d4c17ebab14dd2b202406f7c07b226b394f990e4c9
4
+ data.tar.gz: fa66777aa6ec609403c19ee807402a5d675ab876bfa7970a5ebd86959932f8fe
5
5
  SHA512:
6
- metadata.gz: 8c6a5697b322807ed6676ca82e355705d455b83fd488fb0b3d57754c04c3d9eab4f90641fcc79d30b6e99e5f15738a99ad0f42c3e8c63cc9cc31f3a4d2c4fe74
7
- data.tar.gz: 895a212c1c6a5ad27b7ba44676a2da45dd36e5c3d7d306413df10e823d27d841614dd9a45f830676ef0ae348f5984397842f0d1ff87d6722fa172790746a4534
6
+ metadata.gz: 6c106866fcca562783c8f5b3aae8b2c5c18ef4e59f18babad146282e7174601f6542ef9d8caf92eb80ce7f0af905493029054c2fb09b87f34c32cd93b64d5064
7
+ data.tar.gz: 9603e9cd3f1a7e20df60a49aa96d9a683ec6ff96ceac5486624cc782cfb94d97197373ab96602b60beadf32651db845fecd9dbfe3c146e8477c7f60aaf26dfd8
data/lib/json-socket.rb CHANGED
@@ -1,6 +1,8 @@
1
- require "socket"
1
+ # require "socket"
2
2
  require "fileutils"
3
3
  require "oj"
4
+ require "async/io"
5
+ require 'async/io/unix_endpoint'
4
6
 
5
7
  Oj.default_options = { :mode => :strict }
6
8
 
@@ -25,32 +27,30 @@ module JSONSocket
25
27
  def initialize(host: "127.0.0.1", port: 1234, delimeter: "#", unix_socket: nil, oj_options: nil)
26
28
  Oj.default_options = oj_options if oj_options
27
29
  @delimeter = delimeter
28
- @stop = false
29
30
  @server = if unix_socket
30
31
  FileUtils.rm_f(unix_socket)
31
- UNIXServer.new unix_socket
32
+ Async::IO::Endpoint.unix(unix_socket)
32
33
  else
33
- TCPServer.new host, port
34
+ Async::IO::Endpoint.tcp(host, port)
34
35
  end
35
36
  end
36
37
 
37
- def stop
38
- @stop = true
39
- end
40
-
41
38
  def listen
42
- loop do
43
- Thread.start(@server.accept) do |client|
44
- begin
45
- # https://stackoverflow.com/questions/25303943/how-to-send-a-utf-8-encoded-strings-via-tcpsocket-in-ruby/25305256
46
- client.set_encoding 'UTF-8'
47
- message_length = client.gets(@delimeter).to_i
39
+ Async do |task|
40
+ begin
41
+ @server.accept do |client|
42
+ client = client.set_encoding 'UTF-8'
43
+ # https://stackoverflow.com/questions/25303943/how-to-send-a-utf-8-encoded-strings-via-tcpsocket-in-ruby/25305256
44
+ message_length = client.gets(@delimeter).to_i
45
+ unless message_length == 0
48
46
  on_message(parse_json(client.read(message_length)), client)
49
- rescue Exception => e
50
- on_error e
47
+ else
48
+ client.close
51
49
  end
52
50
  end
53
- break if @stop
51
+ rescue Exception => e
52
+ on_error e
53
+ end
54
54
  end
55
55
  end
56
56
 
@@ -104,14 +104,10 @@ module JSONSocket
104
104
  end
105
105
 
106
106
  def send(message)
107
- begin
108
- if @unix_socket
109
- UNIXSocket.open(@unix_socket) {|socket| handle_send_receive(socket, message) }
110
- else
111
- TCPSocket.open(@host, @port) {|socket| handle_send_receive(socket, message) }
112
- end
113
- rescue Exception => e
114
- STDERR.puts e
107
+ if @unix_socket
108
+ UNIXSocket.open(@unix_socket) {|socket| handle_send_receive(socket, message) }
109
+ else
110
+ TCPSocket.open(@host, @port) {|socket| handle_send_receive(socket, message) }
115
111
  end
116
112
  end
117
113
 
metadata CHANGED
@@ -1,14 +1,13 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: json-socket
3
3
  version: !ruby/object:Gem::Version
4
- version: 1.0.4
4
+ version: 2.0.1
5
5
  platform: ruby
6
6
  authors:
7
7
  - foi
8
- autorequire:
9
8
  bindir: bin
10
9
  cert_chain: []
11
- date: 2023-02-04 00:00:00.000000000 Z
10
+ date: 2026-05-02 00:00:00.000000000 Z
12
11
  dependencies:
13
12
  - !ruby/object:Gem::Dependency
14
13
  name: oj
@@ -24,6 +23,20 @@ dependencies:
24
23
  - - ">="
25
24
  - !ruby/object:Gem::Version
26
25
  version: '0'
26
+ - !ruby/object:Gem::Dependency
27
+ name: async-io
28
+ requirement: !ruby/object:Gem::Requirement
29
+ requirements:
30
+ - - ">="
31
+ - !ruby/object:Gem::Version
32
+ version: '0'
33
+ type: :runtime
34
+ prerelease: false
35
+ version_requirements: !ruby/object:Gem::Requirement
36
+ requirements:
37
+ - - ">="
38
+ - !ruby/object:Gem::Version
39
+ version: '0'
27
40
  - !ruby/object:Gem::Dependency
28
41
  name: rspec
29
42
  requirement: !ruby/object:Gem::Requirement
@@ -38,8 +51,8 @@ dependencies:
38
51
  - - ">="
39
52
  - !ruby/object:Gem::Version
40
53
  version: '0'
41
- description: JSON-socket client & server implementation. Inspired by and compatible
42
- with sebastianseilund/node-json-socket
54
+ description: JSON-socket client & server implementation based on async-io. Inspired
55
+ by and compatible with sebastianseilund/node-json-socket
43
56
  email: foi@live.ru
44
57
  executables: []
45
58
  extensions: []
@@ -50,23 +63,21 @@ homepage: https://github.com/foi/ruby-json-socket
50
63
  licenses:
51
64
  - MIT
52
65
  metadata: {}
53
- post_install_message:
54
66
  rdoc_options: []
55
67
  require_paths:
56
68
  - lib
57
69
  required_ruby_version: !ruby/object:Gem::Requirement
58
70
  requirements:
59
- - - ">="
71
+ - - "~>"
60
72
  - !ruby/object:Gem::Version
61
- version: '0'
73
+ version: '3.0'
62
74
  required_rubygems_version: !ruby/object:Gem::Requirement
63
75
  requirements:
64
76
  - - ">="
65
77
  - !ruby/object:Gem::Version
66
78
  version: '0'
67
79
  requirements: []
68
- rubygems_version: 3.4.1
69
- signing_key:
80
+ rubygems_version: 3.6.9
70
81
  specification_version: 4
71
82
  summary: json-socket protocol implementation
72
83
  test_files: []