smoldot 0.7.13 → 1.0.1

package/dist/cjs/index-nodejs.js

@@ -51,7 +51,7 @@ function start(options) {
             return node_perf_hooks_1.performance.now();
         },
         getRandomValues: (buffer) => {
-            if (buffer.length >= 65536)
+            if (buffer.length >= 1024 * 1024)
                 throw new Error('getRandomValues buffer too large');
             (0, node_crypto_1.randomFillSync)(buffer);
         },
@@ -68,7 +68,6 @@ exports.start = start;
  * @throws {@link ConnectionError} If the multiaddress couldn't be parsed or contains an invalid protocol.
  */
 function connect(config, forbidTcp, forbidWs, forbidNonLocalWs, forbidWss) {
-    let connection;
     // Attempt to parse the multiaddress.
     // TODO: remove support for `/wss` in a long time (https://github.com/paritytech/smoldot/issues/1940)
     const wsParsed = config.address.match(/^\/(ip4|ip6|dns4|dns6|dns)\/(.*?)\/tcp\/(.*?)\/(ws|wss|tls\/ws)$/);
@@ -85,8 +84,33 @@ function connect(config, forbidTcp, forbidWs, forbidNonLocalWs, forbidWss) {
             (proto + "://" + wsParsed[2] + ":" + wsParsed[3]);
         const socket = new ws_1.WebSocket(url);
         socket.binaryType = 'arraybuffer';
+        const bufferedAmountCheck = { quenedUnreportedBytes: 0, nextTimeout: 10 };
+        const checkBufferedAmount = () => {
+            if (socket.readyState != 1)
+                return;
+            // Note that we might expect `bufferedAmount` to always be <= the sum of the lengths
+            // of all the data that has been sent, but that seems to not be the case. It is
+            // unclear whether this is intended or a bug, but is is likely that `bufferedAmount`
+            // also includes WebSocket headers. For this reason, we use `bufferedAmount` as a hint
+            // rather than a correct value.
+            const bufferedAmount = socket.bufferedAmount;
+            let wasSent = bufferedAmountCheck.quenedUnreportedBytes - bufferedAmount;
+            if (wasSent < 0)
+                wasSent = 0;
+            bufferedAmountCheck.quenedUnreportedBytes -= wasSent;
+            if (bufferedAmountCheck.quenedUnreportedBytes != 0) {
+                setTimeout(checkBufferedAmount, bufferedAmountCheck.nextTimeout);
+                bufferedAmountCheck.nextTimeout *= 2;
+                if (bufferedAmountCheck.nextTimeout > 500)
+                    bufferedAmountCheck.nextTimeout = 500;
+            }
+            // Note: it is important to call `onWritableBytes` at the very end, as it might
+            // trigger a call to `send`.
+            if (wasSent != 0)
+                config.onWritableBytes(wasSent);
+        };
         socket.onopen = () => {
-            config.onOpen({ type: 'single-stream', handshake: 'multistream-select-noise-yamux' });
+            config.onOpen({ type: 'single-stream', handshake: 'multistream-select-noise-yamux', initialWritableBytes: 1024 * 1024, writeClosable: false });
         };
         socket.onclose = (event) => {
             const message = "Error code " + event.code + (!!event.reason ? (": " + event.reason) : "");
@@ -106,7 +130,27 @@ function connect(config, forbidTcp, forbidWs, forbidNonLocalWs, forbidWss) {
         socket.onmessage = (msg) => {
             config.onMessage(new Uint8Array(msg.data));
         };
-        connection = { ty: 'websocket', socket };
+        return {
+            reset: () => {
+                // We can't set these fields to null because the TypeScript definitions don't
+                // allow it, but we can set them to dummy values.
+                socket.onopen = () => { };
+                socket.onclose = () => { };
+                socket.onmessage = () => { };
+                socket.onerror = () => { };
+                socket.close();
+            },
+            send: (data) => {
+                socket.send(data);
+                if (bufferedAmountCheck.quenedUnreportedBytes == 0) {
+                    bufferedAmountCheck.nextTimeout = 10;
+                    setTimeout(checkBufferedAmount, 10);
+                }
+                bufferedAmountCheck.quenedUnreportedBytes += data.length;
+            },
+            closeSend: () => { throw new Error('Wrong connection type'); },
+            openOutSubstream: () => { throw new Error('Wrong connection type'); }
+        };
     }
     else if (tcpParsed != null) {
         // `net` module will be missing when we're not in NodeJS.
@@ -117,14 +161,18 @@ function connect(config, forbidTcp, forbidWs, forbidNonLocalWs, forbidWss) {
             host: tcpParsed[2],
             port: parseInt(tcpParsed[3], 10),
         });
-        connection = { ty: 'tcp', socket };
-        connection.socket.setNoDelay();
-        connection.socket.on('connect', () => {
+        // Number of bytes queued using `socket.write` and where `write` has returned false.
+        const drainingBytes = { num: 0 };
+        socket.setNoDelay();
+        socket.on('connect', () => {
             if (socket.destroyed)
                 return;
-            config.onOpen({ type: 'single-stream', handshake: 'multistream-select-noise-yamux' });
+            config.onOpen({
+                type: 'single-stream', handshake: 'multistream-select-noise-yamux',
+                initialWritableBytes: socket.writableHighWaterMark, writeClosable: true
+            });
         });
-        connection.socket.on('close', (hasError) => {
+        socket.on('close', (hasError) => {
             if (socket.destroyed)
                 return;
             // NodeJS doesn't provide a reason why the closing happened, but only
@@ -132,43 +180,46 @@ function connect(config, forbidTcp, forbidWs, forbidNonLocalWs, forbidWss) {
             const message = hasError ? "Error" : "Closed gracefully";
             config.onConnectionReset(message);
         });
-        connection.socket.on('error', () => { });
-        connection.socket.on('data', (message) => {
+        socket.on('error', () => { });
+        socket.on('data', (message) => {
             if (socket.destroyed)
                 return;
             config.onMessage(new Uint8Array(message.buffer));
         });
+        socket.on('drain', () => {
+            // The bytes queued using `socket.write` and where `write` has returned false have now
+            // been sent. Notify the API that it can write more data.
+            if (socket.destroyed)
+                return;
+            const val = drainingBytes.num;
+            drainingBytes.num = 0;
+            config.onWritableBytes(val);
+        });
+        return {
+            reset: () => {
+                socket.destroy();
+            },
+            send: (data) => {
+                const dataLen = data.length;
+                const allWritten = socket.write(data);
+                if (allWritten) {
+                    setImmediate(() => {
+                        if (!socket.writable)
+                            return;
+                        config.onWritableBytes(dataLen);
+                    });
+                }
+                else {
+                    drainingBytes.num += dataLen;
+                }
+            },
+            closeSend: () => {
+                socket.end();
+            },
+            openOutSubstream: () => { throw new Error('Wrong connection type'); }
+        };
     }
     else {
         throw new instance_js_1.ConnectionError('Unrecognized multiaddr format');
     }
-    return {
-        reset: () => {
-            if (connection.ty == 'websocket') {
-                // WebSocket
-                // We can't set these fields to null because the TypeScript definitions don't
-                // allow it, but we can set them to dummy values.
-                connection.socket.onopen = () => { };
-                connection.socket.onclose = () => { };
-                connection.socket.onmessage = () => { };
-                connection.socket.onerror = () => { };
-                connection.socket.close();
-            }
-            else {
-                // TCP
-                connection.socket.destroy();
-            }
-        },
-        send: (data) => {
-            if (connection.ty == 'websocket') {
-                // WebSocket
-                connection.socket.send(data);
-            }
-            else {
-                // TCP
-                connection.socket.write(data);
-            }
-        },
-        openOutSubstream: () => { throw new Error('Wrong connection type'); }
-    };
 }