notifkit 0.1.10 → 0.1.12
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.
- package/README.md +37 -1
- package/dashboard/dist/assets/{index-7mvXb4bS.js → index-Bsrmo9LE.js} +1 -1
- package/dashboard/dist/assets/index-s-SXGIwv.css +1 -0
- package/dashboard/dist/index.html +2 -2
- package/dist/bootstrap-omGPIBny.mjs +89 -0
- package/dist/bulk-C4hTcnLu.mjs +77 -0
- package/dist/index.d.mts +1160 -8886
- package/dist/index.mjs +2 -38
- package/dist/{main-C9s-2ArH.mjs → main-B-AZ-xoN.mjs} +49 -75
- package/dist/main-B5BwjIMu.mjs +811 -0
- package/dist/{main-B3iQrl3t.mjs → main-BU27VjDC.mjs} +149 -134
- package/dist/main-Bes11Ad3.mjs +312 -0
- package/dist/{main-BiFiOX9D.mjs → main-BtnGmyaT.mjs} +119 -112
- package/dist/{main-39DtKrX4.mjs → main-BxAeC_k6.mjs} +395 -184
- package/dist/{main-Dz2sUh3c.mjs → main-DAXO-MiH.mjs} +57 -54
- package/dist/{main-BgmT1MPe.mjs → main-DYGCl7Ja.mjs} +135 -79
- package/dist/{src-QiTu5e_a.mjs → src-CIPTzq9i.mjs} +1351 -661
- package/drizzle/0006_message_logs_redundant_indexes.sql +7 -0
- package/drizzle/0007_workflow_status_canceled.sql +3 -0
- package/drizzle/meta/_journal.json +14 -0
- package/package.json +21 -18
- package/scripts/create-admin.mjs +8 -1
- package/scripts/migrate.mjs +43 -0
- package/src/client.ts +15 -5
- package/src/config/index.ts +37 -3
- package/src/contracts/events/notification-ai-pending.ts +12 -0
- package/src/contracts/events/notification-delivered.ts +7 -0
- package/src/contracts/events/notification-dispatched.ts +21 -2
- package/src/contracts/events/notification-enriched.ts +16 -0
- package/src/contracts/events/notification-failed.ts +2 -0
- package/src/contracts/events/notification-requested.ts +2 -0
- package/src/contracts/registry.ts +2 -2
- package/src/contracts/sdk.ts +77 -29
- package/src/db/bulk.ts +132 -0
- package/src/db/index.ts +174 -7
- package/src/db/schema.ts +3 -50
- package/src/idempotency/index.ts +60 -6
- package/src/logger/index.ts +0 -12
- package/src/queue/index.ts +255 -76
- package/src/rate-limiter/index.ts +217 -16
- package/src/redis/index.ts +265 -0
- package/src/repositories/index.ts +171 -82
- package/src/server.ts +64 -41
- package/src/services/ai/main.ts +83 -70
- package/src/services/api/admin-static.ts +41 -12
- package/src/services/api/handlers.ts +357 -159
- package/src/services/api/http.ts +34 -7
- package/src/services/api/main.ts +104 -67
- package/src/services/api/router.ts +18 -5
- package/src/services/delivery/main.ts +495 -230
- package/src/services/delivery/throttle.ts +42 -59
- package/src/services/engine/main.ts +206 -152
- package/src/services/enricher/main.ts +155 -107
- package/src/services/events/main.ts +100 -55
- package/src/services/scheduler/main.ts +151 -79
- package/src/services/scheduler/send-gate.ts +117 -0
- package/src/services/workflow/main.ts +220 -100
- package/src/shared/batch-processor.ts +65 -34
- package/src/shared/dataloader.ts +58 -22
- package/src/shared/events.ts +3 -0
- package/src/shared/index.ts +0 -1
- package/src/shared/utils.ts +2 -47
- package/src/templates/index.ts +0 -67
- package/src/transport/index.ts +6 -0
- package/src/workers/bootstrap.ts +124 -0
- package/src/workers/index.ts +99 -24
- package/src/workflows/sdk.ts +2 -0
- package/dashboard/dist/assets/index-o7L-f3-c.css +0 -1
- package/dist/index.d.mts.map +0 -1
- package/dist/index.mjs.map +0 -1
- package/dist/main-39DtKrX4.mjs.map +0 -1
- package/dist/main-B3iQrl3t.mjs.map +0 -1
- package/dist/main-BM8DH3v3.mjs +0 -632
- package/dist/main-BM8DH3v3.mjs.map +0 -1
- package/dist/main-BgmT1MPe.mjs.map +0 -1
- package/dist/main-BiFiOX9D.mjs.map +0 -1
- package/dist/main-C9s-2ArH.mjs.map +0 -1
- package/dist/main-Cqo3rSb5.mjs +0 -224
- package/dist/main-Cqo3rSb5.mjs.map +0 -1
- package/dist/main-Dz2sUh3c.mjs.map +0 -1
- package/dist/src-QiTu5e_a.mjs.map +0 -1
|
@@ -1,11 +1,12 @@
|
|
|
1
|
-
import { $ as
|
|
2
|
-
import { extname, isAbsolute, join, relative, resolve } from "node:path";
|
|
1
|
+
import { $t as STREAMS, At as AddUserSchema, B as ApiRateLimiter, C as ContactRepository, D as TemplateRepository, Dn as LRUCache, E as SegmentRepository, En as normaliseTarget, It as NotifyRequestSchema, J as metrics, Jt as CONSUMER_GROUPS, K as StreamProducer, Lt as PreferencesSchema, Mt as ContactChannelSchema, Nt as CreateWorkflowSchema, O as UserRepository, On as globalEmitter, Q as createDatabase, Qt as PUBSUB_CHANNELS, R as RedisClient, S as AdminUserRepository, T as ProjectRepository, Tn as getPriorityBucket, Ut as UpdateUserSchema, Vt as TriggerWorkflowSchema, Y as createLogger, at as projectApiKeys, ct as suppressions, dt as workflowDefinitions, fn as loadEnv, g as transportRegistry, it as messageLogs, jt as BatchAddContactsSchema, k as WorkflowRepository, lt as userTopicPreferences, m as verifyUnsubscribeToken, mn as readBaseConfig, ot as projects, q as getMetricsRegistry, qt as buildStreamEvent, rt as deliveryOutbox, st as scheduledPayloads, ut as users, zt as SyncTemplatesSchema } from "./src-CIPTzq9i.mjs";
|
|
2
|
+
import { dirname, extname, isAbsolute, join, relative, resolve } from "node:path";
|
|
3
3
|
import { z } from "zod";
|
|
4
4
|
import { createHash, randomBytes, randomUUID, scrypt, timingSafeEqual } from "node:crypto";
|
|
5
|
-
import { and, desc, eq, gte, inArray, isNotNull, like,
|
|
5
|
+
import { and, desc, eq, gte, inArray, isNotNull, like, lte, or, sql } from "drizzle-orm";
|
|
6
6
|
import { createServer, request } from "node:http";
|
|
7
7
|
import { promisify } from "node:util";
|
|
8
8
|
import { createReadStream, existsSync, statSync } from "node:fs";
|
|
9
|
+
import { fileURLToPath } from "node:url";
|
|
9
10
|
//#region src/services/api/http.ts
|
|
10
11
|
async function readRawBody(req) {
|
|
11
12
|
return await new Promise((resolve, reject) => {
|
|
@@ -26,13 +27,35 @@ async function readRawBody(req) {
|
|
|
26
27
|
});
|
|
27
28
|
}
|
|
28
29
|
async function readJsonBody(req) {
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
|
|
30
|
+
return new Promise((resolve, reject) => {
|
|
31
|
+
if (typeof req.setEncoding === "function") req.setEncoding("utf8");
|
|
32
|
+
let body = "";
|
|
33
|
+
let totalLength = 0;
|
|
34
|
+
const MAX_PAYLOAD_SIZE = 5242880;
|
|
35
|
+
req.on("data", (chunk) => {
|
|
36
|
+
const str = typeof chunk === "string" ? chunk : chunk.toString("utf8");
|
|
37
|
+
totalLength += str.length;
|
|
38
|
+
if (totalLength > MAX_PAYLOAD_SIZE) {
|
|
39
|
+
if (typeof req.destroy === "function") req.destroy();
|
|
40
|
+
reject(new HttpError(413, "payload_too_large"));
|
|
41
|
+
return;
|
|
42
|
+
}
|
|
43
|
+
body += str;
|
|
44
|
+
});
|
|
45
|
+
req.on("end", () => {
|
|
46
|
+
const trimmed = body.trim();
|
|
47
|
+
if (!trimmed) {
|
|
48
|
+
resolve(void 0);
|
|
49
|
+
return;
|
|
50
|
+
}
|
|
51
|
+
try {
|
|
52
|
+
resolve(JSON.parse(trimmed));
|
|
53
|
+
} catch {
|
|
54
|
+
reject(new HttpError(400, "malformed_json"));
|
|
55
|
+
}
|
|
56
|
+
});
|
|
57
|
+
req.on("error", reject);
|
|
58
|
+
});
|
|
36
59
|
}
|
|
37
60
|
function sendJson(res, status, body) {
|
|
38
61
|
const payload = JSON.stringify(body);
|
|
@@ -70,15 +93,27 @@ var HttpError = class extends Error {
|
|
|
70
93
|
/**
|
|
71
94
|
* Minimal path router with `:param` capture — enough for the REST surface here
|
|
72
95
|
* without pulling in a framework. First match wins.
|
|
96
|
+
*
|
|
97
|
+
* Routes are indexed by `"METHOD:segmentCount"` so `match()` only inspects the
|
|
98
|
+
* small bucket of routes that share the same method and path depth, instead of
|
|
99
|
+
* scanning all ~35 registered routes on every request.
|
|
73
100
|
*/
|
|
74
101
|
var Router = class {
|
|
75
|
-
|
|
102
|
+
/** Indexed buckets: key is `"METHOD:segmentCount"`. */
|
|
103
|
+
index = /* @__PURE__ */ new Map();
|
|
76
104
|
add(method, pattern, handler) {
|
|
77
|
-
|
|
105
|
+
const route = {
|
|
78
106
|
method,
|
|
79
107
|
segments: split(pattern),
|
|
80
108
|
handler
|
|
81
|
-
}
|
|
109
|
+
};
|
|
110
|
+
const key = `${method}:${route.segments.length}`;
|
|
111
|
+
let bucket = this.index.get(key);
|
|
112
|
+
if (!bucket) {
|
|
113
|
+
bucket = [];
|
|
114
|
+
this.index.set(key, bucket);
|
|
115
|
+
}
|
|
116
|
+
bucket.push(route);
|
|
82
117
|
return this;
|
|
83
118
|
}
|
|
84
119
|
get(p, h) {
|
|
@@ -99,9 +134,10 @@ var Router = class {
|
|
|
99
134
|
/** Returns the matched handler + captured params, or null. */
|
|
100
135
|
match(method, pathname) {
|
|
101
136
|
const parts = split(pathname);
|
|
102
|
-
|
|
103
|
-
|
|
104
|
-
|
|
137
|
+
const key = `${method}:${parts.length}`;
|
|
138
|
+
const candidates = this.index.get(key);
|
|
139
|
+
if (!candidates) return null;
|
|
140
|
+
for (const route of candidates) {
|
|
105
141
|
const params = {};
|
|
106
142
|
let ok = true;
|
|
107
143
|
for (let i = 0; i < route.segments.length; i++) {
|
|
@@ -236,11 +272,11 @@ function contactsOf(user) {
|
|
|
236
272
|
/** Persist user records + their contacts in bulk. Shared by addUser and inline notify. */
|
|
237
273
|
async function persistUsers(deps, users, projectId) {
|
|
238
274
|
const usersList = users.map((u) => {
|
|
239
|
-
const primaryEmail = u.email?.[0] ?? u.contacts?.find((c) => c.channel === "email")?.target
|
|
275
|
+
const primaryEmail = u.email?.[0] ?? u.contacts?.find((c) => c.channel === "email")?.target;
|
|
240
276
|
return {
|
|
241
277
|
userId: u.id,
|
|
242
|
-
language: u.language
|
|
243
|
-
timezone: u.timezone
|
|
278
|
+
language: u.language,
|
|
279
|
+
timezone: u.timezone,
|
|
244
280
|
email: primaryEmail,
|
|
245
281
|
segments: u.segments ?? [],
|
|
246
282
|
preferences: u.preferences ?? {}
|
|
@@ -260,11 +296,81 @@ async function persistUsers(deps, users, projectId) {
|
|
|
260
296
|
await txContactRepo.upsertMany(projectId, contactsList);
|
|
261
297
|
});
|
|
262
298
|
}
|
|
299
|
+
function parseDlqEntry(id, rawFields) {
|
|
300
|
+
const fields = {};
|
|
301
|
+
for (let i = 0; i < rawFields.length; i += 2) fields[rawFields[i]] = rawFields[i + 1];
|
|
302
|
+
let parsed = null;
|
|
303
|
+
if (fields.data) try {
|
|
304
|
+
parsed = JSON.parse(fields.data);
|
|
305
|
+
} catch {
|
|
306
|
+
parsed = null;
|
|
307
|
+
}
|
|
308
|
+
const { dlq, ...event } = parsed ?? {};
|
|
309
|
+
let payload = fields;
|
|
310
|
+
if (parsed) payload = event.payload;
|
|
311
|
+
else if (fields.payload) try {
|
|
312
|
+
payload = JSON.parse(fields.payload);
|
|
313
|
+
} catch {
|
|
314
|
+
payload = fields.payload;
|
|
315
|
+
}
|
|
316
|
+
const ms = Number(id.split("-")[0]);
|
|
317
|
+
return {
|
|
318
|
+
id,
|
|
319
|
+
eventType: event.type ?? fields.eventType ?? fields.event_type ?? "unknown",
|
|
320
|
+
payload,
|
|
321
|
+
projectId: payload?.projectId ?? payload?.project_id ?? fields.projectId,
|
|
322
|
+
error: dlq?.reason ?? fields.error ?? fields.reason ?? "Dead letter payload",
|
|
323
|
+
timestamp: dlq?.ackedAt ?? fields.timestamp ?? (Number.isFinite(ms) ? new Date(ms).toISOString() : (/* @__PURE__ */ new Date()).toISOString()),
|
|
324
|
+
event: parsed ? event : null,
|
|
325
|
+
originalStream: dlq?.originalStream,
|
|
326
|
+
fields
|
|
327
|
+
};
|
|
328
|
+
}
|
|
329
|
+
/**
|
|
330
|
+
* Ids that live in uuid columns. Anything else can match no row, and passing it
|
|
331
|
+
* to Postgres fails the query outright — a 500 for what is simply not found.
|
|
332
|
+
*/
|
|
333
|
+
const UUID_RE = /^[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}$/i;
|
|
334
|
+
const isUuid = (v) => typeof v === "string" && UUID_RE.test(v);
|
|
335
|
+
/** Opaque position in the delivery log: a row's full-precision timestamp and id. */
|
|
336
|
+
function encodeLogCursor(ts, id) {
|
|
337
|
+
return Buffer.from(JSON.stringify([ts, id])).toString("base64url");
|
|
338
|
+
}
|
|
339
|
+
function decodeLogCursor(cursor) {
|
|
340
|
+
if (!cursor) return null;
|
|
341
|
+
if (/^\d+$/.test(cursor)) return {
|
|
342
|
+
ts: new Date(Number(cursor)).toISOString(),
|
|
343
|
+
id: "ffffffff-ffff-ffff-ffff-ffffffffffff"
|
|
344
|
+
};
|
|
345
|
+
try {
|
|
346
|
+
const [ts, id] = JSON.parse(Buffer.from(cursor, "base64url").toString("utf8"));
|
|
347
|
+
if (typeof ts === "string" && typeof id === "string" && !Number.isNaN(Date.parse(ts)) && /^[0-9a-f-]{36}$/i.test(id)) return {
|
|
348
|
+
ts,
|
|
349
|
+
id
|
|
350
|
+
};
|
|
351
|
+
} catch {}
|
|
352
|
+
return null;
|
|
353
|
+
}
|
|
354
|
+
/**
|
|
355
|
+
* A LIKE pattern matching `term` anywhere, with the term's own `%`, `_` and
|
|
356
|
+
* `\` taken literally rather than as wildcards.
|
|
357
|
+
*/
|
|
358
|
+
function contains(term) {
|
|
359
|
+
return `%${term.replace(/[\\%_]/g, "\\$&")}%`;
|
|
360
|
+
}
|
|
263
361
|
function getQueryParam(ctx, key) {
|
|
264
362
|
if (!ctx.query) return void 0;
|
|
265
363
|
if (typeof ctx.query.get === "function") return ctx.query.get(key) ?? void 0;
|
|
266
364
|
return ctx.query[key] ?? void 0;
|
|
267
365
|
}
|
|
366
|
+
/**
|
|
367
|
+
* Page size from `?limit=`, clamped to [1, max]. Missing or non-numeric
|
|
368
|
+
* values fall back to `fallback`; `undefined` there means "no limit".
|
|
369
|
+
*/
|
|
370
|
+
function parseLimit(ctx, fallback, max = 100) {
|
|
371
|
+
const n = parseInt(getQueryParam(ctx, "limit") ?? "", 10);
|
|
372
|
+
return Number.isNaN(n) ? fallback : Math.min(Math.max(n, 1), max);
|
|
373
|
+
}
|
|
268
374
|
function createHandlers(deps) {
|
|
269
375
|
const { logger } = deps;
|
|
270
376
|
async function syncTemplates(req, res, ctx) {
|
|
@@ -376,13 +482,14 @@ function createHandlers(deps) {
|
|
|
376
482
|
sendNoContent(res);
|
|
377
483
|
}
|
|
378
484
|
async function notify(req, res, ctx) {
|
|
379
|
-
const
|
|
485
|
+
const rawBody = await readJsonBody(req);
|
|
486
|
+
const parsed = NotifyRequestSchema.safeParse(rawBody);
|
|
380
487
|
if (!parsed.success) return sendValidationError(res, parsed.error);
|
|
381
488
|
const body = parsed.data;
|
|
382
489
|
let targets = [];
|
|
490
|
+
const inlineUsersToSync = [];
|
|
383
491
|
if (body.user !== void 0) {
|
|
384
492
|
const users = Array.isArray(body.user) ? body.user : [body.user];
|
|
385
|
-
const inlineUsersToSync = [];
|
|
386
493
|
for (const u of users) if (typeof u === "string") targets.push({
|
|
387
494
|
type: "user",
|
|
388
495
|
userId: u
|
|
@@ -429,7 +536,7 @@ function createHandlers(deps) {
|
|
|
429
536
|
aiPrompts: body.aiPrompts,
|
|
430
537
|
fallback: body.fallback ?? false,
|
|
431
538
|
scheduledAt: body.sendAt,
|
|
432
|
-
idempotencyKey: notificationId,
|
|
539
|
+
...req.headers["x-idempotency-key"] ? { idempotencyKey: notificationId } : {},
|
|
433
540
|
campaignId: body.campaign
|
|
434
541
|
};
|
|
435
542
|
return buildStreamEvent("notification.requested", payload, "api", notificationId);
|
|
@@ -437,7 +544,7 @@ function createHandlers(deps) {
|
|
|
437
544
|
const { messageIds: chunkMessageIds } = await producer.publishBatch(events);
|
|
438
545
|
messageIds.push(...chunkMessageIds);
|
|
439
546
|
}
|
|
440
|
-
logger.
|
|
547
|
+
logger.debug({
|
|
441
548
|
count: targets.length,
|
|
442
549
|
priority: p
|
|
443
550
|
}, "notification requested");
|
|
@@ -521,7 +628,17 @@ function createHandlers(deps) {
|
|
|
521
628
|
const tsStr = req.headers["x-timestamp"];
|
|
522
629
|
const expiryStr = req.headers["x-expiry"];
|
|
523
630
|
if (tsStr && expiryStr) {
|
|
524
|
-
|
|
631
|
+
const now = Date.now();
|
|
632
|
+
const eventTime = new Date(tsStr).getTime();
|
|
633
|
+
const expMs = parseInt(expiryStr, 10) * 1e3;
|
|
634
|
+
if (Number.isNaN(eventTime) || Number.isNaN(expMs)) {
|
|
635
|
+
sendJson(res, 400, {
|
|
636
|
+
error: "invalid_timestamp",
|
|
637
|
+
message: "x-timestamp and x-expiry must be a date and a number of seconds"
|
|
638
|
+
});
|
|
639
|
+
return;
|
|
640
|
+
}
|
|
641
|
+
if (now > eventTime + expMs) {
|
|
525
642
|
sendJson(res, 400, {
|
|
526
643
|
error: "event_expired",
|
|
527
644
|
message: "Webhook event is expired"
|
|
@@ -580,8 +697,7 @@ function createHandlers(deps) {
|
|
|
580
697
|
});
|
|
581
698
|
}
|
|
582
699
|
async function getNotificationLogs(req, res, ctx) {
|
|
583
|
-
const
|
|
584
|
-
const limit = isNaN(limitParam) ? 50 : Math.min(limitParam, 100);
|
|
700
|
+
const limit = parseLimit(ctx, 50);
|
|
585
701
|
const cursor = ctx.query.get("cursor");
|
|
586
702
|
const templateId = getQueryParam(ctx, "templateId");
|
|
587
703
|
const workflowInstanceId = getQueryParam(ctx, "workflowInstanceId");
|
|
@@ -597,18 +713,56 @@ function createHandlers(deps) {
|
|
|
597
713
|
if (status) conditions.push(eq(messageLogs.status, status));
|
|
598
714
|
if (taskId) conditions.push(eq(messageLogs.taskId, taskId));
|
|
599
715
|
if (campaign) conditions.push(eq(messageLogs.campaignId, campaign));
|
|
600
|
-
if (search) conditions.push(or(like(messageLogs.taskId,
|
|
601
|
-
|
|
602
|
-
|
|
603
|
-
|
|
716
|
+
if (search) conditions.push(or(like(messageLogs.taskId, contains(search)), like(messageLogs.templateId, contains(search)), like(messageLogs.providerMessageId, contains(search)), like(messageLogs.campaignId, contains(search))));
|
|
717
|
+
const start = decodeLogCursor(cursor);
|
|
718
|
+
const tsText = sql`${messageLogs.timestamp}::text`;
|
|
719
|
+
const position = (ts, id) => sql`(${ts}::timestamptz, ${id}::uuid)`;
|
|
720
|
+
const rowKey = sql`(${messageLogs.timestamp}, ${messageLogs.id})`;
|
|
721
|
+
const order = [];
|
|
722
|
+
const rowsByTask = /* @__PURE__ */ new Map();
|
|
723
|
+
let nextCursor = null;
|
|
724
|
+
let scanFrom = start;
|
|
725
|
+
let inclusive = true;
|
|
726
|
+
const batchSize = Math.max(limit * 4, 50);
|
|
727
|
+
for (let round = 0; round < 50 && nextCursor === null; round++) {
|
|
728
|
+
const batch = await deps.db.select({
|
|
729
|
+
row: messageLogs,
|
|
730
|
+
ts: tsText
|
|
731
|
+
}).from(messageLogs).where(and(...conditions, scanFrom ? sql`${rowKey} ${inclusive ? sql`<=` : sql`<`} ${position(scanFrom.ts, scanFrom.id)}` : void 0)).orderBy(desc(messageLogs.timestamp), desc(messageLogs.id)).limit(batchSize);
|
|
732
|
+
const fresh = [...new Set(batch.map((b) => b.row.taskId))].filter((t) => !rowsByTask.has(t));
|
|
733
|
+
const listedEarlier = /* @__PURE__ */ new Set();
|
|
734
|
+
if (start && fresh.length > 0) {
|
|
735
|
+
const newer = await deps.db.selectDistinct({ taskId: messageLogs.taskId }).from(messageLogs).where(and(...conditions, inArray(messageLogs.taskId, fresh), sql`${rowKey} > ${position(start.ts, start.id)}`));
|
|
736
|
+
for (const r of newer) listedEarlier.add(r.taskId);
|
|
737
|
+
}
|
|
738
|
+
for (const { row, ts } of batch) {
|
|
739
|
+
if (listedEarlier.has(row.taskId)) continue;
|
|
740
|
+
let rows = rowsByTask.get(row.taskId);
|
|
741
|
+
if (!rows) {
|
|
742
|
+
if (order.length === limit) {
|
|
743
|
+
nextCursor = encodeLogCursor(ts, row.id);
|
|
744
|
+
break;
|
|
745
|
+
}
|
|
746
|
+
rows = [];
|
|
747
|
+
order.push(row.taskId);
|
|
748
|
+
rowsByTask.set(row.taskId, rows);
|
|
749
|
+
}
|
|
750
|
+
rows.push(row);
|
|
751
|
+
}
|
|
752
|
+
if (batch.length < batchSize) break;
|
|
753
|
+
const last = batch[batch.length - 1];
|
|
754
|
+
scanFrom = {
|
|
755
|
+
ts: last.ts,
|
|
756
|
+
id: last.row.id
|
|
757
|
+
};
|
|
758
|
+
inclusive = false;
|
|
604
759
|
}
|
|
605
|
-
const logs = await deps.db.select().from(messageLogs).where(and(...conditions)).orderBy(desc(messageLogs.timestamp)).limit(limit * 2);
|
|
606
|
-
const deduplicatedMap = /* @__PURE__ */ new Map();
|
|
607
|
-
for (const log of logs) if (!deduplicatedMap.has(log.taskId)) deduplicatedMap.set(log.taskId, log);
|
|
608
|
-
else if (deduplicatedMap.get(log.taskId).status === "dispatched" && log.status !== "dispatched") deduplicatedMap.set(log.taskId, log);
|
|
609
760
|
sendJson(res, 200, {
|
|
610
|
-
logs:
|
|
611
|
-
|
|
761
|
+
logs: order.map((taskId) => {
|
|
762
|
+
const rows = rowsByTask.get(taskId);
|
|
763
|
+
return rows.find((r) => r.status !== "dispatched") ?? rows[0];
|
|
764
|
+
}),
|
|
765
|
+
nextCursor
|
|
612
766
|
});
|
|
613
767
|
}
|
|
614
768
|
async function getNotificationStatus(req, res, ctx) {
|
|
@@ -684,8 +838,7 @@ function createHandlers(deps) {
|
|
|
684
838
|
}
|
|
685
839
|
}
|
|
686
840
|
async function listTemplates(req, res, ctx) {
|
|
687
|
-
const
|
|
688
|
-
const limit = limitParam ? Math.min(parseInt(limitParam, 10), 100) : void 0;
|
|
841
|
+
const limit = parseLimit(ctx, void 0);
|
|
689
842
|
const channel = getQueryParam(ctx, "channel");
|
|
690
843
|
const topic = getQueryParam(ctx, "topic");
|
|
691
844
|
let templates = await deps.templateRepo.list(ctx.projectId);
|
|
@@ -714,8 +867,7 @@ function createHandlers(deps) {
|
|
|
714
867
|
sendNoContent(res);
|
|
715
868
|
}
|
|
716
869
|
async function listWorkflows(req, res, ctx) {
|
|
717
|
-
const
|
|
718
|
-
const limit = limitParam ? Math.min(parseInt(limitParam, 10), 100) : void 0;
|
|
870
|
+
const limit = parseLimit(ctx, void 0);
|
|
719
871
|
const search = getQueryParam(ctx, "search")?.trim().toLowerCase();
|
|
720
872
|
let workflows = await deps.workflowRepo.listDefinitions(ctx.projectId);
|
|
721
873
|
if (search) workflows = workflows.filter((w) => w.name?.toLowerCase().includes(search));
|
|
@@ -724,7 +876,7 @@ function createHandlers(deps) {
|
|
|
724
876
|
}
|
|
725
877
|
async function getWorkflow(req, res, ctx) {
|
|
726
878
|
const instanceId = ctx.params.id;
|
|
727
|
-
const workflow = await deps.workflowRepo.getInstance(ctx.projectId, instanceId);
|
|
879
|
+
const workflow = isUuid(instanceId) ? await deps.workflowRepo.getInstance(ctx.projectId, instanceId) : null;
|
|
728
880
|
if (!workflow) return sendJson(res, 404, {
|
|
729
881
|
error: "workflow_not_found",
|
|
730
882
|
id: instanceId
|
|
@@ -733,7 +885,7 @@ function createHandlers(deps) {
|
|
|
733
885
|
}
|
|
734
886
|
async function cancelWorkflow(req, res, ctx) {
|
|
735
887
|
const instanceId = ctx.params.id;
|
|
736
|
-
if (!await deps.workflowRepo.cancelInstance(ctx.projectId, instanceId)) return sendJson(res, 400, {
|
|
888
|
+
if (!(isUuid(instanceId) && await deps.workflowRepo.cancelInstance(ctx.projectId, instanceId))) return sendJson(res, 400, {
|
|
737
889
|
error: "workflow_not_cancelable",
|
|
738
890
|
id: instanceId
|
|
739
891
|
});
|
|
@@ -741,8 +893,7 @@ function createHandlers(deps) {
|
|
|
741
893
|
sendNoContent(res);
|
|
742
894
|
}
|
|
743
895
|
async function listUsers(req, res, ctx) {
|
|
744
|
-
const
|
|
745
|
-
const limit = isNaN(limitParam) ? 50 : Math.min(limitParam, 100);
|
|
896
|
+
const limit = parseLimit(ctx, 50);
|
|
746
897
|
const cursor = getQueryParam(ctx, "cursor");
|
|
747
898
|
const search = getQueryParam(ctx, "search");
|
|
748
899
|
const segment = getQueryParam(ctx, "segment");
|
|
@@ -770,7 +921,7 @@ function createHandlers(deps) {
|
|
|
770
921
|
}
|
|
771
922
|
async function deleteProject(req, res, ctx) {
|
|
772
923
|
const id = ctx.params.id;
|
|
773
|
-
if (!await deps.projectRepo.delete(id)) return sendJson(res, 404, { error: "project_not_found" });
|
|
924
|
+
if (!(isUuid(id) && await deps.projectRepo.delete(id))) return sendJson(res, 404, { error: "project_not_found" });
|
|
774
925
|
sendNoContent(res);
|
|
775
926
|
}
|
|
776
927
|
async function updateProject(req, res, ctx) {
|
|
@@ -781,7 +932,7 @@ function createHandlers(deps) {
|
|
|
781
932
|
throttleWindowHours: z.number().nullable().optional()
|
|
782
933
|
}).safeParse(await readJsonBody(req));
|
|
783
934
|
if (!parsed.success) return sendValidationError(res, parsed.error);
|
|
784
|
-
if (!await deps.projectRepo.updateSettings(id, parsed.data)) return sendJson(res, 404, { error: "project_not_found" });
|
|
935
|
+
if (!(isUuid(id) && await deps.projectRepo.updateSettings(id, parsed.data))) return sendJson(res, 404, { error: "project_not_found" });
|
|
785
936
|
await deps.redis.native.publish(PUBSUB_CHANNELS.PROJECT_INVALIDATED, id);
|
|
786
937
|
if (parsed.data.rateLimitRpm !== void 0) await deps.redis.native.publish(PUBSUB_CHANNELS.API_KEY_INVALIDATED, "*");
|
|
787
938
|
logger.info({ projectId: id }, "project settings updated");
|
|
@@ -791,7 +942,7 @@ function createHandlers(deps) {
|
|
|
791
942
|
const id = ctx.params.id;
|
|
792
943
|
const parsed = z.object({ role: z.enum(["admin", "read_only"]).default("admin") }).safeParse(await readJsonBody(req));
|
|
793
944
|
const role = parsed.success ? parsed.data.role : "admin";
|
|
794
|
-
|
|
945
|
+
if (!isUuid(id) || !await deps.projectRepo.findThrottleSettings(id)) return sendJson(res, 404, { error: "project_not_found" });
|
|
795
946
|
const apiKey = `nk_live_${randomBytes(32).toString("hex")}`;
|
|
796
947
|
const apiKeyHash = createHash("sha256").update(apiKey).digest("hex");
|
|
797
948
|
sendJson(res, 201, {
|
|
@@ -802,13 +953,14 @@ function createHandlers(deps) {
|
|
|
802
953
|
}
|
|
803
954
|
async function listProjectKeys(req, res, ctx) {
|
|
804
955
|
const id = ctx.params.id;
|
|
956
|
+
if (!isUuid(id)) return sendJson(res, 404, { error: "project_not_found" });
|
|
805
957
|
sendJson(res, 200, { keys: await deps.projectRepo.listApiKeys(id) });
|
|
806
958
|
}
|
|
807
959
|
async function deleteProjectKey(req, res, ctx) {
|
|
808
960
|
const { id, keyId } = ctx.params;
|
|
809
|
-
if (!await deps.projectRepo.deleteApiKey(id, keyId)) return sendJson(res, 404, { error: "key_not_found" });
|
|
961
|
+
if (!(isUuid(id) && isUuid(keyId) && await deps.projectRepo.deleteApiKey(id, keyId))) return sendJson(res, 404, { error: "key_not_found" });
|
|
810
962
|
await deps.redis.native.publish("apikey.invalidated", "*");
|
|
811
|
-
|
|
963
|
+
sendNoContent(res);
|
|
812
964
|
}
|
|
813
965
|
async function getSystemHealth(_req, res, _ctx) {
|
|
814
966
|
const keys = [
|
|
@@ -871,22 +1023,67 @@ function createHandlers(deps) {
|
|
|
871
1023
|
workers
|
|
872
1024
|
});
|
|
873
1025
|
}
|
|
1026
|
+
async function getStreamBacklog(redis, streamKey, targetGroup) {
|
|
1027
|
+
if (!targetGroup) return await redis.xlen(streamKey);
|
|
1028
|
+
if (typeof redis.xinfo === "function") try {
|
|
1029
|
+
const groups = await redis.xinfo("GROUPS", streamKey);
|
|
1030
|
+
if (Array.isArray(groups) && groups.length > 0) for (const item of groups) {
|
|
1031
|
+
const groupData = {};
|
|
1032
|
+
if (Array.isArray(item)) for (let i = 0; i < item.length; i += 2) groupData[String(item[i])] = item[i + 1];
|
|
1033
|
+
else if (item && typeof item === "object") Object.assign(groupData, item);
|
|
1034
|
+
if (groupData.name === targetGroup) {
|
|
1035
|
+
const pending = typeof groupData.pending === "number" ? groupData.pending : 0;
|
|
1036
|
+
if (typeof groupData.lag === "number") return groupData.lag + pending;
|
|
1037
|
+
if (groupData["last-delivered-id"] === "0-0") return await redis.xlen(streamKey) + pending;
|
|
1038
|
+
return pending;
|
|
1039
|
+
}
|
|
1040
|
+
}
|
|
1041
|
+
} catch {}
|
|
1042
|
+
return await redis.xlen(streamKey);
|
|
1043
|
+
}
|
|
874
1044
|
async function getSystemMetrics(_req, res, ctx) {
|
|
875
1045
|
const streamMap = {
|
|
876
|
-
INBOUND_CRITICAL:
|
|
877
|
-
|
|
878
|
-
|
|
879
|
-
|
|
880
|
-
|
|
881
|
-
|
|
882
|
-
|
|
883
|
-
|
|
884
|
-
|
|
885
|
-
|
|
1046
|
+
INBOUND_CRITICAL: {
|
|
1047
|
+
key: STREAMS.INBOUND_CRITICAL,
|
|
1048
|
+
group: CONSUMER_GROUPS.ENRICHER
|
|
1049
|
+
},
|
|
1050
|
+
INBOUND_NORMAL: {
|
|
1051
|
+
key: STREAMS.INBOUND_NORMAL,
|
|
1052
|
+
group: CONSUMER_GROUPS.ENRICHER
|
|
1053
|
+
},
|
|
1054
|
+
INBOUND_LOW: {
|
|
1055
|
+
key: STREAMS.INBOUND_LOW,
|
|
1056
|
+
group: CONSUMER_GROUPS.ENRICHER
|
|
1057
|
+
},
|
|
1058
|
+
ENRICHED_NORMAL: {
|
|
1059
|
+
key: STREAMS.ENRICHED_NORMAL,
|
|
1060
|
+
group: CONSUMER_GROUPS.ENGINE
|
|
1061
|
+
},
|
|
1062
|
+
OUTBOUND_CRITICAL: {
|
|
1063
|
+
key: STREAMS.OUTBOUND_CRITICAL,
|
|
1064
|
+
group: CONSUMER_GROUPS.DELIVERY
|
|
1065
|
+
},
|
|
1066
|
+
OUTBOUND_NORMAL: {
|
|
1067
|
+
key: STREAMS.OUTBOUND_NORMAL,
|
|
1068
|
+
group: CONSUMER_GROUPS.DELIVERY
|
|
1069
|
+
},
|
|
1070
|
+
OUTBOUND_LOW: {
|
|
1071
|
+
key: STREAMS.OUTBOUND_LOW,
|
|
1072
|
+
group: CONSUMER_GROUPS.DELIVERY
|
|
1073
|
+
},
|
|
1074
|
+
WORKFLOW_INBOUND: {
|
|
1075
|
+
key: STREAMS.WORKFLOW_INBOUND,
|
|
1076
|
+
group: CONSUMER_GROUPS.WORKFLOW
|
|
1077
|
+
},
|
|
1078
|
+
EVENTS_INBOUND: {
|
|
1079
|
+
key: STREAMS.EVENTS_INBOUND,
|
|
1080
|
+
group: CONSUMER_GROUPS.EVENTS
|
|
1081
|
+
},
|
|
1082
|
+
DEAD_LETTER: { key: STREAMS.DEAD_LETTER }
|
|
886
1083
|
};
|
|
887
1084
|
const streamDepths = {};
|
|
888
|
-
if (ctx.isAdmin !== false) for (const [key, realRedisKey] of Object.entries(streamMap)) try {
|
|
889
|
-
streamDepths[key] = await deps.redis.native
|
|
1085
|
+
if (ctx.isAdmin !== false) for (const [key, { key: realRedisKey, group }] of Object.entries(streamMap)) try {
|
|
1086
|
+
streamDepths[key] = await getStreamBacklog(deps.redis.native, realRedisKey, group);
|
|
890
1087
|
} catch {
|
|
891
1088
|
streamDepths[key] = 0;
|
|
892
1089
|
}
|
|
@@ -917,30 +1114,28 @@ function createHandlers(deps) {
|
|
|
917
1114
|
}
|
|
918
1115
|
async function getDLQMessages(_req, res, ctx) {
|
|
919
1116
|
try {
|
|
920
|
-
const allMessages = (await deps.redis.native.xrevrange(STREAMS.DEAD_LETTER, "+", "-", "COUNT", "100") || []).map(([id, fields]) =>
|
|
921
|
-
|
|
922
|
-
|
|
923
|
-
|
|
924
|
-
|
|
925
|
-
|
|
926
|
-
|
|
927
|
-
|
|
928
|
-
|
|
929
|
-
return {
|
|
930
|
-
id,
|
|
931
|
-
eventType: fieldMap.eventType || fieldMap.event_type || "unknown",
|
|
932
|
-
payload,
|
|
933
|
-
error: fieldMap.error || fieldMap.reason || "Dead letter payload",
|
|
934
|
-
timestamp: fieldMap.timestamp || (/* @__PURE__ */ new Date()).toISOString()
|
|
935
|
-
};
|
|
936
|
-
});
|
|
937
|
-
sendJson(res, 200, { messages: (ctx.projectId ? allMessages.filter((m) => {
|
|
938
|
-
return (m.payload?.projectId ?? m.payload?.project_id ?? m.projectId) === ctx.projectId;
|
|
939
|
-
}) : allMessages).slice(0, 50) });
|
|
1117
|
+
const allMessages = (await deps.redis.native.xrevrange(STREAMS.DEAD_LETTER, "+", "-", "COUNT", "100") || []).map(([id, fields]) => parseDlqEntry(id, fields));
|
|
1118
|
+
sendJson(res, 200, { messages: (ctx.projectId ? allMessages.filter((m) => m.projectId === ctx.projectId) : allMessages).slice(0, 50).map((m) => ({
|
|
1119
|
+
id: m.id,
|
|
1120
|
+
eventType: m.eventType,
|
|
1121
|
+
payload: m.payload,
|
|
1122
|
+
error: m.error,
|
|
1123
|
+
timestamp: m.timestamp,
|
|
1124
|
+
originalStream: m.originalStream
|
|
1125
|
+
})) });
|
|
940
1126
|
} catch {
|
|
941
1127
|
sendJson(res, 200, { messages: [] });
|
|
942
1128
|
}
|
|
943
1129
|
}
|
|
1130
|
+
/** The entry, or null when it does not exist or belongs to another project. */
|
|
1131
|
+
async function findDlqEntry(ctx, messageId) {
|
|
1132
|
+
if (!/^\d+-\d+$/.test(messageId)) return null;
|
|
1133
|
+
const rawEntries = await deps.redis.native.xrange(STREAMS.DEAD_LETTER, messageId, messageId);
|
|
1134
|
+
if (!rawEntries || rawEntries.length === 0 || !rawEntries[0]) return null;
|
|
1135
|
+
const entry = parseDlqEntry(rawEntries[0][0], rawEntries[0][1]);
|
|
1136
|
+
if (ctx.projectId && entry.projectId !== ctx.projectId) return null;
|
|
1137
|
+
return entry;
|
|
1138
|
+
}
|
|
944
1139
|
async function replayDLQMessage(req, res, ctx) {
|
|
945
1140
|
const messageId = (await readJsonBody(req).catch(() => ({})))?.id;
|
|
946
1141
|
if (!messageId) {
|
|
@@ -948,34 +1143,24 @@ function createHandlers(deps) {
|
|
|
948
1143
|
return;
|
|
949
1144
|
}
|
|
950
1145
|
try {
|
|
951
|
-
const
|
|
952
|
-
if (!
|
|
1146
|
+
const entry = await findDlqEntry(ctx, messageId);
|
|
1147
|
+
if (!entry) {
|
|
953
1148
|
sendJson(res, 404, { error: "dlq_message_not_found" });
|
|
954
1149
|
return;
|
|
955
1150
|
}
|
|
956
|
-
const
|
|
957
|
-
|
|
958
|
-
|
|
959
|
-
|
|
960
|
-
if (fieldMap.payload) try {
|
|
961
|
-
payload = JSON.parse(fieldMap.payload);
|
|
962
|
-
} catch {}
|
|
963
|
-
if (ctx.projectId) {
|
|
964
|
-
if ((payload?.projectId ?? payload?.project_id ?? fieldMap.projectId) !== ctx.projectId) {
|
|
965
|
-
sendJson(res, 404, { error: "dlq_message_not_found" });
|
|
966
|
-
return;
|
|
967
|
-
}
|
|
968
|
-
}
|
|
969
|
-
const priority = fieldMap.priority || "normal";
|
|
970
|
-
const p = getPriorityBucket(priority);
|
|
971
|
-
const targetStream = STREAMS[`INBOUND_${p.toUpperCase()}`] || STREAMS.INBOUND_NORMAL;
|
|
1151
|
+
const replayable = new Set(Object.values(STREAMS));
|
|
1152
|
+
replayable.delete(STREAMS.DEAD_LETTER);
|
|
1153
|
+
const inbound = STREAMS[`INBOUND_${getPriorityBucket(entry.payload?.priority ?? entry.fields.priority).toUpperCase()}`] ?? STREAMS.INBOUND_NORMAL;
|
|
1154
|
+
const targetStream = entry.originalStream && replayable.has(entry.originalStream) ? entry.originalStream : inbound;
|
|
972
1155
|
const xaddArgs = [];
|
|
973
|
-
|
|
1156
|
+
if (entry.event) xaddArgs.push("data", JSON.stringify(entry.event));
|
|
1157
|
+
else for (const [k, v] of Object.entries(entry.fields)) xaddArgs.push(k, v);
|
|
974
1158
|
await deps.redis.native.xadd(targetStream, "*", ...xaddArgs);
|
|
975
1159
|
await deps.redis.native.xdel(STREAMS.DEAD_LETTER, messageId);
|
|
976
1160
|
sendJson(res, 200, {
|
|
977
1161
|
success: true,
|
|
978
|
-
replayedId: messageId
|
|
1162
|
+
replayedId: messageId,
|
|
1163
|
+
stream: targetStream
|
|
979
1164
|
});
|
|
980
1165
|
} catch (err) {
|
|
981
1166
|
sendJson(res, 500, {
|
|
@@ -988,23 +1173,9 @@ function createHandlers(deps) {
|
|
|
988
1173
|
const messageId = ctx.params.id;
|
|
989
1174
|
if (!messageId) return sendJson(res, 400, { error: "missing_id" });
|
|
990
1175
|
try {
|
|
991
|
-
if (ctx
|
|
992
|
-
|
|
993
|
-
|
|
994
|
-
sendJson(res, 404, { error: "dlq_message_not_found" });
|
|
995
|
-
return;
|
|
996
|
-
}
|
|
997
|
-
const fields = rawEntries[0][1];
|
|
998
|
-
const fieldMap = {};
|
|
999
|
-
for (let i = 0; i < fields.length; i += 2) fieldMap[fields[i]] = fields[i + 1];
|
|
1000
|
-
let payload = null;
|
|
1001
|
-
if (fieldMap.payload) try {
|
|
1002
|
-
payload = JSON.parse(fieldMap.payload);
|
|
1003
|
-
} catch {}
|
|
1004
|
-
if ((payload?.projectId ?? payload?.project_id ?? fieldMap.projectId) !== ctx.projectId) {
|
|
1005
|
-
sendJson(res, 404, { error: "dlq_message_not_found" });
|
|
1006
|
-
return;
|
|
1007
|
-
}
|
|
1176
|
+
if (!await findDlqEntry(ctx, messageId)) {
|
|
1177
|
+
sendJson(res, 404, { error: "dlq_message_not_found" });
|
|
1178
|
+
return;
|
|
1008
1179
|
}
|
|
1009
1180
|
await deps.redis.native.xdel(STREAMS.DEAD_LETTER, messageId);
|
|
1010
1181
|
sendJson(res, 200, { success: true });
|
|
@@ -1016,8 +1187,7 @@ function createHandlers(deps) {
|
|
|
1016
1187
|
}
|
|
1017
1188
|
}
|
|
1018
1189
|
async function getScheduledMessages(_req, res, ctx) {
|
|
1019
|
-
const
|
|
1020
|
-
const limit = limitParam ? Math.min(parseInt(limitParam, 10), 100) : 50;
|
|
1190
|
+
const limit = parseLimit(ctx, 50);
|
|
1021
1191
|
const cursor = getQueryParam(ctx, "cursor");
|
|
1022
1192
|
const channel = getQueryParam(ctx, "channel");
|
|
1023
1193
|
const conditions = [sql`(payload->>'projectId') = ${ctx.projectId}`];
|
|
@@ -1142,8 +1312,7 @@ code{background:#f4f4f5;padding:.1rem .35rem;border-radius:4px}</style>
|
|
|
1142
1312
|
sendHtml(res, 200, page("You're unsubscribed", `<p>We've stopped sending ${claim.topics.length > 0 ? "these messages" : "messages"} to <code>${escapeHtml(claim.target)}</code>. It may take a few minutes to take effect for mail already on its way.</p>`));
|
|
1143
1313
|
}
|
|
1144
1314
|
async function listCampaigns(_req, res, ctx) {
|
|
1145
|
-
const
|
|
1146
|
-
const limit = isNaN(limitParam) ? 20 : Math.min(Math.max(limitParam, 1), 100);
|
|
1315
|
+
const limit = parseLimit(ctx, 20);
|
|
1147
1316
|
const search = getQueryParam(ctx, "search")?.trim();
|
|
1148
1317
|
const channel = getQueryParam(ctx, "channel")?.trim();
|
|
1149
1318
|
const since = getQueryParam(ctx, "since")?.trim();
|
|
@@ -1151,7 +1320,7 @@ code{background:#f4f4f5;padding:.1rem .35rem;border-radius:4px}</style>
|
|
|
1151
1320
|
const minMessagesParam = parseInt(getQueryParam(ctx, "minMessages") || "", 10);
|
|
1152
1321
|
const minMessages = isNaN(minMessagesParam) ? void 0 : Math.max(minMessagesParam, 1);
|
|
1153
1322
|
const conditions = [eq(messageLogs.projectId, ctx.projectId), isNotNull(messageLogs.campaignId)];
|
|
1154
|
-
if (search) conditions.push(like(messageLogs.campaignId,
|
|
1323
|
+
if (search) conditions.push(like(messageLogs.campaignId, contains(search)));
|
|
1155
1324
|
if (channel) conditions.push(eq(messageLogs.channel, channel));
|
|
1156
1325
|
if (since) {
|
|
1157
1326
|
const sinceDate = new Date(since);
|
|
@@ -1210,8 +1379,8 @@ code{background:#f4f4f5;padding:.1rem .35rem;border-radius:4px}</style>
|
|
|
1210
1379
|
const bucket = byChannel.get(row.channel) ?? blank();
|
|
1211
1380
|
const n = Number(row.tasks ?? 0);
|
|
1212
1381
|
if (ENGAGEMENT.includes(row.kind)) bucket[row.kind] += n;
|
|
1382
|
+
else if (row.kind === "dispatched") bucket.sent += n;
|
|
1213
1383
|
else {
|
|
1214
|
-
bucket.sent += n;
|
|
1215
1384
|
if (row.status === "delivered") bucket.delivered += n;
|
|
1216
1385
|
if (row.status === "failed") bucket.failed += n;
|
|
1217
1386
|
}
|
|
@@ -1243,15 +1412,14 @@ code{background:#f4f4f5;padding:.1rem .35rem;border-radius:4px}</style>
|
|
|
1243
1412
|
});
|
|
1244
1413
|
}
|
|
1245
1414
|
async function listSuppressions(_req, res, ctx) {
|
|
1246
|
-
const
|
|
1247
|
-
const limit = isNaN(limitParam) ? 100 : Math.min(Math.max(limitParam, 1), 500);
|
|
1415
|
+
const limit = parseLimit(ctx, 100, 500);
|
|
1248
1416
|
const channel = getQueryParam(ctx, "channel");
|
|
1249
1417
|
const reason = getQueryParam(ctx, "reason");
|
|
1250
1418
|
const target = getQueryParam(ctx, "target");
|
|
1251
1419
|
const conditions = [eq(suppressions.projectId, ctx.projectId)];
|
|
1252
1420
|
if (channel) conditions.push(eq(suppressions.channel, channel));
|
|
1253
1421
|
if (reason) conditions.push(eq(suppressions.reason, reason));
|
|
1254
|
-
if (target) conditions.push(like(suppressions.target,
|
|
1422
|
+
if (target) conditions.push(like(suppressions.target, contains(target.toLowerCase().trim())));
|
|
1255
1423
|
sendJson(res, 200, { suppressions: await deps.db.select().from(suppressions).where(and(...conditions)).orderBy(desc(suppressions.createdAt)).limit(limit) });
|
|
1256
1424
|
}
|
|
1257
1425
|
async function createSuppression(req, res, ctx) {
|
|
@@ -1431,14 +1599,37 @@ const MIME_TYPES = {
|
|
|
1431
1599
|
".txt": "text/plain; charset=utf-8",
|
|
1432
1600
|
".map": "application/json; charset=utf-8"
|
|
1433
1601
|
};
|
|
1434
|
-
const
|
|
1435
|
-
|
|
1436
|
-
|
|
1437
|
-
|
|
1438
|
-
|
|
1602
|
+
const DASHBOARD_SUBDIRS = [
|
|
1603
|
+
["dashboard", "dist"],
|
|
1604
|
+
["dashboard", "out"],
|
|
1605
|
+
["dist", "admin"],
|
|
1606
|
+
["dist", "dashboard"]
|
|
1439
1607
|
];
|
|
1440
|
-
|
|
1441
|
-
|
|
1608
|
+
const MODULE_DIR = dirname(fileURLToPath(import.meta.url));
|
|
1609
|
+
/** The nearest ancestor of `dir` holding a package.json: notifkit's own root. */
|
|
1610
|
+
function packageRoot(dir) {
|
|
1611
|
+
for (let d = dir;; d = dirname(d)) {
|
|
1612
|
+
if (existsSync(join(d, "package.json"))) return d;
|
|
1613
|
+
if (dirname(d) === d) return null;
|
|
1614
|
+
}
|
|
1615
|
+
}
|
|
1616
|
+
/**
|
|
1617
|
+
* Locates the built dashboard.
|
|
1618
|
+
*
|
|
1619
|
+
* The package ships `dashboard/dist`, so it is looked for beside this module
|
|
1620
|
+
* first. Resolving it from the working directory alone found it only when the
|
|
1621
|
+
* process was started from a notifkit checkout; installed as a dependency, the
|
|
1622
|
+
* working directory is the host app's and /admin reported "not built".
|
|
1623
|
+
* `NOTIFKIT_DASHBOARD_DIR` overrides both.
|
|
1624
|
+
*/
|
|
1625
|
+
function findDashboardDir(moduleDir = MODULE_DIR, cwd = process.cwd(), env = process.env) {
|
|
1626
|
+
const override = env.NOTIFKIT_DASHBOARD_DIR;
|
|
1627
|
+
if (override && existsSync(join(override, "index.html"))) return resolve(override);
|
|
1628
|
+
const bases = [packageRoot(moduleDir), cwd].filter((b) => b !== null);
|
|
1629
|
+
for (const base of bases) for (const sub of DASHBOARD_SUBDIRS) {
|
|
1630
|
+
const dir = resolve(base, ...sub);
|
|
1631
|
+
if (existsSync(join(dir, "index.html"))) return dir;
|
|
1632
|
+
}
|
|
1442
1633
|
return null;
|
|
1443
1634
|
}
|
|
1444
1635
|
/**
|
|
@@ -1481,7 +1672,7 @@ async function handleAdminRequest(req, res, url) {
|
|
|
1481
1672
|
const targetPort = devProxyUrl ? parseInt(new URL(devProxyUrl).port, 10) : 5173;
|
|
1482
1673
|
if (await proxyToDevServer(req, res, devProxyUrl ? new URL(devProxyUrl).hostname : "127.0.0.1", targetPort)) return true;
|
|
1483
1674
|
}
|
|
1484
|
-
const dashboardDir =
|
|
1675
|
+
const dashboardDir = findDashboardDir();
|
|
1485
1676
|
if (!dashboardDir) {
|
|
1486
1677
|
res.writeHead(200, { "Content-Type": "text/html; charset=utf-8" });
|
|
1487
1678
|
res.end(`
|
|
@@ -1567,6 +1758,8 @@ async function handleAdminRequest(req, res, url) {
|
|
|
1567
1758
|
//#region src/services/api/main.ts
|
|
1568
1759
|
/** Pub/sub channel used to drop a cached API key across every API process. */
|
|
1569
1760
|
const API_KEY_INVALIDATION_CHANNEL = "apikey.invalidated";
|
|
1761
|
+
/** Default window length in milliseconds for API rate limiting (1 minute). */
|
|
1762
|
+
const API_RATE_LIMIT_WINDOW_MS = 6e4;
|
|
1570
1763
|
loadEnv();
|
|
1571
1764
|
const config = readBaseConfig();
|
|
1572
1765
|
let logger;
|
|
@@ -1578,8 +1771,10 @@ let deps;
|
|
|
1578
1771
|
let h;
|
|
1579
1772
|
const AUTH_CACHE_TTL_MS = 6e4;
|
|
1580
1773
|
let authCache = new LRUCache(1e3, AUTH_CACHE_TTL_MS);
|
|
1774
|
+
let tokenHashToToken = /* @__PURE__ */ new Map();
|
|
1581
1775
|
let authSubscriber = null;
|
|
1582
1776
|
let router;
|
|
1777
|
+
let apiRateLimiter;
|
|
1583
1778
|
function extractAuthToken(req) {
|
|
1584
1779
|
const authHeader = req.headers["authorization"];
|
|
1585
1780
|
if (typeof authHeader === "string" && authHeader.toLowerCase().startsWith("bearer ")) return authHeader.slice(7).trim();
|
|
@@ -1732,11 +1927,16 @@ async function startApiServer() {
|
|
|
1732
1927
|
logger.fatal("UNSUBSCRIBE_SECRET is required in production. Without it, all unsubscribe links return 400 and opt-outs are silently dropped. Set a random string of 32+ characters and restart.");
|
|
1733
1928
|
process.exit(1);
|
|
1734
1929
|
}
|
|
1735
|
-
redis =
|
|
1930
|
+
redis = RedisClient.shared({
|
|
1736
1931
|
url: config.REDIS_URL,
|
|
1737
1932
|
name: "api",
|
|
1738
1933
|
logger
|
|
1739
1934
|
});
|
|
1935
|
+
apiRateLimiter = new ApiRateLimiter({
|
|
1936
|
+
redis: redis.native,
|
|
1937
|
+
windowMs: API_RATE_LIMIT_WINDOW_MS,
|
|
1938
|
+
logger
|
|
1939
|
+
});
|
|
1740
1940
|
const dbData = createDatabase({
|
|
1741
1941
|
url: config.DATABASE_URL,
|
|
1742
1942
|
applicationName: "api",
|
|
@@ -1803,41 +2003,49 @@ async function startApiServer() {
|
|
|
1803
2003
|
router = new Router();
|
|
1804
2004
|
router.post("/v1/auth/login", h.login).post("/v1/auth/logout", h.logout).get("/v1/auth/me", h.getMe).put("/v1/templates", h.syncTemplates).get("/v1/templates", h.listTemplates).get("/v1/templates/:id", h.getTemplate).delete("/v1/templates/:id", h.deleteTemplate).post("/v1/users", h.addUser).get("/v1/users", h.listUsers).get("/v1/users/:id", h.getUser).get("/v1/users/:id/details", h.getUserDetails).patch("/v1/users/:id", h.updateUser).delete("/v1/users/:id", h.deleteUser).post("/v1/users/:id/contacts", h.addContact).get("/v1/users/:id/contacts", h.getUserContacts).delete("/v1/users/:id/contacts/:channel/:target", h.deleteContact).get("/v1/users/:id/preferences", h.getUserPreferences).patch("/v1/users/:id/preferences", h.updateUserPreferences).post("/v1/notify", h.notify).get("/v1/notifications/scheduled", h.getScheduledMessages).get("/v1/notifications/logs", h.getNotificationLogs).get("/v1/notifications/:taskId", h.getNotificationStatus).delete("/v1/notifications/:taskId", h.cancelNotification).get("/v1/unsubscribe", h.unsubscribePage).post("/v1/unsubscribe", h.unsubscribe).get("/v1/campaigns", h.listCampaigns).get("/v1/campaigns/:campaign/stats", h.getCampaignStats).get("/v1/suppressions", h.listSuppressions).post("/v1/suppressions", h.createSuppression).delete("/v1/suppressions/:channel/:target", h.deleteSuppression).get("/v1/system/health", h.getSystemHealth).get("/v1/system/metrics", h.getSystemMetrics).get("/v1/dlq", h.getDLQMessages).post("/v1/dlq/replay", h.replayDLQMessage).delete("/v1/dlq/:id", h.deleteDLQMessage).post("/v1/workflows", h.createWorkflow).get("/v1/workflows", h.listWorkflows).get("/v1/workflows/instances/:id", h.getWorkflow).delete("/v1/workflows/instances/:id", h.cancelWorkflow).post("/v1/workflows/trigger", h.triggerWorkflow).get("/v1/segments", h.listSegments).post("/v1/events", h.ingestEvent).get("/v1/events/stream", h.getEventsStream).get("/v1/projects", h.listProjects).post("/v1/projects", handleCreateProject).delete("/v1/projects/:id", h.deleteProject).patch("/v1/projects/:id", h.updateProject).post("/v1/projects/:id/keys", h.createProjectKey).get("/v1/projects/:id/keys", h.listProjectKeys).delete("/v1/projects/:id/keys/:keyId", h.deleteProjectKey).get("/health", handleHealth).get("/metrics", handleMetrics).get("/live", handleLive).get("/ready", handleReady);
|
|
1805
2005
|
server = createServer((req, res) => {
|
|
1806
|
-
handleRequest(req, res)
|
|
2006
|
+
handleRequest(req, res).catch((err) => {
|
|
2007
|
+
logger.error({ err }, "unhandled api request error");
|
|
2008
|
+
if (!res.headersSent) sendJson(res, 500, { error: "internal_error" });
|
|
2009
|
+
});
|
|
1807
2010
|
});
|
|
1808
2011
|
server.requestTimeout = 3e4;
|
|
1809
2012
|
server.headersTimeout = 1e4;
|
|
1810
2013
|
server.keepAliveTimeout = 5e3;
|
|
1811
2014
|
async function handleRequest(req, res) {
|
|
1812
|
-
const
|
|
2015
|
+
const rawUrl = req.url ?? "/";
|
|
2016
|
+
const qIdx = rawUrl.indexOf("?");
|
|
2017
|
+
const pathname = qIdx === -1 ? rawUrl : rawUrl.slice(0, qIdx);
|
|
2018
|
+
let _lazyUrl = null;
|
|
2019
|
+
const getUrl = () => _lazyUrl ??= new URL(rawUrl, "http://n");
|
|
2020
|
+
const searchParams = () => getUrl().searchParams;
|
|
1813
2021
|
const origin = req.headers["origin"];
|
|
1814
2022
|
const allowedOrigins = (config.CORS_ORIGIN ?? "").split(",").map((s) => s.trim()).filter(Boolean);
|
|
1815
|
-
if (
|
|
2023
|
+
if (pathname.startsWith("/v1/auth/") || pathname === "/v1/projects" || pathname.startsWith("/v1/projects/") || pathname.startsWith("/v1/system/") || pathname.startsWith("/v1/dlq")) {
|
|
1816
2024
|
if (origin && allowedOrigins.includes(origin)) {
|
|
1817
2025
|
res.setHeader("Access-Control-Allow-Origin", origin);
|
|
1818
2026
|
res.setHeader("Vary", "Origin");
|
|
1819
2027
|
}
|
|
1820
2028
|
} else res.setHeader("Access-Control-Allow-Origin", "*");
|
|
1821
2029
|
res.setHeader("Access-Control-Allow-Methods", "GET, POST, PUT, PATCH, DELETE, OPTIONS");
|
|
1822
|
-
res.setHeader("Access-Control-Allow-Headers", "Content-Type, Authorization, x-api-key, x-project-id");
|
|
2030
|
+
res.setHeader("Access-Control-Allow-Headers", "Content-Type, Authorization, x-api-key, x-project-id, x-idempotency-key");
|
|
1823
2031
|
if (req.method === "OPTIONS") {
|
|
1824
2032
|
res.writeHead(204);
|
|
1825
2033
|
res.end();
|
|
1826
2034
|
return;
|
|
1827
2035
|
}
|
|
1828
|
-
if (
|
|
1829
|
-
if (await handleAdminRequest(req, res,
|
|
2036
|
+
if (pathname === "/admin" || pathname.startsWith("/admin/")) {
|
|
2037
|
+
if (await handleAdminRequest(req, res, getUrl())) return;
|
|
1830
2038
|
}
|
|
1831
2039
|
let projectId = void 0;
|
|
1832
2040
|
let projectRateLimitRpm = 600;
|
|
1833
2041
|
let keyRole = "admin";
|
|
1834
2042
|
let isAdminToken = false;
|
|
1835
|
-
const isProjectManagement =
|
|
1836
|
-
const isPublicUnsubscribe =
|
|
1837
|
-
const isPublicAuth =
|
|
1838
|
-
if (
|
|
2043
|
+
const isProjectManagement = pathname === "/v1/projects" || pathname.startsWith("/v1/projects/");
|
|
2044
|
+
const isPublicUnsubscribe = pathname === "/v1/unsubscribe";
|
|
2045
|
+
const isPublicAuth = pathname === "/v1/auth/login";
|
|
2046
|
+
if (pathname.startsWith("/v1/") && !isProjectManagement && !isPublicUnsubscribe && !isPublicAuth) {
|
|
1839
2047
|
let token = extractAuthToken(req);
|
|
1840
|
-
if (!token &&
|
|
2048
|
+
if (!token && searchParams().has("token")) token = searchParams().get("token") || void 0;
|
|
1841
2049
|
if (!token) {
|
|
1842
2050
|
sendJson(res, 401, {
|
|
1843
2051
|
error: "unauthorized",
|
|
@@ -1857,8 +2065,8 @@ async function startApiServer() {
|
|
|
1857
2065
|
if (expectedBuffer.length === providedBuffer.length && timingSafeEqual(expectedBuffer, providedBuffer)) isAdminToken = true;
|
|
1858
2066
|
}
|
|
1859
2067
|
if (isAdminToken) {
|
|
1860
|
-
const headerProjectId = req.headers["x-project-id"] ||
|
|
1861
|
-
const isProjectAgnostic =
|
|
2068
|
+
const headerProjectId = req.headers["x-project-id"] || searchParams().get("projectId") || void 0;
|
|
2069
|
+
const isProjectAgnostic = pathname.startsWith("/v1/auth/") || pathname.startsWith("/v1/system/") || pathname.startsWith("/v1/dlq");
|
|
1862
2070
|
if (!headerProjectId && !isProjectAgnostic) {
|
|
1863
2071
|
sendJson(res, 400, {
|
|
1864
2072
|
error: "bad_request",
|
|
@@ -1870,14 +2078,13 @@ async function startApiServer() {
|
|
|
1870
2078
|
projectRateLimitRpm = 6e3;
|
|
1871
2079
|
if (!token.startsWith("nk_sess_")) keyRole = "admin";
|
|
1872
2080
|
} else {
|
|
1873
|
-
const
|
|
1874
|
-
const cached = authCache.get(tokenHash);
|
|
2081
|
+
const cached = authCache.get(token);
|
|
1875
2082
|
if (cached) {
|
|
1876
|
-
|
|
1877
|
-
|
|
1878
|
-
|
|
1879
|
-
keyRole = parts[2];
|
|
2083
|
+
projectId = cached.projectId;
|
|
2084
|
+
projectRateLimitRpm = cached.projectRateLimitRpm;
|
|
2085
|
+
keyRole = cached.keyRole;
|
|
1880
2086
|
} else {
|
|
2087
|
+
const tokenHash = createHash("sha256").update(token).digest("hex");
|
|
1881
2088
|
const rows = await db.select({
|
|
1882
2089
|
id: projects.id,
|
|
1883
2090
|
rateLimitRpm: projects.rateLimitRpm,
|
|
@@ -1890,10 +2097,18 @@ async function startApiServer() {
|
|
|
1890
2097
|
});
|
|
1891
2098
|
return;
|
|
1892
2099
|
}
|
|
1893
|
-
|
|
2100
|
+
const matchedProjectId = rows[0].id;
|
|
2101
|
+
projectId = matchedProjectId;
|
|
1894
2102
|
projectRateLimitRpm = rows[0].rateLimitRpm ?? 600;
|
|
1895
2103
|
keyRole = rows[0].role;
|
|
1896
|
-
authCache.set(
|
|
2104
|
+
authCache.set(token, {
|
|
2105
|
+
projectId: matchedProjectId,
|
|
2106
|
+
projectRateLimitRpm,
|
|
2107
|
+
keyRole,
|
|
2108
|
+
tokenHash
|
|
2109
|
+
});
|
|
2110
|
+
tokenHashToToken.set(tokenHash, token);
|
|
2111
|
+
if (tokenHashToToken.size > 2e3) tokenHashToToken.clear();
|
|
1897
2112
|
}
|
|
1898
2113
|
}
|
|
1899
2114
|
if (keyRole === "read_only") {
|
|
@@ -1905,24 +2120,12 @@ async function startApiServer() {
|
|
|
1905
2120
|
return;
|
|
1906
2121
|
}
|
|
1907
2122
|
}
|
|
1908
|
-
|
|
1909
|
-
|
|
1910
|
-
|
|
1911
|
-
|
|
1912
|
-
|
|
1913
|
-
|
|
1914
|
-
redis.call("ZREMRANGEBYSCORE", key, "-inf", cutoff)
|
|
1915
|
-
local count = redis.call("ZCARD", key)
|
|
1916
|
-
if count < maxReqs then
|
|
1917
|
-
redis.call("ZADD", key, now, now .. "-" .. ARGV[4])
|
|
1918
|
-
redis.call("EXPIRE", key, math.ceil(window / 1000))
|
|
1919
|
-
return count + 1
|
|
1920
|
-
end
|
|
1921
|
-
return -1
|
|
1922
|
-
`;
|
|
1923
|
-
const rlKey = `rate-limit:api:req:${projectId || "global"}`;
|
|
1924
|
-
const nowMs = Date.now();
|
|
1925
|
-
if (await redis.native.eval(LUA_LIMIT, 1, rlKey, nowMs, 6e4, projectRateLimitRpm, randomBytes(4).toString("hex")) === -1) {
|
|
2123
|
+
if (!apiRateLimiter && redis?.native) apiRateLimiter = new ApiRateLimiter({
|
|
2124
|
+
redis: redis.native,
|
|
2125
|
+
windowMs: API_RATE_LIMIT_WINDOW_MS,
|
|
2126
|
+
logger
|
|
2127
|
+
});
|
|
2128
|
+
if (!(apiRateLimiter ? await apiRateLimiter.check(projectId || "global", projectRateLimitRpm) : true)) {
|
|
1926
2129
|
if (!res.headersSent) {
|
|
1927
2130
|
res.setHeader("Retry-After", "60");
|
|
1928
2131
|
sendJson(res, 429, {
|
|
@@ -1991,14 +2194,14 @@ async function startApiServer() {
|
|
|
1991
2194
|
logger.warn({ err }, "auth rate limit unavailable — allowing request");
|
|
1992
2195
|
}
|
|
1993
2196
|
}
|
|
1994
|
-
const route = router.match(req.method ?? "GET",
|
|
2197
|
+
const route = router.match(req.method ?? "GET", pathname);
|
|
1995
2198
|
if (!route) {
|
|
1996
2199
|
sendJson(res, 404, { error: "not_found" });
|
|
1997
2200
|
return;
|
|
1998
2201
|
}
|
|
1999
2202
|
const ctx = {
|
|
2000
2203
|
params: route.params,
|
|
2001
|
-
query:
|
|
2204
|
+
query: searchParams(),
|
|
2002
2205
|
projectId,
|
|
2003
2206
|
role: keyRole,
|
|
2004
2207
|
isAdmin: isAdminToken
|
|
@@ -2013,20 +2216,29 @@ async function startApiServer() {
|
|
|
2013
2216
|
}
|
|
2014
2217
|
logger.error({
|
|
2015
2218
|
err,
|
|
2016
|
-
path:
|
|
2219
|
+
path: pathname
|
|
2017
2220
|
}, "unhandled request error");
|
|
2018
2221
|
if (!res.headersSent) sendJson(res, 500, { error: "internal_error" });
|
|
2019
2222
|
});
|
|
2020
2223
|
}
|
|
2021
|
-
authSubscriber = redis.native.duplicate();
|
|
2224
|
+
authSubscriber = redis.native.duplicate({ enableAutoPipelining: false });
|
|
2022
2225
|
await authSubscriber.subscribe(API_KEY_INVALIDATION_CHANNEL);
|
|
2023
2226
|
authSubscriber.on("message", (channel, tokenHash) => {
|
|
2024
2227
|
if (channel !== "apikey.invalidated") return;
|
|
2025
|
-
if (tokenHash === "*")
|
|
2026
|
-
|
|
2228
|
+
if (tokenHash === "*") {
|
|
2229
|
+
authCache.clear();
|
|
2230
|
+
tokenHashToToken.clear();
|
|
2231
|
+
apiRateLimiter?.clear();
|
|
2232
|
+
} else {
|
|
2233
|
+
const token = tokenHashToToken.get(tokenHash);
|
|
2234
|
+
if (token) {
|
|
2235
|
+
authCache.delete(token);
|
|
2236
|
+
tokenHashToToken.delete(tokenHash);
|
|
2237
|
+
}
|
|
2238
|
+
authCache.delete(tokenHash);
|
|
2239
|
+
}
|
|
2027
2240
|
logger.info({ tokenHash }, "api key cache invalidated");
|
|
2028
2241
|
});
|
|
2029
|
-
const { transportRegistry } = await import("./index.mjs").then((n) => n.t);
|
|
2030
2242
|
for (const channel of transportRegistry.registeredChannels()) {
|
|
2031
2243
|
const transport = transportRegistry.get(channel);
|
|
2032
2244
|
if (!transport?.webhookPath) continue;
|
|
@@ -2175,6 +2387,7 @@ async function stopApiServer() {
|
|
|
2175
2387
|
authSubscriber = null;
|
|
2176
2388
|
}
|
|
2177
2389
|
authCache = new LRUCache(1e3, AUTH_CACHE_TTL_MS);
|
|
2390
|
+
tokenHashToToken.clear();
|
|
2178
2391
|
cachedHealth = null;
|
|
2179
2392
|
if (sql$1) await sql$1.end();
|
|
2180
2393
|
if (redis) await redis.disconnect();
|
|
@@ -2182,5 +2395,3 @@ async function stopApiServer() {
|
|
|
2182
2395
|
}
|
|
2183
2396
|
//#endregion
|
|
2184
2397
|
export { startApiServer, stopApiServer };
|
|
2185
|
-
|
|
2186
|
-
//# sourceMappingURL=main-39DtKrX4.mjs.map
|