Skip to content

refactor: merge Promise.all inside and outside of executor #35

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

Merged
merged 1 commit into from
May 29, 2025
Merged

refactor: merge Promise.all inside and outside of executor #35

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
83 changes: 36 additions & 47 deletions src/core/execute.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,47 +11,40 @@ import { supplyDefaultFunction } from "../utils/index.js";
import { parseImportFunctionInfo } from "../utils/wasmparser.js";
const readFile = promises.readFile;

function nodeExecutor(wasms: string[], outFolder: string, imports: Imports) {
return Promise.all(
wasms.map(async (wasm) => {
const wasi = new WASI({
args: ["node", basename(wasm)],
env: process.env,
preopens: {
"/": outFolder,
},
version: "preview1",
});
async function nodeExecutor(wasm: string, outFolder: string, imports: Imports) {
const wasi = new WASI({
args: ["node", basename(wasm)],
env: process.env,
preopens: {
"/": outFolder,
},
version: "preview1",
});

const importsArg = new ImportsArgument();
const userDefinedImportsObject = imports === null ? {} : imports(importsArg);
const importObject: ASImports = {
wasi_snapshot_preview1: wasi.wasiImport,
mockInstrument: mockInstruFunc,
...covInstruFunc(wasm),
...userDefinedImportsObject,
} as ASImports;
const binaryBuffer = await readFile(wasm);
const binary = binaryBuffer.buffer.slice(
binaryBuffer.byteOffset,
binaryBuffer.byteOffset + binaryBuffer.byteLength
);
const importFuncList = parseImportFunctionInfo(binary as ArrayBuffer);
supplyDefaultFunction(importFuncList, importObject);
const ins = await instantiate(binary, importObject);
importsArg.module = ins.module;
importsArg.instance = ins.instance;
importsArg.exports = ins.exports;
try {
wasi.start(ins);
} catch (error) {
if (error instanceof Error) {
console.error(error.stack);
}
throw new Error("node executor abort.");
}
})
);
const importsArg = new ImportsArgument();
const userDefinedImportsObject = imports === null ? {} : imports(importsArg);
const importObject: ASImports = {
wasi_snapshot_preview1: wasi.wasiImport,
mockInstrument: mockInstruFunc,
...covInstruFunc(wasm),
...userDefinedImportsObject,
} as ASImports;
const binaryBuffer = await readFile(wasm);
const binary = binaryBuffer.buffer.slice(binaryBuffer.byteOffset, binaryBuffer.byteOffset + binaryBuffer.byteLength);
const importFuncList = parseImportFunctionInfo(binary as ArrayBuffer);
supplyDefaultFunction(importFuncList, importObject);
const ins = await instantiate(binary, importObject);
importsArg.module = ins.module;
importsArg.instance = ins.instance;
importsArg.exports = ins.exports;
try {
wasi.start(ins);
} catch (error) {
if (error instanceof Error) {
console.error(error.stack);
}
throw new Error("node executor abort.");
}
}

export async function execWasmBinarys(
Expand All @@ -61,13 +54,9 @@ export async function execWasmBinarys(
): Promise<AssertResult> {
const assertRes = new AssertResult();
ensureDirSync(outFolder);

const wasmPaths = instrumentResult.map((res) => res.instrumentedWasm);

await nodeExecutor(wasmPaths, outFolder, imports);

await Promise.all(
instrumentResult.map(async (res) => {
await Promise.all<void>(
instrumentResult.map(async (res): Promise<void> => {
await nodeExecutor(res.instrumentedWasm, outFolder, imports);
const { instrumentedWasm, expectInfo } = res;
const assertLogFilePath = join(outFolder, basename(instrumentedWasm).slice(0, -4).concat("assert.log"));

Expand Down
3 changes: 2 additions & 1 deletion tsconfig.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,8 @@
"noUncheckedIndexedAccess": true,
"noImplicitOverride": true,
"noPropertyAccessFromIndexSignature": true,
"skipLibCheck": true
"skipLibCheck": true,
"isolatedModules": true
},
"include": ["src/**/*.ts", "transform", "tests/ts/**/*.ts"],
"exclude": ["assembly", "example"]
Expand Down