chore: wip

storage/framework/core/queue/src/job.ts

@@ -98,6 +98,22 @@ export class Queue implements Dispatchable {
   ) { }
 
   async dispatch(): Promise<void> {
+    const queueName = this.options.queue || 'default'
+
+    if (['database', 'redis'].includes(queueDriver)) {
+      await storeJob(this.name, {
+        queue: queueName,
+        payload: this.payload,
+        context: this.options.context,
+        maxTries: this.options.maxTries,
+        timeout: this.options.timeout,
+        backoff: this.options.backoff,
+        delay: this.options.delay
+      })
+
+      process.exit(0)
+    }
+
     if (this.options.afterResponse) {
       process.on('beforeExit', async () => {
         await this.dispatchNow()
@@ -112,21 +128,7 @@ export class Queue implements Dispatchable {
       return
     }
 
-    const queueName = this.options.queue || 'default'
-
     try {
-      if (['database', 'redis'].includes(queueDriver)) {
-        await storeJob(this.name, {
-          queue: queueName,
-          payload: this.payload,
-          context: this.options.context,
-          maxTries: this.options.maxTries,
-          timeout: this.options.timeout,
-          backoff: this.options.backoff,
-        })
-
-        process.exit(0)
-      }
 
       await runJob(this.name, {
         queue: queueName,

storage/framework/core/queue/src/utils.ts

@@ -1,7 +1,11 @@
 import type { JobOptions } from './job'
 import Job from '../../../orm/src/models/Job'
 
-export async function storeJob(name: string, options: JobOptions): Promise<void> {
+interface QueueOption extends JobOptions {
+  delay: number
+}
+
+export async function storeJob(name: string, options: QueueOption): Promise<void> {
   const payloadJson = JSON.stringify({
     displayName: `app/Jobs/${name}.ts`,
     name,
@@ -14,7 +18,13 @@ export async function storeJob(name: string, options: JobOptions): Promise<void>
     queue: options.queue,
     payload: payloadJson,
     attempts: 0,
+    available_at: generateUnixTimestamp(options.delay || 0)
   }
 
   await Job.create(job)
 }
+
+function generateUnixTimestamp(secondsToAdd: number): number {
+  const now = Date.now()
+  return Math.floor((now / 1000) + secondsToAdd)
+}