@bsv/wallet-toolbox-client 2.6.2 → 2.6.3

package/out/index.client.cjs

@@ -32136,15 +32136,11 @@ var WalletPermissionsManager = class WalletPermissionsManager {
 				},
 				expiry
 			});
-			const created = await this.createPermissionTokensBestEffort(toCreate);
-			const renewed = await this.renewPermissionTokensBestEffort(toRenew);
-			for (const req of [...created, ...renewed]) this.markRecentGrant(req);
-			for (const p of matching.pending) p.resolve(true);
+			await this.persistPermissionGrant(toCreate, toRenew);
+			this.settleActiveGrant(params.requestID, matching, "resolve", true);
 		} catch (error) {
-			for (const p of matching.pending) p.reject(error);
+			this.settleActiveGrant(params.requestID, matching, "reject", error);
 			throw error;
-		} finally {
-			this.activeRequests.delete(params.requestID);
 		}
 	}
 	/**
@@ -32169,6 +32165,15 @@ var WalletPermissionsManager = class WalletPermissionsManager {
 		for (const p of matching.pending) p.reject(err);
 		this.activeRequests.delete(requestID);
 	}
+	settleActiveGrant(requestID, matching, method, value) {
+		for (const pending of matching.pending) pending[method](value);
+		this.activeRequests.delete(requestID);
+	}
+	async persistPermissionGrant(toCreate, toRenew) {
+		const created = await this.createPermissionTokensBestEffort(toCreate, true);
+		const renewed = await this.renewPermissionTokensBestEffort(toRenew, true);
+		for (const request of [...created, ...renewed]) this.markRecentGrant(request);
+	}
 	async denyGroupedPermission(requestID) {
 		this.denyActiveRequest(requestID);
 	}
@@ -32226,11 +32231,13 @@ var WalletPermissionsManager = class WalletPermissionsManager {
 				expiry
 			});
 		}
-		const created = await this.createPermissionTokensBestEffort(toCreate);
-		const renewed = await this.renewPermissionTokensBestEffort(toRenew);
-		for (const req of [...created, ...renewed]) this.markRecentGrant(req);
-		for (const p of matching.pending) p.resolve(true);
-		this.activeRequests.delete(params.requestID);
+		try {
+			await this.persistPermissionGrant(toCreate, toRenew);
+			this.settleActiveGrant(params.requestID, matching, "resolve", true);
+		} catch (error) {
+			this.settleActiveGrant(params.requestID, matching, "reject", error);
+			throw error;
+		}
 	}
 	async denyCounterpartyPermission(requestID) {
 		this.denyActiveRequest(requestID);
@@ -33472,12 +33479,12 @@ var WalletPermissionsManager = class WalletPermissionsManager {
 		await Promise.all(Array.from({ length: Math.min(concurrency, items.length) }, async () => await worker()));
 		return results;
 	}
-	async runBestEffortBatches(items, chunkSize, runChunk) {
+	async runBestEffortBatches(items, chunkSize, runChunk, strict = false) {
 		if (items.length === 0) return [];
 		const out = [];
 		for (let i = 0; i < items.length; i += chunkSize) {
 			const chunk = items.slice(i, i + chunkSize);
-			out.push(...await this.runBestEffortChunk(chunk, runChunk));
+			out.push(...strict ? await runChunk(chunk) : await this.runBestEffortChunk(chunk, runChunk));
 		}
 		return out;
 	}
@@ -33513,7 +33520,7 @@ var WalletPermissionsManager = class WalletPermissionsManager {
 			}
 		};
 	}
-	async createPermissionTokensBestEffort(items) {
+	async createPermissionTokensBestEffort(items, strict = false) {
 		return await this.runBestEffortBatches(items, 25, async (chunk) => {
 			const built = await this.mapWithConcurrency(chunk, 8, async (c) => await this.buildPermissionOutput(c.request, c.expiry, c.amount));
 			await this.createAction({
@@ -33522,9 +33529,9 @@ var WalletPermissionsManager = class WalletPermissionsManager {
 				options: { acceptDelayedBroadcast: true }
 			}, this.adminOriginator);
 			return built.map((b) => b.request);
-		});
+		}, strict);
 	}
-	async renewPermissionTokensBestEffort(items) {
+	async renewPermissionTokensBestEffort(items, strict = false) {
 		return await this.runBestEffortBatches(items, 15, async (chunk) => {
 			const built = await this.mapWithConcurrency(chunk, 8, async (c) => await this.buildPermissionOutput(c.request, c.expiry, c.amount));
 			const inputBeef = new _bsv_sdk.Beef();
@@ -33558,7 +33565,7 @@ var WalletPermissionsManager = class WalletPermissionsManager {
 			});
 			if (!txid) throw new Error("Failed to finalize renewal transaction");
 			return built.map((b) => b.request);
-		});
+		}, strict);
 	}
 	async coalescePermissionTokens(oldTokens, newScript, opts) {
 		if (!oldTokens?.length) throw new Error("No permission tokens to coalesce");