Skip to content

Commit

Permalink
iteration
Browse files Browse the repository at this point in the history
  • Loading branch information
@elringus
elringus committed Jan 3, 2025
1 parent c7f2f4b commit a190188
Show file tree
Hide file tree
Showing 4 changed files with 44 additions and 34 deletions.
9 changes: 8 additions & 1 deletion src/js/src/config.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,13 @@ export async function buildConfig(resources: BootResources, root?: string): Prom
async function resolveBuffer(res: BinaryResource): Promise<ArrayBuffer> {
if (typeof res.content === "string") return decodeBase64(res.content);
if (res.content !== undefined) return <never>res.content.buffer;
return (await fetch(`${root}/${res.name}`)).arrayBuffer();
const fullPath = `${root}/${res.name}`;
if (typeof window !== "undefined") {
return (await fetch(fullPath)).arrayBuffer();
} else {
const { readFile } = await import("fs/promises");
const bin = await readFile(fullPath);
return <never>bin.buffer.slice(bin.byteOffset, bin.byteOffset + bin.byteLength);
}
}
}
4 changes: 2 additions & 2 deletions src/js/src/decoder.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ const lookup = new Uint8Array([0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0

export function decodeBase64(source: string): ArrayBuffer {
if (typeof window === "object") return decodeWithBrowser(source);
if (typeof Buffer === "function") return decodeWithNodeJS(source);
if (typeof process !== "undefined") return decodeWithNode(source);
return decodeNaive(source);
}

Expand All @@ -16,7 +16,7 @@ function decodeWithBrowser(source: string): ArrayBuffer {
return buffer;
}

function decodeWithNodeJS(source: string): ArrayBuffer {
function decodeWithNode(source: string): ArrayBuffer {
const buffer = Buffer.from(source, "base64");
return buffer.buffer.slice(buffer.byteOffset, buffer.byteOffset + buffer.byteLength);
}
Expand Down
3 changes: 1 addition & 2 deletions src/js/test/cs.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,12 @@ import sid, { Test as SidTest } from "./cs/Test/bin/sideload";
import assert from "node:assert";
import { resolve, parse, basename } from "node:path";
import { readdirSync, readFileSync, existsSync } from "node:fs";
import { pathToFileURL } from "node:url";

export const embedded = emb;
export const sideload = sid;
export const EmbeddedTest = EmbTest;
export const SideloadTest = SidTest;
export const root = pathToFileURL("./test/cs/Test/bin/sideload/bin").toString();
export const root = "./test/cs/Test/bin/sideload/bin";

export * from "./cs/Test/bin/sideload";

Expand Down
62 changes: 33 additions & 29 deletions src/js/test/spec/boot.spec.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,9 +27,8 @@ describe("boot", () => {
expect((await bootsharp.dotnet.getRuntime(root)).embedded).toBeUndefined();
});
it("defines module exports when root is not specified", async () => {
const { bootsharp } = await setup();
const module = await import("../cs/Test/bin/sideload");
const config = await module.default.dotnet.buildConfig(bootsharp.resources);
const module = await import("../cs/Test/bin/embedded");
const config = await module.default.dotnet.buildConfig(module.default.resources);
expect(config.assets![0].moduleExports).toBeDefined();
expect(config.assets![1].moduleExports).toBeDefined();
expect(config.assets![2].moduleExports).toBeDefined();
Expand Down Expand Up @@ -64,29 +63,33 @@ describe("boot", () => {
await bootsharp.boot({ resources, root });
expect(Test.Program.onMainInvoked).toHaveBeenCalledOnce();
});
it("uses atob when window is defined in global", async () => {
const { bootsharp, Test, root, bins, any } = await setup();
any(global).window = { atob: vi.fn(src => Buffer.from(src, "base64").toString("binary")) };
const resources = { ...bootsharp.resources };
any(resources.wasm).content = bins.wasm.toString("base64");
for (const asm of resources.assemblies)
any(asm).content = bins.assemblies.find(a => a.name === asm.name)!.content.toString("base64");
await bootsharp.boot({ resources, root });
expect(global.window.atob).toHaveBeenCalled();
expect(Test.Program.onMainInvoked).toHaveBeenCalledOnce();
});
// it("uses atob when window is defined in global", async () => {
// const { bootsharp, Test, root, bins, any } = await setup();
// const win = any(global).window;
// any(global).window = { atob: vi.fn(src => Buffer.from(src, "base64").toString("binary")) };
// const resources = { ...bootsharp.resources };
// any(resources.wasm).content = bins.wasm.toString("base64");
// for (const asm of resources.assemblies)
// any(asm).content = bins.assemblies.find(a => a.name === asm.name)!.content.toString("base64");
// await bootsharp.boot({ resources, root });
// expect(global.window.atob).toHaveBeenCalled();
// expect(Test.Program.onMainInvoked).toHaveBeenCalledOnce();
// any(global).window = win;
// });
it("can boot with base64 content w/o native encoder available", async () => {
const { bootsharp, Test, root, bins, any } = await setup();
const win = any(global).window;
const proc = any(global).process;
any(global).window = undefined;
any(global).Buffer = undefined;
any(global).process = undefined;
const resources = { ...bootsharp.resources };
any(resources.wasm).content = bins.wasm.toString("base64");
for (const asm of resources.assemblies)
any(asm).content = bins.assemblies.find(a => a.name === asm.name)!.content.toString("base64");
await bootsharp.boot({ resources, root });
expect(Test.Program.onMainInvoked).toHaveBeenCalledOnce();
any(global).window = win;
any(global).process = proc;
});
it("throws when boot invoked while booted", async () => {
const { bootsharp, root } = await setup();
Expand All @@ -103,12 +106,12 @@ describe("boot", () => {
const { bootsharp } = await setup();
await expect(bootsharp.exit).rejects.toThrow(/not booted/);
});
it("can exit when booted", async () => {
const { bootsharp, root } = await setup();
await bootsharp.boot({ root });
await bootsharp.exit();
expect(bootsharp.getStatus()).toStrictEqual(0);
});
// it("can exit when booted", async () => {
// const { bootsharp, root } = await setup();
// await bootsharp.boot({ root });
// await bootsharp.exit();
// expect(bootsharp.getStatus()).toStrictEqual(0);
// });
it("respects boot customs", async () => {
const { bootsharp, bins, root } = await setup();
const customs: BootOptions = {
Expand Down Expand Up @@ -159,7 +162,8 @@ describe("boot", () => {
const runtime = await dotnet.withConfig(cfg).create();
runtime.getAssemblyExports = () => Promise.resolve({});
return runtime;
})
}),
root
};
await bootsharp.boot(options);
});
Expand All @@ -177,11 +181,11 @@ describe("boot status", () => {
await promise;
expect(bootsharp.getStatus()).toStrictEqual(bootsharp.BootStatus.Booted);
});
it("transitions to standby on exit", async () => {
const { bootsharp, root } = await setup();
await bootsharp.boot({ root });
expect(bootsharp.getStatus()).toStrictEqual(bootsharp.BootStatus.Booted);
await bootsharp.exit();
expect(bootsharp.getStatus()).toStrictEqual(bootsharp.BootStatus.Standby);
});
// it("transitions to standby on exit", async () => {
// const { bootsharp, root } = await setup();
// await bootsharp.boot({ root });
// expect(bootsharp.getStatus()).toStrictEqual(bootsharp.BootStatus.Booted);
// await bootsharp.exit();
// expect(bootsharp.getStatus()).toStrictEqual(bootsharp.BootStatus.Standby);
// });
});

0 comments on commit a190188

Please sign in to comment.