@bytecodealliance/jco 1.31.0 → 1.32.1
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/README.md +35 -0
- package/dist/cmd/new/oci-wit.d.ts +5 -0
- package/dist/cmd/new/oci-wit.d.ts.map +1 -0
- package/dist/cmd/new/oci-wit.js +124 -0
- package/dist/cmd/new/oci-wit.js.map +1 -0
- package/dist/cmd/new.d.ts.map +1 -1
- package/dist/cmd/new.js +6 -1
- package/dist/cmd/new.js.map +1 -1
- package/dist/cmd/opt.d.ts.map +1 -1
- package/dist/cmd/opt.js +102 -130
- package/dist/cmd/opt.js.map +1 -1
- package/dist/cmd/run.d.ts +8 -0
- package/dist/cmd/run.d.ts.map +1 -1
- package/dist/cmd/run.js +202 -6
- package/dist/cmd/run.js.map +1 -1
- package/dist/cmd/transpile.js +1 -4
- package/dist/cmd/transpile.js.map +1 -1
- package/dist/common.d.ts +0 -2
- package/dist/common.d.ts.map +1 -1
- package/dist/common.js +0 -9
- package/dist/common.js.map +1 -1
- package/dist/jco.js +6 -2
- package/dist/jco.js.map +1 -1
- package/package.json +4 -12
- package/dist/ora-shim.d.ts +0 -9
- package/dist/ora-shim.d.ts.map +0 -1
- package/dist/ora-shim.js +0 -10
- package/dist/ora-shim.js.map +0 -1
package/README.md
CHANGED
|
@@ -90,6 +90,19 @@ jco scaffold my-component --wit path/to/wit
|
|
|
90
90
|
`--wit` accepts a self-contained `.wit` file or WIT package directory and copies it into the project. If dealing with a
|
|
91
91
|
WIT file that contains multiple worlds, supply the `--world` option as well.
|
|
92
92
|
|
|
93
|
+
It can also pull a versioned WASI package from the Bytecode Alliance OCI registry. The package and its embedded dependencies are
|
|
94
|
+
expanded into the generated project's `wit/` directory, so subsequent builds do not access the registry:
|
|
95
|
+
|
|
96
|
+
```console
|
|
97
|
+
jco scaffold my-command --wit wasi:cli@0.3.0 --world wasi:cli/command@0.3.0
|
|
98
|
+
```
|
|
99
|
+
|
|
100
|
+
Use an `oci://` reference to scaffold from an arbitrary OCI registry package, including WIT-only components:
|
|
101
|
+
|
|
102
|
+
```console
|
|
103
|
+
jco scaffold my-adder --wit oci://ghcr.io/bytecodealliance/docs/adder:0.1.0 --world docs:adder/adder@0.1.0
|
|
104
|
+
```
|
|
105
|
+
|
|
93
106
|
For a quick WASI starting point, use one of Jco's bundled WIT packages:
|
|
94
107
|
|
|
95
108
|
```console
|
|
@@ -156,10 +169,32 @@ Using the preview2-shim WASI implementation, full access to the underlying syste
|
|
|
156
169
|
|
|
157
170
|
For HTTP Proxy components, `jco serve` provides a JS server implementation:
|
|
158
171
|
|
|
172
|
+
> **Warning:** `jco serve` is intended for development and testing only. It is not production ready.
|
|
173
|
+
|
|
159
174
|
```
|
|
160
175
|
jco serve --port 8080 server.wasm
|
|
161
176
|
```
|
|
162
177
|
|
|
178
|
+
By default, the server reuses one component instance for all requests. Pass `--isolate-requests`
|
|
179
|
+
to run every request in a fresh Node.js worker thread (equivalent to
|
|
180
|
+
`--isolate-requests=worker`):
|
|
181
|
+
|
|
182
|
+
```
|
|
183
|
+
jco serve --isolate-requests --port 8080 server.wasm
|
|
184
|
+
```
|
|
185
|
+
|
|
186
|
+
Worker isolation gives each request a separate V8 isolate, JavaScript global scope, module cache, and
|
|
187
|
+
component instance. Request and response bodies are streamed through a local HTTP proxy. For lower
|
|
188
|
+
overhead, `--isolate-requests=instance` creates fresh component memories, tables, globals, and resource
|
|
189
|
+
tables while sharing the JavaScript isolate and module cache. Neither mode is a security sandbox or
|
|
190
|
+
isolates external filesystem and network side effects. Both modes have a significant performance cost,
|
|
191
|
+
especially worker isolation. Instance isolation is generally the faster isolation mechanism; worker
|
|
192
|
+
isolation trades additional worker startup and HTTP proxy overhead for separate JavaScript globals and
|
|
193
|
+
module caches. To reduce per-request startup latency without reusing JavaScript state, worker mode
|
|
194
|
+
prewarms 50 one-shot workers by default; configure this with `--isolate-worker-pool-size`. See the
|
|
195
|
+
[development-use `jco serve` benchmark](https://bytecodealliance.github.io/jco/performance/benchmarks/development-use-jco-serve.html)
|
|
196
|
+
page for benchmark results and reproduction instructions.
|
|
197
|
+
|
|
163
198
|
> [Wasmtime](https://github.com/bytecodealliance/wasmtime) generally provides the most performant implementation for executing command and proxy worlds to use. These implementations are rather for when JS virtualization is required or the most convenient approach.
|
|
164
199
|
|
|
165
200
|
### Componentize
|
|
@@ -0,0 +1,5 @@
|
|
|
1
|
+
/** Return whether an argument denotes an OCI registry artifact. */
|
|
2
|
+
export declare function isOciWit(input: string): boolean;
|
|
3
|
+
/** Pull an encoded WIT package from OCI and expand it into a WIT directory. */
|
|
4
|
+
export declare function pullOciWit(input: string, destination: string): Promise<void>;
|
|
5
|
+
//# sourceMappingURL=oci-wit.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"oci-wit.d.ts","sourceRoot":"","sources":["../../../src/cmd/new/oci-wit.ts"],"names":[],"mappings":"AA0BA,mEAAmE;AACnE,wBAAgB,QAAQ,CAAC,KAAK,EAAE,MAAM,GAAG,OAAO,CAE/C;AAED,+EAA+E;AAC/E,wBAAsB,UAAU,CAAC,KAAK,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CA8BlF"}
|
|
@@ -0,0 +1,124 @@
|
|
|
1
|
+
import { createHash } from "node:crypto";
|
|
2
|
+
import { mkdir, writeFile } from "node:fs/promises";
|
|
3
|
+
import { dirname, join } from "node:path";
|
|
4
|
+
const MANIFEST_TYPES = [
|
|
5
|
+
"application/vnd.oci.image.manifest.v1+json",
|
|
6
|
+
"application/vnd.docker.distribution.manifest.v2+json",
|
|
7
|
+
].join(", ");
|
|
8
|
+
/** Return whether an argument denotes an OCI registry artifact. */
|
|
9
|
+
export function isOciWit(input) {
|
|
10
|
+
return input.startsWith("oci://") || /^wasi:[a-z][a-z0-9-]*@\d+\.\d+\.\d+(?:[-+].+)?$/.test(input);
|
|
11
|
+
}
|
|
12
|
+
/** Pull an encoded WIT package from OCI and expand it into a WIT directory. */
|
|
13
|
+
export async function pullOciWit(input, destination) {
|
|
14
|
+
const { ref, packageSpec } = resolveReference(input);
|
|
15
|
+
const base = `https://${ref.registry}/v2/${ref.repository}`;
|
|
16
|
+
const manifestResponse = await registryFetch(`${base}/manifests/${encodeURIComponent(ref.reference)}`, {
|
|
17
|
+
headers: { accept: MANIFEST_TYPES },
|
|
18
|
+
repository: ref.repository,
|
|
19
|
+
});
|
|
20
|
+
const manifest = (await manifestResponse.json());
|
|
21
|
+
if (manifest.schemaVersion !== 2 || !Array.isArray(manifest.layers)) {
|
|
22
|
+
throw new Error(`Invalid OCI manifest returned for ${input}`);
|
|
23
|
+
}
|
|
24
|
+
const layer = manifest.layers.find(({ mediaType }) => mediaType === "application/wasm") ?? manifest.layers[0];
|
|
25
|
+
if (!layer) {
|
|
26
|
+
throw new Error(`OCI artifact ${input} has no layers`);
|
|
27
|
+
}
|
|
28
|
+
const blobResponse = await registryFetch(`${base}/blobs/${layer.digest}`, { repository: ref.repository });
|
|
29
|
+
const bytes = new Uint8Array(await blobResponse.arrayBuffer());
|
|
30
|
+
verifyDescriptor(input, layer, bytes);
|
|
31
|
+
// Use a dynamic import so Jco can build against the latest published compatible
|
|
32
|
+
// jco-transpile while this new API is released alongside it.
|
|
33
|
+
const { unpackWit } = (await import("@bytecodealliance/jco-transpile"));
|
|
34
|
+
const files = await unpackWit(packageSpec, bytes);
|
|
35
|
+
for (const [path, contents] of files) {
|
|
36
|
+
const output = join(destination, path);
|
|
37
|
+
await mkdir(dirname(output), { recursive: true });
|
|
38
|
+
await writeFile(output, contents);
|
|
39
|
+
}
|
|
40
|
+
}
|
|
41
|
+
function resolveReference(input) {
|
|
42
|
+
if (!input.startsWith("oci://")) {
|
|
43
|
+
const [name, reference] = input.split("@", 2);
|
|
44
|
+
const [namespace, packageName] = name.split(":", 2);
|
|
45
|
+
return {
|
|
46
|
+
ref: {
|
|
47
|
+
registry: "ghcr.io",
|
|
48
|
+
repository: `webassembly/${namespace}/${packageName}`,
|
|
49
|
+
reference,
|
|
50
|
+
},
|
|
51
|
+
packageSpec: input,
|
|
52
|
+
};
|
|
53
|
+
}
|
|
54
|
+
const value = input.slice("oci://".length);
|
|
55
|
+
const slash = value.indexOf("/");
|
|
56
|
+
const path = value.slice(slash + 1);
|
|
57
|
+
const digestSeparator = path.lastIndexOf("@");
|
|
58
|
+
const tagSeparator = path.lastIndexOf(":");
|
|
59
|
+
const separator = digestSeparator >= 0 ? digestSeparator : tagSeparator;
|
|
60
|
+
if (slash <= 0 || separator <= path.lastIndexOf("/")) {
|
|
61
|
+
throw new Error(`Invalid OCI reference ${JSON.stringify(input)}; expected oci://registry/repository:tag`);
|
|
62
|
+
}
|
|
63
|
+
return {
|
|
64
|
+
ref: {
|
|
65
|
+
registry: value.slice(0, slash),
|
|
66
|
+
repository: path.slice(0, separator),
|
|
67
|
+
reference: path.slice(separator + 1),
|
|
68
|
+
},
|
|
69
|
+
};
|
|
70
|
+
}
|
|
71
|
+
async function registryFetch(url, options) {
|
|
72
|
+
let response = await fetch(url, { headers: options.headers });
|
|
73
|
+
if (response.status === 401) {
|
|
74
|
+
const challenge = response.headers.get("www-authenticate");
|
|
75
|
+
if (!challenge) {
|
|
76
|
+
throw new Error(`OCI registry denied access to ${url}`);
|
|
77
|
+
}
|
|
78
|
+
const auth = parseBearerChallenge(challenge);
|
|
79
|
+
const tokenUrl = new URL(auth.realm);
|
|
80
|
+
tokenUrl.searchParams.set("service", auth.service);
|
|
81
|
+
tokenUrl.searchParams.set("scope", auth.scope ?? `repository:${options.repository}:pull`);
|
|
82
|
+
const tokenResponse = await fetch(tokenUrl);
|
|
83
|
+
if (!tokenResponse.ok) {
|
|
84
|
+
throw new Error(`OCI registry authentication failed: ${tokenResponse.statusText}`);
|
|
85
|
+
}
|
|
86
|
+
const tokenBody = (await tokenResponse.json());
|
|
87
|
+
const token = tokenBody.token ?? tokenBody.access_token;
|
|
88
|
+
if (!token) {
|
|
89
|
+
throw new Error("OCI registry authentication response did not include a token");
|
|
90
|
+
}
|
|
91
|
+
response = await fetch(url, { headers: { ...options.headers, authorization: `Bearer ${token}` } });
|
|
92
|
+
}
|
|
93
|
+
if (!response.ok) {
|
|
94
|
+
throw new Error(`Failed to pull OCI artifact: ${response.status} ${response.statusText}`);
|
|
95
|
+
}
|
|
96
|
+
return response;
|
|
97
|
+
}
|
|
98
|
+
function parseBearerChallenge(challenge) {
|
|
99
|
+
if (!challenge.startsWith("Bearer ")) {
|
|
100
|
+
throw new Error(`Unsupported OCI authentication challenge: ${challenge}`);
|
|
101
|
+
}
|
|
102
|
+
const values = {};
|
|
103
|
+
for (const match of challenge.slice(7).matchAll(/([a-zA-Z]+)="([^"]*)"/g)) {
|
|
104
|
+
values[match[1]] = match[2];
|
|
105
|
+
}
|
|
106
|
+
if (!values.realm || !values.service) {
|
|
107
|
+
throw new Error(`Invalid OCI authentication challenge: ${challenge}`);
|
|
108
|
+
}
|
|
109
|
+
return values;
|
|
110
|
+
}
|
|
111
|
+
function verifyDescriptor(input, descriptor, bytes) {
|
|
112
|
+
if (descriptor.size !== undefined && descriptor.size !== bytes.byteLength) {
|
|
113
|
+
throw new Error(`OCI layer for ${input} has an invalid size`);
|
|
114
|
+
}
|
|
115
|
+
const [algorithm, expected] = descriptor.digest.split(":", 2);
|
|
116
|
+
if (algorithm !== "sha256" || !expected) {
|
|
117
|
+
throw new Error(`Unsupported OCI digest ${descriptor.digest}`);
|
|
118
|
+
}
|
|
119
|
+
const actual = createHash("sha256").update(bytes).digest("hex");
|
|
120
|
+
if (actual !== expected) {
|
|
121
|
+
throw new Error(`OCI layer for ${input} failed digest verification`);
|
|
122
|
+
}
|
|
123
|
+
}
|
|
124
|
+
//# sourceMappingURL=oci-wit.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"oci-wit.js","sourceRoot":"","sources":["../../../src/cmd/new/oci-wit.ts"],"names":[],"mappings":"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"}
|
package/dist/cmd/new.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"new.d.ts","sourceRoot":"","sources":["../../src/cmd/new.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"new.d.ts","sourceRoot":"","sources":["../../src/cmd/new.ts"],"names":[],"mappings":"AAUA,MAAM,MAAM,WAAW,GAAG,YAAY,GAAG,YAAY,CAAC;AACtD,MAAM,MAAM,iBAAiB,GAAG,MAAM,GAAG,KAAK,GAAG,MAAM,CAAC;AACxD,MAAM,MAAM,SAAS,GAAG,QAAQ,GAAG,KAAK,CAAC;AAEzC,MAAM,WAAW,iBAAiB;IAC9B,GAAG,EAAE,MAAM,CAAC;IACZ,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,QAAQ,CAAC,EAAE,WAAW,GAAG,IAAI,GAAG,IAAI,CAAC;IACrC,cAAc,CAAC,EAAE,iBAAiB,CAAC;IACnC,OAAO,CAAC,EAAE,SAAS,EAAE,CAAC;IACtB,IAAI,CAAC,EAAE,OAAO,CAAC;CAClB;AAED,+CAA+C;AAC/C,wBAAsB,aAAa,CAAC,gBAAgB,EAAE,MAAM,EAAE,OAAO,EAAE,iBAAiB,GAAG,OAAO,CAAC,MAAM,CAAC,CA0EzG"}
|
package/dist/cmd/new.js
CHANGED
|
@@ -3,13 +3,15 @@ import { basename, dirname, extname, join, relative, resolve, sep } from "node:p
|
|
|
3
3
|
import { typesComponent } from "./types.js";
|
|
4
4
|
import { copyBuiltinWit, resolveBuiltinWit } from "./new/builtin-wit.js";
|
|
5
5
|
import { declarationModel, validateComponentSource } from "./new/declarations.js";
|
|
6
|
+
import { isOciWit, pullOciWit } from "./new/oci-wit.js";
|
|
6
7
|
import { packageManagerAdapter } from "./new/package-manager.js";
|
|
7
8
|
import { renderComponent, renderComponentTest, renderHostPlugin, renderHostPluginTest } from "./new/render.js";
|
|
8
9
|
/** Create a JS project to match a given WIT */
|
|
9
10
|
export async function createProject(projectDirectory, options) {
|
|
10
11
|
const destination = resolve(projectDirectory);
|
|
11
12
|
const builtinWit = resolveBuiltinWit(options.wit);
|
|
12
|
-
const
|
|
13
|
+
const ociWit = isOciWit(options.wit);
|
|
14
|
+
const witSource = builtinWit || ociWit ? undefined : resolve(options.wit);
|
|
13
15
|
const language = normalizeLanguage(options.language);
|
|
14
16
|
const packageManager = options.packageManager ?? "pnpm";
|
|
15
17
|
const targets = normalizeTargets(options.targets);
|
|
@@ -23,6 +25,9 @@ export async function createProject(projectDirectory, options) {
|
|
|
23
25
|
if (builtinWit) {
|
|
24
26
|
await copyBuiltinWit(builtinWit, projectWit);
|
|
25
27
|
}
|
|
28
|
+
else if (ociWit) {
|
|
29
|
+
await pullOciWit(options.wit, projectWit);
|
|
30
|
+
}
|
|
26
31
|
else {
|
|
27
32
|
await copyWit(witSource, projectWit);
|
|
28
33
|
}
|
package/dist/cmd/new.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"new.js","sourceRoot":"","sources":["../../src/cmd/new.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"new.js","sourceRoot":"","sources":["../../src/cmd/new.ts"],"names":[],"mappings":"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"}
|
package/dist/cmd/opt.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"opt.d.ts","sourceRoot":"","sources":["../../src/cmd/opt.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"opt.d.ts","sourceRoot":"","sources":["../../src/cmd/opt.ts"],"names":[],"mappings":"AAYA,MAAM,WAAW,eAAe;IAC5B,KAAK,EAAE,OAAO,CAAC;IACf,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,OAAO,CAAC,EAAE,MAAM,EAAE,CAAC;IACnB,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,UAAU,CAAC,EAAE,MAAM,CAAC;CACvB;AAED,MAAM,WAAW,cAAc;IAC3B,SAAS,EAAE,UAAU,CAAC;IACtB,eAAe,EAAE,KAAK,CAAC;QACnB,WAAW,EAAE,MAAM,CAAC;QACpB,UAAU,EAAE,MAAM,CAAC;KACtB,CAAC,CAAC;CACN;AAED,wBAAsB,GAAG,CAAC,aAAa,EAAE,MAAM,EAAE,IAAI,EAAE,eAAe,GAAG;IAAE,MAAM,EAAE,MAAM,CAAA;CAAE,EAAE,OAAO,EAAE,GAAG,iBA8CxG;AAgBD;;;;;GAKG;AACH,wBAAsB,iBAAiB,CAAC,cAAc,EAAE,UAAU,EAAE,IAAI,EAAE,eAAe,GAAG,OAAO,CAAC,cAAc,CAAC,CAoIlH"}
|
package/dist/cmd/opt.js
CHANGED
|
@@ -1,8 +1,7 @@
|
|
|
1
1
|
import { fileURLToPath } from "node:url";
|
|
2
2
|
import { writeFile } from "node:fs/promises";
|
|
3
3
|
import { metadataShow, print } from "@bytecodealliance/jco-transpile/wasm-tools";
|
|
4
|
-
import { readFile, sizeStr, fixedDigitDisplay, table, spawnIOTmp
|
|
5
|
-
import ora from "#ora";
|
|
4
|
+
import { readFile, sizeStr, fixedDigitDisplay, table, spawnIOTmp } from "../common.js";
|
|
6
5
|
import { styleText } from "../common.js";
|
|
7
6
|
export async function opt(componentPath, opts, program) {
|
|
8
7
|
const varIdx = program.parent.rawArgs.indexOf("--");
|
|
@@ -10,11 +9,7 @@ export async function opt(componentPath, opts, program) {
|
|
|
10
9
|
opts.optArgs = program.parent.rawArgs.slice(varIdx + 1);
|
|
11
10
|
}
|
|
12
11
|
const componentBytes = await readFile(componentPath);
|
|
13
|
-
|
|
14
|
-
setShowSpinner(true);
|
|
15
|
-
}
|
|
16
|
-
const optPromise = optimizeComponent(componentBytes, opts);
|
|
17
|
-
const { component, compressionInfo } = await optPromise;
|
|
12
|
+
const { component, compressionInfo } = await optimizeComponent(componentBytes, opts);
|
|
18
13
|
await writeFile(opts.output, component);
|
|
19
14
|
let totalBeforeBytes = 0, totalAfterBytes = 0;
|
|
20
15
|
if (!opts.quiet) {
|
|
@@ -66,134 +61,111 @@ function byteLengthLEB128(val) {
|
|
|
66
61
|
* @returns {Promise<{ component: Uint8Array, compressionInfo: { beforeBytes: number, afterBytes: number }[] >}
|
|
67
62
|
*/
|
|
68
63
|
export async function optimizeComponent(componentBytes, opts) {
|
|
69
|
-
|
|
70
|
-
|
|
71
|
-
|
|
72
|
-
|
|
73
|
-
|
|
74
|
-
|
|
75
|
-
|
|
76
|
-
|
|
77
|
-
|
|
78
|
-
|
|
79
|
-
|
|
80
|
-
|
|
81
|
-
|
|
82
|
-
|
|
83
|
-
|
|
84
|
-
|
|
85
|
-
|
|
86
|
-
|
|
87
|
-
|
|
88
|
-
|
|
89
|
-
|
|
90
|
-
|
|
91
|
-
|
|
92
|
-
|
|
93
|
-
|
|
94
|
-
|
|
95
|
-
|
|
96
|
-
args.push("--asyncify");
|
|
64
|
+
let componentMetadata = (await metadataShow(componentBytes));
|
|
65
|
+
componentMetadata.forEach((metadata, index) => {
|
|
66
|
+
// add index to the metadata object
|
|
67
|
+
metadata.index = index;
|
|
68
|
+
const size = metadata.range[1] - metadata.range[0];
|
|
69
|
+
// compute previous LEB128 encoding length
|
|
70
|
+
metadata.prevLEBLen = byteLengthLEB128(size);
|
|
71
|
+
});
|
|
72
|
+
const coreModules = componentMetadata.filter(({ metaType }) => metaType.tag === "module");
|
|
73
|
+
// gather the options for wasm-opt. optionally, adding the asyncify flag
|
|
74
|
+
const args = opts?.optArgs
|
|
75
|
+
? [...opts.optArgs]
|
|
76
|
+
: ["-Oz", "--low-memory-unused", "--enable-bulk-memory", "--strip-debug"];
|
|
77
|
+
if (opts?.asyncify) {
|
|
78
|
+
args.push("--asyncify");
|
|
79
|
+
}
|
|
80
|
+
// process core Wasm modules with wasm-opt
|
|
81
|
+
await Promise.all(coreModules.map(async (metadata) => {
|
|
82
|
+
if (metadata.metaType.tag === "module") {
|
|
83
|
+
// store the wasm-opt processed module in the metadata
|
|
84
|
+
metadata.optimized = await wasmOpt(componentBytes.subarray(metadata.range[0], metadata.range[1]), args, opts);
|
|
85
|
+
// compute the size change, including the change to
|
|
86
|
+
// the LEB128 encoding of the size change
|
|
87
|
+
const prevModuleSize = metadata.range[1] - metadata.range[0];
|
|
88
|
+
const newModuleSize = metadata.optimized.byteLength;
|
|
89
|
+
metadata.newLEBLen = byteLengthLEB128(newModuleSize);
|
|
90
|
+
metadata.sizeChange = newModuleSize - prevModuleSize;
|
|
97
91
|
}
|
|
98
|
-
|
|
99
|
-
|
|
100
|
-
|
|
101
|
-
|
|
102
|
-
|
|
103
|
-
|
|
104
|
-
|
|
105
|
-
|
|
106
|
-
|
|
107
|
-
|
|
108
|
-
metadata.
|
|
109
|
-
|
|
110
|
-
|
|
111
|
-
|
|
112
|
-
|
|
113
|
-
|
|
114
|
-
|
|
115
|
-
// organize components in modules into tree parent and children
|
|
116
|
-
const nodes = componentMetadata.slice(1);
|
|
117
|
-
const getChildren = (parentIndex) => {
|
|
118
|
-
const children = [];
|
|
119
|
-
for (let i = 0; i < nodes.length; i++) {
|
|
120
|
-
const metadata = nodes[i];
|
|
121
|
-
if (metadata.parentIndex === parentIndex) {
|
|
122
|
-
nodes.splice(i, 1); // remove from nodes
|
|
123
|
-
i--;
|
|
124
|
-
metadata.children = getChildren(metadata.index);
|
|
125
|
-
metadata.sizeChange = metadata.children.reduce((total, { prevLEBLen, newLEBLen, sizeChange }) => {
|
|
126
|
-
return sizeChange ? total + sizeChange + newLEBLen - prevLEBLen : total;
|
|
127
|
-
}, metadata.sizeChange || 0);
|
|
128
|
-
const prevSize = metadata.range[1] - metadata.range[0];
|
|
129
|
-
metadata.newLEBLen = byteLengthLEB128(prevSize + (metadata.sizeChange ?? 0));
|
|
130
|
-
children.push(metadata);
|
|
131
|
-
}
|
|
132
|
-
}
|
|
133
|
-
return children;
|
|
134
|
-
};
|
|
135
|
-
const componentTree = getChildren(0);
|
|
136
|
-
// compute the total size change in the component binary
|
|
137
|
-
const sizeChange = componentTree.reduce((total, { prevLEBLen, newLEBLen, sizeChange }) => {
|
|
138
|
-
return total + (sizeChange || 0) + newLEBLen - prevLEBLen;
|
|
139
|
-
}, 0);
|
|
140
|
-
let outComponentBytes = new Uint8Array(componentBytes.byteLength + sizeChange);
|
|
141
|
-
let nextReadPos = 0, nextWritePos = 0;
|
|
142
|
-
const write = ({ prevLEBLen, range, optimized, children, sizeChange }) => {
|
|
143
|
-
// write from the last read to the LEB byte start
|
|
144
|
-
outComponentBytes.set(componentBytes.subarray(nextReadPos, range[0] - prevLEBLen), nextWritePos);
|
|
145
|
-
nextWritePos += range[0] - prevLEBLen - nextReadPos;
|
|
146
|
-
// write the new LEB bytes
|
|
147
|
-
let val = range[1] - range[0] + sizeChange;
|
|
148
|
-
do {
|
|
149
|
-
const byte = val & 0x7f;
|
|
150
|
-
val >>>= 7;
|
|
151
|
-
outComponentBytes[nextWritePos++] = val === 0 ? byte : byte | 0x80;
|
|
152
|
-
} while (val !== 0);
|
|
153
|
-
if (optimized) {
|
|
154
|
-
// write the core module
|
|
155
|
-
outComponentBytes.set(optimized, nextWritePos);
|
|
156
|
-
nextReadPos = range[1];
|
|
157
|
-
nextWritePos += optimized.byteLength;
|
|
158
|
-
}
|
|
159
|
-
else if (children.length > 0) {
|
|
160
|
-
// write child components / modules
|
|
161
|
-
nextReadPos = range[0];
|
|
162
|
-
children.forEach(write);
|
|
163
|
-
}
|
|
164
|
-
else {
|
|
165
|
-
// write component
|
|
166
|
-
outComponentBytes.set(componentBytes.subarray(range[0], range[1]), nextWritePos);
|
|
167
|
-
nextReadPos = range[1];
|
|
168
|
-
nextWritePos += range[1] - range[0];
|
|
169
|
-
}
|
|
170
|
-
};
|
|
171
|
-
// write each top-level component / module
|
|
172
|
-
componentTree.forEach(write);
|
|
173
|
-
// write remaining
|
|
174
|
-
outComponentBytes.set(componentBytes.subarray(nextReadPos), nextWritePos);
|
|
175
|
-
// verify it still parses ok
|
|
176
|
-
if (!opts?.noVerify) {
|
|
177
|
-
try {
|
|
178
|
-
await print(outComponentBytes);
|
|
179
|
-
}
|
|
180
|
-
catch (e) {
|
|
181
|
-
throw new Error(`Internal error performing optimization.\n${e.message}`);
|
|
92
|
+
}));
|
|
93
|
+
// organize components in modules into tree parent and children
|
|
94
|
+
const nodes = componentMetadata.slice(1);
|
|
95
|
+
const getChildren = (parentIndex) => {
|
|
96
|
+
const children = [];
|
|
97
|
+
for (let i = 0; i < nodes.length; i++) {
|
|
98
|
+
const metadata = nodes[i];
|
|
99
|
+
if (metadata.parentIndex === parentIndex) {
|
|
100
|
+
nodes.splice(i, 1); // remove from nodes
|
|
101
|
+
i--;
|
|
102
|
+
metadata.children = getChildren(metadata.index);
|
|
103
|
+
metadata.sizeChange = metadata.children.reduce((total, { prevLEBLen, newLEBLen, sizeChange }) => {
|
|
104
|
+
return sizeChange ? total + sizeChange + newLEBLen - prevLEBLen : total;
|
|
105
|
+
}, metadata.sizeChange || 0);
|
|
106
|
+
const prevSize = metadata.range[1] - metadata.range[0];
|
|
107
|
+
metadata.newLEBLen = byteLengthLEB128(prevSize + (metadata.sizeChange ?? 0));
|
|
108
|
+
children.push(metadata);
|
|
182
109
|
}
|
|
183
110
|
}
|
|
184
|
-
return
|
|
185
|
-
|
|
186
|
-
|
|
187
|
-
|
|
188
|
-
|
|
189
|
-
|
|
190
|
-
|
|
191
|
-
|
|
192
|
-
|
|
193
|
-
|
|
194
|
-
|
|
111
|
+
return children;
|
|
112
|
+
};
|
|
113
|
+
const componentTree = getChildren(0);
|
|
114
|
+
// compute the total size change in the component binary
|
|
115
|
+
const sizeChange = componentTree.reduce((total, { prevLEBLen, newLEBLen, sizeChange }) => {
|
|
116
|
+
return total + (sizeChange || 0) + newLEBLen - prevLEBLen;
|
|
117
|
+
}, 0);
|
|
118
|
+
let outComponentBytes = new Uint8Array(componentBytes.byteLength + sizeChange);
|
|
119
|
+
let nextReadPos = 0, nextWritePos = 0;
|
|
120
|
+
const write = ({ prevLEBLen, range, optimized, children, sizeChange }) => {
|
|
121
|
+
// write from the last read to the LEB byte start
|
|
122
|
+
outComponentBytes.set(componentBytes.subarray(nextReadPos, range[0] - prevLEBLen), nextWritePos);
|
|
123
|
+
nextWritePos += range[0] - prevLEBLen - nextReadPos;
|
|
124
|
+
// write the new LEB bytes
|
|
125
|
+
let val = range[1] - range[0] + sizeChange;
|
|
126
|
+
do {
|
|
127
|
+
const byte = val & 0x7f;
|
|
128
|
+
val >>>= 7;
|
|
129
|
+
outComponentBytes[nextWritePos++] = val === 0 ? byte : byte | 0x80;
|
|
130
|
+
} while (val !== 0);
|
|
131
|
+
if (optimized) {
|
|
132
|
+
// write the core module
|
|
133
|
+
outComponentBytes.set(optimized, nextWritePos);
|
|
134
|
+
nextReadPos = range[1];
|
|
135
|
+
nextWritePos += optimized.byteLength;
|
|
136
|
+
}
|
|
137
|
+
else if (children.length > 0) {
|
|
138
|
+
// write child components / modules
|
|
139
|
+
nextReadPos = range[0];
|
|
140
|
+
children.forEach(write);
|
|
141
|
+
}
|
|
142
|
+
else {
|
|
143
|
+
// write component
|
|
144
|
+
outComponentBytes.set(componentBytes.subarray(range[0], range[1]), nextWritePos);
|
|
145
|
+
nextReadPos = range[1];
|
|
146
|
+
nextWritePos += range[1] - range[0];
|
|
147
|
+
}
|
|
148
|
+
};
|
|
149
|
+
// write each top-level component / module
|
|
150
|
+
componentTree.forEach(write);
|
|
151
|
+
// write remaining
|
|
152
|
+
outComponentBytes.set(componentBytes.subarray(nextReadPos), nextWritePos);
|
|
153
|
+
// verify it still parses ok
|
|
154
|
+
if (!opts?.noVerify) {
|
|
155
|
+
try {
|
|
156
|
+
await print(outComponentBytes);
|
|
157
|
+
}
|
|
158
|
+
catch (e) {
|
|
159
|
+
throw new Error(`Internal error performing optimization.\n${e.message}`);
|
|
195
160
|
}
|
|
196
161
|
}
|
|
162
|
+
return {
|
|
163
|
+
component: outComponentBytes,
|
|
164
|
+
compressionInfo: coreModules.map(({ range, optimized }) => ({
|
|
165
|
+
beforeBytes: range[1] - range[0],
|
|
166
|
+
afterBytes: optimized.byteLength,
|
|
167
|
+
})),
|
|
168
|
+
};
|
|
197
169
|
}
|
|
198
170
|
/**
|
|
199
171
|
* @param {Uint8Array} source
|
package/dist/cmd/opt.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"opt.js","sourceRoot":"","sources":["../../src/cmd/opt.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,UAAU,CAAC;AACzC,OAAO,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAC;AAE7C,OAAO,EAAE,YAAY,EAAE,KAAK,EAAE,MAAM,4CAA4C,CAAC;AAEjF,OAAO,EAAE,QAAQ,EAAE,OAAO,EAAE,iBAAiB,EAAE,KAAK,EAAE,UAAU,EAAE,
|
|
1
|
+
{"version":3,"file":"opt.js","sourceRoot":"","sources":["../../src/cmd/opt.ts"],"names":[],"mappings":"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"}
|
package/dist/cmd/run.d.ts
CHANGED
|
@@ -15,8 +15,16 @@ interface RunComponentOptions extends GetSandboxSetupArgs {
|
|
|
15
15
|
export type RunOptions = RunComponentOptions;
|
|
16
16
|
export interface ServeOptions extends RunComponentOptions {
|
|
17
17
|
host?: string;
|
|
18
|
+
isolateRequests?: "instance" | "worker";
|
|
19
|
+
isolateWorkerPoolSize?: number;
|
|
18
20
|
port?: string;
|
|
19
21
|
}
|
|
22
|
+
interface IncomingHandler {
|
|
23
|
+
handle(request: unknown, responseOutparam: unknown): unknown;
|
|
24
|
+
}
|
|
25
|
+
export declare function createRequestIsolatedHandler(instantiate: (getCoreModule: (path: string) => WebAssembly.Module, imports: Record<string, unknown>) => {
|
|
26
|
+
incomingHandler?: IncomingHandler;
|
|
27
|
+
}, getCoreModule: (path: string) => WebAssembly.Module, getImportObject: () => Record<string, unknown>): IncomingHandler;
|
|
20
28
|
export declare function run(componentPath: string, args: string[], opts: RunOptions): Promise<void>;
|
|
21
29
|
export declare function serve(componentPath: string, args: string[], opts: ServeOptions): Promise<void>;
|
|
22
30
|
export declare function getSandboxSetup(opts: GetSandboxSetupArgs): string;
|
package/dist/cmd/run.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"run.d.ts","sourceRoot":"","sources":["../../src/cmd/run.ts"],"names":[],"mappings":"AAWA,MAAM,WAAW,mBAAmB;IAChC,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,aAAa,CAAC,EAAE,SAAS,MAAM,EAAE,CAAC;IAClC,iBAAiB,CAAC,EAAE,OAAO,CAAC;IAC5B,gBAAgB,CAAC,EAAE,SAAS,MAAM,EAAE,CAAC;IACrC,iBAAiB,CAAC,EAAE,OAAO,CAAC;CAC/B;AAED,UAAU,mBAAoB,SAAQ,mBAAmB;IACrD,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,iBAAiB,CAAC,EAAE,IAAI,GAAG,WAAW,GAAG,QAAQ,GAAG,kBAAkB,CAAC;IACvE,MAAM,CAAC,EAAE,MAAM,EAAE,CAAC;IAClB,QAAQ,CAAC,EAAE,OAAO,CAAC;CACtB;AAED,MAAM,MAAM,UAAU,GAAG,mBAAmB,CAAC;AAE7C,MAAM,WAAW,YAAa,SAAQ,mBAAmB;IACrD,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,IAAI,CAAC,EAAE,MAAM,CAAC;CACjB;AAED,wBAAsB,GAAG,CAAC,aAAa,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,EAAE,IAAI,EAAE,UAAU,iBAwBhF;AAED,wBAAsB,KAAK,CAAC,aAAa,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,EAAE,IAAI,EAAE,YAAY,
|
|
1
|
+
{"version":3,"file":"run.d.ts","sourceRoot":"","sources":["../../src/cmd/run.ts"],"names":[],"mappings":"AAWA,MAAM,WAAW,mBAAmB;IAChC,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,aAAa,CAAC,EAAE,SAAS,MAAM,EAAE,CAAC;IAClC,iBAAiB,CAAC,EAAE,OAAO,CAAC;IAC5B,gBAAgB,CAAC,EAAE,SAAS,MAAM,EAAE,CAAC;IACrC,iBAAiB,CAAC,EAAE,OAAO,CAAC;CAC/B;AAED,UAAU,mBAAoB,SAAQ,mBAAmB;IACrD,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,iBAAiB,CAAC,EAAE,IAAI,GAAG,WAAW,GAAG,QAAQ,GAAG,kBAAkB,CAAC;IACvE,MAAM,CAAC,EAAE,MAAM,EAAE,CAAC;IAClB,QAAQ,CAAC,EAAE,OAAO,CAAC;CACtB;AAED,MAAM,MAAM,UAAU,GAAG,mBAAmB,CAAC;AAE7C,MAAM,WAAW,YAAa,SAAQ,mBAAmB;IACrD,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,eAAe,CAAC,EAAE,UAAU,GAAG,QAAQ,CAAC;IACxC,qBAAqB,CAAC,EAAE,MAAM,CAAC;IAC/B,IAAI,CAAC,EAAE,MAAM,CAAC;CACjB;AAED,UAAU,eAAe;IACrB,MAAM,CAAC,OAAO,EAAE,OAAO,EAAE,gBAAgB,EAAE,OAAO,GAAG,OAAO,CAAC;CAChE;AAED,wBAAgB,4BAA4B,CACxC,WAAW,EAAE,CACT,aAAa,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,WAAW,CAAC,MAAM,EACnD,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,KAC/B;IAAE,eAAe,CAAC,EAAE,eAAe,CAAA;CAAE,EAC1C,aAAa,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,WAAW,CAAC,MAAM,EACnD,eAAe,EAAE,MAAM,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAC/C,eAAe,CAUjB;AAED,wBAAsB,GAAG,CAAC,aAAa,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,EAAE,IAAI,EAAE,UAAU,iBAwBhF;AAED,wBAAsB,KAAK,CAAC,aAAa,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,EAAE,IAAI,EAAE,YAAY,iBAmMpF;AAoID,wBAAgB,eAAe,CAAC,IAAI,EAAE,mBAAmB,GAAG,MAAM,CAuDjE"}
|
package/dist/cmd/run.js
CHANGED
|
@@ -6,6 +6,17 @@ import { fileURLToPath, pathToFileURL } from "node:url";
|
|
|
6
6
|
import { getTmpDir, styleText } from "../common.js";
|
|
7
7
|
import { transpileCmd } from "./transpile.js";
|
|
8
8
|
const DEFAULT_SERVE_HOST = "localhost";
|
|
9
|
+
export function createRequestIsolatedHandler(instantiate, getCoreModule, getImportObject) {
|
|
10
|
+
return {
|
|
11
|
+
handle(request, responseOutparam) {
|
|
12
|
+
const instance = instantiate(getCoreModule, getImportObject());
|
|
13
|
+
if (typeof instance.incomingHandler?.handle !== "function") {
|
|
14
|
+
throw new Error("Not a valid HTTP server component to execute.");
|
|
15
|
+
}
|
|
16
|
+
return instance.incomingHandler.handle(request, responseOutparam);
|
|
17
|
+
},
|
|
18
|
+
};
|
|
19
|
+
}
|
|
9
20
|
export async function run(componentPath, args, opts) {
|
|
10
21
|
// Ensure that `args` is an array
|
|
11
22
|
args = [...args];
|
|
@@ -36,12 +47,167 @@ export async function serve(componentPath, args, opts) {
|
|
|
36
47
|
// Ensure that `args` is an array
|
|
37
48
|
args = [...args];
|
|
38
49
|
host = host ?? DEFAULT_SERVE_HOST;
|
|
39
|
-
|
|
50
|
+
const workerPoolSize = opts.isolateWorkerPoolSize ?? 50;
|
|
51
|
+
if (!Number.isInteger(workerPoolSize) || workerPoolSize < 1) {
|
|
52
|
+
throw new Error("--isolate-worker-pool-size must be a positive integer");
|
|
53
|
+
}
|
|
54
|
+
const isolatedHandler = opts.isolateRequests === "instance"
|
|
55
|
+
? `(${createRequestIsolatedHandler.toString()})(
|
|
56
|
+
mod.instantiate,
|
|
57
|
+
getCoreModule,
|
|
58
|
+
() => new WASIShim().getImportObject()
|
|
59
|
+
)`
|
|
60
|
+
: "mod.incomingHandler";
|
|
61
|
+
return runComponent(componentPath, args, opts, opts.isolateRequests === "worker"
|
|
62
|
+
? `
|
|
63
|
+
import http from 'node:http';
|
|
64
|
+
import { Worker } from 'node:worker_threads';
|
|
65
|
+
|
|
66
|
+
const workerUrl = new URL('./_serve_worker.js', import.meta.url);
|
|
67
|
+
const workerPoolSize = ${workerPoolSize};
|
|
68
|
+
const idleWorkers = [];
|
|
69
|
+
const workerWaiters = [];
|
|
70
|
+
|
|
71
|
+
function createWorker() {
|
|
72
|
+
return new Promise((resolve, reject) => {
|
|
73
|
+
const worker = new Worker(workerUrl);
|
|
74
|
+
const onError = error => { cleanup(); reject(error); };
|
|
75
|
+
const onExit = code => {
|
|
76
|
+
cleanup();
|
|
77
|
+
reject(new Error(\`Request worker exited during startup with code \${code}\`));
|
|
78
|
+
};
|
|
79
|
+
const onMessage = ({ port, error }) => {
|
|
80
|
+
cleanup();
|
|
81
|
+
if (error) {
|
|
82
|
+
worker.terminate();
|
|
83
|
+
reject(new Error(error));
|
|
84
|
+
} else {
|
|
85
|
+
resolve({ worker, port });
|
|
86
|
+
}
|
|
87
|
+
};
|
|
88
|
+
const cleanup = () => {
|
|
89
|
+
worker.off('error', onError);
|
|
90
|
+
worker.off('exit', onExit);
|
|
91
|
+
worker.off('message', onMessage);
|
|
92
|
+
};
|
|
93
|
+
worker.once('error', onError);
|
|
94
|
+
worker.once('exit', onExit);
|
|
95
|
+
worker.once('message', onMessage);
|
|
96
|
+
});
|
|
97
|
+
}
|
|
98
|
+
|
|
99
|
+
function releaseWorker(entry) {
|
|
100
|
+
const waiter = workerWaiters.shift();
|
|
101
|
+
if (waiter) waiter(entry);
|
|
102
|
+
else idleWorkers.push(entry);
|
|
103
|
+
}
|
|
104
|
+
|
|
105
|
+
function replenishWorker() {
|
|
106
|
+
createWorker().then(releaseWorker, error => {
|
|
107
|
+
console.error('Unable to replenish isolated request worker:', error);
|
|
108
|
+
setTimeout(replenishWorker, 100);
|
|
109
|
+
});
|
|
110
|
+
}
|
|
111
|
+
|
|
112
|
+
function retireWorker(entry) {
|
|
113
|
+
entry.worker.terminate().finally(replenishWorker);
|
|
114
|
+
}
|
|
115
|
+
|
|
116
|
+
function acquireWorker() {
|
|
117
|
+
const entry = idleWorkers.shift();
|
|
118
|
+
if (entry) return Promise.resolve(entry);
|
|
119
|
+
return new Promise(resolve => workerWaiters.push(resolve));
|
|
120
|
+
}
|
|
121
|
+
|
|
122
|
+
idleWorkers.push(...await Promise.all(Array.from({ length: workerPoolSize }, createWorker)));
|
|
123
|
+
|
|
124
|
+
const server = http.createServer(async (request, response) => {
|
|
125
|
+
let entry;
|
|
126
|
+
let upstream;
|
|
127
|
+
let settled = false;
|
|
128
|
+
let aborted = false;
|
|
129
|
+
request.once('aborted', () => {
|
|
130
|
+
aborted = true;
|
|
131
|
+
upstream?.destroy();
|
|
132
|
+
if (entry && !settled) {
|
|
133
|
+
settled = true;
|
|
134
|
+
retireWorker(entry);
|
|
135
|
+
}
|
|
136
|
+
});
|
|
137
|
+
entry = await acquireWorker();
|
|
138
|
+
if (aborted) {
|
|
139
|
+
retireWorker(entry);
|
|
140
|
+
return;
|
|
141
|
+
}
|
|
142
|
+
const { worker, port: workerPort } = entry;
|
|
143
|
+
const fail = error => {
|
|
144
|
+
if (settled) return;
|
|
145
|
+
settled = true;
|
|
146
|
+
if (!response.headersSent) response.writeHead(502);
|
|
147
|
+
response.end('Isolated component request failed');
|
|
148
|
+
console.error(error);
|
|
149
|
+
retireWorker(entry);
|
|
150
|
+
};
|
|
151
|
+
worker.once('error', fail);
|
|
152
|
+
worker.once('exit', code => {
|
|
153
|
+
if (!settled) fail(new Error(\`Request worker exited with code \${code}\`));
|
|
154
|
+
});
|
|
155
|
+
upstream = http.request({
|
|
156
|
+
hostname: '127.0.0.1',
|
|
157
|
+
port: workerPort,
|
|
158
|
+
method: request.method,
|
|
159
|
+
path: request.url,
|
|
160
|
+
headers: request.headers,
|
|
161
|
+
}, workerResponse => {
|
|
162
|
+
response.writeHead(workerResponse.statusCode ?? 500, workerResponse.headers);
|
|
163
|
+
workerResponse.pipe(response);
|
|
164
|
+
workerResponse.once('end', () => {
|
|
165
|
+
settled = true;
|
|
166
|
+
retireWorker(entry);
|
|
167
|
+
});
|
|
168
|
+
});
|
|
169
|
+
upstream.once('error', fail);
|
|
170
|
+
request.pipe(upstream);
|
|
171
|
+
});
|
|
172
|
+
let port = ${port};
|
|
173
|
+
while (true) {
|
|
174
|
+
try {
|
|
175
|
+
await new Promise((resolve, reject) => {
|
|
176
|
+
const onError = error => { server.off('listening', onListening); reject(error); };
|
|
177
|
+
const onListening = () => { server.off('error', onError); resolve(); };
|
|
178
|
+
server.once('error', onError);
|
|
179
|
+
server.once('listening', onListening);
|
|
180
|
+
server.listen(port, ${JSON.stringify(host)});
|
|
181
|
+
});
|
|
182
|
+
break;
|
|
183
|
+
} catch (error) {
|
|
184
|
+
if (${tryFindPort} && error.code === 'EADDRINUSE') { port++; continue; }
|
|
185
|
+
throw error;
|
|
186
|
+
}
|
|
187
|
+
}
|
|
188
|
+
console.error(\`Server listening @ ${host}:\${port}...\`);
|
|
189
|
+
`
|
|
190
|
+
: `
|
|
40
191
|
import { HTTPServer } from '@bytecodealliance/preview2-shim/http';
|
|
41
|
-
|
|
192
|
+
${opts.isolateRequests === "instance"
|
|
193
|
+
? `
|
|
194
|
+
import { readFileSync } from 'node:fs';
|
|
195
|
+
import { WASIShim } from '@bytecodealliance/preview2-shim/instantiation';
|
|
196
|
+
const coreModules = new Map();
|
|
197
|
+
function getCoreModule(path) {
|
|
198
|
+
let module = coreModules.get(path);
|
|
199
|
+
if (!module) {
|
|
200
|
+
module = new WebAssembly.Module(readFileSync(new URL(path, import.meta.url)));
|
|
201
|
+
coreModules.set(path, module);
|
|
202
|
+
}
|
|
203
|
+
return module;
|
|
204
|
+
}
|
|
205
|
+
`
|
|
206
|
+
: ""}
|
|
207
|
+
const server = new HTTPServer(${isolatedHandler});
|
|
42
208
|
let port = ${port};
|
|
43
209
|
${tryFindPort
|
|
44
|
-
|
|
210
|
+
? `
|
|
45
211
|
while (true) {
|
|
46
212
|
try {
|
|
47
213
|
server.listen(port, ${JSON.stringify(host)});
|
|
@@ -53,7 +219,7 @@ export async function serve(componentPath, args, opts) {
|
|
|
53
219
|
port++;
|
|
54
220
|
}
|
|
55
221
|
`
|
|
56
|
-
|
|
222
|
+
: `server.listen(port, ${JSON.stringify(host)})`}
|
|
57
223
|
console.error(\`Server listening @ ${host}:${port}...\`);
|
|
58
224
|
`);
|
|
59
225
|
}
|
|
@@ -75,6 +241,7 @@ async function runComponent(componentPath, args, opts, executor) {
|
|
|
75
241
|
tracing: opts.jcoTrace,
|
|
76
242
|
map: opts.jcoMap ? Object.fromEntries(opts.jcoMap.map((mapping) => mapping.split("="))) : undefined,
|
|
77
243
|
importBindings: opts.jcoImportBindings,
|
|
244
|
+
instantiation: opts.isolateRequests ? "sync" : undefined,
|
|
78
245
|
});
|
|
79
246
|
}
|
|
80
247
|
catch (e) {
|
|
@@ -105,14 +272,43 @@ async function runComponent(componentPath, args, opts, executor) {
|
|
|
105
272
|
}
|
|
106
273
|
const runPath = resolve(outDir, "_run.js");
|
|
107
274
|
const sandboxSetup = getSandboxSetup(opts);
|
|
108
|
-
|
|
275
|
+
if (opts.isolateRequests === "worker") {
|
|
276
|
+
await writeFile(resolve(outDir, "_serve_worker.js"), `
|
|
109
277
|
${jcoImport ? `import ${JSON.stringify(pathToFileURL(jcoImport))}` : ""}
|
|
278
|
+
import { parentPort } from 'node:worker_threads';
|
|
279
|
+
import { readFileSync } from 'node:fs';
|
|
280
|
+
import { HTTPServer } from '@bytecodealliance/preview2-shim/http';
|
|
281
|
+
import { WASIShim } from '@bytecodealliance/preview2-shim/instantiation';
|
|
282
|
+
${sandboxSetup}
|
|
283
|
+
try {
|
|
284
|
+
process.argv[1] = ${JSON.stringify(name)};
|
|
285
|
+
const mod = await import('./${name}.js');
|
|
286
|
+
const coreModules = new Map();
|
|
287
|
+
const getCoreModule = path => {
|
|
288
|
+
let module = coreModules.get(path);
|
|
289
|
+
if (!module) {
|
|
290
|
+
module = new WebAssembly.Module(readFileSync(new URL(path, import.meta.url)));
|
|
291
|
+
coreModules.set(path, module);
|
|
292
|
+
}
|
|
293
|
+
return module;
|
|
294
|
+
};
|
|
295
|
+
const instance = mod.instantiate(getCoreModule, new WASIShim().getImportObject());
|
|
296
|
+
const server = new HTTPServer(instance.incomingHandler);
|
|
297
|
+
server.listen(0, '127.0.0.1');
|
|
298
|
+
parentPort.postMessage({ port: server.address().port });
|
|
299
|
+
} catch (error) {
|
|
300
|
+
parentPort.postMessage({ error: error?.stack ?? String(error) });
|
|
301
|
+
}
|
|
302
|
+
`);
|
|
303
|
+
}
|
|
304
|
+
await writeFile(runPath, `
|
|
305
|
+
${jcoImport && opts.isolateRequests !== "worker" ? `import ${JSON.stringify(pathToFileURL(jcoImport))}` : ""}
|
|
110
306
|
import process from 'node:process';
|
|
111
307
|
${sandboxSetup}
|
|
112
308
|
try {
|
|
113
309
|
process.argv[1] = "${name}";
|
|
114
310
|
} catch {}
|
|
115
|
-
const mod = await import('./${name}.js')
|
|
311
|
+
${opts.isolateRequests === "worker" ? "" : `const mod = await import('./${name}.js');`}
|
|
116
312
|
${executor}
|
|
117
313
|
`);
|
|
118
314
|
const nodePath = process.env.JCO_RUN_PATH || process.argv[0];
|
package/dist/cmd/run.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"run.js","sourceRoot":"","sources":["../../src/cmd/run.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,EAAE,EAAE,KAAK,EAAE,SAAS,EAAE,OAAO,EAAE,MAAM,kBAAkB,CAAC;AACjE,OAAO,EAAE,QAAQ,EAAE,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AACvD,OAAO,EAAE,KAAK,EAAE,MAAM,oBAAoB,CAAC;AAC3C,OAAO,OAAO,MAAM,cAAc,CAAC;AACnC,OAAO,EAAE,aAAa,EAAE,aAAa,EAAE,MAAM,UAAU,CAAC;AAExD,OAAO,EAAE,SAAS,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AACpD,OAAO,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAC;AAE9C,MAAM,kBAAkB,GAAG,WAAW,CAAC;
|
|
1
|
+
{"version":3,"file":"run.js","sourceRoot":"","sources":["../../src/cmd/run.ts"],"names":[],"mappings":"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"}
|
package/dist/cmd/transpile.js
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
/* global Buffer */
|
|
2
2
|
import { transpile, transpileBytes } from "@bytecodealliance/jco-transpile";
|
|
3
|
-
import {
|
|
3
|
+
import { writeFiles } from "../common.js";
|
|
4
4
|
// These re-exports exist to avoid breaking backwards compatibility
|
|
5
5
|
export { types, guestTypes, typesComponent } from "./types.js";
|
|
6
6
|
/**
|
|
@@ -35,9 +35,6 @@ function prepOpts(opts, program) {
|
|
|
35
35
|
if (varIdx !== undefined && varIdx !== -1) {
|
|
36
36
|
opts.optArgs = program.parent.rawArgs.slice(varIdx + 1);
|
|
37
37
|
}
|
|
38
|
-
if (!opts.quiet) {
|
|
39
|
-
setShowSpinner(true);
|
|
40
|
-
}
|
|
41
38
|
if (opts.map) {
|
|
42
39
|
if (typeof opts.map === "string") {
|
|
43
40
|
opts.map = opts.map.split(",");
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"transpile.js","sourceRoot":"","sources":["../../src/cmd/transpile.ts"],"names":[],"mappings":"AAAA,mBAAmB;AAEnB,OAAO,EAAE,SAAS,EAAE,cAAc,EAAE,MAAM,iCAAiC,CAAC;AAE5E,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"transpile.js","sourceRoot":"","sources":["../../src/cmd/transpile.ts"],"names":[],"mappings":"AAAA,mBAAmB;AAEnB,OAAO,EAAE,SAAS,EAAE,cAAc,EAAE,MAAM,iCAAiC,CAAC;AAE5E,OAAO,EAAE,UAAU,EAAE,MAAM,cAAc,CAAC;AAsC1C,mEAAmE;AACnE,OAAO,EAAE,KAAK,EAAE,UAAU,EAAE,cAAc,EAAE,MAAM,YAAY,CAAC;AAE/D;;;;;;GAMG;AACH,MAAM,CAAC,KAAK,UAAU,YAAY,CAAC,aAAqB,EAAE,IAAmB,EAAE,OAAa;IACxF,MAAM,EAAE,KAAK,EAAE,GAAG,MAAM,SAAS,CAAC,aAAa,EAAE,QAAQ,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC,CAAC;IAC1E,MAAM,UAAU,CAAC,KAAK,EAAE,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,+BAA+B,CAAC,CAAC;AAClF,CAAC;AAED;;;;;;GAMG;AACH,MAAM,CAAC,KAAK,UAAU,kBAAkB,CAAC,SAAqB,EAAE,IAAI,GAAkB,EAAE;IACpF,OAAO,cAAc,CAAC,SAAS,EAAE,QAAQ,CAAC,IAAI,CAAC,CAI7C,CAAC;AACP,CAAC;AAED,SAAS,QAAQ,CAAC,IAAS,EAAE,OAAa;IACtC,wEAAwE;IACxE,wEAAwE;IACxE,IAAI,CAAC,aAAa,KAAK,IAAI,CAAC,aAAa,CAAC;IAE1C,8EAA8E;IAC9E,8EAA8E;IAC9E,IAAI,CAAC,wBAAwB,KAAK,IAAI,CAAC,sBAAsB,KAAK,KAAK,CAAC;IAExE,MAAM,MAAM,GAAG,OAAO,EAAE,MAAM,CAAC,OAAO,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;IACrD,IAAI,MAAM,KAAK,SAAS,IAAI,MAAM,KAAK,CAAC,CAAC,EAAE,CAAC;QACxC,IAAI,CAAC,OAAO,GAAG,OAAO,CAAC,MAAM,CAAC,OAAO,CAAC,KAAK,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC;IAC5D,CAAC;IAED,IAAI,IAAI,CAAC,GAAG,EAAE,CAAC;QACX,IAAI,OAAO,IAAI,CAAC,GAAG,KAAK,QAAQ,EAAE,CAAC;YAC/B,IAAI,CAAC,GAAG,GAAG,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;QACnC,CAAC;QACD,IAAI,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC;YAC1B,IAAI,CAAC,GAAG,GAAG,MAAM,CAAC,WAAW,CAAC,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC,CAAS,EAAE,EAAE,CAAC,CAAC,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;QAC7E,CAAC;IACL,CAAC;IAED,OAAO,IAAI,CAAC;AAChB,CAAC;AAED,gFAAgF;AAChF,IAAI,OAAO,wBAAwB,KAAK,WAAW,EAAE,CAAC;IAClD,wBAAwB,CAAC,OAAO,GAAG,CAAC,IAAI,EAAE,EAAE,CAAC,SAAS,GAAG,mBAAmB,CAAC,OAAO,IAAI,CAAC,GAAG,CAAC,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;AAChH,CAAC"}
|
package/dist/common.d.ts
CHANGED
|
@@ -5,8 +5,6 @@ export declare const ASYNC_WASI_EXPORTS: string[];
|
|
|
5
5
|
export declare const DEFAULT_ASYNC_MODE = "sync";
|
|
6
6
|
/** Path of WIT files by default when one is not specified */
|
|
7
7
|
export declare const DEFAULT_WIT_PATH = "./wit";
|
|
8
|
-
export declare function setShowSpinner(val: boolean): void;
|
|
9
|
-
export declare function getShowSpinner(): boolean;
|
|
10
8
|
export declare function sizeStr(num: number): string;
|
|
11
9
|
export declare function fixedDigitDisplay(num: number, maxChars: number): string;
|
|
12
10
|
/**
|
package/dist/common.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"common.d.ts","sourceRoot":"","sources":["../src/common.ts"],"names":[],"mappings":"AAMA,OAAO,KAAK,SAAS,MAAM,WAAW,CAAC;AAEvC,eAAO,MAAM,SAAS,SAAuB,CAAC;AAE9C,eAAO,MAAM,kBAAkB,UAS9B,CAAC;AAEF,eAAO,MAAM,kBAAkB,UAA4D,CAAC;AAE5F,eAAO,MAAM,kBAAkB,SAAS,CAAC;AAEzC,6DAA6D;AAC7D,eAAO,MAAM,gBAAgB,UAAU,CAAC;
|
|
1
|
+
{"version":3,"file":"common.d.ts","sourceRoot":"","sources":["../src/common.ts"],"names":[],"mappings":"AAMA,OAAO,KAAK,SAAS,MAAM,WAAW,CAAC;AAEvC,eAAO,MAAM,SAAS,SAAuB,CAAC;AAE9C,eAAO,MAAM,kBAAkB,UAS9B,CAAC;AAEF,eAAO,MAAM,kBAAkB,UAA4D,CAAC;AAE5F,eAAO,MAAM,kBAAkB,SAAS,CAAC;AAEzC,6DAA6D;AAC7D,eAAO,MAAM,gBAAgB,UAAU,CAAC;AAExC,wBAAgB,OAAO,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAW3C;AAED,wBAAgB,iBAAiB,CAAC,GAAG,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,GAAG,MAAM,CAcvE;AAED;;;;;;GAMG;AACH,wBAAgB,KAAK,CAAC,IAAI,EAAE,MAAM,EAAE,EAAE,EAAE,KAAK,GAAE,KAAK,CAAC,MAAM,GAAG,SAAS,CAAM,GAAG,MAAM,CAoBrF;AAED;;;;;;GAMG;AACH,wBAAsB,SAAS,IAAI,OAAO,CAAC,MAAM,CAAC,CAEjD;AAED;;;;;;GAMG;AACH,iBAAe,WAAW,CAAC,QAAQ,EAAE,MAAM,GAAG,GAAG,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC;AACpE,iBAAe,WAAW,CAAC,QAAQ,EAAE,MAAM,GAAG,GAAG,EAAE,QAAQ,EAAE,cAAc,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC;AAQ9F,OAAO,EAAE,WAAW,IAAI,QAAQ,EAAE,CAAC;AAEnC;;;;;;;;;;;;;;;GAeG;AACH,wBAAsB,UAAU,CAAC,GAAG,EAAE,MAAM,EAAE,cAAc,EAAE,UAAU,EAAE,IAAI,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,MAAM,CAAC,CAiCzG;AAED;;;;;;;;;;GAUG;AACH,wBAAsB,UAAU,CAC5B,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,UAAU,CAAC,EAC1C,YAAY,EAAE,MAAM,GAAG,KAAK,GAC7B,OAAO,CAAC,IAAI,CAAC,CAmBf;AAED;;;;;GAKG;AACH,wBAAsB,qBAAqB,CAAC,OAAO,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,CAe7E;AAED;;;;;;GAMG;AACH,wBAAgB,SAAS,CAAC,MAAM,EAAE,UAAU,CAAC,OAAO,SAAS,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,EAAE,IAAI,EAAE,MAAM,GAAG,MAAM,CAKjG"}
|
package/dist/common.js
CHANGED
|
@@ -20,15 +20,6 @@ export const ASYNC_WASI_EXPORTS = ["wasi:cli/run#run", "wasi:http/incoming-handl
|
|
|
20
20
|
export const DEFAULT_ASYNC_MODE = "sync";
|
|
21
21
|
/** Path of WIT files by default when one is not specified */
|
|
22
22
|
export const DEFAULT_WIT_PATH = "./wit";
|
|
23
|
-
let _showSpinner = false;
|
|
24
|
-
export function setShowSpinner(val) {
|
|
25
|
-
_showSpinner = val;
|
|
26
|
-
}
|
|
27
|
-
export function getShowSpinner() {
|
|
28
|
-
const showSpinner = _showSpinner;
|
|
29
|
-
_showSpinner = false;
|
|
30
|
-
return showSpinner;
|
|
31
|
-
}
|
|
32
23
|
export function sizeStr(num) {
|
|
33
24
|
num /= 1024;
|
|
34
25
|
if (num < 1000) {
|
package/dist/common.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"common.js","sourceRoot":"","sources":["../src/common.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,OAAO,EAAE,GAAG,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAC7D,OAAO,EAAE,MAAM,EAAE,MAAM,SAAS,CAAC;AACjC,OAAO,EAAE,QAAQ,EAAE,SAAS,EAAE,EAAE,EAAE,OAAO,EAAE,KAAK,EAAE,IAAI,EAAE,MAAM,kBAAkB,CAAC;AACjF,OAAO,EAAE,KAAK,EAAE,MAAM,oBAAoB,CAAC;AAC3C,OAAO,EAAE,KAAK,EAAE,MAAM,cAAc,CAAC;AACrC,OAAO,EAAE,QAAQ,EAAE,MAAM,cAAc,CAAC;AACxC,OAAO,KAAK,SAAS,MAAM,WAAW,CAAC;AAEvC,MAAM,CAAC,MAAM,SAAS,GAAG,QAAQ,KAAK,OAAO,CAAC;AAE9C,MAAM,CAAC,MAAM,kBAAkB,GAAG;IAC9B,mBAAmB;IACnB,qCAAqC;IACrC,oDAAoD;IACpD,oDAAoD;IACpD,sDAAsD;IACtD,gEAAgE;IAChE,uEAAuE;IACvE,uDAAuD;CAC1D,CAAC;AAEF,MAAM,CAAC,MAAM,kBAAkB,GAAG,CAAC,kBAAkB,EAAE,mCAAmC,CAAC,CAAC;AAE5F,MAAM,CAAC,MAAM,kBAAkB,GAAG,MAAM,CAAC;AAEzC,6DAA6D;AAC7D,MAAM,CAAC,MAAM,gBAAgB,GAAG,OAAO,CAAC;AAExC,
|
|
1
|
+
{"version":3,"file":"common.js","sourceRoot":"","sources":["../src/common.ts"],"names":[],"mappings":"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"}
|
package/dist/jco.js
CHANGED
|
@@ -13,7 +13,7 @@ program
|
|
|
13
13
|
.description(`${styleText("bold", "jco - WebAssembly JS Component Tools")}\n JS Component Transpilation Bindgen & Wasm Tools for JS`)
|
|
14
14
|
.usage("<command> [options]")
|
|
15
15
|
.enablePositionalOptions()
|
|
16
|
-
.version("1.
|
|
16
|
+
.version("1.32.1");
|
|
17
17
|
function myParseInt(value) {
|
|
18
18
|
return parseInt(value, 10);
|
|
19
19
|
}
|
|
@@ -193,6 +193,10 @@ program
|
|
|
193
193
|
.argument("<server>", "WASI server binary to run")
|
|
194
194
|
.option("--port <number>")
|
|
195
195
|
.option("--host <host>")
|
|
196
|
+
.addOption(new Option("--isolate-requests [mode]", "Isolate every request in a fresh worker or component instance")
|
|
197
|
+
.choices(["worker", "instance"])
|
|
198
|
+
.preset("worker"))
|
|
199
|
+
.option("--isolate-worker-pool-size <number>", "Number of one-shot request workers to prewarm", myParseInt, 50)
|
|
196
200
|
.option("--jco-dir <dir>", "Instead of using a temporary dir, set the output directory for the transpiled code")
|
|
197
201
|
.option("--jco-trace", "Enable call tracing")
|
|
198
202
|
.option("--jco-import <module>", "Custom module to import before the server executes to support custom environment setup")
|
|
@@ -257,7 +261,7 @@ program
|
|
|
257
261
|
.command("scaffold")
|
|
258
262
|
.description("Create a TypeScript or JavaScript WebAssembly component or host-plugin project")
|
|
259
263
|
.argument("<project-directory>", "directory to create")
|
|
260
|
-
.option("--wit <
|
|
264
|
+
.option("--wit <source>", "WIT path, builtin, wasi:package@version, or oci://registry/repository:tag")
|
|
261
265
|
.option("--world <world>", "WIT world to implement")
|
|
262
266
|
.option("--host", "scaffold a host plugin that provides the world's imports")
|
|
263
267
|
.addOption(new Option("--language <language>", "component source language")
|
package/dist/jco.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"jco.js","sourceRoot":"","sources":["../src/jco.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"jco.js","sourceRoot":"","sources":["../src/jco.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@bytecodealliance/jco",
|
|
3
|
-
"version": "1.
|
|
3
|
+
"version": "1.32.1",
|
|
4
4
|
"description": "JavaScript tooling for working with WebAssembly Components",
|
|
5
5
|
"keywords": [
|
|
6
6
|
"Component",
|
|
@@ -36,13 +36,6 @@
|
|
|
36
36
|
"type": "module",
|
|
37
37
|
"main": "dist/jco.js",
|
|
38
38
|
"types": "dist/jco.d.ts",
|
|
39
|
-
"imports": {
|
|
40
|
-
"#ora": {
|
|
41
|
-
"types": "./dist/ora-shim.d.ts",
|
|
42
|
-
"browser": "./dist/ora-shim.js",
|
|
43
|
-
"default": "ora"
|
|
44
|
-
}
|
|
45
|
-
},
|
|
46
39
|
"exports": {
|
|
47
40
|
".": {
|
|
48
41
|
"types": "./dist/api.d.ts",
|
|
@@ -57,14 +50,12 @@
|
|
|
57
50
|
"dependencies": {
|
|
58
51
|
"@bytecodealliance/componentize-js": "^0.22.0",
|
|
59
52
|
"@bytecodealliance/componentize-js-0-19-3": "npm:@bytecodealliance/componentize-js@^0.19.3",
|
|
60
|
-
"@bytecodealliance/jco-transpile": "^0.
|
|
61
|
-
"@bytecodealliance/preview2-shim": "^0.
|
|
62
|
-
"@bytecodealliance/preview3-shim": "^0.4.0",
|
|
53
|
+
"@bytecodealliance/jco-transpile": "^0.12.1",
|
|
54
|
+
"@bytecodealliance/preview2-shim": "^0.22.0",
|
|
63
55
|
"binaryen": "^130.0.0",
|
|
64
56
|
"commander": "^14",
|
|
65
57
|
"componentize-qjs": "^0.4.2",
|
|
66
58
|
"mkdirp": "^3",
|
|
67
|
-
"ora": "^8",
|
|
68
59
|
"rolldown": "^1.2.4",
|
|
69
60
|
"typescript": "7.0.2",
|
|
70
61
|
"typescript-compiler-api": "npm:typescript@6.0.3"
|
|
@@ -88,6 +79,7 @@
|
|
|
88
79
|
"build:ts": "tsc -p tsconfig.json",
|
|
89
80
|
"build:types:preview2-shim": "pnpm run build:types:preview2-shim --include-workspace-root",
|
|
90
81
|
"build:test:components": "cargo xtask build-test-components",
|
|
82
|
+
"bench:serve-isolation": "node test/bench/serve-request-isolation.js",
|
|
91
83
|
"fmt": "oxfmt",
|
|
92
84
|
"fmt:check": "oxfmt --check",
|
|
93
85
|
"lint": "oxlint",
|
package/dist/ora-shim.d.ts
DELETED
package/dist/ora-shim.d.ts.map
DELETED
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"ora-shim.d.ts","sourceRoot":"","sources":["../src/ora-shim.ts"],"names":[],"mappings":"AAAA,2BAA2B;AAC3B,MAAM,CAAC,OAAO,UAAU,GAAG,CAAC,QAAQ,CAAC,EAAE,OAAO,OAE7C;AAED,cAAM,GAAG;IACL,IAAI,SAAM;IACV,KAAK,SAAK;IACV,IAAI,SAAK;CACZ"}
|
package/dist/ora-shim.js
DELETED
package/dist/ora-shim.js.map
DELETED
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"ora-shim.js","sourceRoot":"","sources":["../src/ora-shim.ts"],"names":[],"mappings":"AAAA,2BAA2B;AAC3B,MAAM,CAAC,OAAO,UAAU,GAAG,CAAC,QAAkB;IAC1C,OAAO,IAAI,GAAG,EAAE,CAAC;AACrB,CAAC;AAED,MAAM,GAAG;IACL,IAAI,GAAG,EAAE,CAAC;IACV,KAAK,KAAI,CAAC;IACV,IAAI,KAAI,CAAC;CACZ"}
|