hzl-core 2.0.0 → 2.2.0

package/dist/services/hook-drain-service.js

@@ -0,0 +1,388 @@
+import crypto from 'node:crypto';
+import { withWriteTransaction } from '../db/transaction.js';
+const HOOK_OUTBOX_TABLE = 'hook_outbox';
+const STATUS_QUEUED = 'queued';
+const STATUS_PROCESSING = 'processing';
+const STATUS_DELIVERED = 'delivered';
+const STATUS_FAILED = 'failed';
+function toIsoString(value) {
+    return value.toISOString();
+}
+function parseTimestampMs(value) {
+    if (!value)
+        return null;
+    const parsed = Date.parse(value);
+    return Number.isNaN(parsed) ? null : parsed;
+}
+function getChanges(result) {
+    if (result && typeof result === 'object' && 'changes' in result) {
+        const maybe = result.changes;
+        if (typeof maybe === 'number')
+            return maybe;
+    }
+    return 0;
+}
+function stringifyError(error) {
+    if (error instanceof Error)
+        return error.message;
+    return String(error);
+}
+function truncate(text, max = 280) {
+    if (text.length <= max)
+        return text;
+    return `${text.slice(0, max)}...`;
+}
+function parseHeaders(raw) {
+    try {
+        const parsed = JSON.parse(raw);
+        if (!parsed || typeof parsed !== 'object' || Array.isArray(parsed))
+            return {};
+        const headers = {};
+        for (const [key, value] of Object.entries(parsed)) {
+            if (typeof value === 'string')
+                headers[key] = value;
+        }
+        return headers;
+    }
+    catch {
+        return {};
+    }
+}
+export class HookDrainService {
+    db;
+    batchSize;
+    maxAttempts;
+    ttlMs;
+    lockTimeoutMs;
+    backoffBaseMs;
+    backoffMaxMs;
+    jitterRatio;
+    requestTimeoutMs;
+    workerId;
+    now;
+    random;
+    fetchFn;
+    constructor(db, config = {}) {
+        this.db = db;
+        this.batchSize = config.batchSize ?? 50;
+        this.maxAttempts = config.maxAttempts ?? 5;
+        this.ttlMs = config.ttlMs ?? 24 * 60 * 60 * 1000;
+        this.lockTimeoutMs = config.lockTimeoutMs ?? 5 * 60 * 1000;
+        this.backoffBaseMs = config.backoffBaseMs ?? 30_000;
+        this.backoffMaxMs = config.backoffMaxMs ?? 6 * 60 * 60 * 1000;
+        this.jitterRatio = config.jitterRatio ?? 0.2;
+        this.requestTimeoutMs = config.requestTimeoutMs ?? 10_000;
+        this.now = config.now ?? (() => new Date());
+        this.random = config.random ?? Math.random;
+        this.fetchFn = config.fetchFn ?? fetch;
+        this.workerId = config.workerId ?? `hook-drain-${process.pid}-${crypto.randomUUID()}`;
+    }
+    async drain(options = {}) {
+        const startedAt = this.now();
+        const nowIso = toIsoString(startedAt);
+        const limit = Math.max(1, options.limit ?? this.batchSize);
+        const claimBatch = this.claimDueRecords(limit, nowIso);
+        const result = {
+            worker_id: this.workerId,
+            claimed: claimBatch.records.length,
+            attempted: 0,
+            delivered: 0,
+            retried: 0,
+            failed: claimBatch.preflightFailed + claimBatch.reclaimedFailed,
+            reclaimed: claimBatch.reclaimed,
+            reclaimed_failed: claimBatch.reclaimedFailed,
+            preflight_failed: claimBatch.preflightFailed,
+            duration_ms: 0,
+        };
+        for (const record of claimBatch.records) {
+            result.attempted += 1;
+            try {
+                await this.deliver(record);
+                if (this.markDelivered(record.id, record.lock_token) === 1) {
+                    result.delivered += 1;
+                }
+            }
+            catch (error) {
+                const disposition = this.markFailedAttempt(record, error);
+                if (disposition === 'failed') {
+                    result.failed += 1;
+                }
+                else if (disposition === 'retried') {
+                    result.retried += 1;
+                }
+            }
+        }
+        result.duration_ms = Math.max(0, this.now().getTime() - startedAt.getTime());
+        return result;
+    }
+    claimDueRecords(limit, nowIso) {
+        return withWriteTransaction(this.db, () => {
+            let preflightFailed = this.failTerminalQueuedRecords(nowIso);
+            const reclaimResult = this.reclaimStaleProcessing(nowIso);
+            const lockExpiresIso = toIsoString(new Date(this.now().getTime() + this.lockTimeoutMs));
+            const dueRows = this.db.prepare(`
+        SELECT
+          id,
+          url,
+          headers,
+          payload,
+          attempts,
+          created_at
+        FROM ${HOOK_OUTBOX_TABLE}
+        WHERE status = ?
+          AND next_attempt_at <= ?
+        ORDER BY next_attempt_at ASC, id ASC
+        LIMIT ?
+      `).all(STATUS_QUEUED, nowIso, limit);
+            const claimed = [];
+            for (const row of dueRows) {
+                if (this.isTerminal(row.attempts, row.created_at, nowIso)) {
+                    preflightFailed += this.failQueuedRecord(row.id, nowIso, 'hook delivery exhausted before claim');
+                    continue;
+                }
+                const lockToken = crypto.randomUUID();
+                const updateResult = this.db.prepare(`
+          UPDATE ${HOOK_OUTBOX_TABLE}
+          SET
+            status = ?,
+            lock_token = ?,
+            locked_by = ?,
+            processing_started_at = ?,
+            lock_expires_at = ?,
+            updated_at = ?
+          WHERE id = ?
+            AND status = ?
+            AND next_attempt_at <= ?
+            AND attempts < ?
+        `).run(STATUS_PROCESSING, lockToken, this.workerId, nowIso, lockExpiresIso, nowIso, row.id, STATUS_QUEUED, nowIso, this.maxAttempts);
+                if (getChanges(updateResult) === 1) {
+                    claimed.push({
+                        ...row,
+                        lock_token: lockToken,
+                    });
+                }
+            }
+            return {
+                records: claimed,
+                reclaimed: reclaimResult.reclaimed,
+                reclaimedFailed: reclaimResult.reclaimedFailed,
+                preflightFailed,
+            };
+        });
+    }
+    failTerminalQueuedRecords(nowIso) {
+        const ttlCutoffIso = toIsoString(new Date(this.now().getTime() - this.ttlMs));
+        const updateResult = this.db.prepare(`
+      UPDATE ${HOOK_OUTBOX_TABLE}
+      SET
+        status = ?,
+        failed_at = COALESCE(failed_at, ?),
+        lock_token = NULL,
+        locked_by = NULL,
+        lock_expires_at = NULL,
+        updated_at = ?,
+        last_error = COALESCE(last_error, 'hook delivery exhausted before claim')
+      WHERE status = ?
+        AND (attempts >= ? OR created_at <= ?)
+    `).run(STATUS_FAILED, nowIso, nowIso, STATUS_QUEUED, this.maxAttempts, ttlCutoffIso);
+        return getChanges(updateResult);
+    }
+    failQueuedRecord(id, nowIso, reason) {
+        const updateResult = this.db.prepare(`
+      UPDATE ${HOOK_OUTBOX_TABLE}
+      SET
+        status = ?,
+        failed_at = COALESCE(failed_at, ?),
+        lock_token = NULL,
+        locked_by = NULL,
+        lock_expires_at = NULL,
+        updated_at = ?,
+        last_error = ?
+      WHERE id = ?
+        AND status = ?
+    `).run(STATUS_FAILED, nowIso, nowIso, reason, id, STATUS_QUEUED);
+        return getChanges(updateResult);
+    }
+    reclaimStaleProcessing(nowIso) {
+        const staleRows = this.db.prepare(`
+      SELECT
+        id,
+        attempts,
+        created_at
+      FROM ${HOOK_OUTBOX_TABLE}
+      WHERE status = ?
+        AND lock_expires_at IS NOT NULL
+        AND lock_expires_at <= ?
+    `).all(STATUS_PROCESSING, nowIso);
+        let reclaimed = 0;
+        let reclaimedFailed = 0;
+        for (const row of staleRows) {
+            if (this.isTerminal(row.attempts, row.created_at, nowIso)) {
+                const failResult = this.db.prepare(`
+          UPDATE ${HOOK_OUTBOX_TABLE}
+          SET
+            status = ?,
+            failed_at = COALESCE(failed_at, ?),
+            lock_token = NULL,
+            locked_by = NULL,
+            lock_expires_at = NULL,
+            updated_at = ?,
+            last_error = COALESCE(last_error, 'stale processing lock reclaimed after exhaustion')
+          WHERE id = ?
+            AND status = ?
+        `).run(STATUS_FAILED, nowIso, nowIso, row.id, STATUS_PROCESSING);
+                if (getChanges(failResult) === 1)
+                    reclaimedFailed += 1;
+                continue;
+            }
+            const reclaimResult = this.db.prepare(`
+        UPDATE ${HOOK_OUTBOX_TABLE}
+        SET
+          status = ?,
+          lock_token = NULL,
+          locked_by = NULL,
+          lock_expires_at = NULL,
+          updated_at = ?
+        WHERE id = ?
+          AND status = ?
+      `).run(STATUS_QUEUED, nowIso, row.id, STATUS_PROCESSING);
+            if (getChanges(reclaimResult) === 1)
+                reclaimed += 1;
+        }
+        return { reclaimed, reclaimedFailed };
+    }
+    async deliver(record) {
+        const headers = parseHeaders(record.headers);
+        if (!Object.keys(headers).some((key) => key.toLowerCase() === 'content-type')) {
+            headers['content-type'] = 'application/json';
+        }
+        let response;
+        try {
+            response = await this.fetchFn(record.url, {
+                method: 'POST',
+                headers,
+                body: record.payload,
+                signal: AbortSignal.timeout(this.requestTimeoutMs),
+            });
+        }
+        catch (error) {
+            throw new Error(`network error: ${stringifyError(error)}`);
+        }
+        if (!response.ok) {
+            let responseText = '';
+            try {
+                responseText = await response.text();
+            }
+            catch {
+                // Ignore response parsing errors.
+            }
+            const statusMessage = responseText
+                ? `HTTP ${response.status}: ${truncate(responseText)}`
+                : `HTTP ${response.status}`;
+            throw new Error(statusMessage);
+        }
+    }
+    markDelivered(id, lockToken) {
+        const nowIso = toIsoString(this.now());
+        const result = withWriteTransaction(this.db, () => this.db.prepare(`
+        UPDATE ${HOOK_OUTBOX_TABLE}
+        SET
+          status = ?,
+          delivered_at = ?,
+          lock_token = NULL,
+          locked_by = NULL,
+          lock_expires_at = NULL,
+          updated_at = ?,
+          last_error = NULL
+        WHERE id = ?
+          AND status = ?
+          AND lock_token = ?
+      `).run(STATUS_DELIVERED, nowIso, nowIso, id, STATUS_PROCESSING, lockToken));
+        return getChanges(result);
+    }
+    markFailedAttempt(record, error) {
+        const now = this.now();
+        const nowIso = toIsoString(now);
+        const nextAttempts = record.attempts + 1;
+        const errorMessage = truncate(stringifyError(error));
+        const expirationMs = this.expiresAtMs(record.created_at);
+        if (nextAttempts >= this.maxAttempts ||
+            (expirationMs !== null && now.getTime() >= expirationMs)) {
+            const failResult = withWriteTransaction(this.db, () => this.db.prepare(`
+          UPDATE ${HOOK_OUTBOX_TABLE}
+          SET
+            status = ?,
+            attempts = ?,
+            failed_at = COALESCE(failed_at, ?),
+            lock_token = NULL,
+            locked_by = NULL,
+            lock_expires_at = NULL,
+            updated_at = ?,
+            last_error = ?
+          WHERE id = ?
+            AND status = ?
+            AND lock_token = ?
+        `).run(STATUS_FAILED, nextAttempts, nowIso, nowIso, errorMessage, record.id, STATUS_PROCESSING, record.lock_token));
+            return getChanges(failResult) === 1 ? 'failed' : 'noop';
+        }
+        const delayMs = this.computeBackoffDelayMs(nextAttempts);
+        const nextAttemptMs = now.getTime() + delayMs;
+        if (expirationMs !== null && nextAttemptMs >= expirationMs) {
+            const failResult = withWriteTransaction(this.db, () => this.db.prepare(`
+          UPDATE ${HOOK_OUTBOX_TABLE}
+          SET
+            status = ?,
+            attempts = ?,
+            failed_at = COALESCE(failed_at, ?),
+            lock_token = NULL,
+            locked_by = NULL,
+            lock_expires_at = NULL,
+            updated_at = ?,
+            last_error = ?
+          WHERE id = ?
+            AND status = ?
+            AND lock_token = ?
+        `).run(STATUS_FAILED, nextAttempts, nowIso, nowIso, errorMessage, record.id, STATUS_PROCESSING, record.lock_token));
+            return getChanges(failResult) === 1 ? 'failed' : 'noop';
+        }
+        const retryResult = withWriteTransaction(this.db, () => this.db.prepare(`
+        UPDATE ${HOOK_OUTBOX_TABLE}
+        SET
+          status = ?,
+          attempts = ?,
+          next_attempt_at = ?,
+          lock_token = NULL,
+          locked_by = NULL,
+          lock_expires_at = NULL,
+          updated_at = ?,
+          last_error = ?
+        WHERE id = ?
+          AND status = ?
+          AND lock_token = ?
+      `).run(STATUS_QUEUED, nextAttempts, toIsoString(new Date(nextAttemptMs)), nowIso, errorMessage, record.id, STATUS_PROCESSING, record.lock_token));
+        return getChanges(retryResult) === 1 ? 'retried' : 'noop';
+    }
+    isTerminal(attempts, createdAt, nowIso) {
+        if (attempts >= this.maxAttempts)
+            return true;
+        const nowMs = parseTimestampMs(nowIso);
+        const createdMs = parseTimestampMs(createdAt);
+        if (nowMs === null || createdMs === null)
+            return false;
+        return nowMs >= createdMs + this.ttlMs;
+    }
+    expiresAtMs(createdAt) {
+        const createdMs = parseTimestampMs(createdAt);
+        if (createdMs === null)
+            return null;
+        return createdMs + this.ttlMs;
+    }
+    computeBackoffDelayMs(nextAttemptCount) {
+        const exponent = Math.max(0, nextAttemptCount - 1);
+        const uncapped = this.backoffBaseMs * Math.pow(2, exponent);
+        const base = Math.min(this.backoffMaxMs, uncapped);
+        const jitter = 1 + ((this.random() * 2) - 1) * this.jitterRatio;
+        return Math.max(0, Math.round(base * jitter));
+    }
+}
+//# sourceMappingURL=hook-drain-service.js.map

package/dist/services/hook-drain-service.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"hook-drain-service.js","sourceRoot":"","sources":["../../src/services/hook-drain-service.ts"],"names":[],"mappings":"AAAA,OAAO,MAAM,MAAM,aAAa,CAAC;AAEjC,OAAO,EAAE,oBAAoB,EAAE,MAAM,sBAAsB,CAAC;AAE5D,MAAM,iBAAiB,GAAG,aAAa,CAAC;AAExC,MAAM,aAAa,GAAG,QAAQ,CAAC;AAC/B,MAAM,iBAAiB,GAAG,YAAY,CAAC;AACvC,MAAM,gBAAgB,GAAG,WAAW,CAAC;AACrC,MAAM,aAAa,GAAG,QAAQ,CAAC;AAmD/B,SAAS,WAAW,CAAC,KAAW;IAC9B,OAAO,KAAK,CAAC,WAAW,EAAE,CAAC;AAC7B,CAAC;AAED,SAAS,gBAAgB,CAAC,KAAoB;IAC5C,IAAI,CAAC,KAAK;QAAE,OAAO,IAAI,CAAC;IACxB,MAAM,MAAM,GAAG,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;IACjC,OAAO,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,MAAM,CAAC;AAC9C,CAAC;AAED,SAAS,UAAU,CAAC,MAAe;IACjC,IAAI,MAAM,IAAI,OAAO,MAAM,KAAK,QAAQ,IAAI,SAAS,IAAI,MAAM,EAAE,CAAC;QAChE,MAAM,KAAK,GAAI,MAAgC,CAAC,OAAO,CAAC;QACxD,IAAI,OAAO,KAAK,KAAK,QAAQ;YAAE,OAAO,KAAK,CAAC;IAC9C,CAAC;IACD,OAAO,CAAC,CAAC;AACX,CAAC;AAED,SAAS,cAAc,CAAC,KAAc;IACpC,IAAI,KAAK,YAAY,KAAK;QAAE,OAAO,KAAK,CAAC,OAAO,CAAC;IACjD,OAAO,MAAM,CAAC,KAAK,CAAC,CAAC;AACvB,CAAC;AAED,SAAS,QAAQ,CAAC,IAAY,EAAE,GAAG,GAAG,GAAG;IACvC,IAAI,IAAI,CAAC,MAAM,IAAI,GAAG;QAAE,OAAO,IAAI,CAAC;IACpC,OAAO,GAAG,IAAI,CAAC,KAAK,CAAC,CAAC,EAAE,GAAG,CAAC,KAAK,CAAC;AACpC,CAAC;AAED,SAAS,YAAY,CAAC,GAAW;IAC/B,IAAI,CAAC;QACH,MAAM,MAAM,GAAG,IAAI,CAAC,KAAK,CAAC,GAAG,CAAY,CAAC;QAC1C,IAAI,CAAC,MAAM,IAAI,OAAO,MAAM,KAAK,QAAQ,IAAI,KAAK,CAAC,OAAO,CAAC,MAAM,CAAC;YAAE,OAAO,EAAE,CAAC;QAE9E,MAAM,OAAO,GAA2B,EAAE,CAAC;QAC3C,KAAK,MAAM,CAAC,GAAG,EAAE,KAAK,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC,EAAE,CAAC;YAClD,IAAI,OAAO,KAAK,KAAK,QAAQ;gBAAE,OAAO,CAAC,GAAG,CAAC,GAAG,KAAK,CAAC;QACtD,CAAC;QACD,OAAO,OAAO,CAAC;IACjB,CAAC;IAAC,MAAM,CAAC;QACP,OAAO,EAAE,CAAC;IACZ,CAAC;AACH,CAAC;AAED,MAAM,OAAO,gBAAgB;IAeR;IAdF,SAAS,CAAS;IAClB,WAAW,CAAS;IACpB,KAAK,CAAS;IACd,aAAa,CAAS;IACtB,aAAa,CAAS;IACtB,YAAY,CAAS;IACrB,WAAW,CAAS;IACpB,gBAAgB,CAAS;IACzB,QAAQ,CAAS;IACjB,GAAG,CAAa;IAChB,MAAM,CAAe;IACrB,OAAO,CAAe;IAEvC,YACmB,EAAqB,EACtC,SAA0B,EAAE;QADX,OAAE,GAAF,EAAE,CAAmB;QAGtC,IAAI,CAAC,SAAS,GAAG,MAAM,CAAC,SAAS,IAAI,EAAE,CAAC;QACxC,IAAI,CAAC,WAAW,GAAG,MAAM,CAAC,WAAW,IAAI,CAAC,CAAC;QAC3C,IAAI,CAAC,KAAK,GAAG,MAAM,CAAC,KAAK,IAAI,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,IAAI,CAAC;QACjD,IAAI,CAAC,aAAa,GAAG,MAAM,CAAC,aAAa,IAAI,CAAC,GAAG,EAAE,GAAG,IAAI,CAAC;QAC3D,IAAI,CAAC,aAAa,GAAG,MAAM,CAAC,aAAa,IAAI,MAAM,CAAC;QACpD,IAAI,CAAC,YAAY,GAAG,MAAM,CAAC,YAAY,IAAI,CAAC,GAAG,EAAE,GAAG,EAAE,GAAG,IAAI,CAAC;QAC9D,IAAI,CAAC,WAAW,GAAG,MAAM,CAAC,WAAW,IAAI,GAAG,CAAC;QAC7C,IAAI,CAAC,gBAAgB,GAAG,MAAM,CAAC,gBAAgB,IAAI,MAAM,CAAC;QAC1D,IAAI,CAAC,GAAG,GAAG,MAAM,CAAC,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC,IAAI,IAAI,EAAE,CAAC,CAAC;QAC5C,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC,MAAM,IAAI,IAAI,CAAC,MAAM,CAAC;QAC3C,IAAI,CAAC,OAAO,GAAG,MAAM,CAAC,OAAO,IAAI,KAAK,CAAC;QACvC,IAAI,CAAC,QAAQ,GAAG,MAAM,CAAC,QAAQ,IAAI,cAAc,OAAO,CAAC,GAAG,IAAI,MAAM,CAAC,UAAU,EAAE,EAAE,CAAC;IACxF,CAAC;IAED,KAAK,CAAC,KAAK,CAAC,UAA+B,EAAE;QAC3C,MAAM,SAAS,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC;QAC7B,MAAM,MAAM,GAAG,WAAW,CAAC,SAAS,CAAC,CAAC;QACtC,MAAM,KAAK,GAAG,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,OAAO,CAAC,KAAK,IAAI,IAAI,CAAC,SAAS,CAAC,CAAC;QAC3D,MAAM,UAAU,GAAG,IAAI,CAAC,eAAe,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC;QAEvD,MAAM,MAAM,GAAoB;YAC9B,SAAS,EAAE,IAAI,CAAC,QAAQ;YACxB,OAAO,EAAE,UAAU,CAAC,OAAO,CAAC,MAAM;YAClC,SAAS,EAAE,CAAC;YACZ,SAAS,EAAE,CAAC;YACZ,OAAO,EAAE,CAAC;YACV,MAAM,EAAE,UAAU,CAAC,eAAe,GAAG,UAAU,CAAC,eAAe;YAC/D,SAAS,EAAE,UAAU,CAAC,SAAS;YAC/B,gBAAgB,EAAE,UAAU,CAAC,eAAe;YAC5C,gBAAgB,EAAE,UAAU,CAAC,eAAe;YAC5C,WAAW,EAAE,CAAC;SACf,CAAC;QAEF,KAAK,MAAM,MAAM,IAAI,UAAU,CAAC,OAAO,EAAE,CAAC;YACxC,MAAM,CAAC,SAAS,IAAI,CAAC,CAAC;YACtB,IAAI,CAAC;gBACH,MAAM,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC;gBAC3B,IAAI,IAAI,CAAC,aAAa,CAAC,MAAM,CAAC,EAAE,EAAE,MAAM,CAAC,UAAU,CAAC,KAAK,CAAC,EAAE,CAAC;oBAC3D,MAAM,CAAC,SAAS,IAAI,CAAC,CAAC;gBACxB,CAAC;YACH,CAAC;YAAC,OAAO,KAAK,EAAE,CAAC;gBACf,MAAM,WAAW,GAAG,IAAI,CAAC,iBAAiB,CAAC,MAAM,EAAE,KAAK,CAAC,CAAC;gBAC1D,IAAI,WAAW,KAAK,QAAQ,EAAE,CAAC;oBAC7B,MAAM,CAAC,MAAM,IAAI,CAAC,CAAC;gBACrB,CAAC;qBAAM,IAAI,WAAW,KAAK,SAAS,EAAE,CAAC;oBACrC,MAAM,CAAC,OAAO,IAAI,CAAC,CAAC;gBACtB,CAAC;YACH,CAAC;QACH,CAAC;QAED,MAAM,CAAC,WAAW,GAAG,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,IAAI,CAAC,GAAG,EAAE,CAAC,OAAO,EAAE,GAAG,SAAS,CAAC,OAAO,EAAE,CAAC,CAAC;QAC7E,OAAO,MAAM,CAAC;IAChB,CAAC;IAEO,eAAe,CAAC,KAAa,EAAE,MAAc;QACnD,OAAO,oBAAoB,CAAC,IAAI,CAAC,EAAE,EAAE,GAAG,EAAE;YACxC,IAAI,eAAe,GAAG,IAAI,CAAC,yBAAyB,CAAC,MAAM,CAAC,CAAC;YAC7D,MAAM,aAAa,GAAG,IAAI,CAAC,sBAAsB,CAAC,MAAM,CAAC,CAAC;YAC1D,MAAM,cAAc,GAAG,WAAW,CAAC,IAAI,IAAI,CAAC,IAAI,CAAC,GAAG,EAAE,CAAC,OAAO,EAAE,GAAG,IAAI,CAAC,aAAa,CAAC,CAAC,CAAC;YAExF,MAAM,OAAO,GAAG,IAAI,CAAC,EAAE,CAAC,OAAO,CAAC;;;;;;;;eAQvB,iBAAiB;;;;;OAKzB,CAAC,CAAC,GAAG,CACJ,aAAa,EACb,MAAM,EACN,KAAK,CAQL,CAAC;YAEH,MAAM,OAAO,GAAuB,EAAE,CAAC;YACvC,KAAK,MAAM,GAAG,IAAI,OAAO,EAAE,CAAC;gBAC1B,IAAI,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,QAAQ,EAAE,GAAG,CAAC,UAAU,EAAE,MAAM,CAAC,EAAE,CAAC;oBAC1D,eAAe,IAAI,IAAI,CAAC,gBAAgB,CAAC,GAAG,CAAC,EAAE,EAAE,MAAM,EAAE,sCAAsC,CAAC,CAAC;oBACjG,SAAS;gBACX,CAAC;gBAED,MAAM,SAAS,GAAG,MAAM,CAAC,UAAU,EAAE,CAAC;gBACtC,MAAM,YAAY,GAAG,IAAI,CAAC,EAAE,CAAC,OAAO,CAAC;mBAC1B,iBAAiB;;;;;;;;;;;;SAY3B,CAAC,CAAC,GAAG,CACJ,iBAAiB,EACjB,SAAS,EACT,IAAI,CAAC,QAAQ,EACb,MAAM,EACN,cAAc,EACd,MAAM,EACN,GAAG,CAAC,EAAE,EACN,aAAa,EACb,MAAM,EACN,IAAI,CAAC,WAAW,CACjB,CAAC;gBAEF,IAAI,UAAU,CAAC,YAAY,CAAC,KAAK,CAAC,EAAE,CAAC;oBACnC,OAAO,CAAC,IAAI,CAAC;wBACX,GAAG,GAAG;wBACN,UAAU,EAAE,SAAS;qBACtB,CAAC,CAAC;gBACL,CAAC;YACH,CAAC;YAED,OAAO;gBACL,OAAO,EAAE,OAAO;gBAChB,SAAS,EAAE,aAAa,CAAC,SAAS;gBAClC,eAAe,EAAE,aAAa,CAAC,eAAe;gBAC9C,eAAe;aAChB,CAAC;QACJ,CAAC,CAAC,CAAC;IACL,CAAC;IAEO,yBAAyB,CAAC,MAAc;QAC9C,MAAM,YAAY,GAAG,WAAW,CAAC,IAAI,IAAI,CAAC,IAAI,CAAC,GAAG,EAAE,CAAC,OAAO,EAAE,GAAG,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC;QAC9E,MAAM,YAAY,GAAG,IAAI,CAAC,EAAE,CAAC,OAAO,CAAC;eAC1B,iBAAiB;;;;;;;;;;;KAW3B,CAAC,CAAC,GAAG,CACJ,aAAa,EACb,MAAM,EACN,MAAM,EACN,aAAa,EACb,IAAI,CAAC,WAAW,EAChB,YAAY,CACb,CAAC;QAEF,OAAO,UAAU,CAAC,YAAY,CAAC,CAAC;IAClC,CAAC;IAEO,gBAAgB,CAAC,EAAU,EAAE,MAAc,EAAE,MAAc;QACjE,MAAM,YAAY,GAAG,IAAI,CAAC,EAAE,CAAC,OAAO,CAAC;eAC1B,iBAAiB;;;;;;;;;;;KAW3B,CAAC,CAAC,GAAG,CACJ,aAAa,EACb,MAAM,EACN,MAAM,EACN,MAAM,EACN,EAAE,EACF,aAAa,CACd,CAAC;QACF,OAAO,UAAU,CAAC,YAAY,CAAC,CAAC;IAClC,CAAC;IAEO,sBAAsB,CAAC,MAAc;QAC3C,MAAM,SAAS,GAAG,IAAI,CAAC,EAAE,CAAC,OAAO,CAAC;;;;;aAKzB,iBAAiB;;;;KAIzB,CAAC,CAAC,GAAG,CACJ,iBAAiB,EACjB,MAAM,CAKN,CAAC;QAEH,IAAI,SAAS,GAAG,CAAC,CAAC;QAClB,IAAI,eAAe,GAAG,CAAC,CAAC;QAExB,KAAK,MAAM,GAAG,IAAI,SAAS,EAAE,CAAC;YAC5B,IAAI,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,QAAQ,EAAE,GAAG,CAAC,UAAU,EAAE,MAAM,CAAC,EAAE,CAAC;gBAC1D,MAAM,UAAU,GAAG,IAAI,CAAC,EAAE,CAAC,OAAO,CAAC;mBACxB,iBAAiB;;;;;;;;;;;SAW3B,CAAC,CAAC,GAAG,CACJ,aAAa,EACb,MAAM,EACN,MAAM,EACN,GAAG,CAAC,EAAE,EACN,iBAAiB,CAClB,CAAC;gBACF,IAAI,UAAU,CAAC,UAAU,CAAC,KAAK,CAAC;oBAAE,eAAe,IAAI,CAAC,CAAC;gBACvD,SAAS;YACX,CAAC;YAED,MAAM,aAAa,GAAG,IAAI,CAAC,EAAE,CAAC,OAAO,CAAC;iBAC3B,iBAAiB;;;;;;;;;OAS3B,CAAC,CAAC,GAAG,CACJ,aAAa,EACb,MAAM,EACN,GAAG,CAAC,EAAE,EACN,iBAAiB,CAClB,CAAC;YACF,IAAI,UAAU,CAAC,aAAa,CAAC,KAAK,CAAC;gBAAE,SAAS,IAAI,CAAC,CAAC;QACtD,CAAC;QAED,OAAO,EAAE,SAAS,EAAE,eAAe,EAAE,CAAC;IACxC,CAAC;IAEO,KAAK,CAAC,OAAO,CAAC,MAAwB;QAC5C,MAAM,OAAO,GAAG,YAAY,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC;QAC7C,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,IAAI,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,CAAC,WAAW,EAAE,KAAK,cAAc,CAAC,EAAE,CAAC;YAC9E,OAAO,CAAC,cAAc,CAAC,GAAG,kBAAkB,CAAC;QAC/C,CAAC;QAED,IAAI,QAAkB,CAAC;QACvB,IAAI,CAAC;YACH,QAAQ,GAAG,MAAM,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,GAAG,EAAE;gBACxC,MAAM,EAAE,MAAM;gBACd,OAAO;gBACP,IAAI,EAAE,MAAM,CAAC,OAAO;gBACpB,MAAM,EAAE,WAAW,CAAC,OAAO,CAAC,IAAI,CAAC,gBAAgB,CAAC;aACnD,CAAC,CAAC;QACL,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,MAAM,IAAI,KAAK,CAAC,kBAAkB,cAAc,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC;QAC7D,CAAC;QAED,IAAI,CAAC,QAAQ,CAAC,EAAE,EAAE,CAAC;YACjB,IAAI,YAAY,GAAG,EAAE,CAAC;YACtB,IAAI,CAAC;gBACH,YAAY,GAAG,MAAM,QAAQ,CAAC,IAAI,EAAE,CAAC;YACvC,CAAC;YAAC,MAAM,CAAC;gBACP,kCAAkC;YACpC,CAAC;YACD,MAAM,aAAa,GAAG,YAAY;gBAChC,CAAC,CAAC,QAAQ,QAAQ,CAAC,MAAM,KAAK,QAAQ,CAAC,YAAY,CAAC,EAAE;gBACtD,CAAC,CAAC,QAAQ,QAAQ,CAAC,MAAM,EAAE,CAAC;YAC9B,MAAM,IAAI,KAAK,CAAC,aAAa,CAAC,CAAC;QACjC,CAAC;IACH,CAAC;IAEO,aAAa,CAAC,EAAU,EAAE,SAAiB;QACjD,MAAM,MAAM,GAAG,WAAW,CAAC,IAAI,CAAC,GAAG,EAAE,CAAC,CAAC;QACvC,MAAM,MAAM,GAAG,oBAAoB,CAAC,IAAI,CAAC,EAAE,EAAE,GAAG,EAAE,CAChD,IAAI,CAAC,EAAE,CAAC,OAAO,CAAC;iBACL,iBAAiB;;;;;;;;;;;;OAY3B,CAAC,CAAC,GAAG,CACJ,gBAAgB,EAChB,MAAM,EACN,MAAM,EACN,EAAE,EACF,iBAAiB,EACjB,SAAS,CACV,CACF,CAAC;QACF,OAAO,UAAU,CAAC,MAAM,CAAC,CAAC;IAC5B,CAAC;IAEO,iBAAiB,CACvB,MAAwB,EACxB,KAAc;QAEd,MAAM,GAAG,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC;QACvB,MAAM,MAAM,GAAG,WAAW,CAAC,GAAG,CAAC,CAAC;QAChC,MAAM,YAAY,GAAG,MAAM,CAAC,QAAQ,GAAG,CAAC,CAAC;QACzC,MAAM,YAAY,GAAG,QAAQ,CAAC,cAAc,CAAC,KAAK,CAAC,CAAC,CAAC;QACrD,MAAM,YAAY,GAAG,IAAI,CAAC,WAAW,CAAC,MAAM,CAAC,UAAU,CAAC,CAAC;QAEzD,IACE,YAAY,IAAI,IAAI,CAAC,WAAW;YAChC,CAAC,YAAY,KAAK,IAAI,IAAI,GAAG,CAAC,OAAO,EAAE,IAAI,YAAY,CAAC,EACxD,CAAC;YACD,MAAM,UAAU,GAAG,oBAAoB,CAAC,IAAI,CAAC,EAAE,EAAE,GAAG,EAAE,CACpD,IAAI,CAAC,EAAE,CAAC,OAAO,CAAC;mBACL,iBAAiB;;;;;;;;;;;;;SAa3B,CAAC,CAAC,GAAG,CACJ,aAAa,EACb,YAAY,EACZ,MAAM,EACN,MAAM,EACN,YAAY,EACZ,MAAM,CAAC,EAAE,EACT,iBAAiB,EACjB,MAAM,CAAC,UAAU,CAClB,CACF,CAAC;YACF,OAAO,UAAU,CAAC,UAAU,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,MAAM,CAAC;QAC1D,CAAC;QAED,MAAM,OAAO,GAAG,IAAI,CAAC,qBAAqB,CAAC,YAAY,CAAC,CAAC;QACzD,MAAM,aAAa,GAAG,GAAG,CAAC,OAAO,EAAE,GAAG,OAAO,CAAC;QAE9C,IAAI,YAAY,KAAK,IAAI,IAAI,aAAa,IAAI,YAAY,EAAE,CAAC;YAC3D,MAAM,UAAU,GAAG,oBAAoB,CAAC,IAAI,CAAC,EAAE,EAAE,GAAG,EAAE,CACpD,IAAI,CAAC,EAAE,CAAC,OAAO,CAAC;mBACL,iBAAiB;;;;;;;;;;;;;SAa3B,CAAC,CAAC,GAAG,CACJ,aAAa,EACb,YAAY,EACZ,MAAM,EACN,MAAM,EACN,YAAY,EACZ,MAAM,CAAC,EAAE,EACT,iBAAiB,EACjB,MAAM,CAAC,UAAU,CAClB,CACF,CAAC;YACF,OAAO,UAAU,CAAC,UAAU,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,MAAM,CAAC;QAC1D,CAAC;QAED,MAAM,WAAW,GAAG,oBAAoB,CAAC,IAAI,CAAC,EAAE,EAAE,GAAG,EAAE,CACrD,IAAI,CAAC,EAAE,CAAC,OAAO,CAAC;iBACL,iBAAiB;;;;;;;;;;;;;OAa3B,CAAC,CAAC,GAAG,CACJ,aAAa,EACb,YAAY,EACZ,WAAW,CAAC,IAAI,IAAI,CAAC,aAAa,CAAC,CAAC,EACpC,MAAM,EACN,YAAY,EACZ,MAAM,CAAC,EAAE,EACT,iBAAiB,EACjB,MAAM,CAAC,UAAU,CAClB,CACF,CAAC;QACF,OAAO,UAAU,CAAC,WAAW,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,MAAM,CAAC;IAC5D,CAAC;IAEO,UAAU,CAAC,QAAgB,EAAE,SAAiB,EAAE,MAAc;QACpE,IAAI,QAAQ,IAAI,IAAI,CAAC,WAAW;YAAE,OAAO,IAAI,CAAC;QAC9C,MAAM,KAAK,GAAG,gBAAgB,CAAC,MAAM,CAAC,CAAC;QACvC,MAAM,SAAS,GAAG,gBAAgB,CAAC,SAAS,CAAC,CAAC;QAC9C,IAAI,KAAK,KAAK,IAAI,IAAI,SAAS,KAAK,IAAI;YAAE,OAAO,KAAK,CAAC;QACvD,OAAO,KAAK,IAAI,SAAS,GAAG,IAAI,CAAC,KAAK,CAAC;IACzC,CAAC;IAEO,WAAW,CAAC,SAAiB;QACnC,MAAM,SAAS,GAAG,gBAAgB,CAAC,SAAS,CAAC,CAAC;QAC9C,IAAI,SAAS,KAAK,IAAI;YAAE,OAAO,IAAI,CAAC;QACpC,OAAO,SAAS,GAAG,IAAI,CAAC,KAAK,CAAC;IAChC,CAAC;IAEO,qBAAqB,CAAC,gBAAwB;QACpD,MAAM,QAAQ,GAAG,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,gBAAgB,GAAG,CAAC,CAAC,CAAC;QACnD,MAAM,QAAQ,GAAG,IAAI,CAAC,aAAa,GAAG,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,QAAQ,CAAC,CAAC;QAC5D,MAAM,IAAI,GAAG,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,YAAY,EAAE,QAAQ,CAAC,CAAC;QACnD,MAAM,MAAM,GAAG,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC,GAAG,CAAC,CAAC,GAAG,IAAI,CAAC,WAAW,CAAC;QAChE,OAAO,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,IAAI,CAAC,KAAK,CAAC,IAAI,GAAG,MAAM,CAAC,CAAC,CAAC;IAChD,CAAC;CACF"}

package/dist/services/hook-drain-service.test.d.ts

@@ -0,0 +1,2 @@
+export {};
+//# sourceMappingURL=hook-drain-service.test.d.ts.map

package/dist/services/hook-drain-service.test.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"hook-drain-service.test.d.ts","sourceRoot":"","sources":["../../src/services/hook-drain-service.test.ts"],"names":[],"mappings":""}

package/dist/services/hook-drain-service.test.js

@@ -0,0 +1,167 @@
+import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest';
+import { createTestDb } from '../db/test-utils.js';
+import { HookDrainService } from './hook-drain-service.js';
+function insertOutboxRow(db, row) {
+    const result = db.prepare(`
+    INSERT INTO hook_outbox (
+      hook_name,
+      status,
+      url,
+      headers,
+      payload,
+      attempts,
+      next_attempt_at,
+      created_at,
+      lock_token,
+      locked_by,
+      lock_expires_at
+    )
+    VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)
+  `).run(row.hook_name ?? 'on_done', row.status ?? 'queued', row.url ?? 'https://example.com/hooks/done', row.headers ?? '{"Authorization":"Bearer test"}', row.payload ?? '{"task_id":"TASK-1","status":"done"}', row.attempts ?? 0, row.next_attempt_at, row.created_at ?? '2026-02-27T11:00:00.000Z', row.lock_token ?? null, row.locked_by ?? null, row.lock_expires_at ?? null);
+    return result.lastInsertRowid;
+}
+describe('HookDrainService', () => {
+    let db;
+    let now;
+    let fetchMock;
+    beforeEach(() => {
+        db = createTestDb();
+        now = new Date('2026-02-27T12:00:00.000Z');
+        fetchMock = vi.fn();
+    });
+    afterEach(() => {
+        db.close();
+    });
+    it('drains due queued hooks and marks deliveries as delivered', async () => {
+        insertOutboxRow(db, {
+            next_attempt_at: '2026-02-27T11:59:00.000Z',
+            created_at: '2026-02-27T11:00:00.000Z',
+        });
+        fetchMock.mockResolvedValue(new Response('ok', { status: 200 }));
+        const service = new HookDrainService(db, {
+            now: () => now,
+            random: () => 0.5,
+            fetchFn: fetchMock,
+            workerId: 'worker-success',
+        });
+        const result = await service.drain();
+        expect(result.claimed).toBe(1);
+        expect(result.delivered).toBe(1);
+        expect(result.retried).toBe(0);
+        expect(result.failed).toBe(0);
+        const row = db.prepare(`
+      SELECT status, delivered_at, attempts, lock_token, lock_expires_at
+      FROM hook_outbox
+      ORDER BY id ASC
+      LIMIT 1
+    `).get();
+        expect(row.status).toBe('delivered');
+        expect(row.delivered_at).toBe('2026-02-27T12:00:00.000Z');
+        expect(row.attempts).toBe(0);
+        expect(row.lock_token).toBeNull();
+        expect(row.lock_expires_at).toBeNull();
+        expect(fetchMock).toHaveBeenCalledTimes(1);
+        expect(fetchMock).toHaveBeenCalledWith('https://example.com/hooks/done', expect.objectContaining({
+            method: 'POST',
+            body: '{"task_id":"TASK-1","status":"done"}',
+        }));
+    });
+    it('schedules retries with exponential backoff when delivery fails', async () => {
+        insertOutboxRow(db, {
+            next_attempt_at: '2026-02-27T11:59:00.000Z',
+            created_at: '2026-02-27T11:00:00.000Z',
+        });
+        fetchMock.mockRejectedValue(new Error('connection refused'));
+        const service = new HookDrainService(db, {
+            now: () => now,
+            random: () => 0.5,
+            fetchFn: fetchMock,
+            workerId: 'worker-retry',
+            backoffBaseMs: 1_000,
+            backoffMaxMs: 60_000,
+            jitterRatio: 0.2,
+            ttlMs: 24 * 60 * 60 * 1000,
+        });
+        const result = await service.drain();
+        expect(result.claimed).toBe(1);
+        expect(result.delivered).toBe(0);
+        expect(result.retried).toBe(1);
+        expect(result.failed).toBe(0);
+        const row = db.prepare(`
+      SELECT status, attempts, next_attempt_at, last_error
+      FROM hook_outbox
+      ORDER BY id ASC
+      LIMIT 1
+    `).get();
+        expect(row.status).toBe('queued');
+        expect(row.attempts).toBe(1);
+        expect(row.next_attempt_at).toBe('2026-02-27T12:00:01.000Z');
+        expect(row.last_error).toContain('network error');
+    });
+    it('marks records as failed once max attempts are exhausted', async () => {
+        insertOutboxRow(db, {
+            attempts: 4,
+            next_attempt_at: '2026-02-27T11:59:00.000Z',
+            created_at: '2026-02-27T11:00:00.000Z',
+        });
+        fetchMock.mockResolvedValue(new Response('upstream failed', { status: 500 }));
+        const service = new HookDrainService(db, {
+            now: () => now,
+            random: () => 0.5,
+            fetchFn: fetchMock,
+            workerId: 'worker-fail',
+            maxAttempts: 5,
+            backoffBaseMs: 1_000,
+            backoffMaxMs: 60_000,
+            jitterRatio: 0.2,
+            ttlMs: 24 * 60 * 60 * 1000,
+        });
+        const result = await service.drain();
+        expect(result.claimed).toBe(1);
+        expect(result.retried).toBe(0);
+        expect(result.failed).toBe(1);
+        const row = db.prepare(`
+      SELECT status, attempts, failed_at, last_error
+      FROM hook_outbox
+      ORDER BY id ASC
+      LIMIT 1
+    `).get();
+        expect(row.status).toBe('failed');
+        expect(row.attempts).toBe(5);
+        expect(row.failed_at).toBe('2026-02-27T12:00:00.000Z');
+        expect(row.last_error).toContain('HTTP 500');
+    });
+    it('reclaims stale processing locks and redrives delivery', async () => {
+        insertOutboxRow(db, {
+            status: 'processing',
+            lock_token: 'stale-token',
+            locked_by: 'stale-worker',
+            lock_expires_at: '2026-02-27T11:59:00.000Z',
+            next_attempt_at: '2026-02-27T11:35:00.000Z',
+            created_at: '2026-02-27T11:00:00.000Z',
+        });
+        fetchMock.mockResolvedValue(new Response('ok', { status: 200 }));
+        const service = new HookDrainService(db, {
+            now: () => now,
+            random: () => 0.5,
+            fetchFn: fetchMock,
+            workerId: 'worker-reclaim',
+            lockTimeoutMs: 60_000,
+        });
+        const result = await service.drain();
+        expect(result.reclaimed).toBe(1);
+        expect(result.claimed).toBe(1);
+        expect(result.delivered).toBe(1);
+        const row = db.prepare(`
+      SELECT status, lock_token, lock_expires_at, delivered_at
+      FROM hook_outbox
+      ORDER BY id ASC
+      LIMIT 1
+    `).get();
+        expect(row.status).toBe('delivered');
+        expect(row.lock_token).toBeNull();
+        expect(row.lock_expires_at).toBeNull();
+        expect(row.delivered_at).toBe('2026-02-27T12:00:00.000Z');
+    });
+});
+//# sourceMappingURL=hook-drain-service.test.js.map

package/dist/services/hook-drain-service.test.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"hook-drain-service.test.js","sourceRoot":"","sources":["../../src/services/hook-drain-service.test.ts"],"names":[],"mappings":"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"}

package/dist/services/search-service.d.ts

@@ -16,6 +16,7 @@ export interface SearchResult {
 }
 export interface SearchOptions {
     project?: string;
+    status?: string;
     limit?: number;
     offset?: number;
 }

package/dist/services/search-service.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"search-service.d.ts","sourceRoot":"","sources":["../../src/services/search-service.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,QAAQ,MAAM,QAAQ,CAAC;AAEnC,MAAM,WAAW,gBAAgB;IAAG,OAAO,EAAE,MAAM,CAAC;IAAC,KAAK,EAAE,MAAM,CAAC;IAAC,OAAO,EAAE,MAAM,CAAC;IAAC,MAAM,EAAE,MAAM,CAAC;IAAC,WAAW,EAAE,MAAM,GAAG,IAAI,CAAC;IAAC,QAAQ,EAAE,MAAM,CAAC;IAAC,IAAI,EAAE,MAAM,CAAC;CAAE;AAClK,MAAM,WAAW,YAAY;IAAG,KAAK,EAAE,gBAAgB,EAAE,CAAC;IAAC,KAAK,EAAE,MAAM,CAAC;IAAC,KAAK,EAAE,MAAM,CAAC;IAAC,MAAM,EAAE,MAAM,CAAC;CAAE;AAC1G,MAAM,WAAW,aAAa;IAAG,OAAO,CAAC,EAAE,MAAM,CAAC;IAAC,KAAK,CAAC,EAAE,MAAM,CAAC;IAAC,MAAM,CAAC,EAAE,MAAM,CAAC;CAAE;AAErF,qBAAa,aAAa;IACZ,OAAO,CAAC,EAAE;gBAAF,EAAE,EAAE,QAAQ,CAAC,QAAQ;IAEzC,MAAM,CAAC,KAAK,EAAE,MAAM,EAAE,IAAI,CAAC,EAAE,aAAa,GAAG,YAAY;CA+B1D"}
+{"version":3,"file":"search-service.d.ts","sourceRoot":"","sources":["../../src/services/search-service.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,QAAQ,MAAM,QAAQ,CAAC;AAEnC,MAAM,WAAW,gBAAgB;IAAG,OAAO,EAAE,MAAM,CAAC;IAAC,KAAK,EAAE,MAAM,CAAC;IAAC,OAAO,EAAE,MAAM,CAAC;IAAC,MAAM,EAAE,MAAM,CAAC;IAAC,WAAW,EAAE,MAAM,GAAG,IAAI,CAAC;IAAC,QAAQ,EAAE,MAAM,CAAC;IAAC,IAAI,EAAE,MAAM,CAAC;CAAE;AAClK,MAAM,WAAW,YAAY;IAAG,KAAK,EAAE,gBAAgB,EAAE,CAAC;IAAC,KAAK,EAAE,MAAM,CAAC;IAAC,KAAK,EAAE,MAAM,CAAC;IAAC,MAAM,EAAE,MAAM,CAAC;CAAE;AAC1G,MAAM,WAAW,aAAa;IAAG,OAAO,CAAC,EAAE,MAAM,CAAC;IAAC,MAAM,CAAC,EAAE,MAAM,CAAC;IAAC,KAAK,CAAC,EAAE,MAAM,CAAC;IAAC,MAAM,CAAC,EAAE,MAAM,CAAC;CAAE;AAEtG,qBAAa,aAAa;IACZ,OAAO,CAAC,EAAE;gBAAF,EAAE,EAAE,QAAQ,CAAC,QAAQ;IAEzC,MAAM,CAAC,KAAK,EAAE,MAAM,EAAE,IAAI,CAAC,EAAE,aAAa,GAAG,YAAY;CA+B1D"}

package/dist/services/search-service.js

@@ -12,23 +12,21 @@ export class SearchService {
         const safeQuery = trimmedQuery.split(/\s+/).filter(w => w.length > 0).map(w => w.replace(/[^a-zA-Z0-9]/g, '')).filter(w => w.length > 0).join(' ');
         if (!safeQuery)
             return { tasks: [], total: 0, limit, offset };
-        let countQuery, searchQuery;
-        const params = [];
+        const where = ['task_search MATCH ?'];
+        const whereParams = [safeQuery];
         if (opts?.project) {
-            countQuery = `SELECT COUNT(*) as total FROM task_search s JOIN tasks_current t ON s.task_id = t.task_id WHERE task_search MATCH ? AND t.project = ?`;
-            searchQuery = `SELECT t.task_id, t.title, t.project, t.status, t.description, t.priority, rank FROM task_search s JOIN tasks_current t ON s.task_id = t.task_id WHERE task_search MATCH ? AND t.project = ? ORDER BY rank LIMIT ? OFFSET ?`;
-            params.push(safeQuery, opts.project, limit, offset);
+            where.push('t.project = ?');
+            whereParams.push(opts.project);
         }
-        else {
-            countQuery = `SELECT COUNT(*) as total FROM task_search s JOIN tasks_current t ON s.task_id = t.task_id WHERE task_search MATCH ?`;
-            searchQuery = `SELECT t.task_id, t.title, t.project, t.status, t.description, t.priority, rank FROM task_search s JOIN tasks_current t ON s.task_id = t.task_id WHERE task_search MATCH ? ORDER BY rank LIMIT ? OFFSET ?`;
-            params.push(safeQuery, limit, offset);
+        if (opts?.status) {
+            where.push('t.status = ?');
+            whereParams.push(opts.status);
         }
-        const countParams = opts?.project
-            ? [safeQuery, opts.project]
-            : [safeQuery];
-        const total = this.db.prepare(countQuery).get(...countParams).total;
-        const rows = this.db.prepare(searchQuery).all(...params);
+        const whereClause = where.join(' AND ');
+        const countQuery = `SELECT COUNT(*) as total FROM task_search s JOIN tasks_current t ON s.task_id = t.task_id WHERE ${whereClause}`;
+        const searchQuery = `SELECT t.task_id, t.title, t.project, t.status, t.description, t.priority, rank FROM task_search s JOIN tasks_current t ON s.task_id = t.task_id WHERE ${whereClause} ORDER BY rank LIMIT ? OFFSET ?`;
+        const total = this.db.prepare(countQuery).get(...whereParams).total;
+        const rows = this.db.prepare(searchQuery).all(...whereParams, limit, offset);
         return { tasks: rows, total, limit, offset };
     }
 }

package/dist/services/search-service.js.map

@@ -1 +1 @@
-{"version":3,"file":"search-service.js","sourceRoot":"","sources":["../../src/services/search-service.ts"],"names":[],"mappings":"AAOA,MAAM,OAAO,aAAa;IACJ;IAApB,YAAoB,EAAqB;QAArB,OAAE,GAAF,EAAE,CAAmB;IAAG,CAAC;IAE7C,MAAM,CAAC,KAAa,EAAE,IAAoB;QACxC,MAAM,KAAK,GAAG,IAAI,EAAE,KAAK,IAAI,EAAE,CAAC;QAChC,MAAM,MAAM,GAAG,IAAI,EAAE,MAAM,IAAI,CAAC,CAAC;QACjC,MAAM,YAAY,GAAG,KAAK,CAAC,IAAI,EAAE,CAAC;QAElC,IAAI,CAAC,YAAY;YAAE,OAAO,EAAE,KAAK,EAAE,EAAE,EAAE,KAAK,EAAE,CAAC,EAAE,KAAK,EAAE,MAAM,EAAE,CAAC;QAEjE,MAAM,SAAS,GAAG,YAAY,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,OAAO,CAAC,eAAe,EAAE,EAAE,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;QACnJ,IAAI,CAAC,SAAS;YAAE,OAAO,EAAE,KAAK,EAAE,EAAE,EAAE,KAAK,EAAE,CAAC,EAAE,KAAK,EAAE,MAAM,EAAE,CAAC;QAE9D,IAAI,UAAkB,EAAE,WAAmB,CAAC;QAC5C,MAAM,MAAM,GAA2B,EAAE,CAAC;QAE1C,IAAI,IAAI,EAAE,OAAO,EAAE,CAAC;YAClB,UAAU,GAAG,uIAAuI,CAAC;YACrJ,WAAW,GAAG,6NAA6N,CAAC;YAC5O,MAAM,CAAC,IAAI,CAAC,SAAS,EAAE,IAAI,CAAC,OAAO,EAAE,KAAK,EAAE,MAAM,CAAC,CAAC;QACtD,CAAC;aAAM,CAAC;YACN,UAAU,GAAG,qHAAqH,CAAC;YACnI,WAAW,GAAG,2MAA2M,CAAC;YAC1N,MAAM,CAAC,IAAI,CAAC,SAAS,EAAE,KAAK,EAAE,MAAM,CAAC,CAAC;QACxC,CAAC;QAED,MAAM,WAAW,GAA2B,IAAI,EAAE,OAAO;YACvD,CAAC,CAAC,CAAC,SAAS,EAAE,IAAI,CAAC,OAAO,CAAC;YAC3B,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC;QAChB,MAAM,KAAK,GAAI,IAAI,CAAC,EAAE,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC,GAAG,CAAC,GAAG,WAAW,CAAuB,CAAC,KAAK,CAAC;QAC3F,MAAM,IAAI,GAAG,IAAI,CAAC,EAAE,CAAC,OAAO,CAAC,WAAW,CAAC,CAAC,GAAG,CAAC,GAAG,MAAM,CAAuB,CAAC;QAE/E,OAAO,EAAE,KAAK,EAAE,IAAI,EAAE,KAAK,EAAE,KAAK,EAAE,MAAM,EAAE,CAAC;IAC/C,CAAC;CACF"}
+{"version":3,"file":"search-service.js","sourceRoot":"","sources":["../../src/services/search-service.ts"],"names":[],"mappings":"AAOA,MAAM,OAAO,aAAa;IACJ;IAApB,YAAoB,EAAqB;QAArB,OAAE,GAAF,EAAE,CAAmB;IAAG,CAAC;IAE7C,MAAM,CAAC,KAAa,EAAE,IAAoB;QACxC,MAAM,KAAK,GAAG,IAAI,EAAE,KAAK,IAAI,EAAE,CAAC;QAChC,MAAM,MAAM,GAAG,IAAI,EAAE,MAAM,IAAI,CAAC,CAAC;QACjC,MAAM,YAAY,GAAG,KAAK,CAAC,IAAI,EAAE,CAAC;QAElC,IAAI,CAAC,YAAY;YAAE,OAAO,EAAE,KAAK,EAAE,EAAE,EAAE,KAAK,EAAE,CAAC,EAAE,KAAK,EAAE,MAAM,EAAE,CAAC;QAEjE,MAAM,SAAS,GAAG,YAAY,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,OAAO,CAAC,eAAe,EAAE,EAAE,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;QACnJ,IAAI,CAAC,SAAS;YAAE,OAAO,EAAE,KAAK,EAAE,EAAE,EAAE,KAAK,EAAE,CAAC,EAAE,KAAK,EAAE,MAAM,EAAE,CAAC;QAE9D,MAAM,KAAK,GAAa,CAAC,qBAAqB,CAAC,CAAC;QAChD,MAAM,WAAW,GAA2B,CAAC,SAAS,CAAC,CAAC;QAExD,IAAI,IAAI,EAAE,OAAO,EAAE,CAAC;YAClB,KAAK,CAAC,IAAI,CAAC,eAAe,CAAC,CAAC;YAC5B,WAAW,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;QACjC,CAAC;QAED,IAAI,IAAI,EAAE,MAAM,EAAE,CAAC;YACjB,KAAK,CAAC,IAAI,CAAC,cAAc,CAAC,CAAC;YAC3B,WAAW,CAAC,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;QAChC,CAAC;QAED,MAAM,WAAW,GAAG,KAAK,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;QACxC,MAAM,UAAU,GAAG,mGAAmG,WAAW,EAAE,CAAC;QACpI,MAAM,WAAW,GAAG,0JAA0J,WAAW,iCAAiC,CAAC;QAC3N,MAAM,KAAK,GAAI,IAAI,CAAC,EAAE,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC,GAAG,CAAC,GAAG,WAAW,CAAuB,CAAC,KAAK,CAAC;QAC3F,MAAM,IAAI,GAAG,IAAI,CAAC,EAAE,CAAC,OAAO,CAAC,WAAW,CAAC,CAAC,GAAG,CAAC,GAAG,WAAW,EAAE,KAAK,EAAE,MAAM,CAAuB,CAAC;QAEnG,OAAO,EAAE,KAAK,EAAE,IAAI,EAAE,KAAK,EAAE,KAAK,EAAE,MAAM,EAAE,CAAC;IAC/C,CAAC;CACF"}