Rename async-services-supervisor.

Author: samuel-williams-shopify

async-container-supervisor.gemspec async-services-supervisor.gemspecasync-container-supervisor.gemspec renamed to async-services-supervisor.gemspec

@@ -1,10 +1,10 @@
 # frozen_string_literal: true
 
-require_relative "lib/async/container/supervisor/version"
+require_relative "lib/async/services/supervisor/version"
 
 Gem::Specification.new do |spec|
-	spec.name = "async-container-supervisor"
-	spec.version = Async::Container::Supervisor::VERSION
+	spec.name = "async-services-supervisor"
+	spec.version = Async::Services::Supervisor::VERSION
 
 	spec.summary = "A supervisor for managing multiple container processes."
 	spec.authors = ["Samuel Williams"]
@@ -13,18 +13,19 @@ Gem::Specification.new do |spec|
 	spec.cert_chain  = ["release.cert"]
 	spec.signing_key = File.expand_path("~/.gem/release.pem")
 
-	spec.homepage = "https://github.com/socketry/async-container-supervisor"
+	spec.homepage = "https://github.com/socketry/async-services-supervisor"
 
 	spec.metadata = {
-		"documentation_uri" => "https://socketry.github.io/async-container-supervisor/",
-		"source_code_uri" => "https://github.com/socketry/async-container-supervisor.git",
+		"documentation_uri" => "https://socketry.github.io/async-services-supervisor/",
+		"source_code_uri" => "https://github.com/socketry/async-services-supervisor.git",
 	}
 
 	spec.files = Dir.glob(["{bake,context,lib}/**/*", "*.md"], File::FNM_DOTMATCH, base: __dir__)
 
 	spec.required_ruby_version = ">= 3.2"
 
-	spec.add_dependency "async-service"
+	spec.add_dependency "async-bus"
+	spec.add_dependency "async-service", "~> 0.15"
 	spec.add_dependency "io-endpoint"
 	spec.add_dependency "memory", "~> 0.7"
 	spec.add_dependency "memory-leak", "~> 0.5"

bake/async/container/supervisor.rb bake/async/services/supervisor.rbbake/async/container/supervisor.rb renamed to bake/async/services/supervisor.rb

@@ -6,26 +6,29 @@
 def initialize(...)
 	super
 
-	require "async/container/supervisor"
+	require "async/services/supervisor"
 end
 
 # Restart the container, typically causing it to exit (the parent process should then restart it).
 def restart
 	client do |connection|
-		connection.call(do: :restart)
+		supervisor = connection[:supervisor]
+		supervisor.restart
 	end
 end
 
 # Reload the services gracefully, allowing them to reconfigure without dropping connections.
 def reload
 	client do |connection|
-		connection.call(do: :restart, signal: :HUP)
+		supervisor = connection[:supervisor]
+		supervisor.restart(signal: :HUP)
 	end
 end
 
 def status
 	client do |connection|
-		connection.call(do: :status)
+		supervisor = connection[:supervisor]
+		supervisor.status
 	end
 end
 
@@ -35,27 +38,25 @@ def status
 # that are retained after garbage collection.
 #
 # @parameter duration [Integer] The duration in seconds to sample for (default: 10).
-# @parameter connection_id [String] The connection ID to target a specific worker.
+# @parameter connection_id [Integer] The connection ID to target a specific worker.
 def memory_sample(duration: 10, connection_id:)
 	client do |connection|
 		Console.info(self, "Sampling memory from worker...", duration: duration, connection_id: connection_id)
 
-		# Build the operation request:
-		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)
+		supervisor = connection[:supervisor]
+		worker = supervisor[connection_id]
+		return worker.memory_sample(duration: duration)
 	end
 end
 
 private
 
 def endpoint
-	Async::Container::Supervisor.endpoint
+	Async::Services::Supervisor.endpoint
 end
 
 def client(&block)
 	Sync do
-		Async::Container::Supervisor::Client.new(endpoint: self.endpoint).connect(&block)
+		Async::Services::Supervisor::Client.new(endpoint: self.endpoint).connect(&block)
 	end
 end

…/async/container/supervisor/a_monitor.rb …s/async/services/supervisor/a_monitor.rbfixtures/async/container/supervisor/a_monitor.rb renamed to fixtures/async/services/supervisor/a_monitor.rb fixtures/async/container/supervisor/a_monitor.rb renamed to fixtures/async/services/supervisor/a_monitor.rb

@@ -3,10 +3,10 @@
 # Released under the MIT License.
 # Copyright, 2025, by Samuel Williams.
 
-require "async/container/supervisor/a_server"
+require "async/services/supervisor/a_server"
 
 module Async
-	module Container
+	module Services
 		module Supervisor
 			AMonitor = Sus::Shared("a monitor") do
 				include_context AServer
@@ -15,35 +15,38 @@ module Supervisor
 
 				it "can add and remove connections" do
 					worker = Worker.new(endpoint: endpoint)
-					connection = worker.connect
+					worker_task = worker.run
 
 					event = registration_monitor.pop
 					expect(event).to have_attributes(
 						type: be == :register,
 					)
+					expect(event.supervisor_controller).to be_a(Async::Services::Supervisor::SupervisorController)
 
-					connection.close
+					worker_task.stop
 
 					event = registration_monitor.pop
 					expect(event).to have_attributes(
 						type: be == :remove,
 					)
 				ensure
-					connection&.close
+					worker_task&.stop
 				end
 
 				it "can respond to status calls" do
-					worker = Worker.new(endpoint: endpoint)
-					connection = worker.connect
-					
-					response = connection.call(do: :status)
+					client = Client.new(endpoint: endpoint)
 
-					# Maybe we could be a bit more specific.
-					expect(response).to be_a(Array)
-				ensure
-					connection&.close
+					client.connect do |connection|
+						supervisor = connection[:supervisor]
+						response = supervisor.status
+						
+						# Status should return an array of monitor statuses
+						expect(response).to be_a(Array)
+					end
 				end
 			end
 		end
 	end
 end
+
+

…s/async/container/supervisor/a_server.rb …es/async/services/supervisor/a_server.rbfixtures/async/container/supervisor/a_server.rb renamed to fixtures/async/services/supervisor/a_server.rb fixtures/async/container/supervisor/a_server.rb renamed to fixtures/async/services/supervisor/a_server.rb

@@ -4,16 +4,16 @@
 # Copyright, 2025, by Samuel Williams.
 
 require "sus/fixtures/async/scheduler_context"
-require "async/container/supervisor"
+require "async/services/supervisor"
 
 require "io/endpoint/bound_endpoint"
 require "tmpdir"
 
 module Async
-	module Container
+	module Services
 		module Supervisor
 			class RegistrationMonitor
-				Event = Struct.new(:type, :connection)
+				Event = Struct.new(:type, :supervisor_controller)
 
 				def initialize
 					@registrations = ::Thread::Queue.new
@@ -24,28 +24,28 @@ def initialize
 				def run
 				end
 
-				def status(call)
-					call.push(registrations: @registrations.size)
+				def status
+					{registrations: @registrations.size}
 				end
 
 				def pop(...)
 					@registrations.pop(...)
 				end
 
-				def register(connection)
-					@registrations << Event.new(:register, connection)
+				def register(supervisor_controller)
+					@registrations << Event.new(:register, supervisor_controller)
 				end
 
-				def remove(connection)
-					@registrations << Event.new(:remove, connection)
+				def remove(supervisor_controller)
+					@registrations << Event.new(:remove, supervisor_controller)
 				end
 			end
 
 			AServer = Sus::Shared("a server") do
 				include Sus::Fixtures::Async::SchedulerContext
 
 				let(:ipc_path) {File.join(@root, "supervisor.ipc")}
-				let(:endpoint) {Async::Container::Supervisor.endpoint(ipc_path)}
+				let(:endpoint) {Async::Services::Supervisor.endpoint(ipc_path)}
 
 				def around
 					Dir.mktmpdir do |directory|
@@ -56,7 +56,7 @@ def around
 
 				let(:registration_monitor) {RegistrationMonitor.new}
 				let(:monitors) {[registration_monitor]}
-				let(:server) {Async::Container::Supervisor::Server.new(endpoint: @bound_endpoint, monitors: monitors)}
+				let(:server) {Async::Services::Supervisor::Server.new(endpoint: @bound_endpoint, monitors: monitors)}
 
 				def restart_supervisor
 					@server_task&.stop
@@ -82,3 +82,4 @@ def restart_supervisor
 		end
 	end
 end
+