@dvmkit/sdk 0.5.0-rc.1 → 0.7.0-rc.1

package/dist/{chunk-PB4FYZET.js → chunk-EQLA4FFY.js}

@@ -1,3 +1,7 @@
+import {
+  ContentHoldError,
+  applyContentHoldMutation
+} from "./chunk-AFV77S4C.js";
 import {
   withSdkInitLock
 } from "./chunk-COYKJRMM.js";
@@ -228,6 +232,18 @@ var PostgresJobStore = class {
       ALTER TABLE jobs ADD COLUMN IF NOT EXISTS receipt JSONB;
       ALTER TABLE jobs ADD COLUMN IF NOT EXISTS receipt_seq BIGINT;
       ALTER TABLE jobs ADD COLUMN IF NOT EXISTS redacted_at BIGINT;
+      CREATE TABLE IF NOT EXISTS job_content_holds (
+        id TEXT PRIMARY KEY, job_id TEXT NOT NULL REFERENCES jobs(id) ON DELETE CASCADE,
+        data JSONB NOT NULL
+      );
+      CREATE INDEX IF NOT EXISTS job_content_holds_job_idx ON job_content_holds(job_id);
+      CREATE TABLE IF NOT EXISTS job_content_hold_events (
+        event_position BIGSERIAL UNIQUE,
+        id TEXT PRIMARY KEY, job_id TEXT NOT NULL REFERENCES jobs(id) ON DELETE CASCADE,
+        data JSONB NOT NULL
+      );
+      CREATE INDEX IF NOT EXISTS job_content_hold_events_job_idx ON job_content_hold_events(job_id);
+
       -- credit-ledger linkage. Written at submission alongside the
       -- payment fields; the terminal funnel settles/releases the draw and the
       -- receipt countersigns the ReceiptCredit block from it.
@@ -536,7 +552,7 @@ var PostgresJobStore = class {
         required_msats = EXCLUDED.required_msats,
         step_cache = EXCLUDED.step_cache,
         state = EXCLUDED.state,
-        last_activity_at = EXCLUDED.last_activity_at
+        last_activity_at = CASE WHEN jobs.status IN ('completed', 'failed', 'cancelled') THEN jobs.last_activity_at ELSE EXCLUDED.last_activity_at END
       -- terminal is terminal. On a multi-machine DVM a DELETE can
       -- land on a machine that isn't running the handler, which cancels the
       -- job in the store only; the handler's machine never learns of it and
@@ -737,6 +753,7 @@ var PostgresJobStore = class {
     const client = await this.pool.connect();
     try {
       await client.query("BEGIN");
+      await client.query("SELECT id FROM jobs WHERE id = $1 FOR UPDATE", [args.jobId]);
       const { rowCount } = await client.query(
         `UPDATE jobs SET
          input = '',
@@ -760,6 +777,7 @@ var PostgresJobStore = class {
          AND last_activity_at = $2
          AND redacted_at IS NULL
          AND status IN ('completed', 'failed', 'cancelled')
+         AND NOT EXISTS (SELECT 1 FROM job_content_holds h WHERE h.job_id=jobs.id AND h.data->'cleared_at' = 'null'::jsonb)
          AND ($4::boolean = false OR NOT EXISTS (
            SELECT 1 FROM job_messages m WHERE m.job_id=jobs.id
              AND m.data->>'type'='payment'
@@ -781,6 +799,38 @@ var PostgresJobStore = class {
       client.release();
     }
   }
+  async getContentSnapshot(jobId, dvmId) {
+    const { rows } = await this.pool.query(
+      `SELECT j.*, COALESCE((SELECT jsonb_agg(h.data ORDER BY h.data->>'created_at', h.id) FROM job_content_holds h WHERE h.job_id=j.id), '[]'::jsonb) AS content_holds,
+       COALESCE((SELECT jsonb_agg(e.data ORDER BY e.event_position) FROM job_content_hold_events e WHERE e.job_id=j.id), '[]'::jsonb) AS content_hold_events
+       FROM jobs j WHERE j.id=$1 AND ($2::text IS NULL OR j.dvm_id IS NULL OR j.dvm_id=$2)`,
+      [jobId, dvmId ?? null]
+    );
+    if (!rows[0]) return void 0;
+    return { job: rowToRecord(rows[0]), history: { holds: rows[0].content_holds, events: rows[0].content_hold_events } };
+  }
+  async mutateContentHold(jobId, mutation, dvmId) {
+    const client = await this.pool.connect();
+    try {
+      await client.query("BEGIN");
+      const { rows } = await client.query("SELECT * FROM jobs WHERE id=$1 AND ($2::text IS NULL OR dvm_id IS NULL OR dvm_id=$2) FOR UPDATE", [jobId, dvmId ?? null]);
+      if (!rows[0]) throw new ContentHoldError("job_not_found");
+      const holds = await client.query("SELECT data FROM job_content_holds WHERE job_id=$1 ORDER BY data->>'created_at', id", [jobId]);
+      const events = await client.query("SELECT data FROM job_content_hold_events WHERE job_id=$1 ORDER BY event_position", [jobId]);
+      const history = applyContentHoldMutation(rowToRecord(rows[0]), { holds: holds.rows.map((row) => row.data), events: events.rows.map((row) => row.data) }, mutation);
+      const event = history.events.at(-1);
+      const hold = history.holds.find((item) => item.id === event.hold_id);
+      await client.query(`INSERT INTO job_content_holds(id,job_id,data) VALUES($1,$2,$3) ON CONFLICT(id) DO UPDATE SET data=EXCLUDED.data`, [hold.id, jobId, JSON.stringify(hold)]);
+      await client.query("INSERT INTO job_content_hold_events(id,job_id,data) VALUES($1,$2,$3)", [event.id, jobId, JSON.stringify(event)]);
+      await client.query("COMMIT");
+      return history;
+    } catch (error) {
+      await client.query("ROLLBACK");
+      throw error;
+    } finally {
+      client.release();
+    }
+  }
   async claimReceiptSeq(jobId) {
     const client = await this.pool.connect();
     try {
@@ -828,7 +878,7 @@ var PostgresJobStore = class {
     try {
       await client.query("BEGIN");
       const { rows } = await client.query(
-        `UPDATE jobs SET next_seq = next_seq + 1, last_activity_at = $2,
+        `UPDATE jobs SET next_seq = next_seq + 1, last_activity_at = CASE WHEN status IN ('completed','failed','cancelled') THEN last_activity_at ELSE $2 END,
            awaiting_input_at_ms = CASE WHEN $3::boolean AND status NOT IN ('completed', 'failed', 'cancelled')
              THEN COALESCE(awaiting_input_at_ms, $2) ELSE awaiting_input_at_ms END,
            status = CASE WHEN $3::boolean AND status NOT IN ('completed', 'failed', 'cancelled')
@@ -925,7 +975,7 @@ var PostgresJobStore = class {
       await client.query("BEGIN");
       if (message.type === "payment") await this.hostingCleanupFence?.assertNewIntent(client);
       const { rows } = await client.query(
-        `UPDATE jobs SET next_seq = next_seq + 1, last_activity_at = $2
+        `UPDATE jobs SET next_seq = next_seq + 1, last_activity_at = CASE WHEN status IN ('completed','failed','cancelled') THEN last_activity_at ELSE $2 END
            WHERE id = $1 AND redacted_at IS NULL
            RETURNING (next_seq - 1) AS seq`,
         [jobId, Date.now()]
@@ -1024,7 +1074,7 @@ var PostgresJobStore = class {
              cashu_flow = COALESCE($9, cashu_flow),
              pending_x402_nonce = CASE WHEN $11::boolean THEN NULL ELSE pending_x402_nonce END,
              pending_x402_amount_usdc_micro = CASE WHEN $11::boolean THEN NULL ELSE pending_x402_amount_usdc_micro END,
-             last_activity_at = $12
+             last_activity_at = CASE WHEN status IN ('completed','failed','cancelled') THEN last_activity_at ELSE $12 END
            WHERE id = $1
            RETURNING status, paid_msats, pending_payment_msats, credit_id, draw_id`,
           params

package/dist/{chunk-LE74UEV7.js → chunk-EZXAJ6EI.js}

@@ -3,25 +3,14 @@ import {
   listCredits,
   maxAdvertisedMicro,
   withinAdvertisedTolerance
-} from "./chunk-B2IROPQF.js";
+} from "./chunk-O2OTZ5GP.js";
 import {
   authorizeProtectedRemoval,
   isValidEvmPrivateKey,
   loadConfig,
-  updateConfig
-} from "./chunk-MZRJR2CW.js";
-import {
-  X402_DEFAULT_NETWORK,
-  X402_V1_VERSION,
-  X402_VERSION,
-  buildPaymentRequirements,
-  chainIdFromCaip2,
-  encodePayment,
-  usdcContractFor,
-  usdcDomainNameFor,
-  usdcDomainVersionFor,
-  x402NetworkToCaip2
-} from "./chunk-IWQHUSMO.js";
+  updateConfig,
+  x402WalletFromConfig
+} from "./chunk-WBOKPC37.js";
 import {
   costAnchor,
   fetchBtcUsdRate,
@@ -30,25 +19,33 @@ import {
   getLastKnownBtcRate,
   msatsToUsdc,
   usdcToMsats
-} from "./chunk-PAIM66YA.js";
+} from "./chunk-NFMOPYBA.js";
 import {
   X402_CHANNELS_FILE,
+  X402_DEFAULT_NETWORK,
+  X402_V1_VERSION,
+  X402_VERSION,
+  buildPaymentRequirements,
+  chainIdFromCaip2,
+  encodePayment,
   ensureConfigDir,
   resolveRpcHttpTransportOptions,
-  resolveRpcOverride
-} from "./chunk-CZULM42S.js";
+  resolveRpcOverride,
+  usdcContractFor,
+  usdcDomainNameFor,
+  usdcDomainVersionFor,
+  x402NetworkToCaip2
+} from "./chunk-CXCQLOOK.js";
 import {
   redactUrl,
   redactUrlsInText
 } from "./chunk-FUJ36YDV.js";
 import {
+  DvmError,
   assertSupportedX402Network,
   x402NetworkByCaip2,
   x402SupportedNetworksHint
-} from "./chunk-RLTSCKRI.js";
-import {
-  DvmError
-} from "./chunk-LIRAHP7B.js";
+} from "./chunk-BPYMEMQX.js";
 
 // src/lib/x402/asset.ts
 function resolveX402Asset(network = X402_DEFAULT_NETWORK) {
@@ -166,6 +163,43 @@ function rateUnavailable(purpose) {
 var X402_EXACT_AUTHORIZATION_TTL_SECONDS = 600;
 var X402_REFUSAL_TRANSACTION_DISCOVERY_WINDOW_MS = 15 * 6e4;
 
+// src/lib/x402/voucher-pending.ts
+var X402_PENDING_STALE_MS = 24 * 60 * 60 * 1e3;
+function x402PendingStale(pending, now = Date.now()) {
+  return now - pending.requestedAt >= X402_PENDING_STALE_MS;
+}
+function x402PendingRetired(pending) {
+  return pending.refusedAt !== void 0 || pending.supersededAt !== void 0;
+}
+function x402PendingBlockExpiresAt(pending) {
+  return x402PendingDepositExpiresAt(pending) ?? pending.requestedAt + X402_PENDING_STALE_MS;
+}
+function x402PendingDepositExpiresAt(pending) {
+  const seconds = pending.authorizationValidBefore ? Number(pending.authorizationValidBefore) : NaN;
+  return Number.isFinite(seconds) ? seconds * 1e3 : void 0;
+}
+function x402PendingUnsettled(pending, now = Date.now()) {
+  return !x402PendingRetired(pending) || now <= x402PendingBlockExpiresAt(pending);
+}
+function x402VoucherPendingState(blocking) {
+  const depositExpiresAt = x402PendingDepositExpiresAt(blocking);
+  return {
+    code: "x402_voucher_pending",
+    creditId: blocking.creditId,
+    fundId: blocking.fundId,
+    channelId: blocking.channelId,
+    endpoint: blocking.endpoint,
+    retired: x402PendingRetired(blocking),
+    blockedUntil: x402PendingBlockExpiresAt(blocking),
+    ...depositExpiresAt === void 0 ? {} : { depositExpiresAt }
+  };
+}
+function assertNoRivalX402Voucher(channelId, creditId, pending, now) {
+  const blocking = pending.filter((entry) => x402PendingUnsettled(entry, now));
+  const rival = blocking.find((entry) => entry.creditId !== creditId && !x402PendingRetired(entry)) ?? blocking.find((entry) => entry.creditId !== creditId || x402PendingRetired(entry));
+  if (rival) throw { ...x402VoucherPendingState(rival), channelId };
+}
+
 // src/lib/x402/channel-store.ts
 import { AsyncLocalStorage } from "async_hooks";
 import { existsSync, readFileSync, renameSync, writeFileSync } from "fs";
@@ -203,23 +237,6 @@ function clearPendingX402ExactFunding(pending) {
   );
   saveFile(file);
 }
-var X402_PENDING_STALE_MS = 24 * 60 * 60 * 1e3;
-function x402PendingStale(pending, now = Date.now()) {
-  return now - pending.requestedAt >= X402_PENDING_STALE_MS;
-}
-function x402PendingRetired(pending) {
-  return pending.refusedAt !== void 0 || pending.supersededAt !== void 0;
-}
-function x402PendingBlockExpiresAt(pending) {
-  return x402PendingDepositExpiresAt(pending) ?? pending.requestedAt + X402_PENDING_STALE_MS;
-}
-function x402PendingDepositExpiresAt(pending) {
-  const seconds = pending.authorizationValidBefore ? Number(pending.authorizationValidBefore) : NaN;
-  return Number.isFinite(seconds) ? seconds * 1e3 : void 0;
-}
-function x402PendingUnsettled(pending, now = Date.now()) {
-  return !x402PendingRetired(pending) || now <= x402PendingBlockExpiresAt(pending);
-}
 function x402PendingFundingJson(entry) {
   return {
     credit_id: entry.creditId,
@@ -667,15 +684,7 @@ function saveFile(file) {
 
 // src/lib/x402/wallet.ts
 function loadX402Wallet() {
-  const config = loadConfig();
-  const x402 = config?.x402;
-  const privateKey = x402?.privateKey;
-  if (!privateKey || !isValidEvmPrivateKey(privateKey)) return null;
-  return {
-    privateKey,
-    address: "",
-    network: x402.network ?? X402_DEFAULT_NETWORK
-  };
+  return x402WalletFromConfig(loadConfig());
 }
 async function ensureAddress(wallet) {
   if (!isValidEvmPrivateKey(wallet.privateKey)) throw invalidX402PrivateKey();
@@ -1032,17 +1041,19 @@ export {
   staleRateNotice,
   X402_EXACT_AUTHORIZATION_TTL_SECONDS,
   X402_REFUSAL_TRANSACTION_DISCOVERY_WINDOW_MS,
-  x402ExactFundingDead,
-  recordPendingX402ExactFunding,
-  loadResumableX402ExactFunding,
-  listResumableX402ExactFundings,
-  clearPendingX402ExactFunding,
   X402_PENDING_STALE_MS,
   x402PendingStale,
   x402PendingRetired,
   x402PendingBlockExpiresAt,
   x402PendingDepositExpiresAt,
   x402PendingUnsettled,
+  x402VoucherPendingState,
+  assertNoRivalX402Voucher,
+  x402ExactFundingDead,
+  recordPendingX402ExactFunding,
+  loadResumableX402ExactFunding,
+  listResumableX402ExactFundings,
+  clearPendingX402ExactFunding,
   x402PendingFundingJson,
   withX402ChannelLock,
   DvmX402ChannelStorage,

package/dist/{chunk-FI4CST2D.js → chunk-FWGWLPXF.js}

@@ -388,12 +388,6 @@ var HttpTransport = class {
   }
 };
 
-// src/lib/nwc.ts
-import { decrypt, encrypt } from "nostr-tools/nip04";
-import { SimplePool, useWebSocketImplementation } from "nostr-tools/pool";
-import { finalizeEvent, getPublicKey } from "nostr-tools/pure";
-import WebSocket from "ws";
-
 // src/lib/hash.ts
 import { createHash } from "crypto";
 function sha256hex(input) {
@@ -401,6 +395,10 @@ function sha256hex(input) {
 }
 
 // src/lib/nwc.ts
+import { decrypt, encrypt } from "nostr-tools/nip04";
+import { SimplePool, useWebSocketImplementation } from "nostr-tools/pool";
+import { finalizeEvent, getPublicKey } from "nostr-tools/pure";
+import WebSocket from "ws";
 var webSocketImplementationConfigured = false;
 function ensureWebSocketImplementation() {
   if (webSocketImplementationConfigured) return;