spectrum-ts 0.6.0 → 0.6.1

package/dist/providers/imessage/index.js

@@ -107,21 +107,14 @@ async function disposeCloudAuth(clients) {
 
 // src/providers/imessage/local.ts
 import { createReadStream } from "fs";
-import { mkdtemp, rm, writeFile } from "fs/promises";
+import { mkdtemp, readFile, rm, writeFile } from "fs/promises";
 import { tmpdir } from "os";
 import { basename, join } from "path";
 import { Readable } from "stream";
-import {
-  readAttachmentBytes
-} from "@photon-ai/imessage-kit";
-var toSendResult = (result) => {
-  if (!result.message?.id) {
-    throw new Error(
-      "iMessage local send did not return a message id \u2014 track upstream in @photon-ai/imessage-kit"
-    );
-  }
-  return { id: result.message.id, timestamp: result.sentAt };
-};
+var synthSendResult = () => ({
+  id: crypto.randomUUID(),
+  timestamp: /* @__PURE__ */ new Date()
+});
 var DEFAULT_ATTACHMENT_NAME = "attachment";
 var VCARD_MIME_TYPES = /* @__PURE__ */ new Set([
   "text/vcard",
@@ -137,17 +130,21 @@ var isVCardAttachment = (mimeType, fileName) => {
   }
   return Boolean(fileName?.toLowerCase().endsWith(".vcf"));
 };
-var toSpace = (message) => ({
-  id: message.chatId,
-  type: message.chatKind === "group" ? "group" : "dm"
-});
+var readLocalAttachment = async (att) => {
+  if (!att.localPath) {
+    throw new Error(
+      `iMessage attachment ${att.id} has no local file available on disk`
+    );
+  }
+  return readFile(att.localPath);
+};
 var toAttachmentContent = (att) => {
   const { localPath } = att;
   return asAttachment({
     name: att.fileName ?? DEFAULT_ATTACHMENT_NAME,
     mimeType: att.mimeType,
     size: att.sizeBytes,
-    read: () => readAttachmentBytes(att),
+    read: () => readLocalAttachment(att),
     stream: localPath ? async () => Readable.toWeb(
       createReadStream(localPath)
     ) : void 0
@@ -155,16 +152,23 @@ var toAttachmentContent = (att) => {
 };
 var toVCardContent = async (att) => {
   try {
-    const buf = await readAttachmentBytes(att);
+    const buf = await readLocalAttachment(att);
     return asContact(fromVCard(buf.toString("utf8")));
   } catch {
     return toAttachmentContent(att);
   }
 };
 var toMessages = async (message) => {
+  const { chatId, chatKind } = message;
+  if (!chatId || chatKind === "unknown") {
+    return [];
+  }
+  if (message.reaction !== null || message.kind !== "text" || message.retractedAt !== null) {
+    return [];
+  }
   const base = {
     sender: { id: message.participant ?? "" },
-    space: toSpace(message),
+    space: { id: chatId, type: chatKind === "group" ? "group" : "dm" },
     timestamp: message.createdAt
   };
   if (message.attachments.length > 0) {
@@ -186,19 +190,23 @@ var toMessages = async (message) => {
 };
 var messages = (client) => stream((emit, end) => {
   let lastPromise = Promise.resolve();
-  client.startWatching({
-    onMessage: (message) => {
-      if (message.isFromMe) {
-        return;
-      }
+  const startPromise = client.startWatching({
+    onIncomingMessage: (message) => {
       lastPromise = lastPromise.then(() => toMessages(message)).then((ms) => {
         for (const m of ms) {
           emit(m);
         }
-      }).catch((error) => end(error));
-    }
-  });
-  return () => client.stopWatching();
+      }).catch(end);
+    },
+    onError: end
+  }).catch(end);
+  return async () => {
+    await startPromise.catch(() => {
+    });
+    await client.stopWatching();
+    await lastPromise.catch(() => {
+    });
+  };
 });
 var vcardFileName = (content) => {
   const base = content.name?.formatted ?? content.user?.id ?? "contact";
@@ -210,7 +218,7 @@ var sendTempFile = async (client, spaceId, name, data) => {
   const tmp = join(dir, safeName);
   await writeFile(tmp, data);
   try {
-    return await client.send(spaceId, { attachments: [tmp] });
+    await client.send({ to: spaceId, attachments: [tmp] });
   } finally {
     await rm(dir, { recursive: true, force: true }).catch(() => {
     });
@@ -219,21 +227,20 @@ var sendTempFile = async (client, spaceId, name, data) => {
 var send = async (client, spaceId, content) => {
   switch (content.type) {
     case "text":
-      return toSendResult(await client.send(spaceId, content.text));
+      await client.send({ to: spaceId, text: content.text });
+      return synthSendResult();
     case "attachment":
-      return toSendResult(
-        await sendTempFile(client, spaceId, content.name, await content.read())
-      );
+      await sendTempFile(client, spaceId, content.name, await content.read());
+      return synthSendResult();
     case "contact": {
       const vcf = await toVCard(content);
-      return toSendResult(
-        await sendTempFile(
-          client,
-          spaceId,
-          vcardFileName(content),
-          Buffer.from(vcf, "utf8")
-        )
+      await sendTempFile(
+        client,
+        spaceId,
+        vcardFileName(content),
+        Buffer.from(vcf, "utf8")
       );
+      return synthSendResult();
     }
     default:
       throw new Error(
@@ -251,7 +258,7 @@ import {
 
 // src/utils/audio.ts
 import { spawn } from "child_process";
-import { mkdtemp as mkdtemp2, readFile, rm as rm2, writeFile as writeFile2 } from "fs/promises";
+import { mkdtemp as mkdtemp2, readFile as readFile2, rm as rm2, writeFile as writeFile2 } from "fs/promises";
 import { tmpdir as tmpdir2 } from "os";
 import { join as join2 } from "path";
 var M4A_BRANDS = /* @__PURE__ */ new Set([
@@ -358,7 +365,7 @@ var transcodeToM4a = async (buffer) => {
     if (code !== 0) {
       throw new Error(`ffmpeg conversion failed (exit ${code}): ${stderr}`);
     }
-    const out = await readFile(outPath);
+    const out = await readFile2(outPath);
     return { buffer: out, duration: parseDuration(stderr) };
   } finally {
     await rm2(dir, { recursive: true, force: true }).catch(() => {
@@ -373,7 +380,7 @@ var ensureM4a = async (buffer, mimeType) => {
 };
 
 // src/providers/imessage/remote.ts
-var toSendResult2 = (receipt) => ({
+var toSendResult = (receipt) => ({
   id: receipt.guid,
   timestamp: /* @__PURE__ */ new Date()
 });
@@ -495,14 +502,14 @@ var send2 = async (clients, spaceId, content) => {
   const chat = chatGuid(spaceId);
   switch (content.type) {
     case "text":
-      return toSendResult2(await remote.messages.send(chat, content.text));
+      return toSendResult(await remote.messages.send(chat, content.text));
     case "attachment": {
       const attachment = await remote.attachments.upload({
         data: await content.read(),
         fileName: content.name,
         mimeType: content.mimeType
       });
-      return toSendResult2(
+      return toSendResult(
         await remote.messages.send(chat, "", {
           attachment: attachment.guid
         })
@@ -510,7 +517,7 @@ var send2 = async (clients, spaceId, content) => {
     }
     case "contact": {
       const attachment = await sendContactAttachment(remote, content);
-      return toSendResult2(await remote.messages.send(chat, "", { attachment }));
+      return toSendResult(await remote.messages.send(chat, "", { attachment }));
     }
     case "voice": {
       const { buffer } = await ensureM4a(
@@ -522,7 +529,7 @@ var send2 = async (clients, spaceId, content) => {
         fileName: content.name ?? "voice.m4a",
         mimeType: "audio/x-m4a"
       });
-      return toSendResult2(
+      return toSendResult(
         await remote.messages.send(chat, "", {
           attachment: attachment.guid,
           audioMessage: true
@@ -542,7 +549,7 @@ var replyToMessage = async (clients, spaceId, msgId, content) => {
   const replyTo = messageGuid(msgId);
   switch (content.type) {
     case "text":
-      return toSendResult2(
+      return toSendResult(
         await remote.messages.send(chat, content.text, { replyTo })
       );
     case "attachment": {
@@ -551,7 +558,7 @@ var replyToMessage = async (clients, spaceId, msgId, content) => {
         fileName: content.name,
         mimeType: content.mimeType
       });
-      return toSendResult2(
+      return toSendResult(
         await remote.messages.send(chat, "", {
           attachment: attachment.guid,
           replyTo
@@ -560,7 +567,7 @@ var replyToMessage = async (clients, spaceId, msgId, content) => {
     }
     case "contact": {
       const attachment = await sendContactAttachment(remote, content);
-      return toSendResult2(
+      return toSendResult(
         await remote.messages.send(chat, "", { attachment, replyTo })
       );
     }
@@ -574,7 +581,7 @@ var replyToMessage = async (clients, spaceId, msgId, content) => {
         fileName: content.name ?? "voice.m4a",
         mimeType: "audio/x-m4a"
       });
-      return toSendResult2(
+      return toSendResult(
         await remote.messages.send(chat, "", {
           attachment: attachment.guid,
           audioMessage: true,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "spectrum-ts",
-  "version": "0.6.0",
+  "version": "0.6.1",
   "type": "module",
   "main": "./dist/index.js",
   "module": "./dist/index.js",
@@ -20,7 +20,7 @@
   },
   "dependencies": {
     "@photon-ai/advanced-imessage": "^0.4.3",
-    "@photon-ai/imessage-kit": "^3.0.0-rc.2",
+    "@photon-ai/imessage-kit": "^3.0.0",
     "@photon-ai/whatsapp-business": "^0.1.1",
     "@repeaterjs/repeater": "^3.0.6",
     "better-grpc": "^0.3.2",