@spectrum-ts/imessage 5.1.0 → 6.0.0

package/dist/index.d.ts

@@ -199,7 +199,16 @@ declare const imessage: import("@spectrum-ts/core").Platform<import("@spectrum-t
     token: import("zod").ZodString;
     phone: import("zod").ZodString;
   }, import("zod/v4/core").$strip>>]>>;
-}, import("zod/v4/core").$strip>]>, import("zod").ZodType<object, unknown, import("zod/v4/core").$ZodTypeInternals<object, unknown>> | undefined, import("zod").ZodObject<{
+}, import("zod/v4/core").$strip>]>, import("zod").ZodObject<{
+  address: import("zod").ZodOptional<import("zod").ZodString>;
+  country: import("zod").ZodOptional<import("zod").ZodString>;
+  service: import("zod").ZodOptional<import("zod").ZodEnum<{
+    iMessage: "iMessage";
+    unknown: "unknown";
+    SMS: "SMS";
+    RCS: "RCS";
+  }>>;
+}, import("zod/v4/core").$strip>, import("zod").ZodObject<{
   id: import("zod").ZodString;
   type: import("zod").ZodEnum<{
     dm: "dm";

package/dist/index.js

@@ -186,7 +186,7 @@ const configSchema = z.union([z.object({ local: z.literal(true) }), z.object({
 	local: z.literal(false).optional().default(false),
 	clients: clientEntry.or(z.array(clientEntry)).optional()
 })]);
-z.object({
+const userSchema = z.object({
 	address: z.string().optional(),
 	country: z.string().optional(),
 	service: z.enum([
@@ -1508,9 +1508,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 +1525,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 +1536,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 +1553,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;
 };
@@ -1786,8 +1795,11 @@ const pollStream = (client, pollCache, phone) => resumableOrderedStream({
 const clientStream = (client, pollCache, phone, onInbound) => mergeStreams([messageStream(client, phone, onInbound), pollStream(client, pollCache, phone)]);
 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;
+	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);
+	}));
 };
 //#endregion
 //#region src/remote/stream-text.ts
@@ -2060,7 +2072,10 @@ const imessage = definePlatform("iMessage", {
 			await Promise.all(client.map((entry) => entry.client.close()));
 		}
 	},
-	user: { resolve: async ({ input }) => ({ id: input.userID }) },
+	user: {
+		schema: userSchema,
+		resolve: async ({ input }) => ({ id: input.userID })
+	},
 	space: {
 		schema: spaceSchema,
 		params: spaceParamsSchema,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@spectrum-ts/imessage",
-  "version": "5.1.0",
+  "version": "6.0.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"