notifkit 0.1.14 → 0.1.16

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (89) hide show
  1. package/dashboard/dist/assets/index-C-DJYu0_.css +1 -0
  2. package/dashboard/dist/assets/index-CzFZcEon.js +318 -0
  3. package/dashboard/dist/index.html +2 -2
  4. package/dist/{bootstrap-m107TukN.mjs → bootstrap-BMDRPjgp.mjs} +1 -1
  5. package/dist/{bulk-xAd_biYV.mjs → bulk-CJ5QXiPa.mjs} +1 -1
  6. package/dist/index.d.mts +71 -27
  7. package/dist/index.mjs +2 -2
  8. package/dist/{main-CWIBUEc7.mjs → main-6_bXQBDH.mjs} +21 -41
  9. package/dist/{main-WkxXwP5q.mjs → main-8nP3qmCT.mjs} +29 -49
  10. package/dist/{main-HT5c6jyf.mjs → main-B82bsFoy.mjs} +183 -334
  11. package/dist/{main-C87TSAqM.mjs → main-CpaHF1Zw.mjs} +13 -15
  12. package/dist/{main-DRHL2bst.mjs → main-DULD8-th.mjs} +8 -6
  13. package/dist/{main-D_62f9fH.mjs → main-ZW5RaiOK.mjs} +77 -64
  14. package/dist/{main-5kVwbbnW.mjs → main-g1KEcXXp.mjs} +676 -582
  15. package/dist/{main-C0MjK1Au.mjs → main-mGIT8jv4.mjs} +4 -4
  16. package/dist/schedule-or-dispatch-Cd7GLfc3.mjs +52 -0
  17. package/dist/{src-DYqdD694.mjs → src-BE_EUpZ6.mjs} +93 -93
  18. package/package.json +1 -1
  19. package/scripts/create-admin.mjs +0 -0
  20. package/scripts/create-project.mjs +6 -2
  21. package/scripts/migrate.mjs +0 -0
  22. package/scripts/notifkit.mjs +0 -0
  23. package/src/client.ts +3 -3
  24. package/src/config/index.ts +1 -0
  25. package/src/contracts/common.ts +2 -0
  26. package/src/contracts/envelope.ts +1 -1
  27. package/src/contracts/events/notification-created.ts +2 -0
  28. package/src/contracts/events/notification-delivered.ts +1 -1
  29. package/src/contracts/events/notification-failed.ts +1 -1
  30. package/src/contracts/events/notification-requested.ts +3 -2
  31. package/src/contracts/helpers.ts +1 -2
  32. package/src/contracts/index.ts +1 -0
  33. package/src/contracts/registry.ts +1 -0
  34. package/src/contracts/sdk.ts +8 -37
  35. package/src/db/schema.ts +8 -13
  36. package/src/idempotency/index.ts +6 -8
  37. package/src/metrics/index.ts +2 -0
  38. package/src/rate-limiter/api-rate-limiter.ts +208 -0
  39. package/src/rate-limiter/index.ts +3 -411
  40. package/src/rate-limiter/project-settings-cache.ts +99 -0
  41. package/src/rate-limiter/user-throttle.ts +100 -0
  42. package/src/redis/index.ts +10 -3
  43. package/src/repositories/admin-user.ts +83 -0
  44. package/src/repositories/contact.ts +359 -0
  45. package/src/repositories/index.ts +9 -1416
  46. package/src/repositories/preference.ts +35 -0
  47. package/src/repositories/project.ts +110 -0
  48. package/src/repositories/segment.ts +16 -0
  49. package/src/repositories/template.ts +72 -0
  50. package/src/repositories/types.ts +49 -0
  51. package/src/repositories/user.ts +644 -0
  52. package/src/repositories/workflow.ts +64 -0
  53. package/src/services/ai/main.ts +29 -71
  54. package/src/services/api/admin-static.ts +4 -1
  55. package/src/services/api/handlers/auth.ts +109 -0
  56. package/src/services/api/handlers/campaigns.ts +191 -0
  57. package/src/services/api/handlers/events.ts +99 -0
  58. package/src/services/api/handlers/notifications.ts +356 -0
  59. package/src/services/api/handlers/projects.ts +116 -0
  60. package/src/services/api/handlers/shared.ts +262 -0
  61. package/src/services/api/handlers/suppressions.ts +95 -0
  62. package/src/services/api/handlers/system.ts +314 -0
  63. package/src/services/api/handlers/templates.ts +97 -0
  64. package/src/services/api/handlers/unsubscribe.ts +215 -0
  65. package/src/services/api/handlers/users.ts +262 -0
  66. package/src/services/api/handlers/workflows.ts +150 -0
  67. package/src/services/api/handlers.ts +25 -2190
  68. package/src/services/api/health.ts +133 -0
  69. package/src/services/api/http.ts +12 -0
  70. package/src/services/api/main.ts +32 -322
  71. package/src/services/api/router.ts +1 -1
  72. package/src/services/api/webhooks.ts +172 -0
  73. package/src/services/delivery/main.ts +256 -498
  74. package/src/services/engine/main.ts +31 -235
  75. package/src/services/engine/quiet-hours.ts +151 -0
  76. package/src/services/engine/schedule-or-dispatch.ts +104 -0
  77. package/src/services/enricher/main.ts +9 -21
  78. package/src/services/events/main.ts +2 -2
  79. package/src/services/scheduler/main.ts +16 -25
  80. package/src/services/workflow/duration.ts +24 -0
  81. package/src/services/workflow/main.ts +6 -164
  82. package/src/services/workflow/timers.ts +157 -0
  83. package/src/shared/events.ts +3 -2
  84. package/src/templates/render.ts +1 -0
  85. package/src/workers/index.ts +7 -4
  86. package/src/workflows/sdk.ts +1 -0
  87. package/dashboard/README.md +0 -29
  88. package/dashboard/dist/assets/index-ggpJKZqZ.js +0 -315
  89. package/dashboard/dist/assets/index-s-SXGIwv.css +0 -1
@@ -1,5 +1,5 @@
1
- import { C as ContactRepository, D as TemplateRepository, Dn as normaliseTarget, En as getPriorityBucket, Jt as buildStreamEvent, O as UserRepository, Yt as CONSUMER_GROUPS, an as registry, c as BaseWorker, ct as scheduledPayloads, d as startHealthReporter, en as STREAMS, hn as readBaseConfig, kn as globalEmitter, lt as suppressions, pn as loadEnv } from "./src-DYqdD694.mjs";
2
- import { a as uniqueConsumerId, i as shutdownWorker, n as createStreamConsumer, r as createWorkerRuntime, t as createPriorityProducers } from "./bootstrap-m107TukN.mjs";
1
+ import { An as globalEmitter, D as ContactRepository, Dn as getPriorityBucket, E as TemplateRepository, On as normaliseTarget, Xt as CONSUMER_GROUPS, Yt as buildStreamEvent, c as BaseWorker, d as startHealthReporter, gn as readBaseConfig, k as UserRepository, lt as scheduledPayloads, mn as loadEnv, on as registry, tn as STREAMS, ut as suppressions } from "./src-BE_EUpZ6.mjs";
2
+ import { a as uniqueConsumerId, i as shutdownWorker, n as createStreamConsumer, r as createWorkerRuntime, t as createPriorityProducers } from "./bootstrap-BMDRPjgp.mjs";
3
3
  import { randomUUID } from "node:crypto";
4
4
  import { and, asc, eq, gt, inArray, or, sql } from "drizzle-orm";
5
5
  //#region src/services/scheduler/send-gate.ts
@@ -77,6 +77,9 @@ let worker;
77
77
  let healthInterval = null;
78
78
  let pollTimeout = null;
79
79
  let isPolling = false;
80
+ /** Scheduled tasks are spread over 16 sorted sets by the last hex digit of the task id. */
81
+ const shardOf = (taskId) => parseInt(taskId.slice(-1), 16) || 0;
82
+ const zsetKey = (shard) => `notif:scheduled:zset:${shard}`;
80
83
  var SchedulerWorker = class extends BaseWorker {
81
84
  registry;
82
85
  redisCli;
@@ -102,9 +105,8 @@ var SchedulerWorker = class extends BaseWorker {
102
105
  enrichedEventId: scheduled.enrichedEventId,
103
106
  traceId: event.metadata.traceId
104
107
  });
105
- const shard = parseInt(scheduled.taskId.slice(-1), 16) || 0;
106
- const zsetKey = `notif:scheduled:zset:${shard}`;
107
- await this.redisCli.zadd(zsetKey, scheduledAt, taskData);
108
+ const shard = shardOf(scheduled.taskId);
109
+ await this.redisCli.zadd(zsetKey(shard), scheduledAt, taskData);
108
110
  this.logger.debug({
109
111
  taskId: scheduled.taskId,
110
112
  scheduledAt: scheduled.scheduledAt,
@@ -124,7 +126,7 @@ async function executeSchedulerPoll(redis, outboundProducers, logger, db) {
124
126
  const perShardLimit = 100;
125
127
  const pipeline = redis.pipeline();
126
128
  for (let i = 0; i < 16; i++) {
127
- const shardKey = `notif:scheduled:zset:${i}`;
129
+ const shardKey = zsetKey(i);
128
130
  pipeline.schedulerPoll(shardKey, now, perShardLimit, visibilityTimeout);
129
131
  }
130
132
  const perShard = (await pipeline.exec())?.map((res) => res[0] ? [] : res[1] ?? []) ?? [];
@@ -161,14 +163,13 @@ async function executeSchedulerPoll(redis, outboundProducers, logger, db) {
161
163
  for (let i = 0; i < parsedTasks.length; i++) {
162
164
  const { taskStr, taskId, traceId } = parsedTasks[i];
163
165
  if (released.has(taskId)) {
164
- cleanupPipeline.zrem(`notif:scheduled:zset:${parseInt(taskId.slice(-1), 16) || 0}`, taskStr);
166
+ cleanupPipeline.zrem(zsetKey(shardOf(taskId)), taskStr);
165
167
  continue;
166
168
  }
167
169
  const payload = payloadMap.get(taskId);
168
170
  if (!payload) {
169
171
  logger.warn({ taskId }, "scheduled payload not found in Postgres — skipping release");
170
- const shard = parseInt(taskId.slice(-1), 16) || 0;
171
- cleanupPipeline.zrem(`notif:scheduled:zset:${shard}`, taskStr);
172
+ cleanupPipeline.zrem(zsetKey(shardOf(taskId)), taskStr);
172
173
  continue;
173
174
  }
174
175
  const dispatchPayload = payload;
@@ -186,15 +187,13 @@ async function executeSchedulerPoll(redis, outboundProducers, logger, db) {
186
187
  });
187
188
  released.add(taskId);
188
189
  dbCleanupIds.push(taskId);
189
- const shard = parseInt(taskId.slice(-1), 16) || 0;
190
- cleanupPipeline.zrem(`notif:scheduled:zset:${shard}`, taskStr);
190
+ cleanupPipeline.zrem(zsetKey(shardOf(taskId)), taskStr);
191
191
  continue;
192
192
  }
193
193
  batchedEvents[getPriorityBucket(dispatchPayload.priority)].push(buildStreamEvent("notification.dispatched", dispatchPayload, "scheduler", traceId));
194
194
  released.add(taskId);
195
195
  dbCleanupIds.push(taskId);
196
- const shard = parseInt(taskId.slice(-1), 16) || 0;
197
- cleanupPipeline.zrem(`notif:scheduled:zset:${shard}`, taskStr);
196
+ cleanupPipeline.zrem(zsetKey(shardOf(taskId)), taskStr);
198
197
  }
199
198
  for (const p of Object.keys(batchedEvents)) if (batchedEvents[p].length > 0) await (outboundProducers[p] ?? outboundProducers["normal"]).publishBatch(batchedEvents[p]);
200
199
  if (dbCleanupIds.length > 0) try {
@@ -247,8 +246,7 @@ async function rebuildScheduledQueue(redis, db, logger, pageSize = 1e3) {
247
246
  taskId,
248
247
  enrichedEventId: payload?.enrichedEventId
249
248
  });
250
- const shard = parseInt(taskId.slice(-1), 16) || 0;
251
- pipeline.zadd(`notif:scheduled:zset:${shard}`, "NX", Number.isNaN(sendAt) ? Date.now() : sendAt, member);
249
+ pipeline.zadd(zsetKey(shardOf(taskId)), "NX", Number.isNaN(sendAt) ? Date.now() : sendAt, member);
252
250
  }
253
251
  await pipeline.exec();
254
252
  total += rows.length;
@@ -1,5 +1,5 @@
1
- import { C as ContactRepository, D as TemplateRepository, En as getPriorityBucket, Jt as buildStreamEvent, O as UserRepository, Yt as CONSUMER_GROUPS, Z as IdempotencyGuard, Zt as INBOUND_STREAMS, _ as TemplateCache, an as registry, c as BaseWorker, d as startHealthReporter, hn as readBaseConfig, kn as globalEmitter, pn as loadEnv, w as PreferenceRepository } from "./src-DYqdD694.mjs";
2
- import { a as uniqueConsumerId, i as shutdownWorker, n as createStreamConsumer, r as createWorkerRuntime, t as createPriorityProducers } from "./bootstrap-m107TukN.mjs";
1
+ import { An as globalEmitter, D as ContactRepository, Dn as getPriorityBucket, E as TemplateRepository, Q as IdempotencyGuard, Qt as INBOUND_STREAMS, Xt as CONSUMER_GROUPS, Yt as buildStreamEvent, _ as TemplateCache, c as BaseWorker, d as startHealthReporter, gn as readBaseConfig, k as UserRepository, mn as loadEnv, on as registry } from "./src-BE_EUpZ6.mjs";
2
+ import { a as uniqueConsumerId, i as shutdownWorker, n as createStreamConsumer, r as createWorkerRuntime, t as createPriorityProducers } from "./bootstrap-BMDRPjgp.mjs";
3
3
  import { randomUUID } from "node:crypto";
4
4
  //#region src/services/enricher/main.ts
5
5
  loadEnv();
@@ -23,7 +23,6 @@ var EnricherWorker = class extends BaseWorker {
23
23
  producers;
24
24
  idempotency;
25
25
  userRepo;
26
- prefRepo;
27
26
  contactRepo;
28
27
  templateCache;
29
28
  /** Engine in this process, when the pipeline is fused. See `setInlineNext`. */
@@ -73,7 +72,6 @@ var EnricherWorker = class extends BaseWorker {
73
72
  this.producers = options.producers;
74
73
  this.idempotency = options.idempotency;
75
74
  this.userRepo = options.userRepo;
76
- this.prefRepo = options.prefRepo;
77
75
  this.contactRepo = options.contactRepo;
78
76
  this.templateCache = options.templateCache;
79
77
  this.flushTimer = setInterval(() => void this.flushWorkerBuffers(), 5);
@@ -176,6 +174,12 @@ var EnricherWorker = class extends BaseWorker {
176
174
  }, "invalid payload — skipping");
177
175
  return;
178
176
  }
177
+ /**
178
+ * Legacy `notification.created` path.
179
+ * @deprecated Nothing in notifkit publishes `notification.created` any more;
180
+ * this branch only serves callers writing straight to the inbound stream.
181
+ * Removed in the next minor version.
182
+ */
179
183
  if (!isRequested) {
180
184
  const raw = createdResult.data;
181
185
  const dedupeId = `${raw.projectId}:${raw.idempotencyKey ?? event.id}`;
@@ -411,7 +415,6 @@ async function startEnricherWorker() {
411
415
  ttlSeconds: config.IDEMPOTENCY_TTL_SECONDS
412
416
  });
413
417
  const userRepo = new UserRepository(db);
414
- const prefRepo = new PreferenceRepository(db);
415
418
  const contactRepo = new ContactRepository(db);
416
419
  const templateCache = new TemplateCache(new TemplateRepository(db));
417
420
  worker = new EnricherWorker({
@@ -423,7 +426,6 @@ async function startEnricherWorker() {
423
426
  producers,
424
427
  idempotency,
425
428
  userRepo,
426
- prefRepo,
427
429
  contactRepo,
428
430
  templateCache
429
431
  });
@@ -1,19 +1,66 @@
1
- import { Jt as buildStreamEvent, Yt as CONSUMER_GROUPS, a as SuspendExecutionError, c as BaseWorker, d as startHealthReporter, en as STREAMS, ft as workflowDefinitions, hn as readBaseConfig, ht as workflowWaiters, i as workflowRegistry, mt as workflowSteps, o as buildStepNotifyPayload, pn as loadEnv, pt as workflowInstances, q as StreamProducer } from "./src-DYqdD694.mjs";
2
- import { a as uniqueConsumerId, i as shutdownWorker, n as createStreamConsumer, r as createWorkerRuntime } from "./bootstrap-m107TukN.mjs";
1
+ import { J as StreamProducer, Xt as CONSUMER_GROUPS, Yt as buildStreamEvent, a as SuspendExecutionError, c as BaseWorker, d as startHealthReporter, gn as readBaseConfig, gt as workflowWaiters, ht as workflowSteps, i as workflowRegistry, mn as loadEnv, mt as workflowInstances, o as buildStepNotifyPayload, pt as workflowDefinitions, tn as STREAMS } from "./src-BE_EUpZ6.mjs";
2
+ import { a as uniqueConsumerId, i as shutdownWorker, n as createStreamConsumer, r as createWorkerRuntime } from "./bootstrap-BMDRPjgp.mjs";
3
3
  import { randomUUID } from "node:crypto";
4
4
  import { and, eq } from "drizzle-orm";
5
- //#region src/services/workflow/main.ts
6
- /** How long a workflow instance lock is held before it self-expires. */
7
- const WORKFLOW_LOCK_TTL_SECONDS = 60;
8
- /** Renew the lock well inside its TTL so long-running handlers keep it. */
9
- const WORKFLOW_LOCK_RENEW_MS = WORKFLOW_LOCK_TTL_SECONDS / 3 * 1e3;
5
+ //#region src/services/workflow/timers.ts
10
6
  /** How long a claimed workflow timer stays invisible to other pollers. */
11
7
  const WORKFLOW_TIMER_VISIBILITY_MS = 6e4;
12
8
  /** Wake-ups for sleeping instances: waits, event timeouts, deferred resumes. */
13
9
  const WORKFLOW_TIMERS_KEY = "notif:workflow:timers";
14
- /** How soon a resume that found its instance busy is tried again. */
15
- const WORKFLOW_RESUME_RETRY_MS = 2e3;
16
- const UUID_RE = /^[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}$/i;
10
+ /** Resumes instances whose wait, event timeout or deferred resume is due. */
11
+ async function pollWorkflowTimers({ redis, db, logger, workflowProducer }) {
12
+ try {
13
+ const now = Date.now();
14
+ const tasks = await redis.native.schedulerPoll(WORKFLOW_TIMERS_KEY, now, 100, WORKFLOW_TIMER_VISIBILITY_MS);
15
+ for (const taskStr of tasks) {
16
+ const task = JSON.parse(taskStr);
17
+ const inst = (await db.select().from(workflowInstances).where(eq(workflowInstances.id, task.instanceId)).limit(1))[0];
18
+ if (!inst || inst.status === "completed" || inst.status === "failed" || inst.status === "canceled") {
19
+ await redis.native.zrem(WORKFLOW_TIMERS_KEY, taskStr);
20
+ continue;
21
+ }
22
+ if (inst.status === "running") continue;
23
+ if (task.isEventTimeout) {
24
+ if (task.stepId !== void 0) {
25
+ const [own] = await db.select({ output: workflowSteps.output }).from(workflowSteps).where(and(eq(workflowSteps.instanceId, task.instanceId), eq(workflowSteps.stepIndex, String(task.stepId)))).limit(1);
26
+ if (!own || own.output !== null) {
27
+ await redis.native.zrem(WORKFLOW_TIMERS_KEY, taskStr);
28
+ continue;
29
+ }
30
+ }
31
+ if ((await db.delete(workflowWaiters).where(and(eq(workflowWaiters.instanceId, task.instanceId), eq(workflowWaiters.eventName, task.eventName))).returning()).length === 0) {
32
+ await redis.native.zrem(WORKFLOW_TIMERS_KEY, taskStr);
33
+ continue;
34
+ }
35
+ const steps = await db.select().from(workflowSteps).where(and(eq(workflowSteps.instanceId, task.instanceId), eq(workflowSteps.action, "waitForEvent")));
36
+ const pendingStep = task.stepId !== void 0 ? steps.find((s) => s.stepIndex === String(task.stepId) && s.output === null) : steps.find((s) => s.output === null);
37
+ if (pendingStep) await db.update(workflowSteps).set({ output: { timedOut: true } }).where(eq(workflowSteps.id, pendingStep.id));
38
+ }
39
+ await workflowProducer.publish(buildStreamEvent("workflow.resumed", task, "scheduler", void 0));
40
+ await redis.native.zrem(WORKFLOW_TIMERS_KEY, taskStr);
41
+ logger.info({ instanceId: task.instanceId }, "Workflow resumed from timer");
42
+ }
43
+ } catch (err) {
44
+ logger.error({ err }, "error in workflow polling loop");
45
+ }
46
+ }
47
+ /** Sets `running` instances whose lock has expired back to `pending`. */
48
+ async function reapStuckInstances({ redis, db, logger }) {
49
+ try {
50
+ const runningInstances = await db.select({ id: workflowInstances.id }).from(workflowInstances).where(eq(workflowInstances.status, "running"));
51
+ for (const inst of runningInstances) {
52
+ const lockKey = `lock:workflow:${inst.id}`;
53
+ if (!await redis.native.exists(lockKey)) {
54
+ await db.update(workflowInstances).set({ status: "pending" }).where(eq(workflowInstances.id, inst.id));
55
+ logger.info({ instanceId: inst.id }, "Reaped stuck workflow instance (lock expired)");
56
+ }
57
+ }
58
+ } catch (err) {
59
+ logger.error({ err }, "error in stuck workflow reaper");
60
+ }
61
+ }
62
+ //#endregion
63
+ //#region src/services/workflow/duration.ts
17
64
  /** Seconds per unit. Everything is read as seconds first, then scheduled in ms. */
18
65
  const DURATION_UNIT_SECONDS = {
19
66
  ms: .001,
@@ -36,6 +83,15 @@ function parseDurationSeconds(value, what) {
36
83
  function durationToMs(value, what) {
37
84
  return Math.round(parseDurationSeconds(value, what) * 1e3);
38
85
  }
86
+ //#endregion
87
+ //#region src/services/workflow/main.ts
88
+ /** How long a workflow instance lock is held before it self-expires. */
89
+ const WORKFLOW_LOCK_TTL_SECONDS = 60;
90
+ /** Renew the lock well inside its TTL so long-running handlers keep it. */
91
+ const WORKFLOW_LOCK_RENEW_MS = WORKFLOW_LOCK_TTL_SECONDS / 3 * 1e3;
92
+ /** How soon a resume that found its instance busy is tried again. */
93
+ const WORKFLOW_RESUME_RETRY_MS = 2e3;
94
+ const UUID_RE = /^[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}$/i;
39
95
  /** Thrown at a step boundary once the instance has been canceled. */
40
96
  var WorkflowCanceledError = class extends Error {
41
97
  constructor() {
@@ -60,7 +116,6 @@ let workflowProducer;
60
116
  var WorkflowWorker = class extends BaseWorker {
61
117
  redisCli;
62
118
  dbConn;
63
- workflowProducer;
64
119
  notificationProducer;
65
120
  eventBuffer = [];
66
121
  flushTimer = null;
@@ -68,7 +123,6 @@ var WorkflowWorker = class extends BaseWorker {
68
123
  super(options);
69
124
  this.redisCli = options.redis;
70
125
  this.dbConn = options.db;
71
- this.workflowProducer = options.workflowProducer;
72
126
  this.notificationProducer = options.notificationProducer;
73
127
  this.flushTimer = setInterval(() => void this.flushWorkerBuffers(), 100);
74
128
  }
@@ -126,7 +180,6 @@ var WorkflowWorker = class extends BaseWorker {
126
180
  }
127
181
  async process(message) {
128
182
  const { event } = message;
129
- const publishPromises = [];
130
183
  if (event.type !== "workflow.triggered" && event.type !== "workflow.resumed") return;
131
184
  const payload = event.payload;
132
185
  const name = payload.name;
@@ -336,7 +389,6 @@ var WorkflowWorker = class extends BaseWorker {
336
389
  clearInterval(renewTimer);
337
390
  await this.redisCli.releaseLock(lockKey, lockToken);
338
391
  }
339
- await Promise.all(publishPromises);
340
392
  }
341
393
  };
342
394
  async function startWorkflowWorker() {
@@ -371,58 +423,19 @@ async function startWorkflowWorker() {
371
423
  notificationProducer
372
424
  });
373
425
  pollInterval = setInterval(() => {
374
- (async () => {
375
- try {
376
- const now = Date.now();
377
- const tasks = await redis.native.schedulerPoll(WORKFLOW_TIMERS_KEY, now, 100, WORKFLOW_TIMER_VISIBILITY_MS);
378
- for (const taskStr of tasks) {
379
- const task = JSON.parse(taskStr);
380
- const inst = (await db.select().from(workflowInstances).where(eq(workflowInstances.id, task.instanceId)).limit(1))[0];
381
- if (!inst || inst.status === "completed" || inst.status === "failed" || inst.status === "canceled") {
382
- await redis.native.zrem(WORKFLOW_TIMERS_KEY, taskStr);
383
- continue;
384
- }
385
- if (inst.status === "running") continue;
386
- if (task.isEventTimeout) {
387
- if (task.stepId !== void 0) {
388
- const [own] = await db.select({ output: workflowSteps.output }).from(workflowSteps).where(and(eq(workflowSteps.instanceId, task.instanceId), eq(workflowSteps.stepIndex, String(task.stepId)))).limit(1);
389
- if (!own || own.output !== null) {
390
- await redis.native.zrem(WORKFLOW_TIMERS_KEY, taskStr);
391
- continue;
392
- }
393
- }
394
- if ((await db.delete(workflowWaiters).where(and(eq(workflowWaiters.instanceId, task.instanceId), eq(workflowWaiters.eventName, task.eventName))).returning()).length === 0) {
395
- await redis.native.zrem(WORKFLOW_TIMERS_KEY, taskStr);
396
- continue;
397
- }
398
- const steps = await db.select().from(workflowSteps).where(and(eq(workflowSteps.instanceId, task.instanceId), eq(workflowSteps.action, "waitForEvent")));
399
- const pendingStep = task.stepId !== void 0 ? steps.find((s) => s.stepIndex === String(task.stepId) && s.output === null) : steps.find((s) => s.output === null);
400
- if (pendingStep) await db.update(workflowSteps).set({ output: { timedOut: true } }).where(eq(workflowSteps.id, pendingStep.id));
401
- }
402
- await workflowProducer.publish(buildStreamEvent("workflow.resumed", task, "scheduler", void 0));
403
- await redis.native.zrem(WORKFLOW_TIMERS_KEY, taskStr);
404
- logger.info({ instanceId: task.instanceId }, "Workflow resumed from timer");
405
- }
406
- } catch (err) {
407
- logger.error({ err }, "error in workflow polling loop");
408
- }
409
- })();
426
+ pollWorkflowTimers({
427
+ redis,
428
+ db,
429
+ logger,
430
+ workflowProducer
431
+ });
410
432
  }, 5e3);
411
433
  reaperInterval = setInterval(() => {
412
- (async () => {
413
- try {
414
- const runningInstances = await db.select({ id: workflowInstances.id }).from(workflowInstances).where(eq(workflowInstances.status, "running"));
415
- for (const inst of runningInstances) {
416
- const lockKey = `lock:workflow:${inst.id}`;
417
- if (!await redis.native.exists(lockKey)) {
418
- await db.update(workflowInstances).set({ status: "pending" }).where(eq(workflowInstances.id, inst.id));
419
- logger.info({ instanceId: inst.id }, "Reaped stuck workflow instance (lock expired)");
420
- }
421
- }
422
- } catch (err) {
423
- logger.error({ err }, "error in stuck workflow reaper");
424
- }
425
- })();
434
+ reapStuckInstances({
435
+ redis,
436
+ db,
437
+ logger
438
+ });
426
439
  }, 6e4);
427
440
  healthInterval = startHealthReporter("workflow", worker, redis, logger);
428
441
  logger.info("workflow worker starting");