my_wins 1.0.12 → 1.1.0

package/lib/index.js

@@ -7,8 +7,37 @@ const defaultSettings = {
     y: 0,
     height: 120,
     width: 500,
+	screenWidth:1920,
+	screenHeight:1080,
 };
 
+function makeWinsArray(settings, ) {
+	let winsArray = settings.winsArray || [];
+	let {x,y,width, height, screenWidth, screenHeight} = settings;
+	const scr_sz = keysender.getScreenSize();
+	if(!screenWidth) screenWidth = scr_sz.width;
+	if(!screenHeight) screenHeight = scr_sz.height;
+
+
+	// for(let i=0;i<1000;i++) {
+	// 	y += settings.height;
+	// 	winsArray.push({x,y, width, height});
+	// }
+	const wy_total = 10;
+	const wx_total = 4;
+	const wy_step = Math.round(	screenWidth*1.0/wx_total);
+	const wx_step = Math.round(screenHeight*1.0/wy_total);
+	for(let wy = 0; wy<wy_total;wy++ ) {
+		for(let wx = 0; wx<wy_total;wx++ ) {
+			const x = wy_step*wy;
+			const y = wx_step*wx;
+			winsArray.push({x,y, width:wx_step-1, height:wy_step-1});
+		}
+	}
+
+	return winsArray;
+}
+
 const randSuffix = ()=>("_"+Math.ceil(Math.random()*999999999).toString()+Math.ceil(Math.random()*999999999).toString()).substr(0,20);
 
 function awaitDelay(delay) {
@@ -51,6 +80,15 @@ module.exports.run = async ()=>{
 
 	if (!settings.wins) settings.wins = {};
 
+	const arg2 = process.argv[2];
+	if(settings.wins[arg2]) {
+		for(let k in settings.wins) {
+			if(k !== arg2) {
+				delete settings.wins[k];
+			}
+		}
+	}
+
 	for(let k in settings.wins)
 		if(typeof settings.wins[k] === "string")
 			settings.wins[k] = {cmd:settings.wins[k]};
@@ -90,10 +128,12 @@ module.exports.run = async ()=>{
 			exec(`start cmd.exe @cmd /k "title ${title}"`);
 	}
 
-	await awaitDelay(settings.startTimeout || 700);
+	await awaitDelay(settings.startTimeout || 1500);
 	
 	wins = keysender.getAllWindows();
-	let y = settings.y;
+	let winsArray = makeWinsArray(settings);
+
+	let winIndex = 0;
 	for(let k in settings.wins) {
 		const w = settings.wins[k];
 		const {name, title, app, cmd, no_run} = w;
@@ -106,18 +146,18 @@ 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({ x: settings.x, y, width: settings.width, height: settings.height });
-			y += settings.height;
+			win.workwindow.setView(winsArray[winIndex]);
 			win.workwindow.setForeground();
 
 			win.keyboard.printText(cmd);
 			if(!no_run)
 				win.keyboard.sendKey(13);
-			await awaitDelay(50);
+			await awaitDelay(300);
 		}
+		winIndex++;
 	}
 
-	await awaitDelay(100);
+	await awaitDelay(700);
 	console.log(`my_wins finished successfully!`);
 	process.exit(0);
 };

package/package.json

@@ -1,11 +1,11 @@
 {
   "name": "my_wins",
-  "version": "1.0.12",
+  "version": "1.1.0",
   "description": "Automates starting and laying out your console windows for tsc, babel, tests, verdaccio, etc...",
-  "keywords": "automation cmd keysender windows autostart autorun",
+  "keywords": ["automation","cmd","keysender","windows","autostart","autorun"],
   "main": "./index.js",
   "bin": {
-    "my_wins": "./index.js"
+    "my_wins": "./bin/index.js"
   },
   "scripts": {
     "start": "node index.js"
@@ -13,7 +13,6 @@
   "author": "Yuri Yaryshev",
   "license": "Unlicense",
   "dependencies": {
-    "fs-extra": "^9.0.0",
     "json5": "^2.1.3",
     "keysender": "^1.5.0"
   },

package/pnpm-lock.yaml

@@ -1,88 +1,49 @@
+lockfileVersion: 5.3
+
+specifiers:
+  json5: ^2.1.3
+  keysender: ^1.5.0
+  prettier: ^2.0.5
+
 dependencies:
-  fs-extra: 9.0.0
   json5: 2.1.3
   keysender: 1.5.0
+
 devDependencies:
-  prettier: registry.npmjs.org/prettier/2.0.5
-lockfileVersion: 5.1
+  prettier: 2.0.5
+
 packages:
-  /at-least-node/1.0.0:
-    dev: false
-    engines:
-      node: '>= 4.0.0'
-    resolution:
-      integrity: sha512-+q/t7Ekv1EDY2l6Gda6LLiX14rU9TV20Wa3ofeQmwPFZbOMo9DXrLbOjFaaclkXKWidIaopwAObQDqwWtGUjqg==
-  /fs-extra/9.0.0:
-    dependencies:
-      at-least-node: 1.0.0
-      graceful-fs: 4.2.4
-      jsonfile: 6.0.1
-      universalify: 1.0.0
-    dev: false
-    engines:
-      node: '>=10'
-    resolution:
-      integrity: sha512-pmEYSk3vYsG/bF651KPUXZ+hvjpgWYw/Gc7W9NFUe3ZVLczKKWIij3IKpOrQcdw4TILtibFslZ0UmR8Vvzig4g==
-  /graceful-fs/4.2.4:
-    dev: false
-    resolution:
-      integrity: sha512-WjKPNJF79dtJAVniUlGGWHYGz2jWxT6VhN/4m1NdkbZ2nOsEF+cI1Edgql5zCRhs/VsQYRvrXctxktVXZUkixw==
+
   /json5/2.1.3:
-    dependencies:
-      minimist: 1.2.5
-    dev: false
-    engines:
-      node: '>=6'
+    resolution: {integrity: sha512-KXPvOm8K9IJKFM0bmdn8QXh7udDh1g/giieX0NLCaMnb4hEiVFqnop2ImTXCc5e0/oHz3LTqmHGtExn5hfMkOA==}
+    engines: {node: '>=6'}
     hasBin: true
-    resolution:
-      integrity: sha512-KXPvOm8K9IJKFM0bmdn8QXh7udDh1g/giieX0NLCaMnb4hEiVFqnop2ImTXCc5e0/oHz3LTqmHGtExn5hfMkOA==
-  /jsonfile/6.0.1:
     dependencies:
-      universalify: 1.0.0
+      minimist: 1.2.5
     dev: false
-    optionalDependencies:
-      graceful-fs: 4.2.4
-    resolution:
-      integrity: sha512-jR2b5v7d2vIOust+w3wtFKZIfpC2pnRmFAhAC/BuweZFQR8qZzxH1OyrQ10HmdVYiXWkYUqPVsz91cG7EL2FBg==
+
   /keysender/1.5.0:
+    resolution: {integrity: sha512-6GR5lYm/HbirtF5C2CUiAxqoX7upywhxBBV6FQFmtv15844qJgTXG9SQshxTcfu0oG5axrkt7SgrFhNd6Ic68A==}
+    requiresBuild: true
     dependencies:
       lodash.isequal: 4.5.0
       node-addon-api: 2.0.0
     dev: false
-    requiresBuild: true
-    resolution:
-      integrity: sha512-6GR5lYm/HbirtF5C2CUiAxqoX7upywhxBBV6FQFmtv15844qJgTXG9SQshxTcfu0oG5axrkt7SgrFhNd6Ic68A==
+
   /lodash.isequal/4.5.0:
+    resolution: {integrity: sha1-QVxEePK8wwEgwizhDtMib30+GOA=}
     dev: false
-    resolution:
-      integrity: sha1-QVxEePK8wwEgwizhDtMib30+GOA=
+
   /minimist/1.2.5:
+    resolution: {integrity: sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw==}
     dev: false
-    resolution:
-      integrity: sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw==
+
   /node-addon-api/2.0.0:
+    resolution: {integrity: sha512-ASCL5U13as7HhOExbT6OlWJJUV/lLzL2voOSP1UVehpRD8FbSrSDjfScK/KwAvVTI5AS6r4VwbOMlIqtvRidnA==}
     dev: false
-    resolution:
-      integrity: sha512-ASCL5U13as7HhOExbT6OlWJJUV/lLzL2voOSP1UVehpRD8FbSrSDjfScK/KwAvVTI5AS6r4VwbOMlIqtvRidnA==
-  /universalify/1.0.0:
-    dev: false
-    engines:
-      node: '>= 10.0.0'
-    resolution:
-      integrity: sha512-rb6X1W158d7pRQBg5gkR8uPaSfiids68LTJQYOtEUhoJUWBdaQHsuT/EUduxXYxcrt4r5PJ4fuHW1MHT6p0qug==
-  registry.npmjs.org/prettier/2.0.5:
-    dev: true
-    engines:
-      node: '>=10.13.0'
+
+  /prettier/2.0.5:
+    resolution: {integrity: sha512-7PtVymN48hGcO4fGjybyBSIWDsLU4H4XlvOHfq91pz9kkGlonzwTfYkaIEwiRg/dAJF9YlbsduBAgtYLi+8cFg==, registry: https://registry.npmjs.com/}
+    engines: {node: '>=10.13.0'}
     hasBin: true
-    name: prettier
-    resolution:
-      integrity: sha512-7PtVymN48hGcO4fGjybyBSIWDsLU4H4XlvOHfq91pz9kkGlonzwTfYkaIEwiRg/dAJF9YlbsduBAgtYLi+8cFg==
-      registry: 'https://registry.npmjs.com/'
-      tarball: 'https://registry.npmjs.org/prettier/-/prettier-2.0.5.tgz'
-    version: 2.0.5
-specifiers:
-  fs-extra: ^9.0.0
-  json5: ^2.1.3
-  keysender: ^1.5.0
-  prettier: ^2.0.5
+    dev: true

package/readme.md

@@ -81,7 +81,7 @@ It's recommended to gitignore "my_wins_personal.json".
         "wins": {          
             "foo":"my command line 1",
             "baz":{"no_run":true, "cmd":"my command line 2"},
-            "webstorm": {"app":true, "cmd":"C:\\Program Files\\JetBrains\\WebStorm 2019.2\\bin\\webstorm64.exe"}
+            "webstorm": {"app":true, "cmd":"\"C:\\Program Files\\JetBrains\\WebStorm 2019.2\\bin\\webstorm64.exe\""} // notice escaped quotes !
             // "commented": "Comments and trailing commas are supported!",
         },
     }
@@ -103,6 +103,9 @@ It's recommended to gitignore "my_wins_personal.json".
 
 ## Changelog
 
+1.0.13
+- Fixed webstorm example in readme 
+
 1.0.12
 - Fixed JSON5 parsing errors was silently ignored.