@dxos/edge-client 0.6.14-main.f49f251 → 0.6.14-staging.54a8bab

package/dist/lib/browser/index.mjs

@@ -9,12 +9,9 @@ import {
 export * from "@dxos/protocols/buf/dxos/edge/messenger_pb";
 
 // packages/core/mesh/edge-client/src/edge-client.ts
-import WebSocket from "isomorphic-ws";
-import { Trigger, Event, scheduleTaskInterval, scheduleTask, TriggerState } from "@dxos/async";
-import { Context, LifecycleState as LifecycleState2, Resource as Resource2 } from "@dxos/context";
-import { log as log2 } from "@dxos/log";
-import { buf } from "@dxos/protocols/buf";
-import { MessageSchema } from "@dxos/protocols/buf/dxos/edge/messenger_pb";
+import { Trigger, scheduleMicroTask, TriggerState } from "@dxos/async";
+import { Resource as Resource3 } from "@dxos/context";
+import { log as log3, logInfo as logInfo2 } from "@dxos/log";
 
 // packages/core/mesh/edge-client/src/edge-identity.ts
 import { invariant } from "@dxos/invariant";
@@ -56,6 +53,204 @@ var handleAuthChallenge = async (failedResponse, identity) => {
   return schema.getCodecForType("dxos.halo.credentials.Presentation").encode(presentation);
 };
 
+// packages/core/mesh/edge-client/src/edge-ws-connection.ts
+import WebSocket from "isomorphic-ws";
+import { scheduleTask, scheduleTaskInterval } from "@dxos/async";
+import { Context, Resource } from "@dxos/context";
+import { invariant as invariant2 } from "@dxos/invariant";
+import { log, logInfo } from "@dxos/log";
+import { buf } from "@dxos/protocols/buf";
+import { MessageSchema } from "@dxos/protocols/buf/dxos/edge/messenger_pb";
+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") 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_file2 = "/home/runner/work/dxos/dxos/packages/core/mesh/edge-client/src/edge-ws-connection.ts";
+var SIGNAL_KEEPALIVE_INTERVAL = 5e3;
+var EdgeWsConnection = class extends Resource {
+  constructor(_identity, _connectionInfo, _callbacks) {
+    super();
+    this._identity = _identity;
+    this._connectionInfo = _connectionInfo;
+    this._callbacks = _callbacks;
+  }
+  get info() {
+    return {
+      open: this.isOpen,
+      identity: this._identity.identityKey,
+      device: this._identity.peerKey
+    };
+  }
+  send(message) {
+    invariant2(this._ws, void 0, {
+      F: __dxlog_file2,
+      L: 48,
+      S: this,
+      A: [
+        "this._ws",
+        ""
+      ]
+    });
+    log("sending...", {
+      peerKey: this._identity.peerKey,
+      payload: protocol.getPayloadType(message)
+    }, {
+      F: __dxlog_file2,
+      L: 49,
+      S: this,
+      C: (f, a) => f(...a)
+    });
+    this._ws.send(buf.toBinary(MessageSchema, message));
+  }
+  async _open() {
+    this._ws = new WebSocket(this._connectionInfo.url, this._connectionInfo.protocolHeader ? [
+      this._connectionInfo.protocolHeader
+    ] : []);
+    this._ws.onopen = () => {
+      if (this.isOpen) {
+        log("connected", void 0, {
+          F: __dxlog_file2,
+          L: 61,
+          S: this,
+          C: (f, a) => f(...a)
+        });
+        this._callbacks.onConnected();
+        this._scheduleHeartbeats();
+      } else {
+        log.verbose("connected after becoming inactive", {
+          currentIdentity: this._identity
+        }, {
+          F: __dxlog_file2,
+          L: 65,
+          S: this,
+          C: (f, a) => f(...a)
+        });
+      }
+    };
+    this._ws.onclose = () => {
+      if (this.isOpen) {
+        log("disconnected while being open", void 0, {
+          F: __dxlog_file2,
+          L: 70,
+          S: this,
+          C: (f, a) => f(...a)
+        });
+        this._callbacks.onRestartRequired();
+      }
+    };
+    this._ws.onerror = (event) => {
+      if (this.isOpen) {
+        log.warn("edge connection socket error", {
+          error: event.error,
+          info: event.message
+        }, {
+          F: __dxlog_file2,
+          L: 76,
+          S: this,
+          C: (f, a) => f(...a)
+        });
+        this._callbacks.onRestartRequired();
+      } else {
+        log.verbose("error ignored on closed connection", {
+          error: event.error
+        }, {
+          F: __dxlog_file2,
+          L: 79,
+          S: this,
+          C: (f, a) => f(...a)
+        });
+      }
+    };
+    this._ws.onmessage = async (event) => {
+      if (!this.isOpen) {
+        log.verbose("message ignored on closed connection", {
+          event: event.type
+        }, {
+          F: __dxlog_file2,
+          L: 87,
+          S: this,
+          C: (f, a) => f(...a)
+        });
+        return;
+      }
+      if (event.data === "__pong__") {
+        this._rescheduleHeartbeatTimeout();
+        return;
+      }
+      const data = await toUint8Array(event.data);
+      if (this.isOpen) {
+        const message = buf.fromBinary(MessageSchema, data);
+        log("received", {
+          from: message.source,
+          payload: protocol.getPayloadType(message)
+        }, {
+          F: __dxlog_file2,
+          L: 97,
+          S: this,
+          C: (f, a) => f(...a)
+        });
+        this._callbacks.onMessage(message);
+      }
+    };
+  }
+  async _close() {
+    void this._inactivityTimeoutCtx?.dispose().catch(() => {
+    });
+    try {
+      this._ws?.close();
+      this._ws = void 0;
+    } catch (err) {
+      if (err instanceof Error && err.message.includes("WebSocket is closed before the connection is established.")) {
+        return;
+      }
+      log.warn("Error closing websocket", {
+        err
+      }, {
+        F: __dxlog_file2,
+        L: 113,
+        S: this,
+        C: (f, a) => f(...a)
+      });
+    }
+  }
+  _scheduleHeartbeats() {
+    invariant2(this._ws, void 0, {
+      F: __dxlog_file2,
+      L: 118,
+      S: this,
+      A: [
+        "this._ws",
+        ""
+      ]
+    });
+    scheduleTaskInterval(this._ctx, async () => {
+      this._ws?.send("__ping__");
+    }, SIGNAL_KEEPALIVE_INTERVAL);
+    this._ws.send("__ping__");
+    this._rescheduleHeartbeatTimeout();
+  }
+  _rescheduleHeartbeatTimeout() {
+    if (!this.isOpen) {
+      return;
+    }
+    void this._inactivityTimeoutCtx?.dispose();
+    this._inactivityTimeoutCtx = new Context(void 0, {
+      F: __dxlog_file2,
+      L: 137
+    });
+    scheduleTask(this._inactivityTimeoutCtx, () => {
+      if (this.isOpen) {
+        this._callbacks.onRestartRequired();
+      }
+    }, 2 * SIGNAL_KEEPALIVE_INTERVAL);
+  }
+};
+_ts_decorate([
+  logInfo
+], EdgeWsConnection.prototype, "info", null);
+
 // packages/core/mesh/edge-client/src/errors.ts
 var EdgeConnectionClosedError = class extends Error {
   constructor() {
@@ -70,21 +265,22 @@ 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 } from "@dxos/context";
+import { cancelWithContext, LifecycleState, Resource as Resource2 } from "@dxos/context";
 import { warnAfterTimeout } from "@dxos/debug";
-import { log } from "@dxos/log";
-function _ts_decorate(decorators, target, key, desc) {
+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_file2 = "/home/runner/work/dxos/dxos/packages/core/mesh/edge-client/src/persistent-lifecycle.ts";
+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 Resource {
+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;
@@ -97,53 +293,71 @@ var PersistentLifecycle = class extends Resource {
       try {
         await this._restart();
       } catch (err) {
-        log.warn("Restart failed", {
+        log2.warn("Restart failed", {
           err
         }, {
-          F: __dxlog_file2,
-          L: 64,
+          F: __dxlog_file3,
+          L: 65,
           S: this,
           C: (f, a) => f(...a)
         });
         this._restartTask?.schedule();
       }
     });
-    await this._start().catch((err) => {
-      log.warn("Start failed", {
+    this._currentContext = await this._start().catch((err) => {
+      log2.warn("Start failed", {
         err
       }, {
-        F: __dxlog_file2,
-        L: 69,
+        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._stop();
+    await this._stopCurrentContext();
     this._restartTask = void 0;
   }
   async _restart() {
-    log(`restarting in ${this._restartAfter}ms`, {
+    log2(`restarting in ${this._restartAfter}ms`, {
       state: this._lifecycleState
     }, {
-      F: __dxlog_file2,
-      L: 81,
+      F: __dxlog_file3,
+      L: 83,
       S: this,
       C: (f, a) => f(...a)
     });
-    await this._stop();
+    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", () => this._start());
+    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.
   */
@@ -154,10 +368,10 @@ var PersistentLifecycle = class extends Resource {
     this._restartTask.schedule();
   }
 };
-_ts_decorate([
+_ts_decorate2([
   synchronized
 ], PersistentLifecycle.prototype, "_open", null);
-_ts_decorate([
+_ts_decorate2([
   synchronized
 ], PersistentLifecycle.prototype, "scheduleRestart", null);
 
@@ -170,30 +384,31 @@ var getEdgeUrlWithProtocol = (baseUrl, protocol2) => {
 };
 
 // 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";
+function _ts_decorate3(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 DEFAULT_TIMEOUT = 1e4;
-var SIGNAL_KEEPALIVE_INTERVAL = 5e3;
-var EdgeClient = class extends Resource2 {
+var EdgeClient = class extends Resource3 {
   constructor(_identity, _config) {
     super();
     this._identity = _identity;
     this._config = _config;
-    this.reconnect = new Event();
-    this.connected = new Event();
     this._persistentLifecycle = new PersistentLifecycle({
-      start: async () => this._openWebSocket(),
-      stop: async () => this._closeWebSocket(),
-      onRestart: async () => this.reconnect.emit()
+      start: async () => this._connect(),
+      stop: async (state) => this._disconnect(state)
     });
-    this._listeners = /* @__PURE__ */ new Set();
+    this._messageListeners = /* @__PURE__ */ new Set();
+    this._reconnectListeners = /* @__PURE__ */ new Set();
+    this._currentConnection = void 0;
     this._ready = new Trigger();
-    this._ws = void 0;
-    this._keepaliveCtx = void 0;
-    this._heartBeatContext = void 0;
+    this._isActive = (connection) => connection === this._currentConnection;
     this._baseWsUrl = getEdgeUrlWithProtocol(_config.socketEndpoint, "ws");
     this._baseHttpUrl = getEdgeUrlWithProtocol(_config.socketEndpoint, "http");
   }
-  // TODO(burdon): Attach logging.
   get info() {
     return {
       open: this.isOpen,
@@ -202,7 +417,7 @@ var EdgeClient = class extends Resource2 {
     };
   }
   get isConnected() {
-    return Boolean(this._ws) && this._ready.state === TriggerState.RESOLVED;
+    return Boolean(this._currentConnection) && this._ready.state === TriggerState.RESOLVED;
   }
   get identityKey() {
     return this._identity.identityKey;
@@ -212,41 +427,62 @@ var EdgeClient = class extends Resource2 {
   }
   setIdentity(identity) {
     if (identity.identityKey !== this._identity.identityKey || identity.peerKey !== this._identity.peerKey) {
-      log2("Edge identity changed", {
+      log3("Edge identity changed", {
         identity,
         oldIdentity: this._identity
       }, {
-        F: __dxlog_file3,
-        L: 99,
+        F: __dxlog_file4,
+        L: 95,
         S: this,
         C: (f, a) => f(...a)
       });
       this._identity = identity;
+      this._closeCurrentConnection(new EdgeIdentityChangedError());
       this._persistentLifecycle.scheduleRestart();
     }
   }
-  addListener(listener) {
-    this._listeners.add(listener);
-    return () => this._listeners.delete(listener);
+  onMessage(listener) {
+    this._messageListeners.add(listener);
+    return () => this._messageListeners.delete(listener);
+  }
+  onReconnected(listener) {
+    this._reconnectListeners.add(listener);
+    if (this._ready.state === TriggerState.RESOLVED) {
+      scheduleMicroTask(this._ctx, () => {
+        if (this._reconnectListeners.has(listener)) {
+          try {
+            listener();
+          } catch (error) {
+            log3.catch(error, void 0, {
+              F: __dxlog_file4,
+              L: 117,
+              S: this,
+              C: (f, a) => f(...a)
+            });
+          }
+        }
+      });
+    }
+    return () => this._reconnectListeners.delete(listener);
   }
   /**
   * Open connection to messaging service.
   */
   async _open() {
-    log2("opening...", {
+    log3("opening...", {
       info: this.info
     }, {
-      F: __dxlog_file3,
-      L: 114,
+      F: __dxlog_file4,
+      L: 129,
       S: this,
       C: (f, a) => f(...a)
     });
     this._persistentLifecycle.open().catch((err) => {
-      log2.warn("Error while opening connection", {
+      log3.warn("Error while opening connection", {
         err
       }, {
-        F: __dxlog_file3,
-        L: 116,
+        F: __dxlog_file4,
+        L: 131,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -256,153 +492,140 @@ var EdgeClient = class extends Resource2 {
   * Close connection and free resources.
   */
   async _close() {
-    log2("closing...", {
+    log3("closing...", {
       peerKey: this._identity.peerKey
     }, {
-      F: __dxlog_file3,
-      L: 124,
+      F: __dxlog_file4,
+      L: 139,
       S: this,
       C: (f, a) => f(...a)
     });
+    this._closeCurrentConnection();
     await this._persistentLifecycle.close();
   }
-  async _openWebSocket() {
+  async _connect() {
     if (this._ctx.disposed) {
-      return;
+      return void 0;
     }
-    const path = `/ws/${this._identity.identityKey}/${this._identity.peerKey}`;
+    const identity = this._identity;
+    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,
+        S: this,
+        C: (f, a) => f(...a)
+      });
+      return void 0;
+    }
+    const restartRequired = new Trigger();
     const url = new URL(path, this._baseWsUrl);
-    log2("Opening websocket", {
+    log3("Opening websocket", {
       url: url.toString(),
       protocolHeader
     }, {
-      F: __dxlog_file3,
-      L: 136,
+      F: __dxlog_file4,
+      L: 159,
       S: this,
       C: (f, a) => f(...a)
     });
-    this._ws = new WebSocket(url, protocolHeader ? [
+    const connection = new EdgeWsConnection(identity, {
+      url,
       protocolHeader
-    ] : []);
-    this._ws.onopen = () => {
-      log2("opened", this.info, {
-        F: __dxlog_file3,
-        L: 140,
-        S: this,
-        C: (f, a) => f(...a)
-      });
-      this._ready.wake();
-      this.connected.emit();
-    };
-    this._ws.onclose = () => {
-      log2("closed", this.info, {
-        F: __dxlog_file3,
-        L: 145,
-        S: this,
-        C: (f, a) => f(...a)
-      });
-      this._persistentLifecycle.scheduleRestart();
-    };
-    this._ws.onerror = (event) => {
-      log2.warn("EdgeClient socket error", {
-        error: event.error,
-        info: event.message
-      }, {
-        F: __dxlog_file3,
-        L: 149,
-        S: this,
-        C: (f, a) => f(...a)
-      });
-      this._persistentLifecycle.scheduleRestart();
-    };
-    this._ws.onmessage = async (event) => {
-      if (event.data === "__pong__") {
-        this._onHeartbeat();
-        return;
-      }
-      const data = await toUint8Array(event.data);
-      const message = buf.fromBinary(MessageSchema, data);
-      log2("received", {
-        peerKey: this._identity.peerKey,
-        payload: protocol.getPayloadType(message)
-      }, {
-        F: __dxlog_file3,
-        L: 162,
-        S: this,
-        C: (f, a) => f(...a)
-      });
-      if (message) {
-        for (const listener of this._listeners) {
-          try {
-            await listener(message);
-          } catch (err) {
-            log2.error("processing", {
-              err,
-              payload: protocol.getPayloadType(message)
-            }, {
-              F: __dxlog_file3,
-              L: 168,
-              S: this,
-              C: (f, a) => f(...a)
-            });
-          }
+    }, {
+      onConnected: () => {
+        if (this._isActive(connection)) {
+          this._ready.wake();
+          this._notifyReconnected();
+        } else {
+          log3.verbose("connected callback ignored, because connection is not active", void 0, {
+            F: __dxlog_file4,
+            L: 169,
+            S: this,
+            C: (f, a) => f(...a)
+          });
+        }
+      },
+      onRestartRequired: () => {
+        if (this._isActive(connection)) {
+          this._closeCurrentConnection();
+          this._persistentLifecycle.scheduleRestart();
+        } else {
+          log3.verbose("restart requested by inactive connection", void 0, {
+            F: __dxlog_file4,
+            L: 177,
+            S: this,
+            C: (f, a) => f(...a)
+          });
+        }
+        restartRequired.wake();
+      },
+      onMessage: (message) => {
+        if (this._isActive(connection)) {
+          this._notifyMessageReceived(message);
+        } else {
+          log3.verbose("ignored a message on inactive connection", {
+            from: message.source,
+            type: message.payload?.typeUrl
+          }, {
+            F: __dxlog_file4,
+            L: 185,
+            S: this,
+            C: (f, a) => f(...a)
+          });
         }
       }
-    };
-    await this._ready.wait({
-      timeout: this._config.timeout ?? DEFAULT_TIMEOUT
     });
-    log2("Websocket is ready", {
-      identity: this._identity.identityKey,
-      peer: this._identity.peerKey
-    }, {
-      F: __dxlog_file3,
-      L: 176,
-      S: this,
-      C: (f, a) => f(...a)
-    });
-    this._keepaliveCtx = new Context(void 0, {
-      F: __dxlog_file3,
-      L: 179
-    });
-    scheduleTaskInterval(this._keepaliveCtx, async () => {
-      this._ws?.send("__ping__");
-    }, SIGNAL_KEEPALIVE_INTERVAL);
-    this._ws.send("__ping__");
-    this._onHeartbeat();
+    this._currentConnection = connection;
+    await connection.open();
+    await Promise.race([
+      this._ready.wait({
+        timeout: this._config.timeout ?? DEFAULT_TIMEOUT
+      }),
+      restartRequired
+    ]);
+    return connection;
   }
-  async _closeWebSocket() {
-    if (!this._ws) {
-      return;
+  async _disconnect(state) {
+    await state.close();
+  }
+  _closeCurrentConnection(error = new EdgeConnectionClosedError()) {
+    this._currentConnection = void 0;
+    this._ready.throw(error);
+    this._ready.reset();
+  }
+  _notifyReconnected() {
+    for (const listener of this._reconnectListeners) {
+      try {
+        listener();
+      } catch (err) {
+        log3.error("ws reconnect listener failed", {
+          err
+        }, {
+          F: __dxlog_file4,
+          L: 218,
+          S: this,
+          C: (f, a) => f(...a)
+        });
+      }
     }
-    try {
-      this._ready.throw(this.isOpen ? new EdgeIdentityChangedError() : new EdgeConnectionClosedError());
-      this._ready.reset();
-      void this._keepaliveCtx?.dispose();
-      this._keepaliveCtx = void 0;
-      void this._heartBeatContext?.dispose();
-      this._heartBeatContext = void 0;
-      this._ws.onopen = () => {
-      };
-      this._ws.onclose = () => {
-      };
-      this._ws.onerror = () => {
-      };
-      this._ws.close();
-      this._ws = void 0;
-    } catch (err) {
-      if (err instanceof Error && err.message.includes("WebSocket is closed before the connection is established.")) {
-        return;
+  }
+  _notifyMessageReceived(message) {
+    for (const listener of this._messageListeners) {
+      try {
+        listener(message);
+      } catch (err) {
+        log3.error("ws incoming message processing failed", {
+          err,
+          payload: protocol.getPayloadType(message)
+        }, {
+          F: __dxlog_file4,
+          L: 228,
+          S: this,
+          C: (f, a) => f(...a)
+        });
       }
-      log2.warn("Error closing websocket", {
-        err
-      }, {
-        F: __dxlog_file3,
-        L: 215,
-        S: this,
-        C: (f, a) => f(...a)
-      });
     }
   }
   /**
@@ -411,9 +634,9 @@ var EdgeClient = class extends Resource2 {
   */
   async send(message) {
     if (this._ready.state !== TriggerState.RESOLVED) {
-      log2("waiting for websocket to become ready", void 0, {
-        F: __dxlog_file3,
-        L: 225,
+      log3("waiting for websocket to become ready", void 0, {
+        F: __dxlog_file4,
+        L: 239,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -421,35 +644,13 @@ var EdgeClient = class extends Resource2 {
         timeout: this._config.timeout ?? DEFAULT_TIMEOUT
       });
     }
-    if (!this._ws) {
+    if (!this._currentConnection) {
       throw new EdgeConnectionClosedError();
     }
     if (message.source && (message.source.peerKey !== this._identity.peerKey || message.source.identityKey !== this.identityKey)) {
       throw new EdgeIdentityChangedError();
     }
-    log2("sending...", {
-      peerKey: this._identity.peerKey,
-      payload: protocol.getPayloadType(message)
-    }, {
-      F: __dxlog_file3,
-      L: 238,
-      S: this,
-      C: (f, a) => f(...a)
-    });
-    this._ws.send(buf.toBinary(MessageSchema, message));
-  }
-  _onHeartbeat() {
-    if (this._lifecycleState !== LifecycleState2.OPEN) {
-      return;
-    }
-    void this._heartBeatContext?.dispose();
-    this._heartBeatContext = new Context(void 0, {
-      F: __dxlog_file3,
-      L: 247
-    });
-    scheduleTask(this._heartBeatContext, () => {
-      this._persistentLifecycle.scheduleRestart();
-    }, 2 * SIGNAL_KEEPALIVE_INTERVAL);
+    this._currentConnection.send(message);
   }
   async _createAuthHeader(path) {
     const httpUrl = new URL(path, this._baseHttpUrl);
@@ -460,11 +661,11 @@ var EdgeClient = class extends Resource2 {
     if (response.status === 401) {
       return encodePresentationWsAuthHeader(await handleAuthChallenge(response, this._identity));
     } else {
-      log2.warn("no auth challenge from edge", {
+      log3.warn("no auth challenge from edge", {
         status: response.status,
         statusText: response.statusText
       }, {
-        F: __dxlog_file3,
+        F: __dxlog_file4,
         L: 264,
         S: this,
         C: (f, a) => f(...a)
@@ -473,6 +674,9 @@ var EdgeClient = class extends Resource2 {
     }
   }
 };
+_ts_decorate3([
+  logInfo2
+], EdgeClient.prototype, "info", null);
 var encodePresentationWsAuthHeader = (encodedPresentation) => {
   const encodedToken = Buffer.from(encodedPresentation).toString("base64").replace(/=*$/, "").replaceAll("/", "|");
   return `base64url.bearer.authorization.dxos.org.${encodedToken}`;
@@ -581,26 +785,29 @@ var createStubEdgeIdentity = () => {
 // packages/core/mesh/edge-client/src/edge-http-client.ts
 import { sleep as sleep2 } from "@dxos/async";
 import { Context as Context2 } from "@dxos/context";
-import { log as log3 } from "@dxos/log";
+import { log as log4 } from "@dxos/log";
 import { EdgeCallFailedError, EdgeAuthChallengeError } from "@dxos/protocols";
-var __dxlog_file4 = "/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");
-    log3("created", {
+    log4("created", {
       url: this._baseUrl
     }, {
-      F: __dxlog_file4,
+      F: __dxlog_file5,
       L: 42,
       S: this,
       C: (f, a) => f(...a)
     });
   }
   setIdentity(identity) {
-    this._edgeIdentity = identity;
+    if (this._edgeIdentity?.identityKey !== identity.identityKey || this._edgeIdentity?.peerKey !== identity.peerKey) {
+      this._edgeIdentity = identity;
+      this._authHeader = void 0;
+    }
   }
   createAgent(body, args) {
     return this._call("/agents/create", {
@@ -644,18 +851,18 @@ var EdgeHttpClient = class {
   }
   async _call(path, args) {
     const requestContext = args.context ?? new Context2(void 0, {
-      F: __dxlog_file4,
-      L: 88
+      F: __dxlog_file5,
+      L: 91
     });
     const shouldRetry = createRetryHandler(args);
     const url = `${this._baseUrl}${path.startsWith("/") ? path.slice(1) : path}`;
-    log3.info("call", {
+    log4.info("call", {
       method: args.method,
       path,
       request: args.body
     }, {
-      F: __dxlog_file4,
-      L: 92,
+      F: __dxlog_file5,
+      L: 95,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -673,12 +880,12 @@ var EdgeHttpClient = class {
           if (body.success) {
             return body.data;
           }
-          log3.info("unsuccessful edge response", {
+          log4.info("unsuccessful edge response", {
             path,
             body
           }, {
-            F: __dxlog_file4,
-            L: 111,
+            F: __dxlog_file5,
+            L: 114,
             S: this,
             C: (f, a) => f(...a)
           });
@@ -698,12 +905,12 @@ var EdgeHttpClient = class {
         processingError = EdgeCallFailedError.fromProcessingFailureCause(error);
       }
       if (processingError.isRetryable && await shouldRetry(requestContext, retryAfterHeaderValue)) {
-        log3.info("retrying edge request", {
+        log4.info("retrying edge request", {
           path,
           processingError
         }, {
-          F: __dxlog_file4,
-          L: 130,
+          F: __dxlog_file5,
+          L: 133,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -714,9 +921,9 @@ var EdgeHttpClient = class {
   }
   async _handleUnauthorized(response) {
     if (!this._edgeIdentity) {
-      log3.warn("edge unauthorized response received before identity was set", void 0, {
-        F: __dxlog_file4,
-        L: 139,
+      log4.warn("edge unauthorized response received before identity was set", void 0, {
+        F: __dxlog_file5,
+        L: 142,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -724,9 +931,9 @@ var EdgeHttpClient = class {
     }
     const challenge = await handleAuthChallenge(response, this._edgeIdentity);
     this._authHeader = encodeAuthHeader(challenge);
-    log3("auth header updated", void 0, {
-      F: __dxlog_file4,
-      L: 144,
+    log4("auth header updated", void 0, {
+      F: __dxlog_file5,
+      L: 147,
       S: this,
       C: (f, a) => f(...a)
     });