replace predefined globals with global()

Author: arcticnotes

README.md

@@ -18,10 +18,10 @@ In JavaScript code:
 ```javascript
 import {WindowsScriptingHost} from '@arcticnotes/node-wsh';
 
-const wsh = await WindowsScriptingHost.connect();
-const WScript = wsh.WScript;
+const WSH = await WindowsScriptingHost.connect();
+const WScript = WSH.global( 'WScript');
 console.log(WScript.Version);
-await wsh.disconnect();
+await WSH.disconnect();
 ```
 
 ## Dependencies

lib/node/node-wsh.js

@@ -5,7 +5,6 @@ import { Syncline} from "@arcticnotes/syncline";
 const COMMAND = 'cscript.exe';
 const ARGS = [ '//E:jscript', '//NoLogo'];
 const SCRIPT_FILE = PATH.join( PATH.dirname( import.meta.dirname), 'wsh', 'host.js');
-const TRACE_REF = 1;
 
 export class WindowsScriptingHost extends EventEmitter {
 
@@ -14,11 +13,10 @@ export class WindowsScriptingHost extends EventEmitter {
 		const args = options.args || ARGS;
 		const scriptFile = options.scriptFile || SCRIPT_FILE;
 		const trace = options.trace || 0;
-		return new WindowsScriptingHost( await Syncline.spawn( command, [ ...args, scriptFile], { trace}), options);
+		return new WindowsScriptingHost( await Syncline.spawn( command, [ ...args, scriptFile], { trace}));
 	}
 
 	#syncline;
-	#trace;
 	#finalizer = new FinalizationRegistry( this.#finalized.bind( this));
 	#ref2proxy = new Map();
 	#proxy2ref = new WeakMap();
@@ -87,19 +85,11 @@ export class WindowsScriptingHost extends EventEmitter {
 		},
 	};
 
-	#WScript;
-	#GetObject;
-	#Enumerator;
-
-	constructor( syncline, options) {
+	constructor( syncline) {
 		super();
 		this.#syncline = syncline;
 		this.#syncline.on( 'stderr', line => console.log( 'wsh:', line));
 		this.#syncline.on( 'stdout', line => console.log( 'wsh:', line));
-		this.#trace = options.trace;
-		this.#WScript = this.#getOrCreateObject( 0);
-		this.#GetObject = this.#getOrCreateFunction( 1);
-		this.#Enumerator = this.#getOrCreateFunction( 2);
 	}
 
 	get remoteObjects() {
@@ -111,16 +101,13 @@ export class WindowsScriptingHost extends EventEmitter {
 		};
 	}
 
-	get WScript() {
-		return this.#WScript;
-	}
-
-	get GetObject() {
-		return this.#GetObject;
-	}
-
-	get Enumerator() {
-		return this.#Enumerator;
+	global( name) {
+		const output = JSON.parse( this.#syncline.exchange( JSON.stringify( [ 'global', name])));
+		switch( output[ 0]) {
+			case 'value': return this.#decode( output[ 1]);
+			case 'error': throw new Error( output[ 1]);
+			default: throw new Error( `unknown status: ${ output[ 0]}`);
+		}
 	}
 
 	async disconnect() {
@@ -155,17 +142,6 @@ export class WindowsScriptingHost extends EventEmitter {
 		if( this.#ref2proxy.get( ref).deref() === undefined) // otherwise, it's overwritten by a refreshed proxy
 			this.#ref2proxy.delete( ref);
 		const output = this.#syncline.exchange( JSON.stringify( [ 'unref', ref]));
-		if( this.#trace >= TRACE_REF)
-			switch( output[ 0]) {
-				case 'error':
-					console.log( `failed to unref: ${ ref}`);
-					break;
-				case 'done':
-					console.log( `unreferenced: ${ ref}`);
-					break;
-				default:
-					console.log( `unknown response: ${ output[ 0]}`);
-			}
 		this.emit( 'unref', ref);
 	}
 

lib/wsh/host.js

@@ -2,12 +2,9 @@
 
 var FSO = new ActiveXObject( 'Scripting.FileSystemObject');
 var OBJECT_TOSTRING = Object.toString();
-var REFERENCES = { // must match node-wsh.js
-	'0': { type: 'obj', value: WScript},
-	'1': { type: 'fun', value: GetObject},
-	'2': { type: 'fun', value: Enumerator}
-};
-var nextRefId = 3;
+var GLOBAL = this;
+var REFERENCES = {}
+var nextRefId = 0;
 
 eval( FSO.OpenTextFile( FSO.BuildPath( FSO.GetParentFolderName( WScript.ScriptFullName), 'json2.js')).ReadAll());
 
@@ -145,6 +142,9 @@ function decodePotentialMethod( encoded) {
 		try {
 			input = JSON.parse( WScript.StdIn.ReadLine());
 			switch( input[ 0]) {
+				case 'global': // [ 'global', name] => [ 'value', value]
+					output = [ 'value', encode( GLOBAL[ input[ 1]])];
+					break;
 				case 'unref': // [ 'unref', ref] => [ 'done']
 					if( REFERENCES[ input[ 1]] === undefined)
 						throw new Error( 'unknown ref: ' + input[ 1]);

test/test.js

@@ -7,7 +7,9 @@ TEST( 'smoke-test', async() => {
 	wsh.on( 'ref', ( ref, obj) => console.log( 'ref', ref, obj));
 	wsh.on( 'unref', ref => console.log( 'unref', ref));
 	try {
-		const { WScript, GetObject, Enumerator} = wsh;
+		const WScript = wsh.global( 'WScript');
+		const GetObject = wsh.global( 'GetObject');
+		const Enumerator = wsh.global( 'Enumerator');
 		console.log( WScript.Version);
 		ASSERT.equal( typeof WScript.Version, 'string');
 		const procs = GetObject( "winmgmts:\\\\.\\root\\cimv2").ExecQuery( 'SELECT ProcessId, Name FROM Win32_Process');