@shipfox/api-triggers 6.0.0 → 7.1.0

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@shipfox/api-triggers",
   "license": "MIT",
-  "version": "6.0.0",
+  "version": "7.1.0",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/ShipfoxHQ/shipfox.git",
@@ -26,42 +26,25 @@
     "cron-parser": "^5.6.1",
     "drizzle-orm": "^0.45.2",
     "zod": "^4.4.3",
-    "@shipfox/api-auth-context": "6.0.0",
+    "@shipfox/api-auth-context": "7.1.0",
     "@shipfox/api-definitions-dto": "6.0.0",
     "@shipfox/api-integration-core-dto": "6.0.0",
-    "@shipfox/api-projects": "6.0.0",
+    "@shipfox/api-projects": "7.1.0",
     "@shipfox/api-triggers-dto": "5.0.0",
     "@shipfox/api-workflows-dto": "6.0.0",
     "@shipfox/config": "1.2.2",
     "@shipfox/expression": "1.1.3",
     "@shipfox/inter-module": "0.2.0",
     "@shipfox/node-drizzle": "0.3.2",
-    "@shipfox/node-fastify": "0.2.4",
-    "@shipfox/node-module": "0.4.0",
-    "@shipfox/node-opentelemetry": "0.5.2",
+    "@shipfox/node-error-monitoring": "0.2.0",
+    "@shipfox/node-fastify": "0.3.0",
+    "@shipfox/node-module": "0.5.0",
+    "@shipfox/node-opentelemetry": "0.6.0",
     "@shipfox/node-outbox": "0.2.4",
     "@shipfox/node-postgres": "0.4.2",
-    "@shipfox/node-temporal": "0.3.2",
+    "@shipfox/node-temporal": "0.4.0",
     "@shipfox/workflow-document": "2.1.1"
   },
-  "devDependencies": {
-    "@temporalio/activity": "1.18.1",
-    "@temporalio/client": "1.18.1",
-    "@temporalio/common": "1.18.1",
-    "@temporalio/testing": "1.18.1",
-    "@temporalio/worker": "1.18.1",
-    "@types/pg": "^8.15.5",
-    "drizzle-kit": "^0.31.10",
-    "fastify": "^5.3.3",
-    "fastify-type-provider-zod": "^6.0.0",
-    "fishery": "^2.4.0",
-    "@shipfox/biome": "1.8.2",
-    "@shipfox/depcruise": "1.0.2",
-    "@shipfox/swc": "1.2.6",
-    "@shipfox/ts-config": "1.3.8",
-    "@shipfox/typescript": "1.1.7",
-    "@shipfox/vitest": "1.2.3"
-  },
   "scripts": {
     "build": "shipfox-swc && shipfox-temporal-bundle dist/temporal/workflows/index.js",
     "check": "shipfox-biome-check",

package/src/core/drain-cron-schedules.ts

@@ -1,3 +1,4 @@
+import {reportError} from '@shipfox/node-error-monitoring';
 import {logger} from '@shipfox/node-opentelemetry';
 import {advanceCronSchedule, claimDueCronSchedules, selectDbNow} from '#db/cron-schedules.js';
 import {db} from '#db/db.js';
@@ -84,6 +85,11 @@ export async function drainDueCronSchedules(
           {err: error, subscriptionId: schedule.subscriptionId},
           'cron drain: transient fire failure; schedule left due for retry',
         );
+        reportError(error, {
+          boundary: 'triggers.maintenance',
+          operation: 'drain-cron-schedules',
+          extra: {subscriptionId: schedule.subscriptionId},
+        });
       }
       params.onScheduleProcessed?.();
     }

package/src/core/record-trigger-history.ts

@@ -1,3 +1,4 @@
+import {reportError} from '@shipfox/node-error-monitoring';
 import {logger} from '@shipfox/node-opentelemetry';
 import type {JobListenerSubscription} from '#core/entities/job-listener-subscription.js';
 import type {TriggerEventOrigin} from '#core/entities/received-event.js';
@@ -140,6 +141,11 @@ async function safe<T>(
       {err: error, label, eventRef, ...(subscriptionId ? {subscriptionId} : {})},
       'trigger history write failed; ignored (best-effort)',
     );
+    reportError(error, {
+      boundary: 'triggers.history',
+      operation: label,
+      extra: {eventRef, subscriptionId},
+    });
     return undefined;
   }
 }

package/src/db/job-listener-subscriptions.ts

@@ -131,3 +131,12 @@ export async function findMatchingJobListenerSubscriptions(
     );
   return rows.map(toJobListenerSubscription);
 }
+
+export async function hasJobListenerSubscriptions(jobId: string): Promise<boolean> {
+  const [subscription] = await db()
+    .select({id: jobListenerSubscriptions.id})
+    .from(jobListenerSubscriptions)
+    .where(eq(jobListenerSubscriptions.jobId, jobId))
+    .limit(1);
+  return subscription !== undefined;
+}

package/src/index.ts

@@ -18,6 +18,7 @@ import type {WorkflowsModuleClient} from '@shipfox/api-workflows-dto/inter-modul
 import {type ShipfoxModule, subscriberFactory} from '@shipfox/node-module';
 import {db, migrationsPath, triggersOutbox} from '#db/index.js';
 import {registerTriggersServiceMetrics} from '#metrics/index.js';
+import {triggersE2eRoutes} from '#presentation/e2e-routes.js';
 import {createTriggerRoutes} from '#presentation/index.js';
 import {
   createOnIntegrationEventReceived,
@@ -76,6 +77,7 @@ export function createTriggersModule({workflows}: CreateTriggersModuleOptions):
     name: 'triggers',
     database: {db, migrationsPath},
     routes: createTriggerRoutes(workflows),
+    e2eRoutes: [triggersE2eRoutes],
     metrics: registerTriggersServiceMetrics,
     publishers: [{name: 'triggers', table: triggersOutbox, db}],
     subscribers: [

package/src/presentation/e2e-routes.test.ts

@@ -0,0 +1,44 @@
+import {closeApp, createApp} from '@shipfox/node-fastify';
+import {projectJobListenerSubscriptions} from '#db/job-listener-subscriptions.js';
+import {triggersE2eRoutes} from './e2e-routes.js';
+
+describe('triggers E2E routes', () => {
+  afterEach(async () => {
+    await closeApp();
+  });
+
+  test('reports a listener without projected subscriptions as not ready', async () => {
+    const jobId = crypto.randomUUID();
+    const app = await createApp({routes: [triggersE2eRoutes], swagger: false});
+
+    const response = await app.inject({
+      method: 'GET',
+      url: `/triggers/listeners/${jobId}/readiness`,
+    });
+
+    expect(response.statusCode).toBe(200);
+    expect(response.json()).toEqual({ready: false});
+  });
+
+  test('reports a listener with projected subscriptions as ready', async () => {
+    const workspaceId = crypto.randomUUID();
+    const workflowRunId = crypto.randomUUID();
+    const jobId = crypto.randomUUID();
+    await projectJobListenerSubscriptions({
+      workspaceId,
+      workflowRunId,
+      jobId,
+      on: [{source: 'listener-source', event: 'received'}],
+      until: null,
+    });
+    const app = await createApp({routes: [triggersE2eRoutes], swagger: false});
+
+    const response = await app.inject({
+      method: 'GET',
+      url: `/triggers/listeners/${jobId}/readiness`,
+    });
+
+    expect(response.statusCode).toBe(200);
+    expect(response.json()).toEqual({ready: true});
+  });
+});

package/src/presentation/e2e-routes.ts

@@ -0,0 +1,24 @@
+import {defineRoute, type RouteGroup} from '@shipfox/node-fastify';
+import {z} from 'zod';
+import {hasJobListenerSubscriptions} from '#db/job-listener-subscriptions.js';
+
+const listenerReadinessParamsSchema = z.object({jobId: z.string().uuid()});
+const listenerReadinessResponseSchema = z.object({ready: z.boolean()});
+
+const listenerReadinessRoute = defineRoute({
+  method: 'GET',
+  path: '/listeners/:jobId/readiness',
+  description: 'Report whether trigger subscriptions for a listener job are ready in E2E tests.',
+  schema: {
+    params: listenerReadinessParamsSchema,
+    response: {200: listenerReadinessResponseSchema},
+  },
+  handler: async (request) => ({
+    ready: await hasJobListenerSubscriptions(request.params.jobId),
+  }),
+});
+
+export const triggersE2eRoutes: RouteGroup = {
+  prefix: '/triggers',
+  routes: [listenerReadinessRoute],
+};