@matter/general 0.16.7 → 0.16.8-alpha.0-20260125-38e62bc3e

package/dist/esm/util/DataReadQueue.js

@@ -7,8 +7,9 @@
  */
 import { Duration } from "#time/Duration.js";
 import { Minutes } from "#time/TimeUnit.js";
-import { MatterFlowError } from "../MatterError.js";
+import { AbortedError, MatterFlowError } from "../MatterError.js";
 import { Time } from "../time/Time.js";
+import { Abort } from "./Abort.js";
 import { asError } from "./Error.js";
 import { createPromise } from "./Promises.js";
 import { EndOfStreamError, NoResponseTimeoutError } from "./Streams.js";
@@ -16,7 +17,7 @@ class DataReadQueue {
   #queue = new Array();
   #pendingRead;
   #closed = false;
-  async read(timeout = Minutes.one) {
+  async read({ timeout = Minutes.one, abort } = {}) {
     const { promise, resolver, rejecter } = createPromise();
     if (this.#closed) throw new EndOfStreamError();
     const data = this.#queue.shift();
@@ -37,20 +38,34 @@ class DataReadQueue {
         )
       ).start()
     };
+    let localAbort;
     try {
+      if (abort) {
+        localAbort = new Abort({
+          abort,
+          handler: (reason) => {
+            this.#clearPendingRead();
+            rejecter(reason);
+          }
+        });
+      }
       return await promise;
     } catch (e) {
+      if (e instanceof AbortedError) {
+        throw e;
+      }
       const error = asError(e);
       error.stack = new Error().stack;
       throw error;
+    } finally {
+      localAbort?.close();
     }
   }
   write(data) {
     if (this.#closed) throw new EndOfStreamError();
-    if (this.#pendingRead !== void 0) {
-      this.#pendingRead.timeoutTimer?.stop();
-      const pendingRead = this.#pendingRead;
-      this.#pendingRead = void 0;
+    const pendingRead = this.#pendingRead;
+    this.#clearPendingRead();
+    if (pendingRead) {
       pendingRead.resolver(data);
       return;
     }
@@ -66,6 +81,13 @@ class DataReadQueue {
     this.#pendingRead.timeoutTimer?.stop();
     this.#pendingRead.rejecter(new EndOfStreamError());
   }
+  #clearPendingRead() {
+    if (this.#pendingRead === void 0) {
+      return;
+    }
+    this.#pendingRead.timeoutTimer?.stop();
+    this.#pendingRead = void 0;
+  }
 }
 export {
   DataReadQueue

package/dist/esm/util/DataReadQueue.js.map

@@ -1,6 +1,6 @@
 {
   "version": 3,
   "sources": ["../../../src/util/DataReadQueue.ts"],
-  "mappings": "AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAQA,SAAS,gBAAgB;AACzB,SAAS,eAAe;AACxB,SAAS,uBAAuB;AAChC,SAAS,YAAmB;AAC5B,SAAS,eAAe;AACxB,SAAS,qBAAqB;AAC9B,SAAS,kBAAkB,8BAA8B;AAElD,MAAM,cAAiB;AAAA,EACjB,SAAS,IAAI,MAAS;AAAA,EAC/B;AAAA,EACA,UAAU;AAAA,EAEV,MAAM,KAAK,UAAU,QAAQ,KAAiB;AAC1C,UAAM,EAAE,SAAS,UAAU,SAAS,IAAI,cAAiB;AACzD,QAAI,KAAK,QAAS,OAAM,IAAI,iBAAiB;AAC7C,UAAM,OAAO,KAAK,OAAO,MAAM;AAC/B,QAAI,SAAS,QAAW;AACpB,aAAO;AAAA,IACX;AACA,QAAI,KAAK,iBAAiB,OAAW,OAAM,IAAI,gBAAgB,oCAAoC;AACnG,SAAK,eAAe;AAAA,MAChB;AAAA,MACA;AAAA,MACA,cAAc,KAAK;AAAA,QAAS;AAAA,QAAiB;AAAA,QAAS,MAClD;AAAA,UACI,IAAI;AAAA,YACA,oDAAoD,SAAS,OAAO,OAAO,CAAC;AAAA,UAChF;AAAA,QACJ;AAAA,MACJ,EAAE,MAAM;AAAA,IACZ;AAEA,QAAI;AACA,aAAO,MAAM;AAAA,IACjB,SAAS,GAAG;AAER,YAAM,QAAQ,QAAQ,CAAC;AACvB,YAAM,QAAQ,IAAI,MAAM,EAAE;AAC1B,YAAM;AAAA,IACV;AAAA,EACJ;AAAA,EAEA,MAAM,MAAS;AACX,QAAI,KAAK,QAAS,OAAM,IAAI,iBAAiB;AAC7C,QAAI,KAAK,iBAAiB,QAAW;AACjC,WAAK,aAAa,cAAc,KAAK;AACrC,YAAM,cAAc,KAAK;AACzB,WAAK,eAAe;AACpB,kBAAY,SAAS,IAAI;AACzB;AAAA,IACJ;AACA,SAAK,OAAO,KAAK,IAAI;AAAA,EACzB;AAAA,EAEA,IAAI,OAAO;AACP,WAAO,KAAK,OAAO;AAAA,EACvB;AAAA,EAEA,QAAQ;AACJ,QAAI,KAAK,QAAS;AAClB,SAAK,UAAU;AACf,QAAI,KAAK,iBAAiB,OAAW;AACrC,SAAK,aAAa,cAAc,KAAK;AACrC,SAAK,aAAa,SAAS,IAAI,iBAAiB,CAAC;AAAA,EACrD;AACJ;",
+  "mappings": "AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAQA,SAAS,gBAAgB;AACzB,SAAS,eAAe;AACxB,SAAS,cAAc,uBAAuB;AAC9C,SAAS,YAAmB;AAC5B,SAAS,aAAa;AACtB,SAAS,eAAe;AACxB,SAAS,qBAAqB;AAC9B,SAAS,kBAAkB,8BAA8B;AAElD,MAAM,cAAiB;AAAA,EACjB,SAAS,IAAI,MAAS;AAAA,EAC/B;AAAA,EACA,UAAU;AAAA,EAEV,MAAM,KAAK,EAAE,UAAU,QAAQ,KAAK,MAAM,IAAiD,CAAC,GAAe;AACvG,UAAM,EAAE,SAAS,UAAU,SAAS,IAAI,cAAiB;AACzD,QAAI,KAAK,QAAS,OAAM,IAAI,iBAAiB;AAC7C,UAAM,OAAO,KAAK,OAAO,MAAM;AAC/B,QAAI,SAAS,QAAW;AACpB,aAAO;AAAA,IACX;AACA,QAAI,KAAK,iBAAiB,OAAW,OAAM,IAAI,gBAAgB,oCAAoC;AACnG,SAAK,eAAe;AAAA,MAChB;AAAA,MACA;AAAA,MACA,cAAc,KAAK;AAAA,QAAS;AAAA,QAAiB;AAAA,QAAS,MAClD;AAAA,UACI,IAAI;AAAA,YACA,oDAAoD,SAAS,OAAO,OAAO,CAAC;AAAA,UAChF;AAAA,QACJ;AAAA,MACJ,EAAE,MAAM;AAAA,IACZ;AAEA,QAAI;AACJ,QAAI;AACA,UAAI,OAAO;AACP,qBAAa,IAAI,MAAM;AAAA,UACnB;AAAA,UAEA,SAAS,YAAU;AACf,iBAAK,kBAAkB;AACvB,qBAAS,MAAM;AAAA,UACnB;AAAA,QACJ,CAAC;AAAA,MACL;AAEA,aAAO,MAAM;AAAA,IACjB,SAAS,GAAG;AACR,UAAI,aAAa,cAAc;AAC3B,cAAM;AAAA,MACV;AAGA,YAAM,QAAQ,QAAQ,CAAC;AACvB,YAAM,QAAQ,IAAI,MAAM,EAAE;AAC1B,YAAM;AAAA,IACV,UAAE;AACE,kBAAY,MAAM;AAAA,IACtB;AAAA,EACJ;AAAA,EAEA,MAAM,MAAS;AACX,QAAI,KAAK,QAAS,OAAM,IAAI,iBAAiB;AAC7C,UAAM,cAAc,KAAK;AACzB,SAAK,kBAAkB;AACvB,QAAI,aAAa;AACb,kBAAY,SAAS,IAAI;AACzB;AAAA,IACJ;AACA,SAAK,OAAO,KAAK,IAAI;AAAA,EACzB;AAAA,EAEA,IAAI,OAAO;AACP,WAAO,KAAK,OAAO;AAAA,EACvB;AAAA,EAEA,QAAQ;AACJ,QAAI,KAAK,QAAS;AAClB,SAAK,UAAU;AACf,QAAI,KAAK,iBAAiB,OAAW;AACrC,SAAK,aAAa,cAAc,KAAK;AACrC,SAAK,aAAa,SAAS,IAAI,iBAAiB,CAAC;AAAA,EACrD;AAAA,EAEA,oBAAoB;AAChB,QAAI,KAAK,iBAAiB,QAAW;AACjC;AAAA,IACJ;AAEA,SAAK,aAAa,cAAc,KAAK;AACrC,SAAK,eAAe;AAAA,EACxB;AACJ;",
   "names": []
 }

package/dist/esm/util/Semaphore.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"Semaphore.d.ts","sourceRoot":"","sources":["../../../src/util/Semaphore.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAGH,OAAO,EAAE,QAAQ,EAAE,MAAM,mBAAmB,CAAC;AAI7C,OAAO,EAAE,KAAK,EAAE,MAAM,YAAY,CAAC;AAKnC;;GAEG;AACH,MAAM,WAAW,QAAS,SAAQ,UAAU;IACxC;;;OAGG;IACH,KAAK,IAAI,IAAI,CAAC;CACjB;AAED;;;;;GAKG;AACH,qBAAa,SAAS;;gBAYN,KAAK,EAAE,MAAM,EAAE,WAAW,SAAI,EAAE,KAAK,WAAU;IAO3D;;;;;;;;;;OAUG;IACG,UAAU,CAAC,KAAK,CAAC,EAAE,KAAK,CAAC,MAAM,GAAG,OAAO,CAAC,QAAQ,CAAC;IAsIzD;;OAEG;IACH,KAAK,IAAI,IAAI;IASb;;OAEG;IACH,IAAI,KAAK,WAER;IAED;;OAEG;IACH,IAAI,OAAO,WAEV;IAED;;OAEG;IACH,KAAK,IAAI,IAAI;CAMhB"}
+{"version":3,"file":"Semaphore.d.ts","sourceRoot":"","sources":["../../../src/util/Semaphore.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAGH,OAAO,EAAE,QAAQ,EAAE,MAAM,mBAAmB,CAAC;AAI7C,OAAO,EAAE,KAAK,EAAE,MAAM,YAAY,CAAC;AAKnC;;GAEG;AACH,MAAM,WAAW,QAAS,SAAQ,UAAU;IACxC;;;OAGG;IACH,KAAK,IAAI,IAAI,CAAC;CACjB;AAED;;;;;GAKG;AACH,qBAAa,SAAS;;gBAYN,KAAK,EAAE,MAAM,EAAE,WAAW,SAAI,EAAE,KAAK,WAAU;IAO3D;;;;;;;;;;OAUG;IACG,UAAU,CAAC,KAAK,CAAC,EAAE,KAAK,CAAC,MAAM,GAAG,OAAO,CAAC,QAAQ,CAAC;IAuIzD;;OAEG;IACH,KAAK,IAAI,IAAI;IASb;;OAEG;IACH,IAAI,KAAK,WAER;IAED;;OAEG;IACH,IAAI,OAAO,WAEV;IAED;;OAEG;IACH,KAAK,IAAI,IAAI;CAMhB"}

package/dist/esm/util/Semaphore.js

@@ -48,7 +48,7 @@ var __callDispose = (stack, error, hasError) => {
  * Copyright 2022-2026 Matter.js Authors
  * SPDX-License-Identifier: Apache-2.0
  */
-import { AbortedError } from "#MatterError.js";
+import { AbortedError, ClosedError } from "#MatterError.js";
 import { Time } from "#time/Time.js";
 import { Instant } from "#time/TimeUnit.js";
 import { Logger } from "../log/Logger.js";
@@ -85,7 +85,7 @@ class Semaphore {
     var _stack = [];
     try {
       if (this.#closed) {
-        throw new AbortedError("Queue is closed");
+        throw new ClosedError("Queue is closed");
       }
       if (abort) {
         const signal = "signal" in abort ? abort.signal : abort;
@@ -111,8 +111,8 @@ class Semaphore {
             this.#queue.length
           );
         }
-        const reason = combinedAbort.reason;
-        throw reason instanceof AbortedError ? reason : new AbortedError();
+        combinedAbort.throwIfAborted();
+        throw new AbortedError("Aborted without reason");
       }
       return result;
     } catch (_) {
@@ -185,7 +185,7 @@ class Semaphore {
    */
   clear() {
     if (this.#queue.length > 0) {
-      this.#abort.abort(new AbortedError("Queue cleared"));
+      this.#abort.abort(new ClosedError("Queue cleared"));
       this.#abort = new Abort();
     }
     this.#queue.length = 0;
@@ -207,7 +207,7 @@ class Semaphore {
    */
   close() {
     this.#closed = true;
-    this.#abort.abort(new AbortedError("Queue is closed"));
+    this.#abort.abort(new ClosedError("Queue is closed"));
     this.clear();
     this.#delayTimer.stop();
   }

package/dist/esm/util/Semaphore.js.map

@@ -1,6 +1,6 @@
 {
   "version": 3,
   "sources": ["../../../src/util/Semaphore.ts"],
-  "mappings": "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",
+  "mappings": "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",
   "names": []
 }

package/dist/esm/util/index.d.ts

@@ -5,6 +5,7 @@
  */
 export * from "./Abort.js";
 export * from "./Array.js";
+export * from "./AsyncIterator.js";
 export * from "./Boot.js";
 export * from "./Bytes.js";
 export * from "./Cache.js";

package/dist/esm/util/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/util/index.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,cAAc,YAAY,CAAC;AAC3B,cAAc,YAAY,CAAC;AAC3B,cAAc,WAAW,CAAC;AAC1B,cAAc,YAAY,CAAC;AAC3B,cAAc,YAAY,CAAC;AAC3B,cAAc,iBAAiB,CAAC;AAChC,cAAc,mBAAmB,CAAC;AAClC,cAAc,iBAAiB,CAAC;AAChC,cAAc,oBAAoB,CAAC;AACnC,cAAc,iBAAiB,CAAC;AAChC,cAAc,gBAAgB,CAAC;AAC/B,cAAc,eAAe,CAAC;AAC9B,cAAc,gBAAgB,CAAC;AAC/B,cAAc,cAAc,CAAC;AAC7B,cAAc,YAAY,CAAC;AAC3B,cAAc,oBAAoB,CAAC;AACnC,cAAc,eAAe,CAAC;AAC9B,cAAc,qBAAqB,CAAC;AACpC,cAAc,aAAa,CAAC;AAC5B,cAAc,WAAW,CAAC;AAC1B,cAAc,sBAAsB,CAAC;AACrC,cAAc,SAAS,CAAC;AACxB,cAAc,gBAAgB,CAAC;AAC/B,cAAc,eAAe,CAAC;AAC9B,cAAc,UAAU,CAAC;AACzB,cAAc,gBAAgB,CAAC;AAC/B,cAAc,gBAAgB,CAAC;AAC/B,cAAc,YAAY,CAAC;AAC3B,cAAc,mBAAmB,CAAC;AAClC,cAAc,aAAa,CAAC;AAC5B,cAAc,iBAAiB,CAAC;AAChC,cAAc,eAAe,CAAC;AAC9B,cAAc,gBAAgB,CAAC;AAC/B,cAAc,gBAAgB,CAAC;AAC/B,cAAc,gBAAgB,CAAC;AAC/B,cAAc,UAAU,CAAC;AACzB,cAAc,gBAAgB,CAAC;AAC/B,cAAc,cAAc,CAAC;AAC7B,cAAc,aAAa,CAAC;AAC5B,cAAc,WAAW,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/util/index.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,cAAc,YAAY,CAAC;AAC3B,cAAc,YAAY,CAAC;AAC3B,cAAc,oBAAoB,CAAC;AACnC,cAAc,WAAW,CAAC;AAC1B,cAAc,YAAY,CAAC;AAC3B,cAAc,YAAY,CAAC;AAC3B,cAAc,iBAAiB,CAAC;AAChC,cAAc,mBAAmB,CAAC;AAClC,cAAc,iBAAiB,CAAC;AAChC,cAAc,oBAAoB,CAAC;AACnC,cAAc,iBAAiB,CAAC;AAChC,cAAc,gBAAgB,CAAC;AAC/B,cAAc,eAAe,CAAC;AAC9B,cAAc,gBAAgB,CAAC;AAC/B,cAAc,cAAc,CAAC;AAC7B,cAAc,YAAY,CAAC;AAC3B,cAAc,oBAAoB,CAAC;AACnC,cAAc,eAAe,CAAC;AAC9B,cAAc,qBAAqB,CAAC;AACpC,cAAc,aAAa,CAAC;AAC5B,cAAc,WAAW,CAAC;AAC1B,cAAc,sBAAsB,CAAC;AACrC,cAAc,SAAS,CAAC;AACxB,cAAc,gBAAgB,CAAC;AAC/B,cAAc,eAAe,CAAC;AAC9B,cAAc,UAAU,CAAC;AACzB,cAAc,gBAAgB,CAAC;AAC/B,cAAc,gBAAgB,CAAC;AAC/B,cAAc,YAAY,CAAC;AAC3B,cAAc,mBAAmB,CAAC;AAClC,cAAc,aAAa,CAAC;AAC5B,cAAc,iBAAiB,CAAC;AAChC,cAAc,eAAe,CAAC;AAC9B,cAAc,gBAAgB,CAAC;AAC/B,cAAc,gBAAgB,CAAC;AAC/B,cAAc,gBAAgB,CAAC;AAC/B,cAAc,UAAU,CAAC;AACzB,cAAc,gBAAgB,CAAC;AAC/B,cAAc,cAAc,CAAC;AAC7B,cAAc,aAAa,CAAC;AAC5B,cAAc,WAAW,CAAC"}

package/dist/esm/util/index.js

@@ -5,6 +5,7 @@
  */
 export * from "./Abort.js";
 export * from "./Array.js";
+export * from "./AsyncIterator.js";
 export * from "./Boot.js";
 export * from "./Bytes.js";
 export * from "./Cache.js";

package/dist/esm/util/index.js.map

@@ -1,6 +1,6 @@
 {
   "version": 3,
   "sources": ["../../../src/util/index.ts"],
-  "mappings": "AAAA;AAAA;AAAA;AAAA;AAAA;AAMA,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;",
+  "mappings": "AAAA;AAAA;AAAA;AAAA;AAAA;AAMA,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;",
   "names": []
 }

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@matter/general",
-    "version": "0.16.7",
+    "version": "0.16.8-alpha.0-20260125-38e62bc3e",
     "description": "Non-Matter support for Matter.js",
     "keywords": [
         "iot",
@@ -36,7 +36,7 @@
         "@noble/curves": "^2.0.1"
     },
     "devDependencies": {
-        "@matter/testing": "0.16.7"
+        "@matter/testing": "0.16.8-alpha.0-20260125-38e62bc3e"
     },
     "files": [
         "dist/**/*",

package/src/MatterError.ts

@@ -100,6 +100,30 @@ export class MatterError extends Error {
         }
     }
 
+    /**
+     * Replace the message in an error.
+     *
+     * In addition to setting the message, updates the message in the stack.
+     */
+    static replaceMessage(error: Error, message: string) {
+        const oldMessage = error.message;
+        error.message = message;
+
+        const stack = error.stack?.split("\n");
+        const messagePos = stack?.findIndex(line => {
+            if (line.startsWith("Error: ")) {
+                line = line.slice(7);
+            }
+            if (line === oldMessage) {
+                return true;
+            }
+        });
+        if (messagePos !== undefined && messagePos !== -1) {
+            stack![messagePos] = message;
+            error.stack = stack!.join("\n");
+        }
+    }
+
     /**
      * The fallback formatter factory.  This produces a limited plaintext formatter.
      */
@@ -291,10 +315,10 @@ export class TimeoutError extends MatterError {
 }
 
 /**
- * Thrown on abort when there is not an underlying error.
+ * Thrown as the primary cause when an {@link AbortController} aborts.
  */
 export class AbortedError extends CanceledError {
-    constructor(message = "This operation was aborted", options?: ErrorOptions) {
+    constructor(message = "Operation aborted", options?: ErrorOptions) {
         super(message, options);
     }
 
@@ -320,6 +344,11 @@ export class AbortedError extends CanceledError {
     }
 }
 
+/**
+ * Thrown when an operation can't complete because a resource is closed.
+ */
+export class ClosedError extends CanceledError {}
+
 /**
  * Node.js-style object inspection.
  *

package/src/environment/SharedEnvironmentServices.ts

@@ -85,8 +85,8 @@ export class SharedEnvironmentServices implements ServiceProvider {
     /**
      * Load an environmental service asynchronously and register this instance as a consumer.
      *
-     * Waits for the service's construction promise to resolve if present, then tracks
-     * the service for lifecycle management.
+     * Waits for the service's construction promise to resolve if present, then tracks the service for lifecycle
+     * management.
      */
     async load<T extends Environmental.Service>(type: Environmental.Factory<T>): Promise<T> {
         this.#assertClosed();

package/src/storage/StringifyTools.ts

@@ -15,7 +15,8 @@ type SupportedStorageBaseTypes = string | number | boolean | bigint | Bytes;
 
 /** Supported combined types to stringify the data for the storage that can be used as values. */
 type SupportedComplexStorageTypes =
-    | Array<SupportedStorageBaseTypes | SupportedComplexStorageTypes> // Arrays
+    | (SupportedStorageBaseTypes | SupportedComplexStorageTypes)[] // Arrays
+    | readonly (SupportedStorageBaseTypes | SupportedComplexStorageTypes)[] // Arrays
     | { [key: string]: SupportedStorageBaseTypes | SupportedComplexStorageTypes | null | undefined } // Objects
     | Array<[SupportedStorageBaseTypes, SupportedStorageBaseTypes | SupportedComplexStorageTypes | null | undefined]> // Map style arrays
     | Map<SupportedStorageBaseTypes, SupportedStorageBaseTypes | SupportedComplexStorageTypes>

package/src/util/Abort.ts

@@ -23,13 +23,15 @@ import { SafePromise } from "./Promises.js";
  * Optionally will register for abort with an outer {@link AbortController} and/or add a timeout.  You must abort or
  * invoke {@link close} if you use either of these options.
  */
-export class Abort extends Callable<[reason?: Error]> implements AbortController, AbortSignal, PromiseLike<Error> {
+export class Abort
+    extends Callable<[reason?: string | Error]>
+    implements AbortController, AbortSignal, PromiseLike<Error>
+{
     // The native controller implementation
     #controller: AbortController;
 
     // Optional abort chaining
-    #dependents?: AbortSignal[];
-    #listener?: (reason: any) => void;
+    #unregisterDependencies?: () => void;
 
     // Optional PromiseLike behavior
     #aborted?: Promise<Error>;
@@ -38,49 +40,106 @@ export class Abort extends Callable<[reason?: Error]> implements AbortController
     // Optional timeout
     #timeout?: Timer;
 
-    constructor({ abort, timeout, handler }: Abort.Options = {}) {
-        super(() => this.abort());
+    constructor({ abort: aborts, timeout, handler, timeoutHandler }: Abort.Options = {}) {
+        const abort = (reason?: Error | string) => {
+            if (typeof reason === "string") {
+                reason = new AbortedError(reason);
+            }
+            this.abort(reason);
+        };
+
+        super(abort);
 
         this.#controller = new AbortController();
 
+        const throwIfAborted = this.#controller.signal.throwIfAborted.bind(this.#controller.signal);
+        this.#controller.signal.throwIfAborted = () => {
+            try {
+                throwIfAborted();
+            } catch (e) {
+                const error = new AbortedError();
+
+                // Remove stack lines for this abort logic
+                error.stack = error.stack
+                    ?.split("\n")
+                    .filter(line => !line.match(/\.throwIfAborted/))
+                    .join("\n");
+
+                error.cause = e;
+                throw error;
+            }
+        };
+
         const self = (reason?: any) => {
             this.abort(reason);
         };
         Object.setPrototypeOf(self, Object.getPrototypeOf(this));
 
-        if (abort && !Array.isArray(abort)) {
-            abort = [abort];
+        if (aborts && !Array.isArray(aborts)) {
+            aborts = [aborts];
         }
 
-        if (abort?.length) {
-            const dependents = abort.map(abort => ("signal" in abort ? abort.signal : abort));
-            this.#dependents = dependents;
+        if (aborts?.length) {
+            const dependencies = aborts.map(abort => abort && ("signal" in abort ? abort.signal : abort));
+
+            for (const dependency of dependencies) {
+                if (dependency === undefined) {
+                    continue;
+                }
 
-            this.#listener = (reason: any) => this.abort(reason);
-            for (const dependent of dependents) {
-                dependent.addEventListener("abort", this.#listener);
+                const listener = () => this.abort(asError(dependency.reason));
+                dependency.addEventListener("abort", listener);
+                const unregisterPrev = this.#unregisterDependencies;
+                this.#unregisterDependencies = () => {
+                    unregisterPrev?.();
+                    dependency.removeEventListener("abort", listener);
+                };
             }
         }
 
-        if (timeout) {
-            this.#timeout = Time.getPeriodicTimer("subtask timeout", timeout, () => {
-                if (this.aborted) {
-                    return;
-                }
+        if (timeout !== undefined) {
+            if (timeoutHandler) {
+                const original = timeoutHandler;
+                timeoutHandler = () => {
+                    try {
+                        original.call(this);
+                    } catch (e) {
+                        this.abort(asError(e));
+                    }
+                };
+            } else {
+                timeoutHandler = () => this.abort(new TimeoutError());
+            }
 
-                this.abort(new TimeoutError());
-            });
+            if (timeout <= 0) {
+                timeoutHandler.call(this);
+            } else {
+                this.#timeout = Time.getPeriodicTimer("subtask timeout", timeout, () => {
+                    if (this.aborted) {
+                        return;
+                    }
+
+                    timeoutHandler!.call(this);
+                });
 
-            this.#timeout.start();
+                this.#timeout.start();
+            }
         }
 
         if (handler) {
-            this.addEventListener("abort", () => handler(this.reason));
+            if (this.aborted) {
+                handler.call(this, this.reason);
+            } else {
+                this.addEventListener("abort", () => handler.call(this, this.reason));
+            }
         }
     }
 
-    abort(reason?: any) {
-        this.#controller.abort(reason ?? new AbortedError());
+    abort(reason?: Error | string) {
+        if (typeof reason === "string") {
+            reason = new AbortedError(reason);
+        }
+        this.#controller.abort(reason ?? new AbortedError("Operation aborted with no reason given"));
     }
 
     get signal() {
@@ -100,7 +159,7 @@ export class Abort extends Callable<[reason?: Error]> implements AbortController
      * Race with throw on abort.
      */
     async attempt<T>(...promises: Array<T | PromiseLike<T>>) {
-        return Abort.attempt(this, ...promises);
+        return await Abort.attempt(this, ...promises);
     }
 
     /**
@@ -111,11 +170,7 @@ export class Abort extends Callable<[reason?: Error]> implements AbortController
      */
     close() {
         this.#timeout?.stop();
-        if (this.#listener && this.#dependents) {
-            for (const dependent of this.#dependents) {
-                dependent.removeEventListener("abort", this.#listener);
-            }
-        }
+        this.#unregisterDependencies?.();
     }
 
     [Symbol.dispose]() {
@@ -208,7 +263,7 @@ export namespace Abort {
          *
          * This functions similarly to {@link AbortSignal.any} but has additional protection against memory leaks.
          */
-        abort?: Signal | Signal[];
+        abort?: Signal | (Signal | undefined)[];
 
         /**
          * An abort timeout.
@@ -220,7 +275,14 @@ export namespace Abort {
         /**
          * Adds a default abort handler.
          */
-        handler?: (reason?: Error) => void;
+        handler?: (this: Abort, reason?: Error) => void;
+
+        /**
+         * Replaces the default timeout handler.
+         *
+         * The default implementation aborts with {@link TimeoutError}.
+         */
+        timeoutHandler?: (this: Abort) => void;
     }
 
     /**

package/src/util/AsyncIterator.ts

@@ -0,0 +1,70 @@
+/**
+ * @license
+ * Copyright 2022-2026 Matter.js Authors
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+/**
+ * Utilities for working with async iterators.
+ */
+export namespace AsyncIterator {
+    /**
+     * Merge multiple async iterators, yielding results as they become available from any iterator.
+     *
+     * Results are yielded in the order they resolve, not the order of iterators.
+     * Errors from individual iterators are collected and thrown as an aggregate error after all iterators complete.
+     *
+     * @param iterators The async iterables to merge
+     * @param errorMessage Optional message for the aggregate error if any iterators fail
+     */
+    export async function* merge<T>(
+        iterators: AsyncIterable<T>[],
+        errorMessage = "One or more async iterators failed",
+    ): AsyncGenerator<T> {
+        const asyncIterators = iterators.map(iter => iter[Symbol.asyncIterator]());
+        const pending = new Map<number, Promise<{ index: number; result: IteratorResult<T> }>>();
+        const errors: Error[] = [];
+
+        // Initialize with first .next() call for each iterator
+        for (let i = 0; i < asyncIterators.length; i++) {
+            pending.set(
+                i,
+                asyncIterators[i].next().then(
+                    result => ({ index: i, result }),
+                    error => {
+                        // On error, mark as done and collect error
+                        errors.push(error);
+                        return { index: i, result: { done: true, value: undefined } as IteratorResult<T> };
+                    },
+                ),
+            );
+        }
+
+        while (pending.size > 0) {
+            // Race all pending promises
+            const { index, result } = await Promise.race(pending.values());
+
+            if (result.done) {
+                pending.delete(index);
+            } else {
+                yield result.value;
+                // Queue next value from this iterator
+                pending.set(
+                    index,
+                    asyncIterators[index].next().then(
+                        result => ({ index, result }),
+                        error => {
+                            errors.push(error);
+                            return { index, result: { done: true, value: undefined } as IteratorResult<T> };
+                        },
+                    ),
+                );
+            }
+        }
+
+        // After all iterators complete, throw aggregate error if any occurred
+        if (errors.length > 0) {
+            throw new AggregateError(errors, errorMessage);
+        }
+    }
+}

package/src/util/DataReadQueue.ts

@@ -8,8 +8,9 @@
 
 import { Duration } from "#time/Duration.js";
 import { Minutes } from "#time/TimeUnit.js";
-import { MatterFlowError } from "../MatterError.js";
+import { AbortedError, MatterFlowError } from "../MatterError.js";
 import { Time, Timer } from "../time/Time.js";
+import { Abort } from "./Abort.js";
 import { asError } from "./Error.js";
 import { createPromise } from "./Promises.js";
 import { EndOfStreamError, NoResponseTimeoutError } from "./Streams.js";
@@ -19,7 +20,7 @@ export class DataReadQueue<T> {
     #pendingRead?: { resolver: (data: T) => void; rejecter: (reason: any) => void; timeoutTimer?: Timer };
     #closed = false;
 
-    async read(timeout = Minutes.one): Promise<T> {
+    async read({ timeout = Minutes.one, abort }: { timeout?: Duration; abort?: AbortSignal } = {}): Promise<T> {
         const { promise, resolver, rejecter } = createPromise<T>();
         if (this.#closed) throw new EndOfStreamError();
         const data = this.#queue.shift();
@@ -39,22 +40,39 @@ export class DataReadQueue<T> {
             ).start(),
         };
 
+        let localAbort: Abort | undefined;
         try {
+            if (abort) {
+                localAbort = new Abort({
+                    abort,
+
+                    handler: reason => {
+                        this.#clearPendingRead();
+                        rejecter(reason);
+                    },
+                });
+            }
+
             return await promise;
         } catch (e) {
+            if (e instanceof AbortedError) {
+                throw e;
+            }
+
             // The stack trace where we created the error is useless (either a timer or close()) so replace here
             const error = asError(e);
             error.stack = new Error().stack;
             throw error;
+        } finally {
+            localAbort?.close();
         }
     }
 
     write(data: T) {
         if (this.#closed) throw new EndOfStreamError();
-        if (this.#pendingRead !== undefined) {
-            this.#pendingRead.timeoutTimer?.stop();
-            const pendingRead = this.#pendingRead;
-            this.#pendingRead = undefined;
+        const pendingRead = this.#pendingRead;
+        this.#clearPendingRead();
+        if (pendingRead) {
             pendingRead.resolver(data);
             return;
         }
@@ -72,4 +90,13 @@ export class DataReadQueue<T> {
         this.#pendingRead.timeoutTimer?.stop();
         this.#pendingRead.rejecter(new EndOfStreamError());
     }
+
+    #clearPendingRead() {
+        if (this.#pendingRead === undefined) {
+            return;
+        }
+
+        this.#pendingRead.timeoutTimer?.stop();
+        this.#pendingRead = undefined;
+    }
 }