@matter/general 0.16.7 → 0.16.8-alpha.0-20260123-dff2cae52

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (47) hide show
  1. package/dist/cjs/MatterError.d.ts +12 -1
  2. package/dist/cjs/MatterError.d.ts.map +1 -1
  3. package/dist/cjs/MatterError.js +26 -1
  4. package/dist/cjs/MatterError.js.map +1 -1
  5. package/dist/cjs/environment/SharedEnvironmentServices.d.ts +2 -2
  6. package/dist/cjs/environment/SharedEnvironmentServices.js +2 -2
  7. package/dist/cjs/storage/StringifyTools.d.ts +1 -1
  8. package/dist/cjs/storage/StringifyTools.d.ts.map +1 -1
  9. package/dist/cjs/storage/StringifyTools.js.map +1 -1
  10. package/dist/cjs/util/Abort.d.ts +11 -5
  11. package/dist/cjs/util/Abort.d.ts.map +1 -1
  12. package/dist/cjs/util/Abort.js +71 -29
  13. package/dist/cjs/util/Abort.js.map +1 -1
  14. package/dist/cjs/util/DataReadQueue.d.ts +4 -1
  15. package/dist/cjs/util/DataReadQueue.d.ts.map +1 -1
  16. package/dist/cjs/util/DataReadQueue.js +27 -5
  17. package/dist/cjs/util/DataReadQueue.js.map +1 -1
  18. package/dist/cjs/util/Semaphore.d.ts.map +1 -1
  19. package/dist/cjs/util/Semaphore.js +5 -5
  20. package/dist/cjs/util/Semaphore.js.map +1 -1
  21. package/dist/esm/MatterError.d.ts +12 -1
  22. package/dist/esm/MatterError.d.ts.map +1 -1
  23. package/dist/esm/MatterError.js +26 -1
  24. package/dist/esm/MatterError.js.map +1 -1
  25. package/dist/esm/environment/SharedEnvironmentServices.d.ts +2 -2
  26. package/dist/esm/environment/SharedEnvironmentServices.js +2 -2
  27. package/dist/esm/storage/StringifyTools.d.ts +1 -1
  28. package/dist/esm/storage/StringifyTools.d.ts.map +1 -1
  29. package/dist/esm/storage/StringifyTools.js.map +1 -1
  30. package/dist/esm/util/Abort.d.ts +11 -5
  31. package/dist/esm/util/Abort.d.ts.map +1 -1
  32. package/dist/esm/util/Abort.js +71 -29
  33. package/dist/esm/util/Abort.js.map +1 -1
  34. package/dist/esm/util/DataReadQueue.d.ts +4 -1
  35. package/dist/esm/util/DataReadQueue.d.ts.map +1 -1
  36. package/dist/esm/util/DataReadQueue.js +28 -6
  37. package/dist/esm/util/DataReadQueue.js.map +1 -1
  38. package/dist/esm/util/Semaphore.d.ts.map +1 -1
  39. package/dist/esm/util/Semaphore.js +6 -6
  40. package/dist/esm/util/Semaphore.js.map +1 -1
  41. package/package.json +2 -2
  42. package/src/MatterError.ts +31 -2
  43. package/src/environment/SharedEnvironmentServices.ts +2 -2
  44. package/src/storage/StringifyTools.ts +2 -1
  45. package/src/util/Abort.ts +94 -32
  46. package/src/util/DataReadQueue.ts +33 -6
  47. package/src/util/Semaphore.ts +8 -7
@@ -79,6 +79,28 @@ class MatterError extends Error {
79
79
  throw error;
80
80
  }
81
81
  }
82
+ /**
83
+ * Replace the message in an error.
84
+ *
85
+ * In addition to setting the message, updates the message in the stack.
86
+ */
87
+ static replaceMessage(error, message) {
88
+ const oldMessage = error.message;
89
+ error.message = message;
90
+ const stack = error.stack?.split("\n");
91
+ const messagePos = stack?.findIndex((line) => {
92
+ if (line.startsWith("Error: ")) {
93
+ line = line.slice(7);
94
+ }
95
+ if (line === oldMessage) {
96
+ return true;
97
+ }
98
+ });
99
+ if (messagePos !== void 0 && messagePos !== -1) {
100
+ stack[messagePos] = message;
101
+ error.stack = stack.join("\n");
102
+ }
103
+ }
82
104
  /**
83
105
  * The fallback formatter factory. This produces a limited plaintext formatter.
84
106
  */
@@ -205,7 +227,7 @@ class TimeoutError extends MatterError {
205
227
  }
206
228
  }
207
229
  class AbortedError extends CanceledError {
208
- constructor(message = "This operation was aborted", options) {
230
+ constructor(message = "Operation aborted", options) {
209
231
  super(message, options);
210
232
  }
211
233
  /**
@@ -227,6 +249,8 @@ class AbortedError extends CanceledError {
227
249
  return super.accept(cause);
228
250
  }
229
251
  }
252
+ class ClosedError extends CanceledError {
253
+ }
230
254
  function inspector(depth, options) {
231
255
  const formatterFor = MatterError.formatterFor;
232
256
  if (typeof formatterFor !== "function") {
@@ -249,6 +273,7 @@ Object.defineProperty(MatterAggregateError.prototype, "format", {
249
273
  export {
250
274
  AbortedError,
251
275
  CanceledError,
276
+ ClosedError,
252
277
  ImplementationError,
253
278
  ImportError,
254
279
  InternalError,
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "version": 3,
3
3
  "sources": ["../../src/MatterError.ts"],
4
- "mappings": "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",
4
+ "mappings": "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",
5
5
  "names": ["value", "indents"]
6
6
  }
@@ -46,8 +46,8 @@ export declare class SharedEnvironmentServices implements ServiceProvider {
46
46
  /**
47
47
  * Load an environmental service asynchronously and register this instance as a consumer.
48
48
  *
49
- * Waits for the service's construction promise to resolve if present, then tracks
50
- * the service for lifecycle management.
49
+ * Waits for the service's construction promise to resolve if present, then tracks the service for lifecycle
50
+ * management.
51
51
  */
52
52
  load<T extends Environmental.Service>(type: Environmental.Factory<T>): Promise<T>;
53
53
  /**
@@ -62,8 +62,8 @@ class SharedEnvironmentServices {
62
62
  /**
63
63
  * Load an environmental service asynchronously and register this instance as a consumer.
64
64
  *
65
- * Waits for the service's construction promise to resolve if present, then tracks
66
- * the service for lifecycle management.
65
+ * Waits for the service's construction promise to resolve if present, then tracks the service for lifecycle
66
+ * management.
67
67
  */
68
68
  async load(type) {
69
69
  this.#assertClosed();
@@ -8,7 +8,7 @@ import { Bytes } from "../util/Bytes.js";
8
8
  /** Supported base types to stringify the data for the storage that can be used as keys and also values. */
9
9
  type SupportedStorageBaseTypes = string | number | boolean | bigint | Bytes;
10
10
  /** Supported combined types to stringify the data for the storage that can be used as values. */
11
- type SupportedComplexStorageTypes = Array<SupportedStorageBaseTypes | SupportedComplexStorageTypes> | {
11
+ type SupportedComplexStorageTypes = (SupportedStorageBaseTypes | SupportedComplexStorageTypes)[] | readonly (SupportedStorageBaseTypes | SupportedComplexStorageTypes)[] | {
12
12
  [key: string]: SupportedStorageBaseTypes | SupportedComplexStorageTypes | null | undefined;
13
13
  } | Array<[SupportedStorageBaseTypes, SupportedStorageBaseTypes | SupportedComplexStorageTypes | null | undefined]> | Map<SupportedStorageBaseTypes, SupportedStorageBaseTypes | SupportedComplexStorageTypes> | Duration | null | undefined;
14
14
  export type SupportedStorageTypes = SupportedStorageBaseTypes | SupportedComplexStorageTypes;
@@ -1 +1 @@
1
- {"version":3,"file":"StringifyTools.d.ts","sourceRoot":"","sources":["../../../src/storage/StringifyTools.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,EAAE,QAAQ,EAAE,MAAM,mBAAmB,CAAC;AAG7C,OAAO,EAAE,KAAK,EAAE,MAAM,kBAAkB,CAAC;AAGzC,2GAA2G;AAC3G,KAAK,yBAAyB,GAAG,MAAM,GAAG,MAAM,GAAG,OAAO,GAAG,MAAM,GAAG,KAAK,CAAC;AAE5E,iGAAiG;AACjG,KAAK,4BAA4B,GAC3B,KAAK,CAAC,yBAAyB,GAAG,4BAA4B,CAAC,GAC/D;IAAE,CAAC,GAAG,EAAE,MAAM,GAAG,yBAAyB,GAAG,4BAA4B,GAAG,IAAI,GAAG,SAAS,CAAA;CAAE,GAC9F,KAAK,CAAC,CAAC,yBAAyB,EAAE,yBAAyB,GAAG,4BAA4B,GAAG,IAAI,GAAG,SAAS,CAAC,CAAC,GAC/G,GAAG,CAAC,yBAAyB,EAAE,yBAAyB,GAAG,4BAA4B,CAAC,GACxF,QAAQ,GACR,IAAI,GACJ,SAAS,CAAC;AAEhB,MAAM,MAAM,qBAAqB,GAAG,yBAAyB,GAAG,4BAA4B,CAAC;AAQ7F,wBAAgB,MAAM,CAAC,MAAM,EAAE,qBAAqB,EAAE,MAAM,CAAC,EAAE,MAAM,GAAG,MAAM,CA4B7E;AAED,wBAAgB,QAAQ,CAAC,IAAI,EAAE,MAAM,GAAG,qBAAqB,CAgD5D"}
1
+ {"version":3,"file":"StringifyTools.d.ts","sourceRoot":"","sources":["../../../src/storage/StringifyTools.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,EAAE,QAAQ,EAAE,MAAM,mBAAmB,CAAC;AAG7C,OAAO,EAAE,KAAK,EAAE,MAAM,kBAAkB,CAAC;AAGzC,2GAA2G;AAC3G,KAAK,yBAAyB,GAAG,MAAM,GAAG,MAAM,GAAG,OAAO,GAAG,MAAM,GAAG,KAAK,CAAC;AAE5E,iGAAiG;AACjG,KAAK,4BAA4B,GAC3B,CAAC,yBAAyB,GAAG,4BAA4B,CAAC,EAAE,GAC5D,SAAS,CAAC,yBAAyB,GAAG,4BAA4B,CAAC,EAAE,GACrE;IAAE,CAAC,GAAG,EAAE,MAAM,GAAG,yBAAyB,GAAG,4BAA4B,GAAG,IAAI,GAAG,SAAS,CAAA;CAAE,GAC9F,KAAK,CAAC,CAAC,yBAAyB,EAAE,yBAAyB,GAAG,4BAA4B,GAAG,IAAI,GAAG,SAAS,CAAC,CAAC,GAC/G,GAAG,CAAC,yBAAyB,EAAE,yBAAyB,GAAG,4BAA4B,CAAC,GACxF,QAAQ,GACR,IAAI,GACJ,SAAS,CAAC;AAEhB,MAAM,MAAM,qBAAqB,GAAG,yBAAyB,GAAG,4BAA4B,CAAC;AAQ7F,wBAAgB,MAAM,CAAC,MAAM,EAAE,qBAAqB,EAAE,MAAM,CAAC,EAAE,MAAM,GAAG,MAAM,CA4B7E;AAED,wBAAgB,QAAQ,CAAC,IAAI,EAAE,MAAM,GAAG,qBAAqB,CAgD5D"}
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "version": 3,
3
3
  "sources": ["../../../src/storage/StringifyTools.ts"],
4
- "mappings": "AAAA;AAAA;AAAA;AAAA;AAAA;AAOA,SAAS,cAAc;AACvB,SAAS,2BAA2B;AACpC,SAAS,aAAa;AACtB,SAAS,gBAAgB;AAkBzB,MAAM,wBAAwB;AAG9B,MAAM,yBAAyB;AAExB,SAAS,OAAO,QAA+B,QAAyB;AAC3E,SAAO,KAAK;AAAA,IACR;AAAA,IACA,CAAC,MAAM,UAAU;AACb,UAAI,UAAU,QAAW;AACrB,eAAO,KAAK,qBAAqB;AAAA,MACrC;AACA,UAAI,OAAO,UAAU,UAAU;AAC3B,eAAO,KAAK,qBAAqB,eAAe,sBAAsB,MAAM,MAAM,SAAS,CAAC;AAAA,MAChG;AACA,UAAI,MAAM,QAAQ,KAAK,GAAG;AACtB,eAAO,KAAK,qBAAqB,mBAAmB,sBAAsB,MAAM,MAAM,MAAM,KAAK,CAAC;AAAA,MACtG;AAEA,UAAI,SAAS,KAAK,KAAK,MAAM,SAAS,YAAY,MAAM,QAAQ,MAAM,IAAI,GAAG;AACzE,eAAO,KAAK,qBAAqB,mBAAmB,sBAAsB,MAAM,MAAM;AAAA,UAClF,WAAW,KAAK,MAAM,IAAI;AAAA,QAC9B,CAAC;AAAA,MACL;AACA,UAAI,iBAAiB,KAAK;AACtB,eAAO,KAAK,qBAAqB,YAAY,sBAAsB,KAAK,KAAK;AAAA,UACzE,OAAO,MAAM,KAAK,MAAM,QAAQ,CAAC,CAAC;AAAA,QACtC,CAAC;AAAA,MACL;AACA,aAAO;AAAA,IACX;AAAA,IACA;AAAA,EACJ;AACJ;AAEO,SAAS,SAAS,MAAqC;AAC1D,SAAO,KAAK,MAAM,MAAM,CAAC,MAAM,UAAU;AACrC,QAAI,OAAO,UAAU,YAAY,MAAM,WAAW,KAAK,qBAAqB,KAAK,KAAK,MAAM,SAAS,GAAG,GAAG;AACvG,YAAM,OAAO,KAAK,MAAM,KAAK;AAC7B,YAAM,SAAS,KAAK,qBAAqB;AACzC,cAAQ,QAAQ;AAAA,QACZ,KAAK;AACD,iBAAO;AAAA,QACX,KAAK;AACD,iBAAO,OAAO,KAAK,sBAAsB,CAAC;AAAA,QAC9C,KAAK;AACD,iBAAO,MAAM,QAAQ,KAAK,sBAAsB,CAAC;AAAA,QACrD,KAAK;AACD,iBAAO,IAAI;AAAA,YACP,SAAS,KAAK,sBAAsB,CAAC;AAAA,UAIzC;AAAA,QACJ,KAAK;AACD,iBAAO,OAAO,IAAI;AAAA;AAAA,QAGtB,KAAK;AAAA,QACL,KAAK;AAAA,QACL,KAAK;AAAA,QACL,KAAK;AAAA,QACL,KAAK;AAAA,QACL,KAAK;AAAA,QACL,KAAK;AAAA,QACL,KAAK;AAAA,QACL,KAAK;AAAA,QACL,KAAK;AAAA,QACL,KAAK;AAAA,QACL,KAAK;AAAA,QACL,KAAK;AACD,iBAAO,KAAK,sBAAsB;AAAA,QACtC,KAAK;AAAA,QACL,KAAK;AAAA,QACL,KAAK;AACD,iBAAO,OAAO,KAAK,sBAAsB,CAAC;AAAA,QAE9C;AACI,gBAAM,IAAI,oBAAoB,wBAAwB,MAAM,EAAE;AAAA,MACtE;AAAA,IACJ;AACA,WAAO;AAAA,EACX,CAAC;AACL;",
4
+ "mappings": "AAAA;AAAA;AAAA;AAAA;AAAA;AAOA,SAAS,cAAc;AACvB,SAAS,2BAA2B;AACpC,SAAS,aAAa;AACtB,SAAS,gBAAgB;AAmBzB,MAAM,wBAAwB;AAG9B,MAAM,yBAAyB;AAExB,SAAS,OAAO,QAA+B,QAAyB;AAC3E,SAAO,KAAK;AAAA,IACR;AAAA,IACA,CAAC,MAAM,UAAU;AACb,UAAI,UAAU,QAAW;AACrB,eAAO,KAAK,qBAAqB;AAAA,MACrC;AACA,UAAI,OAAO,UAAU,UAAU;AAC3B,eAAO,KAAK,qBAAqB,eAAe,sBAAsB,MAAM,MAAM,SAAS,CAAC;AAAA,MAChG;AACA,UAAI,MAAM,QAAQ,KAAK,GAAG;AACtB,eAAO,KAAK,qBAAqB,mBAAmB,sBAAsB,MAAM,MAAM,MAAM,KAAK,CAAC;AAAA,MACtG;AAEA,UAAI,SAAS,KAAK,KAAK,MAAM,SAAS,YAAY,MAAM,QAAQ,MAAM,IAAI,GAAG;AACzE,eAAO,KAAK,qBAAqB,mBAAmB,sBAAsB,MAAM,MAAM;AAAA,UAClF,WAAW,KAAK,MAAM,IAAI;AAAA,QAC9B,CAAC;AAAA,MACL;AACA,UAAI,iBAAiB,KAAK;AACtB,eAAO,KAAK,qBAAqB,YAAY,sBAAsB,KAAK,KAAK;AAAA,UACzE,OAAO,MAAM,KAAK,MAAM,QAAQ,CAAC,CAAC;AAAA,QACtC,CAAC;AAAA,MACL;AACA,aAAO;AAAA,IACX;AAAA,IACA;AAAA,EACJ;AACJ;AAEO,SAAS,SAAS,MAAqC;AAC1D,SAAO,KAAK,MAAM,MAAM,CAAC,MAAM,UAAU;AACrC,QAAI,OAAO,UAAU,YAAY,MAAM,WAAW,KAAK,qBAAqB,KAAK,KAAK,MAAM,SAAS,GAAG,GAAG;AACvG,YAAM,OAAO,KAAK,MAAM,KAAK;AAC7B,YAAM,SAAS,KAAK,qBAAqB;AACzC,cAAQ,QAAQ;AAAA,QACZ,KAAK;AACD,iBAAO;AAAA,QACX,KAAK;AACD,iBAAO,OAAO,KAAK,sBAAsB,CAAC;AAAA,QAC9C,KAAK;AACD,iBAAO,MAAM,QAAQ,KAAK,sBAAsB,CAAC;AAAA,QACrD,KAAK;AACD,iBAAO,IAAI;AAAA,YACP,SAAS,KAAK,sBAAsB,CAAC;AAAA,UAIzC;AAAA,QACJ,KAAK;AACD,iBAAO,OAAO,IAAI;AAAA;AAAA,QAGtB,KAAK;AAAA,QACL,KAAK;AAAA,QACL,KAAK;AAAA,QACL,KAAK;AAAA,QACL,KAAK;AAAA,QACL,KAAK;AAAA,QACL,KAAK;AAAA,QACL,KAAK;AAAA,QACL,KAAK;AAAA,QACL,KAAK;AAAA,QACL,KAAK;AAAA,QACL,KAAK;AAAA,QACL,KAAK;AACD,iBAAO,KAAK,sBAAsB;AAAA,QACtC,KAAK;AAAA,QACL,KAAK;AAAA,QACL,KAAK;AACD,iBAAO,OAAO,KAAK,sBAAsB,CAAC;AAAA,QAE9C;AACI,gBAAM,IAAI,oBAAoB,wBAAwB,MAAM,EAAE;AAAA,MACtE;AAAA,IACJ;AACA,WAAO;AAAA,EACX,CAAC;AACL;",
5
5
  "names": []
6
6
  }
@@ -17,10 +17,10 @@ import { Callable } from "./Function.js";
17
17
  * Optionally will register for abort with an outer {@link AbortController} and/or add a timeout. You must abort or
18
18
  * invoke {@link close} if you use either of these options.
19
19
  */
20
- export declare class Abort extends Callable<[reason?: Error]> implements AbortController, AbortSignal, PromiseLike<Error> {
20
+ export declare class Abort extends Callable<[reason?: string | Error]> implements AbortController, AbortSignal, PromiseLike<Error> {
21
21
  #private;
22
- constructor({ abort, timeout, handler }?: Abort.Options);
23
- abort(reason?: any): void;
22
+ constructor({ abort: aborts, timeout, handler, timeoutHandler }?: Abort.Options);
23
+ abort(reason?: Error | string): void;
24
24
  get signal(): AbortSignal;
25
25
  /**
26
26
  * Race one or more promises with my abort signal.
@@ -69,7 +69,7 @@ export declare namespace Abort {
69
69
  *
70
70
  * This functions similarly to {@link AbortSignal.any} but has additional protection against memory leaks.
71
71
  */
72
- abort?: Signal | Signal[];
72
+ abort?: Signal | (Signal | undefined)[];
73
73
  /**
74
74
  * An abort timeout.
75
75
  *
@@ -79,7 +79,13 @@ export declare namespace Abort {
79
79
  /**
80
80
  * Adds a default abort handler.
81
81
  */
82
- handler?: (reason?: Error) => void;
82
+ handler?: (this: Abort, reason?: Error) => void;
83
+ /**
84
+ * Replaces the default timeout handler.
85
+ *
86
+ * The default implementation aborts with {@link TimeoutError}.
87
+ */
88
+ timeoutHandler?: (this: Abort) => void;
83
89
  }
84
90
  /**
85
91
  * An entity that may be used to signal abort of an operation.
@@ -1 +1 @@
1
- {"version":3,"file":"Abort.d.ts","sourceRoot":"","sources":["../../../src/util/Abort.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAGH,OAAO,EAAE,QAAQ,EAAE,MAAM,mBAAmB,CAAC;AAG7C,OAAO,EAAE,QAAQ,EAAE,MAAM,eAAe,CAAC;AAGzC;;;;;;;;;;;GAWG;AACH,qBAAa,KAAM,SAAQ,QAAQ,CAAC,CAAC,MAAM,CAAC,EAAE,KAAK,CAAC,CAAE,YAAW,eAAe,EAAE,WAAW,EAAE,WAAW,CAAC,KAAK,CAAC;;gBAejG,EAAE,KAAK,EAAE,OAAO,EAAE,OAAO,EAAE,GAAE,KAAK,CAAC,OAAY;IAyC3D,KAAK,CAAC,MAAM,CAAC,EAAE,GAAG;IAIlB,IAAI,MAAM,gBAET;IAED;;;;OAIG;IACG,IAAI,CAAC,CAAC,EAAE,GAAG,QAAQ,EAAE,KAAK,CAAC,CAAC,GAAG,WAAW,CAAC,CAAC,CAAC,CAAC,GAAG,OAAO,CAAC,OAAO,CAAC,CAAC,CAAC,GAAG,IAAI,CAAC;IAIjF;;OAEG;IACG,OAAO,CAAC,CAAC,EAAE,GAAG,QAAQ,EAAE,KAAK,CAAC,CAAC,GAAG,WAAW,CAAC,CAAC,CAAC,CAAC;IAIvD;;;;;OAKG;IACH,KAAK;IASL,CAAC,MAAM,CAAC,OAAO,CAAC;IAIhB,EAAE,CAAC,SAAS,CAAC,EAAE,OAAO,EAAE,MAAM,CAAC,EAAE,KAAK;IAMtC,IAAI,OAAO,YAEV;IAED,IAAI,OAAO,CAAC,OAAO,EAAE,CAAC,CAAC,IAAI,EAAE,WAAW,EAAE,EAAE,EAAE,KAAK,KAAK,GAAG,CAAC,GAAG,IAAI,EAElE;IAED,IAAI,OAAO,IAJU,CAAC,CAAC,IAAI,EAAE,WAAW,EAAE,EAAE,EAAE,KAAK,KAAK,GAAG,CAAC,GAAG,IAAI,CAMlE;IAED,IAAI,MAAM,UAET;IAED,cAAc;IAId,IAAI,CAAC,QAAQ,GAAG,IAAI,EAAE,QAAQ,GAAG,KAAK,EAClC,WAAW,CAAC,EAAE,CAAC,CAAC,KAAK,EAAE,KAAK,KAAK,QAAQ,GAAG,WAAW,CAAC,QAAQ,CAAC,CAAC,GAAG,IAAI,EACzE,UAAU,CAAC,EAAE,CAAC,CAAC,MAAM,EAAE,GAAG,KAAK,QAAQ,GAAG,WAAW,CAAC,QAAQ,CAAC,CAAC,GAAG,IAAI,GACxE,WAAW,CAAC,QAAQ,GAAG,QAAQ,CAAC;IAQnC,gBAAgB,CAAC,CAAC,SAAS,MAAM,mBAAmB,EAChD,IAAI,EAAE,CAAC,EACP,QAAQ,EAAE,CAAC,IAAI,EAAE,WAAW,EAAE,EAAE,EAAE,mBAAmB,CAAC,CAAC,CAAC,KAAK,GAAG,EAChE,OAAO,CAAC,EAAE,OAAO,GAAG,uBAAuB,GAC5C,IAAI;IACP,gBAAgB,CACZ,IAAI,EAAE,MAAM,EACZ,QAAQ,EAAE,kCAAkC,EAC5C,OAAO,CAAC,EAAE,OAAO,GAAG,uBAAuB,GAC5C,IAAI;IAKP,mBAAmB,CAAC,CAAC,SAAS,MAAM,mBAAmB,EACnD,IAAI,EAAE,CAAC,EACP,QAAQ,EAAE,CAAC,IAAI,EAAE,WAAW,EAAE,EAAE,EAAE,mBAAmB,CAAC,CAAC,CAAC,KAAK,GAAG,EAChE,OAAO,CAAC,EAAE,OAAO,GAAG,oBAAoB,GACzC,IAAI;IACP,mBAAmB,CACf,IAAI,EAAE,MAAM,EACZ,QAAQ,EAAE,kCAAkC,EAC5C,OAAO,CAAC,EAAE,OAAO,GAAG,oBAAoB,GACzC,IAAI;IAKP,aAAa,CAAC,KAAK,EAAE,KAAK;CAG7B;AAED;;GAEG;AACH,yBAAiB,KAAK,CAAC;IACnB;;OAEG;IACH,UAAiB,OAAO;QACpB;;;;;;;WAOG;QACH,KAAK,CAAC,EAAE,MAAM,GAAG,MAAM,EAAE,CAAC;QAE1B;;;;WAIG;QACH,OAAO,CAAC,EAAE,QAAQ,CAAC;QAEnB;;WAEG;QACH,OAAO,CAAC,EAAE,CAAC,MAAM,CAAC,EAAE,KAAK,KAAK,IAAI,CAAC;KACtC;IAED;;OAEG;IACH,KAAY,MAAM,GAAG,eAAe,GAAG,WAAW,CAAC;IAEnD;;OAEG;IACH,SAAgB,EAAE,CAAC,MAAM,EAAE,MAAM,GAAG,SAAS,uBAU5C;IAED;;;;;OAKG;IACH,SAAgB,IAAI,CAAC,CAAC,EAClB,MAAM,EAAE,MAAM,GAAG,SAAS,EAC1B,GAAG,QAAQ,EAAE,KAAK,CAAC,CAAC,GAAG,WAAW,CAAC,CAAC,CAAC,CAAC,GACvC,OAAO,CAAC,OAAO,CAAC,CAAC,CAAC,GAAG,IAAI,CAAC,CAqB5B;IAED;;OAEG;IACH,SAAsB,OAAO,CAAC,CAAC,EAAE,MAAM,EAAE,MAAM,GAAG,SAAS,EAAE,GAAG,QAAQ,EAAE,KAAK,CAAC,CAAC,GAAG,WAAW,CAAC,CAAC,CAAC,CAAC,cAOlG;IAED;;OAEG;IACH,SAAgB,KAAK,CAAC,WAAW,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,GAAG,SAAS,EAAE,QAAQ,EAAE,QAAQ,iBAMvF;IAED;;;;;;;OAOG;IACH,SAAgB,OAAO,CAAC,MAAM,EAAE,MAAM,GAAG,SAAS,EAAE,OAAO,CAAC,EAAE,QAAQ,GAAG,KAAK,CAE7E;IAED;;OAEG;IACH,SAAgB,GAAG,CAAC,GAAG,OAAO,EAAE,CAAC,MAAM,GAAG,SAAS,CAAC,EAAE,SAErD;IAED;;OAEG;IACH,SAAgB,UAAU,CAAC,MAAM,CAAC,EAAE,MAAM,GAAG;QAAE,KAAK,CAAC,EAAE,MAAM,CAAA;KAAE,cAoB9D;CACJ"}
1
+ {"version":3,"file":"Abort.d.ts","sourceRoot":"","sources":["../../../src/util/Abort.ts"],"names":[],"mappings":"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"}
@@ -12,46 +12,92 @@ class Abort extends Callable {
12
12
  // The native controller implementation
13
13
  #controller;
14
14
  // Optional abort chaining
15
- #dependents;
16
- #listener;
15
+ #unregisterDependencies;
17
16
  // Optional PromiseLike behavior
18
17
  #aborted;
19
18
  #resolve;
20
19
  // Optional timeout
21
20
  #timeout;
22
- constructor({ abort, timeout, handler } = {}) {
23
- super(() => this.abort());
21
+ constructor({ abort: aborts, timeout, handler, timeoutHandler } = {}) {
22
+ const abort = (reason) => {
23
+ if (typeof reason === "string") {
24
+ reason = new AbortedError(reason);
25
+ }
26
+ this.abort(reason);
27
+ };
28
+ super(abort);
24
29
  this.#controller = new AbortController();
30
+ const throwIfAborted = this.#controller.signal.throwIfAborted.bind(this.#controller.signal);
31
+ this.#controller.signal.throwIfAborted = () => {
32
+ try {
33
+ throwIfAborted();
34
+ } catch (e) {
35
+ const error = new AbortedError();
36
+ error.stack = error.stack?.split("\n").filter((line) => !line.match(/\.throwIfAborted/)).join("\n");
37
+ error.cause = e;
38
+ throw error;
39
+ }
40
+ };
25
41
  const self = (reason) => {
26
42
  this.abort(reason);
27
43
  };
28
44
  Object.setPrototypeOf(self, Object.getPrototypeOf(this));
29
- if (abort && !Array.isArray(abort)) {
30
- abort = [abort];
31
- }
32
- if (abort?.length) {
33
- const dependents = abort.map((abort2) => "signal" in abort2 ? abort2.signal : abort2);
34
- this.#dependents = dependents;
35
- this.#listener = (reason) => this.abort(reason);
36
- for (const dependent of dependents) {
37
- dependent.addEventListener("abort", this.#listener);
45
+ if (aborts && !Array.isArray(aborts)) {
46
+ aborts = [aborts];
47
+ }
48
+ if (aborts?.length) {
49
+ const dependencies = aborts.map((abort2) => abort2 && ("signal" in abort2 ? abort2.signal : abort2));
50
+ for (const dependency of dependencies) {
51
+ if (dependency === void 0) {
52
+ continue;
53
+ }
54
+ const listener = () => this.abort(asError(dependency.reason));
55
+ dependency.addEventListener("abort", listener);
56
+ const unregisterPrev = this.#unregisterDependencies;
57
+ this.#unregisterDependencies = () => {
58
+ unregisterPrev?.();
59
+ dependency.removeEventListener("abort", listener);
60
+ };
38
61
  }
39
62
  }
40
- if (timeout) {
41
- this.#timeout = Time.getPeriodicTimer("subtask timeout", timeout, () => {
42
- if (this.aborted) {
43
- return;
44
- }
45
- this.abort(new TimeoutError());
46
- });
47
- this.#timeout.start();
63
+ if (timeout !== void 0) {
64
+ if (timeoutHandler) {
65
+ const original = timeoutHandler;
66
+ timeoutHandler = () => {
67
+ try {
68
+ original.call(this);
69
+ } catch (e) {
70
+ this.abort(asError(e));
71
+ }
72
+ };
73
+ } else {
74
+ timeoutHandler = () => this.abort(new TimeoutError());
75
+ }
76
+ if (timeout <= 0) {
77
+ timeoutHandler.call(this);
78
+ } else {
79
+ this.#timeout = Time.getPeriodicTimer("subtask timeout", timeout, () => {
80
+ if (this.aborted) {
81
+ return;
82
+ }
83
+ timeoutHandler.call(this);
84
+ });
85
+ this.#timeout.start();
86
+ }
48
87
  }
49
88
  if (handler) {
50
- this.addEventListener("abort", () => handler(this.reason));
89
+ if (this.aborted) {
90
+ handler.call(this, this.reason);
91
+ } else {
92
+ this.addEventListener("abort", () => handler.call(this, this.reason));
93
+ }
51
94
  }
52
95
  }
53
96
  abort(reason) {
54
- this.#controller.abort(reason ?? new AbortedError());
97
+ if (typeof reason === "string") {
98
+ reason = new AbortedError(reason);
99
+ }
100
+ this.#controller.abort(reason ?? new AbortedError("Operation aborted with no reason given"));
55
101
  }
56
102
  get signal() {
57
103
  return this.#controller.signal;
@@ -68,7 +114,7 @@ class Abort extends Callable {
68
114
  * Race with throw on abort.
69
115
  */
70
116
  async attempt(...promises) {
71
- return Abort.attempt(this, ...promises);
117
+ return await Abort.attempt(this, ...promises);
72
118
  }
73
119
  /**
74
120
  * Free resources.
@@ -78,11 +124,7 @@ class Abort extends Callable {
78
124
  */
79
125
  close() {
80
126
  this.#timeout?.stop();
81
- if (this.#listener && this.#dependents) {
82
- for (const dependent of this.#dependents) {
83
- dependent.removeEventListener("abort", this.#listener);
84
- }
85
- }
127
+ this.#unregisterDependencies?.();
86
128
  }
87
129
  [Symbol.dispose]() {
88
130
  this.close();
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "version": 3,
3
3
  "sources": ["../../../src/util/Abort.ts"],
4
- "mappings": "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",
4
+ "mappings": "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",
5
5
  "names": ["abort", "Abort"]
6
6
  }
@@ -8,7 +8,10 @@
8
8
  import { Duration } from "#time/Duration.js";
9
9
  export declare class DataReadQueue<T> {
10
10
  #private;
11
- read(timeout?: Duration): Promise<T>;
11
+ read({ timeout, abort }?: {
12
+ timeout?: Duration;
13
+ abort?: AbortSignal;
14
+ }): Promise<T>;
12
15
  write(data: T): void;
13
16
  get size(): number;
14
17
  close(): void;
@@ -1 +1 @@
1
- {"version":3,"file":"DataReadQueue.d.ts","sourceRoot":"","sources":["../../../src/util/DataReadQueue.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAEH,OAAO,EAAE,QAAQ,EAAE,MAAM,mBAAmB,CAAC;AAQ7C,qBAAa,aAAa,CAAC,CAAC;;IAKlB,IAAI,CAAC,OAAO,WAAc,GAAG,OAAO,CAAC,CAAC,CAAC;IA8B7C,KAAK,CAAC,IAAI,EAAE,CAAC;IAYb,IAAI,IAAI,WAEP;IAED,KAAK;CAOR"}
1
+ {"version":3,"file":"DataReadQueue.d.ts","sourceRoot":"","sources":["../../../src/util/DataReadQueue.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAEH,OAAO,EAAE,QAAQ,EAAE,MAAM,mBAAmB,CAAC;AAS7C,qBAAa,aAAa,CAAC,CAAC;;IAKlB,IAAI,CAAC,EAAE,OAAqB,EAAE,KAAK,EAAE,GAAE;QAAE,OAAO,CAAC,EAAE,QAAQ,CAAC;QAAC,KAAK,CAAC,EAAE,WAAW,CAAA;KAAO,GAAG,OAAO,CAAC,CAAC,CAAC;IAgD1G,KAAK,CAAC,IAAI,EAAE,CAAC;IAWb,IAAI,IAAI,WAEP;IAED,KAAK;CAgBR"}
@@ -7,8 +7,9 @@
7
7
  */
8
8
  import { Duration } from "#time/Duration.js";
9
9
  import { Minutes } from "#time/TimeUnit.js";
10
- import { MatterFlowError } from "../MatterError.js";
10
+ import { AbortedError, MatterFlowError } from "../MatterError.js";
11
11
  import { Time } from "../time/Time.js";
12
+ import { Abort } from "./Abort.js";
12
13
  import { asError } from "./Error.js";
13
14
  import { createPromise } from "./Promises.js";
14
15
  import { EndOfStreamError, NoResponseTimeoutError } from "./Streams.js";
@@ -16,7 +17,7 @@ class DataReadQueue {
16
17
  #queue = new Array();
17
18
  #pendingRead;
18
19
  #closed = false;
19
- async read(timeout = Minutes.one) {
20
+ async read({ timeout = Minutes.one, abort } = {}) {
20
21
  const { promise, resolver, rejecter } = createPromise();
21
22
  if (this.#closed) throw new EndOfStreamError();
22
23
  const data = this.#queue.shift();
@@ -37,20 +38,34 @@ class DataReadQueue {
37
38
  )
38
39
  ).start()
39
40
  };
41
+ let localAbort;
40
42
  try {
43
+ if (abort) {
44
+ localAbort = new Abort({
45
+ abort,
46
+ handler: (reason) => {
47
+ this.#clearPendingRead();
48
+ rejecter(reason);
49
+ }
50
+ });
51
+ }
41
52
  return await promise;
42
53
  } catch (e) {
54
+ if (e instanceof AbortedError) {
55
+ throw e;
56
+ }
43
57
  const error = asError(e);
44
58
  error.stack = new Error().stack;
45
59
  throw error;
60
+ } finally {
61
+ localAbort?.close();
46
62
  }
47
63
  }
48
64
  write(data) {
49
65
  if (this.#closed) throw new EndOfStreamError();
50
- if (this.#pendingRead !== void 0) {
51
- this.#pendingRead.timeoutTimer?.stop();
52
- const pendingRead = this.#pendingRead;
53
- this.#pendingRead = void 0;
66
+ const pendingRead = this.#pendingRead;
67
+ this.#clearPendingRead();
68
+ if (pendingRead) {
54
69
  pendingRead.resolver(data);
55
70
  return;
56
71
  }
@@ -66,6 +81,13 @@ class DataReadQueue {
66
81
  this.#pendingRead.timeoutTimer?.stop();
67
82
  this.#pendingRead.rejecter(new EndOfStreamError());
68
83
  }
84
+ #clearPendingRead() {
85
+ if (this.#pendingRead === void 0) {
86
+ return;
87
+ }
88
+ this.#pendingRead.timeoutTimer?.stop();
89
+ this.#pendingRead = void 0;
90
+ }
69
91
  }
70
92
  export {
71
93
  DataReadQueue
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "version": 3,
3
3
  "sources": ["../../../src/util/DataReadQueue.ts"],
4
- "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;",
4
+ "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;",
5
5
  "names": []
6
6
  }
@@ -1 +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"}
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;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"}
@@ -48,7 +48,7 @@ var __callDispose = (stack, error, hasError) => {
48
48
  * Copyright 2022-2026 Matter.js Authors
49
49
  * SPDX-License-Identifier: Apache-2.0
50
50
  */
51
- import { AbortedError } from "#MatterError.js";
51
+ import { AbortedError, ClosedError } from "#MatterError.js";
52
52
  import { Time } from "#time/Time.js";
53
53
  import { Instant } from "#time/TimeUnit.js";
54
54
  import { Logger } from "../log/Logger.js";
@@ -85,7 +85,7 @@ class Semaphore {
85
85
  var _stack = [];
86
86
  try {
87
87
  if (this.#closed) {
88
- throw new AbortedError("Queue is closed");
88
+ throw new ClosedError("Queue is closed");
89
89
  }
90
90
  if (abort) {
91
91
  const signal = "signal" in abort ? abort.signal : abort;
@@ -111,8 +111,8 @@ class Semaphore {
111
111
  this.#queue.length
112
112
  );
113
113
  }
114
- const reason = combinedAbort.reason;
115
- throw reason instanceof AbortedError ? reason : new AbortedError();
114
+ combinedAbort.throwIfAborted();
115
+ throw new AbortedError("Aborted without reason");
116
116
  }
117
117
  return result;
118
118
  } catch (_) {
@@ -185,7 +185,7 @@ class Semaphore {
185
185
  */
186
186
  clear() {
187
187
  if (this.#queue.length > 0) {
188
- this.#abort.abort(new AbortedError("Queue cleared"));
188
+ this.#abort.abort(new ClosedError("Queue cleared"));
189
189
  this.#abort = new Abort();
190
190
  }
191
191
  this.#queue.length = 0;
@@ -207,7 +207,7 @@ class Semaphore {
207
207
  */
208
208
  close() {
209
209
  this.#closed = true;
210
- this.#abort.abort(new AbortedError("Queue is closed"));
210
+ this.#abort.abort(new ClosedError("Queue is closed"));
211
211
  this.clear();
212
212
  this.#delayTimer.stop();
213
213
  }
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "version": 3,
3
3
  "sources": ["../../../src/util/Semaphore.ts"],
4
- "mappings": "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",
4
+ "mappings": "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",
5
5
  "names": []
6
6
  }
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@matter/general",
3
- "version": "0.16.7",
3
+ "version": "0.16.8-alpha.0-20260123-dff2cae52",
4
4
  "description": "Non-Matter support for Matter.js",
5
5
  "keywords": [
6
6
  "iot",
@@ -36,7 +36,7 @@
36
36
  "@noble/curves": "^2.0.1"
37
37
  },
38
38
  "devDependencies": {
39
- "@matter/testing": "0.16.7"
39
+ "@matter/testing": "0.16.8-alpha.0-20260123-dff2cae52"
40
40
  },
41
41
  "files": [
42
42
  "dist/**/*",
@@ -100,6 +100,30 @@ export class MatterError extends Error {
100
100
  }
101
101
  }
102
102
 
103
+ /**
104
+ * Replace the message in an error.
105
+ *
106
+ * In addition to setting the message, updates the message in the stack.
107
+ */
108
+ static replaceMessage(error: Error, message: string) {
109
+ const oldMessage = error.message;
110
+ error.message = message;
111
+
112
+ const stack = error.stack?.split("\n");
113
+ const messagePos = stack?.findIndex(line => {
114
+ if (line.startsWith("Error: ")) {
115
+ line = line.slice(7);
116
+ }
117
+ if (line === oldMessage) {
118
+ return true;
119
+ }
120
+ });
121
+ if (messagePos !== undefined && messagePos !== -1) {
122
+ stack![messagePos] = message;
123
+ error.stack = stack!.join("\n");
124
+ }
125
+ }
126
+
103
127
  /**
104
128
  * The fallback formatter factory. This produces a limited plaintext formatter.
105
129
  */
@@ -291,10 +315,10 @@ export class TimeoutError extends MatterError {
291
315
  }
292
316
 
293
317
  /**
294
- * Thrown on abort when there is not an underlying error.
318
+ * Thrown as the primary cause when an {@link AbortController} aborts.
295
319
  */
296
320
  export class AbortedError extends CanceledError {
297
- constructor(message = "This operation was aborted", options?: ErrorOptions) {
321
+ constructor(message = "Operation aborted", options?: ErrorOptions) {
298
322
  super(message, options);
299
323
  }
300
324
 
@@ -320,6 +344,11 @@ export class AbortedError extends CanceledError {
320
344
  }
321
345
  }
322
346
 
347
+ /**
348
+ * Thrown when an operation can't complete because a resource is closed.
349
+ */
350
+ export class ClosedError extends CanceledError {}
351
+
323
352
  /**
324
353
  * Node.js-style object inspection.
325
354
  *
@@ -85,8 +85,8 @@ export class SharedEnvironmentServices implements ServiceProvider {
85
85
  /**
86
86
  * Load an environmental service asynchronously and register this instance as a consumer.
87
87
  *
88
- * Waits for the service's construction promise to resolve if present, then tracks
89
- * the service for lifecycle management.
88
+ * Waits for the service's construction promise to resolve if present, then tracks the service for lifecycle
89
+ * management.
90
90
  */
91
91
  async load<T extends Environmental.Service>(type: Environmental.Factory<T>): Promise<T> {
92
92
  this.#assertClosed();
@@ -15,7 +15,8 @@ type SupportedStorageBaseTypes = string | number | boolean | bigint | Bytes;
15
15
 
16
16
  /** Supported combined types to stringify the data for the storage that can be used as values. */
17
17
  type SupportedComplexStorageTypes =
18
- | Array<SupportedStorageBaseTypes | SupportedComplexStorageTypes> // Arrays
18
+ | (SupportedStorageBaseTypes | SupportedComplexStorageTypes)[] // Arrays
19
+ | readonly (SupportedStorageBaseTypes | SupportedComplexStorageTypes)[] // Arrays
19
20
  | { [key: string]: SupportedStorageBaseTypes | SupportedComplexStorageTypes | null | undefined } // Objects
20
21
  | Array<[SupportedStorageBaseTypes, SupportedStorageBaseTypes | SupportedComplexStorageTypes | null | undefined]> // Map style arrays
21
22
  | Map<SupportedStorageBaseTypes, SupportedStorageBaseTypes | SupportedComplexStorageTypes>