Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix broken notebook loading on firefox by compressing the encoded wasm payload #8426

Merged
merged 2 commits into from
Dec 12, 2024
Merged

Fix broken notebook loading on firefox by compressing the encoded wasm payload #8426

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1aaca2c
Compress the encoded wasm payload in the dataurl for jupyter notebooks
jleibs Dec 11, 2024
ea53e98
Remove unnecessary await
jleibs Dec 12, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 13 additions & 7 deletions rerun_js/web-viewer/bundle.mjs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,25 +6,31 @@
import { fileURLToPath } from "node:url";
import * as path from "node:path";
import * as fs from "node:fs";
import * as zlib from "node:zlib";
import * as util from "node:util";

const __filename = path.resolve(fileURLToPath(import.meta.url));
const __dirname = path.dirname(__filename);

const wasm = fs.readFileSync(path.join(__dirname, "re_viewer_bg.wasm"));
const wasm = zlib.gzipSync(fs.readFileSync(path.join(__dirname, "re_viewer_bg.wasm")));
const js = fs.readFileSync(path.join(__dirname, "re_viewer.js"), "utf-8");
const index = fs.readFileSync(path.join(__dirname, "index.js"), "utf-8");

const INLINE_MARKER = "/*<INLINE-MARKER>*/";

/** @param {Buffer} buffer */
function buffer_to_data_url(buffer) {
return `data:application/wasm;base64,${buffer.toString("base64")}`;
return `data:application/octet-stream;gzip;base64,${buffer.toString("base64")}`;
}

async function data_url_to_buffer(dataUrl) {
const response = await fetch(dataUrl);
return response.arrayBuffer();
async function compressed_data_url_to_buffer(dataUrl) {
const response = await fetch(dataUrl);
const blob = await response.blob();

let ds = new DecompressionStream("gzip");
let decompressedStream = blob.stream().pipeThrough(ds);

return new Response(decompressedStream).arrayBuffer();
}

const inlined_js = js.replace("export default function", "return function");
Expand All @@ -35,9 +41,9 @@ async function fetch_viewer_js() {
}

async function fetch_viewer_wasm() {
${data_url_to_buffer.toString()}
${compressed_data_url_to_buffer.toString()}
const dataUrl = ${JSON.stringify(buffer_to_data_url(wasm))};
const buffer = await data_url_to_buffer(dataUrl);
const buffer = await compressed_data_url_to_buffer(dataUrl);
return new Response(buffer, { "headers": { "Content-Type": "application/wasm" } });
}
`;
Expand Down
Loading