@spectrum-ts/imessage 11.0.0 → 11.2.0

package/dist/index.js

@@ -1,7 +1,7 @@
 import { NotFoundError, ValidationError, createClient } from "@photon-ai/advanced-imessage";
 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, avatarSchema, buildPhotoAction, createLogger, ensureM4a, errorAttrs, groupSchema, leaveSpaceSchema, messageEffectSchema, photoActionSchema, reactionSchema, removeMemberSchema, renameSchema, resumableOrderedStream, sanitizeErrorMessage } from "@spectrum-ts/core/authoring";
+import { addMemberSchema, asAttachment, asContact, asCustom, asGroup, asPoll, asPollOption, asReply, asText, asVoice, avatarSchema, buildPhotoAction, createLogger, ensureM4a, errorAttrs, groupSchema, leaveSpaceSchema, messageEffectSchema, photoActionSchema, reactionSchema, removeMemberSchema, renameSchema, resumableOrderedStream, sanitizeErrorMessage } from "@spectrum-ts/core/authoring";
 import z from "zod";
 import { Marked } from "marked";
 import { LRUCache } from "lru-cache";
@@ -576,6 +576,18 @@ const sendCustomizedMiniApp$1 = async (remote, spaceId, content) => {
 const updateCustomizedMiniApp$1 = async (remote, spaceId, session, content) => {
 	return toProviderRecord(await remote.messages.updateCustomizedMiniApp(session, content), content, spaceId);
 };
+//#endregion
+//#region src/shared/audio.ts
+const AUDIO_MIME_PATTERN = /^audio\//i;
+const CAF_MIME_TYPE = "audio/x-caf";
+const CAF_UTI = "com.apple.coreaudio-format";
+const GENERIC_BINARY_MIME_TYPE = "application/octet-stream";
+const isCafAttachment = (attachment) => attachment.uti?.toLowerCase() === CAF_UTI || attachment.fileName?.toLowerCase().endsWith(".caf") === true;
+const normalizeAppleAttachmentMimeType = (attachment) => attachment.mimeType.toLowerCase() === GENERIC_BINARY_MIME_TYPE && isCafAttachment(attachment) ? CAF_MIME_TYPE : attachment.mimeType;
+const appleAudioMimeType = (attachment) => {
+	const mimeType = normalizeAppleAttachmentMimeType(attachment);
+	return AUDIO_MIME_PATTERN.test(mimeType) ? mimeType : void 0;
+};
 const addTextPart = (parts, text) => {
 	const trimmed = text?.trim();
 	if (trimmed) parts.push({
@@ -707,7 +719,7 @@ const getRemoteAttachment = async (client, guid) => {
 	return asAttachment({
 		id: info.guid,
 		name: info.fileName,
-		mimeType: info.mimeType,
+		mimeType: normalizeAppleAttachmentMimeType(info),
 		size: info.totalBytes,
 		read: () => downloadPrimaryAttachment(client, info.guid),
 		stream: async () => downloadPrimaryAttachmentStream(client, info.guid)
@@ -762,7 +774,15 @@ const buildMessageBase = (message, chatGuidHint, timestamp, phone) => {
 const toAttachmentContent = (client, info) => asAttachment({
 	id: info.guid,
 	name: info.fileName,
-	mimeType: info.mimeType,
+	mimeType: normalizeAppleAttachmentMimeType(info),
+	size: info.totalBytes,
+	read: async () => await downloadPrimaryAttachment(client, info.guid),
+	stream: async () => downloadPrimaryAttachmentStream(client, info.guid)
+});
+const toVoiceContent = (client, info, mimeType) => asVoice({
+	id: info.guid,
+	name: info.fileName,
+	mimeType,
 	size: info.totalBytes,
 	read: async () => await downloadPrimaryAttachment(client, info.guid),
 	stream: async () => downloadPrimaryAttachmentStream(client, info.guid)
@@ -778,9 +798,13 @@ const toVCardContent = async (client, info) => {
 		return toAttachmentContent(client, info);
 	}
 };
-const attachmentContent = async (client, info) => isVCardAttachment(info.mimeType, info.fileName) ? await toVCardContent(client, info) : toAttachmentContent(client, info);
-const buildAttachmentMessage = async (client, base, info, id, partIndex, parentId) => {
-	const content = await attachmentContent(client, info);
+const attachmentContent = async (client, info, isVoice) => {
+	if (isVCardAttachment(info.mimeType, info.fileName)) return await toVCardContent(client, info);
+	const audioMimeType = isVoice ? appleAudioMimeType(info) : void 0;
+	return audioMimeType ? toVoiceContent(client, info, audioMimeType) : toAttachmentContent(client, info);
+};
+const buildAttachmentMessage = async (client, base, info, id, partIndex, parentId, isVoice = false) => {
+	const content = await attachmentContent(client, info, isVoice);
 	const msg = {
 		...base,
 		id,
@@ -800,9 +824,10 @@ const buildTextMessage = (base, text, id, partIndex, parentId) => {
 	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 buildOrderedPartMessage = async (client, base, part, id, partIndex, parentId, voiceAttachmentGuid) => part.type === "text" ? buildTextMessage(base, part.text, id, partIndex, parentId) : await buildAttachmentMessage(client, base, part.attachment, id, partIndex, parentId, part.attachment.guid === voiceAttachmentGuid);
 const buildUnwrappedContentMessage = async (client, base, message, messageGuidStr) => {
 	const attachments = messageAttachments(message);
+	const voiceAttachmentGuid = message.isAudioMessage ? attachments.find((attachment) => appleAudioMimeType(attachment))?.guid : void 0;
 	if (attachments.length === 0) {
 		const text = message.content.text;
 		return {
@@ -820,13 +845,13 @@ const buildUnwrappedContentMessage = async (client, base, message, messageGuidSt
 	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);
+		return buildOrderedPartMessage(client, base, part, messageGuidStr, 0, void 0, voiceAttachmentGuid);
 	}
 	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));
+		items.push(await buildOrderedPartMessage(client, base, part, formatChildId(i, messageGuidStr), i, messageGuidStr, voiceAttachmentGuid));
 	}
 	return {
 		...base,
@@ -1807,6 +1832,25 @@ const toPollDeltaMessages = async (client, pollCache, event, phone) => {
 const isCursorRejectedIMessageError = (error) => error instanceof ValidationError;
 const streamLabel = (kind, phone) => `imessage.${kind}:${phone === "shared" ? phone : sanitizePhone(phone)}`;
 const isEventFromCurrentAccount = (event, phone) => event.isFromMe || phone !== "shared" && event.actor?.address !== void 0 && event.actor.address === phone;
+const streamLog = createLogger("spectrum.imessage.stream");
+const isRetryableMappingError = (error) => typeof error === "object" && error !== null && error.retryable === true;
+const skipUnmappable = async (label, cursor, map) => {
+	try {
+		return await map();
+	} catch (error) {
+		if (isRetryableMappingError(error)) throw error;
+		streamLog.warn("skipping unmappable imessage event", {
+			"spectrum.imessage.stream": label,
+			"spectrum.imessage.cursor": cursor,
+			...errorAttrs(error)
+		}, error instanceof Error ? error : void 0);
+		return {
+			cursor,
+			id: `unmappable:${cursor}`,
+			values: []
+		};
+	}
+};
 const toMessageItem = async (client, event, phone, cursor, onInbound) => {
 	if (event.type === "message.received") {
 		if (event.message.isFromMe) return {
@@ -1814,13 +1858,13 @@ const toMessageItem = async (client, event, phone, cursor, onInbound) => {
 			id: event.message.guid,
 			values: []
 		};
+		const values = await toInboundMessages(client, getMessageCache(client), event, phone);
 		const inboundChatGuid = event.message.chatGuids?.[0];
 		if (inboundChatGuid) onInbound?.(inboundChatGuid);
-		const cache = getMessageCache(client);
 		return {
 			cursor,
 			id: event.message.guid,
-			values: await toInboundMessages(client, cache, event, phone)
+			values
 		};
 	}
 	if (event.type === "message.reactionAdded") {
@@ -1914,8 +1958,8 @@ const messageStream = (client, phone, onInbound, recover) => resumableOrderedStr
 	isCursorRejectedError: isCursorRejectedIMessageError,
 	label: streamLabel("messages", phone),
 	recover,
-	processLive: (event) => toMessageItem(client, event, phone, String(event.sequence), onInbound),
-	processMissed: (event) => event.type === "catchup.complete" ? Promise.resolve(toCatchUpCompleteItem(event)) : toMessageItem(client, event, phone, String(event.sequence), onInbound),
+	processLive: (event) => skipUnmappable(streamLabel("messages", phone), String(event.sequence), () => toMessageItem(client, event, phone, String(event.sequence), onInbound)),
+	processMissed: (event) => event.type === "catchup.complete" ? Promise.resolve(toCatchUpCompleteItem(event)) : skipUnmappable(streamLabel("messages", phone), String(event.sequence), () => toMessageItem(client, event, phone, String(event.sequence), onInbound)),
 	subscribeLive: (cursor) => withClose(client.messages.subscribeEvents(), cursor)
 });
 const pollStream = (client, pollCache, phone, recover) => resumableOrderedStream({
@@ -1923,8 +1967,8 @@ const pollStream = (client, pollCache, phone, recover) => resumableOrderedStream
 	isCursorRejectedError: isCursorRejectedIMessageError,
 	label: streamLabel("polls", phone),
 	recover,
-	processLive: (event) => toPollItem(client, pollCache, event, phone, String(event.sequence)),
-	processMissed: (event) => event.type === "catchup.complete" ? Promise.resolve(toCatchUpCompleteItem(event)) : toPollItem(client, pollCache, event, phone, String(event.sequence)),
+	processLive: (event) => skipUnmappable(streamLabel("polls", phone), String(event.sequence), () => toPollItem(client, pollCache, event, phone, String(event.sequence))),
+	processMissed: (event) => event.type === "catchup.complete" ? Promise.resolve(toCatchUpCompleteItem(event)) : skipUnmappable(streamLabel("polls", phone), String(event.sequence), () => toPollItem(client, pollCache, event, phone, String(event.sequence))),
 	subscribeLive: (cursor) => withClose(client.polls.subscribeEvents(), cursor)
 });
 const groupStream = (client, phone, recover) => resumableOrderedStream({
@@ -1932,8 +1976,8 @@ const groupStream = (client, phone, recover) => resumableOrderedStream({
 	isCursorRejectedError: isCursorRejectedIMessageError,
 	label: streamLabel("groups", phone),
 	recover,
-	processLive: (event) => toGroupItem(client, event, phone, String(event.sequence)),
-	processMissed: (event) => event.type === "catchup.complete" ? Promise.resolve(toCatchUpCompleteItem(event)) : toGroupItem(client, event, phone, String(event.sequence)),
+	processLive: (event) => skipUnmappable(streamLabel("groups", phone), String(event.sequence), () => toGroupItem(client, event, phone, String(event.sequence))),
+	processMissed: (event) => event.type === "catchup.complete" ? Promise.resolve(toCatchUpCompleteItem(event)) : skipUnmappable(streamLabel("groups", phone), String(event.sequence), () => toGroupItem(client, event, phone, String(event.sequence))),
 	subscribeLive: (cursor) => withClose(client.groups.subscribeEvents(), cursor)
 });
 const clientStream = (client, pollCache, phone, includeGroupEvents, onInbound, recover) => {

package/package.json

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