@1sat/cli 0.0.109 → 0.0.110

package/dist/cli.js

@@ -1428,6 +1428,7 @@ 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")
@@ -1442,7 +1443,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 +1458,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 +1516,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 +1599,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 +1611,7 @@ Unknown or missing method: ${method ?? ""}`);
     }, {
       auth,
       authorizePayment,
+      prepareRequest,
       plainFetch: fetch,
       confirmPayment: async (message) => {
         const ok = await confirm({ message });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@1sat/cli",
-  "version": "0.0.109",
+  "version": "0.0.110",
   "description": "CLI for 1Sat Ordinals SDK",
   "type": "module",
   "main": "./dist/cli.js",

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 })