@dxos/network-manager 0.6.9-staging.8e43e2a → 0.6.10-main.3cfcc89

package/dist/lib/browser/{chunk-ZQ4OU7JZ.mjs → chunk-SKTAEJ7M.mjs}

@@ -622,7 +622,8 @@ import { Context as Context2 } from "@dxos/context";
 import { invariant as invariant2 } from "@dxos/invariant";
 import { PublicKey as PublicKey2 } from "@dxos/keys";
 import { log as log3 } from "@dxos/log";
-import { schema, TimeoutError as TimeoutError2 } from "@dxos/protocols";
+import { TimeoutError as TimeoutError2 } from "@dxos/protocols";
+import { schema } from "@dxos/protocols/proto";
 import { ComplexMap } from "@dxos/util";
 var __dxlog_file3 = "/home/runner/work/dxos/dxos/packages/core/mesh/network-manager/src/signal/swarm-messenger.ts";
 var SwarmMessage = schema.getCodecForType("dxos.mesh.swarm.SwarmMessage");
@@ -630,7 +631,7 @@ var SwarmMessenger = class {
   constructor({ sendMessage, onSignal, onOffer, topic }) {
     this._ctx = new Context2(void 0, {
       F: __dxlog_file3,
-      L: 34
+      L: 35
     });
     this._offerRecords = new ComplexMap((key) => key.toHex());
     this._sendMessage = sendMessage;
@@ -652,7 +653,7 @@ var SwarmMessenger = class {
       msg: message
     }, {
       F: __dxlog_file3,
-      L: 70,
+      L: 71,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -681,7 +682,7 @@ var SwarmMessenger = class {
         message
       }, {
         F: __dxlog_file3,
-        L: 81,
+        L: 82,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -690,7 +691,7 @@ var SwarmMessenger = class {
   async signal(message) {
     invariant2(message.data?.signal || message.data?.signalBatch, "Invalid message", {
       F: __dxlog_file3,
-      L: 86,
+      L: 87,
       S: this,
       A: [
         "message.data?.signal || message.data?.signalBatch",
@@ -731,7 +732,7 @@ var SwarmMessenger = class {
       msg: networkMessage
     }, {
       F: __dxlog_file3,
-      L: 124,
+      L: 125,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -747,7 +748,7 @@ var SwarmMessenger = class {
   async _resolveAnswers(message) {
     invariant2(message.data?.answer?.offerMessageId, "No offerMessageId", {
       F: __dxlog_file3,
-      L: 136,
+      L: 137,
       S: this,
       A: [
         "message.data?.answer?.offerMessageId",
@@ -759,7 +760,7 @@ var SwarmMessenger = class {
       this._offerRecords.delete(message.data.answer.offerMessageId);
       invariant2(message.data?.answer, "No answer", {
         F: __dxlog_file3,
-        L: 140,
+        L: 141,
         S: this,
         A: [
           "message.data?.answer",
@@ -770,7 +771,7 @@ var SwarmMessenger = class {
         answer: message.data.answer
       }, {
         F: __dxlog_file3,
-        L: 141,
+        L: 142,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -780,7 +781,7 @@ var SwarmMessenger = class {
   async _handleOffer({ author, recipient, message }) {
     invariant2(message.data.offer, "No offer", {
       F: __dxlog_file3,
-      L: 155,
+      L: 156,
       S: this,
       A: [
         "message.data.offer",
@@ -815,7 +816,7 @@ var SwarmMessenger = class {
           err
         }, {
           F: __dxlog_file3,
-          L: 176,
+          L: 177,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -824,7 +825,7 @@ var SwarmMessenger = class {
           err
         }, {
           F: __dxlog_file3,
-          L: 178,
+          L: 179,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -834,7 +835,7 @@ var SwarmMessenger = class {
   async _handleSignal({ author, recipient, message }) {
     invariant2(message.messageId, void 0, {
       F: __dxlog_file3,
-      L: 192,
+      L: 193,
       S: this,
       A: [
         "message.messageId",
@@ -843,7 +844,7 @@ var SwarmMessenger = class {
     });
     invariant2(message.data.signal || message.data.signalBatch, "Invalid message", {
       F: __dxlog_file3,
-      L: 193,
+      L: 194,
       S: this,
       A: [
         "message.data.signal || message.data.signalBatch",
@@ -2458,7 +2459,6 @@ var FullyConnectedTopology = class {
 };
 
 // packages/core/mesh/network-manager/src/topology/mmst-topology.ts
-import distance from "xor-distance";
 import { invariant as invariant8 } from "@dxos/invariant";
 import { log as log9 } from "@dxos/log";
 var __dxlog_file10 = "/home/runner/work/dxos/dxos/packages/core/mesh/network-manager/src/topology/mmst-topology.ts";
@@ -2475,7 +2475,7 @@ var MMSTTopology = class {
   init(controller) {
     invariant8(!this._controller, "Already initialized", {
       F: __dxlog_file10,
-      L: 51,
+      L: 49,
       S: this,
       A: [
         "!this._controller",
@@ -2487,7 +2487,7 @@ var MMSTTopology = class {
   update() {
     invariant8(this._controller, "Not initialized", {
       F: __dxlog_file10,
-      L: 56,
+      L: 54,
       S: this,
       A: [
         "this._controller",
@@ -2498,7 +2498,7 @@ var MMSTTopology = class {
     if (this._sampleCollected || connected.length > this._maxPeers || candidates.length > 0) {
       log9("Running the algorithm.", void 0, {
         F: __dxlog_file10,
-        L: 60,
+        L: 58,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -2513,7 +2513,7 @@ var MMSTTopology = class {
   async onOffer(peer) {
     invariant8(this._controller, "Not initialized", {
       F: __dxlog_file10,
-      L: 72,
+      L: 70,
       S: this,
       A: [
         "this._controller",
@@ -2524,7 +2524,7 @@ var MMSTTopology = class {
     const accept = connected.length < this._maxPeers;
     log9(`Offer ${peer} accept=${accept}`, void 0, {
       F: __dxlog_file10,
-      L: 75,
+      L: 73,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -2535,7 +2535,7 @@ var MMSTTopology = class {
   _runAlgorithm() {
     invariant8(this._controller, "Not initialized", {
       F: __dxlog_file10,
-      L: 84,
+      L: 82,
       S: this,
       A: [
         "this._controller",
@@ -2546,14 +2546,14 @@ var MMSTTopology = class {
     if (connected.length > this._maxPeers) {
       log9(`disconnect ${connected.length - this._maxPeers} peers.`, void 0, {
         F: __dxlog_file10,
-        L: 90,
+        L: 88,
         S: this,
         C: (f, a) => f(...a)
       });
       const sorted = sortByXorDistance(connected, ownPeerId).reverse().slice(0, this._maxPeers - connected.length);
       invariant8(sorted.length === 0, void 0, {
         F: __dxlog_file10,
-        L: 94,
+        L: 92,
         S: this,
         A: [
           "sorted.length === 0",
@@ -2563,7 +2563,7 @@ var MMSTTopology = class {
       if (sorted.length > MAX_CHANGES_PER_UPDATE) {
         log9(`want to disconnect ${sorted.length} peers but limited to ${MAX_CHANGES_PER_UPDATE}`, void 0, {
           F: __dxlog_file10,
-          L: 97,
+          L: 95,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -2572,7 +2572,7 @@ var MMSTTopology = class {
         for (const peer of sorted.slice(0, MAX_CHANGES_PER_UPDATE)) {
           log9(`Disconnect ${peer}.`, void 0, {
             F: __dxlog_file10,
-            L: 102,
+            L: 100,
             S: this,
             C: (f, a) => f(...a)
           });
@@ -2582,7 +2582,7 @@ var MMSTTopology = class {
       } else {
         log9("rate limited disconnect", void 0, {
           F: __dxlog_file10,
-          L: 107,
+          L: 105,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -2590,7 +2590,7 @@ var MMSTTopology = class {
     } else if (connected.length < this._originateConnections) {
       log9(`connect ${this._originateConnections - connected.length} peers.`, void 0, {
         F: __dxlog_file10,
-        L: 111,
+        L: 109,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -2599,7 +2599,7 @@ var MMSTTopology = class {
       if (sorted.length > MAX_CHANGES_PER_UPDATE) {
         log9(`want to connect ${sorted.length} peers but limited to ${MAX_CHANGES_PER_UPDATE}`, void 0, {
           F: __dxlog_file10,
-          L: 116,
+          L: 114,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -2608,7 +2608,7 @@ var MMSTTopology = class {
         for (const peer of sorted.slice(0, MAX_CHANGES_PER_UPDATE)) {
           log9(`Connect ${peer}.`, void 0, {
             F: __dxlog_file10,
-            L: 120,
+            L: 118,
             S: this,
             C: (f, a) => f(...a)
           });
@@ -2618,7 +2618,7 @@ var MMSTTopology = class {
       } else {
         log9("rate limited connect", void 0, {
           F: __dxlog_file10,
-          L: 125,
+          L: 123,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -2629,7 +2629,40 @@ var MMSTTopology = class {
     return "MMSTTopology";
   }
 };
-var sortByXorDistance = (keys, reference) => keys.sort((a, b) => distance.gt(distance(a.asBuffer(), reference.asBuffer()), distance(b.asBuffer(), reference.asBuffer())));
+var sortByXorDistance = (keys, reference) => {
+  const sorted = keys.sort((a, b) => {
+    return compareXor(distXor(a.asBuffer(), reference.asBuffer()), distXor(b.asBuffer(), reference.asBuffer()));
+  });
+  log9("Sorted keys", {
+    keys,
+    reference,
+    sorted
+  }, {
+    F: __dxlog_file10,
+    L: 137,
+    S: void 0,
+    C: (f, a) => f(...a)
+  });
+  return sorted;
+};
+var distXor = (a, b) => {
+  const maxLength = Math.max(a.length, b.length);
+  const result = Buffer2.allocUnsafe(maxLength);
+  for (let i = 0; i < maxLength; i++) {
+    result[i] = (a[i] || 0) ^ (b[i] || 0);
+  }
+  return result;
+};
+var compareXor = (a, b) => {
+  const maxLength = Math.max(a.length, b.length);
+  for (let i = 0; i < maxLength; i++) {
+    if ((a[i] || 0) === (b[i] || 0)) {
+      continue;
+    }
+    return (a[i] || 0) < (b[i] || 0) ? -1 : 1;
+  }
+  return 0;
+};
 
 // packages/core/mesh/network-manager/src/topology/star-topology.ts
 import { invariant as invariant9 } from "@dxos/invariant";
@@ -4184,4 +4217,4 @@ export {
   TcpTransport,
   createTeleportProtocolFactory
 };
-//# sourceMappingURL=chunk-ZQ4OU7JZ.mjs.map
+//# sourceMappingURL=chunk-SKTAEJ7M.mjs.map