@spectrum-ts/imessage 11.0.0 → 11.1.0

package/dist/index.js

@@ -1807,6 +1807,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 +1833,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 +1933,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 +1942,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 +1951,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.1.0",
   "description": "iMessage provider for spectrum-ts.",
   "repository": {
     "type": "git",