@spectrum-ts/imessage 5.2.0 → 6.1.0

package/dist/index.js

@@ -219,6 +219,7 @@ const log$3 = createLogger("spectrum.imessage.auth");
 const RENEWAL_RATIO = .8;
 const EXPIRY_BUFFER_MS = 3e4;
 const RETRY_DELAY_MS = 3e4;
+const FORCE_REFRESH_MIN_INTERVAL_MS = 5e3;
 const cloudAuthState = /* @__PURE__ */ new WeakMap();
 const requirePhone = (data, instanceId) => {
 	const phone = data.numbers?.[instanceId];
@@ -231,6 +232,8 @@ async function createCloudClients(projectId, projectSecret) {
 	let disposed = false;
 	let renewalTimer;
 	let refreshFailures = 0;
+	let refreshInFlight;
+	let lastRefreshAt = Date.now();
 	const records = [];
 	const syncPhones = (data) => {
 		for (const { entry, instanceId } of records) entry.phone = requirePhone(data, instanceId);
@@ -249,39 +252,66 @@ async function createCloudClients(projectId, projectSecret) {
 			...errorAttrs(error)
 		}, error);
 	};
+	const refreshNow = async () => {
+		tokenData = await cloud.issueImessageTokens(projectId, projectSecret);
+		tokenExpiresAt = Date.now() + tokenData.expiresIn * 1e3;
+		lastRefreshAt = Date.now();
+		if (tokenData.type === "dedicated") syncPhones(tokenData);
+		onRefreshSuccess();
+		scheduleRenewal();
+	};
+	const coalescedRefresh = () => {
+		if (!refreshInFlight) refreshInFlight = refreshNow().finally(() => {
+			refreshInFlight = void 0;
+		});
+		return refreshInFlight;
+	};
 	const scheduleRenewal = () => {
 		if (disposed) return;
+		if (renewalTimer !== void 0) {
+			clearTimeout(renewalTimer);
+			renewalTimer = void 0;
+		}
 		const ttlMs = tokenData.expiresIn * 1e3;
 		const renewInMs = Math.max(ttlMs * RENEWAL_RATIO, 5e3);
-		renewalTimer = setTimeout(async () => {
-			try {
-				tokenData = await cloud.issueImessageTokens(projectId, projectSecret);
-				tokenExpiresAt = Date.now() + tokenData.expiresIn * 1e3;
-				if (tokenData.type === "dedicated") syncPhones(tokenData);
-				onRefreshSuccess();
-				scheduleRenewal();
-			} catch (error) {
+		const runScheduledRefresh = () => {
+			coalescedRefresh().catch((error) => {
 				onRefreshFailure(error);
-				renewalTimer = setTimeout(() => scheduleRenewal(), RETRY_DELAY_MS);
+				if (disposed) return;
+				renewalTimer = setTimeout(runScheduledRefresh, RETRY_DELAY_MS);
 				renewalTimer?.unref?.();
-			}
-		}, renewInMs);
+			});
+		};
+		renewalTimer = setTimeout(runScheduledRefresh, renewInMs);
 		renewalTimer?.unref?.();
 	};
 	scheduleRenewal();
 	const refreshIfNeeded = async () => {
 		if (Date.now() < tokenExpiresAt - EXPIRY_BUFFER_MS) return;
-		tokenData = await cloud.issueImessageTokens(projectId, projectSecret);
-		tokenExpiresAt = Date.now() + tokenData.expiresIn * 1e3;
-		if (tokenData.type === "dedicated") syncPhones(tokenData);
-		onRefreshSuccess();
-		scheduleRenewal();
+		await coalescedRefresh();
+	};
+	const forceRefresh = async () => {
+		if (Date.now() - lastRefreshAt < FORCE_REFRESH_MIN_INTERVAL_MS) return;
+		await coalescedRefresh();
+	};
+	const dispose = () => {
+		disposed = true;
+		if (renewalTimer !== void 0) {
+			clearTimeout(renewalTimer);
+			renewalTimer = void 0;
+		}
+	};
+	const cloudAuth = {
+		dispose,
+		forceRefresh
 	};
 	if (tokenData.type === "shared") {
 		const entries = [{
 			phone: SHARED_PHONE,
 			client: createClient({
 				address: process.env.SPECTRUM_IMESSAGE_ADDRESS ?? "imessage.spectrum.photon.codes:443",
+				autoIdempotency: true,
+				retry: true,
 				tls: true,
 				token: async () => {
 					await refreshIfNeeded();
@@ -289,13 +319,7 @@ async function createCloudClients(projectId, projectSecret) {
 				}
 			})
 		}];
-		cloudAuthState.set(entries, { dispose: () => {
-			disposed = true;
-			if (renewalTimer !== void 0) {
-				clearTimeout(renewalTimer);
-				renewalTimer = void 0;
-			}
-		} });
+		cloudAuthState.set(entries, cloudAuth);
 		return entries;
 	}
 	const dedicated = tokenData;
@@ -304,6 +328,8 @@ async function createCloudClients(projectId, projectSecret) {
 			phone: requirePhone(dedicated, instanceId),
 			client: createClient({
 				address: `${instanceId}.imsg.photon.codes:443`,
+				autoIdempotency: true,
+				retry: true,
 				tls: true,
 				token: async () => {
 					await refreshIfNeeded();
@@ -317,13 +343,7 @@ async function createCloudClients(projectId, projectSecret) {
 		});
 	}
 	const entries = records.map((r) => r.entry);
-	cloudAuthState.set(entries, { dispose: () => {
-		disposed = true;
-		if (renewalTimer !== void 0) {
-			clearTimeout(renewalTimer);
-			renewalTimer = void 0;
-		}
-	} });
+	cloudAuthState.set(entries, cloudAuth);
 	return entries;
 }
 async function disposeCloudAuth(clients) {
@@ -333,6 +353,15 @@ async function disposeCloudAuth(clients) {
 		cloudAuthState.delete(clients);
 	}
 }
+/**
+* The recover hook for a cloud-backed client array: forces a token re-mint so a
+* persistently-failing stream (server rejecting an unexpired token after a
+* restart) gets a fresh bearer on its next reconnect. Returns undefined for
+* explicitly-configured (static-token) clients, which have nothing to re-mint.
+*/
+function getCloudRecover(clients) {
+	return cloudAuthState.get(clients)?.forceRefresh;
+}
 //#endregion
 //#region src/cache.ts
 const DEFAULT_MAX = 1e3;
@@ -1508,9 +1537,12 @@ const log$1 = createLogger("spectrum.imessage.contact");
 const SHARE_TTL_MS = 1440 * 60 * 1e3;
 const MAX_TRACKED_CHATS = 1e4;
 /**
-* Tracks which chats this bot has already proactively pushed its contact card
-* to, so `im.chats.shareContactInfo` is fired at most once per chat per 24h
-* per iMessage provider instance.
+* Tracks which chats this bot's line has already proactively pushed its contact
+* card to, so `im.chats.shareContactInfo` is fired at most once per chat per
+* line per 24h. One tracker is created per `AdvancedIMessage` client (see
+* `getContactShareTracker`), so the dedupe is naturally scoped to the line: a
+* DM `chatGuid` encodes the peer, not the receiving bot line, so the same guid
+* arriving on a different line shares independently.
 *
 * Backed by `lru-cache` for TTL + bounded memory. `ttlAutopurge: false`
 * keeps eviction lazy (on access) — there is no background timer to leak
@@ -1522,6 +1554,10 @@ var ContactShareTracker = class {
 		ttl: SHARE_TTL_MS,
 		ttlAutopurge: false
 	});
+	client;
+	constructor(client) {
+		this.client = client;
+	}
 	/**
 	* Best-effort share. The cache is set eagerly so that a burst of inbound
 	* messages for the same chat coalesces to a single API call. On failure the
@@ -1529,11 +1565,11 @@ var ContactShareTracker = class {
 	* permanently mute the feature for a chat. Never awaits and never throws:
 	* the receive stream must not crash on share failures.
 	*/
-	maybeShare(client, chatGuid) {
+	maybeShare(chatGuid) {
 		if (this.cache.has(chatGuid)) return;
 		this.cache.set(chatGuid, true);
 		const safeChatGuid = sanitizeErrorMessage(chatGuid);
-		client.chats.shareContactInfo(chatGuid).then(() => {
+		this.client.chats.shareContactInfo(chatGuid).then(() => {
 			log$1.info("shared contact card", { "spectrum.imessage.contact.chat": safeChatGuid });
 		}).catch((error) => {
 			this.cache.delete(chatGuid);
@@ -1546,16 +1582,18 @@ var ContactShareTracker = class {
 };
 const trackers = /* @__PURE__ */ new WeakMap();
 /**
-* Returns a per-owner tracker. Mirrors `getMessageCache`/`getPollCache` in
-* ../cache.ts — keyed by an object (the `RemoteClient[]` array for remote
-* mode), so each iMessage provider instance has its own tracker and multiple
-* providers don't share state accidentally.
+* Returns a per-line tracker. Mirrors `getMessageCache` in ../cache.ts — keyed
+* by the individual `AdvancedIMessage` client, so each line has its own dedupe
+* state and multiple lines/providers don't share state accidentally. The
+* WeakMap holds the client weakly, so a torn-down line's tracker is collected
+* with its client (the tracker's own reference back to the client doesn't pin
+* it — the entry is a collectible cycle).
 */
-const getContactShareTracker = (owner) => {
-	let tracker = trackers.get(owner);
+const getContactShareTracker = (client) => {
+	let tracker = trackers.get(client);
 	if (!tracker) {
-		tracker = new ContactShareTracker();
-		trackers.set(owner, tracker);
+		tracker = new ContactShareTracker(client);
+		trackers.set(client, tracker);
 	}
 	return tracker;
 };
@@ -1767,27 +1805,33 @@ async function* afterCursor(stream, cursor) {
 const withClose = (source, cursor) => Object.assign(afterCursor(source, cursor), { close: async () => {
 	await source.close?.();
 } });
-const messageStream = (client, phone, onInbound) => resumableOrderedStream({
+const messageStream = (client, phone, onInbound, recover) => resumableOrderedStream({
 	fetchMissed: (cursor) => catchUpEvents(client, cursor, isMessageEvent),
 	isCursorRejectedError: isCursorRejectedIMessageError,
 	label: streamLabel("messages", phone),
+	recover,
 	processLive: (event) => toMessageItem(client, event, phone, String(event.sequence), onInbound),
 	processMissed: (event) => event.type === "catchup.complete" ? Promise.resolve(toCatchUpCompleteItem(event)) : toMessageItem(client, event, phone, String(event.sequence), onInbound),
 	subscribeLive: (cursor) => withClose(client.messages.subscribeEvents(), cursor)
 });
-const pollStream = (client, pollCache, phone) => resumableOrderedStream({
+const pollStream = (client, pollCache, phone, recover) => resumableOrderedStream({
 	fetchMissed: (cursor) => catchUpEvents(client, cursor, isPollEvent),
 	isCursorRejectedError: isCursorRejectedIMessageError,
 	label: streamLabel("polls", phone),
+	recover,
 	processLive: (event) => toPollItem(client, pollCache, event, phone, String(event.sequence)),
 	processMissed: (event) => event.type === "catchup.complete" ? Promise.resolve(toCatchUpCompleteItem(event)) : toPollItem(client, pollCache, event, phone, String(event.sequence)),
 	subscribeLive: (cursor) => withClose(client.polls.subscribeEvents(), cursor)
 });
-const clientStream = (client, pollCache, phone, onInbound) => mergeStreams([messageStream(client, phone, onInbound), pollStream(client, pollCache, phone)]);
+const clientStream = (client, pollCache, phone, onInbound, recover) => mergeStreams([messageStream(client, phone, onInbound, recover), pollStream(client, pollCache, phone, recover)]);
 const messages$1 = (clients, projectConfig) => {
 	const pollCache = getPollCache(clients);
-	const tracker = projectConfig?.profile?.imessageSynced === true ? getContactShareTracker(clients) : void 0;
-	return mergeStreams(clients.map((entry) => clientStream(entry.client, pollCache, entry.phone, tracker ? (chatGuid) => tracker.maybeShare(entry.client, chatGuid) : void 0)));
+	const shareEnabled = projectConfig?.profile?.imessageSynced === true;
+	const recover = getCloudRecover(clients);
+	return mergeStreams(clients.map((entry) => {
+		const tracker = shareEnabled ? getContactShareTracker(entry.client) : void 0;
+		return clientStream(entry.client, pollCache, entry.phone, tracker ? (chatGuid) => tracker.maybeShare(chatGuid) : void 0, recover);
+	}));
 };
 //#endregion
 //#region src/remote/stream-text.ts
@@ -2044,6 +2088,8 @@ const imessage = definePlatform("iMessage", {
 				phone: e.phone,
 				client: createClient({
 					address: e.address,
+					autoIdempotency: true,
+					retry: true,
 					tls: true,
 					token: e.token
 				})

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@spectrum-ts/imessage",
-  "version": "5.2.0",
+  "version": "6.1.0",
   "description": "iMessage provider for spectrum-ts — local and remote (advanced) modes.",
   "repository": {
     "type": "git",
@@ -39,7 +39,7 @@
     "zod": "^4.2.1"
   },
   "peerDependencies": {
-    "@spectrum-ts/core": "^5.0.0",
+    "@spectrum-ts/core": "^6.0.0",
     "typescript": "^5 || ^6.0.0"
   },
   "license": "MIT"