my_wins 1.1.5 → 1.2.1

package/lib/index.js

@@ -9,8 +9,8 @@ const defaultSettings = {
     width: 500,
 	screenWidth:1920,
 	screenHeight:1080,
-	 wy_total : 12,
-	 wx_total : 3,
+	wx_total : 3,
+	wy_total : 12,
 };
 
 function makeWinsArray(settings, ) {
@@ -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);
 
-	let winIndex = 0;
+	const myWins = {};
+
 	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,48 @@ 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.activate = ()=>{
+				win.workwindow.setView(winsArray[winIndex]);
+				win.workwindow.setForeground();
+			}
+			w.print = async (cmd) => {
+				await awaitDelay(200);
+				w.activate();
+				win.keyboard.printText(cmd);
+				await awaitDelay(200);
+			}
 
-			win.keyboard.printText(cmd);
-			if(!no_run)
+			w.pressEnter = async  () => {
+				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];
+			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.5",
+  "version": "1.2.1",
   "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",