node-automator 1.0.4 → 1.1.0

package/README.md

@@ -3,11 +3,11 @@
 ```sh
 $ npm install
 ```
-# Node
+## Node
 ```sh
 $ node . ./examples/print_env.yml
 ```
-# Npx
+## Npx
 > You can pass encoded configuration content instead of a file path
 ```js
 function encode(input) {

package/commands/mgr.js

@@ -113,6 +113,7 @@ const { AssertCommand } = require('./assert');
 const { SvnAddCommand } = require('./svn_add');
 const { ImageCropCommand } = require('./image_crop');
 const { CursorUpCommand } = require('./cursor_up');
+const { RegisterSearchInstallLocationCommand } = require('./register_search_install_location');
 
 const globalData = {
     "executed_cfg": [], // 执行过的配置文件
@@ -467,6 +468,7 @@ function init() {
     register("svn_add", SvnAddCommand, false);
     register("image_crop", ImageCropCommand, false);
     register("cursor_up", CursorUpCommand, false);
+    register("register_search_install_location", RegisterSearchInstallLocationCommand, false);
 }
 
 module.exports = {

package/commands/register_search_install_location.js

@@ -0,0 +1,12 @@
+const { registerSearchInstallLocation } = require('../utils/reg_tool');
+const { BaseCommand } = require("./base");
+
+class RegisterSearchInstallLocationCommand extends BaseCommand {
+    async execute() {
+        return registerSearchInstallLocation(this.selfData.target);
+    }
+}
+
+module.exports = {
+    RegisterSearchInstallLocationCommand,
+};

package/commands/which.js

@@ -1,57 +1,16 @@
+const { warn } = require('../utils/log_tool');
+const { registerSearchInstallLocation } = require('../utils/reg_tool');
+const { which } = require('../utils/which_tool');
 const { BaseCommand } = require("./base");
-const { exec_shell } = require('../utils/shell_tool');
-const { get_fst_file } = require("../utils/file_tool");
-const path = require("path");
-const fs = require("fs");
-const { warn } = require("../utils/log_tool");
+
 
 class WhichCommand extends BaseCommand {
     async execute() {
-        let cmd;
-        switch (process.platform) {
-            case "win32": {
-                cmd = "where";
-                break;
-            }
-            default: {
-                cmd = "which";
-                break;
-            }
-        }
-
-        let file;
-        let stdout = await exec_shell({
-            cmd: `${cmd} ${this.selfData.target}`,
-            capture_stdout: true,
-            ignore_code: true,
-        });
-        if (stdout) {
-            /** @type {string[]} */
-            let files = stdout.split(/[\r\n]{1,2}/);
-            files = files.filter(v => v && v.trim());
-            // windows系统下，优先选择有 .cmd 或者 .exe
-            if (process.platform === "win32") { 
-                let preferExts = ['.exe', '.cmd'];
-                files.sort((a, b) => {
-                    let exta = path.extname(a);
-                    let extb = path.extname(b);
-                    if (preferExts.includes(exta)) {
-                        return -1;
-                    } else if (preferExts.includes(extb)) {
-                        return 1;
-                    }
-                    return 0;
-                });
-            }
-            file = get_fst_file(files);
-            if (file) {
-                file = fs.realpathSync(file);
-            }
-        }
-        if (!file) {
-            warn(`未找到 ${this.selfData.target}`);
+        let result = await which(this.selfData.target);
+        if (!result) {
+          warn(`未找到 ${this.selfData.target}`);
         }
-        return file;
+        return result;
     }
 }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "node-automator",
-  "version": "1.0.4",
+  "version": "1.1.0",
   "description": "Execute automation with yaml configuration(compatible with json)",
   "main": "index.js",
   "repository": {

package/utils/log_tool.js

@@ -41,7 +41,7 @@ function log(msg, end = "\n", level = -1, force = true, with_date = false) {
 	}
 	// clearLine();
 	let color = colors[level];
-	if (color) {
+	if (color && ""[color]) {
 		process.stdout.write(msg.toString()[color] + end);
 	} else {
 		process.stdout.write(msg.toString() + end);

package/utils/reg_tool.js

@@ -0,0 +1,66 @@
+const path = require("path");
+const { exec_shell } = require("./shell_tool");
+const { which } = require("./which_tool");
+
+/**
+ * 查找指定软件的安装目录
+ * @param {*} target
+ * @returns
+ */
+async function registerSearchInstallLocation(target) {
+  const key = target;
+  var Uninstalls = [
+    "HKEY_CURRENT_USER\\SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Uninstall",
+    "HKEY_LOCAL_MACHINE\\SOFTWARE\\WOW6432Node\\Microsoft\\Windows\\CurrentVersion\\Uninstall",
+  ];
+  var result = "";
+  for (var i = 0; i < Uninstalls.length; i++) {
+    const Uninstall = Uninstalls[i];
+    result = await registerQuery(`${Uninstall}\\${key}`);
+    if (result) break;
+  }
+  const InstallLocation = registerGetProp(result, "InstallLocation");
+  if (InstallLocation) return InstallLocation;
+  const UninstallString = registerGetProp(result, "UninstallString");
+  if (UninstallString) return path.dirname(UninstallString);
+  return "";
+}
+
+/**
+ * 查找指定注册项
+ * @param {*} key
+ * @returns
+ */
+async function registerQuery(key) {
+  const REG_EXE = await which("reg");
+  return exec_shell({
+    cmd: [REG_EXE, "QUERY", key],
+    capture_stdout: true,
+    ignore_code: true,
+    quiet: true,
+  });
+}
+
+/**
+ * 获取注册项的属性
+ * @param {*} queryResult
+ * @param {*} key
+ * @returns
+ */
+function registerGetProp(queryResult, key) {
+  var matches = queryResult.match(new RegExp(key + "\\s+REG_SZ\\s+(.*)"));
+  if (matches && matches.length > 1) {
+    var value = matches[1];
+    if (value.startsWith('"') && value.endsWith('"')) {
+      return value.substring(1, value.length - 1);
+    }
+    return value;
+  }
+  return "";
+}
+
+module.exports = {
+  registerSearchInstallLocation,
+  registerGetProp,
+  registerQuery,
+};

package/utils/request_tool.js

@@ -41,25 +41,17 @@ async function doRequest(data) {
     let hasProgress = false;
     if (useCache) {
         result = http_cache;
-        if (data.dst) {
-            let file = fs.createWriteStream(get_full_path(data.dst, "FILE"));
-            file.write(result);
-        }
     } else {
+        let chunks = [];
         result = await new Promise(resolve => {
             let sizeTotal = 0;
-            let fileDst = data.dst || shareData.AUTOMATOR_SCRATCH + "/request_tool/" + cache_name;
-            let file = fs.createWriteStream(get_full_path(fileDst, "FILE"));
+            let fileDst = get_full_path(data.dst || shareData.AUTOMATOR_SCRATCH + "/request_tool/" + cache_name, "FILE");
             let cacheDir = path.dirname(cache_path);
             if (!fs.existsSync(cacheDir)) {
                 fs.mkdirSync(cacheDir, {
                     recursive: true
                 });
             }
-            let cachedFile;
-            if (enable_http_cache) {
-                cachedFile = fs.createWriteStream(cache_path);
-            }
             function send_request() {
                 let req = request(url, options, (err, res, result) => {
                     if (err) {
@@ -74,17 +66,15 @@ async function doRequest(data) {
                         resolve();
                         return;
                     }
+                    const buffer = Buffer.concat(chunks);
                     sizeTotal = res.client.bytesRead;
                     !quiet && progress(sizeTotal, sizeTotal, { desc: "完成", format_bytes: true, color: "green" });
                     // 仅在响应码合法时，写入缓存
-                    if (enable_http_cache) {
-                        if (res.statusCode > 0 && res.statusCode < 400) {
-
-                        } else {
-                            if (fs.existsSync(cache_path)) {
-                                fs.unlinkSync(cache_path);
-                            }
+                    if (res.statusCode > 0 && res.statusCode < 400) {
+                        if (enable_http_cache) {
+                            fs.writeFileSync(cache_path, buffer);
                         }
+                        fs.writeFileSync(fileDst, buffer);
                     }
                     if (!data.ignore_status_code) {
                         if (res.statusCode >= 400) {
@@ -125,10 +115,9 @@ async function doRequest(data) {
                         }
                     }
                 });
-                req.pipe(file);
-                if (enable_http_cache) {
-                    req.pipe(cachedFile);
-                }
+                req.on("data", (chunk) => {
+                    chunks.push(chunk);
+                });
                 request_progress(
                     req.on('progress', function (state) {
                             sizeTotal = state.size.total;

package/utils/shell_tool.js

@@ -31,6 +31,7 @@ async function exec_shell(data) {
     let instant_stdout = data.instant_stdout;
     let capture_stdout = isStdOut() || data.capture_stdout;
     let acceptableErrors = data.acceptableErrors || [];
+    let quiet = data.quiet;;
     const result = await new Promise((resolve, reject) => {
         /** @type {string[]} */
         let cmd = data.cmd;
@@ -63,7 +64,7 @@ async function exec_shell(data) {
         let results = [];
         let errors = [];
         let encoding = data.encoding || "cp936";
-        whisper(`cmd:[${cmd}] cwd:${data.cwd} inputs:${data.inputs}`);
+        !quiet && whisper(`cmd:[${cmd}] cwd:${data.cwd} inputs:${data.inputs}`);
         options.stdio = ["pipe", capture_stdout ? "pipe" : process.stdout, "pipe"];
         const child = child_process.spawn(cmd[0], cmd.slice(1), options);
         if (child.stdout) {

package/utils/which_tool.js

@@ -0,0 +1,54 @@
+const path = require("path");
+const fs = require("fs");
+const { exec_shell } = require('./shell_tool');
+const { get_fst_file } = require("./file_tool");
+const { warn } = require("./log_tool");
+async function which(target) {
+  let cmd;
+  switch (process.platform) {
+    case "win32": {
+      cmd = "where";
+      break;
+    }
+    default: {
+      cmd = "which";
+      break;
+    }
+  }
+
+  let file;
+  let stdout = await exec_shell({
+    cmd: `${cmd} ${target}`,
+    capture_stdout: true,
+    ignore_code: true,
+    quiet: true,
+  });
+  if (stdout) {
+    /** @type {string[]} */
+    let files = stdout.split(/[\r\n]{1,2}/);
+    files = files.filter((v) => v && v.trim());
+    // windows系统下，优先选择有 .cmd 或者 .exe
+    if (process.platform === "win32") {
+      let preferExts = [".exe", ".cmd"];
+      files.sort((a, b) => {
+        let exta = path.extname(a);
+        let extb = path.extname(b);
+        if (preferExts.includes(exta)) {
+          return -1;
+        } else if (preferExts.includes(extb)) {
+          return 1;
+        }
+        return 0;
+      });
+    }
+    file = get_fst_file(files);
+    if (file) {
+      file = fs.realpathSync(file);
+    }
+  }
+  return file;
+}
+
+module.exports = {
+  which,
+};