@arcticnotes/node-wsh 0.0.7 → 0.0.9

package/lib/node/node-wsh.js

@@ -1,3 +1,4 @@
+import EventEmitter from 'node:events';
 import PATH from 'node:path';
 import { Syncline} from "@arcticnotes/syncline";
 
@@ -7,7 +8,7 @@ const SCRIPT_FILE = PATH.join( PATH.dirname( import.meta.dirname), 'wsh', 'host.
 const PROXY = Symbol();
 const TRACE_REF = 1;
 
-export class WindowsScriptingHost {
+export class WindowsScriptingHost extends EventEmitter {
 
 	static async connect( options = {}) {
 		const command = options.command || COMMAND;
@@ -24,15 +25,25 @@ export class WindowsScriptingHost {
 	#Enumerator;
 
 	constructor( syncline, options) {
+		super();
 		this.#syncline = syncline;
 		this.#syncline.on( 'stderr', line => console.log( 'wsh:', line));
 		this.#syncline.on( 'stdout', line => console.log( 'wsh:', line));
-		this.#proxies = new Proxies( syncline, options);
+		this.#proxies = new Proxies( syncline, options, this);
 		this.#WScript = this.#proxies.getOrCreateObject( 0);
 		this.#GetObject = this.#proxies.getOrCreateFunction( 1);
 		this.#Enumerator = this.#proxies.getOrCreateFunction( 2);
 	}
 
+	get remoteObjects() {
+		const proxies = this.#proxies;
+		return {
+			get count() {
+				return proxies.count;
+			},
+		};
+	}
+
 	get WScript() {
 		return this.#WScript;
 	}
@@ -54,6 +65,7 @@ class Proxies {
 
 	#syncline;
 	#trace;
+	#eventEmitter;
 	#finalizer = new FinalizationRegistry( this.#finalized.bind( this));
 	#ref2proxy = new Map();
 	#proxy2ref = new Map();
@@ -74,6 +86,18 @@ class Proxies {
 				default: throw new Error( `unknown status: ${ output[ 0]}`);
 			}
 		},
+
+		set( target, prop, value) {
+			const encodedTarget = this.proxies.#encode( target[ PROXY]);
+			const encodedProp = this.proxies.#encode( prop);
+			const encodedValue = this.proxies.#encode( value);
+			const output = JSON.parse( this.proxies.#syncline.exchange( JSON.stringify( [ 'set', encodedTarget, encodedProp, encodedValue])));
+			switch( output[ 0]) {
+				case 'set': return;
+				case 'error': throw new Error( output[ 1]);
+				default: throw new Error( `unknown status: ${ output[ 0]}`);
+			}
+		},
 	};
 
 	#functionHandler = {
@@ -110,9 +134,14 @@ class Proxies {
 		},
 	};
 
-	constructor( syncline, options) {
+	constructor( syncline, options, eventEmitter) {
 		this.#syncline = syncline;
 		this.#trace = options.trace;
+		this.#eventEmitter = eventEmitter;
+	}
+
+	get count() {
+		return this.#ref2proxy.size;
 	}
 
 	getOrCreateObject( ref) {
@@ -134,6 +163,7 @@ class Proxies {
 		this.#ref2proxy.set( ref, newProxy);
 		this.#proxy2ref.set( newProxy, ref);
 		this.#finalizer.register( newProxy, ref);
+		this.#eventEmitter.emit( 'ref', ref, newProxy);
 		return newProxy;
 	}
 
@@ -150,6 +180,7 @@ class Proxies {
 				default:
 					console.log( `unknown response: ${ output[ 0]}`);
 			}
+		this.#eventEmitter.emit( 'unref', ref);
 	}
 
 	#encode( decoded) {

package/lib/wsh/host.js

@@ -138,6 +138,7 @@ function decodePotentialMethod( encoded) {
 	var output;
 	var target;
 	var prop;
+	var value;
 	var thisArg;
 	var args;
 	while( !WScript.StdIn.AtEndOfLine)
@@ -162,6 +163,13 @@ function decodePotentialMethod( encoded) {
 						output = [ 'value', encodePotentialMethod( target, prop)];
 					}
 					break;
+				case 'set': // [ 'set', target, prop, value] => [ 'set']
+					target = decode( input[ 1]);
+					prop = decode( input[ 2]);
+					value = decode( input[ 3]);
+					target[ prop] = value;
+					output = [ 'set'];
+					break;
 				case 'apply': // [ 'apply', target, thisArg, argumentList] => [ 'value', value]
 					target = decodePotentialMethod( input[ 1]);
 					thisArg = decode( input[ 2]);

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@arcticnotes/node-wsh",
-	"version": "0.0.7",
+	"version": "0.0.9",
 	"description": "A Node.js package that runs Windows Scripting Host (WSH) as a child process and exposes the resources from the WSH world to the Node.js world",
 	"author": "Paul <paul@arcticnotes.com>",
 	"license": "MIT",
@@ -22,5 +22,8 @@
 	},
 	"dependencies": {
 		"@arcticnotes/syncline": "0.0.3"
-	}
+	},
+	"files": [
+		"/lib/"
+	]
 }

package/test/test.js

@@ -1,20 +0,0 @@
-import ASSERT from 'node:assert/strict';
-import TEST from 'node:test';
-import { WindowsScriptingHost} from '@arcticnotes/node-wsh';
-
-TEST( 'smoke-test', async() => {
-	const wsh = await WindowsScriptingHost.connect();
-	try {
-		const { WScript, GetObject, Enumerator} = wsh;
-		console.log( WScript.Version);
-		ASSERT.equal( typeof WScript.Version, 'string');
-		const procs = GetObject( "winmgmts:\\\\.\\root\\cimv2").ExecQuery( 'SELECT ProcessId, Name FROM Win32_Process');
-		for( const enumerator = new Enumerator( procs); !enumerator.atEnd(); enumerator.moveNext()) {
-			console.log( `${ enumerator.item().ProcessId}: ${ enumerator.item().Name}`);
-			ASSERT.equal( typeof enumerator.item().ProcessId, 'number');
-			ASSERT.equal( typeof enumerator.item().Name, 'string');
-		}
-	} finally {
-		await wsh.disconnect();
-	}
-});