fix: update quickjs-wasi to v2.2.0 APIs (#409)

* fix: update quickjs-wasi to v2.2.0 APIs

* fix: remove invalid argument from QuickJS dispose() calls

quickjs-wasi v2.2.0's dispose() takes no arguments. The previous
boolean parameter was from an older API version.

* chore: add changeset for quickjs-wasi v2.2.0 update

---------

Co-authored-by: clutz-bot[bot] <clutz-bot[bot]@users.noreply.github.com>

Author: TooTallNate

.changeset/fair-emus-chew.md

@@ -0,0 +1,7 @@
+---
+'degenerator': patch
+'pac-proxy-agent': patch
+'pac-resolver': patch
+---
+
+Update QuickJS integration for `quickjs-wasi` v2.2.0. This removes deprecated `unwrapResult()` / `dispose(false)` usage and avoids duplicate sandbox host callback registration when recompiling PAC resolvers.

packages/degenerator/src/compile.ts

@@ -10,6 +10,8 @@ export interface CompileOptions {
 	sandbox?: Context;
 }
 
+const SANDBOX_FUNCTION_PREFIX = '__degeneratorSandboxFunction:';
+
 export function compile<R = unknown, A extends unknown[] = []>(
 	vm: QuickJS,
 	code: string,
@@ -26,17 +28,12 @@ export function compile<R = unknown, A extends unknown[] = []>(
 					`Expected a "function" for sandbox property \`${name}\`, but got "${typeof value}"`
 				);
 			}
-			const fnHandle = vm.newFunction(name, (_this, ...args) => {
-				const result = value(...args.map((arg) => vm.dump(arg)));
-				vm.executePendingJobs();
-				return hostToQuickJSHandle(vm, result);
-			});
+			const fnHandle = getOrCreateSandboxFunction(vm, name, value);
 			fnHandle.consume((handle) => vm.setProp(vm.global, name, handle));
 		}
 	}
 
-	const fnResult = vm.evalCode(`${compiled};${returnName}`, options.filename);
-	const fn = vm.unwrapResult(fnResult);
+	const fn = vm.evalCode(`${compiled};${returnName}`, options.filename);
 
 	const t = vm.typeof(fn);
 	if (t !== 'function') {
@@ -53,7 +50,7 @@ export function compile<R = unknown, A extends unknown[] = []>(
 				vm.undefined,
 				...args.map((arg) => hostToQuickJSHandle(vm, arg))
 			);
-			promiseHandle = vm.unwrapResult(result);
+			promiseHandle = result;
 			const resolvedResultP = vm.resolvePromise(promiseHandle);
 			vm.executePendingJobs();
 			const resolvedResult = await resolvedResultP;
@@ -102,6 +99,41 @@ export function compile<R = unknown, A extends unknown[] = []>(
 	return r;
 }
 
+function getOrCreateSandboxFunction(
+	vm: QuickJS,
+	name: string,
+	value: (...args: unknown[]) => unknown
+): JSValueHandle {
+	const callback = (...args: JSValueHandle[]) => {
+		const result = value(...args.map((arg) => vm.dump(arg)));
+		vm.executePendingJobs();
+		return hostToQuickJSHandle(vm, result);
+	};
+
+	const globalFunctionName = `${SANDBOX_FUNCTION_PREFIX}${name}`;
+	const keyHandle = vm.newString(globalFunctionName);
+	let existingHandle: JSValueHandle | undefined;
+	try {
+		existingHandle = vm.getProp(vm.global, keyHandle);
+		if (vm.typeof(existingHandle) === 'function') {
+			vm.registerHostCallback(name, callback);
+			return existingHandle;
+		}
+		existingHandle.dispose();
+		existingHandle = undefined;
+
+		const fnHandle = vm.newFunction(name, callback);
+		vm.defineProp(vm.global, globalFunctionName, fnHandle, {
+			writable: false,
+			enumerable: false,
+			configurable: false,
+		});
+		return fnHandle;
+	} finally {
+		keyHandle.dispose();
+	}
+}
+
 function hostToQuickJSHandle(vm: QuickJS, val: unknown): JSValueHandle {
 	if (typeof val === 'undefined') {
 		return vm.undefined;

packages/degenerator/test/test.ts

@@ -72,7 +72,7 @@ describe('degenerator()', () => {
 		});
 
 		afterAll(() => {
-			qjs?.dispose(false);
+			qjs?.dispose();
 		});
 
 		it('should compile code into an invocable async function', async () => {

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

@@ -147,13 +147,13 @@ export class PacProxyAgent<Uri extends string> extends Agent {
 					'Same sha1 hash for code - contents have not changed, reusing previous proxy resolver'
 				);
 				// Dispose the newly created VM since we're reusing the old resolver
-				qjs.dispose(false);
+				qjs.dispose();
 				return this.resolver;
 			}
 
 			// Dispose the previous VM before creating a new resolver
 			if (this.qjs) {
-				this.qjs.dispose(false);
+				this.qjs.dispose();
 			}
 			this.qjs = qjs;
 

packages/pac-resolver/test/test.ts

@@ -14,7 +14,7 @@ describe('FindProxyForURL', () => {
 	});
 
 	afterAll(() => {
-		qjs?.dispose(false);
+		qjs?.dispose();
 	});
 
 	it('should return `undefined` by default', async () => {

pnpm-lock.yaml

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