@dxos/async 0.8.4-main.fbb7a13 → 0.8.4-main.fcfe5033a5

package/dist/lib/browser/index.mjs

@@ -22,7 +22,7 @@ var chain = (chain2) => async (elements) => {
 import { ComplexMap } from "@dxos/util";
 var combine = (...cleanupFns) => {
   return () => {
-    cleanupFns.flat().forEach((cleanupFn) => cleanupFn());
+    cleanupFns.flat().filter((f) => typeof f === "function").forEach((cleanupFn) => cleanupFn());
   };
 };
 var timeout = (cb, ms = 0) => {
@@ -39,8 +39,8 @@ var addEventListener = (target, type, listener, options) => {
 };
 var SubscriptionList = class {
   _cleanups = [];
-  add(cb) {
-    this._cleanups.push(cb);
+  add(...cb) {
+    this._cleanups.push(...cb);
     return this;
   }
   clear() {
@@ -166,6 +166,9 @@ var sleepWithContext = (ctx, ms) => {
 };
 var asyncReturn = () => sleep(0);
 var asyncTimeout = async (promise, timeout2, err) => {
+  if (typeof promise === "function") {
+    throw new Error("First argument must be a promise.");
+  }
   let timeoutId;
   const throwable = err === void 0 || typeof err === "string" ? new TimeoutError(timeout2, err) : err;
   const timeoutPromise = new Promise((resolve, reject) => {
@@ -174,9 +177,8 @@ var asyncTimeout = async (promise, timeout2, err) => {
     }, timeout2);
     unrefTimeout(timeoutId);
   });
-  const conditionTimeout = typeof promise === "function" ? promiseFromCallback(promise) : promise;
   return await Promise.race([
-    conditionTimeout,
+    promise,
     timeoutPromise
   ]).finally(() => {
     clearTimeout(timeoutId);
@@ -607,7 +609,7 @@ var MutexGuard = class {
     this.release();
   }
 };
-var classMutexSymbol = Symbol("class-mutex");
+var classMutexSymbol = /* @__PURE__ */ Symbol("class-mutex");
 var FORCE_DISABLE_WARNING = false;
 var enableWarning = !FORCE_DISABLE_WARNING && globalThis.mochaExecutor;
 var synchronized = (target, propertyName, descriptor) => {
@@ -935,7 +937,7 @@ import { warnAfterTimeout as warnAfterTimeout2 } from "@dxos/debug";
 import { log as log2 } from "@dxos/log";
 
 // src/task-scheduling.ts
-import { ContextDisposedError as ContextDisposedError2 } from "@dxos/context";
+import { Context as Context2, ContextDisposedError as ContextDisposedError2 } from "@dxos/context";
 import { StackTrace as StackTrace2 } from "@dxos/debug";
 
 // src/track-leaks.ts
@@ -944,7 +946,7 @@ import { log } from "@dxos/log";
 var __dxlog_file3 = "/__w/dxos/dxos/packages/common/async/src/track-leaks.ts";
 var enabled = typeof process !== "undefined" && !!process.env.DX_TRACK_LEAKS;
 var openResources = /* @__PURE__ */ new Set();
-var handleSymbol = Symbol("checkLeaksHandle");
+var handleSymbol = /* @__PURE__ */ Symbol("checkLeaksHandle");
 var trackResource = (resourceProvider) => {
   if (!enabled) {
     return () => {
@@ -1023,6 +1025,7 @@ if (enabled) {
 }
 
 // src/task-scheduling.ts
+var __dxlog_file4 = "/__w/dxos/dxos/packages/common/async/src/task-scheduling.ts";
 var DeferredTask = class {
   _ctx;
   _callback;
@@ -1088,16 +1091,19 @@ var AsyncTask = class {
   * Context of the resource that owns the task.
   * When the context is disposed, the task is cancelled and cannot be scheduled again.
   */
-  // TODO(dmaretskyi): We don't really need to pass ctx in here, since close will also signal dispose.
-  open(ctx) {
-    this.#ctx = ctx;
+  open() {
+    this.#ctx = new Context2(void 0, {
+      F: __dxlog_file4,
+      L: 102
+    });
   }
   /**
   * Closes the task and waits for it to finish if it is running.
   */
   async close() {
-    this.#ctx = void 0;
+    await this.#ctx?.dispose();
     await this.join();
+    this.#ctx = void 0;
   }
   [Symbol.asyncDispose]() {
     return this.close();
@@ -1105,6 +1111,7 @@ var AsyncTask = class {
   /**
   * Schedule the task to run asynchronously.
   */
+  // TODO(dmaretskyi): Add scheduleAt. Where the earlier time will override the later one.
   schedule() {
     if (!this.#ctx || this.#ctx.disposed) {
       throw new Error("AsyncTask not open");
@@ -1229,7 +1236,7 @@ function _ts_decorate(decorators, target, key, desc) {
   else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
   return c > 3 && r && Object.defineProperty(target, key, r), r;
 }
-var __dxlog_file4 = "/__w/dxos/dxos/packages/common/async/src/persistent-lifecycle.ts";
+var __dxlog_file5 = "/__w/dxos/dxos/packages/common/async/src/persistent-lifecycle.ts";
 var INIT_RESTART_DELAY = 100;
 var DEFAULT_MAX_RESTART_DELAY = 5e3;
 var PersistentLifecycle = class extends Resource {
@@ -1258,7 +1265,7 @@ var PersistentLifecycle = class extends Resource {
         log2.warn("Restart failed", {
           err
         }, {
-          F: __dxlog_file4,
+          F: __dxlog_file5,
           L: 72,
           S: this,
           C: (f, a) => f(...a)
@@ -1270,7 +1277,7 @@ var PersistentLifecycle = class extends Resource {
       log2.warn("Start failed", {
         err
       }, {
-        F: __dxlog_file4,
+        F: __dxlog_file5,
         L: 78,
         S: this,
         C: (f, a) => f(...a)
@@ -1288,7 +1295,7 @@ var PersistentLifecycle = class extends Resource {
     log2(`restarting in ${this._restartAfter}ms`, {
       state: this._lifecycleState
     }, {
-      F: __dxlog_file4,
+      F: __dxlog_file5,
       L: 91,
       S: this,
       C: (f, a) => f(...a)
@@ -1311,7 +1318,7 @@ var PersistentLifecycle = class extends Resource {
         await this._stop(this._currentState);
       } catch (err) {
         log2.catch(err, void 0, {
-          F: __dxlog_file4,
+          F: __dxlog_file5,
           L: 113,
           S: this,
           C: (f, a) => f(...a)
@@ -1339,7 +1346,7 @@ _ts_decorate([
 
 // src/push-iterable.ts
 import { invariant as invariant2 } from "@dxos/invariant";
-var __dxlog_file5 = "/__w/dxos/dxos/packages/common/async/src/push-iterable.ts";
+var __dxlog_file6 = "/__w/dxos/dxos/packages/common/async/src/push-iterable.ts";
 var makePushIterable = () => {
   const buf = [];
   const trigger2 = new Trigger({
@@ -1354,7 +1361,7 @@ var makePushIterable = () => {
           }
           const item = buf.shift();
           invariant2(item, void 0, {
-            F: __dxlog_file5,
+            F: __dxlog_file6,
             L: 42,
             S: this,
             A: [