Replace @tootallnate/quickjs-emscripten with quickjs-wasi

Migrate degenerator, pac-resolver, and pac-proxy-agent from
@tootallnate/quickjs-emscripten to quickjs-wasi, a lighter-weight
QuickJS WASM runtime built on quickjs-ng with WASI reactor mode.

Key changes:
- degenerator: compile() now takes a QuickJS instance directly instead
  of QuickJSWASMModule (no more qjs.newContext() — the QuickJS instance
  IS the context). Host callbacks receive _this as first arg.
  resolvePromise() returns {value}|{error} instead of VmCallResult.
  Promise bridging calls executePendingJobs() after resolve/reject.
- pac-resolver: createPacResolver() takes QuickJS instead of
  QuickJSWASMModule. Updated workspace dependency on degenerator.
- pac-proxy-agent: QuickJS.create() replaces getQuickJS(). quickjs-wasi
  is now a runtime dependency (replaces @tootallnate/quickjs-emscripten).
  Updated workspace dependency on pac-resolver.
- Tests: Updated error message assertion for quickjs-ng which formats
  'process is not defined' without quotes around the identifier.

Author: TooTallNate

packages/degenerator/package.json

@@ -34,10 +34,10 @@
     "esprima": "^4.0.1"
   },
   "devDependencies": {
-    "@tootallnate/quickjs-emscripten": "catalog:",
     "@types/escodegen": "^0.0.7",
     "@types/esprima": "^4.0.3",
     "@types/node": "catalog:",
+    "quickjs-wasi": "catalog:",
     "tsconfig": "workspace:*",
     "typescript": "catalog:"
   }

packages/degenerator/src/compile.ts

@@ -1,11 +1,7 @@
 import { types } from 'util';
 import { degenerator } from './degenerator.js';
 import type { Context } from 'vm';
-import type {
-	QuickJSContext,
-	QuickJSHandle,
-	QuickJSWASMModule,
-} from '@tootallnate/quickjs-emscripten';
+import type { QuickJS, JSValueHandle } from 'quickjs-wasi';
 import type { DegeneratorNames } from './degenerator.js';
 
 export interface CompileOptions {
@@ -15,15 +11,13 @@ export interface CompileOptions {
 }
 
 export function compile<R = unknown, A extends unknown[] = []>(
-	qjs: QuickJSWASMModule,
+	vm: QuickJS,
 	code: string,
 	returnName: string,
 	options: CompileOptions = {}
 ): (...args: A) => Promise<R> {
 	const compiled = degenerator(code, options.names ?? []);
 
-	const vm = qjs.newContext();
-
 	// Add functions to global
 	if (options.sandbox) {
 		for (const [name, value] of Object.entries(options.sandbox)) {
@@ -32,11 +26,11 @@ export function compile<R = unknown, A extends unknown[] = []>(
 					`Expected a "function" for sandbox property \`${name}\`, but got "${typeof value}"`
 				);
 			}
-			const fnHandle = vm.newFunction(name, (...args) => {
+			const fnHandle = vm.newFunction(name, (_this, ...args) => {
 				const result = value(
-					...args.map((arg) => quickJSHandleToHost(vm, arg))
+					...args.map((arg) => vm.dump(arg))
 				);
-				vm.runtime.executePendingJobs();
+				vm.executePendingJobs();
 				return hostToQuickJSHandle(vm, result);
 			});
 			fnHandle.consume((handle) => vm.setProp(vm.global, name, handle));
@@ -53,8 +47,8 @@ export function compile<R = unknown, A extends unknown[] = []>(
 		);
 	}
 	const r = async function (...args: A): Promise<R> {
-		let promiseHandle: QuickJSHandle | undefined;
-		let resolvedHandle: QuickJSHandle | undefined;
+		let promiseHandle: JSValueHandle | undefined;
+		let resolvedHandle: JSValueHandle | undefined;
 		try {
 			const result = vm.callFunction(
 				fn,
@@ -63,10 +57,23 @@ export function compile<R = unknown, A extends unknown[] = []>(
 			);
 			promiseHandle = vm.unwrapResult(result);
 			const resolvedResultP = vm.resolvePromise(promiseHandle);
-			vm.runtime.executePendingJobs();
+			vm.executePendingJobs();
 			const resolvedResult = await resolvedResultP;
-			resolvedHandle = vm.unwrapResult(resolvedResult);
-			return quickJSHandleToHost(vm, resolvedHandle);
+			if ('error' in resolvedResult) {
+				const dumped = vm.dump(resolvedResult.error);
+				resolvedResult.error.dispose();
+				if (dumped instanceof Error) {
+					// QuickJS Error `stack` does not include the name +
+					// message, so patch those in to behave more like V8
+					if (dumped.stack && !dumped.stack.startsWith(dumped.name)) {
+						dumped.stack = `${dumped.name}: ${dumped.message}\n${dumped.stack}`;
+					}
+					throw dumped;
+				}
+				throw new Error(String(dumped));
+			}
+			resolvedHandle = resolvedResult.value;
+			return vm.dump(resolvedHandle) as R;
 		} catch (err: unknown) {
 			if (err && typeof err === 'object' && 'cause' in err && err.cause) {
 				if (
@@ -97,11 +104,7 @@ export function compile<R = unknown, A extends unknown[] = []>(
 	return r;
 }
 
-function quickJSHandleToHost(vm: QuickJSContext, val: QuickJSHandle) {
-	return vm.dump(val);
-}
-
-function hostToQuickJSHandle(vm: QuickJSContext, val: unknown): QuickJSHandle {
+function hostToQuickJSHandle(vm: QuickJS, val: unknown): JSValueHandle {
 	if (typeof val === 'undefined') {
 		return vm.undefined;
 	} else if (val === null) {
@@ -116,13 +119,14 @@ function hostToQuickJSHandle(vm: QuickJSContext, val: unknown): QuickJSHandle {
 		return val ? vm.true : vm.false;
 	} else if (types.isPromise(val)) {
 		const promise = vm.newPromise();
-		promise.settled.then(vm.runtime.executePendingJobs);
 		val.then(
 			(r: unknown) => {
 				promise.resolve(hostToQuickJSHandle(vm, r));
+				vm.executePendingJobs();
 			},
 			(err: unknown) => {
 				promise.reject(hostToQuickJSHandle(vm, err));
+				vm.executePendingJobs();
 			}
 		);
 		return promise.handle;

packages/degenerator/test/test.ts

@@ -2,10 +2,7 @@ import fs from 'fs';
 import path from 'path';
 import assert from 'assert';
 import { degenerator, compile } from '../src';
-import {
-	getQuickJS,
-	type QuickJSWASMModule,
-} from '@tootallnate/quickjs-emscripten';
+import { QuickJS } from 'quickjs-wasi';
 
 describe('degenerator()', () => {
 	it('should support "async" output functions', () => {
@@ -68,10 +65,14 @@ describe('degenerator()', () => {
 	});
 
 	describe('`compile()`', () => {
-		let qjs: QuickJSWASMModule;
+		let qjs: QuickJS;
 
 		beforeAll(async () => {
-			qjs = await getQuickJS();
+			qjs = await QuickJS.create();
+		});
+
+		afterAll(() => {
+			qjs?.dispose(false);
 		});
 
 		it('should compile code into an invocable async function', async () => {
@@ -173,7 +174,7 @@ describe('degenerator()', () => {
 				err = _err as Error;
 			}
 			assert(err);
-			assert.equal(err.message, "'process' is not defined");
+			assert(err.message.includes('process is not defined'));
 		});
 		it('should allow to return synchronous undefined', async () => {
 			function u() {

packages/pac-proxy-agent/package.json

@@ -36,13 +36,13 @@
   "author": "Nathan Rajlich <[email protected]> (http://n8.io/)",
   "license": "MIT",
   "dependencies": {
-    "@tootallnate/quickjs-emscripten": "catalog:",
     "agent-base": "workspace:*",
     "debug": "catalog:",
     "get-uri": "workspace:*",
     "http-proxy-agent": "workspace:*",
     "https-proxy-agent": "workspace:*",
     "pac-resolver": "workspace:*",
+    "quickjs-wasi": "catalog:",
     "socks-proxy-agent": "workspace:*"
   },
   "devDependencies": {

packages/pac-proxy-agent/src/index.ts

@@ -20,7 +20,7 @@ import {
 	FindProxyForURL,
 	PacResolverOptions,
 } from 'pac-resolver';
-import { getQuickJS } from '@tootallnate/quickjs-emscripten';
+import { QuickJS } from 'quickjs-wasi';
 
 const debug = createDebug('pac-proxy-agent');
 
@@ -134,7 +134,7 @@ export class PacProxyAgent<Uri extends string> extends Agent {
 		try {
 			// (Re)load the contents of the PAC file URI
 			const [qjs, code] = await Promise.all([
-				getQuickJS(),
+				QuickJS.create(),
 				this.loadPacFile(),
 			]);
 

packages/pac-resolver/package.json

@@ -17,9 +17,9 @@
     "netmask": "^2.0.2"
   },
   "devDependencies": {
-    "@tootallnate/quickjs-emscripten": "catalog:",
     "@types/netmask": "^1.0.30",
     "@types/node": "catalog:",
+    "quickjs-wasi": "catalog:",
     "tsconfig": "workspace:*",
     "typescript": "catalog:"
   },

packages/pac-resolver/src/index.ts

@@ -16,14 +16,14 @@ import myIpAddress from './myIpAddress.js';
 import shExpMatch from './shExpMatch.js';
 import timeRange from './timeRange.js';
 import weekdayRange from './weekdayRange.js';
-import type { QuickJSWASMModule } from '@tootallnate/quickjs-emscripten';
+import type { QuickJS } from 'quickjs-wasi';
 
 /**
  * Returns an asynchronous `FindProxyForURL()` function
  * from the given JS string (from a PAC file).
  */
 export function createPacResolver(
-	qjs: QuickJSWASMModule,
+	qjs: QuickJS,
 	_str: string | Buffer,
 	_opts: PacResolverOptions = {}
 ) {

packages/pac-resolver/test/test.ts

@@ -2,18 +2,19 @@ import assert from 'assert';
 import { resolve } from 'path';
 import { readFileSync } from 'fs';
 import { createPacResolver } from '../src';
-import {
-	getQuickJS,
-	type QuickJSWASMModule,
-} from '@tootallnate/quickjs-emscripten';
+import { QuickJS } from 'quickjs-wasi';
 
 type FindProxyForURLFn = ReturnType<typeof createPacResolver>;
 
 describe('FindProxyForURL', () => {
-	let qjs: QuickJSWASMModule;
+	let qjs: QuickJS;
 
 	beforeAll(async () => {
-		qjs = await getQuickJS();
+		qjs = await QuickJS.create();
+	});
+
+	afterAll(() => {
+		qjs?.dispose(false);
 	});
 
 	it('should return `undefined` by default', async () => {
@@ -73,7 +74,7 @@ describe('FindProxyForURL', () => {
 			err = _err as Error;
 		}
 		assert(err);
-		expect(err.message).toEqual("'process' is not defined");
+		expect(err.message).toContain('process is not defined');
 	});
 
 	describe('official docs Example #1', () => {

pnpm-lock.yaml

@@ -3,7 +3,7 @@ packages:
   - 'packages/*'
 
 catalog:
-  '@tootallnate/quickjs-emscripten': ^0.23.0
+  quickjs-wasi: ^0.0.1
   '@types/async-retry': ^1.4.5
   '@types/debug': ^4.1.7
   '@types/node': ^22.13.0