smoldot 1.0.2 → 1.0.4

package/dist/cjs/client.d.ts

@@ -317,4 +317,4 @@ export interface AddChainOptions {
      */
     disableJsonRpc?: boolean;
 }
-export declare function start(options: ClientOptions, platformBindings: PlatformBindings): Client;
+export declare function start(options: ClientOptions, wasmModule: Promise<WebAssembly.Module>, platformBindings: PlatformBindings): Client;

package/dist/cjs/client.js

@@ -62,7 +62,7 @@ exports.JsonRpcDisabledError = JsonRpcDisabledError;
 // This function is similar to the `start` function found in `index.ts`, except with an extra
 // parameter containing the platform-specific bindings.
 // Contrary to the one within `index.js`, this function is not supposed to be directly used.
-function start(options, platformBindings) {
+function start(options, wasmModule, platformBindings) {
     const logCallback = options.logCallback || ((level, target, message) => {
         // The first parameter of the methods of `console` has some printf-like substitution
         // capabilities. We don't really need to use this, but not using it means that the logs might
@@ -86,25 +86,22 @@ function start(options, platformBindings) {
     // For each chain object returned by `addChain`, the associated internal chain id.
     //
     // Immediately cleared when `remove()` is called on a chain.
-    let chainIds = new WeakMap();
+    const chainIds = new WeakMap();
     // If `Client.terminate()̀  is called, this error is set to a value.
     // All the functions of the public API check if this contains a value.
-    let alreadyDestroyedError = null;
+    const alreadyDestroyedError = { value: null };
     const instance = (0, instance_js_1.start)({
+        wasmModule,
         // Maximum level of log entries sent by the client.
         // 0 = Logging disabled, 1 = Error, 2 = Warn, 3 = Info, 4 = Debug, 5 = Trace
         maxLogLevel: options.maxLogLevel || 3,
         logCallback,
-        // `enableCurrentTask` adds a small performance hit, but adds some additional information to
-        // crash reports. Whether this should be enabled is very opiniated and not that important. At
-        // the moment, we enable it all the time, except if the user has logging disabled altogether.
-        enableCurrentTask: options.maxLogLevel ? options.maxLogLevel >= 1 : true,
         cpuRateLimit: options.cpuRateLimit || 1.0,
     }, platformBindings);
     return {
         addChain: (options) => __awaiter(this, void 0, void 0, function* () {
-            if (alreadyDestroyedError)
-                throw alreadyDestroyedError;
+            if (alreadyDestroyedError.value)
+                throw alreadyDestroyedError.value;
             // Passing a JSON object for the chain spec is an easy mistake, so we provide a more
             // readable error.
             if (!(typeof options.chainSpec === 'string'))
@@ -129,8 +126,8 @@ function start(options, platformBindings) {
             // Resolve the promise that `addChain` returned to the user.
             const newChain = {
                 sendJsonRpc: (request) => {
-                    if (alreadyDestroyedError)
-                        throw alreadyDestroyedError;
+                    if (alreadyDestroyedError.value)
+                        throw alreadyDestroyedError.value;
                     if (wasDestroyed.destroyed)
                         throw new AlreadyDestroyedError();
                     if (options.disableJsonRpc)
@@ -142,8 +139,8 @@ function start(options, platformBindings) {
                     instance.request(request, chainId);
                 },
                 nextJsonRpcResponse: () => {
-                    if (alreadyDestroyedError)
-                        return Promise.reject(alreadyDestroyedError);
+                    if (alreadyDestroyedError.value)
+                        return Promise.reject(alreadyDestroyedError.value);
                     if (wasDestroyed.destroyed)
                         return Promise.reject(new AlreadyDestroyedError());
                     if (options.disableJsonRpc)
@@ -151,8 +148,8 @@ function start(options, platformBindings) {
                     return instance.nextJsonRpcResponse(chainId);
                 },
                 remove: () => {
-                    if (alreadyDestroyedError)
-                        throw alreadyDestroyedError;
+                    if (alreadyDestroyedError.value)
+                        throw alreadyDestroyedError.value;
                     if (wasDestroyed.destroyed)
                         throw new AlreadyDestroyedError();
                     wasDestroyed.destroyed = true;
@@ -165,9 +162,9 @@ function start(options, platformBindings) {
             return newChain;
         }),
         terminate: () => __awaiter(this, void 0, void 0, function* () {
-            if (alreadyDestroyedError)
-                throw alreadyDestroyedError;
-            alreadyDestroyedError = new AlreadyDestroyedError();
+            if (alreadyDestroyedError.value)
+                throw alreadyDestroyedError.value;
+            alreadyDestroyedError.value = new AlreadyDestroyedError();
             instance.startShutdown();
         })
     };

package/dist/cjs/index-browser.js

@@ -28,6 +28,7 @@ const client_js_1 = require("./client.js");
 const instance_js_1 = require("./instance/instance.js");
 const base64_js_1 = require("./base64.js");
 const pako_1 = require("pako");
+const wasm_js_1 = require("./instance/autogen/wasm.js");
 var client_js_2 = require("./client.js");
 Object.defineProperty(exports, "AddChainError", { enumerable: true, get: function () { return client_js_2.AddChainError; } });
 Object.defineProperty(exports, "AlreadyDestroyedError", { enumerable: true, get: function () { return client_js_2.AlreadyDestroyedError; } });
@@ -44,10 +45,12 @@ Object.defineProperty(exports, "QueueFullError", { enumerable: true, get: functi
  */
 function start(options) {
     options = options || {};
-    return (0, client_js_1.start)(options, {
-        trustedBase64DecodeAndZlibInflate: (input) => {
-            return Promise.resolve((0, pako_1.inflate)((0, base64_js_1.classicDecode)(input)));
-        },
+    // The actual Wasm bytecode is base64-decoded then deflate-decoded from a constant found in a
+    // different file.
+    // This is suboptimal compared to using `instantiateStreaming`, but it is the most
+    // cross-platform cross-bundler approach.
+    const wasmModule = WebAssembly.compile((0, pako_1.inflate)((0, base64_js_1.classicDecode)(wasm_js_1.default)));
+    return (0, client_js_1.start)(options, wasmModule, {
         registerShouldPeriodicallyYield: (callback) => {
             if (typeof document === 'undefined') // We might be in a web worker.
                 return [false, () => { }];
@@ -62,7 +65,16 @@ function start(options) {
             const crypto = globalThis.crypto;
             if (!crypto)
                 throw new Error('randomness not available');
-            crypto.getRandomValues(buffer);
+            // Browsers have this completely undocumented behavior (it's not even part of a spec)
+            // that for some reason `getRandomValues` can't be called on arrayviews back by
+            // `SharedArrayBuffer`s and they throw an exception if you try.
+            if (buffer.buffer instanceof ArrayBuffer)
+                crypto.getRandomValues(buffer);
+            else {
+                const tmpArray = new Uint8Array(buffer.length);
+                crypto.getRandomValues(tmpArray);
+                buffer.set(tmpArray);
+            }
         },
         connect: (config) => {
             return connect(config, (options === null || options === void 0 ? void 0 : options.forbidWs) || false, (options === null || options === void 0 ? void 0 : options.forbidNonLocalWs) || false, (options === null || options === void 0 ? void 0 : options.forbidWss) || false, (options === null || options === void 0 ? void 0 : options.forbidWebRtc) || false);

package/dist/cjs/index-deno.js

@@ -25,6 +25,7 @@ exports.start = exports.JsonRpcDisabledError = exports.QueueFullError = exports.
 // along with this program.  If not, see <http://www.gnu.org/licenses/>.
 const client_js_1 = require("./client.js");
 const instance_js_1 = require("./instance/instance.js");
+const wasm_js_1 = require("./instance/autogen/wasm.js");
 var client_js_2 = require("./client.js");
 Object.defineProperty(exports, "AddChainError", { enumerable: true, get: function () { return client_js_2.AddChainError; } });
 Object.defineProperty(exports, "AlreadyDestroyedError", { enumerable: true, get: function () { return client_js_2.AlreadyDestroyedError; } });
@@ -41,33 +42,12 @@ Object.defineProperty(exports, "JsonRpcDisabledError", { enumerable: true, get:
  */
 function start(options) {
     options = options || {};
-    return (0, client_js_1.start)(options || {}, {
-        trustedBase64DecodeAndZlibInflate: (input) => __awaiter(this, void 0, void 0, function* () {
-            const buffer = trustedBase64Decode(input);
-            // This code has been copy-pasted from the official streams draft specification.
-            // At the moment, it is found here: https://wicg.github.io/compression/#example-deflate-compress
-            const ds = new DecompressionStream('deflate');
-            const writer = ds.writable.getWriter();
-            writer.write(buffer);
-            writer.close();
-            const output = [];
-            const reader = ds.readable.getReader();
-            let totalSize = 0;
-            while (true) {
-                const { value, done } = yield reader.read();
-                if (done)
-                    break;
-                output.push(value);
-                totalSize += value.byteLength;
-            }
-            const concatenated = new Uint8Array(totalSize);
-            let offset = 0;
-            for (const array of output) {
-                concatenated.set(array, offset);
-                offset += array.byteLength;
-            }
-            return concatenated;
-        }),
+    // The actual Wasm bytecode is base64-decoded then deflate-decoded from a constant found in a
+    // different file.
+    // This is suboptimal compared to using `instantiateStreaming`, but it is the most
+    // cross-platform cross-bundler approach.
+    const wasmModule = zlibInflate(trustedBase64Decode(wasm_js_1.default)).then(((bytecode) => WebAssembly.compile(bytecode)));
+    return (0, client_js_1.start)(options || {}, wasmModule, {
         registerShouldPeriodicallyYield: (_callback) => {
             return [true, () => { }];
         },
@@ -86,6 +66,36 @@ function start(options) {
     });
 }
 exports.start = start;
+/**
+ * Applies the zlib inflate algorithm on the buffer.
+ */
+function zlibInflate(buffer) {
+    return __awaiter(this, void 0, void 0, function* () {
+        // This code has been copy-pasted from the official streams draft specification.
+        // At the moment, it is found here: https://wicg.github.io/compression/#example-deflate-compress
+        const ds = new DecompressionStream('deflate');
+        const writer = ds.writable.getWriter();
+        writer.write(buffer);
+        writer.close();
+        const output = [];
+        const reader = ds.readable.getReader();
+        let totalSize = 0;
+        while (true) {
+            const { value, done } = yield reader.read();
+            if (done)
+                break;
+            output.push(value);
+            totalSize += value.byteLength;
+        }
+        const concatenated = new Uint8Array(totalSize);
+        let offset = 0;
+        for (const array of output) {
+            concatenated.set(array, offset);
+            offset += array.byteLength;
+        }
+        return concatenated;
+    });
+}
 /**
  * Decodes a base64 string.
  *
@@ -237,7 +247,7 @@ function connect(config, forbidTcp, forbidWs, forbidNonLocalWs, forbidWss) {
                 config.onMessage(readBuffer.slice(0, outcome));
                 return read(readBuffer);
             });
-            read(new Uint8Array(1024));
+            read(new Uint8Array(32768));
             return established;
         });
         return {

package/dist/cjs/index-nodejs.js

@@ -19,6 +19,7 @@ exports.start = exports.JsonRpcDisabledError = exports.QueueFullError = exports.
 // with both at the same time.
 const client_js_1 = require("./client.js");
 const instance_js_1 = require("./instance/instance.js");
+const wasm_js_1 = require("./instance/autogen/wasm.js");
 const ws_1 = require("ws");
 const pako_1 = require("pako");
 const node_perf_hooks_1 = require("node:perf_hooks");
@@ -40,10 +41,12 @@ Object.defineProperty(exports, "JsonRpcDisabledError", { enumerable: true, get:
  */
 function start(options) {
     options = options || {};
-    return (0, client_js_1.start)(options || {}, {
-        trustedBase64DecodeAndZlibInflate: (input) => {
-            return Promise.resolve((0, pako_1.inflate)(Buffer.from(input, 'base64')));
-        },
+    // The actual Wasm bytecode is base64-decoded then deflate-decoded from a constant found in a
+    // different file.
+    // This is suboptimal compared to using `instantiateStreaming`, but it is the most
+    // cross-platform cross-bundler approach.
+    const wasmModule = WebAssembly.compile((0, pako_1.inflate)(Buffer.from(wasm_js_1.default, 'base64')));
+    return (0, client_js_1.start)(options || {}, wasmModule, {
         registerShouldPeriodicallyYield: (_callback) => {
             return [true, () => { }];
         },