expose newProxy() on RemoteObject

Author: arcticnotes

lib/node/node-wsh.js

@@ -21,12 +21,6 @@ export class WindowsScriptingHost extends EventEmitter {
 	#finalizer = new FinalizationRegistry( this.#finalized.bind( this));
 	#ref2proxy = new Map(); // Map< string, WeakRef< Proxy | <custom-mapped>>>
 	#proxy2ref = new WeakMap(); // Map< Proxy | <custom-mapped>, string>
-	#handler = {
-		get: ( ticket, prop) => ticket.get( prop, undefined),
-		set: ( ticket, prop, value) => ticket.set( prop, value),
-		apply: ( ticket, thisArg, argumentsList) => ticket.apply( thisArg, argumentsList, undefined),
-		construct: ( ticket, argumentsList) => ticket.construct( argumentsList, undefined),
-	};
 
 	constructor( syncline) {
 		super();
@@ -139,11 +133,9 @@ export class WindowsScriptingHost extends EventEmitter {
 		if( existingProxy)
 			return existingProxy;
 
-		const ticket = new RemoteObject( this.#syncline, { encode: this.#encode.bind( this), decode: this.#decode.bind( this)}, ref);
-		const newProxy = mapper? mapper( ticket): new Proxy( ticket, this.#handler);
+		const newProxy = new RemoteObject( this.#syncline, this.#encode.bind( this), this.#decode.bind( this), ref, mapper).proxy;
 		if( this.#proxy2ref.has( newProxy)) // sanity check, doesn't catch all misbehaving mappers
 			throw new Error( `mapper must return new objects: ${ newProxy}`);
-		ticket.setProxy( newProxy);
 		this.#ref2proxy.set( ref, new WeakRef( newProxy)); // may be overwriting a dead WeakRef
 		this.#proxy2ref.set( newProxy, ref);
 		this.#finalizer.register( newProxy, ref);
@@ -162,39 +154,53 @@ export class WindowsScriptingHost extends EventEmitter {
 
 class RemoteObject extends Function {
 
+	static #handler = {
+		get: ( ticket, prop) => ticket.get( prop, undefined),
+		set: ( ticket, prop, value) => ticket.set( prop, value),
+		apply: ( ticket, thisArg, argumentsList) => ticket.apply( thisArg, argumentsList, undefined),
+		construct: ( ticket, argumentsList) => ticket.construct( argumentsList, undefined),
+	};
+
 	#syncline;
-	#codec;
+	#encode;
+	#decode;
 	#ref;
 	#proxy;
 
-	constructor( syncline, codec, ref) {
+	constructor( syncline, encode, decode, ref, mapper) {
 		super();
 		this.#syncline = syncline;
-		this.#codec = codec;
+		this.#encode = encode;
+		this.#decode = decode;
 		this.#ref = ref;
+		this.#proxy = mapper? mapper( this): this.newProxy();
+	}
+
+	get proxy() {
+		return this.#proxy;
 	}
 
-	setProxy( proxy) {
-		this.#proxy = proxy;
+	newProxy() {
+		return new Proxy( this, RemoteObject.#handler);
 	}
 
 	get( prop, mapper) {
 		if( prop === Symbol.toPrimitive)
 			return () => `ref#${ this.#ref}`; 
-		const encodedTarget = this.#codec.encode( this.#proxy);
-		const encodedProp = this.#codec.encode( prop);
+		const encodedTarget = this.#encode( this.#proxy);
+		const encodedProp = this.#encode( prop);
 		const output = JSON.parse( this.#syncline.exchange( JSON.stringify( [ 'get', encodedTarget, encodedProp])));
 		switch( output[ 0]) {
-			case 'value': return this.#codec.decode( output[ 1], mapper);
+			case 'value': return this.#decode( output[ 1], mapper);
 			case 'error': throw new Error( output[ 1]);
 			default: throw new Error( `unknown status: ${ output[ 0]}`);
 		}
 	}
 
 	set( prop, value) {
-		const encodedTarget = this.#codec.encode( this.#proxy);
-		const encodedProp = this.#codec.encode( prop);
-		const encodedValue = this.#codec.encode( value);
+		const encodedTarget = this.#encode( this.#proxy);
+		const encodedProp = this.#encode( prop);
+		const encodedValue = this.#encode( value);
 		const output = JSON.parse( this.#syncline.exchange( JSON.stringify( [ 'set', encodedTarget, encodedProp, encodedValue])));
 		switch( output[ 0]) {
 			case 'set': return true;
@@ -204,23 +210,23 @@ class RemoteObject extends Function {
 	}
 
 	apply( thisArg, argumentsList, mapper) {
-		const encodedTarget = this.#codec.encode( this.#proxy);
-		const encodedThisArg = this.#codec.encode( thisArg);
-		const encodedArgumentList = this.#codec.encode( [ ...argumentsList]); // argumentsList may not be instanceof Array
+		const encodedTarget = this.#encode( this.#proxy);
+		const encodedThisArg = this.#encode( thisArg);
+		const encodedArgumentList = this.#encode( [ ...argumentsList]); // argumentsList may not be instanceof Array
 		const output = JSON.parse( this.#syncline.exchange( JSON.stringify( [ 'apply', encodedTarget, encodedThisArg, encodedArgumentList])));
 		switch( output[ 0]) {
-			case 'value': return this.#codec.decode( output[ 1], mapper);
+			case 'value': return this.#decode( output[ 1], mapper);
 			case 'error': throw new Error( output[ 1]);
 			default: throw new Error( `unknown status: ${ output[ 0]}`);
 		}
 	}
 
 	construct( argumentsList, mapper) {
-		const encodedTarget = this.#codec.encode( this.#proxy);
-		const encodedArgumentList = this.#codec.encode( [ ...argumentsList]); // argumentsList may not be instanceof Array
+		const encodedTarget = this.#encode( this.#proxy);
+		const encodedArgumentList = this.#encode( [ ...argumentsList]); // argumentsList may not be instanceof Array
 		const output = JSON.parse( this.#syncline.exchange( JSON.stringify( [ 'construct', encodedTarget, encodedArgumentList])));
 		switch( output[ 0]) {
-			case 'value': return this.#codec.decode( output[ 1], mapper);
+			case 'value': return this.#decode( output[ 1], mapper);
 			case 'error': throw new Error( output[ 1]);
 			default: throw new Error( `unknown status: ${ output[ 0]}`);
 		}