@spectrum-ts/imessage 8.1.1 → 8.2.1

package/dist/index.js

@@ -2,7 +2,7 @@ import { MessageEffect, NotFoundError, ValidationError, createClient } from "@ph
 import { IMessageSDK } from "@photon-ai/imessage-kit";
 import { sanitizePhone, withSpan } from "@photon-ai/otel";
 import { UnsupportedError, appLayoutSchema, cloud, definePlatform, fromVCard, mergeStreams, read, stream, text, toVCard } from "@spectrum-ts/core";
-import { asAttachment, asContact, asCustom, asGroup, asPoll, asPollOption, asText, buildPhotoAction, createLogger, ensureM4a, errorAttrs, groupSchema, messageEffectSchema, photoActionSchema, reactionSchema, resumableOrderedStream, sanitizeErrorMessage } from "@spectrum-ts/core/authoring";
+import { asAttachment, asContact, asCustom, asGroup, asPoll, asPollOption, asReply, asText, buildPhotoAction, createLogger, ensureM4a, errorAttrs, groupSchema, messageEffectSchema, photoActionSchema, reactionSchema, resumableOrderedStream, sanitizeErrorMessage } from "@spectrum-ts/core/authoring";
 import z from "zod";
 import { setTimeout as setTimeout$1 } from "node:timers/promises";
 import { createReadStream } from "node:fs";
@@ -530,6 +530,26 @@ const ATTACHMENT_JOIN_RETRY_LIMIT = 8;
 const ATTACHMENT_JOIN_FETCH_LIMIT = 10;
 const hasAttachmentPlaceholder = (message) => message.text?.includes("") ?? false;
 const isPendingAttachmentJoin = (message) => message.attachments.length === 0 && (message.hasAttachments || hasAttachmentPlaceholder(message));
+const replyTargetId = (message) => message.threadRootMessageId ?? void 0;
+const stubReplyTarget$1 = (space, targetId) => ({
+	id: targetId,
+	content: asCustom({
+		imessage_type: "reply-target",
+		stub: true
+	}),
+	space
+});
+const asProviderReply$1 = (content, target) => asReply({
+	content,
+	target
+});
+const wrapReply = (messages, targetId) => {
+	if (!targetId) return messages;
+	return messages.map((message) => ({
+		...message,
+		content: asProviderReply$1(message.content, stubReplyTarget$1(message.space, targetId))
+	}));
+};
 const refetchUntilAttachmentsSettle = async (client, message) => {
 	if (!message.chatId) return message;
 	for (let attempt = 0; attempt < ATTACHMENT_JOIN_RETRY_LIMIT; attempt += 1) {
@@ -566,12 +586,13 @@ const toMessages = async (message) => {
 		},
 		timestamp: message.createdAt
 	};
+	const targetId = replyTargetId(message);
 	if (message.attachments.length > 0) {
-		if (!hasUsableTextPart(message.text)) return Promise.all(message.attachments.map(async (att) => ({
+		if (!hasUsableTextPart(message.text)) return wrapReply(await Promise.all(message.attachments.map(async (att) => ({
 			...base,
 			id: `${message.id}:${att.id}`,
 			content: await localAttachmentContent(att)
-		})));
+		}))), targetId);
 		const parts = toOrderedParts(message.text, message.attachments);
 		const messages = [];
 		for (let i = 0; i < parts.length; i++) {
@@ -589,16 +610,16 @@ const toMessages = async (message) => {
 				partIndex: i
 			});
 		}
-		return messages;
+		return wrapReply(messages, targetId);
 	}
-	return [{
+	return wrapReply([{
 		...base,
 		id: message.id,
 		content: {
 			type: "text",
 			text: message.text ?? ""
 		}
-	}];
+	}], targetId);
 };
 const messages$3 = (client) => stream((emit, end) => {
 	let lastPromise = Promise.resolve();
@@ -881,6 +902,10 @@ const asProviderGroup = (items) => groupSchema.parse({
 	type: "group",
 	items
 });
+const asProviderReply = (content, target) => asReply({
+	content,
+	target
+});
 const buildMessageBase = (message, chatGuidHint, timestamp, phone) => {
 	const chat = resolveChatGuid(message, chatGuidHint);
 	return {
@@ -936,7 +961,7 @@ const buildTextMessage = (base, text, id, partIndex, parentId) => {
 	return msg;
 };
 const buildOrderedPartMessage = async (client, base, part, id, partIndex, parentId) => part.type === "text" ? buildTextMessage(base, part.text, id, partIndex, parentId) : await buildAttachmentMessage(client, base, part.attachment, id, partIndex, parentId);
-const buildContentMessage = async (client, base, message, messageGuidStr) => {
+const buildUnwrappedContentMessage = async (client, base, message, messageGuidStr) => {
 	const attachments = messageAttachments(message);
 	if (attachments.length === 0) {
 		const text = message.content.text;
@@ -969,20 +994,70 @@ const buildContentMessage = async (client, base, message, messageGuidStr) => {
 		content: asProviderGroup(items)
 	};
 };
-const rebuildFromAppleMessage = async (client, message, phone, chatGuidHint) => {
+const replyTargetGuid = (message) => message.replyTargetGuid ?? message.threadOriginatorGuid;
+const stubReplyTarget = (base, targetGuid) => ({
+	id: targetGuid,
+	content: asCustom({
+		imessage_type: "reply-target",
+		stub: true
+	}),
+	space: base.space
+});
+const resolveReplyTarget = async (client, base, targetGuid, currentGuid, options) => {
+	if (targetGuid === currentGuid || options.visitedReplyGuids?.has(targetGuid)) return stubReplyTarget(base, targetGuid);
+	const cached = options.cache?.get(targetGuid);
+	if (cached) return cached;
+	try {
+		const visitedReplyGuids = new Set(options.visitedReplyGuids);
+		visitedReplyGuids.add(currentGuid);
+		const rebuilt = await rebuildFromAppleMessage(client, await client.messages.get(toMessageGuid(targetGuid)), options.phone, base.space.id, options.cache, visitedReplyGuids);
+		if (options.cache) cacheMessage(options.cache, rebuilt);
+		return rebuilt;
+	} catch (err) {
+		if (!(err instanceof NotFoundError)) log$2.warn("failed to resolve iMessage reply target; falling back to stub target", {
+			"spectrum.imessage.message.guid": currentGuid,
+			"spectrum.imessage.reply.target_guid": targetGuid,
+			...errorAttrs(err)
+		}, err);
+		return stubReplyTarget(base, targetGuid);
+	}
+};
+const buildContentMessage = async (client, base, message, messageGuidStr, options) => {
+	const msg = await buildUnwrappedContentMessage(client, base, message, messageGuidStr);
+	const targetGuid = replyTargetGuid(message);
+	if (!targetGuid) return msg;
+	const target = await resolveReplyTarget(client, base, targetGuid, messageGuidStr, options);
+	return {
+		...msg,
+		content: asProviderReply(msg.content, target)
+	};
+};
+const messageGroupContent = (message) => {
+	if (message.content.type === "group") return message.content;
+	if (message.content.type === "reply" && message.content.content.type === "group") return message.content.content;
+};
+const rebuildFromAppleMessage = async (client, message, phone, chatGuidHint, cache, visitedReplyGuids) => {
 	const messageGuidStr = message.guid;
-	return buildContentMessage(client, buildMessageBase(message, chatGuidHint, message.dateCreated ?? /* @__PURE__ */ new Date(), phone), message, messageGuidStr);
+	return buildContentMessage(client, buildMessageBase(message, chatGuidHint, message.dateCreated ?? /* @__PURE__ */ new Date(), phone), message, messageGuidStr, {
+		cache,
+		phone,
+		visitedReplyGuids
+	});
 };
 const cacheMessage = (cache, message) => {
 	cache.set(message.id, message);
-	if (message.content.type === "group") {
-		for (const item of message.content.items) if (isIMessageMessage(item)) cache.set(item.id, item);
+	const group = messageGroupContent(message);
+	if (group) {
+		for (const item of group.items) if (isIMessageMessage(item)) cache.set(item.id, item);
 	}
 };
 const toInboundMessages = async (client, cache, event, phone) => {
 	const base = buildMessageBase(event.message, event.chatGuid, event.occurredAt, phone);
 	const messageGuidStr = event.message.guid;
-	const msg = await buildContentMessage(client, base, event.message, messageGuidStr);
+	const msg = await buildContentMessage(client, base, event.message, messageGuidStr, {
+		cache,
+		phone
+	});
 	cacheMessage(cache, msg);
 	return [msg];
 };
@@ -992,17 +1067,18 @@ const getMessage$1 = async (remote, spaceId, msgId, phone) => {
 	if (cached) return cached;
 	const childRef = parseChildId(msgId);
 	if (childRef) try {
-		const parent = await rebuildFromAppleMessage(remote, await remote.messages.get(toMessageGuid(childRef.parentGuid)), phone, spaceId);
+		const parent = await rebuildFromAppleMessage(remote, await remote.messages.get(toMessageGuid(childRef.parentGuid)), phone, spaceId, cache);
 		cacheMessage(cache, parent);
-		if (parent.content.type !== "group") return;
-		const item = parent.content.items[childRef.partIndex];
+		const group = messageGroupContent(parent);
+		if (!group) return;
+		const item = group.items[childRef.partIndex];
 		return isIMessageMessage(item) ? item : void 0;
 	} catch (err) {
 		if (err instanceof NotFoundError) return;
 		throw err;
 	}
 	try {
-		const rebuilt = await rebuildFromAppleMessage(remote, await remote.messages.get(toMessageGuid(msgId)), phone, spaceId);
+		const rebuilt = await rebuildFromAppleMessage(remote, await remote.messages.get(toMessageGuid(msgId)), phone, spaceId, cache);
 		cacheMessage(cache, rebuilt);
 		return rebuilt;
 	} catch (err) {
@@ -2121,8 +2197,15 @@ const imessage = definePlatform("iMessage", {
 		schema: spaceSchema,
 		params: spaceParamsSchema,
 		create: async ({ input, client }) => {
-			if (isLocal(client)) throw UnsupportedError.action("space.create", "iMessage (local mode)", "local mode only supports replying to existing messages");
 			if (input.users.length === 0) throw new Error("iMessage space creation requires at least one user");
+			if (isLocal(client)) {
+				if (input.users.length > 1) throw UnsupportedError.action("space.create", "iMessage (local mode)", "local mode cannot create group chats — use space.get(chatGuid) for an existing group");
+				return {
+					id: dmChatGuid(input.users[0]?.id ?? ""),
+					type: "dm",
+					phone: ""
+				};
+			}
 			if (client.length === 0) throw new Error("No iMessage clients configured");
 			const addresses = input.users.map((u) => u.id);
 			if (isSharedMode(client)) {
@@ -2142,7 +2225,11 @@ const imessage = definePlatform("iMessage", {
 			};
 		},
 		get: async ({ input, client }) => {
-			if (isLocal(client)) throw UnsupportedError.action("space.get", "iMessage (local mode)", "local mode only supports replying to existing messages");
+			if (isLocal(client)) return {
+				id: input.id,
+				type: chatTypeFromGuid(input.id),
+				phone: ""
+			};
 			if (client.length === 0) throw new Error("No iMessage clients configured");
 			const phone = isSharedMode(client) ? SHARED_PHONE : input.params?.phone ?? (client.length === 1 ? client[0]?.phone : void 0);
 			if (!phone) throw new Error(`iMessage space.get requires params.phone when multiple clients are configured. Available: ${availablePhones(client).join(", ")}`);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@spectrum-ts/imessage",
-  "version": "8.1.1",
+  "version": "8.2.1",
   "description": "iMessage provider for spectrum-ts — local and remote (advanced) modes.",
   "repository": {
     "type": "git",