@pbvision/cloud-run-service 0.0.42 → 0.0.44

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pbvision/cloud-run-service",
-  "version": "0.0.42",
+  "version": "0.0.44",
   "description": "fastify-firestore-service Web Framework on Cloud Run",
   "license": "Apache-2.0",
   "type": "module",
@@ -28,7 +28,7 @@
   },
   "dependencies": {
     "@google-cloud/tasks": "^4.0.1",
-    "@pbvision/fastify-firestore-service": "^0.0.47",
+    "@pbvision/fastify-firestore-service": "^0.0.48",
     "google-auth-library": "^9.4.2",
     "ua-parser-js": "^1.0.37"
   },

package/src/tasks.js

@@ -47,7 +47,9 @@ export async function enqueueCloudTask ({
   service = 'internal',
   name = undefined,
   hashNameParts = undefined,
-  ignoreNameAlreadyUsedError = false
+  ignoreNameAlreadyUsedError = false,
+  delaySecs = 0,
+  scheduledEpoch = undefined // can only be up to 30 days from now
 }) {
   const project = process.env.GCLOUD_PROJECT
   const region = process.env.REGION
@@ -66,6 +68,20 @@ export async function enqueueCloudTask ({
       }
     }
   }
+  const currentEpoch = new Date().getTime() / 1000
+  if (delaySecs) {
+    task.scheduleTime = {
+      seconds: Math.ceil(currentEpoch + delaySecs)
+    }
+    assert(!scheduledEpoch, 'cannot specify both delaysSecs and scheduledEpoch')
+  }
+  if (scheduledEpoch) {
+    scheduledEpoch = Math.floor(scheduledEpoch)
+    task.scheduleTime = { seconds: Math.floor(scheduledEpoch) }
+  }
+  if (task.scheduleTime) {
+    assert(task.scheduleTime.seconds <= currentEpoch + 30 * 86400, 'cannot delay for more than 30 days')
+  }
   if (hashNameParts) {
     assert(Array.isArray(hashNameParts))
     assert(!name, 'cannot specify both name and hashNameParts')

package/test/unit-test-tasks.js

@@ -1,7 +1,7 @@
 import crypto from 'node:crypto'
 
 import { CloudTasksClient } from '@google-cloud/tasks'
-import { jest } from '@jest/globals'
+import { expect, jest } from '@jest/globals'
 
 import { enqueueCloudTask } from '../src/tasks.js'
 
@@ -62,6 +62,20 @@ class TestTasks extends BaseTest {
     await this.check({ payload: { x: 3 } })
   }
 
+  async testEnqueueTaskWithDelay () {
+    const now = new Date().getTime() / 1000
+    await this.check(
+      { payload: { x: 3 }, delaySecs: 10 },
+      { scheduleTime: { seconds: expect.closeTo(now + 10, -0.7) } })
+  }
+
+  async testEnqueueTaskWithSchedule () {
+    const target = 100 + Math.floor(new Date().getTime() / 1000)
+    await this.check(
+      { payload: { x: 3 }, scheduledEpoch: target },
+      { scheduleTime: { seconds: target } })
+  }
+
   async testEnqueueTaskWithName () {
     await this.check(
       { name: 'x', payload: { x: 3 } },