@spectrum-ts/imessage 8.1.0 → 8.2.0

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";
@@ -204,8 +204,9 @@ const spaceSchema = z.object({
 const spaceParamsSchema = z.object({ phone: z.string().optional() });
 /**
 * iMessage-specific per-message metadata surfaced on `IMessageMessage`.
-* - `partIndex`: attachment index within a multi-part message (0 for bare
-*   or single-attachment messages; 0..N-1 for a group's sub-items).
+* - `partIndex`: ordered part index within a multi-part message. Text and
+*   attachment parts both consume an index (0 for bare or single-part
+*   messages; 0..N-1 for a group's sub-items).
 * - `parentId`: guid of the parent message for a group sub-item. Undefined
 *   when the message itself is the parent.
 */
@@ -445,6 +446,43 @@ const getPollCache = (owner) => {
 	}
 	return cache;
 };
+const addTextPart = (parts, text) => {
+	const trimmed = text?.trim();
+	if (trimmed) parts.push({
+		type: "text",
+		text: trimmed
+	});
+};
+const hasUsableTextPart = (text) => text?.split("").some((segment) => segment.trim()) ?? false;
+const addAttachmentParts = (parts, attachments) => {
+	for (const attachment of attachments) if (attachment) parts.push({
+		type: "attachment",
+		attachment
+	});
+};
+const toOrderedParts = (text, attachments) => {
+	const parts = [];
+	if (!text) {
+		addAttachmentParts(parts, attachments);
+		return parts;
+	}
+	if (!text.includes("")) {
+		addAttachmentParts(parts, attachments);
+		addTextPart(parts, text);
+		return parts;
+	}
+	const textSegments = text.split("");
+	for (let i = 0; i < attachments.length; i++) {
+		addTextPart(parts, textSegments[i]);
+		const attachment = attachments[i];
+		if (attachment) parts.push({
+			type: "attachment",
+			attachment
+		});
+	}
+	addTextPart(parts, textSegments.slice(attachments.length).join(""));
+	return parts;
+};
 //#endregion
 //#region src/shared/vcard.ts
 const VCARD_MIME_TYPES = new Set([
@@ -487,12 +525,31 @@ const toVCardContent$1 = async (att) => {
 const localAttachmentContent = async (att) => isVCardAttachment(att.mimeType, att.fileName) ? await toVCardContent$1(att) : toAttachmentContent$1(att);
 //#endregion
 //#region src/local/inbound.ts
-const ATTACHMENT_PLACEHOLDER = "";
 const ATTACHMENT_JOIN_RETRY_DELAY_MS = 250;
 const ATTACHMENT_JOIN_RETRY_LIMIT = 8;
 const ATTACHMENT_JOIN_FETCH_LIMIT = 10;
-const hasAttachmentPlaceholder = (message) => message.text?.includes(ATTACHMENT_PLACEHOLDER) ?? false;
+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) {
@@ -529,19 +586,40 @@ const toMessages = async (message) => {
 		},
 		timestamp: message.createdAt
 	};
-	if (message.attachments.length > 0) return Promise.all(message.attachments.map(async (att) => ({
-		...base,
-		id: `${message.id}:${att.id}`,
-		content: await localAttachmentContent(att)
-	})));
-	return [{
+	const targetId = replyTargetId(message);
+	if (message.attachments.length > 0) {
+		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++) {
+			const part = parts[i];
+			if (!part) continue;
+			messages.push(part.type === "text" ? {
+				...base,
+				id: `${message.id}:text:${i}`,
+				content: asText(part.text),
+				partIndex: i
+			} : {
+				...base,
+				id: `${message.id}:${part.attachment.id}`,
+				content: await localAttachmentContent(part.attachment),
+				partIndex: i
+			});
+		}
+		return wrapReply(messages, targetId);
+	}
+	return wrapReply([{
 		...base,
 		id: message.id,
 		content: {
 			type: "text",
 			text: message.text ?? ""
 		}
-	}];
+	}], targetId);
 };
 const messages$3 = (client) => stream((emit, end) => {
 	let lastPromise = Promise.resolve();
@@ -824,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 {
@@ -868,73 +950,114 @@ const buildAttachmentMessage = async (client, base, info, id, partIndex, parentI
 	if (parentId !== void 0) msg.parentId = parentId;
 	return msg;
 };
-const rebuildFromAppleMessage = async (client, message, phone, chatGuidHint) => {
-	const messageGuidStr = message.guid;
-	const base = buildMessageBase(message, chatGuidHint, message.dateCreated ?? /* @__PURE__ */ new Date(), phone);
+const buildTextMessage = (base, text, id, partIndex, parentId) => {
+	const msg = {
+		...base,
+		id,
+		content: asText(text),
+		partIndex
+	};
+	if (parentId !== void 0) msg.parentId = 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 buildUnwrappedContentMessage = async (client, base, message, messageGuidStr) => {
 	const attachments = messageAttachments(message);
-	if (attachments.length === 1) {
-		const info = attachments[0];
-		if (!info) throw new Error("Unreachable: attachments.length === 1 but no element");
-		return buildAttachmentMessage(client, base, info, messageGuidStr, 0);
-	}
-	if (attachments.length > 1) {
-		const items = [];
-		for (let i = 0; i < attachments.length; i++) {
-			const info = attachments[i];
-			if (!info) continue;
-			items.push(await buildAttachmentMessage(client, base, info, formatChildId(i, messageGuidStr), i, messageGuidStr));
-		}
+	if (attachments.length === 0) {
+		const text = message.content.text;
 		return {
 			...base,
 			id: messageGuidStr,
-			content: asProviderGroup(items)
+			content: text ? asText(text) : asCustom(message)
 		};
 	}
-	const text = message.content.text;
+	const parts = toOrderedParts(message.content.text, attachments);
+	if (parts.length === 0) return {
+		...base,
+		id: messageGuidStr,
+		content: asCustom(message)
+	};
+	if (parts.length === 1) {
+		const part = parts[0];
+		if (!part) throw new Error("Unreachable: parts.length === 1 but no element");
+		return buildOrderedPartMessage(client, base, part, messageGuidStr, 0);
+	}
+	const items = [];
+	for (let i = 0; i < parts.length; i++) {
+		const part = parts[i];
+		if (!part) continue;
+		items.push(await buildOrderedPartMessage(client, base, part, formatChildId(i, messageGuidStr), i, messageGuidStr));
+	}
 	return {
 		...base,
 		id: messageGuidStr,
-		content: text ? asText(text) : asCustom(message)
+		content: asProviderGroup(items)
 	};
 };
+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, {
+		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 attachments = messageAttachments(event.message);
-	if (attachments.length === 1) {
-		const info = attachments[0];
-		if (!info) throw new Error("Unreachable: attachments.length === 1 but no element");
-		const msg = await buildAttachmentMessage(client, base, info, messageGuidStr, 0);
-		cacheMessage(cache, msg);
-		return [msg];
-	}
-	if (attachments.length > 1) {
-		const items = [];
-		for (let i = 0; i < attachments.length; i++) {
-			const info = attachments[i];
-			if (!info) continue;
-			items.push(await buildAttachmentMessage(client, base, info, formatChildId(i, messageGuidStr), i, messageGuidStr));
-		}
-		const parent = {
-			...base,
-			id: messageGuidStr,
-			content: asProviderGroup(items)
-		};
-		cacheMessage(cache, parent);
-		return [parent];
-	}
-	const text = event.message.content.text;
-	const msg = {
-		...base,
-		id: messageGuidStr,
-		content: text ? asText(text) : asCustom(event.message)
-	};
+	const msg = await buildContentMessage(client, base, event.message, messageGuidStr, {
+		cache,
+		phone
+	});
 	cacheMessage(cache, msg);
 	return [msg];
 };
@@ -944,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) {
@@ -2073,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)) {
@@ -2094,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.0",
+  "version": "8.2.0",
   "description": "iMessage provider for spectrum-ts — local and remote (advanced) modes.",
   "repository": {
     "type": "git",