@dxos/context 0.3.2-main.de57e73 → 0.3.2-main.ec06501

package/dist/lib/browser/index.mjs

@@ -1,6 +1,15 @@
 // packages/common/context/src/context.ts
 import { log } from "@dxos/log";
 import { safeInstanceof } from "@dxos/util";
+
+// packages/common/context/src/context-disposed.ts
+var ContextDisposedError = class extends Error {
+  constructor() {
+    super("Context disposed.");
+  }
+};
+
+// packages/common/context/src/context.ts
 function _ts_decorate(decorators, target, key, desc) {
   var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
   if (typeof Reflect === "object" && typeof Reflect.decorate === "function")
@@ -15,6 +24,9 @@ var __dxlog_file = "/home/runner/work/dxos/dxos/packages/common/context/src/cont
 var MAX_SAFE_DISPOSE_CALLBACKS = 300;
 var Context = class Context1 {
   constructor({ onError = (error) => {
+    if (error instanceof ContextDisposedError) {
+      return;
+    }
     void this.dispose();
     throw error;
   }, attributes = {}, parent } = {}) {
@@ -49,7 +61,7 @@ var Context = class Context1 {
         } catch (error) {
           log.catch(error, void 0, {
             F: __dxlog_file,
-            L: 72,
+            L: 78,
             S: this,
             C: (f, a) => f(...a)
           });
@@ -63,7 +75,7 @@ var Context = class Context1 {
         safeThreshold: this.maxSafeDisposeCallbacks
       }, {
         F: __dxlog_file,
-        L: 79,
+        L: 85,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -96,7 +108,7 @@ var Context = class Context1 {
         } catch (error) {
           log.catch(error, void 0, {
             F: __dxlog_file,
-            L: 114,
+            L: 120,
             S: this,
             C: (f, a) => f(...a)
           });
@@ -157,7 +169,7 @@ Context = _ts_decorate([
 ], Context);
 
 // packages/common/context/src/promise-utils.ts
-var rejectOnDispose = (ctx, error = new Error("CANCELLED")) => new Promise((resolve, reject) => {
+var rejectOnDispose = (ctx, error = new ContextDisposedError()) => new Promise((resolve, reject) => {
   ctx.onDispose(() => reject(error));
 });
 var cancelWithContext = (ctx, promise) => {
@@ -165,12 +177,13 @@ var cancelWithContext = (ctx, promise) => {
   return Promise.race([
     promise,
     new Promise((resolve, reject) => {
-      clearDispose = ctx.onDispose(() => reject(new Error("CANCELLED")));
+      clearDispose = ctx.onDispose(() => reject(new ContextDisposedError()));
     })
   ]).finally(() => clearDispose?.());
 };
 export {
   Context,
+  ContextDisposedError,
   cancelWithContext,
   rejectOnDispose
 };

package/dist/lib/browser/index.mjs.map

@@ -1,7 +1,7 @@
 {
   "version": 3,
-  "sources": ["../../../src/context.ts", "../../../src/promise-utils.ts"],
-  "sourcesContent": ["//\n// Copyright 2022 DXOS.org\n//\n\nimport { log } from '@dxos/log';\nimport { safeInstanceof } from '@dxos/util';\n\nexport type ContextErrorHandler = (error: Error) => void;\n\nexport type DisposeCallback = () => void | Promise<void>;\n\nexport type CreateContextParams = {\n  onError?: ContextErrorHandler;\n  attributes?: Record<string, any>;\n  parent?: Context;\n};\n\n/**\n * Maximum number of dispose callbacks before we start logging warnings.\n */\nconst MAX_SAFE_DISPOSE_CALLBACKS = 300;\n\n@safeInstanceof('Context')\nexport class Context {\n  private readonly _onError: ContextErrorHandler;\n  private readonly _disposeCallbacks: DisposeCallback[] = [];\n  private _isDisposed = false;\n  private _disposePromise?: Promise<void> = undefined;\n  private _parent: Context | null = null;\n\n  private _attributes: Record<string, any>;\n\n  public maxSafeDisposeCallbacks = MAX_SAFE_DISPOSE_CALLBACKS;\n\n  constructor({\n    onError = (error) => {\n      void this.dispose();\n\n      // Will generate an unhandled rejection.\n      throw error;\n    },\n    attributes = {},\n    parent,\n  }: CreateContextParams = {}) {\n    this._onError = onError;\n    this._attributes = attributes;\n    if (parent !== undefined) {\n      this._parent = parent;\n    }\n  }\n\n  get disposed() {\n    return this._isDisposed;\n  }\n\n  /**\n   * Schedules a callback to run when the context is disposed.\n   * May be async, in this case the disposer might choose to wait for all resource to released.\n   * Throwing an error inside the callback will result in the error being logged, but not re-thrown.\n   *\n   * NOTE: Will call the callback immediately if the context is already disposed.\n   *\n   * @returns A function that can be used to remove the callback from the dispose list.\n   */\n  onDispose(callback: DisposeCallback) {\n    if (this._isDisposed) {\n      // Call the callback immediately if the context is already disposed.\n      void (async () => {\n        try {\n          await callback();\n        } catch (error: any) {\n          log.catch(error);\n        }\n      })();\n    }\n\n    this._disposeCallbacks.push(callback);\n    if (this._disposeCallbacks.length > this.maxSafeDisposeCallbacks) {\n      log.warn('Context has a large number of dispose callbacks. This might be a memory leak.', {\n        count: this._disposeCallbacks.length,\n        safeThreshold: this.maxSafeDisposeCallbacks,\n      });\n    }\n\n    return () => {\n      const index = this._disposeCallbacks.indexOf(callback);\n      if (index !== -1) {\n        this._disposeCallbacks.splice(index, 1);\n      }\n    };\n  }\n\n  /**\n   * Runs all dispose callbacks.\n   * Sync callbacks are run in the reverse order they were added.\n   * Async callbacks are run in parallel.\n   * This function never throws.\n   * It is safe to ignore the returned promise if the caller does not wish to wait for callbacks to complete.\n   * Disposing context means that onDispose will throw an error and any errors raised will be logged and not propagated.\n   */\n  dispose(): Promise<void> {\n    if (this._disposePromise) {\n      return this._disposePromise;\n    }\n    this._isDisposed = true;\n\n    const promises = [];\n    for (const callback of this._disposeCallbacks.reverse()) {\n      promises.push(\n        (async () => {\n          try {\n            await callback();\n          } catch (error: any) {\n            log.catch(error);\n          }\n        })(),\n      );\n    }\n    this._disposeCallbacks.length = 0;\n\n    return (this._disposePromise = Promise.all(promises).then(() => {}));\n  }\n\n  /**\n   * Raise the error inside the context.\n   * The error will be propagated to the error handler.\n   * IF the error handler is not set, the error will dispose the context and cause an unhandled rejection.\n   */\n  raise(error: Error): void {\n    if (this._isDisposed) {\n      // TODO(dmaretskyi): Don't log those.\n      // log.warn('Error in disposed context', error);\n      return;\n    }\n\n    try {\n      this._onError(error);\n    } catch (err) {\n      // Generate an unhandled rejection and stop the error propagation.\n      void Promise.reject(err);\n    }\n  }\n\n  derive({ onError, attributes }: CreateContextParams = {}): Context {\n    const newCtx = new Context({\n      // TODO(dmaretskyi): Optimize to not require allocating a new closure for every context.\n      onError: async (error) => {\n        if (!onError) {\n          this.raise(error);\n        } else {\n          try {\n            await onError(error);\n          } catch {\n            this.raise(error);\n          }\n        }\n      },\n      attributes,\n    });\n    const clearDispose = this.onDispose(() => newCtx.dispose());\n    newCtx.onDispose(clearDispose);\n    return newCtx;\n  }\n\n  getAttribute(key: string): any {\n    if (key in this._attributes) {\n      return this._attributes[key];\n    }\n    if (this._parent !== null) {\n      return this._parent.getAttribute(key);\n    }\n    return undefined;\n  }\n}\n", "//\n// Copyright 2023 DXOS.org\n//\n\nimport { Context } from './context';\n\n/**\n * @returns A promise that rejects when the context is disposed.\n */\n// TODO(dmaretskyi): Memory leak.\nexport const rejectOnDispose = (ctx: Context, error = new Error('CANCELLED')): Promise<never> =>\n  new Promise((resolve, reject) => {\n    ctx.onDispose(() => reject(error));\n  });\n\n/**\n * Rejects the promise if the context is disposed.\n */\nexport const cancelWithContext = <T>(ctx: Context, promise: Promise<T>): Promise<T> => {\n  let clearDispose: () => void;\n  return Promise.race([\n    promise,\n    new Promise<never>((resolve, reject) => {\n      // Will be called before .finally() handlers.\n      clearDispose = ctx.onDispose(() => reject(new Error('CANCELLED')));\n    }),\n  ]).finally(() => clearDispose?.());\n};\n"],
-  "mappings": "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",
-  "names": ["log", "safeInstanceof", "MAX_SAFE_DISPOSE_CALLBACKS", "Context", "constructor", "onError", "error", "dispose", "attributes", "parent", "_disposeCallbacks", "_isDisposed", "_disposePromise", "undefined", "_parent", "maxSafeDisposeCallbacks", "_onError", "_attributes", "disposed", "onDispose", "callback", "catch", "push", "length", "warn", "count", "safeThreshold", "index", "indexOf", "splice", "promises", "reverse", "Promise", "all", "then", "raise", "err", "reject", "derive", "newCtx", "clearDispose", "getAttribute", "key", "rejectOnDispose", "ctx", "error", "Error", "Promise", "resolve", "reject", "onDispose", "cancelWithContext", "promise", "clearDispose", "race", "finally"]
+  "sources": ["../../../src/context.ts", "../../../src/context-disposed.ts", "../../../src/promise-utils.ts"],
+  "sourcesContent": ["//\n// Copyright 2022 DXOS.org\n//\n\nimport { log } from '@dxos/log';\nimport { safeInstanceof } from '@dxos/util';\n\nimport { ContextDisposedError } from './context-disposed';\n\nexport type ContextErrorHandler = (error: Error) => void;\n\nexport type DisposeCallback = () => void | Promise<void>;\n\nexport type CreateContextParams = {\n  onError?: ContextErrorHandler;\n  attributes?: Record<string, any>;\n  parent?: Context;\n};\n\n/**\n * Maximum number of dispose callbacks before we start logging warnings.\n */\nconst MAX_SAFE_DISPOSE_CALLBACKS = 300;\n\n@safeInstanceof('Context')\nexport class Context {\n  private readonly _onError: ContextErrorHandler;\n  private readonly _disposeCallbacks: DisposeCallback[] = [];\n  private _isDisposed = false;\n  private _disposePromise?: Promise<void> = undefined;\n  private _parent: Context | null = null;\n\n  private _attributes: Record<string, any>;\n\n  public maxSafeDisposeCallbacks = MAX_SAFE_DISPOSE_CALLBACKS;\n\n  constructor({\n    onError = (error) => {\n      if (error instanceof ContextDisposedError) {\n        return;\n      }\n\n      void this.dispose();\n\n      // Will generate an unhandled rejection.\n      throw error;\n    },\n    attributes = {},\n    parent,\n  }: CreateContextParams = {}) {\n    this._onError = onError;\n    this._attributes = attributes;\n    if (parent !== undefined) {\n      this._parent = parent;\n    }\n  }\n\n  get disposed() {\n    return this._isDisposed;\n  }\n\n  /**\n   * Schedules a callback to run when the context is disposed.\n   * May be async, in this case the disposer might choose to wait for all resource to released.\n   * Throwing an error inside the callback will result in the error being logged, but not re-thrown.\n   *\n   * NOTE: Will call the callback immediately if the context is already disposed.\n   *\n   * @returns A function that can be used to remove the callback from the dispose list.\n   */\n  onDispose(callback: DisposeCallback) {\n    if (this._isDisposed) {\n      // Call the callback immediately if the context is already disposed.\n      void (async () => {\n        try {\n          await callback();\n        } catch (error: any) {\n          log.catch(error);\n        }\n      })();\n    }\n\n    this._disposeCallbacks.push(callback);\n    if (this._disposeCallbacks.length > this.maxSafeDisposeCallbacks) {\n      log.warn('Context has a large number of dispose callbacks. This might be a memory leak.', {\n        count: this._disposeCallbacks.length,\n        safeThreshold: this.maxSafeDisposeCallbacks,\n      });\n    }\n\n    return () => {\n      const index = this._disposeCallbacks.indexOf(callback);\n      if (index !== -1) {\n        this._disposeCallbacks.splice(index, 1);\n      }\n    };\n  }\n\n  /**\n   * Runs all dispose callbacks.\n   * Sync callbacks are run in the reverse order they were added.\n   * Async callbacks are run in parallel.\n   * This function never throws.\n   * It is safe to ignore the returned promise if the caller does not wish to wait for callbacks to complete.\n   * Disposing context means that onDispose will throw an error and any errors raised will be logged and not propagated.\n   */\n  dispose(): Promise<void> {\n    if (this._disposePromise) {\n      return this._disposePromise;\n    }\n    this._isDisposed = true;\n\n    const promises = [];\n    for (const callback of this._disposeCallbacks.reverse()) {\n      promises.push(\n        (async () => {\n          try {\n            await callback();\n          } catch (error: any) {\n            log.catch(error);\n          }\n        })(),\n      );\n    }\n    this._disposeCallbacks.length = 0;\n\n    return (this._disposePromise = Promise.all(promises).then(() => {}));\n  }\n\n  /**\n   * Raise the error inside the context.\n   * The error will be propagated to the error handler.\n   * IF the error handler is not set, the error will dispose the context and cause an unhandled rejection.\n   */\n  raise(error: Error): void {\n    if (this._isDisposed) {\n      // TODO(dmaretskyi): Don't log those.\n      // log.warn('Error in disposed context', error);\n      return;\n    }\n\n    try {\n      this._onError(error);\n    } catch (err) {\n      // Generate an unhandled rejection and stop the error propagation.\n      void Promise.reject(err);\n    }\n  }\n\n  derive({ onError, attributes }: CreateContextParams = {}): Context {\n    const newCtx = new Context({\n      // TODO(dmaretskyi): Optimize to not require allocating a new closure for every context.\n      onError: async (error) => {\n        if (!onError) {\n          this.raise(error);\n        } else {\n          try {\n            await onError(error);\n          } catch {\n            this.raise(error);\n          }\n        }\n      },\n      attributes,\n    });\n    const clearDispose = this.onDispose(() => newCtx.dispose());\n    newCtx.onDispose(clearDispose);\n    return newCtx;\n  }\n\n  getAttribute(key: string): any {\n    if (key in this._attributes) {\n      return this._attributes[key];\n    }\n    if (this._parent !== null) {\n      return this._parent.getAttribute(key);\n    }\n    return undefined;\n  }\n}\n", "//\n// Copyright 2023 DXOS.org\n//\n\nexport class ContextDisposedError extends Error {\n  constructor() {\n    super('Context disposed.');\n  }\n}\n", "//\n// Copyright 2023 DXOS.org\n//\n\nimport { Context } from './context';\nimport { ContextDisposedError } from './context-disposed';\n\n/**\n * @returns A promise that rejects when the context is disposed.\n */\n// TODO(dmaretskyi): Memory leak.\nexport const rejectOnDispose = (ctx: Context, error = new ContextDisposedError()): Promise<never> =>\n  new Promise((resolve, reject) => {\n    ctx.onDispose(() => reject(error));\n  });\n\n/**\n * Rejects the promise if the context is disposed.\n */\nexport const cancelWithContext = <T>(ctx: Context, promise: Promise<T>): Promise<T> => {\n  let clearDispose: () => void;\n  return Promise.race([\n    promise,\n    new Promise<never>((resolve, reject) => {\n      // Will be called before .finally() handlers.\n      clearDispose = ctx.onDispose(() => reject(new ContextDisposedError()));\n    }),\n  ]).finally(() => clearDispose?.());\n};\n"],
+  "mappings": "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",
+  "names": ["log", "safeInstanceof", "ContextDisposedError", "Error", "constructor", "MAX_SAFE_DISPOSE_CALLBACKS", "Context", "constructor", "onError", "error", "ContextDisposedError", "dispose", "attributes", "parent", "_disposeCallbacks", "_isDisposed", "_disposePromise", "undefined", "_parent", "maxSafeDisposeCallbacks", "_onError", "_attributes", "disposed", "onDispose", "callback", "log", "catch", "push", "length", "warn", "count", "safeThreshold", "index", "indexOf", "splice", "promises", "reverse", "Promise", "all", "then", "raise", "err", "reject", "derive", "newCtx", "clearDispose", "getAttribute", "key", "safeInstanceof", "rejectOnDispose", "ctx", "error", "ContextDisposedError", "Promise", "resolve", "reject", "onDispose", "cancelWithContext", "promise", "clearDispose", "race", "finally"]
 }

package/dist/lib/browser/meta.json

@@ -1 +1 @@
-{"inputs":{"packages/common/context/src/context.ts":{"bytes":16775,"imports":[{"path":"@dxos/log","kind":"import-statement","external":true},{"path":"@dxos/util","kind":"import-statement","external":true}],"format":"esm"},"packages/common/context/src/promise-utils.ts":{"bytes":2811,"imports":[],"format":"esm"},"packages/common/context/src/index.ts":{"bytes":563,"imports":[{"path":"packages/common/context/src/context.ts","kind":"import-statement","original":"./context"},{"path":"packages/common/context/src/promise-utils.ts","kind":"import-statement","original":"./promise-utils"}],"format":"esm"}},"outputs":{"packages/common/context/dist/lib/browser/index.mjs.map":{"imports":[],"exports":[],"inputs":{},"bytes":9050},"packages/common/context/dist/lib/browser/index.mjs":{"imports":[{"path":"@dxos/log","kind":"import-statement","external":true},{"path":"@dxos/util","kind":"import-statement","external":true}],"exports":["Context","cancelWithContext","rejectOnDispose"],"entryPoint":"packages/common/context/src/index.ts","inputs":{"packages/common/context/src/context.ts":{"bytesInOutput":4873},"packages/common/context/src/index.ts":{"bytesInOutput":0},"packages/common/context/src/promise-utils.ts":{"bytesInOutput":402}},"bytes":5463}}}
+{"inputs":{"packages/common/context/src/context-disposed.ts":{"bytes":803,"imports":[],"format":"esm"},"packages/common/context/src/context.ts":{"bytes":17229,"imports":[{"path":"@dxos/log","kind":"import-statement","external":true},{"path":"@dxos/util","kind":"import-statement","external":true},{"path":"packages/common/context/src/context-disposed.ts","kind":"import-statement","original":"./context-disposed"}],"format":"esm"},"packages/common/context/src/promise-utils.ts":{"bytes":3018,"imports":[{"path":"packages/common/context/src/context-disposed.ts","kind":"import-statement","original":"./context-disposed"}],"format":"esm"},"packages/common/context/src/index.ts":{"bytes":675,"imports":[{"path":"packages/common/context/src/context.ts","kind":"import-statement","original":"./context"},{"path":"packages/common/context/src/promise-utils.ts","kind":"import-statement","original":"./promise-utils"},{"path":"packages/common/context/src/context-disposed.ts","kind":"import-statement","original":"./context-disposed"}],"format":"esm"}},"outputs":{"packages/common/context/dist/lib/browser/index.mjs.map":{"imports":[],"exports":[],"inputs":{},"bytes":9671},"packages/common/context/dist/lib/browser/index.mjs":{"imports":[{"path":"@dxos/log","kind":"import-statement","external":true},{"path":"@dxos/util","kind":"import-statement","external":true}],"exports":["Context","ContextDisposedError","cancelWithContext","rejectOnDispose"],"entryPoint":"packages/common/context/src/index.ts","inputs":{"packages/common/context/src/context.ts":{"bytesInOutput":4942},"packages/common/context/src/context-disposed.ts":{"bytesInOutput":106},"packages/common/context/src/index.ts":{"bytesInOutput":0},"packages/common/context/src/promise-utils.ts":{"bytesInOutput":410}},"bytes":5765}}}

package/dist/lib/node/index.cjs

@@ -21,6 +21,7 @@ var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: tru
 var src_exports = {};
 __export(src_exports, {
   Context: () => Context,
+  ContextDisposedError: () => ContextDisposedError,
   cancelWithContext: () => cancelWithContext,
   rejectOnDispose: () => rejectOnDispose
 });
@@ -29,6 +30,15 @@ module.exports = __toCommonJS(src_exports);
 // packages/common/context/src/context.ts
 var import_log = require("@dxos/log");
 var import_util = require("@dxos/util");
+
+// packages/common/context/src/context-disposed.ts
+var ContextDisposedError = class extends Error {
+  constructor() {
+    super("Context disposed.");
+  }
+};
+
+// packages/common/context/src/context.ts
 function _ts_decorate(decorators, target, key, desc) {
   var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
   if (typeof Reflect === "object" && typeof Reflect.decorate === "function")
@@ -43,6 +53,9 @@ var __dxlog_file = "/home/runner/work/dxos/dxos/packages/common/context/src/cont
 var MAX_SAFE_DISPOSE_CALLBACKS = 300;
 var Context = class Context1 {
   constructor({ onError = (error) => {
+    if (error instanceof ContextDisposedError) {
+      return;
+    }
     void this.dispose();
     throw error;
   }, attributes = {}, parent } = {}) {
@@ -77,7 +90,7 @@ var Context = class Context1 {
         } catch (error) {
           import_log.log.catch(error, void 0, {
             F: __dxlog_file,
-            L: 72,
+            L: 78,
             S: this,
             C: (f, a) => f(...a)
           });
@@ -91,7 +104,7 @@ var Context = class Context1 {
         safeThreshold: this.maxSafeDisposeCallbacks
       }, {
         F: __dxlog_file,
-        L: 79,
+        L: 85,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -124,7 +137,7 @@ var Context = class Context1 {
         } catch (error) {
           import_log.log.catch(error, void 0, {
             F: __dxlog_file,
-            L: 114,
+            L: 120,
             S: this,
             C: (f, a) => f(...a)
           });
@@ -185,7 +198,7 @@ Context = _ts_decorate([
 ], Context);
 
 // packages/common/context/src/promise-utils.ts
-var rejectOnDispose = (ctx, error = new Error("CANCELLED")) => new Promise((resolve, reject) => {
+var rejectOnDispose = (ctx, error = new ContextDisposedError()) => new Promise((resolve, reject) => {
   ctx.onDispose(() => reject(error));
 });
 var cancelWithContext = (ctx, promise) => {
@@ -193,13 +206,14 @@ var cancelWithContext = (ctx, promise) => {
   return Promise.race([
     promise,
     new Promise((resolve, reject) => {
-      clearDispose = ctx.onDispose(() => reject(new Error("CANCELLED")));
+      clearDispose = ctx.onDispose(() => reject(new ContextDisposedError()));
     })
   ]).finally(() => clearDispose?.());
 };
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   Context,
+  ContextDisposedError,
   cancelWithContext,
   rejectOnDispose
 });

package/dist/lib/node/index.cjs.map

@@ -1,7 +1,7 @@
 {
   "version": 3,
-  "sources": ["../../../src/index.ts", "../../../src/context.ts", "../../../src/promise-utils.ts"],
-  "sourcesContent": ["//\n// Copyright 2022 DXOS.org\n//\n\nexport * from './context';\nexport * from './promise-utils';\n", "//\n// Copyright 2022 DXOS.org\n//\n\nimport { log } from '@dxos/log';\nimport { safeInstanceof } from '@dxos/util';\n\nexport type ContextErrorHandler = (error: Error) => void;\n\nexport type DisposeCallback = () => void | Promise<void>;\n\nexport type CreateContextParams = {\n  onError?: ContextErrorHandler;\n  attributes?: Record<string, any>;\n  parent?: Context;\n};\n\n/**\n * Maximum number of dispose callbacks before we start logging warnings.\n */\nconst MAX_SAFE_DISPOSE_CALLBACKS = 300;\n\n@safeInstanceof('Context')\nexport class Context {\n  private readonly _onError: ContextErrorHandler;\n  private readonly _disposeCallbacks: DisposeCallback[] = [];\n  private _isDisposed = false;\n  private _disposePromise?: Promise<void> = undefined;\n  private _parent: Context | null = null;\n\n  private _attributes: Record<string, any>;\n\n  public maxSafeDisposeCallbacks = MAX_SAFE_DISPOSE_CALLBACKS;\n\n  constructor({\n    onError = (error) => {\n      void this.dispose();\n\n      // Will generate an unhandled rejection.\n      throw error;\n    },\n    attributes = {},\n    parent,\n  }: CreateContextParams = {}) {\n    this._onError = onError;\n    this._attributes = attributes;\n    if (parent !== undefined) {\n      this._parent = parent;\n    }\n  }\n\n  get disposed() {\n    return this._isDisposed;\n  }\n\n  /**\n   * Schedules a callback to run when the context is disposed.\n   * May be async, in this case the disposer might choose to wait for all resource to released.\n   * Throwing an error inside the callback will result in the error being logged, but not re-thrown.\n   *\n   * NOTE: Will call the callback immediately if the context is already disposed.\n   *\n   * @returns A function that can be used to remove the callback from the dispose list.\n   */\n  onDispose(callback: DisposeCallback) {\n    if (this._isDisposed) {\n      // Call the callback immediately if the context is already disposed.\n      void (async () => {\n        try {\n          await callback();\n        } catch (error: any) {\n          log.catch(error);\n        }\n      })();\n    }\n\n    this._disposeCallbacks.push(callback);\n    if (this._disposeCallbacks.length > this.maxSafeDisposeCallbacks) {\n      log.warn('Context has a large number of dispose callbacks. This might be a memory leak.', {\n        count: this._disposeCallbacks.length,\n        safeThreshold: this.maxSafeDisposeCallbacks,\n      });\n    }\n\n    return () => {\n      const index = this._disposeCallbacks.indexOf(callback);\n      if (index !== -1) {\n        this._disposeCallbacks.splice(index, 1);\n      }\n    };\n  }\n\n  /**\n   * Runs all dispose callbacks.\n   * Sync callbacks are run in the reverse order they were added.\n   * Async callbacks are run in parallel.\n   * This function never throws.\n   * It is safe to ignore the returned promise if the caller does not wish to wait for callbacks to complete.\n   * Disposing context means that onDispose will throw an error and any errors raised will be logged and not propagated.\n   */\n  dispose(): Promise<void> {\n    if (this._disposePromise) {\n      return this._disposePromise;\n    }\n    this._isDisposed = true;\n\n    const promises = [];\n    for (const callback of this._disposeCallbacks.reverse()) {\n      promises.push(\n        (async () => {\n          try {\n            await callback();\n          } catch (error: any) {\n            log.catch(error);\n          }\n        })(),\n      );\n    }\n    this._disposeCallbacks.length = 0;\n\n    return (this._disposePromise = Promise.all(promises).then(() => {}));\n  }\n\n  /**\n   * Raise the error inside the context.\n   * The error will be propagated to the error handler.\n   * IF the error handler is not set, the error will dispose the context and cause an unhandled rejection.\n   */\n  raise(error: Error): void {\n    if (this._isDisposed) {\n      // TODO(dmaretskyi): Don't log those.\n      // log.warn('Error in disposed context', error);\n      return;\n    }\n\n    try {\n      this._onError(error);\n    } catch (err) {\n      // Generate an unhandled rejection and stop the error propagation.\n      void Promise.reject(err);\n    }\n  }\n\n  derive({ onError, attributes }: CreateContextParams = {}): Context {\n    const newCtx = new Context({\n      // TODO(dmaretskyi): Optimize to not require allocating a new closure for every context.\n      onError: async (error) => {\n        if (!onError) {\n          this.raise(error);\n        } else {\n          try {\n            await onError(error);\n          } catch {\n            this.raise(error);\n          }\n        }\n      },\n      attributes,\n    });\n    const clearDispose = this.onDispose(() => newCtx.dispose());\n    newCtx.onDispose(clearDispose);\n    return newCtx;\n  }\n\n  getAttribute(key: string): any {\n    if (key in this._attributes) {\n      return this._attributes[key];\n    }\n    if (this._parent !== null) {\n      return this._parent.getAttribute(key);\n    }\n    return undefined;\n  }\n}\n", "//\n// Copyright 2023 DXOS.org\n//\n\nimport { Context } from './context';\n\n/**\n * @returns A promise that rejects when the context is disposed.\n */\n// TODO(dmaretskyi): Memory leak.\nexport const rejectOnDispose = (ctx: Context, error = new Error('CANCELLED')): Promise<never> =>\n  new Promise((resolve, reject) => {\n    ctx.onDispose(() => reject(error));\n  });\n\n/**\n * Rejects the promise if the context is disposed.\n */\nexport const cancelWithContext = <T>(ctx: Context, promise: Promise<T>): Promise<T> => {\n  let clearDispose: () => void;\n  return Promise.race([\n    promise,\n    new Promise<never>((resolve, reject) => {\n      // Will be called before .finally() handlers.\n      clearDispose = ctx.onDispose(() => reject(new Error('CANCELLED')));\n    }),\n  ]).finally(() => clearDispose?.());\n};\n"],
-  "mappings": "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",
-  "names": ["MAX_SAFE_DISPOSE_CALLBACKS", "Context", "constructor", "onError", "error", "dispose", "attributes", "parent", "_disposeCallbacks", "_isDisposed", "_disposePromise", "undefined", "_parent", "maxSafeDisposeCallbacks", "_onError", "_attributes", "disposed", "onDispose", "callback", "log", "catch", "push", "length", "warn", "count", "safeThreshold", "index", "indexOf", "splice", "promises", "reverse", "Promise", "all", "then", "raise", "err", "reject", "derive", "newCtx", "clearDispose", "getAttribute", "key", "safeInstanceof", "rejectOnDispose", "ctx", "error", "Error", "Promise", "resolve", "reject", "onDispose", "cancelWithContext", "promise", "clearDispose", "race", "finally"]
+  "sources": ["../../../src/index.ts", "../../../src/context.ts", "../../../src/context-disposed.ts", "../../../src/promise-utils.ts"],
+  "sourcesContent": ["//\n// Copyright 2022 DXOS.org\n//\n\nexport * from './context';\nexport * from './promise-utils';\nexport * from './context-disposed';\n", "//\n// Copyright 2022 DXOS.org\n//\n\nimport { log } from '@dxos/log';\nimport { safeInstanceof } from '@dxos/util';\n\nimport { ContextDisposedError } from './context-disposed';\n\nexport type ContextErrorHandler = (error: Error) => void;\n\nexport type DisposeCallback = () => void | Promise<void>;\n\nexport type CreateContextParams = {\n  onError?: ContextErrorHandler;\n  attributes?: Record<string, any>;\n  parent?: Context;\n};\n\n/**\n * Maximum number of dispose callbacks before we start logging warnings.\n */\nconst MAX_SAFE_DISPOSE_CALLBACKS = 300;\n\n@safeInstanceof('Context')\nexport class Context {\n  private readonly _onError: ContextErrorHandler;\n  private readonly _disposeCallbacks: DisposeCallback[] = [];\n  private _isDisposed = false;\n  private _disposePromise?: Promise<void> = undefined;\n  private _parent: Context | null = null;\n\n  private _attributes: Record<string, any>;\n\n  public maxSafeDisposeCallbacks = MAX_SAFE_DISPOSE_CALLBACKS;\n\n  constructor({\n    onError = (error) => {\n      if (error instanceof ContextDisposedError) {\n        return;\n      }\n\n      void this.dispose();\n\n      // Will generate an unhandled rejection.\n      throw error;\n    },\n    attributes = {},\n    parent,\n  }: CreateContextParams = {}) {\n    this._onError = onError;\n    this._attributes = attributes;\n    if (parent !== undefined) {\n      this._parent = parent;\n    }\n  }\n\n  get disposed() {\n    return this._isDisposed;\n  }\n\n  /**\n   * Schedules a callback to run when the context is disposed.\n   * May be async, in this case the disposer might choose to wait for all resource to released.\n   * Throwing an error inside the callback will result in the error being logged, but not re-thrown.\n   *\n   * NOTE: Will call the callback immediately if the context is already disposed.\n   *\n   * @returns A function that can be used to remove the callback from the dispose list.\n   */\n  onDispose(callback: DisposeCallback) {\n    if (this._isDisposed) {\n      // Call the callback immediately if the context is already disposed.\n      void (async () => {\n        try {\n          await callback();\n        } catch (error: any) {\n          log.catch(error);\n        }\n      })();\n    }\n\n    this._disposeCallbacks.push(callback);\n    if (this._disposeCallbacks.length > this.maxSafeDisposeCallbacks) {\n      log.warn('Context has a large number of dispose callbacks. This might be a memory leak.', {\n        count: this._disposeCallbacks.length,\n        safeThreshold: this.maxSafeDisposeCallbacks,\n      });\n    }\n\n    return () => {\n      const index = this._disposeCallbacks.indexOf(callback);\n      if (index !== -1) {\n        this._disposeCallbacks.splice(index, 1);\n      }\n    };\n  }\n\n  /**\n   * Runs all dispose callbacks.\n   * Sync callbacks are run in the reverse order they were added.\n   * Async callbacks are run in parallel.\n   * This function never throws.\n   * It is safe to ignore the returned promise if the caller does not wish to wait for callbacks to complete.\n   * Disposing context means that onDispose will throw an error and any errors raised will be logged and not propagated.\n   */\n  dispose(): Promise<void> {\n    if (this._disposePromise) {\n      return this._disposePromise;\n    }\n    this._isDisposed = true;\n\n    const promises = [];\n    for (const callback of this._disposeCallbacks.reverse()) {\n      promises.push(\n        (async () => {\n          try {\n            await callback();\n          } catch (error: any) {\n            log.catch(error);\n          }\n        })(),\n      );\n    }\n    this._disposeCallbacks.length = 0;\n\n    return (this._disposePromise = Promise.all(promises).then(() => {}));\n  }\n\n  /**\n   * Raise the error inside the context.\n   * The error will be propagated to the error handler.\n   * IF the error handler is not set, the error will dispose the context and cause an unhandled rejection.\n   */\n  raise(error: Error): void {\n    if (this._isDisposed) {\n      // TODO(dmaretskyi): Don't log those.\n      // log.warn('Error in disposed context', error);\n      return;\n    }\n\n    try {\n      this._onError(error);\n    } catch (err) {\n      // Generate an unhandled rejection and stop the error propagation.\n      void Promise.reject(err);\n    }\n  }\n\n  derive({ onError, attributes }: CreateContextParams = {}): Context {\n    const newCtx = new Context({\n      // TODO(dmaretskyi): Optimize to not require allocating a new closure for every context.\n      onError: async (error) => {\n        if (!onError) {\n          this.raise(error);\n        } else {\n          try {\n            await onError(error);\n          } catch {\n            this.raise(error);\n          }\n        }\n      },\n      attributes,\n    });\n    const clearDispose = this.onDispose(() => newCtx.dispose());\n    newCtx.onDispose(clearDispose);\n    return newCtx;\n  }\n\n  getAttribute(key: string): any {\n    if (key in this._attributes) {\n      return this._attributes[key];\n    }\n    if (this._parent !== null) {\n      return this._parent.getAttribute(key);\n    }\n    return undefined;\n  }\n}\n", "//\n// Copyright 2023 DXOS.org\n//\n\nexport class ContextDisposedError extends Error {\n  constructor() {\n    super('Context disposed.');\n  }\n}\n", "//\n// Copyright 2023 DXOS.org\n//\n\nimport { Context } from './context';\nimport { ContextDisposedError } from './context-disposed';\n\n/**\n * @returns A promise that rejects when the context is disposed.\n */\n// TODO(dmaretskyi): Memory leak.\nexport const rejectOnDispose = (ctx: Context, error = new ContextDisposedError()): Promise<never> =>\n  new Promise((resolve, reject) => {\n    ctx.onDispose(() => reject(error));\n  });\n\n/**\n * Rejects the promise if the context is disposed.\n */\nexport const cancelWithContext = <T>(ctx: Context, promise: Promise<T>): Promise<T> => {\n  let clearDispose: () => void;\n  return Promise.race([\n    promise,\n    new Promise<never>((resolve, reject) => {\n      // Will be called before .finally() handlers.\n      clearDispose = ctx.onDispose(() => reject(new ContextDisposedError()));\n    }),\n  ]).finally(() => clearDispose?.());\n};\n"],
+  "mappings": "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",
+  "names": ["ContextDisposedError", "Error", "constructor", "MAX_SAFE_DISPOSE_CALLBACKS", "Context", "constructor", "onError", "error", "ContextDisposedError", "dispose", "attributes", "parent", "_disposeCallbacks", "_isDisposed", "_disposePromise", "undefined", "_parent", "maxSafeDisposeCallbacks", "_onError", "_attributes", "disposed", "onDispose", "callback", "log", "catch", "push", "length", "warn", "count", "safeThreshold", "index", "indexOf", "splice", "promises", "reverse", "Promise", "all", "then", "raise", "err", "reject", "derive", "newCtx", "clearDispose", "getAttribute", "key", "safeInstanceof", "rejectOnDispose", "ctx", "error", "ContextDisposedError", "Promise", "resolve", "reject", "onDispose", "cancelWithContext", "promise", "clearDispose", "race", "finally"]
 }

package/dist/lib/node/meta.json

@@ -1 +1 @@
-{"inputs":{"packages/common/context/src/context.ts":{"bytes":16775,"imports":[{"path":"@dxos/log","kind":"import-statement","external":true},{"path":"@dxos/util","kind":"import-statement","external":true}],"format":"esm"},"packages/common/context/src/promise-utils.ts":{"bytes":2811,"imports":[],"format":"esm"},"packages/common/context/src/index.ts":{"bytes":563,"imports":[{"path":"packages/common/context/src/context.ts","kind":"import-statement","original":"./context"},{"path":"packages/common/context/src/promise-utils.ts","kind":"import-statement","original":"./promise-utils"}],"format":"esm"}},"outputs":{"packages/common/context/dist/lib/node/index.cjs.map":{"imports":[],"exports":[],"inputs":{},"bytes":9207},"packages/common/context/dist/lib/node/index.cjs":{"imports":[{"path":"@dxos/log","kind":"require-call","external":true},{"path":"@dxos/util","kind":"require-call","external":true}],"exports":[],"entryPoint":"packages/common/context/src/index.ts","inputs":{"packages/common/context/src/index.ts":{"bytesInOutput":207},"packages/common/context/src/context.ts":{"bytesInOutput":4925},"packages/common/context/src/promise-utils.ts":{"bytesInOutput":402}},"bytes":6642}}}
+{"inputs":{"packages/common/context/src/context-disposed.ts":{"bytes":803,"imports":[],"format":"esm"},"packages/common/context/src/context.ts":{"bytes":17229,"imports":[{"path":"@dxos/log","kind":"import-statement","external":true},{"path":"@dxos/util","kind":"import-statement","external":true},{"path":"packages/common/context/src/context-disposed.ts","kind":"import-statement","original":"./context-disposed"}],"format":"esm"},"packages/common/context/src/promise-utils.ts":{"bytes":3018,"imports":[{"path":"packages/common/context/src/context-disposed.ts","kind":"import-statement","original":"./context-disposed"}],"format":"esm"},"packages/common/context/src/index.ts":{"bytes":675,"imports":[{"path":"packages/common/context/src/context.ts","kind":"import-statement","original":"./context"},{"path":"packages/common/context/src/promise-utils.ts","kind":"import-statement","original":"./promise-utils"},{"path":"packages/common/context/src/context-disposed.ts","kind":"import-statement","original":"./context-disposed"}],"format":"esm"}},"outputs":{"packages/common/context/dist/lib/node/index.cjs.map":{"imports":[],"exports":[],"inputs":{},"bytes":9839},"packages/common/context/dist/lib/node/index.cjs":{"imports":[{"path":"@dxos/log","kind":"require-call","external":true},{"path":"@dxos/util","kind":"require-call","external":true}],"exports":[],"entryPoint":"packages/common/context/src/index.ts","inputs":{"packages/common/context/src/index.ts":{"bytesInOutput":259},"packages/common/context/src/context.ts":{"bytesInOutput":4994},"packages/common/context/src/context-disposed.ts":{"bytesInOutput":106},"packages/common/context/src/promise-utils.ts":{"bytesInOutput":410}},"bytes":6996}}}

package/dist/types/src/context-disposed.d.ts

@@ -0,0 +1,4 @@
+export declare class ContextDisposedError extends Error {
+    constructor();
+}
+//# sourceMappingURL=context-disposed.d.ts.map

package/dist/types/src/context-disposed.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"context-disposed.d.ts","sourceRoot":"","sources":["../../../src/context-disposed.ts"],"names":[],"mappings":"AAIA,qBAAa,oBAAqB,SAAQ,KAAK;;CAI9C"}

package/dist/types/src/context.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"context.d.ts","sourceRoot":"","sources":["../../../src/context.ts"],"names":[],"mappings":"AAOA,MAAM,MAAM,mBAAmB,GAAG,CAAC,KAAK,EAAE,KAAK,KAAK,IAAI,CAAC;AAEzD,MAAM,MAAM,eAAe,GAAG,MAAM,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;AAEzD,MAAM,MAAM,mBAAmB,GAAG;IAChC,OAAO,CAAC,EAAE,mBAAmB,CAAC;IAC9B,UAAU,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;IACjC,MAAM,CAAC,EAAE,OAAO,CAAC;CAClB,CAAC;AAOF,qBACa,OAAO;IAClB,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAsB;IAC/C,OAAO,CAAC,QAAQ,CAAC,iBAAiB,CAAyB;IAC3D,OAAO,CAAC,WAAW,CAAS;IAC5B,OAAO,CAAC,eAAe,CAAC,CAA4B;IACpD,OAAO,CAAC,OAAO,CAAwB;IAEvC,OAAO,CAAC,WAAW,CAAsB;IAElC,uBAAuB,SAA8B;gBAEhD,EACV,OAKC,EACD,UAAe,EACf,MAAM,GACP,GAAE,mBAAwB;IAQ3B,IAAI,QAAQ,YAEX;IAED;;;;;;;;OAQG;IACH,SAAS,CAAC,QAAQ,EAAE,eAAe;IA4BnC;;;;;;;OAOG;IACH,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC;IAuBxB;;;;OAIG;IACH,KAAK,CAAC,KAAK,EAAE,KAAK,GAAG,IAAI;IAezB,MAAM,CAAC,EAAE,OAAO,EAAE,UAAU,EAAE,GAAE,mBAAwB,GAAG,OAAO;IAqBlE,YAAY,CAAC,GAAG,EAAE,MAAM,GAAG,GAAG;CAS/B"}
+{"version":3,"file":"context.d.ts","sourceRoot":"","sources":["../../../src/context.ts"],"names":[],"mappings":"AASA,MAAM,MAAM,mBAAmB,GAAG,CAAC,KAAK,EAAE,KAAK,KAAK,IAAI,CAAC;AAEzD,MAAM,MAAM,eAAe,GAAG,MAAM,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;AAEzD,MAAM,MAAM,mBAAmB,GAAG;IAChC,OAAO,CAAC,EAAE,mBAAmB,CAAC;IAC9B,UAAU,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;IACjC,MAAM,CAAC,EAAE,OAAO,CAAC;CAClB,CAAC;AAOF,qBACa,OAAO;IAClB,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAsB;IAC/C,OAAO,CAAC,QAAQ,CAAC,iBAAiB,CAAyB;IAC3D,OAAO,CAAC,WAAW,CAAS;IAC5B,OAAO,CAAC,eAAe,CAAC,CAA4B;IACpD,OAAO,CAAC,OAAO,CAAwB;IAEvC,OAAO,CAAC,WAAW,CAAsB;IAElC,uBAAuB,SAA8B;gBAEhD,EACV,OASC,EACD,UAAe,EACf,MAAM,GACP,GAAE,mBAAwB;IAQ3B,IAAI,QAAQ,YAEX;IAED;;;;;;;;OAQG;IACH,SAAS,CAAC,QAAQ,EAAE,eAAe;IA4BnC;;;;;;;OAOG;IACH,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC;IAuBxB;;;;OAIG;IACH,KAAK,CAAC,KAAK,EAAE,KAAK,GAAG,IAAI;IAezB,MAAM,CAAC,EAAE,OAAO,EAAE,UAAU,EAAE,GAAE,mBAAwB,GAAG,OAAO;IAqBlE,YAAY,CAAC,GAAG,EAAE,MAAM,GAAG,GAAG;CAS/B"}

package/dist/types/src/index.d.ts

@@ -1,3 +1,4 @@
 export * from './context';
 export * from './promise-utils';
+export * from './context-disposed';
 //# sourceMappingURL=index.d.ts.map

package/dist/types/src/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/index.ts"],"names":[],"mappings":"AAIA,cAAc,WAAW,CAAC;AAC1B,cAAc,iBAAiB,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/index.ts"],"names":[],"mappings":"AAIA,cAAc,WAAW,CAAC;AAC1B,cAAc,iBAAiB,CAAC;AAChC,cAAc,oBAAoB,CAAC"}

package/dist/types/src/promise-utils.d.ts

@@ -1,8 +1,9 @@
 import { Context } from './context';
+import { ContextDisposedError } from './context-disposed';
 /**
  * @returns A promise that rejects when the context is disposed.
  */
-export declare const rejectOnDispose: (ctx: Context, error?: Error) => Promise<never>;
+export declare const rejectOnDispose: (ctx: Context, error?: ContextDisposedError) => Promise<never>;
 /**
  * Rejects the promise if the context is disposed.
  */

package/dist/types/src/promise-utils.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"promise-utils.d.ts","sourceRoot":"","sources":["../../../src/promise-utils.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAEpC;;GAEG;AAEH,eAAO,MAAM,eAAe,QAAS,OAAO,oBAAmC,QAAQ,KAAK,CAGxF,CAAC;AAEL;;GAEG;AACH,eAAO,MAAM,iBAAiB,WAAY,OAAO,oCAShD,CAAC"}
+{"version":3,"file":"promise-utils.d.ts","sourceRoot":"","sources":["../../../src/promise-utils.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AACpC,OAAO,EAAE,oBAAoB,EAAE,MAAM,oBAAoB,CAAC;AAE1D;;GAEG;AAEH,eAAO,MAAM,eAAe,QAAS,OAAO,mCAAuC,QAAQ,KAAK,CAG5F,CAAC;AAEL;;GAEG;AACH,eAAO,MAAM,iBAAiB,WAAY,OAAO,oCAShD,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dxos/context",
-  "version": "0.3.2-main.de57e73",
+  "version": "0.3.2-main.ec06501",
   "description": "Async utils.",
   "homepage": "https://dxos.org",
   "bugs": "https://github.com/dxos/dxos/issues",
@@ -16,8 +16,8 @@
     "src"
   ],
   "dependencies": {
-    "@dxos/log": "0.3.2-main.de57e73",
-    "@dxos/util": "0.3.2-main.de57e73"
+    "@dxos/log": "0.3.2-main.ec06501",
+    "@dxos/util": "0.3.2-main.ec06501"
   },
   "publishConfig": {
     "access": "public"

package/src/context-disposed.ts

@@ -0,0 +1,9 @@
+//
+// Copyright 2023 DXOS.org
+//
+
+export class ContextDisposedError extends Error {
+  constructor() {
+    super('Context disposed.');
+  }
+}

package/src/context.ts

@@ -5,6 +5,8 @@
 import { log } from '@dxos/log';
 import { safeInstanceof } from '@dxos/util';
 
+import { ContextDisposedError } from './context-disposed';
+
 export type ContextErrorHandler = (error: Error) => void;
 
 export type DisposeCallback = () => void | Promise<void>;
@@ -34,6 +36,10 @@ export class Context {
 
   constructor({
     onError = (error) => {
+      if (error instanceof ContextDisposedError) {
+        return;
+      }
+
       void this.dispose();
 
       // Will generate an unhandled rejection.

package/src/index.ts

@@ -4,3 +4,4 @@
 
 export * from './context';
 export * from './promise-utils';
+export * from './context-disposed';

package/src/promise-utils.ts

@@ -3,12 +3,13 @@
 //
 
 import { Context } from './context';
+import { ContextDisposedError } from './context-disposed';
 
 /**
  * @returns A promise that rejects when the context is disposed.
  */
 // TODO(dmaretskyi): Memory leak.
-export const rejectOnDispose = (ctx: Context, error = new Error('CANCELLED')): Promise<never> =>
+export const rejectOnDispose = (ctx: Context, error = new ContextDisposedError()): Promise<never> =>
   new Promise((resolve, reject) => {
     ctx.onDispose(() => reject(error));
   });
@@ -22,7 +23,7 @@ export const cancelWithContext = <T>(ctx: Context, promise: Promise<T>): Promise
     promise,
     new Promise<never>((resolve, reject) => {
       // Will be called before .finally() handlers.
-      clearDispose = ctx.onDispose(() => reject(new Error('CANCELLED')));
+      clearDispose = ctx.onDispose(() => reject(new ContextDisposedError()));
     }),
   ]).finally(() => clearDispose?.());
 };