@1sat/cli 0.0.109 → 0.0.111

package/dist/cli.js

@@ -1,7 +1,15 @@
 #!/usr/bin/env node
-import { createRequire } from "node:module";
-var __esm = (fn, res) => () => (fn && (res = fn(fn = 0)), res);
-var __require = /* @__PURE__ */ createRequire(import.meta.url);
+var __esm = (fn, res, err) => () => {
+  if (fn)
+    try {
+      res = fn(fn = 0);
+    } catch (e) {
+      err = [e];
+    }
+  if (err)
+    throw err[0];
+  return res;
+};
 
 // src/args.ts
 function parseGlobalFlags(args) {
@@ -505,11 +513,11 @@ async function handleActionCommand(args, opts) {
 Registered actions:
 `);
     const grouped = new Map;
-    for (const action2 of actions) {
-      const cat = action2.meta.category;
+    for (const action of actions) {
+      const cat = action.meta.category;
       if (!grouped.has(cat))
         grouped.set(cat, []);
-      grouped.get(cat).push(action2);
+      grouped.get(cat).push(action);
     }
     for (const [category, categoryActions] of grouped) {
       console.log(`  ${category}:`);
@@ -1428,11 +1436,12 @@ import { AuthFetch } from "@bsv/sdk";
 function createApprovalAuth(wallet) {
   let approved = false;
   let submitted = false;
+  let currentRequest;
   const guarded = new Proxy(wallet, {
     get(target, property) {
       if (property === "createAction")
         return async (...args) => {
-          const satoshis = args[0].outputs?.reduce((sum, output2) => sum + output2.satoshis, 0) ?? 0;
+          const satoshis = args[0].outputs?.reduce((sum, output) => sum + output.satoshis, 0) ?? 0;
           if (!Number.isSafeInteger(satoshis) || satoshis <= 0)
             throw new Error("Invalid HTTP payment amount");
           if (approved === false)
@@ -1442,7 +1451,10 @@ function createApprovalAuth(wallet) {
           if (submitted)
             throw new Error("Payment already submitted; reconcile wallet activity before retrying");
           submitted = true;
-          return target.createAction(...args);
+          const result = await target.createAction(...args);
+          if (currentRequest?.retryCounter === 0)
+            currentRequest.retryCounter = 1;
+          return result;
         };
       if (property === "signAction")
         return async () => {
@@ -1454,18 +1466,27 @@ function createApprovalAuth(wallet) {
   });
   return {
     auth: new AuthFetch(guarded),
+    prepareRequest: (config) => {
+      currentRequest = config;
+    },
     authorizePayment: (satoshis) => {
       approved = satoshis ?? true;
     }
   };
 }
 async function requestWithApproval(url, init, options, dependencies) {
+  const send = () => {
+    const config = {
+      ...init,
+      paymentRetryAttempts: 1,
+      ...init.method === "GET" || init.method === "HEAD" ? {} : { retryCounter: 1 }
+    };
+    dependencies.prepareRequest?.(config);
+    return dependencies.auth.fetch(url, config);
+  };
   let res;
   try {
-    res = await dependencies.auth.fetch(url, {
-      ...init,
-      paymentRetryAttempts: 1
-    });
+    res = await send();
   } catch (error) {
     if (error instanceof PaymentRequired) {
       res = new Response(null, {
@@ -1503,7 +1524,7 @@ async function requestWithApproval(url, init, options, dependencies) {
     }
   }
   dependencies.authorizePayment?.(satoshis);
-  return dependencies.auth.fetch(url, { ...init, paymentRetryAttempts: 1 });
+  return send();
 }
 var PaymentRequired;
 var init_authfetch_request = __esm(() => {
@@ -1586,7 +1607,7 @@ Unknown or missing method: ${method ?? ""}`);
     chain: opts.chain
   });
   try {
-    const { auth, authorizePayment } = createApprovalAuth(walletResult.wallet);
+    const { auth, authorizePayment, prepareRequest } = createApprovalAuth(walletResult.wallet);
     const init = {
       method,
       headers,
@@ -1598,6 +1619,7 @@ Unknown or missing method: ${method ?? ""}`);
     }, {
       auth,
       authorizePayment,
+      prepareRequest,
       plainFetch: fetch,
       confirmPayment: async (message) => {
         const ok = await confirm({ message });
@@ -1943,15 +1965,15 @@ async function handleInitCommand(_args, opts) {
   }
   let wif;
   if (keySource === "generate") {
-    const pk2 = PrivateKey2.fromRandom();
-    wif = pk2.toWif();
-    const address2 = pk2.toPublicKey().toAddress();
+    const pk = PrivateKey2.fromRandom();
+    wif = pk.toWif();
+    const address = pk.toPublicKey().toAddress();
     console.log();
     console.log(formatWarning("  IMPORTANT: Back up your private key!"));
     console.log(formatWarning("  If you lose it, your funds are gone forever."));
     console.log();
     console.log(`  ${formatValue("WIF:")}    ${wif}`);
-    console.log(`  ${formatValue("Address:")} ${address2}`);
+    console.log(`  ${formatValue("Address:")} ${address}`);
     console.log();
     const confirmed = await confirm2({
       message: "Have you saved your private key somewhere safe?"
@@ -3665,7 +3687,7 @@ async function startWalletServer(resolved, walletResult, accounts, mode) {
     ttlSeconds: sessionStoreCfg.ttlSeconds
   } : undefined;
   if (mode === "wallet") {
-    const handle2 = createWalletServer({
+    const handle = createWalletServer({
       wallet: walletResult.wallet,
       storage: walletResult.getActiveStorage(),
       serverIdentityKey: walletResult.wallet.identityKey,
@@ -3675,10 +3697,10 @@ async function startWalletServer(resolved, walletResult, accounts, mode) {
       accounts: accounts?.walletServerAccounts,
       sessionStore
     });
-    const port2 = await handle2.start();
-    const notes2 = [resolved.accounts.enabled ? "accounts: on" : ""].filter(Boolean).join(", ");
-    console.log(`[wallet] listening on ${resolved.host}:${port2}${notes2 ? ` (${notes2})` : ""}`);
-    return { stop: () => handle2.stop() };
+    const port = await handle.start();
+    const notes = [resolved.accounts.enabled ? "accounts: on" : ""].filter(Boolean).join(", ");
+    console.log(`[wallet] listening on ${resolved.host}:${port}${notes ? ` (${notes})` : ""}`);
+    return { stop: () => handle.stop() };
   }
   const serverCfg = config.server ?? {};
   const paymailCfg = serverCfg.paymail;
@@ -4845,8 +4867,8 @@ async function walletListOutputs(args, opts) {
 ${result.totalOutputs} total outputs in basket '${basket}':
 `);
       for (const out of result.outputs) {
-        const tags2 = out.tags?.join(", ") || "none";
-        console.log(`  ${out.outpoint} | ${out.satoshis} sats | tags: ${tags2}`);
+        const tags = out.tags?.join(", ") || "none";
+        console.log(`  ${out.outpoint} | ${out.satoshis} sats | tags: ${tags}`);
       }
       console.log();
     }
@@ -5104,7 +5126,6 @@ var init_wallet = __esm(() => {
 });
 
 // src/main.ts
-var exports_main = {};
 import { existsSync as existsSync4 } from "node:fs";
 import { resolve } from "node:path";
 import { config as loadEnv } from "dotenv";
@@ -5244,4 +5265,4 @@ var init_main = __esm(() => {
 
 // src/cli.ts
 process.env.DOTENV_CONFIG_QUIET = "true";
-await Promise.resolve().then(() => (init_main(), exports_main));
+await Promise.resolve().then(() => (init_main(), {}));

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@1sat/cli",
-  "version": "0.0.109",
+  "version": "0.0.111",
   "description": "CLI for 1Sat Ordinals SDK",
   "type": "module",
   "main": "./dist/cli.js",
@@ -27,7 +27,7 @@
   ],
   "license": "MIT",
   "dependencies": {
-    "@1sat/actions": "0.0.207",
+    "@1sat/actions": "0.0.208",
     "@1sat/client": "0.0.51",
     "@1sat/types": "0.0.41",
     "@1sat/wallet-node": "0.0.73",

package/src/commands/authfetch-request.ts

@@ -10,6 +10,7 @@ class PaymentRequired extends Error {
 export function createApprovalAuth(wallet: WalletInterface) {
 	let approved: false | number | true = false
 	let submitted = false
+	let currentRequest: { retryCounter?: number } | undefined
 	const guarded = new Proxy(wallet, {
 		get(target, property) {
 			if (property === 'createAction')
@@ -31,7 +32,12 @@ export function createApprovalAuth(wallet: WalletInterface) {
 							'Payment already submitted; reconcile wallet activity before retrying',
 						)
 					submitted = true
-					return target.createAction(...args)
+					const result = await target.createAction(...args)
+					// A verified 402 reached the approved wallet boundary. Permit its
+					// one paid send, but not stale-session replay of that send.
+					if (currentRequest?.retryCounter === 0)
+						currentRequest.retryCounter = 1
+					return result
 				}
 			if (property === 'signAction')
 				return async () => {
@@ -43,6 +49,9 @@ export function createApprovalAuth(wallet: WalletInterface) {
 	})
 	return {
 		auth: new AuthFetch(guarded),
+		prepareRequest: (config: { retryCounter?: number }) => {
+			currentRequest = config
+		},
 		authorizePayment: (satoshis?: number) => {
 			approved = satoshis ?? true
 		},
@@ -67,14 +76,23 @@ export async function requestWithApproval(
 		plainFetch: typeof fetch
 		confirmPayment: (message: string) => Promise<boolean>
 		authorizePayment?: (satoshis?: number) => void
+		prepareRequest?: (config: { retryCounter?: number }) => void
 	},
 ): Promise<Response | PaymentApprovalRequired> {
-	let res: Response
-	try {
-		res = await dependencies.auth.fetch(url, {
+	const send = () => {
+		const config = {
 			...init,
 			paymentRetryAttempts: 1,
-		})
+			...(init.method === 'GET' || init.method === 'HEAD'
+				? {}
+				: { retryCounter: 1 }),
+		}
+		dependencies.prepareRequest?.(config)
+		return dependencies.auth.fetch(url, config)
+	}
+	let res: Response
+	try {
+		res = await send()
 	} catch (error) {
 		if (error instanceof PaymentRequired) {
 			res = new Response(null, {
@@ -130,5 +148,5 @@ export async function requestWithApproval(
 		}
 	}
 	dependencies.authorizePayment?.(satoshis)
-	return dependencies.auth.fetch(url, { ...init, paymentRetryAttempts: 1 })
+	return send()
 }

package/src/commands/authfetch.ts

@@ -107,7 +107,9 @@ export async function handleAuthfetchCommand(
 	})
 
 	try {
-		const { auth, authorizePayment } = createApprovalAuth(walletResult.wallet)
+		const { auth, authorizePayment, prepareRequest } = createApprovalAuth(
+			walletResult.wallet,
+		)
 		const init = {
 			method,
 			headers,
@@ -124,6 +126,7 @@ export async function handleAuthfetchCommand(
 			{
 				auth,
 				authorizePayment,
+				prepareRequest,
 				plainFetch: fetch,
 				confirmPayment: async (message) => {
 					const ok = await confirm({ message })