@spectrum-ts/imessage 8.1.0 → 8.1.1

package/dist/index.js

@@ -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,11 +525,10 @@ 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 refetchUntilAttachmentsSettle = async (client, message) => {
 	if (!message.chatId) return message;
@@ -529,11 +566,31 @@ 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)
-	})));
+	if (message.attachments.length > 0) {
+		if (!hasUsableTextPart(message.text)) return Promise.all(message.attachments.map(async (att) => ({
+			...base,
+			id: `${message.id}:${att.id}`,
+			content: await localAttachmentContent(att)
+		})));
+		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 messages;
+	}
 	return [{
 		...base,
 		id: message.id,
@@ -868,35 +925,54 @@ 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 buildContentMessage = 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 rebuildFromAppleMessage = async (client, message, phone, chatGuidHint) => {
+	const messageGuidStr = message.guid;
+	return buildContentMessage(client, buildMessageBase(message, chatGuidHint, message.dateCreated ?? /* @__PURE__ */ new Date(), phone), message, messageGuidStr);
+};
 const cacheMessage = (cache, message) => {
 	cache.set(message.id, message);
 	if (message.content.type === "group") {
@@ -906,35 +982,7 @@ const cacheMessage = (cache, message) => {
 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);
 	cacheMessage(cache, msg);
 	return [msg];
 };

package/package.json

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