@dxos/async 0.8.4-main.fd6878d → 0.8.4-staging.60fe92afc8

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() {
@@ -64,29 +64,55 @@ var SubscriptionSet = class {
 };
 
 // src/debounce.ts
-var debounce = (cb, delay = 100) => {
+var delay = (cb, delay2 = 100) => {
+  let pending = false;
+  return (...args) => {
+    if (pending) {
+      return;
+    }
+    pending = true;
+    setTimeout(() => {
+      try {
+        cb(...args);
+      } finally {
+        pending = false;
+      }
+    }, delay2);
+  };
+};
+var debounce = (cb, delay2 = 100) => {
   let t;
   return (...args) => {
     clearTimeout(t);
-    t = setTimeout(() => cb(...args), delay);
+    t = setTimeout(() => cb(...args), delay2);
   };
 };
-var throttle = (cb, delay = 100) => {
+var throttle = (cb, delay2 = 100) => {
   let lastCall = 0;
   return (...args) => {
     const now = Date.now();
-    if (now - lastCall >= delay) {
+    if (now - lastCall >= delay2) {
       cb(...args);
       lastCall = now;
     }
   };
 };
-var debounceAndThrottle = (cb, delay = 100) => {
-  const debounced = debounce(cb, delay);
-  const throttled = throttle(cb, delay);
+var debounceAndThrottle = (cb, delay2 = 100) => {
+  let timeout2;
+  let lastCall = 0;
   return (...args) => {
-    debounced(...args);
-    throttled(...args);
+    const now = Date.now();
+    const delta = now - lastCall;
+    clearTimeout(timeout2);
+    if (delta >= delay2) {
+      cb(...args);
+      lastCall = now;
+    } else {
+      timeout2 = setTimeout(() => {
+        cb(...args);
+        lastCall = Date.now();
+      }, delay2 - delta);
+    }
   };
 };
 
@@ -140,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) => {
@@ -148,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);
@@ -187,7 +215,6 @@ var waitForEvent = (eventEmitter, eventName, test, timeout2, error) => {
 
 // src/events.ts
 import { Context } from "@dxos/context";
-var __dxlog_file = "/__w/dxos/dxos/packages/common/async/src/events.ts";
 var DO_NOT_ERROR_ON_ASYNC_CALLBACK = true;
 var Event = class _Event {
   /**
@@ -242,10 +269,7 @@ var Event = class _Event {
       _ctx,
       _callback
     ] : [
-      new Context(void 0, {
-        F: __dxlog_file,
-        L: 132
-      }),
+      new Context(),
       _ctx
     ];
     const weak = !!options?.weak;
@@ -275,10 +299,7 @@ var Event = class _Event {
       _ctx,
       _callback
     ] : [
-      new Context(void 0, {
-        F: __dxlog_file,
-        L: 169
-      }),
+      new Context(),
       _ctx
     ];
     const listener = new EventListener(this, callback, ctx, true, false);
@@ -451,12 +472,11 @@ var EventListener = class {
   once;
   weak;
   callback;
-  _clearDispose;
+  _clearDispose = void 0;
   constructor(event, listener, ctx, once, weak) {
     this.ctx = ctx;
     this.once = once;
     this.weak = weak;
-    this._clearDispose = void 0;
     this._clearDispose = ctx.onDispose(() => {
       event._removeListener(this);
     });
@@ -582,7 +602,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) => {
@@ -613,7 +633,6 @@ import PushStream from "zen-push";
 
 // src/trigger.ts
 import { invariant } from "@dxos/invariant";
-var __dxlog_file2 = "/__w/dxos/dxos/packages/common/async/src/trigger.ts";
 var trigger = (timeout2) => {
   let callback;
   const promise = new Promise((resolve, reject) => {
@@ -629,23 +648,22 @@ var trigger = (timeout2) => {
     resolver
   ];
 };
-var TriggerState = /* @__PURE__ */ function(TriggerState2) {
+var TriggerState = /* @__PURE__ */ (function(TriggerState2) {
   TriggerState2["WAITING"] = "WAITING";
   TriggerState2["RESOLVED"] = "RESOLVED";
   TriggerState2["REJECTED"] = "REJECTED";
   return TriggerState2;
-}({});
+})({});
 var Trigger = class {
   _options;
   _promise;
   _resolve;
   _reject;
-  _state;
+  _state = "WAITING";
   constructor(_options = {
     autoReset: false
   }) {
     this._options = _options;
-    this._state = "WAITING";
     this.reset();
   }
   get state() {
@@ -706,15 +724,7 @@ var Trigger = class {
   }
 };
 var latch = ({ count = 1, timeout: timeout2 } = {}) => {
-  invariant(count >= 0, void 0, {
-    F: __dxlog_file2,
-    L: 139,
-    S: void 0,
-    A: [
-      "count >= 0",
-      ""
-    ]
-  });
+  invariant(count >= 0);
   let t;
   let doResolve;
   let doReject;
@@ -755,23 +765,11 @@ var latch = ({ count = 1, timeout: timeout2 } = {}) => {
 // src/observable.ts
 var MulticastObservable = class _MulticastObservable extends Observable {
   _value;
-  _observers;
+  _observers = /* @__PURE__ */ new Set();
   _observable;
-  _completed;
+  _completed = new Trigger();
   constructor(subscriber, _value) {
-    super((observer) => this._subscribe(observer)), this._value = _value, this._observers = /* @__PURE__ */ new Set(), this._completed = new Trigger(), this._handlers = {
-      next: (value) => {
-        this._value = value;
-        this._observers.forEach((observer) => observer.next?.(value));
-      },
-      error: (err) => {
-        this._observers.forEach((observer) => observer.error?.(err));
-      },
-      complete: () => {
-        this._completed.wake();
-        this._observers.forEach((observer) => observer.complete?.());
-      }
-    };
+    super((observer) => this._subscribe(observer)), this._value = _value;
     this._observable = typeof subscriber === "function" ? new Observable(subscriber) : subscriber;
     this._observable.subscribe(this._handlers);
   }
@@ -855,7 +853,19 @@ var MulticastObservable = class _MulticastObservable extends Observable {
       this._observers.delete(observer);
     };
   }
-  _handlers;
+  _handlers = {
+    next: (value) => {
+      this._value = value;
+      this._observers.forEach((observer) => observer.next?.(value));
+    },
+    error: (err) => {
+      this._observers.forEach((observer) => observer.error?.(err));
+    },
+    complete: () => {
+      this._completed.wake();
+      this._observers.forEach((observer) => observer.complete?.());
+    }
+  };
 };
 var EMPTY_OBSERVABLE = MulticastObservable.of(null);
 
@@ -888,9 +898,9 @@ var ObservableProvider = class {
 };
 var CancellableObservableProvider = class extends ObservableProvider {
   _handleCancel;
-  _cancelled;
+  _cancelled = false;
   constructor(_handleCancel) {
-    super(), this._handleCancel = _handleCancel, this._cancelled = false;
+    super(), this._handleCancel = _handleCancel;
   }
   get cancelled() {
     return this._cancelled;
@@ -911,16 +921,15 @@ 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
 import { StackTrace } from "@dxos/debug";
 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 () => {
@@ -967,31 +976,11 @@ var dumpLeaks = () => {
   if (!enabled) {
     return;
   }
-  log.info(`Leaked resources ${openResources.size}:`, void 0, {
-    F: __dxlog_file3,
-    L: 82,
-    S: void 0,
-    C: (f, a) => f(...a)
-  });
+  log.info(`Leaked resources ${openResources.size}:`);
   for (const resource of openResources) {
-    log.info(`- ${resource.name} at`, void 0, {
-      F: __dxlog_file3,
-      L: 84,
-      S: void 0,
-      C: (f, a) => f(...a)
-    });
-    log.info(resource.openStack.getStack(1), void 0, {
-      F: __dxlog_file3,
-      L: 85,
-      S: void 0,
-      C: (f, a) => f(...a)
-    });
-    log.info("\n", void 0, {
-      F: __dxlog_file3,
-      L: 86,
-      S: void 0,
-      C: (f, a) => f(...a)
-    });
+    log.info(`- ${resource.name} at`);
+    log.info(resource.openStack.getStack(1));
+    log.info("\n");
   }
 };
 if (enabled) {
@@ -1002,15 +991,12 @@ if (enabled) {
 var DeferredTask = class {
   _ctx;
   _callback;
-  _scheduled;
-  _currentTask;
-  _nextTask;
+  _scheduled = false;
+  _currentTask = null;
+  _nextTask = new Trigger();
   constructor(_ctx, _callback) {
     this._ctx = _ctx;
     this._callback = _callback;
-    this._scheduled = false;
-    this._currentTask = null;
-    this._nextTask = new Trigger();
   }
   get scheduled() {
     return this._scheduled;
@@ -1051,6 +1037,79 @@ var DeferredTask = class {
     await this._currentTask;
   }
 };
+var AsyncTask = class {
+  #callback;
+  #ctx = void 0;
+  #scheduled = false;
+  #currentTask = null;
+  #nextTask = new Trigger();
+  constructor(callback) {
+    this.#callback = callback;
+  }
+  get scheduled() {
+    return this.#scheduled;
+  }
+  /**
+  * Context of the resource that owns the task.
+  * When the context is disposed, the task is cancelled and cannot be scheduled again.
+  */
+  open() {
+    this.#ctx = new Context2();
+  }
+  /**
+  * Closes the task and waits for it to finish if it is running.
+  */
+  async close() {
+    await this.#ctx?.dispose();
+    await this.join();
+    this.#ctx = void 0;
+  }
+  [Symbol.asyncDispose]() {
+    return this.close();
+  }
+  /**
+  * 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");
+    }
+    if (this.#scheduled) {
+      return;
+    }
+    scheduleTask(this.#ctx, async () => {
+      await this.#currentTask;
+      if (!this.#ctx || this.#ctx.disposed) {
+        return;
+      }
+      this.#scheduled = false;
+      const completionTrigger = this.#nextTask;
+      this.#nextTask = new Trigger();
+      this.#currentTask = runInContextAsync(this.#ctx, () => this.#callback()).then(() => {
+        completionTrigger.wake();
+      });
+    });
+    this.#scheduled = true;
+  }
+  /**
+  * Schedule the task to run and wait for it to finish.
+  */
+  async runBlocking() {
+    if (this.#ctx?.disposed) {
+      throw new ContextDisposedError2();
+    }
+    this.schedule();
+    await this.#nextTask.wait();
+  }
+  /**
+  * Waits for the current task to finish if it is running.
+  * Does not schedule a new task.
+  */
+  async join() {
+    await this.#currentTask;
+  }
+};
 var runInContext = (ctx, fn) => {
   try {
     fn();
@@ -1136,9 +1195,9 @@ 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 INIT_RESTART_DELAY = 100;
 var DEFAULT_MAX_RESTART_DELAY = 5e3;
+var STABLE_CONNECTION_THRESHOLD = 5e3;
 var PersistentLifecycle = class extends Resource {
   _start;
   _stop;
@@ -1147,6 +1206,7 @@ var PersistentLifecycle = class extends Resource {
   _currentState = void 0;
   _restartTask = void 0;
   _restartAfter = 0;
+  _connectedAt = void 0;
   constructor({ start, stop, onRestart, maxRestartDelay = DEFAULT_MAX_RESTART_DELAY }) {
     super();
     this._start = start;
@@ -1162,29 +1222,27 @@ var PersistentLifecycle = class extends Resource {
       try {
         await this._restart();
       } catch (err) {
+        if (this._ctx?.disposed) {
+          return;
+        }
         log2.warn("Restart failed", {
           err
-        }, {
-          F: __dxlog_file4,
-          L: 72,
-          S: this,
-          C: (f, a) => f(...a)
         });
         this._restartTask?.schedule();
       }
     });
-    this._currentState = await this._start().catch((err) => {
+    try {
+      this._currentState = await this._start();
+      this._connectedAt = Date.now();
+    } catch (err) {
+      if (this._ctx?.disposed) {
+        return;
+      }
       log2.warn("Start failed", {
         err
-      }, {
-        F: __dxlog_file4,
-        L: 78,
-        S: this,
-        C: (f, a) => f(...a)
       });
       this._restartTask?.schedule();
-      return void 0;
-    });
+    }
   }
   async _close() {
     await this._restartTask?.join();
@@ -1194,12 +1252,11 @@ var PersistentLifecycle = class extends Resource {
   async _restart() {
     log2(`restarting in ${this._restartAfter}ms`, {
       state: this._lifecycleState
-    }, {
-      F: __dxlog_file4,
-      L: 91,
-      S: this,
-      C: (f, a) => f(...a)
     });
+    if (this._connectedAt !== void 0 && Date.now() - this._connectedAt >= STABLE_CONNECTION_THRESHOLD) {
+      this._restartAfter = 0;
+    }
+    this._connectedAt = void 0;
     await this._stopCurrentState();
     if (this._lifecycleState !== LifecycleState.OPEN) {
       return;
@@ -1209,7 +1266,7 @@ var PersistentLifecycle = class extends Resource {
     await warnAfterTimeout2(5e3, "Connection establishment takes too long", async () => {
       this._currentState = await this._start();
     });
-    this._restartAfter = 0;
+    this._connectedAt = Date.now();
     await this._onRestart?.();
   }
   async _stopCurrentState() {
@@ -1217,12 +1274,7 @@ var PersistentLifecycle = class extends Resource {
       try {
         await this._stop(this._currentState);
       } catch (err) {
-        log2.catch(err, void 0, {
-          F: __dxlog_file4,
-          L: 113,
-          S: this,
-          C: (f, a) => f(...a)
-        });
+        log2.catch(err);
       }
       this._currentState = void 0;
     }
@@ -1246,7 +1298,6 @@ _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 makePushIterable = () => {
   const buf = [];
   const trigger2 = new Trigger({
@@ -1260,15 +1311,7 @@ var makePushIterable = () => {
             await trigger2.wait();
           }
           const item = buf.shift();
-          invariant2(item, void 0, {
-            F: __dxlog_file5,
-            L: 42,
-            S: this,
-            A: [
-              "item",
-              ""
-            ]
-          });
+          invariant2(item);
           switch (item.kind) {
             case "next":
               return {
@@ -1447,13 +1490,11 @@ var untilError = (cb) => {
 // src/timer.ts
 var Timer = class {
   _callback;
-  _state;
+  _state = new Event();
   _timer;
-  _count;
+  _count = 0;
   constructor(_callback) {
     this._callback = _callback;
-    this._state = new Event();
-    this._count = 0;
   }
   get state() {
     return this._state;
@@ -1506,16 +1547,13 @@ var UpdateScheduler = class {
   * Promise that resolves when the callback is done.
   * Never rejects.
   */
-  _promise;
-  _scheduled;
-  _lastUpdateTime;
+  _promise = null;
+  _scheduled = false;
+  _lastUpdateTime = -TIME_PERIOD;
   constructor(_ctx, _callback, _params = {}) {
     this._ctx = _ctx;
     this._callback = _callback;
     this._params = _params;
-    this._promise = null;
-    this._scheduled = false;
-    this._lastUpdateTime = -TIME_PERIOD;
     _ctx.onDispose(async () => {
       await this._promise;
     });
@@ -1528,13 +1566,13 @@ var UpdateScheduler = class {
       await this._promise;
       if (this._params.maxFrequency) {
         const now = performance.now();
-        const delay = this._lastUpdateTime + TIME_PERIOD / this._params.maxFrequency - now;
-        if (delay > 0) {
+        const delay2 = this._lastUpdateTime + TIME_PERIOD / this._params.maxFrequency - now;
+        if (delay2 > 0) {
           await new Promise((resolve) => {
             const timeoutId = setTimeout(() => {
               clearContext();
               resolve();
-            }, delay);
+            }, delay2);
             const clearContext = this._ctx.onDispose(() => {
               clearTimeout(timeoutId);
               resolve();
@@ -1578,6 +1616,7 @@ var UpdateScheduler = class {
   }
 };
 export {
+  AsyncTask,
   CancellableObservableProvider,
   DeferredTask,
   Event,
@@ -1604,6 +1643,7 @@ export {
   combine,
   debounce,
   debounceAndThrottle,
+  delay,
   dumpLeaks,
   interval,
   latch,