@apiagex/database 0.6.3 → 0.8.0

package/dist/webhook-repository.d.ts

@@ -1,15 +1,15 @@
-import type { SqliteDatabase } from "./sqlite.js";
+import type { ApiagexDatabase } from "./database-adapter.type.js";
 import type { EnqueueWebhookEventInput, RecordWebhookDeliveryInput, WebhookDeliveryRecord, WebhookDraft, WebhookEventRecord, WebhookEventStatus, WebhookRecord, WebhookSecretRecord } from "./webhook-repository.type.js";
-export declare function createWebhook(db: SqliteDatabase, input: WebhookDraft): WebhookRecord;
-export declare function updateWebhook(db: SqliteDatabase, webhookId: string, input: WebhookDraft): WebhookRecord;
-export declare function listWebhooks(db: SqliteDatabase): WebhookRecord[];
-export declare function deleteWebhook(db: SqliteDatabase, webhookId: string): boolean;
-export declare function enqueueWebhookEvent(db: SqliteDatabase, input: EnqueueWebhookEventInput): WebhookEventRecord;
-export declare function listPendingWebhookEvents(db: SqliteDatabase, now?: string, limit?: number): WebhookEventRecord[];
-export declare function listMatchingWebhooks(db: SqliteDatabase, event: WebhookEventRecord): WebhookSecretRecord[];
-export declare function listWebhookDeliveries(db: SqliteDatabase, webhookId?: string): WebhookDeliveryRecord[];
-export declare function countWebhookDeliveryAttempts(db: SqliteDatabase, eventId: string, webhookId: string): number;
-export declare function hasSuccessfulWebhookDelivery(db: SqliteDatabase, eventId: string, webhookId: string): boolean;
-export declare function recordWebhookDelivery(db: SqliteDatabase, input: RecordWebhookDeliveryInput): WebhookDeliveryRecord;
-export declare function updateWebhookEventStatus(db: SqliteDatabase, eventId: string, status: WebhookEventStatus, attempts: number, nextRetryAt: string | null): void;
+export declare function createWebhook(db: ApiagexDatabase, input: WebhookDraft): Promise<WebhookRecord>;
+export declare function updateWebhook(db: ApiagexDatabase, webhookId: string, input: WebhookDraft): Promise<WebhookRecord>;
+export declare function listWebhooks(db: ApiagexDatabase): Promise<WebhookRecord[]>;
+export declare function deleteWebhook(db: ApiagexDatabase, webhookId: string): Promise<boolean>;
+export declare function enqueueWebhookEvent(db: ApiagexDatabase, input: EnqueueWebhookEventInput): Promise<WebhookEventRecord>;
+export declare function listPendingWebhookEvents(db: ApiagexDatabase, now?: string, limit?: number): Promise<WebhookEventRecord[]>;
+export declare function listMatchingWebhooks(db: ApiagexDatabase, event: WebhookEventRecord): Promise<WebhookSecretRecord[]>;
+export declare function listWebhookDeliveries(db: ApiagexDatabase, webhookId?: string): Promise<WebhookDeliveryRecord[]>;
+export declare function countWebhookDeliveryAttempts(db: ApiagexDatabase, eventId: string, webhookId: string): Promise<number>;
+export declare function hasSuccessfulWebhookDelivery(db: ApiagexDatabase, eventId: string, webhookId: string): Promise<boolean>;
+export declare function recordWebhookDelivery(db: ApiagexDatabase, input: RecordWebhookDeliveryInput): Promise<WebhookDeliveryRecord>;
+export declare function updateWebhookEventStatus(db: ApiagexDatabase, eventId: string, status: WebhookEventStatus, attempts: number, nextRetryAt: string | null): Promise<void>;
 //# sourceMappingURL=webhook-repository.d.ts.map

package/dist/webhook-repository.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"webhook-repository.d.ts","sourceRoot":"","sources":["../src/webhook-repository.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,aAAa,CAAC;AAElD,OAAO,KAAK,EACV,wBAAwB,EACxB,0BAA0B,EAC1B,qBAAqB,EACrB,YAAY,EACZ,kBAAkB,EAClB,kBAAkB,EAElB,aAAa,EACb,mBAAmB,EAEpB,MAAM,8BAA8B,CAAC;AAgBtC,wBAAgB,aAAa,CAAC,EAAE,EAAE,cAAc,EAAE,KAAK,EAAE,YAAY,GAAG,aAAa,CASpF;AAED,wBAAgB,aAAa,CAAC,EAAE,EAAE,cAAc,EAAE,SAAS,EAAE,MAAM,EAAE,KAAK,EAAE,YAAY,GAAG,aAAa,CASvG;AAED,wBAAgB,YAAY,CAAC,EAAE,EAAE,cAAc,GAAG,aAAa,EAAE,CAGhE;AAED,wBAAgB,aAAa,CAAC,EAAE,EAAE,cAAc,EAAE,SAAS,EAAE,MAAM,GAAG,OAAO,CAG5E;AAED,wBAAgB,mBAAmB,CAAC,EAAE,EAAE,cAAc,EAAE,KAAK,EAAE,wBAAwB,GAAG,kBAAkB,CAe3G;AAED,wBAAgB,wBAAwB,CAAC,EAAE,EAAE,cAAc,EAAE,GAAG,SAA2B,EAAE,KAAK,SAAK,GAAG,kBAAkB,EAAE,CAI7H;AAED,wBAAgB,oBAAoB,CAAC,EAAE,EAAE,cAAc,EAAE,KAAK,EAAE,kBAAkB,GAAG,mBAAmB,EAAE,CAIzG;AAED,wBAAgB,qBAAqB,CAAC,EAAE,EAAE,cAAc,EAAE,SAAS,CAAC,EAAE,MAAM,GAAG,qBAAqB,EAAE,CAMrG;AAED,wBAAgB,4BAA4B,CAAC,EAAE,EAAE,cAAc,EAAE,OAAO,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,GAAG,MAAM,CAI3G;AAED,wBAAgB,4BAA4B,CAAC,EAAE,EAAE,cAAc,EAAE,OAAO,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,GAAG,OAAO,CAI5G;AAED,wBAAgB,qBAAqB,CAAC,EAAE,EAAE,cAAc,EAAE,KAAK,EAAE,0BAA0B,GAAG,qBAAqB,CASlH;AAED,wBAAgB,wBAAwB,CACtC,EAAE,EAAE,cAAc,EAClB,OAAO,EAAE,MAAM,EACf,MAAM,EAAE,kBAAkB,EAC1B,QAAQ,EAAE,MAAM,EAChB,WAAW,EAAE,MAAM,GAAG,IAAI,GACzB,IAAI,CAGN"}
+{"version":3,"file":"webhook-repository.d.ts","sourceRoot":"","sources":["../src/webhook-repository.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,4BAA4B,CAAC;AAElE,OAAO,KAAK,EACV,wBAAwB,EACxB,0BAA0B,EAC1B,qBAAqB,EACrB,YAAY,EACZ,kBAAkB,EAClB,kBAAkB,EAGlB,aAAa,EACb,mBAAmB,EACpB,MAAM,8BAA8B,CAAC;AActC,wBAAsB,aAAa,CAAC,EAAE,EAAE,eAAe,EAAE,KAAK,EAAE,YAAY,GAAG,OAAO,CAAC,aAAa,CAAC,CASpG;AAED,wBAAsB,aAAa,CACjC,EAAE,EAAE,eAAe,EACnB,SAAS,EAAE,MAAM,EACjB,KAAK,EAAE,YAAY,GAClB,OAAO,CAAC,aAAa,CAAC,CAiBxB;AAED,wBAAsB,YAAY,CAAC,EAAE,EAAE,eAAe,GAAG,OAAO,CAAC,aAAa,EAAE,CAAC,CAGhF;AAED,wBAAsB,aAAa,CAAC,EAAE,EAAE,eAAe,EAAE,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC,CAG5F;AAED,wBAAsB,mBAAmB,CACvC,EAAE,EAAE,eAAe,EACnB,KAAK,EAAE,wBAAwB,GAC9B,OAAO,CAAC,kBAAkB,CAAC,CAe7B;AAED,wBAAsB,wBAAwB,CAC5C,EAAE,EAAE,eAAe,EACnB,GAAG,SAA2B,EAC9B,KAAK,SAAK,GACT,OAAO,CAAC,kBAAkB,EAAE,CAAC,CAK/B;AAED,wBAAsB,oBAAoB,CACxC,EAAE,EAAE,eAAe,EACnB,KAAK,EAAE,kBAAkB,GACxB,OAAO,CAAC,mBAAmB,EAAE,CAAC,CAKhC;AAED,wBAAsB,qBAAqB,CACzC,EAAE,EAAE,eAAe,EACnB,SAAS,CAAC,EAAE,MAAM,GACjB,OAAO,CAAC,qBAAqB,EAAE,CAAC,CAKlC;AAED,wBAAsB,4BAA4B,CAChD,EAAE,EAAE,eAAe,EACnB,OAAO,EAAE,MAAM,EACf,SAAS,EAAE,MAAM,GAChB,OAAO,CAAC,MAAM,CAAC,CAKjB;AAED,wBAAsB,4BAA4B,CAChD,EAAE,EAAE,eAAe,EACnB,OAAO,EAAE,MAAM,EACf,SAAS,EAAE,MAAM,GAChB,OAAO,CAAC,OAAO,CAAC,CAKlB;AAED,wBAAsB,qBAAqB,CACzC,EAAE,EAAE,eAAe,EACnB,KAAK,EAAE,0BAA0B,GAChC,OAAO,CAAC,qBAAqB,CAAC,CAsBhC;AAED,wBAAsB,wBAAwB,CAC5C,EAAE,EAAE,eAAe,EACnB,OAAO,EAAE,MAAM,EACf,MAAM,EAAE,kBAAkB,EAC1B,QAAQ,EAAE,MAAM,EAChB,WAAW,EAAE,MAAM,GAAG,IAAI,GACzB,OAAO,CAAC,IAAI,CAAC,CAGf"}

package/dist/webhook-repository.js

@@ -1,31 +1,30 @@
 import { randomUUID } from "node:crypto";
 import { getSchemaById } from "./schema-repository.js";
 const allowedEvents = new Set(["entry.created", "entry.updated", "entry.deleted"]);
-export function createWebhook(db, input) {
-    const draft = normalizeWebhookDraft(db, input);
+export async function createWebhook(db, input) {
+    const draft = await normalizeWebhookDraft(db, input);
     const id = randomUUID();
     const now = new Date().toISOString();
-    db.prepare(`INSERT INTO webhooks (id, name, url, secret, events_json, schema_id, active, created_at, updated_at)
+    await db.prepare(`INSERT INTO webhooks (id, name, url, secret, events_json, schema_id, active, created_at, updated_at)
      VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?)`).run(id, draft.name, draft.url, draft.secret, JSON.stringify(draft.events), draft.schemaId, draft.active ? 1 : 0, now, now);
-    return publicWebhook(requireWebhook(db, id));
+    return publicWebhook(await requireWebhook(db, id));
 }
-export function updateWebhook(db, webhookId, input) {
-    const current = requireWebhook(db, webhookId);
-    const draft = normalizeWebhookDraft(db, { ...input, secret: input.secret ?? current.secret });
-    const now = new Date().toISOString();
-    db.prepare(`UPDATE webhooks SET name = ?, url = ?, secret = ?, events_json = ?, schema_id = ?, active = ?, updated_at = ?
-     WHERE id = ?`).run(draft.name, draft.url, draft.secret, JSON.stringify(draft.events), draft.schemaId, draft.active ? 1 : 0, now, webhookId);
-    return publicWebhook(requireWebhook(db, webhookId));
+export async function updateWebhook(db, webhookId, input) {
+    const current = await requireWebhook(db, webhookId);
+    const draft = await normalizeWebhookDraft(db, { ...input, secret: input.secret ?? current.secret });
+    await db.prepare(`UPDATE webhooks SET name = ?, url = ?, secret = ?, events_json = ?, schema_id = ?, active = ?, updated_at = ?
+     WHERE id = ?`).run(draft.name, draft.url, draft.secret, JSON.stringify(draft.events), draft.schemaId, draft.active ? 1 : 0, new Date().toISOString(), webhookId);
+    return publicWebhook(await requireWebhook(db, webhookId));
 }
-export function listWebhooks(db) {
-    const rows = db.prepare(webhookSelectSql("ORDER BY created_at DESC")).all();
+export async function listWebhooks(db) {
+    const rows = await db.prepare(webhookSelectSql("ORDER BY created_at DESC")).all();
     return rows.map(rowToWebhook).map(publicWebhook);
 }
-export function deleteWebhook(db, webhookId) {
-    const result = db.prepare("DELETE FROM webhooks WHERE id = ?").run(webhookId);
+export async function deleteWebhook(db, webhookId) {
+    const result = await db.prepare("DELETE FROM webhooks WHERE id = ?").run(webhookId);
     return result.changes > 0;
 }
-export function enqueueWebhookEvent(db, input) {
+export async function enqueueWebhookEvent(db, input) {
     const id = randomUUID();
     const now = new Date().toISOString();
     const payload = {
@@ -34,51 +33,56 @@ export function enqueueWebhookEvent(db, input) {
         entry: input.entry,
         occurredAt: now,
     };
-    db.prepare(`INSERT INTO webhook_events
+    await db.prepare(`INSERT INTO webhook_events
       (id, event_type, schema_id, schema_slug, entry_id, payload_json, status, attempts, next_retry_at, created_at, updated_at)
      VALUES (?, ?, ?, ?, ?, ?, 'pending', 0, NULL, ?, ?)`).run(id, input.eventType, input.schemaId, input.schemaSlug, input.entry.id, JSON.stringify(payload), now, now);
     return requireWebhookEvent(db, id);
 }
-export function listPendingWebhookEvents(db, now = new Date().toISOString(), limit = 20) {
-    const rows = db.prepare(eventSelectSql("WHERE status = 'pending' AND (next_retry_at IS NULL OR next_retry_at <= ?) ORDER BY created_at ASC LIMIT ?"))
+export async function listPendingWebhookEvents(db, now = new Date().toISOString(), limit = 20) {
+    const rows = await db
+        .prepare(eventSelectSql("WHERE status = 'pending' AND (next_retry_at IS NULL OR next_retry_at <= ?) ORDER BY created_at ASC LIMIT ?"))
         .all(now, limit);
     return rows.map(rowToEvent);
 }
-export function listMatchingWebhooks(db, event) {
-    const rows = db.prepare(webhookSelectSql("WHERE active = 1 AND (schema_id IS NULL OR schema_id = ?) ORDER BY created_at ASC"))
+export async function listMatchingWebhooks(db, event) {
+    const rows = await db
+        .prepare(webhookSelectSql("WHERE active = 1 AND (schema_id IS NULL OR schema_id = ?) ORDER BY created_at ASC"))
         .all(event.schemaId);
     return rows.map(rowToWebhook).filter((webhook) => webhook.events.includes(event.eventType));
 }
-export function listWebhookDeliveries(db, webhookId) {
+export async function listWebhookDeliveries(db, webhookId) {
     const suffix = webhookId ? "WHERE webhook_id = ? ORDER BY created_at DESC" : "ORDER BY created_at DESC";
-    const rows = webhookId
+    return webhookId
         ? db.prepare(deliverySelectSql(suffix)).all(webhookId)
         : db.prepare(deliverySelectSql(suffix)).all();
-    return rows;
 }
-export function countWebhookDeliveryAttempts(db, eventId, webhookId) {
-    const row = db.prepare("SELECT COUNT(*) as count FROM webhook_deliveries WHERE event_id = ? AND webhook_id = ?")
+export async function countWebhookDeliveryAttempts(db, eventId, webhookId) {
+    const row = await db
+        .prepare("SELECT COUNT(*) as count FROM webhook_deliveries WHERE event_id = ? AND webhook_id = ?")
         .get(eventId, webhookId);
-    return row.count;
+    return row?.count ?? 0;
 }
-export function hasSuccessfulWebhookDelivery(db, eventId, webhookId) {
-    const row = db.prepare("SELECT id FROM webhook_deliveries WHERE event_id = ? AND webhook_id = ? AND status = 'success' LIMIT 1")
+export async function hasSuccessfulWebhookDelivery(db, eventId, webhookId) {
+    const row = await db
+        .prepare("SELECT id FROM webhook_deliveries WHERE event_id = ? AND webhook_id = ? AND status = 'success' LIMIT 1")
         .get(eventId, webhookId);
     return Boolean(row);
 }
-export function recordWebhookDelivery(db, input) {
+export async function recordWebhookDelivery(db, input) {
     const id = input.id ?? randomUUID();
-    const now = new Date().toISOString();
-    db.prepare(`INSERT INTO webhook_deliveries
+    await db.prepare(`INSERT INTO webhook_deliveries
       (id, event_id, webhook_id, url, status, status_code, response_body, error, attempt, created_at, next_retry_at)
-     VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)`).run(id, input.eventId, input.webhookId, input.url, input.status, input.statusCode ?? null, trim(input.responseBody), trim(input.error), input.attempt, now, input.nextRetryAt ?? null);
-    return db.prepare(deliverySelectSql("WHERE id = ?")).get(id);
-}
-export function updateWebhookEventStatus(db, eventId, status, attempts, nextRetryAt) {
-    db.prepare("UPDATE webhook_events SET status = ?, attempts = ?, next_retry_at = ?, updated_at = ? WHERE id = ?")
+     VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)`).run(id, input.eventId, input.webhookId, input.url, input.status, input.statusCode ?? null, trim(input.responseBody), trim(input.error), input.attempt, new Date().toISOString(), input.nextRetryAt ?? null);
+    const delivery = await db.prepare(deliverySelectSql("WHERE id = ?")).get(id);
+    if (!delivery)
+        throw new Error("WEBHOOK_DELIVERY_NOT_FOUND");
+    return delivery;
+}
+export async function updateWebhookEventStatus(db, eventId, status, attempts, nextRetryAt) {
+    await db.prepare("UPDATE webhook_events SET status = ?, attempts = ?, next_retry_at = ?, updated_at = ? WHERE id = ?")
         .run(status, attempts, nextRetryAt, new Date().toISOString(), eventId);
 }
-function normalizeWebhookDraft(db, input) {
+async function normalizeWebhookDraft(db, input) {
     const events = [...new Set(input.events)];
     if (!input.name.trim())
         throw new Error("WEBHOOK_NAME_REQUIRED");
@@ -86,19 +90,19 @@ function normalizeWebhookDraft(db, input) {
         throw new Error("WEBHOOK_URL_INVALID");
     if (events.length === 0 || events.some((event) => !allowedEvents.has(event)))
         throw new Error("WEBHOOK_EVENTS_INVALID");
-    if (input.schemaId && !getSchemaById(db, input.schemaId))
+    if (input.schemaId && !(await getSchemaById(db, input.schemaId)))
         throw new Error("SCHEMA_NOT_FOUND");
     const secret = input.secret?.trim() || randomUUID();
     return { name: input.name.trim(), url: input.url.trim(), secret, events, schemaId: input.schemaId ?? null, active: input.active ?? true };
 }
-function requireWebhook(db, webhookId) {
-    const row = db.prepare(webhookSelectSql("WHERE id = ?")).get(webhookId);
+async function requireWebhook(db, webhookId) {
+    const row = await db.prepare(webhookSelectSql("WHERE id = ?")).get(webhookId);
     if (!row)
         throw new Error("WEBHOOK_NOT_FOUND");
     return rowToWebhook(row);
 }
-function requireWebhookEvent(db, eventId) {
-    const row = db.prepare(eventSelectSql("WHERE id = ?")).get(eventId);
+async function requireWebhookEvent(db, eventId) {
+    const row = await db.prepare(eventSelectSql("WHERE id = ?")).get(eventId);
     if (!row)
         throw new Error("WEBHOOK_EVENT_NOT_FOUND");
     return rowToEvent(row);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@apiagex/database",
-  "version": "0.6.3",
+  "version": "0.8.0",
   "description": "Kysely database adapter package for Apiagex CMS.",
   "type": "module",
   "license": "MIT",
@@ -35,9 +35,12 @@
     "test": "vitest run"
   },
   "dependencies": {
-    "better-sqlite3": "^12.9.0"
+    "better-sqlite3": "^12.9.0",
+    "mysql2": "^3.22.3",
+    "pg": "^8.20.0"
   },
   "devDependencies": {
-    "@types/better-sqlite3": "^7.6.13"
+    "@types/better-sqlite3": "^7.6.13",
+    "@types/pg": "^8.20.0"
   }
 }