@basmilius/apple-common 0.6.4 → 0.6.6

package/dist/index.js

@@ -281,8 +281,10 @@ class Connection extends EventEmitter {
     return new Promise((resolve, reject) => {
       this.#state = "connecting";
       this.#connectPromise = { resolve, reject };
+      this.#socket?.removeAllListeners();
       this.#socket = undefined;
       this.#socket = new Socket;
+      this.#socket.setNoDelay(true);
       this.#socket.setTimeout(SOCKET_TIMEOUT);
       this.#socket.on("close", this.#onClose.bind(this));
       this.#socket.on("connect", this.#onConnect.bind(this));
@@ -318,6 +320,10 @@ class Connection extends EventEmitter {
       this.#connectPromise = undefined;
       return;
     }
+    if (this.#retryTimeout) {
+      clearTimeout(this.#retryTimeout);
+      this.#retryTimeout = undefined;
+    }
     this.#retryAttempt++;
     this.#context.logger.net(`Retry attempt ${this.#retryAttempt} / ${this.#retryAttempts} in ${this.#retryInterval}ms...`);
     const { resolve, reject } = this.#connectPromise ?? NOOP_PROMISE_HANDLER;
@@ -787,8 +793,9 @@ class TimingServer {
   constructor() {
     this.#logger = new Logger("timing-server");
     this.#socket = createSocket("udp4");
-    this.#socket.on("error", (err) => this.#onError(err));
-    this.#socket.on("message", (data, info2) => this.#onMessage(data, info2));
+    this.#socket.on("connect", this.#onConnect.bind(this));
+    this.#socket.on("error", this.#onError.bind(this));
+    this.#socket.on("message", this.#onMessage.bind(this));
   }
   async close() {
     this.#socket.close();
@@ -800,6 +807,10 @@ class TimingServer {
       this.#socket.bind(0, resolve);
     });
   }
+  #onConnect() {
+    this.#socket.setRecvBufferSize(16384);
+    this.#socket.setSendBufferSize(16384);
+  }
   async#onError(err) {
     this.#logger.error("Timing server error", err);
   }
@@ -875,13 +886,13 @@ function randomInt64() {
   return randomBytes(8).readBigUint64LE(0);
 }
 function uint16ToBE(value) {
-  const buffer = Buffer.alloc(2);
+  const buffer = Buffer.allocUnsafe(2);
   buffer.writeUInt16BE(value, 0);
   return buffer;
 }
 function uint53ToLE(value) {
   const [upper, lower] = splitUInt53(value);
-  const buffer = Buffer.alloc(8);
+  const buffer = Buffer.allocUnsafe(8);
   buffer.writeUInt32LE(lower, 0);
   buffer.writeUInt32LE(upper, 4);
   return buffer;

package/package.json

@@ -1,7 +1,7 @@
 {
     "name": "@basmilius/apple-common",
     "description": "Common features shared across various apple protocol packages.",
-    "version": "0.6.4",
+    "version": "0.6.6",
     "type": "module",
     "license": "MIT",
     "author": {
@@ -39,8 +39,8 @@
         }
     },
     "dependencies": {
-        "@basmilius/apple-encoding": "0.6.4",
-        "@basmilius/apple-encryption": "0.6.4",
+        "@basmilius/apple-encoding": "0.6.6",
+        "@basmilius/apple-encryption": "0.6.6",
         "fast-srp-hap": "^2.0.4",
         "node-dns-sd": "^1.0.1"
     },