async-job 0.0.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2fa7b9ed6bf57940243caa6fae0e8d72a9e5c6eaf38f13311b800abb80850c09
-  data.tar.gz: 9dce5abfa5b06e6e00592e6ca474241ab92806d65b70c94aab0d0763e5196a19
+  metadata.gz: 9a816771aa488ab674c70776181481a1de707a9e6eb4c8520325b62049015a89
+  data.tar.gz: d15d2f5f2276d96da9c91a7badf33b6bb86b9159de1839b25b8b77fc666166af
 SHA512:
-  metadata.gz: 79557b886d6fadc8ae47644c36916c556091f4eac1c78f5d4b3271163a00fa08d5e68931d867fe7ea1871f6257cbd9b00fd413561ecd6a3a244e101a2d2685bf
-  data.tar.gz: 0cbce58e990cff1881f29c4c91f7db93aae228d44d85ecde799b22d88ab5824df5dbabd5c11045dddba01c37d0b644914169adc8c6ed86b38fa7b353492763a7
+  metadata.gz: 0d47ff44888af2ce4ca369e2d1644e4d99f0dd179ca73f1f50d2362154087560031d11490f5b3887f4f1303e8eaaf4d597d8de66804b3b5f38d19d1a4ab29b03
+  data.tar.gz: e8f8c0a81b6980aacc5f46a5fa53de95d74ffe190af12a06542b14599d32331e941d39b44d60b80a00eff88fbb78605303dd58dc73be0b98ec42351becc49365

data/lib/async/job/backend/redis/delayed_queue.rb

@@ -19,6 +19,7 @@ module Async
 						if #jobs > 0 then
 							redis.call('LPUSH', KEYS[2], unpack(jobs))
 						end
+						return #jobs
 					LUA
 					
 					def initialize(client, key)
@@ -30,9 +31,16 @@ module Async
 					end
 					
 					def start(ready_queue, resolution: 10, parent: Async::Task.current)
+						Console.info(self, "Starting delayed queue...")
 						parent.async do
 							while true
-								move(destination: ready_queue.key)
+								Console.debug(self, "Checking for delayed jobs...")
+								count = move(destination: ready_queue.key)
+								
+								if count > 0
+									Console.info(self, "Moved #{count} delayed jobs to ready queue.")
+								end
+								
 								sleep(resolution)
 							end
 						end
@@ -40,8 +48,12 @@ module Async
 					
 					attr :key
 					
-					def add(job, job_store)
-						@client.evalsha(@add, 2, job_store.key, @key, job.id, job.serialize, job.perform_at.to_f)
+					def add(job, timestamp, job_store)
+						id = SecureRandom.uuid
+						
+						@client.evalsha(@add, 2, job_store.key, @key, id, job, timestamp.to_f)
+						
+						return id
 					end
 					
 					def move(destination:, now: Time.now.to_i)

data/lib/async/job/backend/redis/processing_queue.rb

@@ -69,10 +69,7 @@ module Async
 					attr :key
 					
 					def fetch
-						Console.info(self, "Fetching job...")
-						id = @client.brpoplpush(@ready_queue.key, @pending_key, 0)
-						Console.info(self, "Fetching job: #{id}")
-						return id
+						@client.brpoplpush(@ready_queue.key, @pending_key, 0)
 					end
 					
 					def complete(id)
@@ -87,9 +84,10 @@ module Async
 					
 					def start(delay: 5, factor: 2, parent: Async::Task.current)
 						heartbeat_key = "#{@key}:#{@id}"
-						
 						start_time = Time.now.to_f
 						
+						Console.info(self, "Starting processing queue...", key: @key, id: @id, heartbeat_key: heartbeat_key, delay: delay, factor: factor)
+						
 						parent.async do
 							while true
 								uptime = (Time.now.to_f - start_time).round(2)

data/lib/async/job/backend/redis/ready_queue.rb

@@ -23,7 +23,11 @@ module Async
 					attr :key
 					
 					def add(job, job_store)
-						@client.evalsha(@add, 2, job_store.key, @key, job.id, job.serialize)
+						id = SecureRandom.uuid
+						
+						@client.evalsha(@add, 2, job_store.key, @key, id, job)
+						
+						return id
 					end
 				end
 			end

data/lib/async/job/backend/redis/server.rb

@@ -29,6 +29,7 @@ module Async
 					end
 					
 					def start
+						Console.info(self, "Starting server...")
 						# Start the delayed queue, which will move jobs to the ready queue when they are ready:
 						@delayed_queue.start(@ready_queue)
 						
@@ -37,25 +38,28 @@ module Async
 					end
 					
 					def enqueue(job)
-						if perform_at = job.perform_at and perform_at > Time.now.to_f
-							# If the job is delayed, add it to the delayed queue:
-							@delayed_queue.add(job, @job_store)
-						else
-							# If the job is ready to be processed now, add it to the ready queue:
-							@ready_queue.add(job, @job_store)
+						@ready_queue.add(job, @job_store)
+					end
+					
+					def schedule(job, timestamp)
+						@delayed_queue.add(job, timestamp, @job_store)
+					end
+					
+					def process(&block)
+						id = @processing_queue.fetch
+						begin
+							job = @job_store.get(id)
+							yield id, job
+							@processing_queue.complete(id)
+						rescue => error
+							@processing_queue.retry(id)
+							raise
 						end
 					end
 					
 					def each(&block)
-						while id = @processing_queue.fetch
-							begin
-								job = @job_store.get(id)
-								yield id, job
-								@processing_queue.complete(id)
-							rescue => error
-								@processing_queue.retry(id)
-								raise
-							end
+						while true
+							process(&block)
 						end
 					end
 				end

data/lib/async/job/backend/redis.rb

@@ -0,0 +1,18 @@
+require_relative 'redis/server'
+
+module Async
+	module Job
+		module Backend
+			module Redis
+				def self.new(**options)
+					endpoint = options.fetch(:endpoint) {Async::Redis.local_endpoint}
+					prefix = options.fetch(:prefix) {"async:job"}
+					
+					client = Async::Redis::Client.new(endpoint)
+					
+					return Async::Job::Backend::Redis::Server.new(client, prefix)
+				end
+			end
+		end
+	end
+end

data/lib/async/job/backend.rb

@@ -0,0 +1,11 @@
+require_relative 'backend/redis'
+
+module Async
+	module Job
+		module Backend
+			def self.new(backend: Async::Job::Backend::Redis, **options)
+				backend.new(**options)
+			end
+		end
+	end
+end

data/lib/async/job/generic.rb

@@ -1,8 +1,14 @@
+# frozen_string_literal: true
+
+# Released under the MIT License.
+# Copyright, 2024, by Samuel Williams.
+
 module Async
 	module Job
 		class Generic
 			def self.enqueue(...)
 				self.new(...).enqueue
+			end
 			
 			def initialize(id, perform_at: nil)
 				@id = id
@@ -22,9 +28,3 @@ module Async
 		end
 	end
 end
-
-
-server.enqueue(job)
-	-> job.serialize
-
-Server.enqueue(job)

data/lib/async/job/version.rb

@@ -5,6 +5,6 @@
 
 module Async
 	module Job
-		VERSION = "0.0.0"
+		VERSION = "0.2.0"
 	end
 end

data/lib/async/job.rb

@@ -4,4 +4,4 @@
 # Copyright, 2024, by Samuel Williams.
 
 require_relative 'job/version'
-require_relative 'job/backend/redis/server'
+require_relative 'job/backend'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: async-job
 version: !ruby/object:Gem::Version
-  version: 0.0.0
+  version: 0.2.0
 platform: ruby
 authors:
 - Samuel Williams
@@ -37,7 +37,7 @@ cert_chain:
   Q2K9NVun/S785AP05vKkXZEFYxqG6EW012U4oLcFl5MySFajYXRYbuUpH6AY+HP8
   voD0MPg1DssDLKwXyt1eKD/+Fq0bFWhwVM/1XiAXL7lyYUyOq24KHgQ2Csg=
   -----END CERTIFICATE-----
-date: 2024-02-14 00:00:00.000000000 Z
+date: 2024-02-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: async
@@ -74,6 +74,8 @@ extensions: []
 extra_rdoc_files: []
 files:
 - lib/async/job.rb
+- lib/async/job/backend.rb
+- lib/async/job/backend/redis.rb
 - lib/async/job/backend/redis/delayed_queue.rb
 - lib/async/job/backend/redis/job_store.rb
 - lib/async/job/backend/redis/processing_queue.rb

metadata.gz.sig

@@ -1,3 +1 @@
-m���A������>������4̌E�<k��
J�V]�];hy%�]��;/Xևu1����@����Y������^A��
-?~�G���&8���Zw2k�^�74��3 �r(�)���A��}L�Uߺ��$��E�Z��;�HO�#X�Q�������D�R�=������	f����M�Nxe��	HT�Ҥ�:�@_����@S5��>��ކ���{�� b>Ph0h]�}�ᑻ��]b鈆��2}̅�� �/h��TXJ���
-|Zt��,l�$t�V���	���8��&�)�d�38�pPS�U�Xp���^��5�l�b9,JOj�*�j6D�'
+�;���9�4