@dxos/messaging 0.8.4-main.5ad4a44 → 0.8.4-main.66e292d

package/dist/lib/browser/{chunk-CD3GXEDZ.mjs → chunk-4EMAT5U7.mjs}

@@ -30,24 +30,31 @@ var MessengerMonitor = class {
 var MESSAGE_TIMEOUT = 1e4;
 
 // src/messenger.ts
-function _define_property(obj, key, value) {
-  if (key in obj) {
-    Object.defineProperty(obj, key, {
-      value,
-      enumerable: true,
-      configurable: true,
-      writable: true
-    });
-  } else {
-    obj[key] = value;
-  }
-  return obj;
-}
 var __dxlog_file = "/__w/dxos/dxos/packages/core/mesh/messaging/src/messenger.ts";
 var ReliablePayload = schema.getCodecForType("dxos.mesh.messaging.ReliablePayload");
 var Acknowledgement = schema.getCodecForType("dxos.mesh.messaging.Acknowledgement");
 var RECEIVED_MESSAGES_GC_INTERVAL = 12e4;
 var Messenger = class {
+  _monitor = new MessengerMonitor();
+  _signalManager;
+  // { peerId, payloadType } => listeners set
+  _listeners = new ComplexMap(({ peerId, payloadType }) => peerId + payloadType);
+  // peerId => listeners set
+  _defaultListeners = /* @__PURE__ */ new Map();
+  _onAckCallbacks = new ComplexMap(PublicKey.hash);
+  _receivedMessages = new ComplexSet(PublicKey.hash);
+  /**
+  * Keys scheduled to be cleared from _receivedMessages on the next iteration.
+  */
+  _toClear = new ComplexSet(PublicKey.hash);
+  _ctx;
+  _closed = true;
+  _retryDelay;
+  constructor({ signalManager, retryDelay = 1e3 }) {
+    this._signalManager = signalManager;
+    this._retryDelay = retryDelay;
+    this.open();
+  }
   open() {
     if (!this._closed) {
       return;
@@ -177,7 +184,10 @@ var Messenger = class {
         C: (f, a) => f(...a)
       });
       this._onAckCallbacks.delete(reliablePayload.messageId);
-      timeoutHit(new ProtocolTimeoutError("signaling message not delivered", new TimeoutError(MESSAGE_TIMEOUT, "Message not delivered")));
+      timeoutHit(new ProtocolTimeoutError({
+        message: "signaling message not delivered",
+        cause: new TimeoutError(MESSAGE_TIMEOUT, "Message not delivered")
+      }));
       void messageContext.dispose();
       this._monitor.recordReliableMessage({
         sendAttempts,
@@ -403,21 +413,6 @@ var Messenger = class {
       });
     }
   }
-  constructor({ signalManager, retryDelay = 1e3 }) {
-    _define_property(this, "_monitor", new MessengerMonitor());
-    _define_property(this, "_signalManager", void 0);
-    _define_property(this, "_listeners", new ComplexMap(({ peerId, payloadType }) => peerId + payloadType));
-    _define_property(this, "_defaultListeners", /* @__PURE__ */ new Map());
-    _define_property(this, "_onAckCallbacks", new ComplexMap(PublicKey.hash));
-    _define_property(this, "_receivedMessages", new ComplexSet(PublicKey.hash));
-    _define_property(this, "_toClear", new ComplexSet(PublicKey.hash));
-    _define_property(this, "_ctx", void 0);
-    _define_property(this, "_closed", true);
-    _define_property(this, "_retryDelay", void 0);
-    this._signalManager = signalManager;
-    this._retryDelay = retryDelay;
-    this.open();
-  }
 };
 
 // src/signal-client/signal-client.ts
@@ -431,20 +426,22 @@ import { SignalState } from "@dxos/protocols/proto/dxos/mesh/signal";
 
 // src/signal-client/signal-client-monitor.ts
 import { trace as trace3 } from "@dxos/tracing";
-function _define_property2(obj, key, value) {
-  if (key in obj) {
-    Object.defineProperty(obj, key, {
-      value,
-      enumerable: true,
-      configurable: true,
-      writable: true
-    });
-  } else {
-    obj[key] = value;
-  }
-  return obj;
-}
 var SignalClientMonitor = class {
+  _performance = {
+    sentMessages: 0,
+    receivedMessages: 0,
+    reconnectCounter: 0,
+    joinCounter: 0,
+    leaveCounter: 0
+  };
+  /**
+  * Timestamp of when the connection attempt was began.
+  */
+  _connectionStarted = /* @__PURE__ */ new Date();
+  /**
+  * Timestamp of last state change.
+  */
+  _lastStateChange = /* @__PURE__ */ new Date();
   getRecordedTimestamps() {
     return {
       connectionStarted: this._connectionStarted,
@@ -514,17 +511,6 @@ var SignalClientMonitor = class {
       }
     });
   }
-  constructor() {
-    _define_property2(this, "_performance", {
-      sentMessages: 0,
-      receivedMessages: 0,
-      reconnectCounter: 0,
-      joinCounter: 0,
-      leaveCounter: 0
-    });
-    _define_property2(this, "_connectionStarted", /* @__PURE__ */ new Date());
-    _define_property2(this, "_lastStateChange", /* @__PURE__ */ new Date());
-  }
 };
 var getByteCount = (message) => {
   return message.author.peerKey.length + message.recipient.peerKey.length + message.payload.type_url.length + message.payload.value.length;
@@ -541,21 +527,36 @@ import { cancelWithContext } from "@dxos/context";
 import { PublicKey as PublicKey2 } from "@dxos/keys";
 import { log as log2 } from "@dxos/log";
 import { ComplexMap as ComplexMap2, ComplexSet as ComplexSet2, safeAwaitAll } from "@dxos/util";
-function _define_property3(obj, key, value) {
-  if (key in obj) {
-    Object.defineProperty(obj, key, {
-      value,
-      enumerable: true,
-      configurable: true,
-      writable: true
-    });
-  } else {
-    obj[key] = value;
-  }
-  return obj;
-}
 var __dxlog_file2 = "/__w/dxos/dxos/packages/core/mesh/messaging/src/signal-client/signal-local-state.ts";
 var SignalLocalState = class {
+  _onMessage;
+  _onSwarmEvent;
+  /**
+  * Swarm events streams. Keys represent actually joined topic and peerId.
+  */
+  _swarmStreams = new ComplexMap2(({ topic, peerId }) => topic.toHex() + peerId.toHex());
+  /**
+  * Represent desired joined topic and peerId.
+  */
+  _joinedTopics = new ComplexSet2(({ topic, peerId }) => topic.toHex() + peerId.toHex());
+  /**
+  * Represent desired message subscriptions.
+  */
+  _subscribedMessages = new ComplexSet2(({ peerId }) => peerId.toHex());
+  /**
+  * Message streams. Keys represents actually subscribed peers.
+  * @internal
+  */
+  messageStreams = new ComplexMap2((key) => key.toHex());
+  /**
+  * Event to use in tests to wait till subscription is successfully established.
+  * @internal
+  */
+  reconciled = new Event();
+  constructor(_onMessage, _onSwarmEvent) {
+    this._onMessage = _onMessage;
+    this._onSwarmEvent = _onSwarmEvent;
+  }
   async safeCloseStreams() {
     const streams = [
       ...this._swarmStreams.values()
@@ -715,22 +716,6 @@ var SignalLocalState = class {
       this.messageStreams.set(peerId, messageStream);
     }
   }
-  constructor(_onMessage, _onSwarmEvent) {
-    _define_property3(this, "_onMessage", void 0);
-    _define_property3(this, "_onSwarmEvent", void 0);
-    _define_property3(this, "_swarmStreams", void 0);
-    _define_property3(this, "_joinedTopics", void 0);
-    _define_property3(this, "_subscribedMessages", void 0);
-    _define_property3(this, "messageStreams", void 0);
-    _define_property3(this, "reconciled", void 0);
-    this._onMessage = _onMessage;
-    this._onSwarmEvent = _onSwarmEvent;
-    this._swarmStreams = new ComplexMap2(({ topic, peerId }) => topic.toHex() + peerId.toHex());
-    this._joinedTopics = new ComplexSet2(({ topic, peerId }) => topic.toHex() + peerId.toHex());
-    this._subscribedMessages = new ComplexSet2(({ peerId }) => peerId.toHex());
-    this.messageStreams = new ComplexMap2((key) => key.toHex());
-    this.reconciled = new Event();
-  }
 };
 
 // src/signal-client/signal-rpc-client.ts
@@ -757,22 +742,132 @@ var SignalRpcClientMonitor = class {
 };
 
 // src/signal-client/signal-rpc-client.ts
-function _define_property4(obj, key, value) {
-  if (key in obj) {
-    Object.defineProperty(obj, key, {
-      value,
-      enumerable: true,
-      configurable: true,
-      writable: true
-    });
-  } else {
-    obj[key] = value;
-  }
-  return obj;
-}
 var __dxlog_file3 = "/__w/dxos/dxos/packages/core/mesh/messaging/src/signal-client/signal-rpc-client.ts";
 var SIGNAL_KEEPALIVE_INTERVAL = 1e4;
 var SignalRPCClient = class {
+  _socket;
+  _rpc;
+  _connectTrigger = new Trigger();
+  _keepaliveCtx;
+  _closed = false;
+  _url;
+  _callbacks;
+  _closeComplete = new Trigger();
+  _monitor = new SignalRpcClientMonitor();
+  constructor({ url, callbacks = {} }) {
+    const traceId = PublicKey3.random().toHex();
+    log3.trace("dxos.mesh.signal-rpc-client.constructor", trace5.begin({
+      id: traceId
+    }), {
+      F: __dxlog_file3,
+      L: 66,
+      S: this,
+      C: (f, a) => f(...a)
+    });
+    this._url = url;
+    this._callbacks = callbacks;
+    this._socket = new WebSocket(this._url);
+    this._rpc = createProtoRpcPeer({
+      requested: {
+        Signal: schema2.getService("dxos.mesh.signal.Signal")
+      },
+      noHandshake: true,
+      port: {
+        send: (msg) => {
+          if (this._closed) {
+            return;
+          }
+          try {
+            this._socket.send(msg);
+          } catch (err) {
+            log3.warn("send error", err, {
+              F: __dxlog_file3,
+              L: 85,
+              S: this,
+              C: (f, a) => f(...a)
+            });
+          }
+        },
+        subscribe: (cb) => {
+          this._socket.onmessage = async (msg) => {
+            if (typeof Blob !== "undefined" && msg.data instanceof Blob) {
+              cb(Buffer.from(await msg.data.arrayBuffer()));
+            } else {
+              cb(msg.data);
+            }
+          };
+        }
+      },
+      encodingOptions: {
+        preserveAny: true
+      }
+    });
+    this._socket.onopen = async () => {
+      try {
+        await this._rpc.open();
+        if (this._closed) {
+          await this._safeCloseRpc();
+          return;
+        }
+        log3(`RPC open ${this._url}`, void 0, {
+          F: __dxlog_file3,
+          L: 110,
+          S: this,
+          C: (f, a) => f(...a)
+        });
+        this._callbacks.onConnected?.();
+        this._connectTrigger.wake();
+        this._keepaliveCtx = new Context2(void 0, {
+          F: __dxlog_file3,
+          L: 113
+        });
+        scheduleTaskInterval2(this._keepaliveCtx, async () => {
+          this._socket?.send("__ping__");
+        }, SIGNAL_KEEPALIVE_INTERVAL);
+      } catch (err) {
+        this._callbacks.onError?.(err);
+        this._socket.close();
+        this._closed = true;
+      }
+    };
+    this._socket.onclose = async () => {
+      log3(`Disconnected ${this._url}`, void 0, {
+        F: __dxlog_file3,
+        L: 133,
+        S: this,
+        C: (f, a) => f(...a)
+      });
+      this._callbacks.onDisconnected?.();
+      this._closeComplete.wake();
+      await this.close();
+    };
+    this._socket.onerror = async (event) => {
+      if (this._closed) {
+        this._socket.close();
+        return;
+      }
+      this._closed = true;
+      this._callbacks.onError?.(event.error ?? new Error(event.message));
+      await this._safeCloseRpc();
+      log3.warn(`Socket ${event.type ?? "unknown"} error`, {
+        message: event.message,
+        url: this._url
+      }, {
+        F: __dxlog_file3,
+        L: 149,
+        S: this,
+        C: (f, a) => f(...a)
+      });
+    };
+    log3.trace("dxos.mesh.signal-rpc-client.constructor", trace5.end({
+      id: traceId
+    }), {
+      F: __dxlog_file3,
+      L: 152,
+      S: this,
+      C: (f, a) => f(...a)
+    });
+  }
   async close() {
     if (this._closed) {
       return;
@@ -890,151 +985,54 @@ var SignalRPCClient = class {
       });
     }
   }
-  constructor({ url, callbacks = {} }) {
-    _define_property4(this, "_socket", void 0);
-    _define_property4(this, "_rpc", void 0);
-    _define_property4(this, "_connectTrigger", new Trigger());
-    _define_property4(this, "_keepaliveCtx", void 0);
-    _define_property4(this, "_closed", false);
-    _define_property4(this, "_url", void 0);
-    _define_property4(this, "_callbacks", void 0);
-    _define_property4(this, "_closeComplete", new Trigger());
-    _define_property4(this, "_monitor", new SignalRpcClientMonitor());
-    const traceId = PublicKey3.random().toHex();
-    log3.trace("dxos.mesh.signal-rpc-client.constructor", trace5.begin({
-      id: traceId
-    }), {
-      F: __dxlog_file3,
-      L: 66,
-      S: this,
-      C: (f, a) => f(...a)
-    });
-    this._url = url;
-    this._callbacks = callbacks;
-    this._socket = new WebSocket(this._url);
-    this._rpc = createProtoRpcPeer({
-      requested: {
-        Signal: schema2.getService("dxos.mesh.signal.Signal")
-      },
-      noHandshake: true,
-      port: {
-        send: (msg) => {
-          if (this._closed) {
-            return;
-          }
-          try {
-            this._socket.send(msg);
-          } catch (err) {
-            log3.warn("send error", err, {
-              F: __dxlog_file3,
-              L: 85,
-              S: this,
-              C: (f, a) => f(...a)
-            });
-          }
-        },
-        subscribe: (cb) => {
-          this._socket.onmessage = async (msg) => {
-            if (typeof Blob !== "undefined" && msg.data instanceof Blob) {
-              cb(Buffer.from(await msg.data.arrayBuffer()));
-            } else {
-              cb(msg.data);
-            }
-          };
-        }
-      },
-      encodingOptions: {
-        preserveAny: true
-      }
-    });
-    this._socket.onopen = async () => {
-      try {
-        await this._rpc.open();
-        if (this._closed) {
-          await this._safeCloseRpc();
-          return;
-        }
-        log3(`RPC open ${this._url}`, void 0, {
-          F: __dxlog_file3,
-          L: 110,
-          S: this,
-          C: (f, a) => f(...a)
-        });
-        this._callbacks.onConnected?.();
-        this._connectTrigger.wake();
-        this._keepaliveCtx = new Context2(void 0, {
-          F: __dxlog_file3,
-          L: 113
-        });
-        scheduleTaskInterval2(this._keepaliveCtx, async () => {
-          this._socket?.send("__ping__");
-        }, SIGNAL_KEEPALIVE_INTERVAL);
-      } catch (err) {
-        this._callbacks.onError?.(err);
-        this._socket.close();
-        this._closed = true;
-      }
-    };
-    this._socket.onclose = async () => {
-      log3(`Disconnected ${this._url}`, void 0, {
-        F: __dxlog_file3,
-        L: 133,
-        S: this,
-        C: (f, a) => f(...a)
-      });
-      this._callbacks.onDisconnected?.();
-      this._closeComplete.wake();
-      await this.close();
-    };
-    this._socket.onerror = async (event) => {
-      if (this._closed) {
-        this._socket.close();
-        return;
-      }
-      this._closed = true;
-      this._callbacks.onError?.(event.error ?? new Error(event.message));
-      await this._safeCloseRpc();
-      log3.warn(`Socket ${event.type ?? "unknown"} error`, {
-        message: event.message,
-        url: this._url
-      }, {
-        F: __dxlog_file3,
-        L: 149,
-        S: this,
-        C: (f, a) => f(...a)
-      });
-    };
-    log3.trace("dxos.mesh.signal-rpc-client.constructor", trace5.end({
-      id: traceId
-    }), {
-      F: __dxlog_file3,
-      L: 152,
-      S: this,
-      C: (f, a) => f(...a)
-    });
-  }
 };
 
 // src/signal-client/signal-client.ts
-function _define_property5(obj, key, value) {
-  if (key in obj) {
-    Object.defineProperty(obj, key, {
-      value,
-      enumerable: true,
-      configurable: true,
-      writable: true
-    });
-  } else {
-    obj[key] = value;
-  }
-  return obj;
-}
 var __dxlog_file4 = "/__w/dxos/dxos/packages/core/mesh/messaging/src/signal-client/signal-client.ts";
 var DEFAULT_RECONNECT_TIMEOUT = 100;
 var MAX_RECONNECT_TIMEOUT = 5e3;
 var ERROR_RECONCILE_DELAY = 1e3;
 var RECONCILE_INTERVAL = 5e3;
 var SignalClient = class extends Resource {
+  _host;
+  _getMetadata;
+  _monitor = new SignalClientMonitor();
+  _state = SignalState.CLOSED;
+  _lastError;
+  _lastReconciliationFailed = false;
+  _clientReady = new Trigger2();
+  _connectionCtx;
+  _client;
+  _reconcileTask;
+  _reconnectTask;
+  /**
+  * Number of milliseconds after which the connection will be attempted again in case of error.
+  */
+  _reconnectAfter = DEFAULT_RECONNECT_TIMEOUT;
+  _instanceId = PublicKey4.random().toHex();
+  /**
+  * @internal
+  */
+  localState;
+  statusChanged = new Event2();
+  onMessage = new Event2();
+  swarmEvent = new Event2();
+  /**
+  * @param _host Signal server websocket URL.
+  * @param onMessage called when a new message is received.
+  * @param onSwarmEvent called when a new swarm event is received.
+  * @param _getMetadata signal-message metadata provider, called for every message.
+  */
+  constructor(_host, _getMetadata) {
+    super(), this._host = _host, this._getMetadata = _getMetadata;
+    if (!this._host.startsWith("wss://") && !this._host.startsWith("ws://")) {
+      throw new Error(`Signal server requires a websocket URL. Provided: ${this._host}`);
+    }
+    this.localState = new SignalLocalState(async (message) => {
+      this._monitor.recordMessageReceived(message);
+      this.onMessage.emit(message);
+    }, async (event) => this.swarmEvent.emit(event));
+  }
   async _open() {
     log4.trace("dxos.mesh.signal-client.open", trace6.begin({
       id: this._instanceId
@@ -1432,28 +1430,6 @@ var SignalClient = class extends Resource {
     });
     this._client = void 0;
   }
-  /**
-  * @param _host Signal server websocket URL.
-  * @param onMessage called when a new message is received.
-  * @param onSwarmEvent called when a new swarm event is received.
-  * @param _getMetadata signal-message metadata provider, called for every message.
-  */
-  constructor(_host, _getMetadata) {
-    super(), _define_property5(this, "_host", void 0), _define_property5(this, "_getMetadata", void 0), _define_property5(this, "_monitor", void 0), _define_property5(this, "_state", void 0), _define_property5(this, "_lastError", void 0), _define_property5(this, "_lastReconciliationFailed", void 0), _define_property5(this, "_clientReady", void 0), _define_property5(this, "_connectionCtx", void 0), _define_property5(this, "_client", void 0), _define_property5(this, "_reconcileTask", void 0), _define_property5(this, "_reconnectTask", void 0), /**
-    * Number of milliseconds after which the connection will be attempted again in case of error.
-    */
-    _define_property5(this, "_reconnectAfter", void 0), _define_property5(this, "_instanceId", void 0), /**
-    * @internal
-    */
-    _define_property5(this, "localState", void 0), _define_property5(this, "statusChanged", void 0), _define_property5(this, "onMessage", void 0), _define_property5(this, "swarmEvent", void 0), this._host = _host, this._getMetadata = _getMetadata, this._monitor = new SignalClientMonitor(), this._state = SignalState.CLOSED, this._lastReconciliationFailed = false, this._clientReady = new Trigger2(), this._reconnectAfter = DEFAULT_RECONNECT_TIMEOUT, this._instanceId = PublicKey4.random().toHex(), this.statusChanged = new Event2(), this.onMessage = new Event2(), this.swarmEvent = new Event2();
-    if (!this._host.startsWith("wss://") && !this._host.startsWith("ws://")) {
-      throw new Error(`Signal server requires a websocket URL. Provided: ${this._host}`);
-    }
-    this.localState = new SignalLocalState(async (message) => {
-      this._monitor.recordMessageReceived(message);
-      this.onMessage.emit(message);
-    }, async (event) => this.swarmEvent.emit(event));
-  }
 };
 
 // src/signal-methods.ts
@@ -1467,28 +1443,33 @@ import { PublicKey as PublicKey5 } from "@dxos/keys";
 import { log as log5 } from "@dxos/log";
 import { schema as schema3 } from "@dxos/protocols/proto";
 import { ComplexMap as ComplexMap3, ComplexSet as ComplexSet3 } from "@dxos/util";
-function _define_property6(obj, key, value) {
-  if (key in obj) {
-    Object.defineProperty(obj, key, {
-      value,
-      enumerable: true,
-      configurable: true,
-      writable: true
-    });
-  } else {
-    obj[key] = value;
-  }
-  return obj;
-}
 var __dxlog_file5 = "/__w/dxos/dxos/packages/core/mesh/messaging/src/signal-manager/memory-signal-manager.ts";
 var MemorySignalManagerContext = class {
-  constructor() {
-    _define_property6(this, "swarmEvent", new Event3());
-    _define_property6(this, "swarms", new ComplexMap3(PublicKey5.hash));
-    _define_property6(this, "connections", new ComplexMap3(PeerInfoHash));
-  }
+  // Swarm messages.
+  swarmEvent = new Event3();
+  // Mapping from topic to set of peers.
+  swarms = new ComplexMap3(PublicKey5.hash);
+  // Map of connections for each peer for signaling.
+  connections = new ComplexMap3(PeerInfoHash);
 };
 var MemorySignalManager = class {
+  _context;
+  statusChanged = new Event3();
+  swarmEvent = new Event3();
+  onMessage = new Event3();
+  /**  Will be used to emit SwarmEvents on .open() and .close() */
+  _joinedSwarms = new ComplexSet3(({ topic, peer }) => topic.toHex() + peer.peerKey);
+  _ctx;
+  // TODO(dmaretskyi): Replace with callback.
+  _freezeTrigger = new Trigger3().wake();
+  constructor(_context) {
+    this._context = _context;
+    this._ctx = new Context3(void 0, {
+      F: __dxlog_file5,
+      L: 54
+    });
+    this._ctx.onDispose(this._context.swarmEvent.on((data) => this.swarmEvent.emit(data)));
+  }
   async open() {
     if (!this._ctx.disposed) {
       return;
@@ -1706,26 +1687,6 @@ var MemorySignalManager = class {
   unfreeze() {
     this._freezeTrigger.wake();
   }
-  constructor(_context) {
-    _define_property6(this, "_context", void 0);
-    _define_property6(this, "statusChanged", void 0);
-    _define_property6(this, "swarmEvent", void 0);
-    _define_property6(this, "onMessage", void 0);
-    _define_property6(this, "_joinedSwarms", void 0);
-    _define_property6(this, "_ctx", void 0);
-    _define_property6(this, "_freezeTrigger", void 0);
-    this._context = _context;
-    this.statusChanged = new Event3();
-    this.swarmEvent = new Event3();
-    this.onMessage = new Event3();
-    this._joinedSwarms = new ComplexSet3(({ topic, peer }) => topic.toHex() + peer.peerKey);
-    this._freezeTrigger = new Trigger3().wake();
-    this._ctx = new Context3(void 0, {
-      F: __dxlog_file5,
-      L: 54
-    });
-    this._ctx.onDispose(this._context.swarmEvent.on((data) => this.swarmEvent.emit(data)));
-  }
 };
 var dec = (payload) => {
   if (!payload.type_url.endsWith("ReliablePayload")) {
@@ -1767,19 +1728,6 @@ var WebsocketSignalManagerMonitor = class {
 };
 
 // src/signal-manager/websocket-signal-manager.ts
-function _define_property7(obj, key, value) {
-  if (key in obj) {
-    Object.defineProperty(obj, key, {
-      value,
-      enumerable: true,
-      configurable: true,
-      writable: true
-    });
-  } else {
-    obj[key] = value;
-  }
-  return obj;
-}
 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);
@@ -1790,6 +1738,42 @@ var __dxlog_file6 = "/__w/dxos/dxos/packages/core/mesh/messaging/src/signal-mana
 var MAX_SERVER_FAILURES = 5;
 var WSS_SIGNAL_SERVER_REBOOT_DELAY = 3e3;
 var WebsocketSignalManager = class extends Resource2 {
+  _hosts;
+  _getMetadata;
+  _servers = /* @__PURE__ */ new Map();
+  _monitor = new WebsocketSignalManagerMonitor();
+  /**
+  * Used to avoid logging failed server restarts more than once until the server actually recovers.
+  */
+  _failedServersBitfield;
+  failureCount = /* @__PURE__ */ new Map();
+  statusChanged = new Event4();
+  swarmEvent = new Event4();
+  onMessage = new Event4();
+  _instanceId = PublicKey6.random().toHex();
+  constructor(_hosts, _getMetadata) {
+    super(), this._hosts = _hosts, this._getMetadata = _getMetadata;
+    log6("Created WebsocketSignalManager", {
+      hosts: this._hosts
+    }, {
+      F: __dxlog_file6,
+      L: 59,
+      S: this,
+      C: (f, a) => f(...a)
+    });
+    for (const host of this._hosts) {
+      if (this._servers.has(host.server)) {
+        continue;
+      }
+      const server = new SignalClient(host.server, this._getMetadata);
+      server.swarmEvent.on((data) => this.swarmEvent.emit(data));
+      server.onMessage.on((data) => this.onMessage.emit(data));
+      server.statusChanged.on(() => this.statusChanged.emit(this.getStatus()));
+      this._servers.set(host.server, server);
+      this.failureCount.set(host.server, 0);
+    }
+    this._failedServersBitfield = BitField.zeros(this._hosts.length);
+  }
   async _open() {
     log6("open signal manager", {
       hosts: this._hosts
@@ -2047,32 +2031,6 @@ var WebsocketSignalManager = class extends Resource2 {
   async _forEachServer(fn) {
     return Promise.all(Array.from(this._servers.entries()).map(([serverName, server], idx) => fn(server, serverName, idx)));
   }
-  constructor(_hosts, _getMetadata) {
-    super(), _define_property7(this, "_hosts", void 0), _define_property7(this, "_getMetadata", void 0), _define_property7(this, "_servers", void 0), _define_property7(this, "_monitor", void 0), /**
-    * Used to avoid logging failed server restarts more than once until the server actually recovers.
-    */
-    _define_property7(this, "_failedServersBitfield", void 0), _define_property7(this, "failureCount", void 0), _define_property7(this, "statusChanged", void 0), _define_property7(this, "swarmEvent", void 0), _define_property7(this, "onMessage", void 0), _define_property7(this, "_instanceId", void 0), this._hosts = _hosts, this._getMetadata = _getMetadata, this._servers = /* @__PURE__ */ new Map(), this._monitor = new WebsocketSignalManagerMonitor(), this.failureCount = /* @__PURE__ */ new Map(), this.statusChanged = new Event4(), this.swarmEvent = new Event4(), this.onMessage = new Event4(), this._instanceId = PublicKey6.random().toHex();
-    log6("Created WebsocketSignalManager", {
-      hosts: this._hosts
-    }, {
-      F: __dxlog_file6,
-      L: 59,
-      S: this,
-      C: (f, a) => f(...a)
-    });
-    for (const host of this._hosts) {
-      if (this._servers.has(host.server)) {
-        continue;
-      }
-      const server = new SignalClient(host.server, this._getMetadata);
-      server.swarmEvent.on((data) => this.swarmEvent.emit(data));
-      server.onMessage.on((data) => this.onMessage.emit(data));
-      server.statusChanged.on(() => this.statusChanged.emit(this.getStatus()));
-      this._servers.set(host.server, server);
-      this.failureCount.set(host.server, 0);
-    }
-    this._failedServersBitfield = BitField.zeros(this._hosts.length);
-  }
 };
 _ts_decorate([
   synchronized
@@ -2095,21 +2053,24 @@ import { EdgeService } from "@dxos/protocols";
 import { bufWkt } from "@dxos/protocols/buf";
 import { SwarmRequest_Action as SwarmRequestAction, SwarmRequestSchema, SwarmResponseSchema } from "@dxos/protocols/buf/dxos/edge/messenger_pb";
 import { ComplexMap as ComplexMap4, ComplexSet as ComplexSet4 } from "@dxos/util";
-function _define_property8(obj, key, value) {
-  if (key in obj) {
-    Object.defineProperty(obj, key, {
-      value,
-      enumerable: true,
-      configurable: true,
-      writable: true
-    });
-  } else {
-    obj[key] = value;
-  }
-  return obj;
-}
 var __dxlog_file7 = "/__w/dxos/dxos/packages/core/mesh/messaging/src/signal-manager/edge-signal-manager.ts";
 var EdgeSignalManager = class extends Resource3 {
+  /**
+  * @deprecated
+  */
+  swarmEvent = new Event5();
+  swarmState = new Event5();
+  onMessage = new Event5();
+  /**
+  * 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 ComplexMap4(PublicKey7.hash);
+  _edgeConnection;
+  constructor({ edgeConnection }) {
+    super();
+    this._edgeConnection = edgeConnection;
+  }
   async _open() {
     this._ctx.onDispose(this._edgeConnection.onMessage((message) => this._onMessage(message)));
     this._ctx.onDispose(this._edgeConnection.onReconnected(() => {
@@ -2344,17 +2305,6 @@ var EdgeSignalManager = class extends Resource3 {
       });
     }
   }
-  constructor({ edgeConnection }) {
-    super(), /**
-    * @deprecated
-    */
-    _define_property8(this, "swarmEvent", new Event5()), _define_property8(this, "swarmState", new Event5()), _define_property8(this, "onMessage", new Event5()), /**
-    * 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.
-    _define_property8(this, "_swarmPeers", new ComplexMap4(PublicKey7.hash)), _define_property8(this, "_edgeConnection", void 0);
-    this._edgeConnection = edgeConnection;
-  }
 };
 var createMessageSource = (topic, peerInfo) => {
   return {
@@ -2430,4 +2380,4 @@ export {
   EdgeSignalManager,
   setIdentityTags
 };
-//# sourceMappingURL=chunk-CD3GXEDZ.mjs.map
+//# sourceMappingURL=chunk-4EMAT5U7.mjs.map