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

package/dist/lib/node/index.cjs

@@ -59,17 +59,13 @@ var import_invariant2 = require("@dxos/invariant");
 var import_log2 = require("@dxos/log");
 var import_buf = require("@dxos/protocols/buf");
 var import_messenger_pb = require("@dxos/protocols/buf/dxos/edge/messenger_pb");
-var import_async3 = require("@dxos/async");
-var import_context3 = require("@dxos/context");
-var import_debug = require("@dxos/debug");
-var import_log3 = require("@dxos/log");
 var import_credentials = require("@dxos/credentials");
 var import_invariant3 = require("@dxos/invariant");
 var import_keyring = require("@dxos/keyring");
 var import_keys = require("@dxos/keys");
-var import_async4 = require("@dxos/async");
-var import_context4 = require("@dxos/context");
-var import_log4 = require("@dxos/log");
+var import_async3 = require("@dxos/async");
+var import_context3 = require("@dxos/context");
+var import_log3 = require("@dxos/log");
 var import_protocols = require("@dxos/protocols");
 var __dxlog_file = "/home/runner/work/dxos/dxos/packages/core/mesh/edge-client/src/edge-identity.ts";
 var handleAuthChallenge = async (failedResponse, identity) => {
@@ -331,132 +327,26 @@ var EdgeIdentityChangedError = class extends Error {
     super("Edge identity changed.");
   }
 };
-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 import_context3.Resource {
-  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 import_async3.DeferredTask(this._ctx, async () => {
-      try {
-        await this._restart();
-      } catch (err) {
-        import_log3.log.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) => {
-      import_log3.log.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() {
-    (0, import_log3.log)(`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 !== import_context3.LifecycleState.OPEN) {
-      return;
-    }
-    await (0, import_context3.cancelWithContext)(this._ctx, (0, import_async3.sleep)(this._restartAfter));
-    this._restartAfter = Math.min(Math.max(this._restartAfter * 2, INIT_RESTART_DELAY), this._maxRestartDelay);
-    await (0, import_debug.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) {
-        import_log3.log.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 !== import_context3.LifecycleState.OPEN) {
-      return;
-    }
-    this._restartTask.schedule();
-  }
-};
-_ts_decorate2([
-  import_async3.synchronized
-], PersistentLifecycle.prototype, "_open", null);
-_ts_decorate2([
-  import_async3.synchronized
-], PersistentLifecycle.prototype, "scheduleRestart", null);
 var getEdgeUrlWithProtocol = (baseUrl, protocol2) => {
   const isSecure = baseUrl.startsWith("https") || baseUrl.startsWith("wss");
   const url = new URL(baseUrl);
   url.protocol = protocol2 + (isSecure ? "s" : "");
   return url.toString();
 };
-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 import_context.Resource {
   constructor(_identity, _config) {
     super();
     this._identity = _identity;
     this._config = _config;
-    this._persistentLifecycle = new PersistentLifecycle({
+    this._persistentLifecycle = new import_async.PersistentLifecycle({
       start: async () => this._connect(),
       stop: async (state) => this._disconnect(state)
     });
@@ -490,8 +380,8 @@ var EdgeClient = class extends import_context.Resource {
         identity,
         oldIdentity: this._identity
       }, {
-        F: __dxlog_file4,
-        L: 95,
+        F: __dxlog_file3,
+        L: 94,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -513,8 +403,8 @@ var EdgeClient = class extends import_context.Resource {
             listener();
           } catch (error) {
             import_log.log.catch(error, void 0, {
-              F: __dxlog_file4,
-              L: 117,
+              F: __dxlog_file3,
+              L: 116,
               S: this,
               C: (f, a) => f(...a)
             });
@@ -531,8 +421,8 @@ var EdgeClient = class extends import_context.Resource {
     (0, import_log.log)("opening...", {
       info: this.info
     }, {
-      F: __dxlog_file4,
-      L: 129,
+      F: __dxlog_file3,
+      L: 128,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -540,8 +430,8 @@ var EdgeClient = class extends import_context.Resource {
       import_log.log.warn("Error while opening connection", {
         err
       }, {
-        F: __dxlog_file4,
-        L: 131,
+        F: __dxlog_file3,
+        L: 130,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -554,8 +444,8 @@ var EdgeClient = class extends import_context.Resource {
     (0, import_log.log)("closing...", {
       peerKey: this._identity.peerKey
     }, {
-      F: __dxlog_file4,
-      L: 139,
+      F: __dxlog_file3,
+      L: 138,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -571,8 +461,8 @@ var EdgeClient = class extends import_context.Resource {
     const protocolHeader = this._config.disableAuth ? void 0 : await this._createAuthHeader(path);
     if (this._identity !== identity) {
       (0, import_log.log)("identity changed during auth header request", void 0, {
-        F: __dxlog_file4,
-        L: 153,
+        F: __dxlog_file3,
+        L: 152,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -584,8 +474,8 @@ var EdgeClient = class extends import_context.Resource {
       url: url.toString(),
       protocolHeader
     }, {
-      F: __dxlog_file4,
-      L: 159,
+      F: __dxlog_file3,
+      L: 158,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -599,8 +489,8 @@ var EdgeClient = class extends import_context.Resource {
           this._notifyReconnected();
         } else {
           import_log.log.verbose("connected callback ignored, because connection is not active", void 0, {
-            F: __dxlog_file4,
-            L: 169,
+            F: __dxlog_file3,
+            L: 168,
             S: this,
             C: (f, a) => f(...a)
           });
@@ -612,8 +502,8 @@ var EdgeClient = class extends import_context.Resource {
           this._persistentLifecycle.scheduleRestart();
         } else {
           import_log.log.verbose("restart requested by inactive connection", void 0, {
-            F: __dxlog_file4,
-            L: 177,
+            F: __dxlog_file3,
+            L: 176,
             S: this,
             C: (f, a) => f(...a)
           });
@@ -628,8 +518,8 @@ var EdgeClient = class extends import_context.Resource {
             from: message.source,
             type: message.payload?.typeUrl
           }, {
-            F: __dxlog_file4,
-            L: 185,
+            F: __dxlog_file3,
+            L: 184,
             S: this,
             C: (f, a) => f(...a)
           });
@@ -662,8 +552,8 @@ var EdgeClient = class extends import_context.Resource {
         import_log.log.error("ws reconnect listener failed", {
           err
         }, {
-          F: __dxlog_file4,
-          L: 218,
+          F: __dxlog_file3,
+          L: 217,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -679,8 +569,8 @@ var EdgeClient = class extends import_context.Resource {
           err,
           payload: import_chunk_ANV2HBEH.protocol.getPayloadType(message)
         }, {
-          F: __dxlog_file4,
-          L: 228,
+          F: __dxlog_file3,
+          L: 227,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -694,8 +584,8 @@ var EdgeClient = class extends import_context.Resource {
   async send(message) {
     if (this._ready.state !== import_async.TriggerState.RESOLVED) {
       (0, import_log.log)("waiting for websocket to become ready", void 0, {
-        F: __dxlog_file4,
-        L: 239,
+        F: __dxlog_file3,
+        L: 238,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -724,8 +614,8 @@ var EdgeClient = class extends import_context.Resource {
         status: response.status,
         statusText: response.statusText
       }, {
-        F: __dxlog_file4,
-        L: 264,
+        F: __dxlog_file3,
+        L: 263,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -733,14 +623,14 @@ var EdgeClient = class extends import_context.Resource {
     }
   }
 };
-_ts_decorate3([
+_ts_decorate2([
   import_log.logInfo
 ], EdgeClient.prototype, "info", null);
 var encodePresentationWsAuthHeader = (encodedPresentation) => {
   const encodedToken = Buffer.from(encodedPresentation).toString("base64").replace(/=*$/, "").replaceAll("/", "|");
   return `base64url.bearer.authorization.dxos.org.${encodedToken}`;
 };
-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(),
@@ -785,7 +675,7 @@ var createChainEdgeIdentity = async (signer, identityKey, peerKey, chain, creden
     peerKey: peerKey.toHex(),
     presentCredentials: async ({ challenge }) => {
       (0, import_invariant3.invariant)(chain, void 0, {
-        F: __dxlog_file5,
+        F: __dxlog_file4,
         L: 75,
         S: void 0,
         A: [
@@ -845,22 +735,25 @@ var createStubEdgeIdentity = () => {
     }
   };
 };
-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");
-    (0, import_log4.log)("created", {
+    (0, import_log3.log)("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;
@@ -970,9 +863,9 @@ var EdgeHttpClient = class {
     });
   }
   async _call(path, args) {
-    const requestContext = args.context ?? new import_context4.Context(void 0, {
-      F: __dxlog_file6,
-      L: 173
+    const requestContext = args.context ?? new import_context3.Context(void 0, {
+      F: __dxlog_file5,
+      L: 177
     });
     const shouldRetry = createRetryHandler(args);
     let url = `${this._baseUrl}${path.startsWith("/") ? path.slice(1) : path}`;
@@ -983,13 +876,13 @@ var EdgeHttpClient = class {
       }
       url += `?${queryParams.toString()}`;
     }
-    (0, import_log4.log)("call", {
+    (0, import_log3.log)("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)
     });
@@ -1007,12 +900,12 @@ var EdgeHttpClient = class {
           if (body.success) {
             return body.data;
           }
-          (0, import_log4.log)("unsuccessful edge response", {
+          (0, import_log3.log)("unsuccessful edge response", {
             path,
             body
           }, {
-            F: __dxlog_file6,
-            L: 204,
+            F: __dxlog_file5,
+            L: 208,
             S: this,
             C: (f, a) => f(...a)
           });
@@ -1032,12 +925,12 @@ var EdgeHttpClient = class {
         processingError = import_protocols.EdgeCallFailedError.fromProcessingFailureCause(error);
       }
       if (processingError.isRetryable && await shouldRetry(requestContext, retryAfterHeaderValue)) {
-        (0, import_log4.log)("retrying edge request", {
+        (0, import_log3.log)("retrying edge request", {
           path,
           processingError
         }, {
-          F: __dxlog_file6,
-          L: 223,
+          F: __dxlog_file5,
+          L: 227,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -1048,9 +941,9 @@ var EdgeHttpClient = class {
   }
   async _handleUnauthorized(response) {
     if (!this._edgeIdentity) {
-      import_log4.log.warn("edge unauthorized response received before identity was set", void 0, {
-        F: __dxlog_file6,
-        L: 232,
+      import_log3.log.warn("edge unauthorized response received before identity was set", void 0, {
+        F: __dxlog_file5,
+        L: 236,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -1058,9 +951,9 @@ var EdgeHttpClient = class {
     }
     const challenge = await handleAuthChallenge(response, this._edgeIdentity);
     this._authHeader = encodeAuthHeader(challenge);
-    (0, import_log4.log)("auth header updated", void 0, {
-      F: __dxlog_file6,
-      L: 237,
+    (0, import_log3.log)("auth header updated", void 0, {
+      F: __dxlog_file5,
+      L: 241,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -1080,10 +973,10 @@ var createRetryHandler = (args) => {
       return false;
     }
     if (retryAfter) {
-      await (0, import_async4.sleep)(retryAfter);
+      await (0, import_async3.sleep)(retryAfter);
     } else {
       const timeout = baseTimeout + Math.random() * jitter;
-      await (0, import_async4.sleep)(timeout);
+      await (0, import_async3.sleep)(timeout);
     }
     return true;
   };