@dxos/teleport 0.3.5-main.d14658e → 0.3.5-main.d2902c5

package/dist/lib/browser/{chunk-3PM5BABC.mjs → chunk-VXXLKKBF.mjs}

@@ -2,7 +2,7 @@ import "@dxos/node-std/globals";
 
 // packages/core/mesh/teleport/src/testing/test-builder.ts
 import { pipeline } from "@dxos/node-std/stream";
-import { invariant as invariant4 } from "@dxos/invariant";
+import { invariant as invariant5 } from "@dxos/invariant";
 import { PublicKey as PublicKey2 } from "@dxos/keys";
 import { log as log5 } from "@dxos/log";
 
@@ -10,7 +10,7 @@ import { log as log5 } from "@dxos/log";
 import { asyncTimeout, scheduleTaskInterval as scheduleTaskInterval2, runInContextAsync, synchronized, scheduleTask } from "@dxos/async";
 import { Context as Context2 } from "@dxos/context";
 import { failUndefined as failUndefined2 } from "@dxos/debug";
-import { invariant as invariant3 } from "@dxos/invariant";
+import { invariant as invariant4 } from "@dxos/invariant";
 import { PublicKey } from "@dxos/keys";
 import { log as log4 } from "@dxos/log";
 import { schema as schema2, RpcClosedError, TimeoutError as TimeoutError2 } from "@dxos/protocols";
@@ -188,13 +188,14 @@ import { Duplex as Duplex2 } from "@dxos/node-std/stream";
 import { scheduleTaskInterval, Event as Event3, Trigger } from "@dxos/async";
 import { Context } from "@dxos/context";
 import { failUndefined } from "@dxos/debug";
-import { invariant as invariant2 } from "@dxos/invariant";
+import { invariant as invariant3 } from "@dxos/invariant";
 import { log as log3 } from "@dxos/log";
 import { schema, TimeoutError } from "@dxos/protocols";
 
 // packages/core/mesh/teleport/src/muxing/balancer.ts
 import * as varint from "varint";
 import { Event as Event2 } from "@dxos/async";
+import { invariant as invariant2 } from "@dxos/invariant";
 import { log as log2 } from "@dxos/log";
 var __dxlog_file2 = "/home/runner/work/dxos/dxos/packages/core/mesh/teleport/src/muxing/balancer.ts";
 var MAX_CHUNK_SIZE = 8192;
@@ -206,6 +207,7 @@ var Balancer = class {
     this._framer = new Framer();
     this._sendBuffers = /* @__PURE__ */ new Map();
     this._receiveBuffers = /* @__PURE__ */ new Map();
+    this._sending = false;
     this.incomingData = new Event2();
     this.stream = this._framer.stream;
     this._channels.push(_sysChannelId);
@@ -224,43 +226,19 @@ var Balancer = class {
     this._channels.push(channel);
   }
   pushData(data, trigger, channelId) {
-    const noCalls = this._sendBuffers.size === 0;
-    if (!this._channels.includes(channelId)) {
-      throw new Error(`Unknown channel ${channelId}`);
-    }
-    if (!this._sendBuffers.has(channelId)) {
-      this._sendBuffers.set(channelId, []);
-    }
-    const sendBuffer = this._sendBuffers.get(channelId);
-    const chunks = [];
-    for (let idx = 0; idx < data.length; idx += MAX_CHUNK_SIZE) {
-      chunks.push(data.subarray(idx, idx + MAX_CHUNK_SIZE));
-    }
-    chunks.forEach((chunk, index) => {
-      const msg = encodeChunk({
-        chunk,
-        channelId,
-        dataLength: index === 0 ? data.length : void 0
-      });
-      sendBuffer.push({
-        msg,
-        trigger: index === chunks.length - 1 ? trigger : void 0
-      });
-    });
-    if (noCalls) {
-      this._sendChunk().catch((err) => log2.catch(err, void 0, {
-        F: __dxlog_file2,
-        L: 100,
-        S: this,
-        C: (f, a) => f(...a)
-      }));
-    }
+    this._enqueueChunk(data, trigger, channelId);
+    this._sendChunks().catch((err) => log2.catch(err, void 0, {
+      F: __dxlog_file2,
+      L: 75,
+      S: this,
+      C: (f, a) => f(...a)
+    }));
   }
   destroy() {
     if (this._sendBuffers.size !== 0) {
       log2.warn("destroying balancer with pending calls", void 0, {
         F: __dxlog_file2,
-        L: 106,
+        L: 80,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -301,36 +279,99 @@ var Balancer = class {
     this._lastCallerIndex = (this._lastCallerIndex + 1) % this._channels.length;
     return this._channels[index];
   }
+  _enqueueChunk(data, trigger, channelId) {
+    if (!this._channels.includes(channelId)) {
+      throw new Error(`Unknown channel ${channelId}`);
+    }
+    if (!this._sendBuffers.has(channelId)) {
+      this._sendBuffers.set(channelId, []);
+    }
+    const sendBuffer = this._sendBuffers.get(channelId);
+    const chunks = [];
+    for (let idx = 0; idx < data.length; idx += MAX_CHUNK_SIZE) {
+      chunks.push(data.subarray(idx, idx + MAX_CHUNK_SIZE));
+    }
+    chunks.forEach((chunk, index) => {
+      const msg = encodeChunk({
+        chunk,
+        channelId,
+        dataLength: index === 0 ? data.length : void 0
+      });
+      sendBuffer.push({
+        msg,
+        trigger: index === chunks.length - 1 ? trigger : void 0
+      });
+    });
+  }
+  // get the next chunk or null if there are no chunks remaining
   _getNextChunk() {
     let chunk;
-    while (!chunk) {
+    while (this._sendBuffers.size > 0) {
       const channelId = this._getNextCallerId();
       const sendBuffer = this._sendBuffers.get(channelId);
       if (!sendBuffer) {
         continue;
       }
       chunk = sendBuffer.shift();
+      if (!chunk) {
+        continue;
+      }
       if (sendBuffer.length === 0) {
         this._sendBuffers.delete(channelId);
       }
+      return chunk;
     }
-    return chunk;
+    return null;
   }
-  async _sendChunk() {
-    if (this._sendBuffers.size === 0) {
+  async _sendChunks() {
+    if (this._sending) {
       return;
     }
-    if (!this._framer.writable) {
-      await this._framer.drain.waitForCount(1);
-    }
-    const chunk = this._getNextChunk();
-    try {
-      await this._framer.port.send(chunk.msg);
-      chunk.trigger?.wake();
-    } catch (err) {
-      chunk.trigger?.throw(err);
+    this._sending = true;
+    let chunk;
+    chunk = this._getNextChunk();
+    while (chunk) {
+      if (!this._framer.writable) {
+        log2("PAUSE for drain", void 0, {
+          F: __dxlog_file2,
+          L: 179,
+          S: this,
+          C: (f, a) => f(...a)
+        });
+        await this._framer.drain.waitForCount(1);
+        log2("RESUME for drain", void 0, {
+          F: __dxlog_file2,
+          L: 181,
+          S: this,
+          C: (f, a) => f(...a)
+        });
+      }
+      try {
+        await this._framer.port.send(chunk.msg);
+        chunk.trigger?.wake();
+      } catch (err) {
+        log2("Error sending chunk", {
+          err
+        }, {
+          F: __dxlog_file2,
+          L: 187,
+          S: this,
+          C: (f, a) => f(...a)
+        });
+        chunk.trigger?.throw(err);
+      }
+      chunk = this._getNextChunk();
     }
-    await this._sendChunk();
+    invariant2(this._sendBuffers.size === 0, "sendBuffers not empty", {
+      F: __dxlog_file2,
+      L: 192,
+      S: this,
+      A: [
+        "this._sendBuffers.size === 0",
+        "'sendBuffers not empty'"
+      ]
+    });
+    this._sending = false;
   }
 };
 var encodeChunk = ({ channelId, dataLength, chunk }) => {
@@ -399,7 +440,7 @@ var Muxer = class {
       tag,
       contentType: opts.contentType
     });
-    invariant2(!channel.push, `Channel already open: ${tag}`, {
+    invariant3(!channel.push, `Channel already open: ${tag}`, {
       F: __dxlog_file3,
       L: 140,
       S: this,
@@ -447,7 +488,7 @@ var Muxer = class {
       tag,
       contentType: opts.contentType
     });
-    invariant2(!channel.push, `Channel already open: ${tag}`, {
+    invariant3(!channel.push, `Channel already open: ${tag}`, {
       F: __dxlog_file3,
       L: 192,
       S: this,
@@ -471,7 +512,7 @@ var Muxer = class {
         await this._sendData(channel, data, timeout);
       },
       subscribe: (cb) => {
-        invariant2(!callback, "Only one subscriber is allowed", {
+        invariant3(!callback, "Only one subscriber is allowed", {
           F: __dxlog_file3,
           L: 214,
           S: this,
@@ -843,7 +884,7 @@ var Teleport = class {
     this._open = false;
     this._destroying = false;
     this._aborting = false;
-    invariant3(typeof initiator === "boolean", void 0, {
+    invariant4(typeof initiator === "boolean", void 0, {
       F: __dxlog_file4,
       L: 75,
       S: this,
@@ -852,7 +893,7 @@ var Teleport = class {
         ""
       ]
     });
-    invariant3(PublicKey.isPublicKey(localPeerId), void 0, {
+    invariant4(PublicKey.isPublicKey(localPeerId), void 0, {
       F: __dxlog_file4,
       L: 76,
       S: this,
@@ -861,7 +902,7 @@ var Teleport = class {
         ""
       ]
     });
-    invariant3(PublicKey.isPublicKey(remotePeerId), void 0, {
+    invariant4(PublicKey.isPublicKey(remotePeerId), void 0, {
       F: __dxlog_file4,
       L: 77,
       S: this,
@@ -882,7 +923,7 @@ var Teleport = class {
         S: this,
         C: (f, a) => f(...a)
       });
-      invariant3(!this._remoteExtensions.has(name), "Remote extension already exists", {
+      invariant4(!this._remoteExtensions.has(name), "Remote extension already exists", {
         F: __dxlog_file4,
         L: 84,
         S: this,
@@ -1027,7 +1068,7 @@ var Teleport = class {
     }
   }
   _setExtension(extensionName, extension) {
-    invariant3(!extensionName.includes("/"), "Invalid extension name", {
+    invariant4(!extensionName.includes("/"), "Invalid extension name", {
       F: __dxlog_file4,
       L: 226,
       S: this,
@@ -1036,7 +1077,7 @@ var Teleport = class {
         "'Invalid extension name'"
       ]
     });
-    invariant3(!this._extensions.has(extensionName), "Extension already exists", {
+    invariant4(!this._extensions.has(extensionName), "Extension already exists", {
       F: __dxlog_file4,
       L: 227,
       S: this,
@@ -1062,7 +1103,7 @@ var Teleport = class {
       localPeerId: this.localPeerId,
       remotePeerId: this.remotePeerId,
       createPort: async (channelName, opts) => {
-        invariant3(!channelName.includes("/"), "Invalid channel name", {
+        invariant4(!channelName.includes("/"), "Invalid channel name", {
           F: __dxlog_file4,
           L: 240,
           S: this,
@@ -1074,7 +1115,7 @@ var Teleport = class {
         return this._muxer.createPort(`${extensionName}/${channelName}`, opts);
       },
       createStream: async (channelName, opts) => {
-        invariant3(!channelName.includes("/"), "Invalid channel name", {
+        invariant4(!channelName.includes("/"), "Invalid channel name", {
           F: __dxlog_file4,
           L: 244,
           S: this,
@@ -1184,7 +1225,7 @@ var TestBuilder = class {
     await Promise.all(Array.from(this._peers).map((agent) => agent.destroy()));
   }
   async connect(peer1, peer2) {
-    invariant4(peer1 !== peer2, void 0, {
+    invariant5(peer1 !== peer2, void 0, {
       F: __dxlog_file5,
       L: 37,
       S: this,
@@ -1193,7 +1234,7 @@ var TestBuilder = class {
         ""
       ]
     });
-    invariant4(this._peers.has(peer1), void 0, {
+    invariant5(this._peers.has(peer1), void 0, {
       F: __dxlog_file5,
       L: 38,
       S: this,
@@ -1202,7 +1243,7 @@ var TestBuilder = class {
         ""
       ]
     });
-    invariant4(this._peers.has(peer1), void 0, {
+    invariant5(this._peers.has(peer1), void 0, {
       F: __dxlog_file5,
       L: 39,
       S: this,
@@ -1230,7 +1271,7 @@ var TestBuilder = class {
     ];
   }
   async disconnect(peer1, peer2) {
-    invariant4(peer1 !== peer2, void 0, {
+    invariant5(peer1 !== peer2, void 0, {
       F: __dxlog_file5,
       L: 51,
       S: this,
@@ -1239,7 +1280,7 @@ var TestBuilder = class {
         ""
       ]
     });
-    invariant4(this._peers.has(peer1), void 0, {
+    invariant5(this._peers.has(peer1), void 0, {
       F: __dxlog_file5,
       L: 52,
       S: this,
@@ -1248,7 +1289,7 @@ var TestBuilder = class {
         ""
       ]
     });
-    invariant4(this._peers.has(peer1), void 0, {
+    invariant5(this._peers.has(peer1), void 0, {
       F: __dxlog_file5,
       L: 53,
       S: this,
@@ -1259,7 +1300,7 @@ var TestBuilder = class {
     });
     const connection1 = Array.from(peer1.connections).find((connection) => connection.remotePeerId.equals(peer2.peerId));
     const connection2 = Array.from(peer2.connections).find((connection) => connection.remotePeerId.equals(peer1.peerId));
-    invariant4(connection1, void 0, {
+    invariant5(connection1, void 0, {
       F: __dxlog_file5,
       L: 62,
       S: this,
@@ -1268,7 +1309,7 @@ var TestBuilder = class {
         ""
       ]
     });
-    invariant4(connection2, void 0, {
+    invariant5(connection2, void 0, {
       F: __dxlog_file5,
       L: 63,
       S: this,
@@ -1298,7 +1339,7 @@ var TestPeer = class {
     return connection;
   }
   async openConnection(connection) {
-    invariant4(this.connections.has(connection), void 0, {
+    invariant5(this.connections.has(connection), void 0, {
       F: __dxlog_file5,
       L: 84,
       S: this,
@@ -1311,7 +1352,7 @@ var TestPeer = class {
     await this.onOpen(connection);
   }
   async closeConnection(connection) {
-    invariant4(this.connections.has(connection), void 0, {
+    invariant5(this.connections.has(connection), void 0, {
       F: __dxlog_file5,
       L: 90,
       S: this,
@@ -1367,7 +1408,7 @@ var TestConnection = class {
 
 // packages/core/mesh/teleport/src/testing/test-extension.ts
 import { asyncTimeout as asyncTimeout2, Trigger as Trigger2 } from "@dxos/async";
-import { invariant as invariant5 } from "@dxos/invariant";
+import { invariant as invariant6 } from "@dxos/invariant";
 import { log as log6 } from "@dxos/log";
 import { schema as schema3 } from "@dxos/protocols";
 import { createProtoRpcPeer as createProtoRpcPeer2 } from "@dxos/rpc";
@@ -1453,7 +1494,7 @@ var TestExtension = class {
     const res = await asyncTimeout2(this._rpc.rpc.TestService.testCall({
       data: message
     }), 1500);
-    invariant5(res.data === message, void 0, {
+    invariant6(res.data === message, void 0, {
       F: __dxlog_file6,
       L: 84,
       S: this,
@@ -1474,7 +1515,7 @@ var TestExtension = class {
 // packages/core/mesh/teleport/src/testing/test-extension-with-streams.ts
 import { randomBytes } from "@dxos/node-std/crypto";
 import { Trigger as Trigger3 } from "@dxos/async";
-import { invariant as invariant6 } from "@dxos/invariant";
+import { invariant as invariant7 } from "@dxos/invariant";
 import { log as log7 } from "@dxos/log";
 import { schema as schema4 } from "@dxos/protocols";
 import { createProtoRpcPeer as createProtoRpcPeer3 } from "@dxos/rpc";
@@ -1491,7 +1532,7 @@ var TestExtensionWithStreams = class {
     return this.extensionContext?.remotePeerId;
   }
   async _openStream(streamTag, interval = 5, chunkSize = 2048) {
-    invariant6(!this._streams.has(streamTag), `Stream already exists: ${streamTag}`, {
+    invariant7(!this._streams.has(streamTag), `Stream already exists: ${streamTag}`, {
       F: __dxlog_file7,
       L: 39,
       S: this,
@@ -1557,7 +1598,7 @@ var TestExtensionWithStreams = class {
     }, 100);
   }
   _closeStream(streamTag) {
-    invariant6(this._streams.has(streamTag), `Stream does not exist: ${streamTag}`, {
+    invariant7(this._streams.has(streamTag), `Stream does not exist: ${streamTag}`, {
       F: __dxlog_file7,
       L: 106,
       S: this,
@@ -1680,7 +1721,7 @@ var TestExtensionWithStreams = class {
       streamLoadInterval,
       streamLoadChunkSize
     });
-    invariant6(data === streamTag, void 0, {
+    invariant7(data === streamTag, void 0, {
       F: __dxlog_file7,
       L: 207,
       S: this,
@@ -1699,7 +1740,7 @@ var TestExtensionWithStreams = class {
     const { data, bytesSent, bytesReceived, sendErrors, receiveErrors, runningTime } = await this._rpc.rpc.TestServiceWithStreams.closeTestStream({
       data: streamTag
     });
-    invariant6(data === streamTag, void 0, {
+    invariant7(data === streamTag, void 0, {
       F: __dxlog_file7,
       L: 220,
       S: this,
@@ -1743,4 +1784,4 @@ export {
   TestExtension,
   TestExtensionWithStreams
 };
-//# sourceMappingURL=chunk-3PM5BABC.mjs.map
+//# sourceMappingURL=chunk-VXXLKKBF.mjs.map