@spectrum-ts/imessage 12.5.0 → 12.6.0

package/dist/index.js

@@ -1,7 +1,7 @@
 import { ErrorCode, NotFoundError, ValidationError, createGrpcClient } from "@photon-ai/advanced-imessage/grpc";
 import { sanitizePhone, withSpan } from "@photon-ai/otel";
 import { UnsupportedError, appLayoutSchema, cloud, definePlatform, fromVCard, mergeStreams, read, text, toVCard } from "@spectrum-ts/core";
-import { addMemberSchema, asAttachment, asContact, asCustom, asGroup, asPoll, asPollOption, asReply, asText, asVoice, avatarSchema, buildPhotoAction, createLogger, createTokenRenewal, ensureM4a, errorAttrs, groupSchema, leaveSpaceSchema, messageEffectSchema, photoActionSchema, reactionSchema, readSchema, removeMemberSchema, renameSchema, resumableOrderedStream, sanitizeErrorMessage } from "@spectrum-ts/core/authoring";
+import { addMemberSchema, asAttachment, asContact, asCustom, asGroup, asPoll, asPollOption, asReply, asText, asVoice, avatarSchema, buildPhotoAction, createLogger, createStreamGroup, createTokenRenewal, ensureM4a, errorAttrs, groupSchema, leaveSpaceSchema, messageEffectSchema, photoActionSchema, reactionSchema, readSchema, removeMemberSchema, renameSchema, resumableOrderedStream, sanitizeErrorMessage } from "@spectrum-ts/core/authoring";
 import z from "zod";
 import { Marked } from "marked";
 import { LRUCache } from "lru-cache";
@@ -179,6 +179,73 @@ function effect(input, messageEffect) {
 	} };
 }
 //#endregion
+//#region src/lines.ts
+const linesLog = createLogger("spectrum.imessage.lines");
+const observers = /* @__PURE__ */ new WeakMap();
+const lineIds = /* @__PURE__ */ new WeakMap();
+let fallbackKeys = 0;
+/** Pairs an entry with the cloud instance it was built from. */
+const setLineId = (entry, instanceId) => {
+	lineIds.set(entry, instanceId);
+};
+/**
+* Stable per-entry key. Falls back to a generated id for explicitly-configured
+* clients, which carry no instance id and may legitimately repeat a phone
+* number — phone alone would collide.
+*/
+const lineKey = (entry) => {
+	const existing = lineIds.get(entry);
+	if (existing) return existing;
+	fallbackKeys += 1;
+	const generated = `line-${fallbackKeys}`;
+	lineIds.set(entry, generated);
+	return generated;
+};
+/**
+* Registers `observer` and returns a disposer that removes just this one, so a
+* closed message stream stops being called into. `clearLineObservers` remains
+* the whole-array teardown used when the client itself is destroyed.
+*/
+const addLineObserver = (clients, observer) => {
+	const existing = observers.get(clients);
+	if (existing) existing.add(observer);
+	else observers.set(clients, new Set([observer]));
+	return () => {
+		const current = observers.get(clients);
+		if (!current?.delete(observer)) return;
+		if (current.size === 0) observers.delete(clients);
+	};
+};
+const clearLineObservers = (clients) => {
+	observers.delete(clients);
+};
+/**
+* Synchronous by contract: `reconcile` calls this immediately after pushing the
+* entry, with no await in between, so an observer can never see a half-applied
+* array. A throwing observer is contained — it must not be able to reject the
+* token refresh, which would stall renewal for every line.
+*/
+const notifyLineAttached = (clients, entry) => {
+	for (const observer of observers.get(clients) ?? []) try {
+		observer.attach(entry);
+	} catch (error) {
+		linesLog.warn("imessage line observer failed to attach", errorAttrs(error), error instanceof Error ? error : void 0);
+	}
+};
+/**
+* Returns each observer's detach promise so the caller can settle them off the
+* refresh path — a wedged stream close must not stall token renewal.
+*/
+const notifyLineDetached = (clients, entry) => {
+	const pending = [];
+	for (const observer of observers.get(clients) ?? []) try {
+		pending.push(Promise.resolve(observer.detach(entry)));
+	} catch (error) {
+		linesLog.warn("imessage line observer failed to detach", errorAttrs(error), error instanceof Error ? error : void 0);
+	}
+	return pending;
+};
+//#endregion
 //#region src/types.ts
 /**
 * Sentinel phone for shared-token mode. The single shared client serves an
@@ -232,18 +299,92 @@ const messageSchema = z.object({
 //#endregion
 //#region src/auth.ts
 const FORCE_REFRESH_MIN_INTERVAL_MS = 5e3;
+const authLog = createLogger("spectrum.imessage.auth");
 const cloudAuthState = /* @__PURE__ */ new WeakMap();
-const requirePhone = (data, instanceId) => {
-	const phone = data.numbers?.[instanceId];
-	if (!phone) throw new Error(`iMessage instance ${instanceId} has no phone assigned`);
-	return phone;
-};
+const instanceAttrs = (instanceId) => ({ "spectrum.imessage.instance": instanceId });
 async function createCloudClients(projectId, projectSecret) {
 	let tokenData = await cloud.issueImessageTokens(projectId, projectSecret);
 	let lastRefreshAt = Date.now();
-	const records = [];
-	const syncPhones = (data) => {
-		for (const { entry, instanceId } of records) entry.phone = requirePhone(data, instanceId);
+	const entries = [];
+	const records = /* @__PURE__ */ new Map();
+	const buildEntry = (instanceId, phone, initialToken) => ({
+		phone,
+		client: createGrpcClient({
+			address: `${instanceId}.imsg.photon.codes:443`,
+			autoIdempotency: true,
+			retry: true,
+			tls: true,
+			token: async () => {
+				await renewal.refreshIfNeeded();
+				if (tokenData.type !== "dedicated") return initialToken;
+				return tokenData.auth[instanceId] ?? initialToken;
+			}
+		})
+	});
+	const retire = async (entry) => {
+		await Promise.allSettled(notifyLineDetached(entries, entry));
+		await entry.client.close();
+	};
+	const removeMissing = (data) => {
+		let removed = 0;
+		for (const [instanceId, entry] of records) {
+			if (data.auth[instanceId]) continue;
+			records.delete(instanceId);
+			const index = entries.indexOf(entry);
+			if (index >= 0) entries.splice(index, 1);
+			removed += 1;
+			retire(entry).catch((error) => {
+				authLog.warn("failed to retire imessage line", {
+					...instanceAttrs(instanceId),
+					...errorAttrs(error)
+				}, error instanceof Error ? error : void 0);
+			});
+		}
+		return removed;
+	};
+	const addOrSync = (data) => {
+		let added = 0;
+		for (const [instanceId, token] of Object.entries(data.auth)) {
+			const phone = data.numbers?.[instanceId];
+			const existing = records.get(instanceId);
+			if (existing) {
+				if (phone) existing.phone = phone;
+				else authLog.warn("imessage line lost its phone number; keeping the last known number", instanceAttrs(instanceId));
+				notifyLineAttached(entries, existing);
+				continue;
+			}
+			if (!phone) {
+				authLog.warn("skipping imessage line without a phone number", instanceAttrs(instanceId));
+				continue;
+			}
+			const entry = buildEntry(instanceId, phone, token);
+			setLineId(entry, instanceId);
+			records.set(instanceId, entry);
+			entries.push(entry);
+			notifyLineAttached(entries, entry);
+			added += 1;
+		}
+		return added;
+	};
+	/**
+	* Brings the client set in line with the token payload, which is the only
+	* inventory the cloud exposes: keys present but untracked are newly
+	* provisioned, tracked keys that vanished were deprovisioned.
+	*
+	* An empty payload means the project has no lines, not that the response is
+	* suspect — keeping entries the payload no longer covers would leave the
+	* client routing through channels whose tokens have stopped being refreshed.
+	* A genuinely malformed payload (no `auth` at all) throws instead, which the
+	* caller contains before any line is removed.
+	*/
+	const reconcile = (data) => {
+		const removed = removeMissing(data);
+		const added = addOrSync(data);
+		if (added > 0 || removed > 0) authLog.info("imessage lines reconciled", {
+			"spectrum.imessage.lines.added": added,
+			"spectrum.imessage.lines.removed": removed,
+			"spectrum.imessage.lines.total": entries.length
+		});
 	};
 	const renewal = createTokenRenewal({
 		expiresInSeconds: () => tokenData.expiresIn,
@@ -251,7 +392,12 @@ async function createCloudClients(projectId, projectSecret) {
 		refresh: async () => {
 			tokenData = await cloud.issueImessageTokens(projectId, projectSecret);
 			lastRefreshAt = Date.now();
-			if (tokenData.type === "dedicated") syncPhones(tokenData);
+			if (tokenData.type !== "dedicated") return;
+			try {
+				reconcile(tokenData);
+			} catch (error) {
+				authLog.error("imessage line reconcile failed", errorAttrs(error), error instanceof Error ? error : void 0);
+			}
 		}
 	});
 	const forceRefresh = async () => {
@@ -263,10 +409,11 @@ async function createCloudClients(projectId, projectSecret) {
 		forceRefresh
 	};
 	if (tokenData.type === "shared") {
-		const entries = [{
+		const address = process.env.SPECTRUM_IMESSAGE_ADDRESS ?? "imessage.spectrum.photon.codes:443";
+		entries.push({
 			phone: SHARED_PHONE,
 			client: createGrpcClient({
-				address: process.env.SPECTRUM_IMESSAGE_ADDRESS ?? "imessage.spectrum.photon.codes:443",
+				address,
 				autoIdempotency: true,
 				retry: true,
 				tls: true,
@@ -275,35 +422,16 @@ async function createCloudClients(projectId, projectSecret) {
 					return tokenData.token;
 				}
 			})
-		}];
+		});
 		cloudAuthState.set(entries, cloudAuth);
 		return entries;
 	}
-	const dedicated = tokenData;
-	for (const [instanceId, token] of Object.entries(dedicated.auth)) {
-		const entry = {
-			phone: requirePhone(dedicated, instanceId),
-			client: createGrpcClient({
-				address: `${instanceId}.imsg.photon.codes:443`,
-				autoIdempotency: true,
-				retry: true,
-				tls: true,
-				token: async () => {
-					await renewal.refreshIfNeeded();
-					return tokenData.auth[instanceId] ?? token;
-				}
-			})
-		};
-		records.push({
-			entry,
-			instanceId
-		});
-	}
-	const entries = records.map((r) => r.entry);
+	reconcile(tokenData);
 	cloudAuthState.set(entries, cloudAuth);
 	return entries;
 }
 async function disposeCloudAuth(clients) {
+	clearLineObservers(clients);
 	const auth = cloudAuthState.get(clients);
 	if (auth) {
 		auth.dispose();
@@ -2133,11 +2261,26 @@ const messages$1 = (clients, projectConfig, profileSyncGate) => {
 	const pollCache = getPollCache(clients);
 	const staticShareEnabled = projectConfig?.profile?.imessageSynced === true;
 	const recover = getCloudRecover(clients);
-	const includeGroupEvents = !isSharedMode(clients);
-	return mergeStreams(clients.map((entry) => {
+	const shared = isSharedMode(clients);
+	const includeGroupEvents = !shared;
+	const build = (entry) => () => {
 		const tracker = staticShareEnabled || profileSyncGate ? getContactShareTracker(entry.client) : void 0;
 		return clientStream(entry.client, pollCache, entry.phone, includeGroupEvents, tracker ? contactShareHandler(tracker, profileSyncGate) : void 0, recover);
-	}));
+	};
+	const group = createStreamGroup({ label: "imessage.messages" });
+	for (const entry of clients) group.add(lineKey(entry), build(entry));
+	if (shared) return group;
+	const disposeObserver = addLineObserver(clients, {
+		attach: (entry) => {
+			group.add(lineKey(entry), build(entry));
+		},
+		detach: (entry) => group.remove(lineKey(entry)).then(() => void 0)
+	});
+	const closeGroup = group.close.bind(group);
+	return Object.assign(group, { close: async () => {
+		disposeObserver();
+		await closeGroup();
+	} });
 };
 //#endregion
 //#region src/remote/stream-text.ts

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@spectrum-ts/imessage",
-  "version": "12.5.0",
+  "version": "12.6.0",
   "description": "iMessage provider for spectrum-ts.",
   "repository": {
     "type": "git",