@beignet/provider-db-drizzle 0.0.37 → 0.0.39

package/src/shared/idempotency-core.ts

@@ -13,6 +13,7 @@
 
 import {
   createIdempotencyStorageKey,
+  DEFAULT_IDEMPOTENCY_RESERVATION_TTL_SEC,
   type IdempotencyCompleteInput,
   type IdempotencyFailInput,
   type IdempotencyPort,
@@ -57,6 +58,8 @@ export interface IdempotencyPortCoreOptions {
    * Clock used by tests and deterministic environments.
    */
   now?: () => Date;
+  /** Token factory used for deterministic tests. */
+  createReservationToken?: () => string;
 }
 
 /**
@@ -84,7 +87,7 @@ export type IdempotencyMutationErrorConstructor = new (
 export function formatIdempotencyMutationErrorMessage(
   args: IdempotencyMutationErrorArgs,
 ): string {
-  return `Idempotency ${args.action} for key "${args.key}" in namespace "${args.namespace}" matched no in-progress reservation with this fingerprint. The reservation may be missing, expired, already completed or released, or reserved with a different fingerprint.`;
+  return `Idempotency ${args.action} for key "${args.key}" in namespace "${args.namespace}" matched no in-progress reservation with this fingerprint and reservation token. The reservation may be missing, expired, already completed or released, or owned by a different execution.`;
 }
 
 function nowFrom(options: IdempotencyPortCoreOptions): Date {
@@ -117,6 +120,7 @@ function validateReserveInput(input: IdempotencyReserveInput): void {
   assertNonEmptyString("key", input.key);
   assertNonEmptyString("fingerprint", input.fingerprint);
   assertIdempotencyTtl(input.ttlSec);
+  assertIdempotencyTtl(input.reservationTtlSec);
 }
 
 function validateMutationInput(
@@ -125,6 +129,65 @@ function validateMutationInput(
   assertNonEmptyString("namespace", input.namespace);
   assertNonEmptyString("key", input.key);
   assertNonEmptyString("fingerprint", input.fingerprint);
+  assertNonEmptyString("reservationToken", input.reservationToken);
+}
+
+type StoredReservationState = {
+  reservationToken: string;
+  replayTtlSec: number | null;
+};
+
+function encodeReservationState(
+  reservationToken: string,
+  replayTtlSec: number | undefined,
+): string {
+  return JSON.stringify({
+    reservationToken,
+    replayTtlSec: replayTtlSec ?? null,
+  });
+}
+
+function decodeReservationState(
+  value: string | null,
+): StoredReservationState | undefined {
+  if (value === null) return undefined;
+  try {
+    const parsed = JSON.parse(value) as {
+      reservationToken?: unknown;
+      replayTtlSec?: unknown;
+    };
+    if (
+      typeof parsed.reservationToken !== "string" ||
+      (parsed.replayTtlSec !== null &&
+        (!Number.isInteger(parsed.replayTtlSec) ||
+          Number(parsed.replayTtlSec) <= 0))
+    ) {
+      return undefined;
+    }
+    return {
+      reservationToken: parsed.reservationToken,
+      replayTtlSec:
+        parsed.replayTtlSec === null ? null : Number(parsed.replayTtlSec),
+    };
+  } catch {
+    return undefined;
+  }
+}
+
+function createRandomReservationToken(): string {
+  if (typeof globalThis.crypto?.randomUUID === "function") {
+    return globalThis.crypto.randomUUID();
+  }
+
+  const bytes = new Uint8Array(16);
+  globalThis.crypto?.getRandomValues?.(bytes);
+  if (bytes.some((value) => value !== 0)) {
+    return Array.from(bytes, (value) =>
+      value.toString(16).padStart(2, "0"),
+    ).join("");
+  }
+
+  return `${Date.now().toString(36)}-${Math.random().toString(36).slice(2)}`;
 }
 
 /**
@@ -172,7 +235,15 @@ export function createIdempotencyPortCore(
 
     const now = nowFrom(options);
     const nowIso = encodeTimestamp(now);
-    const expiresAt = resolveIdempotencyExpiresAt(input.ttlSec, now);
+    const expiresAt = resolveIdempotencyExpiresAt(
+      input.reservationTtlSec ?? DEFAULT_IDEMPOTENCY_RESERVATION_TTL_SEC,
+      now,
+    );
+    const reservationToken = encodeReservationState(
+      (options.createReservationToken ?? createRandomReservationToken)(),
+      input.ttlSec,
+    );
+    const reservationJson = reservationToken;
     const storageKey = createIdempotencyStorageKey(input);
     const scopeKey = normalizeIdempotencyScope(input.scope);
     const reserved = (): IdempotencyReservation => ({
@@ -181,6 +252,7 @@ export function createIdempotencyPortCore(
       key: input.key,
       scopeKey,
       fingerprint: input.fingerprint,
+      reservationToken,
       reservedAt: now,
       expiresAt,
     });
@@ -204,7 +276,7 @@ export function createIdempotencyPortCore(
       ${scopeKey},
       ${input.fingerprint},
       'in-progress',
-      null,
+      ${reservationJson},
       ${nowIso},
       null,
       ${expiresAt ? encodeTimestamp(expiresAt) : null},
@@ -225,7 +297,7 @@ export function createIdempotencyPortCore(
         scope_key = ${scopeKey},
         fingerprint = ${input.fingerprint},
         status = 'in-progress',
-        result_json = null,
+        result_json = ${reservationJson},
         reserved_at = ${nowIso},
         completed_at = null,
         expires_at = ${expiresAt ? encodeTimestamp(expiresAt) : null},
@@ -265,8 +337,14 @@ export function createIdempotencyPortCore(
     async complete(input) {
       validateMutationInput(input);
 
-      const nowIso = encodeTimestamp(nowFrom(options));
+      const completedAt = nowFrom(options);
+      const completedAtIso = encodeTimestamp(completedAt);
       const storageKey = createIdempotencyStorageKey(input);
+      const reservationState = decodeReservationState(input.reservationToken);
+      const expiresAt = resolveIdempotencyExpiresAt(
+        reservationState?.replayTtlSec ?? undefined,
+        completedAt,
+      );
       const serializedResult = JSON.stringify(input.result);
       const resultJson =
         serializedResult === undefined ? null : serializedResult;
@@ -275,10 +353,12 @@ export function createIdempotencyPortCore(
         set
           status = 'completed',
           result_json = ${resultJson},
-          completed_at = ${nowIso},
-          updated_at = ${nowIso}
+          completed_at = ${completedAtIso},
+          expires_at = ${expiresAt ? encodeTimestamp(expiresAt) : null},
+          updated_at = ${completedAtIso}
         where storage_key = ${storageKey}
           and fingerprint = ${input.fingerprint}
+          and result_json = ${input.reservationToken}
           and status = 'in-progress'`);
 
       assertIdempotencyMutationSucceeded("complete", input, rowsAffected);
@@ -291,6 +371,7 @@ export function createIdempotencyPortCore(
       const rowsAffected = await executor.run(sql`delete from ${executor.table}
         where storage_key = ${storageKey}
           and fingerprint = ${input.fingerprint}
+          and result_json = ${input.reservationToken}
           and status = 'in-progress'`);
 
       assertIdempotencyMutationSucceeded("fail", input, rowsAffected);

package/src/shared/outbox-core.ts

@@ -362,6 +362,7 @@ export function createOutboxPortCore(
         kind,
         name,
         payload_json,
+        trace_context_json,
         status,
         attempts,
         max_attempts,
@@ -378,6 +379,7 @@ export function createOutboxPortCore(
         ${message.kind},
         ${message.name},
         ${JSON.stringify(message.payload)},
+        ${message.trace ? JSON.stringify(message.trace) : null},
         ${message.status},
         ${message.attempts},
         ${message.maxAttempts},

package/src/shared/rows.ts

@@ -19,6 +19,7 @@ import {
   type OutboxMessageKind,
   type OutboxMessageStatus,
 } from "@beignet/core/outbox";
+import { parseTraceCarrier, type TraceCarrier } from "@beignet/core/tracing";
 
 /**
  * Encode a timestamp for storage. All dialects store ISO-8601 UTC strings.
@@ -56,6 +57,7 @@ export interface OutboxRow {
   kind: OutboxMessageKind;
   name: string;
   payload_json: string;
+  trace_context_json: string | null;
   status: OutboxMessageStatus;
   attempts: number;
   max_attempts: number;
@@ -69,15 +71,26 @@ export interface OutboxRow {
   updated_at: string;
 }
 
+function parseStoredTrace(value: string | null): TraceCarrier | undefined {
+  if (!value) return undefined;
+  try {
+    return parseTraceCarrier(JSON.parse(value));
+  } catch {
+    return undefined;
+  }
+}
+
 /**
  * Decode a raw outbox row into an `OutboxMessage`.
  */
 export function rowToMessage(row: OutboxRow): OutboxMessage {
+  const trace = parseStoredTrace(row.trace_context_json);
   return {
     id: row.id,
     kind: row.kind,
     name: row.name,
     payload: JSON.parse(row.payload_json) as OutboxJsonValue,
+    ...(trace ? { trace } : {}),
     status: row.status,
     attempts: row.attempts,
     maxAttempts: row.max_attempts,

package/src/sqlite/index.ts

@@ -408,6 +408,7 @@ export function createDrizzleSqliteOutboxSetupStatements(
       kind text NOT NULL,
       name text NOT NULL,
       payload_json text NOT NULL,
+      trace_context_json text,
       status text NOT NULL,
       attempts integer DEFAULT 0 NOT NULL,
       max_attempts integer DEFAULT 3 NOT NULL,

package/src/sqlite/schema.ts

@@ -43,6 +43,7 @@ export const outboxMessages = sqliteTable(
     kind: text("kind").notNull(),
     name: text("name").notNull(),
     payloadJson: text("payload_json").notNull(),
+    traceContextJson: text("trace_context_json"),
     status: text("status").notNull(),
     attempts: integer("attempts").notNull().default(0),
     maxAttempts: integer("max_attempts").notNull().default(3),