@ghostlytools/cli 1.3.0 → 1.3.1

package/dist/assets/{host-Cmd205Dc.js → host-CWt-jtqz.js}

@@ -1,10 +1,9 @@
-import { jt as fromBase64Url } from "./groupFiles-DBbjOLuD.js";
-import { Ba as callRtcConfig, Gr as checkPushEndpoint, Ha as extractParamsFromSdp, Ia as CALL_SIGNAL_MAX_AGE_MS, La as RTC_CONFIG, Ra as answersOffer, Ua as parseCallSignal, Us as setLinkTraceSink, Va as callSignalHeardAt, Wa as signalHasVideo, hi as isPublicAddress, za as buildSdpFromSignal } from "./src-DhfGgAUu.js";
-import { a as fedimintSdkOn, r as irohRelayProblem } from "./irohWeb--YyEA-hX.js";
-import { r as asCliError, t as CliError } from "./errors-my6VJR_0.js";
-import { a as findChat } from "./apiKit-CajiDxdK.js";
-import { _ as flushCardUpdates, c as paymentJson, d as nodeLocalFetch, f as chatJson, g as resumeHolds, h as groupMessageJson, l as reportAppFrames, m as groupJson, p as chatMessageJson, r as callApi, u as servedApps } from "./api-CrxVxtY1.js";
-import { n as RESTORED_MARK, r as acquireLock } from "./profiles-B6F4oa9K.js";
+import { Go as answersOffer, Jo as callSignalHeardAt, Ko as buildSdpFromSignal, Oi as isPublicAddress, Uo as CALL_SIGNAL_MAX_AGE_MS, Wo as RTC_CONFIG, Xo as parseCallSignal, Yo as extractParamsFromSdp, Zc as setLinkTraceSink, Zo as signalHasVideo, gl as fromBase64Url, ii as checkPushEndpoint, qo as callRtcConfig } from "./src-DDzSERyc.js";
+import { a as fedimintSdkOn, r as irohRelayProblem } from "./irohWeb-4oChIOIp.js";
+import { r as asCliError, t as CliError } from "./errors-DO5z6h_l.js";
+import { a as findChat } from "./apiKit-CA2x5GJF.js";
+import { _ as flushCardUpdates, c as paymentJson, d as nodeLocalFetch, f as chatJson, g as resumeHolds, h as groupMessageJson, l as reportAppFrames, m as groupJson, p as chatMessageJson, r as callApi, u as servedApps } from "./api-Dq2QXQDk.js";
+import { n as RESTORED_MARK, r as acquireLock } from "./profiles-BHc9pEYg.js";
 import { r as privateFolder, t as ownFolder } from "./privateFolder-Bk9C9oFv.js";
 import { createRequire } from "node:module";
 import { appendFileSync, chmodSync, closeSync, existsSync, fstatSync, fsyncSync, lstatSync, mkdirSync, openSync, readFileSync, readdirSync, renameSync, rmSync, statSync, writeFileSync, writeSync } from "node:fs";
@@ -910,8 +909,12 @@ var CallManager = class {
 	calls = /* @__PURE__ */ new Map();
 	/** Per chat: the timestamp of the last signal handled. */
 	lastSignal = /* @__PURE__ */ new Map();
+	/** Per chat: the timestamp of the last signal sent (`stamp`). */
+	lastSent = /* @__PURE__ */ new Map();
 	/** Per chat: the timer that clears the hang-up signal. */
 	clearing = /* @__PURE__ */ new Map();
+	/** Per chat: when this side's last call there ended before it was answered (`CALL_PACE_MS`). */
+	unansweredAt = /* @__PURE__ */ new Map();
 	auto;
 	configPath;
 	stopping = false;
@@ -924,6 +927,15 @@ var CallManager = class {
 	get now() {
 		return (this.host.now ?? Date.now)();
 	}
+	/**
+	* A new signal's timestamp in a chat: now, or 1 ms after the last one sent there. The contact drops a signal no
+	* newer than the last it heard, so a redial or a hang-up in the same millisecond as the signal before it would be lost.
+	*/
+	stamp(chat) {
+		const ts = Math.max(this.now, (this.lastSent.get(chat) ?? 0) + 1);
+		this.lastSent.set(chat, ts);
+		return ts;
+	}
 	/** A signal the contact's app sent in a chat (the engine's `call-signal`). */
 	onSignal(chat, json) {
 		if (this.stopping) return;
@@ -1035,7 +1047,7 @@ var CallManager = class {
 		try {
 			const stack = await this.stack();
 			if (!await this.connect(call, (media) => CallMedia.offer(stack, media))) return;
-			call.offerTs = this.now;
+			call.offerTs = this.stamp(call.chat);
 			call.offering = true;
 			await this.send(call.chat, {
 				t: "o",
@@ -1059,7 +1071,7 @@ var CallManager = class {
 			if (!await this.connect(call, (media) => CallMedia.answer(stack, offer, media))) return;
 			await this.send(call.chat, {
 				t: "a",
-				ts: this.now,
+				ts: this.stamp(call.chat),
 				o: offer.ts,
 				...call.media.local,
 				v: 0
@@ -1122,6 +1134,7 @@ var CallManager = class {
 	async start(chat, options) {
 		const link = this.callable(chat);
 		if (this.byChat(link.id)) throw new CliError("busy", "A call is already on in this chat");
+		this.paced(link.id);
 		const rate = rateOf(options.rate, this.auto.rate);
 		const stack = await this.stack();
 		if (this.byChat(link.id)) throw new CliError("busy", "A call is already on in this chat");
@@ -1130,7 +1143,7 @@ var CallManager = class {
 			await this.attach(call, (media) => CallMedia.offer(stack, media));
 			if (call.reason === "crossed") throw new CliError("busy", "The contact called at the same time: their call rings here");
 			if (call.ended) throw new CliError("unavailable", "The call ended before it was placed");
-			call.offerTs = this.now;
+			call.offerTs = this.stamp(link.id);
 			call.offering = true;
 			await this.send(link.id, {
 				t: "o",
@@ -1168,7 +1181,7 @@ var CallManager = class {
 			if (call.ended) throw new CliError("unavailable", "The call ended before it was answered");
 			await this.send(call.chat, {
 				t: "a",
-				ts: this.now,
+				ts: this.stamp(call.chat),
 				o: call.offer.ts,
 				...call.media.local,
 				v: 0
@@ -1388,6 +1401,7 @@ var CallManager = class {
 		this.disarm(call);
 		if (call.watcher) clearInterval(call.watcher);
 		this.calls.delete(call.id);
+		if (call.direction === "out" && call.connectedAt === null && call.state === "ringing" && (reason === "hangup" || reason === "unanswered")) this.unansweredAt.set(call.chat, this.now);
 		if (report) process.stderr.write(`ghostly: call ${call.id}: ended (${reason})${call.media ? `, ice ${call.media.ice.state}` : ""}\n`);
 		call.media?.close();
 		this.stopEarly(call);
@@ -1397,7 +1411,7 @@ var CallManager = class {
 		if (tell) {
 			await this.send(call.chat, {
 				t: "h",
-				ts: this.now
+				ts: this.stamp(call.chat)
 			}).catch(() => {});
 			if (!this.stopping) {
 				const timer = setTimeout(() => {
@@ -1416,6 +1430,17 @@ var CallManager = class {
 			...call.connectedAt !== null ? { duration: this.now - call.connectedAt } : {}
 		});
 	}
+	/** Refuses a call placed too soon after this side's last unanswered one in the chat (`CALL_PACE_MS`). */
+	paced(chat) {
+		const pace = this.host.callPaceMs ?? 2e3, last = this.unansweredAt.get(chat);
+		if (!pace || last === void 0) return;
+		const left = last + pace - this.now;
+		if (left <= 0) {
+			this.unansweredAt.delete(chat);
+			return;
+		}
+		throw new CliError("busy", `Your last call in this chat ended unanswered a moment ago: call again in ${Math.ceil(left / 100) / 10} s`, { retryAfterMs: left });
+	}
 	arm(call, ms, reason, tell) {
 		this.disarm(call);
 		call.timer = setTimeout(() => void this.end(call, reason, tell), ms);
@@ -4358,14 +4383,14 @@ async function startRuntime(paths, options = {}) {
 	(await import("./ghostly_iroh_web-Dvzh3Y6E.js")).initSync({ module: irohWasmBytes() });
 	const [{ registerFileBytes }, { NodeFileBytes }] = await Promise.all([import("./fileBytes-CgbibpbV.js"), import("./fileBytes-CfSXjTFa.js")]);
 	registerFileBytes("native", async () => new NodeFileBytes(paths.files), true);
-	const [{ EngineServer }, { createHyperEndpoint }] = await Promise.all([import("./server-CBCEYKMN.js"), import("./endpoint-Dn7H8qE1.js")]);
+	const [{ EngineServer }, { createHyperEndpoint }] = await Promise.all([import("./server-Ss0gJ-nw.js"), import("./endpoint-BOTFMpfS.js")]);
 	const network = hyperdhtNetwork();
 	const dht = mainlineNetwork();
-	const mainline = dht.off ? null : new (await (import("./mainline-D5D5C-jT.js"))).Mainline({
+	const mainline = dht.off ? null : new (await (import("./mainline-ZkiOnevs.js"))).Mainline({
 		bootstrap: dht.bootstrap,
 		host: dht.host
 	});
-	const transport = mainline || pinned ? new (await (import("./mainline-D5D5C-jT.js"))).RelaysAndDht(mainline, pinned ? { relays: pinned } : {}, !!pinned) : null;
+	const transport = mainline || pinned ? new (await (import("./mainline-ZkiOnevs.js"))).RelaysAndDht(mainline, pinned ? { relays: pinned } : {}, !!pinned) : null;
 	const apps = servedApps(paths.dir).length > 0;
 	const server = new EngineServer({
 		...transport ? { transport } : {},
@@ -4645,4 +4670,4 @@ function connection(ctx, socket) {
 //#endregion
 export { BASELINE_NEWEST, MAX_LINE, keepServing, openHost, serve };
 
-//# sourceMappingURL=host-Cmd205Dc.js.map
+//# sourceMappingURL=host-CWt-jtqz.js.map