@dxos/messaging 0.8.4-main.9be5663bfe → 0.8.4-main.abd8ff62ef

package/dist/lib/neutral/index.mjs

@@ -4,15 +4,14 @@ import {
   MemorySignalManagerContext,
   Messenger,
   PeerInfoHash
-} from "./chunk-ZNKR3G44.mjs";
+} from "./chunk-EC4H56J5.mjs";
 
 // src/signal-client/signal-client.ts
 import { DeferredTask, Event as Event2, Trigger as Trigger2, scheduleTask, scheduleTaskInterval as scheduleTaskInterval2, sleep } from "@dxos/async";
 import { Resource, cancelWithContext as cancelWithContext2 } from "@dxos/context";
 import { invariant as invariant2 } from "@dxos/invariant";
-import { PublicKey as PublicKey3 } from "@dxos/keys";
+import { PublicKey as PublicKey2 } from "@dxos/keys";
 import { log as log3 } from "@dxos/log";
-import { trace as trace4 } from "@dxos/protocols";
 import { SignalState } from "@dxos/protocols/proto/dxos/mesh/signal";
 
 // src/signal-client/signal-client-monitor.ts
@@ -189,12 +188,7 @@ var SignalLocalState = class {
   unsubscribeMessages(peerId) {
     log("unsubscribing from messages", {
       peerId
-    }, {
-      F: __dxlog_file,
-      L: 79,
-      S: this,
-      C: (f, a) => f(...a)
-    });
+    }, { "~LogMeta": "~LogMeta", F: __dxlog_file, L: 72, S: this });
     this._subscribedMessages.delete({
       peerId
     });
@@ -241,12 +235,7 @@ var SignalLocalState = class {
         })) {
           log("swarm event", {
             swarmEvent
-          }, {
-            F: __dxlog_file,
-            L: 115,
-            S: this,
-            C: (f, a) => f(...a)
-          });
+          }, { "~LogMeta": "~LogMeta", F: __dxlog_file, L: 125, S: this });
           const event = swarmEvent.peerAvailable ? {
             topic,
             peerAvailable: {
@@ -314,9 +303,7 @@ import WebSocket from "isomorphic-ws";
 import { TimeoutError, Trigger, scheduleTaskInterval } from "@dxos/async";
 import { Context } from "@dxos/context";
 import { invariant } from "@dxos/invariant";
-import { PublicKey as PublicKey2 } from "@dxos/keys";
 import { log as log2 } from "@dxos/log";
-import { trace as trace3 } from "@dxos/protocols";
 import { schema } from "@dxos/protocols/proto";
 import { createProtoRpcPeer } from "@dxos/rpc";
 
@@ -346,15 +333,9 @@ var SignalRPCClient = class {
   _closeComplete = new Trigger();
   _monitor = new SignalRpcClientMonitor();
   constructor({ url, callbacks = {} }) {
-    const traceId = PublicKey2.random().toHex();
-    log2.trace("dxos.mesh.signal-rpc-client.constructor", trace3.begin({
-      id: traceId
-    }), {
-      F: __dxlog_file2,
-      L: 66,
-      S: this,
-      C: (f, a) => f(...a)
-    });
+    log2("creating signal rpc client", {
+      url
+    }, { "~LogMeta": "~LogMeta", F: __dxlog_file2, L: 28, S: this });
     this._url = url;
     this._callbacks = callbacks;
     this._socket = new WebSocket(this._url);
@@ -371,12 +352,7 @@ var SignalRPCClient = class {
           try {
             this._socket.send(msg);
           } catch (err) {
-            log2.warn("send error", err, {
-              F: __dxlog_file2,
-              L: 85,
-              S: this,
-              C: (f, a) => f(...a)
-            });
+            log2.warn("send error", err, { "~LogMeta": "~LogMeta", F: __dxlog_file2, L: 48, S: this });
           }
         },
         subscribe: (cb) => {
@@ -400,18 +376,10 @@ var SignalRPCClient = class {
           await this._safeCloseRpc();
           return;
         }
-        log2(`RPC open ${this._url}`, void 0, {
-          F: __dxlog_file2,
-          L: 110,
-          S: this,
-          C: (f, a) => f(...a)
-        });
+        log2(`RPC open ${this._url}`, void 0, { "~LogMeta": "~LogMeta", F: __dxlog_file2, L: 72, S: this });
         this._callbacks.onConnected?.();
         this._connectTrigger.wake();
-        this._keepaliveCtx = new Context(void 0, {
-          F: __dxlog_file2,
-          L: 113
-        });
+        this._keepaliveCtx = new Context(void 0, { "~LogMeta": "~LogMeta", F: __dxlog_file2, L: 75 });
         scheduleTaskInterval(this._keepaliveCtx, async () => {
           this._socket?.send("__ping__");
         }, SIGNAL_KEEPALIVE_INTERVAL);
@@ -422,12 +390,7 @@ var SignalRPCClient = class {
       }
     };
     this._socket.onclose = async () => {
-      log2(`Disconnected ${this._url}`, void 0, {
-        F: __dxlog_file2,
-        L: 133,
-        S: this,
-        C: (f, a) => f(...a)
-      });
+      log2(`Disconnected ${this._url}`, void 0, { "~LogMeta": "~LogMeta", F: __dxlog_file2, L: 90, S: this });
       this._callbacks.onDisconnected?.();
       this._closeComplete.wake();
       await this.close();
@@ -443,21 +406,11 @@ var SignalRPCClient = class {
       log2.warn(`Socket ${event.type ?? "unknown"} error`, {
         message: event.message,
         url: this._url
-      }, {
-        F: __dxlog_file2,
-        L: 149,
-        S: this,
-        C: (f, a) => f(...a)
-      });
+      }, { "~LogMeta": "~LogMeta", F: __dxlog_file2, L: 103, S: this });
     };
-    log2.trace("dxos.mesh.signal-rpc-client.constructor", trace3.end({
-      id: traceId
-    }), {
-      F: __dxlog_file2,
-      L: 152,
-      S: this,
-      C: (f, a) => f(...a)
-    });
+    log2("created signal rpc client", {
+      url
+    }, { "~LogMeta": "~LogMeta", F: __dxlog_file2, L: 108, S: this });
   }
   async close() {
     if (this._closed) {
@@ -485,21 +438,8 @@ var SignalRPCClient = class {
       topic,
       peerId,
       metadata: this._callbacks?.getMetadata?.()
-    }, {
-      F: __dxlog_file2,
-      L: 178,
-      S: this,
-      C: (f, a) => f(...a)
-    });
-    invariant(!this._closed, "SignalRPCClient is closed", {
-      F: __dxlog_file2,
-      L: 179,
-      S: this,
-      A: [
-        "!this._closed",
-        "'SignalRPCClient is closed'"
-      ]
-    });
+    }, { "~LogMeta": "~LogMeta", F: __dxlog_file2, L: 135, S: this });
+    invariant(!this._closed, "SignalRPCClient is closed", { "~LogMeta": "~LogMeta", F: __dxlog_file2, L: 140, S: this, A: ["!this._closed", "'SignalRPCClient is closed'"] });
     await this._connectTrigger.wait();
     const swarmStream = this._rpc.rpc.Signal.join({
       swarm: topic.asUint8Array(),
@@ -512,21 +452,8 @@ var SignalRPCClient = class {
   async receiveMessages(peerId) {
     log2("receiveMessages", {
       peerId
-    }, {
-      F: __dxlog_file2,
-      L: 191,
-      S: this,
-      C: (f, a) => f(...a)
-    });
-    invariant(!this._closed, "SignalRPCClient is closed", {
-      F: __dxlog_file2,
-      L: 192,
-      S: this,
-      A: [
-        "!this._closed",
-        "'SignalRPCClient is closed'"
-      ]
-    });
+    }, { "~LogMeta": "~LogMeta", F: __dxlog_file2, L: 151, S: this });
+    invariant(!this._closed, "SignalRPCClient is closed", { "~LogMeta": "~LogMeta", F: __dxlog_file2, L: 154, S: this, A: ["!this._closed", "'SignalRPCClient is closed'"] });
     await this._connectTrigger.wait();
     const messageStream = this._rpc.rpc.Signal.receiveMessages({
       peer: peerId.asUint8Array()
@@ -540,21 +467,8 @@ var SignalRPCClient = class {
       recipient,
       payload,
       metadata: this._callbacks?.getMetadata?.()
-    }, {
-      F: __dxlog_file2,
-      L: 210,
-      S: this,
-      C: (f, a) => f(...a)
-    });
-    invariant(!this._closed, "SignalRPCClient is closed", {
-      F: __dxlog_file2,
-      L: 211,
-      S: this,
-      A: [
-        "!this._closed",
-        "'SignalRPCClient is closed'"
-      ]
-    });
+    }, { "~LogMeta": "~LogMeta", F: __dxlog_file2, L: 163, S: this });
+    invariant(!this._closed, "SignalRPCClient is closed", { "~LogMeta": "~LogMeta", F: __dxlog_file2, L: 169, S: this, A: ["!this._closed", "'SignalRPCClient is closed'"] });
     await this._connectTrigger.wait();
     await this._rpc.rpc.Signal.sendMessage({
       author: author.asUint8Array(),
@@ -568,12 +482,7 @@ var SignalRPCClient = class {
       this._connectTrigger.reset();
       await this._rpc.close();
     } catch (err) {
-      log2.catch(err, void 0, {
-        F: __dxlog_file2,
-        L: 226,
-        S: this,
-        C: (f, a) => f(...a)
-      });
+      log2.catch(err, void 0, { "~LogMeta": "~LogMeta", F: __dxlog_file2, L: 183, S: this });
     }
   }
 };
@@ -600,7 +509,6 @@ var SignalClient = class extends Resource {
   * Number of milliseconds after which the connection will be attempted again in case of error.
   */
   _reconnectAfter = DEFAULT_RECONNECT_TIMEOUT;
-  _instanceId = PublicKey3.random().toHex();
   /**
   * @internal
   */
@@ -625,14 +533,7 @@ var SignalClient = class extends Resource {
     }, async (event) => this.swarmEvent.emit(event));
   }
   async _open() {
-    log3.trace("dxos.mesh.signal-client.open", trace4.begin({
-      id: this._instanceId
-    }), {
-      F: __dxlog_file3,
-      L: 96,
-      S: this,
-      C: (f, a) => f(...a)
-    });
+    log3("opening signal client", void 0, { "~LogMeta": "~LogMeta", F: __dxlog_file3, L: 62, S: this });
     if ([
       SignalState.CONNECTED,
       SignalState.CONNECTING
@@ -645,15 +546,7 @@ var SignalClient = class extends Resource {
         await cancelWithContext2(this._connectionCtx, this._clientReady.wait({
           timeout: 5e3
         }));
-        invariant2(this._state === SignalState.CONNECTED, "Not connected to Signal Server", {
-          F: __dxlog_file3,
-          L: 106,
-          S: this,
-          A: [
-            "this._state === SignalState.CONNECTED",
-            "'Not connected to Signal Server'"
-          ]
-        });
+        invariant2(this._state === SignalState.CONNECTED, "Not connected to Signal Server", { "~LogMeta": "~LogMeta", F: __dxlog_file3, L: 75, S: this, A: ["this._state === SignalState.CONNECTED", "'Not connected to Signal Server'"] });
         await this.localState.reconcile(this._connectionCtx, this._client);
         this._monitor.recordReconciliation({
           success: true
@@ -686,36 +579,19 @@ var SignalClient = class extends Resource {
       }
     });
     this._createClient();
-    log3.trace("dxos.mesh.signal-client.open", trace4.end({
-      id: this._instanceId
-    }), {
-      F: __dxlog_file3,
-      L: 139,
-      S: this,
-      C: (f, a) => f(...a)
-    });
+    log3("opened signal client", void 0, { "~LogMeta": "~LogMeta", F: __dxlog_file3, L: 109, S: this });
   }
   async _catch(err) {
     if (this._state === SignalState.CLOSED || this._ctx.disposed) {
       return;
     }
     if (this._state === SignalState.CONNECTED && !this._lastReconciliationFailed) {
-      log3.warn("SignalClient error:", err, {
-        F: __dxlog_file3,
-        L: 148,
-        S: this,
-        C: (f, a) => f(...a)
-      });
+      log3.warn("SignalClient error:", err, { "~LogMeta": "~LogMeta", F: __dxlog_file3, L: 117, S: this });
     }
     this._scheduleReconcileAfterError();
   }
   async _close() {
-    log3("closing...", void 0, {
-      F: __dxlog_file3,
-      L: 154,
-      S: this,
-      C: (f, a) => f(...a)
-    });
+    log3("closing...", void 0, { "~LogMeta": "~LogMeta", F: __dxlog_file3, L: 122, S: this });
     if ([
       SignalState.CLOSED
     ].includes(this._state)) {
@@ -723,12 +599,7 @@ var SignalClient = class extends Resource {
     }
     this._setState(SignalState.CLOSED);
     await this._safeResetClient();
-    log3("closed", void 0, {
-      F: __dxlog_file3,
-      L: 162,
-      S: this,
-      C: (f, a) => f(...a)
-    });
+    log3("closed", void 0, { "~LogMeta": "~LogMeta", F: __dxlog_file3, L: 130, S: this });
   }
   getStatus() {
     return {
@@ -743,16 +614,11 @@ var SignalClient = class extends Resource {
     log3("joining", {
       topic: args.topic,
       peerId: args.peer.peerKey
-    }, {
-      F: __dxlog_file3,
-      L: 176,
-      S: this,
-      C: (f, a) => f(...a)
-    });
+    }, { "~LogMeta": "~LogMeta", F: __dxlog_file3, L: 142, S: this });
     this._monitor.recordJoin();
     this.localState.join({
       topic: args.topic,
-      peerId: PublicKey3.from(args.peer.peerKey)
+      peerId: PublicKey2.from(args.peer.peerKey)
     });
     this._reconcileTask?.schedule();
   }
@@ -760,16 +626,11 @@ var SignalClient = class extends Resource {
     log3("leaving", {
       topic: args.topic,
       peerId: args.peer.peerKey
-    }, {
-      F: __dxlog_file3,
-      L: 183,
-      S: this,
-      C: (f, a) => f(...a)
-    });
+    }, { "~LogMeta": "~LogMeta", F: __dxlog_file3, L: 154, S: this });
     this._monitor.recordLeave();
     this.localState.leave({
       topic: args.topic,
-      peerId: PublicKey3.from(args.peer.peerKey)
+      peerId: PublicKey2.from(args.peer.peerKey)
     });
   }
   async query(_ctx, params) {
@@ -778,80 +639,30 @@ var SignalClient = class extends Resource {
   async sendMessage(_ctx, msg) {
     return this._monitor.recordMessageSending(msg, async () => {
       await this._clientReady.wait();
-      invariant2(this._state === SignalState.CONNECTED, "Not connected to Signal Server", {
-        F: __dxlog_file3,
-        L: 195,
-        S: this,
-        A: [
-          "this._state === SignalState.CONNECTED",
-          "'Not connected to Signal Server'"
-        ]
-      });
-      invariant2(msg.author.peerKey, "Author key required", {
-        F: __dxlog_file3,
-        L: 196,
-        S: this,
-        A: [
-          "msg.author.peerKey",
-          "'Author key required'"
-        ]
-      });
-      invariant2(msg.recipient.peerKey, "Recipient key required", {
-        F: __dxlog_file3,
-        L: 197,
-        S: this,
-        A: [
-          "msg.recipient.peerKey",
-          "'Recipient key required'"
-        ]
-      });
+      invariant2(this._state === SignalState.CONNECTED, "Not connected to Signal Server", { "~LogMeta": "~LogMeta", F: __dxlog_file3, L: 170, S: this, A: ["this._state === SignalState.CONNECTED", "'Not connected to Signal Server'"] });
+      invariant2(msg.author.peerKey, "Author key required", { "~LogMeta": "~LogMeta", F: __dxlog_file3, L: 171, S: this, A: ["msg.author.peerKey", "'Author key required'"] });
+      invariant2(msg.recipient.peerKey, "Recipient key required", { "~LogMeta": "~LogMeta", F: __dxlog_file3, L: 172, S: this, A: ["msg.recipient.peerKey", "'Recipient key required'"] });
       await this._client.sendMessage({
-        author: PublicKey3.from(msg.author.peerKey),
-        recipient: PublicKey3.from(msg.recipient.peerKey),
+        author: PublicKey2.from(msg.author.peerKey),
+        recipient: PublicKey2.from(msg.recipient.peerKey),
         payload: msg.payload
       });
     });
   }
   async subscribeMessages(peer) {
-    invariant2(peer.peerKey, "Peer key required", {
-      F: __dxlog_file3,
-      L: 207,
-      S: this,
-      A: [
-        "peer.peerKey",
-        "'Peer key required'"
-      ]
-    });
+    invariant2(peer.peerKey, "Peer key required", { "~LogMeta": "~LogMeta", F: __dxlog_file3, L: 181, S: this, A: ["peer.peerKey", "'Peer key required'"] });
     log3("subscribing to messages", {
       peer
-    }, {
-      F: __dxlog_file3,
-      L: 208,
-      S: this,
-      C: (f, a) => f(...a)
-    });
-    this.localState.subscribeMessages(PublicKey3.from(peer.peerKey));
+    }, { "~LogMeta": "~LogMeta", F: __dxlog_file3, L: 182, S: this });
+    this.localState.subscribeMessages(PublicKey2.from(peer.peerKey));
     this._reconcileTask?.schedule();
   }
   async unsubscribeMessages(peer) {
-    invariant2(peer.peerKey, "Peer key required", {
-      F: __dxlog_file3,
-      L: 214,
-      S: this,
-      A: [
-        "peer.peerKey",
-        "'Peer key required'"
-      ]
-    });
+    invariant2(peer.peerKey, "Peer key required", { "~LogMeta": "~LogMeta", F: __dxlog_file3, L: 189, S: this, A: ["peer.peerKey", "'Peer key required'"] });
     log3("unsubscribing from messages", {
       peer
-    }, {
-      F: __dxlog_file3,
-      L: 215,
-      S: this,
-      C: (f, a) => f(...a)
-    });
-    this.localState.unsubscribeMessages(PublicKey3.from(peer.peerKey));
+    }, { "~LogMeta": "~LogMeta", F: __dxlog_file3, L: 190, S: this });
+    this.localState.unsubscribeMessages(PublicKey2.from(peer.peerKey));
   }
   _scheduleReconcileAfterError() {
     scheduleTask(this._ctx, () => this._reconcileTask.schedule(), ERROR_RECONCILE_DELAY);
@@ -860,30 +671,12 @@ var SignalClient = class extends Resource {
     log3("creating client", {
       host: this._host,
       state: this._state
-    }, {
-      F: __dxlog_file3,
-      L: 224,
-      S: this,
-      C: (f, a) => f(...a)
-    });
-    invariant2(!this._client, "Client already created", {
-      F: __dxlog_file3,
-      L: 225,
-      S: this,
-      A: [
-        "!this._client",
-        "'Client already created'"
-      ]
-    });
+    }, { "~LogMeta": "~LogMeta", F: __dxlog_file3, L: 199, S: this });
+    invariant2(!this._client, "Client already created", { "~LogMeta": "~LogMeta", F: __dxlog_file3, L: 203, S: this, A: ["!this._client", "'Client already created'"] });
     this._monitor.recordConnectionStartTime();
     this._connectionCtx = this._ctx.derive();
     this._connectionCtx.onDispose(async () => {
-      log3("connection context disposed", void 0, {
-        F: __dxlog_file3,
-        L: 232,
-        S: this,
-        C: (f, a) => f(...a)
-      });
+      log3("connection context disposed", void 0, { "~LogMeta": "~LogMeta", F: __dxlog_file3, L: 208, S: this });
       const { failureCount } = await this.localState.safeCloseStreams();
       this._monitor.recordStreamCloseErrors(failureCount);
     });
@@ -893,12 +686,7 @@ var SignalClient = class extends Resource {
         callbacks: {
           onConnected: () => {
             if (client === this._client) {
-              log3("socket connected", void 0, {
-                F: __dxlog_file3,
-                L: 243,
-                S: this,
-                C: (f, a) => f(...a)
-              });
+              log3("socket connected", void 0, { "~LogMeta": "~LogMeta", F: __dxlog_file3, L: 218, S: this });
               this._onConnected();
             }
           },
@@ -908,12 +696,7 @@ var SignalClient = class extends Resource {
             }
             log3("socket disconnected", {
               state: this._state
-            }, {
-              F: __dxlog_file3,
-              L: 252,
-              S: this,
-              C: (f, a) => f(...a)
-            });
+            }, { "~LogMeta": "~LogMeta", F: __dxlog_file3, L: 226, S: this });
             if (this._state === SignalState.ERROR) {
               this._setState(SignalState.DISCONNECTED);
             } else {
@@ -925,12 +708,7 @@ var SignalClient = class extends Resource {
               log3("socket error", {
                 error,
                 state: this._state
-              }, {
-                F: __dxlog_file3,
-                L: 264,
-                S: this,
-                C: (f, a) => f(...a)
-              });
+              }, { "~LogMeta": "~LogMeta", F: __dxlog_file3, L: 239, S: this });
               this._onDisconnected({
                 error
               });
@@ -950,19 +728,9 @@ var SignalClient = class extends Resource {
   async _reconnect() {
     log3(`reconnecting in ${this._reconnectAfter}ms`, {
       state: this._state
-    }, {
-      F: __dxlog_file3,
-      L: 279,
-      S: this,
-      C: (f, a) => f(...a)
-    });
+    }, { "~LogMeta": "~LogMeta", F: __dxlog_file3, L: 260, S: this });
     if (this._state === SignalState.RECONNECTING) {
-      log3.info("Signal api already reconnecting.", void 0, {
-        F: __dxlog_file3,
-        L: 282,
-        S: this,
-        C: (f, a) => f(...a)
-      });
+      log3.info("Signal api already reconnecting.", void 0, { "~LogMeta": "~LogMeta", F: __dxlog_file3, L: 264, S: this });
       return;
     }
     if (this._state === SignalState.CLOSED) {
@@ -999,12 +767,7 @@ var SignalClient = class extends Resource {
     this._monitor.recordStateChangeTime();
     log3("signal state changed", {
       status: this.getStatus()
-    }, {
-      F: __dxlog_file3,
-      L: 323,
-      S: this,
-      C: (f, a) => f(...a)
-    });
+    }, { "~LogMeta": "~LogMeta", F: __dxlog_file3, L: 299, S: this });
     this.statusChanged.emit(this.getStatus());
   }
   _updateReconnectTimeout() {
@@ -1027,19 +790,18 @@ var SignalClient = class extends Resource {
 import { Event as Event3, sleep as sleep2, synchronized } from "@dxos/async";
 import { LifecycleState, Resource as Resource2 } from "@dxos/context";
 import { invariant as invariant3 } from "@dxos/invariant";
-import { PublicKey as PublicKey4 } from "@dxos/keys";
 import { log as log4 } from "@dxos/log";
-import { RateLimitExceededError, TimeoutError as TimeoutError2, trace as trace6 } from "@dxos/protocols";
+import { RateLimitExceededError, TimeoutError as TimeoutError2 } from "@dxos/protocols";
 import { BitField, safeAwaitAll as safeAwaitAll2 } from "@dxos/util";
 
 // src/signal-manager/websocket-signal-manager-monitor.ts
-import { trace as trace5 } from "@dxos/tracing";
+import { trace as trace3 } from "@dxos/tracing";
 var WebsocketSignalManagerMonitor = class {
   recordRateLimitExceeded() {
-    trace5.metrics.increment("dxos.mesh.signal.signal-manager.rate-limit-hit", 1);
+    trace3.metrics.increment("dxos.mesh.signal.signal-manager.rate-limit-hit", 1);
   }
   recordServerFailure(params) {
-    trace5.metrics.increment("dxos.mesh.signal.signal-manager.server-failure", 1, {
+    trace3.metrics.increment("dxos.mesh.signal.signal-manager.server-failure", 1, {
       tags: {
         server: params.serverName,
         restarted: params.willRestart
@@ -1049,13 +811,13 @@ var WebsocketSignalManagerMonitor = class {
 };
 
 // src/signal-manager/websocket-signal-manager.ts
+var __dxlog_file4 = "/__w/dxos/dxos/packages/core/mesh/messaging/src/signal-manager/websocket-signal-manager.ts";
 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_file4 = "/__w/dxos/dxos/packages/core/mesh/messaging/src/signal-manager/websocket-signal-manager.ts";
 var MAX_SERVER_FAILURES = 5;
 var WSS_SIGNAL_SERVER_REBOOT_DELAY = 3e3;
 var WebsocketSignalManager = class extends Resource2 {
@@ -1071,17 +833,11 @@ var WebsocketSignalManager = class extends Resource2 {
   statusChanged = new Event3();
   swarmEvent = new Event3();
   onMessage = new Event3();
-  _instanceId = PublicKey4.random().toHex();
   constructor(_hosts, _getMetadata) {
     super(), this._hosts = _hosts, this._getMetadata = _getMetadata;
     log4("Created WebsocketSignalManager", {
       hosts: this._hosts
-    }, {
-      F: __dxlog_file4,
-      L: 58,
-      S: this,
-      C: (f, a) => f(...a)
-    });
+    }, { "~LogMeta": "~LogMeta", F: __dxlog_file4, L: 38, S: this });
     for (const host of this._hosts) {
       if (this._servers.has(host.server)) {
         continue;
@@ -1098,29 +854,8 @@ var WebsocketSignalManager = class extends Resource2 {
   async _open() {
     log4("open signal manager", {
       hosts: this._hosts
-    }, {
-      F: __dxlog_file4,
-      L: 78,
-      S: this,
-      C: (f, a) => f(...a)
-    });
-    log4.trace("dxos.mesh.websocket-signal-manager.open", trace6.begin({
-      id: this._instanceId
-    }), {
-      F: __dxlog_file4,
-      L: 79,
-      S: this,
-      C: (f, a) => f(...a)
-    });
+    }, { "~LogMeta": "~LogMeta", F: __dxlog_file4, L: 56, S: this });
     await safeAwaitAll2(this._servers.values(), (server) => server.open());
-    log4.trace("dxos.mesh.websocket-signal-manager.open", trace6.end({
-      id: this._instanceId
-    }), {
-      F: __dxlog_file4,
-      L: 83,
-      S: this,
-      C: (f, a) => f(...a)
-    });
   }
   async _close() {
     await safeAwaitAll2(this._servers.values(), (server) => server.close());
@@ -1128,31 +863,10 @@ var WebsocketSignalManager = class extends Resource2 {
   async restartServer(serverName) {
     log4("restarting server", {
       serverName
-    }, {
-      F: __dxlog_file4,
-      L: 91,
-      S: this,
-      C: (f, a) => f(...a)
-    });
-    invariant3(this._lifecycleState === LifecycleState.OPEN, void 0, {
-      F: __dxlog_file4,
-      L: 92,
-      S: this,
-      A: [
-        "this._lifecycleState === LifecycleState.OPEN",
-        ""
-      ]
-    });
+    }, { "~LogMeta": "~LogMeta", F: __dxlog_file4, L: 65, S: this });
+    invariant3(this._lifecycleState === LifecycleState.OPEN, void 0, { "~LogMeta": "~LogMeta", F: __dxlog_file4, L: 68, S: this, A: ["this._lifecycleState === LifecycleState.OPEN", ""] });
     const server = this._servers.get(serverName);
-    invariant3(server, "server not found", {
-      F: __dxlog_file4,
-      L: 95,
-      S: this,
-      A: [
-        "server",
-        "'server not found'"
-      ]
-    });
+    invariant3(server, "server not found", { "~LogMeta": "~LogMeta", F: __dxlog_file4, L: 70, S: this, A: ["server", "'server not found'"] });
     await server.close();
     await sleep2(WSS_SIGNAL_SERVER_REBOOT_DELAY);
     await server.open();
@@ -1164,21 +878,8 @@ var WebsocketSignalManager = class extends Resource2 {
     log4("join", {
       topic,
       peer
-    }, {
-      F: __dxlog_file4,
-      L: 108,
-      S: this,
-      C: (f, a) => f(...a)
-    });
-    invariant3(this._lifecycleState === LifecycleState.OPEN, void 0, {
-      F: __dxlog_file4,
-      L: 109,
-      S: this,
-      A: [
-        "this._lifecycleState === LifecycleState.OPEN",
-        ""
-      ]
-    });
+    }, { "~LogMeta": "~LogMeta", F: __dxlog_file4, L: 79, S: this });
+    invariant3(this._lifecycleState === LifecycleState.OPEN, void 0, { "~LogMeta": "~LogMeta", F: __dxlog_file4, L: 83, S: this, A: ["this._lifecycleState === LifecycleState.OPEN", ""] });
     await this._forEachServer((server) => server.join(_ctx, {
       topic,
       peer
@@ -1188,21 +889,8 @@ var WebsocketSignalManager = class extends Resource2 {
     log4("leaving", {
       topic,
       peer
-    }, {
-      F: __dxlog_file4,
-      L: 115,
-      S: this,
-      C: (f, a) => f(...a)
-    });
-    invariant3(this._lifecycleState === LifecycleState.OPEN, void 0, {
-      F: __dxlog_file4,
-      L: 116,
-      S: this,
-      A: [
-        "this._lifecycleState === LifecycleState.OPEN",
-        ""
-      ]
-    });
+    }, { "~LogMeta": "~LogMeta", F: __dxlog_file4, L: 90, S: this });
+    invariant3(this._lifecycleState === LifecycleState.OPEN, void 0, { "~LogMeta": "~LogMeta", F: __dxlog_file4, L: 94, S: this, A: ["this._lifecycleState === LifecycleState.OPEN", ""] });
     await this._forEachServer((server) => server.leave(_ctx, {
       topic,
       peer
@@ -1214,21 +902,8 @@ var WebsocketSignalManager = class extends Resource2 {
   async sendMessage(_ctx, { author, recipient, payload }) {
     log4("signal", {
       recipient
-    }, {
-      F: __dxlog_file4,
-      L: 125,
-      S: this,
-      C: (f, a) => f(...a)
-    });
-    invariant3(this._lifecycleState === LifecycleState.OPEN, void 0, {
-      F: __dxlog_file4,
-      L: 126,
-      S: this,
-      A: [
-        "this._lifecycleState === LifecycleState.OPEN",
-        ""
-      ]
-    });
+    }, { "~LogMeta": "~LogMeta", F: __dxlog_file4, L: 104, S: this });
+    invariant3(this._lifecycleState === LifecycleState.OPEN, void 0, { "~LogMeta": "~LogMeta", F: __dxlog_file4, L: 107, S: this, A: ["this._lifecycleState === LifecycleState.OPEN", ""] });
     void this._forEachServer(async (server, serverName, index) => {
       void server.sendMessage(_ctx, {
         author,
@@ -1238,32 +913,17 @@ var WebsocketSignalManager = class extends Resource2 {
         if (err instanceof RateLimitExceededError) {
           log4.info("WSS rate limit exceeded", {
             err
-          }, {
-            F: __dxlog_file4,
-            L: 134,
-            S: this,
-            C: (f, a) => f(...a)
-          });
+          }, { "~LogMeta": "~LogMeta", F: __dxlog_file4, L: 115, S: this });
           this._monitor.recordRateLimitExceeded();
         } else if (err instanceof TimeoutError2 || err.constructor.name === "TimeoutError") {
           log4.info("WSS sendMessage timeout", {
             err
-          }, {
-            F: __dxlog_file4,
-            L: 137,
-            S: this,
-            C: (f, a) => f(...a)
-          });
+          }, { "~LogMeta": "~LogMeta", F: __dxlog_file4, L: 120, S: this });
           void this.checkServerFailure(serverName, index);
         } else {
           log4.warn(`error sending to ${serverName}`, {
             err
-          }, {
-            F: __dxlog_file4,
-            L: 140,
-            S: this,
-            C: (f, a) => f(...a)
-          });
+          }, { "~LogMeta": "~LogMeta", F: __dxlog_file4, L: 125, S: this });
           void this.checkServerFailure(serverName, index);
         }
       });
@@ -1281,12 +941,7 @@ var WebsocketSignalManager = class extends Resource2 {
         log4.warn("too many failures for ws-server, restarting", {
           serverName,
           failureCount
-        }, {
-          F: __dxlog_file4,
-          L: 154,
-          S: this,
-          C: (f, a) => f(...a)
-        });
+        }, { "~LogMeta": "~LogMeta", F: __dxlog_file4, L: 142, S: this });
         BitField.set(this._failedServersBitfield, index, true);
       }
       await this.restartServer(serverName);
@@ -1299,12 +954,7 @@ var WebsocketSignalManager = class extends Resource2 {
     if (BitField.get(this._failedServersBitfield, index)) {
       log4.info("server connection restored", {
         serverName
-      }, {
-        F: __dxlog_file4,
-        L: 167,
-        S: this,
-        C: (f, a) => f(...a)
-      });
+      }, { "~LogMeta": "~LogMeta", F: __dxlog_file4, L: 156, S: this });
       BitField.set(this._failedServersBitfield, index, false);
       this.failureCount.set(serverName, 0);
     }
@@ -1312,41 +962,15 @@ var WebsocketSignalManager = class extends Resource2 {
   async subscribeMessages(peer) {
     log4("subscribed for message stream", {
       peer
-    }, {
-      F: __dxlog_file4,
-      L: 174,
-      S: this,
-      C: (f, a) => f(...a)
-    });
-    invariant3(this._lifecycleState === LifecycleState.OPEN, void 0, {
-      F: __dxlog_file4,
-      L: 175,
-      S: this,
-      A: [
-        "this._lifecycleState === LifecycleState.OPEN",
-        ""
-      ]
-    });
+    }, { "~LogMeta": "~LogMeta", F: __dxlog_file4, L: 164, S: this });
+    invariant3(this._lifecycleState === LifecycleState.OPEN, void 0, { "~LogMeta": "~LogMeta", F: __dxlog_file4, L: 167, S: this, A: ["this._lifecycleState === LifecycleState.OPEN", ""] });
     await this._forEachServer(async (server) => server.subscribeMessages(peer));
   }
   async unsubscribeMessages(peer) {
     log4("subscribed for message stream", {
       peer
-    }, {
-      F: __dxlog_file4,
-      L: 181,
-      S: this,
-      C: (f, a) => f(...a)
-    });
-    invariant3(this._lifecycleState === LifecycleState.OPEN, void 0, {
-      F: __dxlog_file4,
-      L: 182,
-      S: this,
-      A: [
-        "this._lifecycleState === LifecycleState.OPEN",
-        ""
-      ]
-    });
+    }, { "~LogMeta": "~LogMeta", F: __dxlog_file4, L: 171, S: this });
+    invariant3(this._lifecycleState === LifecycleState.OPEN, void 0, { "~LogMeta": "~LogMeta", F: __dxlog_file4, L: 174, S: this, A: ["this._lifecycleState === LifecycleState.OPEN", ""] });
     await this._forEachServer(async (server) => server.unsubscribeMessages(peer));
   }
   async _forEachServer(fn) {
@@ -1368,7 +992,7 @@ import { Event as Event4, scheduleMicroTask } from "@dxos/async";
 import { Resource as Resource3, cancelWithContext as cancelWithContext3 } from "@dxos/context";
 import { EdgeIdentityChangedError, protocol } from "@dxos/edge-client";
 import { invariant as invariant4 } from "@dxos/invariant";
-import { PublicKey as PublicKey5 } from "@dxos/keys";
+import { PublicKey as PublicKey3 } from "@dxos/keys";
 import { log as log5 } from "@dxos/log";
 import { EdgeService } from "@dxos/protocols";
 import { bufWkt } from "@dxos/protocols/buf";
@@ -1386,7 +1010,7 @@ var EdgeSignalManager = class extends Resource3 {
   * Swarm key -> { peer: <own state payload>, joinedPeers: <state of swarm> }.
   */
   // TODO(mykola): This class should not contain swarm state joinedPeers. Temporary before network-manager API changes to accept list of peers.
-  _swarmPeers = new ComplexMap2(PublicKey5.hash);
+  _swarmPeers = new ComplexMap2(PublicKey3.hash);
   _edgeConnection;
   constructor({ edgeConnection }) {
     super();
@@ -1409,12 +1033,7 @@ var EdgeSignalManager = class extends Resource3 {
           peerKey: this._edgeConnection.peerKey,
           identityKey: this._edgeConnection.identityKey
         }
-      }, {
-        F: __dxlog_file5,
-        L: 65,
-        S: this,
-        C: (f, a) => f(...a)
-      });
+      }, { "~LogMeta": "~LogMeta", F: __dxlog_file5, L: 41, S: this });
       peer.identityKey = this._edgeConnection.identityKey;
       peer.peerKey = this._edgeConnection.peerKey;
     }
@@ -1478,12 +1097,7 @@ var EdgeSignalManager = class extends Resource3 {
           peerKey: this._edgeConnection.peerKey,
           identityKey: this._edgeConnection.identityKey
         }
-      }, {
-        F: __dxlog_file5,
-        L: 133,
-        S: this,
-        C: (f, a) => f(...a)
-      });
+      }, { "~LogMeta": "~LogMeta", F: __dxlog_file5, L: 108, S: this });
     }
     await this._edgeConnection.send(ctx, protocol.createMessage(bufWkt.AnySchema, {
       serviceId: EdgeService.SIGNAL,
@@ -1513,18 +1127,10 @@ var EdgeSignalManager = class extends Resource3 {
     }
   }
   _processSwarmResponse(message) {
-    invariant4(protocol.getPayloadType(message) === SwarmResponseSchema.typeName, "Wrong payload type", {
-      F: __dxlog_file5,
-      L: 171,
-      S: this,
-      A: [
-        "protocol.getPayloadType(message) === SwarmResponseSchema.typeName",
-        "'Wrong payload type'"
-      ]
-    });
+    invariant4(protocol.getPayloadType(message) === SwarmResponseSchema.typeName, "Wrong payload type", { "~LogMeta": "~LogMeta", F: __dxlog_file5, L: 148, S: this, A: ["protocol.getPayloadType(message) === SwarmResponseSchema.typeName", "'Wrong payload type'"] });
     const payload = protocol.getPayload(message, SwarmResponseSchema);
     this.swarmState.emit(payload);
-    const topic = PublicKey5.from(payload.swarmKey);
+    const topic = PublicKey3.from(payload.swarmKey);
     if (!this._swarmPeers.has(topic)) {
       return;
     }
@@ -1557,43 +1163,11 @@ var EdgeSignalManager = class extends Resource3 {
     this._swarmPeers.get(topic).joinedPeers = newPeers;
   }
   _processMessage(message) {
-    invariant4(protocol.getPayloadType(message) === bufWkt.AnySchema.typeName, "Wrong payload type", {
-      F: __dxlog_file5,
-      L: 209,
-      S: this,
-      A: [
-        "protocol.getPayloadType(message) === bufWkt.AnySchema.typeName",
-        "'Wrong payload type'"
-      ]
-    });
+    invariant4(protocol.getPayloadType(message) === bufWkt.AnySchema.typeName, "Wrong payload type", { "~LogMeta": "~LogMeta", F: __dxlog_file5, L: 186, S: this, A: ["protocol.getPayloadType(message) === bufWkt.AnySchema.typeName", "'Wrong payload type'"] });
     const payload = protocol.getPayload(message, bufWkt.AnySchema);
-    invariant4(message.source, "source is missing", {
-      F: __dxlog_file5,
-      L: 211,
-      S: this,
-      A: [
-        "message.source",
-        "'source is missing'"
-      ]
-    });
-    invariant4(message.target, "target is missing", {
-      F: __dxlog_file5,
-      L: 212,
-      S: this,
-      A: [
-        "message.target",
-        "'target is missing'"
-      ]
-    });
-    invariant4(message.target.length === 1, "target should have exactly one item", {
-      F: __dxlog_file5,
-      L: 213,
-      S: this,
-      A: [
-        "message.target.length === 1",
-        "'target should have exactly one item'"
-      ]
-    });
+    invariant4(message.source, "source is missing", { "~LogMeta": "~LogMeta", F: __dxlog_file5, L: 188, S: this, A: ["message.source", "'source is missing'"] });
+    invariant4(message.target, "target is missing", { "~LogMeta": "~LogMeta", F: __dxlog_file5, L: 189, S: this, A: ["message.target", "'target is missing'"] });
+    invariant4(message.target.length === 1, "target should have exactly one item", { "~LogMeta": "~LogMeta", F: __dxlog_file5, L: 190, S: this, A: ["message.target.length === 1", "'target should have exactly one item'"] });
     this.onMessage.emit({
       author: message.source,
       recipient: message.target[0],
@@ -1609,12 +1183,7 @@ var EdgeSignalManager = class extends Resource3 {
   async _rejoinAllSwarms() {
     log5("rejoin swarms", {
       swarms: Array.from(this._swarmPeers.keys())
-    }, {
-      F: __dxlog_file5,
-      L: 232,
-      S: this,
-      C: (f, a) => f(...a)
-    });
+    }, { "~LogMeta": "~LogMeta", F: __dxlog_file5, L: 204, S: this });
     for (const [topic, { lastState }] of this._swarmPeers.entries()) {
       await this.join(this._ctx, {
         topic,
@@ -1644,12 +1213,7 @@ var setIdentityTags = ({ identityService, devicesService, setTag }) => {
     if (!idqr?.identity?.identityKey) {
       log6("empty response from identity service", {
         idqr
-      }, {
-        F: __dxlog_file6,
-        L: 21,
-        S: void 0,
-        C: (f, a) => f(...a)
-      });
+      }, { "~LogMeta": "~LogMeta", F: __dxlog_file6, L: 10, S: void 0 });
       return;
     }
     setTag("identityKey", idqr.identity.identityKey.truncate());
@@ -1658,33 +1222,15 @@ var setIdentityTags = ({ identityService, devicesService, setTag }) => {
     if (!dqr || !dqr.devices || dqr.devices.length === 0) {
       log6("empty response from device service", {
         device: dqr
-      }, {
-        F: __dxlog_file6,
-        L: 30,
-        S: void 0,
-        C: (f, a) => f(...a)
-      });
+      }, { "~LogMeta": "~LogMeta", F: __dxlog_file6, L: 19, S: void 0 });
       return;
     }
-    invariant5(dqr, "empty response from device service", {
-      F: __dxlog_file6,
-      L: 33,
-      S: void 0,
-      A: [
-        "dqr",
-        "'empty response from device service'"
-      ]
-    });
+    invariant5(dqr, "empty response from device service", { "~LogMeta": "~LogMeta", F: __dxlog_file6, L: 24, S: void 0, A: ["dqr", "'empty response from device service'"] });
     const thisDevice = dqr.devices.find((device) => device.kind === DeviceKind.CURRENT);
     if (!thisDevice) {
       log6("no current device", {
         device: dqr
-      }, {
-        F: __dxlog_file6,
-        L: 37,
-        S: void 0,
-        C: (f, a) => f(...a)
-      });
+      }, { "~LogMeta": "~LogMeta", F: __dxlog_file6, L: 27, S: void 0 });
       return;
     }
     setTag("deviceKey", thisDevice.deviceKey.truncate());