smoldot 3.5.0 → 3.7.0

package/dist/mjs/no-auto-bytecode-nodejs.js

@@ -30,6 +30,17 @@ export function startWithBytecode(options) {
         }
     });
 }
+/**
+ * Human-readable reason for a socket error. An `AggregateError` (every address of a
+ * multi-address host failed) has an empty `message`; its causes are in `errors`.
+ */
+function errorReason(error) {
+    var _a;
+    return ((_a = error.errors) === null || _a === void 0 ? void 0 : _a.map((cause) => cause.message).filter(Boolean).join("; "))
+        || error.message
+        || error.code
+        || "Error";
+}
 /**
  * Tries to open a new connection using the given configuration.
  *
@@ -77,7 +88,7 @@ function connect(config) {
             socket.onerror = () => { };
         };
         socket.onerror = (event) => {
-            config.onConnectionReset(event.message);
+            config.onConnectionReset(errorReason(event.error));
             socket.onopen = () => { };
             socket.onclose = () => { };
             socket.onmessage = () => { };
@@ -117,30 +128,35 @@ function connect(config) {
         });
         // Number of bytes queued using `socket.write` and where `write` has returned false.
         const drainingBytes = { num: 0 };
+        // Set by `reset()`. Events that arrive after that must be ignored. This can't be
+        // `socket.destroyed`: NodeJS marks the socket destroyed before emitting `close`, so
+        // that check would swallow every close, including remote ones.
+        let resetCalled = false;
+        // Message of the last `error` event, reported through the `close` event that follows it.
+        let lastError = null;
         socket.setNoDelay();
         socket.on('connect', () => {
-            if (socket.destroyed)
+            if (resetCalled)
                 return;
             config.onWritableBytes(socket.writableHighWaterMark);
         });
+        socket.on('error', (error) => {
+            lastError = errorReason(error);
+        });
         socket.on('close', (hasError) => {
-            if (socket.destroyed)
+            if (resetCalled)
                 return;
-            // NodeJS doesn't provide a reason why the closing happened, but only
-            // whether it was caused by an error.
-            const message = hasError ? "Error" : "Closed gracefully";
-            config.onConnectionReset(message);
+            config.onConnectionReset(lastError !== null && lastError !== void 0 ? lastError : (hasError ? "Error" : "Closed gracefully"));
         });
-        socket.on('error', () => { });
         socket.on('data', (message) => {
-            if (socket.destroyed)
+            if (resetCalled)
                 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)
+            if (resetCalled)
                 return;
             const val = drainingBytes.num;
             drainingBytes.num = 0;
@@ -148,6 +164,7 @@ function connect(config) {
         });
         return {
             reset: () => {
+                resetCalled = true;
                 socket.destroy();
             },
             send: (data) => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "smoldot",
-  "version": "3.5.0",
+  "version": "3.7.0",
   "description": "Light client that connects to Polkadot and Substrate-based blockchains",
   "contributors": [
     "Parity Technologies <admin@parity.io>",