@ghostlytools/cli 1.3.1 → 1.3.2

package/dist/assets/{groupFiles-IEUW3DQz.js → groupFiles-DHTrTA4I.js}

@@ -1,7 +1,7 @@
-import { Fn as decodeBolt11, Fr as ChatFiles, Lr as transferEnded, Nn as requestLnurlInvoice, Pn as resolveLightningDestination, Qn as GROUP_HAVE_FRAME, Ta as RateWindow, Ua as replySnippet, Xn as engineText, Yn as engineError, Zn as GROUP_FILE_LIMITS, _l as randomBytes, _n as walletNetworkOf, ar as readGroupHave, er as GROUP_WANT_NO_FRAME, fn as WALLET_NETWORKS, nr as groupFileFallback, or as readGroupWant, rr as isGroupMessageId, sr as readGroupWantNo, tr as fetchesByItself, vl as toBase64Url, ya as fileMessageText } from "./src-DDzSERyc.js";
+import { $n as GROUP_HAVE_FRAME, Ea as RateWindow, Fn as resolveLightningDestination, In as decodeBolt11, Ir as ChatFiles, Pn as requestLnurlInvoice, Qn as GROUP_FILE_LIMITS, Rr as transferEnded, Wa as replySnippet, Xn as engineError, Zn as engineText, bl as randomBytes, cr as readGroupWantNo, fn as WALLET_NETWORKS, ir as isGroupMessageId, nr as fetchesByItself, or as readGroupHave, rr as groupFileFallback, sr as readGroupWant, tr as GROUP_WANT_NO_FRAME, va as fileMessageText, vn as walletNetworkOf, xl as toBase64Url } from "./src-yMUQvdyL.js";
 import { a as describeProvider, c as offeredIn, d as sourceProblem, n as PROVIDER_PLATFORMS, o as isNothingSpentError, s as networkMode, t as NothingSpentError, u as redact } from "./types-C4_KafL_.js";
 import { c as fileStore, f as store, i as STORES, m as wrap, o as databaseName, p as transact } from "./idb-B5L8wuOm.js";
-import { a as sealSeed, i as newDeviceKey, o as unsealSeed, t as networkReason } from "./networkReason-CetKkTPo.js";
+import { a as sealSeed, i as newDeviceKey, o as unsealSeed, t as networkReason } from "./networkReason-D42iNuUB.js";
 import { t as BITCOIN_INVOICE_ON_TESTNET, u as mintNetwork } from "./mints-BrlY773j.js";
 import { f as FILE_BYTES_STEP, o as fileBytes, s as fileBytesOf } from "./fileBytes-Di7VZtmU.js";
 import { sha256 } from "@noble/hashes/sha2.js";
@@ -2477,6 +2477,7 @@ var GroupFileDesk = class {
 			this.byMessage.delete(`${groupId}\n${kept.message}`);
 			this.wants.delete(kept.id);
 			this.deps.transfers.delete(kept.id);
+			await kept.writing?.catch(() => {});
 			await this.deps.store.remove(kept.id).catch(() => {});
 		}
 		for (const [linkId, edge] of this.edgesById) if (edge.groupId === groupId) {
@@ -2515,7 +2516,7 @@ var GroupFileDesk = class {
 			if (no) this.refused(groupId, peer, linkId, no.id, no.why);
 		} else if (frame.t === "group-have") {
 			const ids = readGroupHave(frame, groupId);
-			if (ids) this.heard(groupId, peer, ids);
+			if (ids && this.edge(groupId, peer, linkId).haveTaken.take()) this.heard(groupId, peer, ids);
 		}
 	}
 	/** A community's `group-have`, an application frame its signer sent the group. */
@@ -2852,7 +2853,8 @@ var GroupFileDesk = class {
 			edge.busy.add(messageId);
 			return "busy";
 		}
-		if (active.some((a) => a.peer === edge.peer && a.sending)) return "busy";
+		const theirs = active.filter((a) => a.peer === edge.peer);
+		if (theirs.length > 1 || theirs.some((a) => a.sending || this.deps.now() - a.since >= GROUP_FILE_LIMITS.doneWaitMs)) return "busy";
 		const today = Math.floor(this.deps.now() / 864e5);
 		if (this.served.day !== today) this.served = {
 			day: today,
@@ -2863,7 +2865,7 @@ var GroupFileDesk = class {
 	}
 	/**
 	* Transfers served now, all groups together: to whom, what each takes of the day (its size, or what it sent when that
-	* is more), and whether bytes are still to go.
+	* is more), whether bytes are still to go, and since when it has not gone further.
 	*/
 	servingNow() {
 		const active = [];
@@ -2872,7 +2874,8 @@ var GroupFileDesk = class {
 			if (record && !transferEnded(record)) active.push({
 				peer: edge.peer,
 				size: Math.max(record.file.size, edge.files.sent(wire)),
-				sending: record.confirmed < record.file.size
+				sending: record.confirmed < record.file.size,
+				since: edge.servedMoved.get(wire)?.at ?? this.deps.now()
 			});
 		}
 		return active;
@@ -2891,20 +2894,27 @@ var GroupFileDesk = class {
 	}
 	/**
 	* Served transfers that no longer count end, their places free for others (WISP 503 § Serving limits): the asker's
-	* session closed, it is not in the roster any more, or its bytes have not moved for `wantWaitMs` (the asker has moved
-	* on by then).
+	* session closed, it is not in the roster any more, its bytes have not gone further for `wantWaitMs` (the asker has
+	* moved on by then), or it has all its bytes and the member's next want has overtaken its word for `doneWaitMs`.
 	*/
 	letGo() {
 		const now = this.deps.now();
+		const theirs = /* @__PURE__ */ new Map();
+		for (const a of this.servingNow()) theirs.set(a.peer, (theirs.get(a.peer) ?? 0) + 1);
 		for (const edge of this.edgesById.values()) for (const wire of [...edge.serving.keys()]) {
 			const record = edge.files.get("out", wire);
 			if (!record || transferEnded(record)) continue;
 			let moved = edge.servedMoved.get(wire);
-			if (!moved || moved.confirmed !== record.confirmed) edge.servedMoved.set(wire, moved = {
+			if (!moved) edge.servedMoved.set(wire, moved = {
 				confirmed: record.confirmed,
 				at: now
 			});
-			if (!edge.files.live || !this.deps.membership(edge.groupId)?.inRoster(edge.peer) || now - moved.at >= GROUP_FILE_LIMITS.wantWaitMs) edge.files.cancel("out", wire);
+			const gone = !edge.files.live || !this.deps.membership(edge.groupId)?.inRoster(edge.peer);
+			const overtaken = record.confirmed === record.file.size && theirs.get(edge.peer) > 1 && now - moved.at >= GROUP_FILE_LIMITS.doneWaitMs;
+			if (gone || overtaken || now - moved.at >= GROUP_FILE_LIMITS.wantWaitMs) {
+				edge.files.cancel("out", wire);
+				theirs.set(edge.peer, theirs.get(edge.peer) - 1);
+			}
 		}
 	}
 	/**
@@ -2955,6 +2965,7 @@ var GroupFileDesk = class {
 			ended: [],
 			have: /* @__PURE__ */ new Set(),
 			haveSent: new RateWindow(GROUP_FILE_LIMITS.haveFrames, GROUP_FILE_LIMITS.haveWindowMs, () => this.deps.now()),
+			haveTaken: new RateWindow(GROUP_FILE_LIMITS.haveFrames, GROUP_FILE_LIMITS.haveWindowMs, () => this.deps.now()),
 			busy: /* @__PURE__ */ new Set(),
 			gone: /* @__PURE__ */ new Set()
 		};
@@ -2995,13 +3006,23 @@ var GroupFileDesk = class {
 		const writer = await this.deps.store.write(kept.id, !kept.fresh);
 		kept.fresh = false;
 		const resumed = writer.offset > 0;
+		if (!resumed) kept.storedBy = edge.peer;
+		else if (kept.storedBy !== edge.peer) kept.storedBy = void 0;
 		let damaged = false;
+		const gone = () => this.kept.get(kept.id) !== kept;
+		const write = async (op) => {
+			if (gone()) {
+				await writer.discard();
+				throw new Error("No such file");
+			}
+			return await (kept.writing = op());
+		};
 		return {
 			offset: writer.offset,
-			append: (bytes) => writer.append(bytes),
-			flush: () => writer.flush(),
+			append: (bytes) => write(() => writer.append(bytes)),
+			flush: () => write(() => writer.flush()),
 			verify: async () => {
-				damaged = await writer.digest() !== kept.meta.d;
+				damaged = await write(() => writer.digest()) !== kept.meta.d;
 				const want = this.wants.get(kept.id);
 				if (damaged && want) want.why = "damaged";
 				return !damaged;
@@ -3009,10 +3030,11 @@ var GroupFileDesk = class {
 			discard: () => {
 				if (damaged) {
 					kept.stored = 0;
-					if (resumed) kept.fresh = kept.unclear = true;
+					if (resumed && kept.storedBy !== edge.peer) kept.fresh = kept.unclear = true;
 					else kept.damaged.add(edge.peer);
+					kept.storedBy = void 0;
 				}
-				return kept.idle = (damaged || kept.dropped === record.id ? writer.discard() : writer.close()).catch(() => {});
+				return kept.idle = (damaged || kept.dropped === record.id || gone() ? writer.discard() : writer.close()).catch(() => {});
 			}
 		};
 	}
@@ -3034,6 +3056,11 @@ var GroupFileDesk = class {
 	transferChanged(edge, record, transferred) {
 		if (transferEnded(record)) this.transferOver(edge, record);
 		if (record.direction === "out") {
+			const moved = edge.servedMoved.get(record.id);
+			if (moved && record.confirmed > moved.confirmed) edge.servedMoved.set(record.id, {
+				confirmed: record.confirmed,
+				at: this.deps.now()
+			});
 			if (transferEnded(record) && edge.serving.has(record.id)) {
 				const today = Math.floor(this.deps.now() / 864e5);
 				if (this.served.day !== today) this.served = {
@@ -3199,4 +3226,4 @@ function messageFile(kept) {
 //#endregion
 export { setSingleWriterGate as $, LightningCards as A, breezDatabaseInUse as B, FileAppender as C, streamStored as D, storedSize as E, ProviderSources as F, ModeChanged as G, dropBreezDatabase as H, sourceKey as I, networkLabel as J, ModeGate as K, CASHU_MINT_SOURCE as L, isRecoveryPhrase as M, normalizePhrase as N, waitingGroupFile as O, lightningPaying as P, setAwayWallets as Q, cashuMint as R, WALLET_TYPES as S, removeStored as T, iceServerProblem as U, breezDatabasesFor as V, iceServerSetting as W, refuseAway as X, awayFrom as Y, requireTurn as Z, crossNetwork as _, storedGroupFiles as a, walletInstances as b, receivedPairedReply as c, paymentAlias as d, paymentWireId as f, createTiming as g, createFailure as h, groupOfFile as i, cardsKey as j, CASHU_CARD as k, replyRef as l, assertConfirmedReal as m, groupFileId as n, groupReply as o, WALLET_NAMES as p, WrongNetworkError as q, groupFileText as r, pairedWireReply as s, GroupFileDesk as t, replyTo as u, paymentNetwork as v, readStored as w, MESSAGE_DETAILS_MAX_BYTES as x, paymentNetworksOf as y, breezDatabase as z };
 
-//# sourceMappingURL=groupFiles-IEUW3DQz.js.map
+//# sourceMappingURL=groupFiles-DHTrTA4I.js.map