@basmilius/apple-companion-link 0.3.2 → 0.4.0

package/dist/index.js

@@ -189,33 +189,36 @@ import { randomInt } from "node:crypto";
 import { Chacha20, ENCRYPTION, EncryptionAwareConnection } from "@basmilius/apple-common";
 import { OPack } from "@basmilius/apple-encoding";
 var HEADER_SIZE = 4;
+var PAIRING_QUEUE_IDENTIFIER = -1;
 
 class Stream extends EncryptionAwareConnection {
   get #encryptionState() {
     return this[ENCRYPTION];
   }
-  #queue = {};
+  #queue = new Map;
   #buffer = Buffer.alloc(0);
   #xid;
   constructor(context, address, port) {
     super(context, address, port);
     this.#xid = randomInt(0, 2 ** 16);
+    this.on("close", this.#onClose.bind(this));
     this.on("data", this.#onData.bind(this));
+    this.on("error", this.#onError.bind(this));
   }
   async exchange(type, obj) {
     const _x = this.#xid;
     return new Promise((resolve, reject) => {
       if (PairFrameTypes.includes(type)) {
-        this.#queue[-1] = resolve;
+        this.#queue.set(PAIRING_QUEUE_IDENTIFIER, [resolve, reject]);
       } else {
-        this.#queue[_x] = resolve;
+        this.#queue.set(_x, [resolve, reject]);
       }
       this.send(type, obj).catch(reject);
     });
   }
   async send(type, obj) {
     const _x = this.#xid++;
-    obj._x ??= OPack.sizedInt(_x, 8);
+    obj._x ??= OPack.sizedInteger(_x, 8);
     let payload = Buffer.from(OPack.encode(obj));
     let payloadLength = payload.byteLength;
     if (this.isEncrypted && payloadLength > 0) {
@@ -241,6 +244,13 @@ class Stream extends EncryptionAwareConnection {
       this.emit("error", err);
     }
   }
+  #onClose() {
+    const error = new Error("Connection closed while waiting for response");
+    for (const [, reject] of this.#queue.values()) {
+      reject(error);
+    }
+    this.#queue.clear();
+  }
   async#onData(data) {
     this.#buffer = Buffer.concat([this.#buffer, data]);
     try {
@@ -267,6 +277,12 @@ class Stream extends EncryptionAwareConnection {
       this.emit("error", err);
     }
   }
+  #onError(err) {
+    for (const [, reject] of this.#queue.values()) {
+      reject(err);
+    }
+    this.#queue.clear();
+  }
   #decrypt(data) {
     const header = data.subarray(0, 4);
     const payloadLength = header.readUintBE(1, 3);
@@ -287,25 +303,24 @@ class Stream extends EncryptionAwareConnection {
     payload = OPack.decode(payload);
     this.context.logger.raw("[companion-link]", "Decoded OPACK", { header, payload });
     if ("_x" in payload) {
-      const _x = payload._x;
-      if (_x in this.#queue) {
-        const resolve = this.#queue[_x] ?? null;
-        resolve?.([header, payload]);
-        delete this.#queue[_x];
+      const _x = Number(payload["_x"]);
+      if (this.#queue.has(_x)) {
+        const [resolve] = this.#queue.get(_x);
+        resolve([header, payload]);
+        this.#queue.delete(_x);
       } else if ("_i" in payload) {
         this.emit(payload["_i"], payload["_c"]);
       } else {
         const content = payload["_c"];
-        const keys = Object.keys(content).map((k) => k.substring(0, -3));
+        const keys = Object.keys(content).map((k) => k.slice(0, -3));
         for (const key of keys) {
           this.emit(key, content[key]);
         }
       }
-    } else if (this.#queue[-1]) {
-      const _x = -1;
-      const resolve = this.#queue[_x] ?? null;
-      resolve?.([header, payload]);
-      delete this.#queue[_x];
+    } else if (this.#queue.has(PAIRING_QUEUE_IDENTIFIER)) {
+      const [resolve] = this.#queue.get(PAIRING_QUEUE_IDENTIFIER);
+      resolve([header, payload]);
+      this.#queue.delete(PAIRING_QUEUE_IDENTIFIER);
     } else {
       this.context.logger.warn("[companion-link]", "No handler for message", [header, payload]);
     }
@@ -601,10 +616,10 @@ class Protocol {
   }
 }
 function objectOrFail(obj) {
-  if (typeof obj === "object") {
+  if (obj !== null && typeof obj === "object") {
     return obj;
   }
-  throw new Error("Expected an object.");
+  throw new TypeError("Expected an object.");
 }
 export {
   convertAttentionState,

package/package.json

@@ -1,7 +1,7 @@
 {
     "name": "@basmilius/apple-companion-link",
     "description": "Implementation of Apple's Companion Link in Node.js.",
-    "version": "0.3.2",
+    "version": "0.4.0",
     "type": "module",
     "license": "MIT",
     "author": {
@@ -40,8 +40,8 @@
         }
     },
     "dependencies": {
-        "@basmilius/apple-common": "0.3.2",
-        "@basmilius/apple-encoding": "0.3.2"
+        "@basmilius/apple-common": "0.4.0",
+        "@basmilius/apple-encoding": "0.4.0"
     },
     "devDependencies": {
         "@basmilius/tools": "^2.23.0",