@dxos/edge-client 0.7.5-labs.ea4b4c2 → 0.7.5-labs.f400bbc

package/dist/lib/node-esm/index.mjs

@@ -10,9 +10,9 @@ import {
 export * from "@dxos/protocols/buf/dxos/edge/messenger_pb";
 
 // packages/core/mesh/edge-client/src/edge-client.ts
-import { Trigger, scheduleMicroTask, TriggerState } from "@dxos/async";
-import { Resource as Resource3 } from "@dxos/context";
-import { log as log3, logInfo as logInfo2 } from "@dxos/log";
+import { Trigger, scheduleMicroTask, TriggerState, PersistentLifecycle } from "@dxos/async";
+import { Resource as Resource2 } from "@dxos/context";
+import { log as log2, logInfo as logInfo2 } from "@dxos/log";
 
 // packages/core/mesh/edge-client/src/edge-identity.ts
 import { invariant } from "@dxos/invariant";
@@ -289,118 +289,6 @@ var EdgeIdentityChangedError = class extends Error {
   }
 };
 
-// packages/core/mesh/edge-client/src/persistent-lifecycle.ts
-import { DeferredTask, sleep, synchronized } from "@dxos/async";
-import { cancelWithContext, LifecycleState, Resource as Resource2 } from "@dxos/context";
-import { warnAfterTimeout } from "@dxos/debug";
-import { log as log2 } from "@dxos/log";
-function _ts_decorate2(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") r = Reflect.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_file3 = "/home/runner/work/dxos/dxos/packages/core/mesh/edge-client/src/persistent-lifecycle.ts";
-var INIT_RESTART_DELAY = 100;
-var DEFAULT_MAX_RESTART_DELAY = 5e3;
-var PersistentLifecycle = class extends Resource2 {
-  constructor({ start, stop, onRestart, maxRestartDelay = DEFAULT_MAX_RESTART_DELAY }) {
-    super();
-    this._currentContext = void 0;
-    this._restartTask = void 0;
-    this._restartAfter = 0;
-    this._start = start;
-    this._stop = stop;
-    this._onRestart = onRestart;
-    this._maxRestartDelay = maxRestartDelay;
-  }
-  async _open() {
-    this._restartTask = new DeferredTask(this._ctx, async () => {
-      try {
-        await this._restart();
-      } catch (err) {
-        log2.warn("Restart failed", {
-          err
-        }, {
-          F: __dxlog_file3,
-          L: 65,
-          S: this,
-          C: (f, a) => f(...a)
-        });
-        this._restartTask?.schedule();
-      }
-    });
-    this._currentContext = await this._start().catch((err) => {
-      log2.warn("Start failed", {
-        err
-      }, {
-        F: __dxlog_file3,
-        L: 70,
-        S: this,
-        C: (f, a) => f(...a)
-      });
-      this._restartTask?.schedule();
-      return void 0;
-    });
-  }
-  async _close() {
-    await this._restartTask?.join();
-    await this._stopCurrentContext();
-    this._restartTask = void 0;
-  }
-  async _restart() {
-    log2(`restarting in ${this._restartAfter}ms`, {
-      state: this._lifecycleState
-    }, {
-      F: __dxlog_file3,
-      L: 83,
-      S: this,
-      C: (f, a) => f(...a)
-    });
-    await this._stopCurrentContext();
-    if (this._lifecycleState !== LifecycleState.OPEN) {
-      return;
-    }
-    await cancelWithContext(this._ctx, sleep(this._restartAfter));
-    this._restartAfter = Math.min(Math.max(this._restartAfter * 2, INIT_RESTART_DELAY), this._maxRestartDelay);
-    await warnAfterTimeout(5e3, "Connection establishment takes too long", async () => {
-      this._currentContext = await this._start();
-    });
-    this._restartAfter = 0;
-    await this._onRestart?.();
-  }
-  async _stopCurrentContext() {
-    if (this._currentContext) {
-      try {
-        await this._stop(this._currentContext);
-      } catch (err) {
-        log2.catch(err, void 0, {
-          F: __dxlog_file3,
-          L: 105,
-          S: this,
-          C: (f, a) => f(...a)
-        });
-      }
-      this._currentContext = void 0;
-    }
-  }
-  /**
-  * Scheduling restart should be done from outside.
-  */
-  scheduleRestart() {
-    if (this._lifecycleState !== LifecycleState.OPEN) {
-      return;
-    }
-    this._restartTask.schedule();
-  }
-};
-_ts_decorate2([
-  synchronized
-], PersistentLifecycle.prototype, "_open", null);
-_ts_decorate2([
-  synchronized
-], PersistentLifecycle.prototype, "scheduleRestart", null);
-
 // packages/core/mesh/edge-client/src/utils.ts
 var getEdgeUrlWithProtocol = (baseUrl, protocol2) => {
   const isSecure = baseUrl.startsWith("https") || baseUrl.startsWith("wss");
@@ -410,15 +298,15 @@ var getEdgeUrlWithProtocol = (baseUrl, protocol2) => {
 };
 
 // packages/core/mesh/edge-client/src/edge-client.ts
-function _ts_decorate3(decorators, target, key, desc) {
+function _ts_decorate2(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") r = Reflect.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 = "/home/runner/work/dxos/dxos/packages/core/mesh/edge-client/src/edge-client.ts";
+var __dxlog_file3 = "/home/runner/work/dxos/dxos/packages/core/mesh/edge-client/src/edge-client.ts";
 var DEFAULT_TIMEOUT = 1e4;
-var EdgeClient = class extends Resource3 {
+var EdgeClient = class extends Resource2 {
   constructor(_identity, _config) {
     super();
     this._identity = _identity;
@@ -453,12 +341,12 @@ var EdgeClient = class extends Resource3 {
   }
   setIdentity(identity) {
     if (identity.identityKey !== this._identity.identityKey || identity.peerKey !== this._identity.peerKey) {
-      log3("Edge identity changed", {
+      log2("Edge identity changed", {
         identity,
         oldIdentity: this._identity
       }, {
-        F: __dxlog_file4,
-        L: 95,
+        F: __dxlog_file3,
+        L: 94,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -479,9 +367,9 @@ var EdgeClient = class extends Resource3 {
           try {
             listener();
           } catch (error) {
-            log3.catch(error, void 0, {
-              F: __dxlog_file4,
-              L: 117,
+            log2.catch(error, void 0, {
+              F: __dxlog_file3,
+              L: 116,
               S: this,
               C: (f, a) => f(...a)
             });
@@ -495,20 +383,20 @@ var EdgeClient = class extends Resource3 {
   * Open connection to messaging service.
   */
   async _open() {
-    log3("opening...", {
+    log2("opening...", {
       info: this.info
     }, {
-      F: __dxlog_file4,
-      L: 129,
+      F: __dxlog_file3,
+      L: 128,
       S: this,
       C: (f, a) => f(...a)
     });
     this._persistentLifecycle.open().catch((err) => {
-      log3.warn("Error while opening connection", {
+      log2.warn("Error while opening connection", {
         err
       }, {
-        F: __dxlog_file4,
-        L: 131,
+        F: __dxlog_file3,
+        L: 130,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -518,11 +406,11 @@ var EdgeClient = class extends Resource3 {
   * Close connection and free resources.
   */
   async _close() {
-    log3("closing...", {
+    log2("closing...", {
       peerKey: this._identity.peerKey
     }, {
-      F: __dxlog_file4,
-      L: 139,
+      F: __dxlog_file3,
+      L: 138,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -537,9 +425,9 @@ var EdgeClient = class extends Resource3 {
     const path = `/ws/${identity.identityKey}/${identity.peerKey}`;
     const protocolHeader = this._config.disableAuth ? void 0 : await this._createAuthHeader(path);
     if (this._identity !== identity) {
-      log3("identity changed during auth header request", void 0, {
-        F: __dxlog_file4,
-        L: 153,
+      log2("identity changed during auth header request", void 0, {
+        F: __dxlog_file3,
+        L: 152,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -547,12 +435,12 @@ var EdgeClient = class extends Resource3 {
     }
     const restartRequired = new Trigger();
     const url = new URL(path, this._baseWsUrl);
-    log3("Opening websocket", {
+    log2("Opening websocket", {
       url: url.toString(),
       protocolHeader
     }, {
-      F: __dxlog_file4,
-      L: 159,
+      F: __dxlog_file3,
+      L: 158,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -565,9 +453,9 @@ var EdgeClient = class extends Resource3 {
           this._ready.wake();
           this._notifyReconnected();
         } else {
-          log3.verbose("connected callback ignored, because connection is not active", void 0, {
-            F: __dxlog_file4,
-            L: 169,
+          log2.verbose("connected callback ignored, because connection is not active", void 0, {
+            F: __dxlog_file3,
+            L: 168,
             S: this,
             C: (f, a) => f(...a)
           });
@@ -578,9 +466,9 @@ var EdgeClient = class extends Resource3 {
           this._closeCurrentConnection();
           this._persistentLifecycle.scheduleRestart();
         } else {
-          log3.verbose("restart requested by inactive connection", void 0, {
-            F: __dxlog_file4,
-            L: 177,
+          log2.verbose("restart requested by inactive connection", void 0, {
+            F: __dxlog_file3,
+            L: 176,
             S: this,
             C: (f, a) => f(...a)
           });
@@ -591,12 +479,12 @@ var EdgeClient = class extends Resource3 {
         if (this._isActive(connection)) {
           this._notifyMessageReceived(message);
         } else {
-          log3.verbose("ignored a message on inactive connection", {
+          log2.verbose("ignored a message on inactive connection", {
             from: message.source,
             type: message.payload?.typeUrl
           }, {
-            F: __dxlog_file4,
-            L: 185,
+            F: __dxlog_file3,
+            L: 184,
             S: this,
             C: (f, a) => f(...a)
           });
@@ -626,11 +514,11 @@ var EdgeClient = class extends Resource3 {
       try {
         listener();
       } catch (err) {
-        log3.error("ws reconnect listener failed", {
+        log2.error("ws reconnect listener failed", {
           err
         }, {
-          F: __dxlog_file4,
-          L: 218,
+          F: __dxlog_file3,
+          L: 217,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -642,12 +530,12 @@ var EdgeClient = class extends Resource3 {
       try {
         listener(message);
       } catch (err) {
-        log3.error("ws incoming message processing failed", {
+        log2.error("ws incoming message processing failed", {
           err,
           payload: protocol.getPayloadType(message)
         }, {
-          F: __dxlog_file4,
-          L: 228,
+          F: __dxlog_file3,
+          L: 227,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -660,9 +548,9 @@ var EdgeClient = class extends Resource3 {
   */
   async send(message) {
     if (this._ready.state !== TriggerState.RESOLVED) {
-      log3("waiting for websocket to become ready", void 0, {
-        F: __dxlog_file4,
-        L: 239,
+      log2("waiting for websocket to become ready", void 0, {
+        F: __dxlog_file3,
+        L: 238,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -687,12 +575,12 @@ var EdgeClient = class extends Resource3 {
     if (response.status === 401) {
       return encodePresentationWsAuthHeader(await handleAuthChallenge(response, this._identity));
     } else {
-      log3.warn("no auth challenge from edge", {
+      log2.warn("no auth challenge from edge", {
         status: response.status,
         statusText: response.statusText
       }, {
-        F: __dxlog_file4,
-        L: 264,
+        F: __dxlog_file3,
+        L: 263,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -700,7 +588,7 @@ var EdgeClient = class extends Resource3 {
     }
   }
 };
-_ts_decorate3([
+_ts_decorate2([
   logInfo2
 ], EdgeClient.prototype, "info", null);
 var encodePresentationWsAuthHeader = (encodedPresentation) => {
@@ -713,7 +601,7 @@ import { createCredential, signPresentation } from "@dxos/credentials";
 import { invariant as invariant3 } from "@dxos/invariant";
 import { Keyring } from "@dxos/keyring";
 import { PublicKey } from "@dxos/keys";
-var __dxlog_file5 = "/home/runner/work/dxos/dxos/packages/core/mesh/edge-client/src/auth.ts";
+var __dxlog_file4 = "/home/runner/work/dxos/dxos/packages/core/mesh/edge-client/src/auth.ts";
 var createDeviceEdgeIdentity = async (signer, key) => {
   return {
     identityKey: key.toHex(),
@@ -758,7 +646,7 @@ var createChainEdgeIdentity = async (signer, identityKey, peerKey, chain, creden
     peerKey: peerKey.toHex(),
     presentCredentials: async ({ challenge }) => {
       invariant3(chain, void 0, {
-        F: __dxlog_file5,
+        F: __dxlog_file4,
         L: 75,
         S: void 0,
         A: [
@@ -820,26 +708,29 @@ var createStubEdgeIdentity = () => {
 };
 
 // packages/core/mesh/edge-client/src/edge-http-client.ts
-import { sleep as sleep2 } from "@dxos/async";
+import { sleep } from "@dxos/async";
 import { Context as Context2 } from "@dxos/context";
-import { log as log4 } from "@dxos/log";
+import { log as log3 } from "@dxos/log";
 import { EdgeCallFailedError, EdgeAuthChallengeError } from "@dxos/protocols";
-var __dxlog_file6 = "/home/runner/work/dxos/dxos/packages/core/mesh/edge-client/src/edge-http-client.ts";
+var __dxlog_file5 = "/home/runner/work/dxos/dxos/packages/core/mesh/edge-client/src/edge-http-client.ts";
 var DEFAULT_RETRY_TIMEOUT = 1500;
 var DEFAULT_RETRY_JITTER = 500;
 var DEFAULT_MAX_RETRIES_COUNT = 3;
 var EdgeHttpClient = class {
   constructor(baseUrl) {
     this._baseUrl = getEdgeUrlWithProtocol(baseUrl, "http");
-    log4("created", {
+    log3("created", {
       url: this._baseUrl
     }, {
-      F: __dxlog_file6,
+      F: __dxlog_file5,
       L: 49,
       S: this,
       C: (f, a) => f(...a)
     });
   }
+  get baseUrl() {
+    return this._baseUrl;
+  }
   setIdentity(identity) {
     if (this._edgeIdentity?.identityKey !== identity.identityKey || this._edgeIdentity?.peerKey !== identity.peerKey) {
       this._edgeIdentity = identity;
@@ -950,8 +841,8 @@ var EdgeHttpClient = class {
   }
   async _call(path, args) {
     const requestContext = args.context ?? new Context2(void 0, {
-      F: __dxlog_file6,
-      L: 173
+      F: __dxlog_file5,
+      L: 177
     });
     const shouldRetry = createRetryHandler(args);
     let url = `${this._baseUrl}${path.startsWith("/") ? path.slice(1) : path}`;
@@ -962,13 +853,13 @@ var EdgeHttpClient = class {
       }
       url += `?${queryParams.toString()}`;
     }
-    log4("call", {
+    log3("call", {
       method: args.method,
       path,
       request: args.body
     }, {
-      F: __dxlog_file6,
-      L: 185,
+      F: __dxlog_file5,
+      L: 189,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -986,12 +877,12 @@ var EdgeHttpClient = class {
           if (body.success) {
             return body.data;
           }
-          log4("unsuccessful edge response", {
+          log3("unsuccessful edge response", {
             path,
             body
           }, {
-            F: __dxlog_file6,
-            L: 204,
+            F: __dxlog_file5,
+            L: 208,
             S: this,
             C: (f, a) => f(...a)
           });
@@ -1011,12 +902,12 @@ var EdgeHttpClient = class {
         processingError = EdgeCallFailedError.fromProcessingFailureCause(error);
       }
       if (processingError.isRetryable && await shouldRetry(requestContext, retryAfterHeaderValue)) {
-        log4("retrying edge request", {
+        log3("retrying edge request", {
           path,
           processingError
         }, {
-          F: __dxlog_file6,
-          L: 223,
+          F: __dxlog_file5,
+          L: 227,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -1027,9 +918,9 @@ var EdgeHttpClient = class {
   }
   async _handleUnauthorized(response) {
     if (!this._edgeIdentity) {
-      log4.warn("edge unauthorized response received before identity was set", void 0, {
-        F: __dxlog_file6,
-        L: 232,
+      log3.warn("edge unauthorized response received before identity was set", void 0, {
+        F: __dxlog_file5,
+        L: 236,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -1037,9 +928,9 @@ var EdgeHttpClient = class {
     }
     const challenge = await handleAuthChallenge(response, this._edgeIdentity);
     this._authHeader = encodeAuthHeader(challenge);
-    log4("auth header updated", void 0, {
-      F: __dxlog_file6,
-      L: 237,
+    log3("auth header updated", void 0, {
+      F: __dxlog_file5,
+      L: 241,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -1059,10 +950,10 @@ var createRetryHandler = (args) => {
       return false;
     }
     if (retryAfter) {
-      await sleep2(retryAfter);
+      await sleep(retryAfter);
     } else {
       const timeout = baseTimeout + Math.random() * jitter;
-      await sleep2(timeout);
+      await sleep(timeout);
     }
     return true;
   };