tiny_tcp_service 1.2.1 → 1.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 705433100d134e1b65ea922d21ced51f6429570bdc86aeaba322765c6e4d0cf3
-  data.tar.gz: 3ab6c3c0510341c0e3bb26180a6baf0576570c0e96b1f6b12cf0ab4c38357521
+  metadata.gz: 9153074bb46f8f6cbf51c4a864bfb2fa2eabb63232669d708e61502c931324dd
+  data.tar.gz: 401a36c00244ebecad0a6c8ee3cae185860edac655270d4cf4eb70f39392a097
 SHA512:
-  metadata.gz: 35ca44ed886b5d9edca59455d6a88cc8f43904c0a3c139596d5656f47f0d431dcc621f1329d178cea0be775f2caf19f9fe7db5b850edc99ae4d9860a3c5d01b9
-  data.tar.gz: 8b862c075f947a468ce8c42bc6e2fe0de03eb7e37011bed1da0de6bb2af4ece354a6a37ee6aaa09b5af72380b96e56c9093efaffa8d588e471c97cfac8efb209
+  metadata.gz: 77f635cb2880c4578db3c72f0190a47f4939dc1f479fc8583e6f39d3eb84368beb1cf1c1ca2f7d146309cb78b3427084a36e9a4e7ddc8b0e886793a496f5f96c
+  data.tar.gz: b7766536ee659434cdaa7d1055611784837baf6fb90f9f8e7675d8d29a519fe8d3df66dc84c8cf035f2b1645abaff63538fc263af429963448db11cc58b3507c

data/lib/tiny_tcp_service.rb

@@ -6,7 +6,6 @@ require 'socket'
 #    ->(m) { puts m }
 #  )
 #
-#  s.start!     # everything runs in background threads
 #  s.stop!      # gracefully shutdown the server
 #
 # TinyTCPService implements a line-based, call and response protocol, where
@@ -27,52 +26,13 @@ class TinyTCPService
 
     @server = TCPServer.new(port)
     @clients = []
-    @running = false
+    @running = true
 
     @msg_handler = nil
     @error_handlers = {}
-  end
-
-  # h - some object that responds to #call
-  def msg_handler=(h)
-    @msg_handler = h
-  end
-
-  # returns true if the server is running
-  # false otherwise
-  def running?
-    @running
-  end
-
-  # add the error handler and block for the specified class
-  #
-  # you can assume that the local variable name of the error will be `e'
-  def add_error_handler(klass, block)
-    @error_handlers[klass] = block
-  end
-
-  # remove the error handler associated with klass
-  def remove_error_handler(klass)
-    @error_handlers.delete(klass)
-  end
-
-  # returns the number of connected clients
-  def num_clients
-    @clients.length
-  end
-
-  def _remove_client!(c)
-    @clients.delete(c)
-    c.close if c && !c.closed?
-  end
-
-  # starts the server
-  def start!
-    return if running?
-    @running = true
 
     # client accept thread
-    Thread.new do |t|
+    @thread = Thread.new do |t|
       loop do
         break unless running?
         @clients << @server.accept
@@ -90,8 +50,14 @@ class TinyTCPService
         readable, _, errored = IO.select(@clients, nil, @clients, 1)
         readable&.each do |c|
           begin
-            c.puts(@msg_handler&.call(c.gets.chomp))
-          rescue TinyTCPService::BadClient => e
+            m = c.gets&.chomp
+
+            if m.is_a?(String)
+              c.puts(@msg_handler&.call(m))
+            else
+              _remove_client!(c)
+            end
+          rescue TinyTCPService::BadClient, Errno::ECONNRESET => e
             _remove_client!(c)
           rescue => e
             handler = @error_handlers[e.class]
@@ -112,6 +78,44 @@ class TinyTCPService
     end
   end
 
+  # join the service Thread if you want to wait until it's closed
+  def join
+    @thread.join
+  end
+
+  # h - some object that responds to #call
+  def msg_handler=(h)
+    @msg_handler = h
+  end
+
+  # returns true if the server is running
+  # false otherwise
+  def running?
+    @running
+  end
+
+  # add the error handler and block for the specified class
+  #
+  # you can assume that the local variable name of the error will be `e'
+  def add_error_handler(klass, block)
+    @error_handlers[klass] = block
+  end
+
+  # remove the error handler associated with klass
+  def remove_error_handler(klass)
+    @error_handlers.delete(klass)
+  end
+
+  # returns the number of connected clients
+  def num_clients
+    @clients.length
+  end
+
+  def _remove_client!(c)
+    @clients.delete(c)
+    c.close if c && !c.closed?
+  end
+
   # stops the server gracefully
   def stop!
     @running = false

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tiny_tcp_service
 version: !ruby/object:Gem::Version
-  version: 1.2.1
+  version: 1.4.0
 platform: ruby
 authors:
 - Jeff Lunt
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-11-04 00:00:00.000000000 Z
+date: 2023-11-05 00:00:00.000000000 Z
 dependencies: []
 description: a tiny TCP service with automated client lifecycle
 email: jefflunt@gmail.com
@@ -36,7 +36,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.7
+rubygems_version: 3.4.1
 signing_key:
 specification_version: 4
 summary: a tiny TCP service with automated client lifecycle