async-job-adapter-active_job 0.12.1 → 0.14.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5d1cb1e42e12edd769d1cabbd69b95db8332178ec952275e2e587fb8d4679c29
-  data.tar.gz: 4c560b3d759812bcef27293441528077b4dfc4278399519d802d5c097f8ba710
+  metadata.gz: 2dd9f7593bc4e508c98ca5cff8a163fc594872625467667138213a3ab8f2ed78
+  data.tar.gz: 78d52a6b38482a80ee4c227d8f753baa2662d313d6a59e284f35de2e00b84e32
 SHA512:
-  metadata.gz: 486fa0105ecf07506ae2c807e6c1d7f013d2d4bcd11df00c703143a8379cd6abc0a46b8532ef24abe960cd598aeb8ecdd5fb63e397a516bbbca199eb5d016428
-  data.tar.gz: eae87108c3e46b892f086cf39f1359888e3938c8127e9e39f716bf2c05bb89bb6f284844f643a004122845150861467153892c98984d43677393db1964cfdab5
+  metadata.gz: f205bafb6e23f4eed08575db38d96ec18e4f7e9bad444830b03b6e5a33fac62d91749f0e2ab4bf0328a2fa5192ee19bbdcf182c792de83464555871112674e26
+  data.tar.gz: e239ac52ec5e7bfae69347c3dcedd4cb0d6dffae60114bcdad4e3c3528c66a49b1bf2c2e4b940ea447b631abb028192336aab1e81b6806fdb7a3539118b532c8

data/bin/async-job-adapter-active_job-server

@@ -7,13 +7,8 @@ require 'async/service/controller'
 require 'async/job/adapter/active_job/environment'
 
 configuration = Async::Service::Configuration.build do
-	service "async-job-server" do
+	service "async-job-adapter-active_job-server" do
 		include Async::Job::Adapter::ActiveJob::Environment
-		
-		root {ENV.fetch('RAILS_ROOT', Dir.pwd)}
-		
-		# If you have multiple queues, you may want to run a separate server for each queue.
-		queue_name ENV.fetch('ASYNC_JOB_ADAPTER_ACTIVE_JOB_QUEUE_NAME', 'default')
 	end
 end
 

data/lib/active_job/queue_adapters/async_job_adapter.rb

@@ -0,0 +1,26 @@
+# frozen_string_literal: true
+
+# Released under the MIT License.
+# Copyright, 2024, by Samuel Williams.
+
+require 'active_job/queue_adapters/abstract_adapter'
+
+module ActiveJob
+	module QueueAdapters
+		class AsyncJobAdapter < AbstractAdapter
+			def initialize(dispatcher = ::Async::Job::Adapter::ActiveJob::Railtie.dispatcher)
+				@dispatcher = dispatcher
+			end
+			
+			# Enqueue a job for processing.
+			def enqueue(job)
+				@dispatcher.call(job)
+			end
+			
+			# Enqueue a job for processing at a specific time.
+			def enqueue_at(job, timestamp)
+				@dispatcher.call(job)
+			end
+		end
+	end
+end

data/lib/async/job/adapter/active_job/dispatcher.rb

@@ -4,10 +4,8 @@
 # Copyright, 2024, by Samuel Williams.
 
 require_relative 'executor'
-require_relative 'interface'
 
 require 'async/job'
-require 'thread/local'
 require 'async/job/builder'
 
 module Async
@@ -41,18 +39,10 @@ module Async
 						end
 					end
 					
-					# Enqueue a job for processing.
-					def enqueue(job)
+					def call(job)
 						name = @aliases.fetch(job.queue_name, job.queue_name)
 						
-						self[name].client.enqueue(job)
-					end
-					
-					# Enqueue a job for processing at a specific time.
-					def enqueue_at(job, timestamp)
-						name = @aliases.fetch(job.queue_name, job.queue_name)
-						
-						self[name].client.enqueue_at(job, timestamp)
+						self[name].client.call(job.serialize)
 					end
 					
 					# Start processing jobs in the given queue.
@@ -60,17 +50,16 @@ module Async
 						self[name].server.start
 					end
 					
+					def keys
+						@definitions.keys
+					end
+					
 					private def build(definition)
 						builder = Builder.new(Executor::DEFAULT)
 						
 						builder.instance_eval(&definition)
 						
-						builder.build do |client|
-							# Ensure that the client is an interface:
-							unless client.is_a?(Interface)
-								Interface.new(client)
-							end
-						end
+						return builder.build
 					end
 				end
 			end

data/lib/async/job/adapter/active_job/environment.rb

@@ -16,9 +16,21 @@ module Async
 						Service
 					end
 					
+					def root
+						ENV.fetch('RAILS_ROOT', Dir.pwd)
+					end
+					
+					def dispatcher
+						Railtie.dispatcher
+					end
+					
 					# The name of the queue to use.
-					def queue_name
-						"default"
+					def queue_names
+						if queue_names = ENV['ASYNC_JOB_ADAPTER_ACTIVE_JOB_QUEUE_NAMES']
+							queue_names.split(',')
+						else
+							dispatcher.keys
+						end
 					end
 				end
 			end

data/lib/async/job/adapter/active_job/executor.rb

@@ -5,6 +5,12 @@
 
 require 'json'
 
+require 'console'
+require 'console/event/failure'
+
+require 'active_job'
+require 'active_job/base'
+
 module Async
 	module Job
 		module Adapter
@@ -15,15 +21,26 @@ module Async
 						@delegate = delegate
 					end
 					
+					def execute(job_data)
+						::ActiveJob::Callbacks.run_callbacks(:execute) do
+							job = ::ActiveJob::Base.deserialize(job_data)
+							
+							begin
+								job.perform_now
+							rescue => error
+								# Ignore, as ActiveJob has already logged the error.
+							end
+						end
+					end
+					
 					# Execute the given job.
 					def call(job)
-						Console.debug(self, "Executing job...", job: job)
 						begin
-							::ActiveJob::Base.execute(job)
+							execute(job)
 						rescue => error
 							# Error handling is done by the job itself.
 							# Ignore the error here, as ActiveJob has already logged unhandled errors.
-							# Console::Event::Failure.for(error).emit(self, "Failed to execute job!", job: job)
+							Console::Event::Failure.for(error).emit(self, "Failed to execute job!", job: job)
 						end
 						
 						@delegate&.call(job)

data/lib/async/job/adapter/active_job/railtie.rb

@@ -6,11 +6,7 @@
 require 'async/job'
 require 'async/job/processor/inline'
 
-require 'thread/local'
-
-require_relative 'dispatcher'
-
-Thread.attr_accessor :async_job_adapter_active_job_dispatcher
+require_relative 'thread_local_dispatcher'
 
 module Async
 	module Job
@@ -26,6 +22,8 @@ module Async
 					def initialize
 						@definitions = {"default" => DEFAULT_QUEUE_DEFINITION}
 						@aliases = {}
+						
+						@dispatcher = ThreadLocalDispatcher.new(@definitions, @aliases)
 					end
 					
 					# The queues that are available for processing jobs.
@@ -34,6 +32,9 @@ module Async
 					# The aliases for the definitions, if any.
 					attr :aliases
 					
+					# Thed default dispatcher for processing jobs.
+					attr :dispatcher
+					
 					# Define a new backend for processing jobs.
 					# @parameter name [String] The name of the backend.
 					# @parameter aliases [Array(String)] The aliases for the backend.
@@ -57,45 +58,12 @@ module Async
 						end
 					end
 					
-					# Used for dispatching jobs to a thread-local queue to avoid thread-safety issues.
-					class ThreadLocalDispatcher
-						def initialize(definitions, aliases)
-							@definitions = definitions
-							@aliases = aliases
-						end
-						
-						# The dispatcher for the current thread.
-						def dispatcher
-							Thread.current.async_job_adapter_active_job_dispatcher ||= Dispatcher.new(@definitions, @aliases)
-						end
-						
-						# Enqueue a job to be processed at a specific time.
-						def enqueue_at(job, timestamp)
-							dispatcher.enqueue_at(job, timestamp)
-						end
-						
-						# Enqueue a job to be processed as soon as possible.
-						def enqueue(job)
-							dispatcher.enqueue(job)
-						end
-						
-						# Start processing jobs in the queue with the given name.
-						# @parameter name [String] The name of the queue.
-						def start(name)
-							dispatcher.start(name)
-						end
-					end
-					
 					# Start the job server with the given name.
 					def start(name = "default")
-						config.active_job.queue_adapter.start(name)
+						@dispatcher.start(name)
 					end
 					
-					DEFAULT_DISPATCHER = ThreadLocalDispatcher.new(self.definitions, self.aliases)
-					
 					config.async_job = self
-					
-					config.active_job.queue_adapter = DEFAULT_DISPATCHER
 				end
 			end
 		end

data/lib/async/job/adapter/active_job/service.rb

@@ -4,6 +4,8 @@
 # Copyright, 2024, by Samuel Williams.
 
 require 'async/service/generic'
+require 'console/event/failure'
+require 'async/barrier'
 
 module Async
 	module Job
@@ -15,12 +17,29 @@ module Async
 					def setup(container)
 						container.run(name: self.name, restart: true) do |instance|
 							evaluator = @environment.evaluator
+							
 							require File.expand_path('config/environment', evaluator.root)
 							
+							dispatcher = evaluator.dispatcher
+							
 							instance.ready!
 							
-							Sync do
-								Railtie.start(evaluator.queue_name)
+							Sync do |task|
+								barrier = Async::Barrier.new
+								
+								# Start all the named queues:
+								evaluator.queue_names.each do |queue_name|
+									barrier.async do
+										Console.debug(self, "Starting queue...", queue_name: queue_name)
+										dispatcher.start(queue_name)
+									rescue => error
+										Console::Event::Failure.for(error).emit(self, "Queue failed!")
+									end
+								end
+								
+								barrier.wait
+							ensure
+								barrier.stop
 							end
 						end
 					end

data/lib/async/job/adapter/active_job/thread_local_dispatcher.rb

@@ -0,0 +1,56 @@
+# frozen_string_literal: true
+
+# Released under the MIT License.
+# Copyright, 2024, by Samuel Williams.
+
+require_relative 'dispatcher'
+
+Thread.attr_accessor :async_job_adapter_active_job_dispatcher
+
+module Async
+	module Job
+		module Adapter
+			module ActiveJob
+				# Used for dispatching jobs to a thread-local queue to avoid thread-safety issues.
+				class ThreadLocalDispatcher
+					def initialize(definitions, aliases)
+						@definitions = definitions
+						@aliases = aliases
+					end
+					
+					# @attribute [Hash(String, Proc)] The definitions to use for creating queues.
+					attr :definitions
+					
+					# @attribute [Hash(String, String)] The aliases for the job queues.
+					attr :aliases
+					
+					# The dispatcher for the current thread.
+					#
+					# As a dispatcher contains state, it is important to ensure that each thread has its own dispatcher.
+					def dispatcher
+						Thread.current.async_job_adapter_active_job_dispatcher ||= Dispatcher.new(@definitions, @aliases)
+					end
+					
+					def [](name)
+						dispatcher[name]
+					end
+					
+					def call(job)
+						dispatcher.call(job)
+					end
+					
+					# Start processing jobs in the queue with the given name.
+					# @parameter name [String] The name of the queue.
+					def start(name)
+						dispatcher.start(name)
+					end
+					
+					# The names of all the queues that are available for processing jobs.
+					def keys
+						@definitions.keys
+					end
+				end
+			end
+		end
+	end
+end

data/lib/async/job/adapter/active_job/version.rb

@@ -7,7 +7,7 @@ module Async
 	module Job
 		module Adapter
 			module ActiveJob
-				VERSION = "0.12.1"
+				VERSION = "0.14.0"
 			end
 		end
 	end

data/lib/async/job/adapter/active_job.rb

@@ -3,7 +3,10 @@
 # Released under the MIT License.
 # Copyright, 2024, by Samuel Williams.
 
-require_relative 'active_job/version'
-require_relative 'active_job/interface'
-require_relative 'active_job/executor'
-require_relative "active_job/railtie" if defined?(Rails::Railtie)
+require_relative "active_job/version"
+require_relative "active_job/executor"
+
+if defined?(Rails::Railtie)
+	require_relative "active_job/railtie"
+	require "active_job/queue_adapters/async_job_adapter"
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: async-job-adapter-active_job
 version: !ruby/object:Gem::Version
-  version: 0.12.1
+  version: 0.14.0
 platform: ruby
 authors:
 - Samuel Williams
@@ -37,7 +37,7 @@ cert_chain:
   Q2K9NVun/S785AP05vKkXZEFYxqG6EW012U4oLcFl5MySFajYXRYbuUpH6AY+HP8
   voD0MPg1DssDLKwXyt1eKD/+Fq0bFWhwVM/1XiAXL7lyYUyOq24KHgQ2Csg=
   -----END CERTIFICATE-----
-date: 2024-08-09 00:00:00.000000000 Z
+date: 2024-08-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: async-job
@@ -67,20 +67,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.12'
-- !ruby/object:Gem::Dependency
-  name: thread-local
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 description:
 email:
 executables:
@@ -89,13 +75,14 @@ extensions: []
 extra_rdoc_files: []
 files:
 - bin/async-job-adapter-active_job-server
+- lib/active_job/queue_adapters/async_job_adapter.rb
 - lib/async/job/adapter/active_job.rb
 - lib/async/job/adapter/active_job/dispatcher.rb
 - lib/async/job/adapter/active_job/environment.rb
 - lib/async/job/adapter/active_job/executor.rb
-- lib/async/job/adapter/active_job/interface.rb
 - lib/async/job/adapter/active_job/railtie.rb
 - lib/async/job/adapter/active_job/service.rb
+- lib/async/job/adapter/active_job/thread_local_dispatcher.rb
 - lib/async/job/adapter/active_job/version.rb
 - license.md
 - readme.md

data/lib/async/job/adapter/active_job/interface.rb

@@ -1,38 +0,0 @@
-# frozen_string_literal: true
-
-# Released under the MIT License.
-# Copyright, 2024, by Samuel Williams.
-
-module Async
-	module Job
-		module Adapter
-			module ActiveJob
-				# An interface for `ActiveJob` that allows you to use `Async::Job` as the queue.
-				class Interface
-					def initialize(delegate)
-						@delegate = delegate
-					end
-					
-					# Enqueue a job for processing.
-					def enqueue(job)
-						Console.debug(self, "Enqueueing job...", id: job.job_id)
-						@delegate.call(serialize(job))
-					end
-					
-					# Enqueue a job for processing at a specific time.
-					def enqueue_at(job, timestamp)
-						# We assume the given timestamp is the same as `job.scheduled_at` which is true in every case we've seen so far.
-						Console.debug(self, "Scheduling job...", id: job.job_id, scheduled_at: job.scheduled_at)
-						@delegate.call(serialize(job))
-					end
-					
-					protected
-					
-					def serialize(job)
-						job.serialize
-					end
-				end
-			end
-		end
-	end
-end