node-automator 1.3.1 → 1.3.3

package/commands/ali_oss.js

@@ -48,7 +48,10 @@ class AliOssCommand extends BaseCommand {
                 case "DOWNLOAD": {
                     let src = this.selfData.src;
                     let dst = get_full_path(this.selfData.dst);
-                    client.get(src, dst).then((result) => {
+                    let timeout = this.selfData.options && this.selfData.options.timeout || 1000 * 60 * 2;
+                    client.get(src, dst, {
+                        timeout,
+                    }).then((result) => {
                         resolve(result);
                     }).catch((err) => {
                         reject(err);
@@ -59,9 +62,12 @@ class AliOssCommand extends BaseCommand {
                 case "UPLOAD": {
                     let dst = this.selfData.dst;
                     let src = get_full_path(this.selfData.src);
+                    let timeout = this.selfData.options && this.selfData.options.timeout || 1000 * 60 * 2;
                     info("");
                     info(`开始上传 ${path.basename(src)} 到 ${dst}`);
-                    client.put(dst, src).then((result) => {
+                    client.put(dst, src, {
+                        timeout,
+                    }).then((result) => {
                         resolve(result);
                     })
                     .catch((err) => {
@@ -72,6 +78,7 @@ class AliOssCommand extends BaseCommand {
                 case "UPLOAD_FILES": {
                     let dst_folder = this.selfData.dst;
                     let concurrency = this.selfData.options && this.selfData.options.concurrency || 10;
+                    let timeout = this.selfData.options && this.selfData.options.timeout || 1000 * 60 * 2;
                     let base = this.selfData.base;
                     whisper(`在 ${base} 中收集要上传的文件...`, undefined, true);
                     let srcs = get_file_list(this.selfData.src, undefined, true);
@@ -80,7 +87,9 @@ class AliOssCommand extends BaseCommand {
                     function uploadFiles(srcs) {
                         let tasks = srcs.map((src) => {
                             let dst = path.join(dst_folder, path.relative(base, src)).replace(/\\/g, "/")
-                            return client.put.bind(client, dst, src);
+                            return client.put.bind(client, dst, src, {
+                                timeout,
+                            });
                         });
                         queueAsync(tasks, concurrency, (done, total, index, indexDone) => {
                             progress(done, total, {

package/index.js

@@ -11,6 +11,7 @@ require('dotenv').config({
 });
 
 // 禁用其他打印
+console.yzplog = console.log;
 console.log = () => {};
 console.warn = () => {};
 console.info = () => {};

package/package.json

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

package/utils/selection_tool.js

@@ -583,7 +583,7 @@ async function multiSelect(content, data) {
       onKeyPress(undefined, { name: "return" });
     }
   });
-  success(`已选择:${getPrint(selectedOptions, true)}`);
+  !data.quiet && success(`已选择:${getPrint(selectedOptions, true)}`);
   return selectedOptions;
 }