my_wins 1.1.6 → 1.2.2

package/lib/index.js

@@ -22,8 +22,8 @@ function makeWinsArray(settings, ) {
 
 	const wy_step = Math.round(	screenHeight*1.0/wy_total);
 	const wx_step = Math.round(screenWidth*1.0/wx_total);
-	for(let wx = 0; wx<wx_total;wx++ ) {
-		for(let wy = 0; wy<wy_total;wy++ ) {
+	for(let wy = 0; wy<wy_total;wy++ ) {
+		for(let wx = 0; wx<wx_total;wx++ ) {
 			const nx = (x||0)+wx_step*wx;
 			const ny = (y||0)+wy_step*wy;
 			winsArray.push({x:nx,y:ny, width:wx_step-1, height:wy_step-1});
@@ -66,6 +66,7 @@ module.exports.run = async ()=>{
 				baz:{no_run:true, cmd:"my command line 2"},
 				webstorm: {app:true, cmd:"C:\\Program Files\\JetBrains\\WebStorm 2019.2\\bin\\webstorm64.exe"},
 			}
+			delay:0,
 		}
 		
 		optionally create my_wins_personal.json to override any settings    
@@ -128,10 +129,11 @@ module.exports.run = async ()=>{
 	wins = keysender.getAllWindows();
 	let winsArray = makeWinsArray(settings);
 
+	const myWins = {};
 	let winIndex = 0;
 	for(let k in settings.wins) {
 		const w = settings.wins[k];
-		const {name, title, app, cmd, no_run} = w;
+		const {name, title, app, cmd, no_run, delay} = w;
 
 		let win_info_candidates = wins.filter(c => c.title.includes(title));
 		const win_info = win_info_candidates[0];
@@ -141,17 +143,53 @@ module.exports.run = async ()=>{
 			console.warn(`CODE00000000 There are ${win_info_candidates.length} windows with title '${title}'. Only one window expected!`);
 		else {
 			const win = new keysender.Hardware(win_info.handle);
-			win.workwindow.setView(winsArray[winIndex]);
-			win.workwindow.setForeground();
+			w.win = win;
+			w.winIndex = winIndex;
+			w.view = winsArray[winIndex];
+			win.workwindow.setView(w.view);
+
+			w.activate = async ()=>{
+				win.workwindow.setForeground();
+				await awaitDelay(200);
+			}
+
+			w.print = async (cmd) => {
+				await w.activate();
+				win.keyboard.printText(cmd);
+				await awaitDelay(200);
+			}
 
-			win.keyboard.printText(cmd);
-			if(!no_run)
+			w.pressEnter = async  () => {
+				await w.activate();
 				win.keyboard.sendKey(13);
-			await awaitDelay(300);
+				await awaitDelay(200);
+			}
+
+			await w.print(cmd);
+			// await awaitDelay(200);
+			// if(!no_run) {
+			// 	if(delay) {
+			// 		await awaitDelay(delay);
+			// 	}
+			// 	w.pressEnter();
+			// }
+			// await awaitDelay(300);
 		}
 		winIndex++;
 	}
 
+	for(let k in settings.wins) {
+		const w = settings.wins[k];
+		const {name, title, app, cmd, no_run, delay} = w;
+			if(!no_run) {
+				if(delay) {
+					await awaitDelay(delay);
+				}
+				await w.pressEnter();
+			}
+		}
+
+
 	await awaitDelay(700);
 	console.log(`my_wins finished successfully!`);
 	process.exit(0);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "my_wins",
-  "version": "1.1.6",
+  "version": "1.2.2",
   "description": "Automates starting and laying out your console windows for tsc, babel, tests, verdaccio, etc...",
   "keywords": ["automation","cmd","keysender","windows","autostart","autorun"],
   "main": "./index.js",