async-container-supervisor 0.9.0 → 0.9.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1b9684c9b4ef621c8b92411d251478b9751cc901e251fa1b35c3fca92af18763
-  data.tar.gz: 5e9f9a25b01f4de9c160aa194acd2a3467215d09ccbbdfbac178c2bb1f278e58
+  metadata.gz: 9013912b7ef22165d93ebf5f6958d26be67b99f601a28b3ac6e7208fc4e8db54
+  data.tar.gz: 2de566c74dc9fabad2bc5ccb0f0bf329581860fbb8e27f14944cefecfacef9b2
 SHA512:
-  metadata.gz: 7fa18caa63bb5dff847b3640c63ca5c2109a3003537bf36cf8ac2947d560a8c0dc5d201b79e98c789e991db415fb2b07aa2c8a9cf94f556f2d932d68d4044dd4
-  data.tar.gz: 235f540925cc1ea12f1f2ef89df5cfacca213e56c4a0b39514f610a92e93e7de995e087842eb827936daa954802631ced0f5ca89ae22f7441c69763f10d7bc6b
+  metadata.gz: bde00386e4f3faa439e149b872bb22075725f05235769a1b5084760f059e0e1aed7a669dec9232125aa5053b1afdf09a016c444a16918c4da92210169e9e50b0
+  data.tar.gz: 844be24d31216db2cdfb978aaf888d15be0982e3211c384e7239bd564ef08880d5d870d887084319232ce6760594b37974623c11c5686c433c92ae3de960e67d

data/bake/async/container/supervisor.rb

@@ -44,7 +44,13 @@ def memory_sample(duration: 10, connection_id:)
 		operation = {do: :memory_sample, duration: duration}
 		
 		# Use the forward operation to proxy the request to a worker:
-		return connection.call(do: :forward, operation: operation, connection_id: connection_id)
+		response = connection.call(do: :forward, operation: operation, connection_id: connection_id)
+		
+		if response && response.key?(:data)
+			JSON.parse(response[:data], symbolize_names: true)
+		else
+			response
+		end
 	end
 end
 

data/lib/async/container/supervisor/client.rb

@@ -48,11 +48,11 @@ module Async
 				
 				# Run the client in a loop, reconnecting if necessary.
 				def run
-					Async(annotation: "Supervisor Client", transient: true) do
+					Async(annotation: "Supervisor Client", transient: true) do |task|
 						loop do
 							connection = connect!
 							
-							Async do
+							connected_task = task.async do
 								connected!(connection)
 							end
 							
@@ -61,6 +61,10 @@ module Async
 							Console.error(self, "Connection failed:", exception: error)
 							sleep(rand)
 						ensure
+							# Ensure any tasks that were created during connection are stopped:
+							connected_task&.stop
+							
+							# Close the connection itself:
 							connection&.close
 						end
 					end

data/lib/async/container/supervisor/connection.rb

@@ -147,10 +147,13 @@ module Async
 					def self.dispatch(connection, target, id, message)
 						Async do
 							call = self.new(connection, id, message)
+							# Track the call in the connection's calls hash:
 							connection.calls[id] = call
 							
+							# Dispatch the call to the target (synchronously):
 							target.dispatch(call)
 							
+							# Stream responses back to the connection (asynchronously):
 							while response = call.pop
 								connection.write(id: id, **response)
 							end
@@ -160,6 +163,9 @@ module Async
 							
 							# If the queue is closed, we don't need to send a finished message:
 							unless call.closed?
+								# Ensure the call is closed, to prevent messages being buffered:
+								call.close
+								
 								# If the above write failed, this is likely to fail too, and we can safely ignore it.
 								connection.write(id: id, finished: true) rescue nil
 							end
@@ -207,7 +213,11 @@ module Async
 								end
 							end
 						ensure
+							# Ensure the call is removed from the connection's calls hash, otherwise it will leak:
 							connection.calls.delete(id)
+							
+							# Ensure the call is closed, so that `Call#pop` will return `nil`.
+							call.close
 						end
 					end
 				end
@@ -243,8 +253,9 @@ module Async
 				#
 				# @parameter message [Hash] The message to write.
 				def write(**message)
-					@stream.write(JSON.dump(message) << "\n")
-					@stream.flush
+					raise IOError, "Connection is closed!" unless @stream
+					@stream&.write(JSON.dump(message) << "\n")
+					@stream&.flush # it is possible for @stream to become nil after the write call
 				end
 				
 				# Read a message from the connection stream.
@@ -276,16 +287,19 @@ module Async
 				#
 				# @parameter target [Dispatchable] The target to dispatch calls to.
 				def run(target)
+					# Process incoming messages from the connection:
 					self.each do |message|
+						# If the message has an ID, it is a response to a call:
 						if id = message.delete(:id)
+							# Find the call in the connection's calls hash:
 							if call = @calls[id]
-								# Response to a call:
+								# Enqueue the response for the call:
 								call.push(**message)
 							elsif message.key?(:do)
-								# Incoming call:
+								# Otherwise, if we couldn't find an existing call, it must be a new call:
 								Call.dispatch(self, target, id, message)
 							else
-								# Likely a response to a timed-out call, ignore it:
+								# Finally, if none of the above, it is likely a response to a timed-out call, so ignore it:
 								Console.debug(self, "Ignoring message:", message)
 							end
 						else

data/lib/async/container/supervisor/version.rb

@@ -9,7 +9,7 @@ module Async
 	module Container
 		# @namespace
 		module Supervisor
-			VERSION = "0.9.0"
+			VERSION = "0.9.2"
 		end
 	end
 end

data/lib/async/container/supervisor/worker.rb

@@ -117,7 +117,7 @@ module Async
 					report = sampler.report
 					
 					dump(call) do |file|
-						file.puts(report.to_s)
+						file.puts(report.to_json)
 					end
 				ensure
 					GC.start

data/readme.md

@@ -26,6 +26,10 @@ Please see the [project documentation](https://socketry.github.io/async-containe
 
 Please see the [project releases](https://socketry.github.io/async-container-supervisor/releases/index) for all releases.
 
+### v0.9.1
+
+  - Close `Call` queue if asynchronous call fails during dispatch - further messages will fail with `ClosedQueueError`.
+
 ### v0.9.0
 
   - Better handling of write failures in `Connection::Call.dispatch`, ensuring we don't leak calls.

data/releases.md

@@ -1,5 +1,9 @@
 # Releases
 
+## v0.9.1
+
+  - Close `Call` queue if asynchronous call fails during dispatch - further messages will fail with `ClosedQueueError`.
+
 ## v0.9.0
 
   - Better handling of write failures in `Connection::Call.dispatch`, ensuring we don't leak calls.

data.tar.gz.sig

@@ -1,4 +1,2 @@
-�9��b�l=�<���(Cܝy�뼍���fIl���Q�km1�������	.���jW>�����k����q%I:�;%��� Ot�*�ϻ�wW3I�m��Z�!�_����<u��~������}[��y�ۤG(�a'��+k�H:˒���%�)�l��J����ؠS
-H��-�*C��R6g&�K�k��mL�7���(
-'�U\�v�=B�;��Iv~b�6�~x��Wˋ&�����b�ke��y*6����D�0>�ת@k�22dR4bL����QZ�p,�TƸ	��U&�.���2v�X�02���?1��ヌ_Dv:D��X̄S�h�
-����|ܺ�H�R��:�[-��"x��v}^7�lgo
+)X��&!�$l@	�v���8��a�u6<QF!��[�` �Xm��6�&,'�F���W�,$��i�|��S6
+����2�4��!RT�.S��%,eP�@����G�{�r7g�T˖����e���nc�#_�N�[\�Y#�-	��I0��l��5�����B�NdO;9��_�����/�$����oF!M>�=F^L��ľ$7��V��w�'e�T�B�����*bl�Z��^��:Td���-7N������+,7i�4[M��.]���O|���2slA��u�����yK�3�O���U ��������sG+�$Bf��=j)MAM]�66���O�OAK�by�h;j�d�%d
�V�[hs[4�tt}�Zo`A)�.

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: async-container-supervisor
 version: !ruby/object:Gem::Version
-  version: 0.9.0
+  version: 0.9.2
 platform: ruby
 authors:
 - Samuel Williams