async-container-supervisor 0.2.0 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3a0bc9194df4540151c6eefcb4cee4c7e3409ef0987cd9c531854735e55aa8a4
-  data.tar.gz: 71250f5046b37fb5be64e2230f6f17a4a17ed73a427e695e1e16838240c776d1
+  metadata.gz: bd9f2199288f8fec5b35a5e03b198dbb7cd6b24d2b8fd3d88e3aac544010e67c
+  data.tar.gz: ac3ea3b40125f70b84913050f539b17459ed7479266ba9f6a93896ec16602d88
 SHA512:
-  metadata.gz: 5e6f93605da53a940279f004d9132fc30c5de7c2517806f34c9fd3a4d4ffde964414a317d99f7828d72f4100891e807a8eef49f9c8bc45b76e2d130c8d820e67
-  data.tar.gz: 7886788dd3cc56ac89f37e68657136ccf6ac608c0f74d48c6da73166c618a41d4608c650a9190c153b53f061803a3f81cd185c76ec10ff979cfebb89b03974ee
+  metadata.gz: 351d36fac69f88fd879e10d48c18af0f2d5b34e4646e8cffda29a431944a1f0cae9e95ab8963238bc4831516edf831cdafaf8a28cb288ac5d730a1664dfb9793
+  data.tar.gz: 26256ef607c7f227122a60d15477250f2a42f11bc6c9d76ad75d17aa8496a201ada0085f505d28b8ac8e25d7a4f9a0e96a2f4ea96226b6538f37a8f81907ef0f

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

@@ -58,7 +58,7 @@ module Async
 							Console.error(self, "Connection failed:", exception: error)
 							sleep(rand)
 						ensure
-							connection.close
+							connection&.close
 						end
 					end
 				end

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

@@ -93,12 +93,34 @@ module Async
 						call = self.new(connection, id, message)
 						
 						connection.calls[id] = call
-						connection.write(id: id, **message)
-						
-						if block_given?
-							call.each(&block)
-						else
-							return call.pop
+						begin
+							connection.write(id: id, **message)
+							
+							if block_given?
+								call.each(&block)
+							else
+								intermediate = nil
+								
+								while response = call.pop
+									if response.delete(:finished)
+										if intermediate
+											if response.any?
+												intermediate << response
+											end
+											
+											return intermediate
+										else
+											return response
+										end
+									else
+										# Buffer intermediate responses:
+										intermediate ||= []
+										intermediate << response
+									end
+								end
+							end
+						ensure
+							connection.calls.delete(id)
 						end
 					end
 				end
@@ -156,7 +178,7 @@ module Async
 				
 				def run(target)
 					self.each do |message|
-						if id = message[:id]
+						if id = message.delete(:id)
 							if call = @calls[id]
 								# Response to a call:
 								call.push(**message)

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

@@ -5,6 +5,8 @@
 
 require "async/service/environment"
 
+require_relative "service"
+
 module Async
 	module Container
 		module Supervisor

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

@@ -43,9 +43,7 @@ module Async
 				end
 				
 				def status(call)
-					@processes.each do
-						call.push(memory_monitor: @cluster)
-					end
+					call.push(memory_monitor: @cluster)
 				end
 				
 				def run

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

@@ -0,0 +1,30 @@
+# frozen_string_literal: true
+
+# Released under the MIT License.
+# Copyright, 2025, by Samuel Williams.
+
+require "async/service/environment"
+
+module Async
+	module Container
+		module Supervisor
+			module Supervised
+				# The IPC path to use for communication with the supervisor.
+				# @returns [String]
+				def supervisor_ipc_path
+					::File.expand_path("supervisor.ipc", root)
+				end
+				
+				# The endpoint the supervisor will bind to.
+				# @returns [::IO::Endpoint::Generic]
+				def supervisor_endpoint
+					::IO::Endpoint.unix(supervisor_ipc_path)
+				end
+				
+				def make_supervised_worker(instance)
+					Worker.new(instance, endpoint: supervisor_endpoint)
+				end
+			end
+		end
+	end
+end

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

@@ -6,7 +6,7 @@
 module Async
 	module Container
 		module Supervisor
-			VERSION = "0.2.0"
+			VERSION = "0.4.0"
 		end
 	end
 end

data/lib/async/container/supervisor.rb

@@ -12,4 +12,4 @@ require_relative "supervisor/client"
 require_relative "supervisor/memory_monitor"
 
 require_relative "supervisor/environment"
-require_relative "supervisor/service"
+require_relative "supervisor/supervised"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: async-container-supervisor
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.4.0
 platform: ruby
 authors:
 - Samuel Williams
@@ -107,6 +107,7 @@ files:
 - lib/async/container/supervisor/memory_monitor.rb
 - lib/async/container/supervisor/server.rb
 - lib/async/container/supervisor/service.rb
+- lib/async/container/supervisor/supervised.rb
 - lib/async/container/supervisor/version.rb
 - lib/async/container/supervisor/worker.rb
 - license.md