opticedge-cloud-utils 1.0.21 → 1.0.23

package/dist/index.d.ts

@@ -2,6 +2,7 @@ export * from './auth/verify';
 export * from './db/mongo';
 export * from './db/mongo2';
 export * from './db/mongo3';
+export * from './types/notify';
 export * from './types/pokemontcg';
 export * from './types/pricecharting';
 export * from './utils/env';

package/dist/index.js

@@ -18,6 +18,7 @@ __exportStar(require("./auth/verify"), exports);
 __exportStar(require("./db/mongo"), exports);
 __exportStar(require("./db/mongo2"), exports);
 __exportStar(require("./db/mongo3"), exports);
+__exportStar(require("./types/notify"), exports);
 __exportStar(require("./types/pokemontcg"), exports);
 __exportStar(require("./types/pricecharting"), exports);
 __exportStar(require("./utils/env"), exports);

package/dist/types/notify.d.ts

@@ -0,0 +1,4 @@
+export type Message = {
+    title: string;
+    body: string;
+};

package/dist/types/notify.js

@@ -0,0 +1,2 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });

package/dist/utils/task.d.ts

@@ -1 +1 @@
-export declare function createTask(projectId: string, region: string, queueId: string, data: unknown, serviceAccount: string, audience: string): Promise<string>;
+export declare function createTask(projectId: string, region: string, queueId: string, data: unknown, serviceAccount: string, audience: string, delaySeconds?: number): Promise<string>;

package/dist/utils/task.js

@@ -3,11 +3,17 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.createTask = createTask;
 const tasks_1 = require("@google-cloud/tasks");
 const tasksClient = new tasks_1.CloudTasksClient();
-async function createTask(projectId, region, queueId, data, serviceAccount, audience) {
+async function createTask(projectId, region, queueId, data, serviceAccount, audience, delaySeconds = 0) {
     if (!projectId || !region || !queueId || !serviceAccount || !audience) {
         throw new Error('Missing required parameters for Cloud Tasks setup');
     }
     const parent = tasksClient.queuePath(projectId, region, queueId);
+    const now = Date.now() / 1000;
+    const scheduledTime = delaySeconds > 0
+        ? {
+            seconds: Math.floor(now + delaySeconds)
+        }
+        : undefined;
     const task = {
         httpRequest: {
             httpMethod: tasks_1.protos.google.cloud.tasks.v2.HttpMethod.POST,
@@ -20,11 +26,13 @@ async function createTask(projectId, region, queueId, data, serviceAccount, audi
                 serviceAccountEmail: serviceAccount,
                 audience
             }
-        }
+        },
+        scheduleTime: scheduledTime
     };
     const [response] = await tasksClient.createTask({ parent, task });
     if (!response.name) {
         throw new Error('Failed to create task: no name returned');
     }
+    console.log(`✅ Created Cloud Task: ${response.name}`);
     return response.name;
 }

package/dist/utils/task.test.js

@@ -51,4 +51,17 @@ describe('createTask', () => {
         mockCreateTask.mockResolvedValue([{}]); // Simulate missing name
         await expect((0, task_1.createTask)('test-project', 'us-central1', 'test-queue', { foo: 'bar' }, 'test@project.iam.gserviceaccount.com', 'https://example.com')).rejects.toThrow('Failed to create task: no name returned');
     });
+    it('should include scheduleTime if delaySeconds is set', async () => {
+        const mockTaskName = 'projects/test/locations/us-central1/queues/test/tasks/task-456';
+        mockCreateTask.mockResolvedValue([{ name: mockTaskName }]);
+        const delaySeconds = 120;
+        const before = Math.floor(Date.now() / 1000) + delaySeconds;
+        await (0, task_1.createTask)('test', 'us-central1', 'test', { message: 'delayed' }, 'sa@test.iam.gserviceaccount.com', 'https://run-url', delaySeconds);
+        const taskArg = mockCreateTask.mock.calls[0][0].task;
+        const scheduleTime = taskArg.scheduleTime?.seconds;
+        const after = Math.floor(Date.now() / 1000) + delaySeconds;
+        expect(typeof scheduleTime).toBe('number');
+        expect(scheduleTime).toBeGreaterThanOrEqual(before);
+        expect(scheduleTime).toBeLessThanOrEqual(after);
+    });
 });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "opticedge-cloud-utils",
-  "version": "1.0.21",
+  "version": "1.0.23",
   "description": "Common utilities for cloud functions",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",

package/src/index.ts

@@ -2,6 +2,7 @@ export * from './auth/verify'
 export * from './db/mongo'
 export * from './db/mongo2'
 export * from './db/mongo3'
+export * from './types/notify'
 export * from './types/pokemontcg'
 export * from './types/pricecharting'
 export * from './utils/env'

package/src/types/notify.ts

@@ -0,0 +1,4 @@
+export type Message = {
+  title: string
+  body: string
+}

package/src/utils/task.test.ts

@@ -91,4 +91,31 @@ describe('createTask', () => {
       )
     ).rejects.toThrow('Failed to create task: no name returned')
   })
+
+  it('should include scheduleTime if delaySeconds is set', async () => {
+    const mockTaskName = 'projects/test/locations/us-central1/queues/test/tasks/task-456'
+    mockCreateTask.mockResolvedValue([{ name: mockTaskName }])
+
+    const delaySeconds = 120
+    const before = Math.floor(Date.now() / 1000) + delaySeconds
+
+    await createTask(
+      'test',
+      'us-central1',
+      'test',
+      { message: 'delayed' },
+      'sa@test.iam.gserviceaccount.com',
+      'https://run-url',
+      delaySeconds
+    )
+
+    const taskArg = mockCreateTask.mock.calls[0][0].task
+    const scheduleTime = taskArg.scheduleTime?.seconds
+
+    const after = Math.floor(Date.now() / 1000) + delaySeconds
+
+    expect(typeof scheduleTime).toBe('number')
+    expect(scheduleTime).toBeGreaterThanOrEqual(before)
+    expect(scheduleTime).toBeLessThanOrEqual(after)
+  })
 })

package/src/utils/task.ts

@@ -8,7 +8,8 @@ export async function createTask(
   queueId: string,
   data: unknown,
   serviceAccount: string,
-  audience: string
+  audience: string,
+  delaySeconds: number = 0
 ): Promise<string> {
   if (!projectId || !region || !queueId || !serviceAccount || !audience) {
     throw new Error('Missing required parameters for Cloud Tasks setup')
@@ -16,6 +17,14 @@ export async function createTask(
 
   const parent = tasksClient.queuePath(projectId, region, queueId)
 
+  const now = Date.now() / 1000
+  const scheduledTime: protos.google.protobuf.ITimestamp | undefined =
+    delaySeconds > 0
+      ? {
+          seconds: Math.floor(now + delaySeconds)
+        }
+      : undefined
+
   const task: protos.google.cloud.tasks.v2.ITask = {
     httpRequest: {
       httpMethod: protos.google.cloud.tasks.v2.HttpMethod.POST,
@@ -28,12 +37,15 @@ export async function createTask(
         serviceAccountEmail: serviceAccount,
         audience
       }
-    }
+    },
+    scheduleTime: scheduledTime
   }
 
   const [response] = await tasksClient.createTask({ parent, task })
   if (!response.name) {
     throw new Error('Failed to create task: no name returned')
   }
+
+  console.log(`✅ Created Cloud Task: ${response.name}`)
   return response.name
 }