Skip to content

Commit 3767be5

Browse files
committed
Address review comments
1 parent 6e55907 commit 3767be5

File tree

5 files changed

+22
-20
lines changed

5 files changed

+22
-20
lines changed

.github/workflows/test.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ jobs:
4040
run: npm ci
4141

4242
- name: Decompress compressed files
43-
run: node utils/compress.mjs -d -k
43+
run: npm run decompress
4444

4545
- name: Cache jsvu Binaries
4646
uses: actions/cache@v4

JetStreamDriver.js

Lines changed: 18 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ const defaultIterationCount = 120;
3131
const defaultWorstCaseCount = 4;
3232

3333
if (!JetStreamParams.prefetchResources)
34-
console.warn("Disabling resource prefetching! All compressed files must have been decompressed using `node utils/compress.mjs -d -k`");
34+
console.warn("Disabling resource prefetching! All compressed files must have been decompressed using `npm run decompress`");
3535

3636
if (!isInBrowser && JetStreamParams.prefetchResources) {
3737
// Use the wasm compiled zlib as a polyfill when decompression stream is
@@ -190,7 +190,7 @@ class ShellFileLoader {
190190

191191
let contents;
192192
if (compressed) {
193-
let bytes = new Int8Array(read(url, "binary"));
193+
const bytes = new Int8Array(read(url, "binary"));
194194
bytes = zlib.decompress(bytes);
195195
contents = new TextDecoder().decode(bytes);
196196
} else {
@@ -944,7 +944,7 @@ class Benchmark {
944944
// If we need to decompress this, then run it through a decompression
945945
// stream.
946946
if (compressed) {
947-
const stream = response.body.pipeThrough(new DecompressionStream('deflate'))
947+
const stream = response.body.pipeThrough(new DecompressionStream("deflate"))
948948
response = new Response(stream);
949949
}
950950

@@ -1086,23 +1086,24 @@ class Benchmark {
10861086
console.assert(this.preloads === null, "This initialization should be called only once.");
10871087
this.preloads = [];
10881088
this.shellPrefetchedResources = Object.create(null);
1089-
if (this.plan.preload) {
1090-
for (let [name, file] of Object.entries(this.plan.preload)) {
1091-
const compressed = isCompressed(file);
1092-
if (compressed && !JetStreamParams.prefetchResources) {
1093-
file = uncompressedName(file);
1094-
}
1089+
if (!this.plan.preload) {
1090+
return;
1091+
}
1092+
for (let [name, file] of Object.entries(this.plan.preload)) {
1093+
const compressed = isCompressed(file);
1094+
if (compressed && !JetStreamParams.prefetchResources) {
1095+
file = uncompressedName(file);
1096+
}
10951097

1096-
if (JetStreamParams.prefetchResources) {
1097-
let bytes = new Int8Array(read(file, "binary"));
1098-
if (compressed) {
1099-
bytes = zlib.decompress(bytes);
1100-
}
1101-
this.shellPrefetchedResources[file] = bytes;
1098+
if (JetStreamParams.prefetchResources) {
1099+
let bytes = new Int8Array(read(file, "binary"));
1100+
if (compressed) {
1101+
bytes = zlib.decompress(bytes);
11021102
}
1103-
1104-
this.preloads.push([name, file]);
1103+
this.shellPrefetchedResources[file] = bytes;
11051104
}
1105+
1106+
this.preloads.push([name, file]);
11061107
}
11071108
}
11081109

package.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717
"scripts": {
1818
"server": "node tests/server.mjs",
1919
"compress": "node utils/compress.mjs",
20+
"decompress": "node utils/compress.mjs -d -k",
2021
"lint:check": "eslint **/*.{js,mjs,jsx,ts,tsx}",
2122
"pretty:check": "prettier --check ./",
2223
"format:check": "npm run pretty:check && npm run lint:check",

wasm/zlib/shell.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
// DecompressionStream are not available.
33

44
function module() {
5-
'use strict';
5+
"use strict";
66

77
let zlibPromise = null;
88
let zlibModule = null;

web-tooling-benchmark/benchmark.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ class Benchmark {
3939
const loadPromises = Object.entries(preload).map(
4040
async ([name, url]) => {
4141
if (name.endsWith(".wasm")) {
42-
let buffer = (await JetStream.getBinary(url)).buffer;
42+
const buffer = (await JetStream.getBinary(url)).buffer;
4343
if (!(buffer instanceof ArrayBuffer)) {
4444
// The returned array buffer is from a different global when
4545
// prefetching resources and running in the shell. This is fine,

0 commit comments

Comments
 (0)