yj-deploy 0.0.7 → 0.0.8

package/README.md

@@ -11,6 +11,7 @@
 - ✔ 支持灵活配置dockerfile，upload.sh等脚本内容
 - ✔ 支持多种方式配置 `镜像仓库` `镜像环境`等参数
 - ✔ 支持懒上传，仅上传新增部分文件，提升上传效率
+- ✔ 支持失败自动重新上传，支持配置次数，防止网络不稳定可能导致上传失败
 > 全程不需要连接跳板机做任何操作即可完成镜像推送
 
 ## 运行情况
@@ -74,7 +75,12 @@ const deploy = new yjDeploy({
       'echo "- 镜像环境: $2"',
       'docker build -t harbor.yunjingtech.cn:30002/$1/$tag .',
       'docker push harbor.yunjingtech.cn:30002/$1/$tag',
+      'if [ $? -eq 0 ];then',
+      'echo - 推送成功',
       'echo - 镜像地址: harbor.yunjingtech.cn:30002/$1/$tag',
+      'else',
+      'echo - 镜像推送失败，请重试或联系运维人员，如需查看全部docker日志，请在命令后添加 --allLog查看更多信息',
+      'fi',
     ]
   },
 
@@ -89,7 +95,9 @@ const deploy = new yjDeploy({
 
   allLog: false, // 是否打印所有log信息，主要是包含推送镜像阶段的日志，如果报错可以打开此开关
 
-  lazyUpload: false // 是否开启懒上传，针对小程序图片等仅需要部署新增部分文件的项目有奇效
+  lazyUpload: false, // 是否开启懒上传，针对小程序图片等仅需要部署新增部分文件的项目有奇效
+  
+  rePushNum: 3, // 重新推送次数，为0代表不重新推送
 }
 ```
 
@@ -260,6 +268,9 @@ node uploader.js --tmpName=test
 
 ## 升级日志
 
+### v0.0.8
+  支持判断是否推送成功，如果推送失败，则自动重试三次，可以手动配置重试次数
+
 ### v0.0.6
   支持懒上传文件，大幅提升上传速度
 

package/dist/yj-deploy.mjs

@@ -1,7 +1,7 @@
-var x = Object.defineProperty;
-var L = (f, e, t) => e in f ? x(f, e, { enumerable: !0, configurable: !0, writable: !0, value: t }) : f[e] = t;
-var $ = (f, e, t) => (L(f, typeof e != "symbol" ? e + "" : e, t), t);
-const { stdout: v } = require("single-line-log"), F = require("path"), k = require("fs"), { Client: A } = require("ssh2");
+var L = Object.defineProperty;
+var v = (f, e, o) => e in f ? L(f, e, { enumerable: !0, configurable: !0, writable: !0, value: o }) : f[e] = o;
+var $ = (f, e, o) => (v(f, typeof e != "symbol" ? e + "" : e, o), o);
+const { stdout: F } = require("single-line-log"), A = require("path"), C = require("fs"), { Client: N } = require("ssh2");
 module.exports = class {
   constructor(e) {
     $(this, "config", {
@@ -40,7 +40,12 @@ module.exports = class {
           'echo "- 镜像环境: $2"',
           "docker build -t harbor.yunjingtech.cn:30002/$1/$tag .",
           "docker push harbor.yunjingtech.cn:30002/$1/$tag",
-          "echo - 镜像地址: harbor.yunjingtech.cn:30002/$1/$tag"
+          "if [ $? -eq 0 ];then",
+          "echo - 推送成功",
+          "echo - 镜像地址: harbor.yunjingtech.cn:30002/$1/$tag",
+          "else",
+          "echo - 镜像推送失败，请重试或联系运维人员，如需查看全部docker日志，请在命令后添加 --allLog查看更多信息",
+          "fi"
         ]
       },
       // 上传dist目录信息
@@ -53,8 +58,10 @@ module.exports = class {
       // 文件并行上传数量，如果报错，可以减少此配置
       allLog: !1,
       // 是否显示全部日志
-      lazyUpload: !1
+      lazyUpload: !1,
       // 是否开启懒上传
+      rePushNum: 3
+      // 重新推送次数，为0代表不重新推送
     });
     $(this, "ssh2Conn", null);
     // 上传状态
@@ -107,9 +114,9 @@ module.exports = class {
       console.log("- 请配置跳板机密码 password");
       return;
     }
-    this.uploading || (this.ssh2Conn = new A(), this.ssh2Conn.on("ready", () => {
-      console.log("- 跳板机连接成功！"), this.ssh2Conn.sftp(async (e, t) => {
-        e && (console.log("- sftp连接失败"), this.breakConnect()), this.config.namespace || (console.log("- 请配置项目命名空间 namespace"), this.breakConnect()), this.uploading = !0, this.getArgv("--reset") !== void 0 && (console.log("- 重置项目"), await this.onShell(`rm -r ${this.config.rootDir}/${this.config.namespace}`)), this.upLoadProject(t, `${this.config.rootDir}/${this.config.namespace}`);
+    this.uploading || (this.ssh2Conn = new N(), this.ssh2Conn.on("ready", () => {
+      console.log("- 跳板机连接成功！"), this.ssh2Conn.sftp(async (e, o) => {
+        e && (console.log("- sftp连接失败"), this.breakConnect()), this.config.namespace || (console.log("- 请配置项目命名空间 namespace"), this.breakConnect()), this.uploading = !0, this.getArgv("--reset") !== void 0 && (console.log("- 重置项目"), await this.onShell(`rm -r ${this.config.rootDir}/${this.config.namespace}`)), this.upLoadProject(o, `${this.config.rootDir}/${this.config.namespace}`);
       });
     }).connect({
       host: this.config.host,
@@ -134,24 +141,24 @@ module.exports = class {
    * @returns Promise
    */
   onShell(e) {
-    const t = this.getArgv("--allLog") !== void 0;
-    return new Promise((i, s) => {
-      this.ssh2Conn.shell((n, l) => {
-        if (n) {
-          console.log("- 远程命令错误：" + n, e), this.breakConnect(), s(n);
+    const o = this.getArgv("--allLog") !== void 0;
+    return new Promise((t, r) => {
+      this.ssh2Conn.shell((l, n) => {
+        if (l) {
+          console.log("- 远程命令错误：" + l, e), this.breakConnect(), r(l);
           return;
         }
-        let r = [];
-        l.on("close", () => {
-          i(r.toString());
+        let i = [];
+        n.on("close", () => {
+          t(i.toString());
         }).on("data", (c) => {
           let a = c.toString();
-          (t || this.config.allLog || a.startsWith("- ")) && r.push(`
+          (o || this.config.allLog || a.startsWith("- ")) && i.push(`
 ` + a);
         }).stderr.on("data", (c) => {
           console.log(`- 远程命令错误：
-` + c), this.breakConnect(), s(c);
-        }), l.end(e + `
+` + c), this.breakConnect(), r(c);
+        }), n.end(e + `
 exit
 `);
       });
@@ -162,19 +169,19 @@ exit
    * @param {*} sftp 
    * @param {*} dir 
    */
-  projectInit(e, t) {
-    return new Promise(async (i, s) => {
-      e.mkdir(t, async (n) => {
-        if (n)
-          s(n);
+  projectInit(e, o) {
+    return new Promise(async (t, r) => {
+      e.mkdir(o, async (l) => {
+        if (l)
+          r(l);
         else {
           console.log("- 正在创建dockerfile");
-          const l = `${t}/${this.config.dockerfile.name}`;
-          await this.onShell(`touch ${l}`), await this.onShell(`echo '${this.config.dockerfile.content.join(`
-`)}' > ${l}`), console.log("- 正在创建upload.sh");
-          const r = `${t}/${this.config.upload.name}`;
-          await this.onShell(`touch ${r}`), await this.onShell(`echo '${this.config.upload.content.join(`
-`)}' > ${r}`), i();
+          const n = `${o}/${this.config.dockerfile.name}`;
+          await this.onShell(`touch ${n}`), await this.onShell(`echo '${this.config.dockerfile.content.join(`
+`)}' > ${n}`), console.log("- 正在创建upload.sh");
+          const i = `${o}/${this.config.upload.name}`;
+          await this.onShell(`touch ${i}`), await this.onShell(`echo '${this.config.upload.content.join(`
+`)}' > ${i}`), t();
         }
       });
     });
@@ -185,10 +192,10 @@ exit
    * @param {*} remotePath 
    * @returns 
    */
-  checkRemoteFile(e, t) {
-    return new Promise((i) => {
-      e.stat(t, (s) => {
-        i(!s);
+  checkRemoteFile(e, o) {
+    return new Promise((t) => {
+      e.stat(o, (r) => {
+        t(!r);
       });
     });
   }
@@ -197,89 +204,98 @@ exit
    * @param {*} sftp 
    * @param {*} dir 
    */
-  upLoadProject(e, t) {
-    e.readdir(t, async (i) => {
-      if (i) {
-        console.log("- 跳板机不存在项目, 开始创建项目"), this.projectInit(e, t).then(() => {
-          console.log(`- ${this.config.namespace}项目创建成功`), this.upLoadProject(e, t);
-        }).catch((o) => {
-          console.log(`- 创建项目失败: ${o}`), this.breakConnect();
+  upLoadProject(e, o) {
+    let t = 0;
+    typeof this.config.rePushNum == "number" && this.config.rePushNum > 0 && (t = this.config.rePushNum), e.readdir(o, async (r) => {
+      if (r) {
+        console.log("- 跳板机不存在项目, 开始创建项目"), this.projectInit(e, o).then(() => {
+          console.log(`- ${this.config.namespace}项目创建成功`), this.upLoadProject(e, o);
+        }).catch((s) => {
+          console.log(`- 创建项目失败: ${s}`), this.breakConnect();
         });
         return;
       }
-      const s = this.getArgv("--lazyUpload") !== void 0 || this.config.lazyUpload, n = `${t}/${this.config.dist.name}`;
-      if (s || await this.onShell(`rm -rf ${n}`), await this.onShell(`mkdir ${n}`), !this.config.fileDir) {
+      const l = this.getArgv("--lazyUpload") !== void 0 || this.config.lazyUpload, n = `${o}/${this.config.dist.name}`;
+      if (l || await this.onShell(`rm -rf ${n}`), await this.onShell(`mkdir ${n}`), !this.config.fileDir) {
         console.log("- 请配置待上传文件目录 fileDir"), this.breakConnect();
         return;
       }
-      const { localFileList: l, dirList: r } = await this.getFilesInDirectory(this.config.fileDir);
-      if (l.length === 0) {
+      const { localFileList: i, dirList: c } = await this.getFilesInDirectory(this.config.fileDir);
+      if (i.length === 0) {
         console.log("- 待上传目录没有获取到文件，请检查"), this.breakConnect();
         return;
       }
-      let c = 0, a = l.length;
-      const w = (o) => new Promise(async (u, g) => {
+      let a = 0, p = i.length;
+      const y = (s) => new Promise(async (u, g) => {
         try {
-          if (s && await this.checkRemoteFile(e, `${n}${o.remotePath}`))
+          if (l && await this.checkRemoteFile(e, `${n}${s.remotePath}`))
             return u();
-          const h = k.createReadStream(o.localPath), S = e.createWriteStream(`${n}${o.remotePath}`);
-          S.on("close", () => {
-            this.progressBar(++c, a), u();
-          }), S.on("error", (b) => {
-            console.log(`- 文件 ${o.remotePath} 上传失败：${b}`), g(b), this.breakConnect();
-          }), h.pipe(S);
+          const h = C.createReadStream(s.localPath), b = e.createWriteStream(`${n}${s.remotePath}`);
+          b.on("close", () => {
+            this.progressBar(++a, p), u();
+          }), b.on("error", (k) => {
+            console.log(`- 文件 ${s.remotePath} 上传失败：${k}`), g(k), this.breakConnect();
+          }), h.pipe(b);
         } catch (h) {
           g(h);
         }
-      }), m = (o, u) => {
+      }), d = (s, u) => {
         let g = [];
-        for (let h = 0; h < o.length; h += u)
-          g.push(o.slice(h, h + u));
+        for (let h = 0; h < s.length; h += u)
+          g.push(s.slice(h, h + u));
         return g;
-      }, d = (o) => {
-        if (o.length === 0)
+      }, m = (s) => {
+        if (s.length === 0)
           return Promise.resolve();
-        const u = o.shift();
-        return Promise.all(u.map((g) => w(g))).then(() => d(o));
-      }, p = (o) => {
-        if (o.length === 0)
+        const u = s.shift();
+        return Promise.all(u.map((g) => y(g))).then(() => m(s));
+      }, P = (s) => {
+        if (s.length === 0)
           return Promise.resolve();
-        let g = o.shift().map((h) => `${n}${h}`).join(" ");
-        return this.onShell(`mkdir -p ${g}`).then(() => p(o));
+        let g = s.shift().map((h) => `${n}${h}`).join(" ");
+        return this.onShell(`mkdir -p ${g}`).then(() => P(s));
       };
-      let C = [...m(r, this.config.parallelDir || 20)];
-      await p(C), console.log("- 创建目录完成"), await new Promise((o) => {
+      let w = [...d(c, this.config.parallelDir || 20)];
+      await P(w), console.log("- 创建目录完成"), await new Promise((s) => {
         setTimeout(() => {
-          o();
+          s();
         }, 500);
       });
-      let y = [...m(l, this.config.parallelFile || 50)];
-      await d(y), s && (this.progressBar(a, a), console.log("\x1B[32m%s\x1B[0m", `- 已开启懒上传，本次共上传 ${c} 个文件`)), console.log("- 文件上传成功"), console.log("- 开始推送镜像");
-      let P = `cd ${t} && sh ${this.config.upload.name}`;
-      if (await this.isNewShell(e, t)) {
-        const o = this.getArgv("--imageStore") || this.config.imageStore;
-        P += ` ${o}`;
+      let D = [...d(i, this.config.parallelFile || 50)];
+      await m(D), l && (this.progressBar(p, p), console.log("\x1B[32m%s\x1B[0m", `- 已开启懒上传，本次共上传 ${a} 个文件`)), console.log("- 文件上传成功"), console.log("- 开始推送镜像");
+      let S = `cd ${o} && sh ${this.config.upload.name}`;
+      if (await this.isNewShell(e, o)) {
+        const s = this.getArgv("--imageStore") || this.config.imageStore;
+        S += ` ${s}`;
       } else
         console.log(`
 - warning 检测到当前脚本为手动创建,不支持镜像仓库配置,imageStore将失效`), console.log("- warning 如需支持imageStore参数,请在命令行后添加 --reset 重新生成脚本");
-      const j = this.getArgv("--tmpName") || this.config.tmpName;
-      P += ` ${j}`;
-      const D = await this.onShell(P);
-      console.log(D), console.log("- 镜像推送完成"), this.breakConnect();
+      const x = this.getArgv("--tmpName") || this.config.tmpName;
+      S += ` ${x}`;
+      const j = Array.from(new Array(t + 1)).map(() => this.onShell(S));
+      await this.pushMirrorImage(j, j.length), this.breakConnect();
     });
   }
+  // 推送镜像
+  async pushMirrorImage(e, o) {
+    if (e.length === 0)
+      return console.log("- 镜像推送失败，请添加 --allLog 查看全部日志"), null;
+    const t = await e[0];
+    return t.includes("- 镜像推送失败") ? (console.log(t), e.length > 1 && console.log(`- 正在尝试第 ${o - e.length + 1} 次推送...`), this.pushMirrorImage(e.slice(1), o)) : (console.log(t), console.log("- 镜像推送结束"), t);
+  }
   /**
    * 获取脚本内容是不是自动创建的脚本
    * 兼容用户手动根据运维文档创建的推送脚本，因参数不同可能报错的问题
    * 有 $2代表是自动创建的版本，否则老版本
   */
-  async isNewShell(e, t) {
-    return new Promise((i, s) => {
-      e.readFile(`${t}/${this.config.upload.name}`, (n, l) => {
-        if (n)
-          return s(!1);
-        const r = l.toString();
-        i(r.includes("$2"));
+  async isNewShell(e, o) {
+    return new Promise((t, r) => {
+      e.readFile(`${o}/${this.config.upload.name}`, (l, n) => {
+        if (l)
+          return r(!1);
+        const i = n.toString();
+        i.includes("- 镜像推送失败") || console.log(`
+- warning 检测到当前脚本可能不是最新版本，推送失败可能不会提示，且没有失败自动重试功能，请在命令后添加 --reset 重新生成脚本`), t(i.includes("$2"));
       });
     });
   }
@@ -288,41 +304,41 @@ exit
    * @param description 命令行开头的文字信息
    * @param bar_length 进度条的长度(单位：字符)，默认设为 25
    */
-  progressBar(e, t, i = 25) {
-    let s = (e / t).toFixed(4), n = Math.floor(s * i), l = "";
-    for (let a = 0; a < n; a++)
-      l += "█";
-    let r = "";
-    for (let a = 0; a < i - n; a++)
-      r += "░";
-    let c = `- 文件上传进度: ${l}${r} (${e}/${t}) ${(100 * s).toFixed(2)}%`;
-    v(c), e == t && console.log("");
+  progressBar(e, o, t = 25) {
+    let r = (e / o).toFixed(4), l = Math.floor(r * t), n = "";
+    for (let a = 0; a < l; a++)
+      n += "█";
+    let i = "";
+    for (let a = 0; a < t - l; a++)
+      i += "░";
+    let c = `- 文件上传进度: ${n}${i} (${e}/${o}) ${(100 * r).toFixed(2)}%`;
+    F(c), e == o && console.log("");
   }
   /**
    * 获取目录下所有文件并分类
    * @param {*} dir 
    */
   getFilesInDirectory(e) {
-    const t = [], i = [];
-    return new Promise((s, n) => {
-      const l = (r, c, a) => {
-        const w = k.readdirSync(r);
-        let m = !1;
-        w.forEach((d) => {
-          const p = F.join(r, d), y = k.statSync(p).isDirectory();
-          y ? m = !0 : t.push({
-            localPath: p,
+    const o = [], t = [];
+    return new Promise((r, l) => {
+      const n = (i, c, a) => {
+        const p = C.readdirSync(i);
+        let y = !1;
+        p.forEach((d) => {
+          const m = A.join(i, d), w = C.statSync(m).isDirectory();
+          w ? y = !0 : o.push({
+            localPath: m,
             // 本地路径
             remotePath: `${c}${d}`,
             // 远程路径
             level: a
             // 文件或目录层级
-          }), y && l(p, `${c}${d}/`, a + 1);
-        }), m || i.push(c);
+          }), w && n(m, `${c}${d}/`, a + 1);
+        }), y || t.push(c);
       };
-      l(e, "/", 0), s({
-        localFileList: t,
-        dirList: i
+      n(e, "/", 0), r({
+        localFileList: o,
+        dirList: t
       });
     });
   }
@@ -331,10 +347,10 @@ exit
    * @param { string } name
    */
   getArgv(e) {
-    const t = process.argv;
-    let i;
-    return t.forEach((s) => {
-      s.indexOf(e) > -1 && (i = s.split("=")[1] || "");
-    }), i;
+    const o = process.argv;
+    let t;
+    return o.forEach((r) => {
+      r.indexOf(e) > -1 && (t = r.split("=")[1] || "");
+    }), t;
   }
 };

package/dist/yj-deploy.umd.js

@@ -1,8 +1,9 @@
-(function(h){typeof define=="function"&&define.amd?define(h):h()})(function(){"use strict";var v=Object.defineProperty;var F=(h,f,u)=>f in h?v(h,f,{enumerable:!0,configurable:!0,writable:!0,value:u}):h[f]=u;var w=(h,f,u)=>(F(h,typeof f!="symbol"?f+"":f,u),u);const{stdout:h}=require("single-line-log"),f=require("path"),u=require("fs"),{Client:D}=require("ssh2");module.exports=class{constructor(e){w(this,"config",{host:"",port:"",username:"",password:"",namespace:"",imageStore:"dev-images",tmpName:"dev",delay:0,fileDir:"",rootDir:"/home/yjweb",dockerfile:{name:"Dockerfile",content:["FROM harbor.yunjingtech.cn:30002/yj-base/nginx:latest","RUN rm -rf /usr/share/nginx/html/*","COPY dist /usr/share/nginx/html/"]},upload:{name:"upload.sh",content:["#!/bin/sh","tag=`basename \\`pwd\\``:$2-`date +%Y%m%d`",'echo "- 镜像仓库: $1"','echo "- 镜像环境: $2"',"docker build -t harbor.yunjingtech.cn:30002/$1/$tag .","docker push harbor.yunjingtech.cn:30002/$1/$tag","echo - 镜像地址: harbor.yunjingtech.cn:30002/$1/$tag"]},dist:{name:"dist"},parallelDir:20,parallelFile:50,allLog:!1,lazyUpload:!1});w(this,"ssh2Conn",null);w(this,"uploading",!1);w(this,"trim",null);return this.config=Object.assign(this.config,e),{name:"yj-deploy",isPut:this.isPut.bind(this),upload:this.upload.bind(this),apply:this.apply.bind(this),closeBundle:this.isPut.bind(this)}}apply(e){return e&&e.hooks&&e.hooks.done&&e.hooks.done.tap("yj-deploy",()=>{this.isPut()}),"build"}isPut(){this.getArgv("--deploy")!=null&&(clearTimeout(this.trim),this.trim=setTimeout(()=>{this.upload()},this.config.delay||0))}upload(){if(console.log("-------------- deploy-start --------------"),!this.config.host){console.log("- 请配置跳板机地址 host");return}if(!this.config.port){console.log("- 请配置跳板机端口 port");return}if(!this.config.username){console.log("- 请配置跳板机账号 username");return}if(!this.config.password){console.log("- 请配置跳板机密码 password");return}this.uploading||(this.ssh2Conn=new D,this.ssh2Conn.on("ready",()=>{console.log("- 跳板机连接成功！"),this.ssh2Conn.sftp(async(e,t)=>{e&&(console.log("- sftp连接失败"),this.breakConnect()),this.config.namespace||(console.log("- 请配置项目命名空间 namespace"),this.breakConnect()),this.uploading=!0,this.getArgv("--reset")!==void 0&&(console.log("- 重置项目"),await this.onShell(`rm -r ${this.config.rootDir}/${this.config.namespace}`)),this.upLoadProject(t,`${this.config.rootDir}/${this.config.namespace}`)})}).connect({host:this.config.host,port:this.config.port,username:this.config.username,password:this.config.password}),this.ssh2Conn.on("error",e=>{console.log(`- 连接失败: ${e}`),this.breakConnect()}),this.ssh2Conn.on("end",()=>{this.uploading=!1}))}breakConnect(){this.uploading=!1,console.log("- 已断开连接"),console.log("-------------- deploy-end --------------"),this.ssh2Conn.end()}onShell(e){const t=this.getArgv("--allLog")!==void 0;return new Promise((n,s)=>{this.ssh2Conn.shell((i,l)=>{if(i){console.log("- 远程命令错误："+i,e),this.breakConnect(),s(i);return}let r=[];l.on("close",()=>{n(r.toString())}).on("data",c=>{let a=c.toString();(t||this.config.allLog||a.startsWith("- "))&&r.push(`
+(function(h){typeof define=="function"&&define.amd?define(h):h()})(function(){"use strict";var F=Object.defineProperty;var A=(h,u,f)=>u in h?F(h,u,{enumerable:!0,configurable:!0,writable:!0,value:f}):h[u]=f;var w=(h,u,f)=>(A(h,typeof u!="symbol"?u+"":u,f),f);const{stdout:h}=require("single-line-log"),u=require("path"),f=require("fs"),{Client:x}=require("ssh2");module.exports=class{constructor(e){w(this,"config",{host:"",port:"",username:"",password:"",namespace:"",imageStore:"dev-images",tmpName:"dev",delay:0,fileDir:"",rootDir:"/home/yjweb",dockerfile:{name:"Dockerfile",content:["FROM harbor.yunjingtech.cn:30002/yj-base/nginx:latest","RUN rm -rf /usr/share/nginx/html/*","COPY dist /usr/share/nginx/html/"]},upload:{name:"upload.sh",content:["#!/bin/sh","tag=`basename \\`pwd\\``:$2-`date +%Y%m%d`",'echo "- 镜像仓库: $1"','echo "- 镜像环境: $2"',"docker build -t harbor.yunjingtech.cn:30002/$1/$tag .","docker push harbor.yunjingtech.cn:30002/$1/$tag","if [ $? -eq 0 ];then","echo - 推送成功","echo - 镜像地址: harbor.yunjingtech.cn:30002/$1/$tag","else","echo - 镜像推送失败，请重试或联系运维人员，如需查看全部docker日志，请在命令后添加 --allLog查看更多信息","fi"]},dist:{name:"dist"},parallelDir:20,parallelFile:50,allLog:!1,lazyUpload:!1,rePushNum:3});w(this,"ssh2Conn",null);w(this,"uploading",!1);w(this,"trim",null);return this.config=Object.assign(this.config,e),{name:"yj-deploy",isPut:this.isPut.bind(this),upload:this.upload.bind(this),apply:this.apply.bind(this),closeBundle:this.isPut.bind(this)}}apply(e){return e&&e.hooks&&e.hooks.done&&e.hooks.done.tap("yj-deploy",()=>{this.isPut()}),"build"}isPut(){this.getArgv("--deploy")!=null&&(clearTimeout(this.trim),this.trim=setTimeout(()=>{this.upload()},this.config.delay||0))}upload(){if(console.log("-------------- deploy-start --------------"),!this.config.host){console.log("- 请配置跳板机地址 host");return}if(!this.config.port){console.log("- 请配置跳板机端口 port");return}if(!this.config.username){console.log("- 请配置跳板机账号 username");return}if(!this.config.password){console.log("- 请配置跳板机密码 password");return}this.uploading||(this.ssh2Conn=new x,this.ssh2Conn.on("ready",()=>{console.log("- 跳板机连接成功！"),this.ssh2Conn.sftp(async(e,t)=>{e&&(console.log("- sftp连接失败"),this.breakConnect()),this.config.namespace||(console.log("- 请配置项目命名空间 namespace"),this.breakConnect()),this.uploading=!0,this.getArgv("--reset")!==void 0&&(console.log("- 重置项目"),await this.onShell(`rm -r ${this.config.rootDir}/${this.config.namespace}`)),this.upLoadProject(t,`${this.config.rootDir}/${this.config.namespace}`)})}).connect({host:this.config.host,port:this.config.port,username:this.config.username,password:this.config.password}),this.ssh2Conn.on("error",e=>{console.log(`- 连接失败: ${e}`),this.breakConnect()}),this.ssh2Conn.on("end",()=>{this.uploading=!1}))}breakConnect(){this.uploading=!1,console.log("- 已断开连接"),console.log("-------------- deploy-end --------------"),this.ssh2Conn.end()}onShell(e){const t=this.getArgv("--allLog")!==void 0;return new Promise((o,l)=>{this.ssh2Conn.shell((r,s)=>{if(r){console.log("- 远程命令错误："+r,e),this.breakConnect(),l(r);return}let i=[];s.on("close",()=>{o(i.toString())}).on("data",c=>{let a=c.toString();(t||this.config.allLog||a.startsWith("- "))&&i.push(`
 `+a)}).stderr.on("data",c=>{console.log(`- 远程命令错误：
-`+c),this.breakConnect(),s(c)}),l.end(e+`
+`+c),this.breakConnect(),l(c)}),s.end(e+`
 exit
-`)})})}projectInit(e,t){return new Promise(async(n,s)=>{e.mkdir(t,async i=>{if(i)s(i);else{console.log("- 正在创建dockerfile");const l=`${t}/${this.config.dockerfile.name}`;await this.onShell(`touch ${l}`),await this.onShell(`echo '${this.config.dockerfile.content.join(`
-`)}' > ${l}`),console.log("- 正在创建upload.sh");const r=`${t}/${this.config.upload.name}`;await this.onShell(`touch ${r}`),await this.onShell(`echo '${this.config.upload.content.join(`
-`)}' > ${r}`),n()}})})}checkRemoteFile(e,t){return new Promise(n=>{e.stat(t,s=>{n(!s)})})}upLoadProject(e,t){e.readdir(t,async n=>{if(n){console.log("- 跳板机不存在项目, 开始创建项目"),this.projectInit(e,t).then(()=>{console.log(`- ${this.config.namespace}项目创建成功`),this.upLoadProject(e,t)}).catch(o=>{console.log(`- 创建项目失败: ${o}`),this.breakConnect()});return}const s=this.getArgv("--lazyUpload")!==void 0||this.config.lazyUpload,i=`${t}/${this.config.dist.name}`;if(s||await this.onShell(`rm -rf ${i}`),await this.onShell(`mkdir ${i}`),!this.config.fileDir){console.log("- 请配置待上传文件目录 fileDir"),this.breakConnect();return}const{localFileList:l,dirList:r}=await this.getFilesInDirectory(this.config.fileDir);if(l.length===0){console.log("- 待上传目录没有获取到文件，请检查"),this.breakConnect();return}let c=0,a=l.length;const S=o=>new Promise(async(p,d)=>{try{if(s&&await this.checkRemoteFile(e,`${i}${o.remotePath}`))return p();const g=u.createReadStream(o.localPath),k=e.createWriteStream(`${i}${o.remotePath}`);k.on("close",()=>{this.progressBar(++c,a),p()}),k.on("error",C=>{console.log(`- 文件 ${o.remotePath} 上传失败：${C}`),d(C),this.breakConnect()}),g.pipe(k)}catch(g){d(g)}}),y=(o,p)=>{let d=[];for(let g=0;g<o.length;g+=p)d.push(o.slice(g,g+p));return d},m=o=>{if(o.length===0)return Promise.resolve();const p=o.shift();return Promise.all(p.map(d=>S(d))).then(()=>m(o))},$=o=>{if(o.length===0)return Promise.resolve();let d=o.shift().map(g=>`${i}${g}`).join(" ");return this.onShell(`mkdir -p ${d}`).then(()=>$(o))};let j=[...y(r,this.config.parallelDir||20)];await $(j),console.log("- 创建目录完成"),await new Promise(o=>{setTimeout(()=>{o()},500)});let P=[...y(l,this.config.parallelFile||50)];await m(P),s&&(this.progressBar(a,a),console.log("\x1B[32m%s\x1B[0m",`- 已开启懒上传，本次共上传 ${c} 个文件`)),console.log("- 文件上传成功"),console.log("- 开始推送镜像");let b=`cd ${t} && sh ${this.config.upload.name}`;if(await this.isNewShell(e,t)){const o=this.getArgv("--imageStore")||this.config.imageStore;b+=` ${o}`}else console.log(`
-- warning 检测到当前脚本为手动创建,不支持镜像仓库配置,imageStore将失效`),console.log("- warning 如需支持imageStore参数,请在命令行后添加 --reset 重新生成脚本");const x=this.getArgv("--tmpName")||this.config.tmpName;b+=` ${x}`;const L=await this.onShell(b);console.log(L),console.log("- 镜像推送完成"),this.breakConnect()})}async isNewShell(e,t){return new Promise((n,s)=>{e.readFile(`${t}/${this.config.upload.name}`,(i,l)=>{if(i)return s(!1);const r=l.toString();n(r.includes("$2"))})})}progressBar(e,t,n=25){let s=(e/t).toFixed(4),i=Math.floor(s*n),l="";for(let a=0;a<i;a++)l+="█";let r="";for(let a=0;a<n-i;a++)r+="░";let c=`- 文件上传进度: ${l}${r} (${e}/${t}) ${(100*s).toFixed(2)}%`;h(c),e==t&&console.log("")}getFilesInDirectory(e){const t=[],n=[];return new Promise((s,i)=>{const l=(r,c,a)=>{const S=u.readdirSync(r);let y=!1;S.forEach(m=>{const $=f.join(r,m),P=u.statSync($).isDirectory();P?y=!0:t.push({localPath:$,remotePath:`${c}${m}`,level:a}),P&&l($,`${c}${m}/`,a+1)}),y||n.push(c)};l(e,"/",0),s({localFileList:t,dirList:n})})}getArgv(e){const t=process.argv;let n;return t.forEach(s=>{s.indexOf(e)>-1&&(n=s.split("=")[1]||"")}),n}}});
+`)})})}projectInit(e,t){return new Promise(async(o,l)=>{e.mkdir(t,async r=>{if(r)l(r);else{console.log("- 正在创建dockerfile");const s=`${t}/${this.config.dockerfile.name}`;await this.onShell(`touch ${s}`),await this.onShell(`echo '${this.config.dockerfile.content.join(`
+`)}' > ${s}`),console.log("- 正在创建upload.sh");const i=`${t}/${this.config.upload.name}`;await this.onShell(`touch ${i}`),await this.onShell(`echo '${this.config.upload.content.join(`
+`)}' > ${i}`),o()}})})}checkRemoteFile(e,t){return new Promise(o=>{e.stat(t,l=>{o(!l)})})}upLoadProject(e,t){let o=0;typeof this.config.rePushNum=="number"&&this.config.rePushNum>0&&(o=this.config.rePushNum),e.readdir(t,async l=>{if(l){console.log("- 跳板机不存在项目, 开始创建项目"),this.projectInit(e,t).then(()=>{console.log(`- ${this.config.namespace}项目创建成功`),this.upLoadProject(e,t)}).catch(n=>{console.log(`- 创建项目失败: ${n}`),this.breakConnect()});return}const r=this.getArgv("--lazyUpload")!==void 0||this.config.lazyUpload,s=`${t}/${this.config.dist.name}`;if(r||await this.onShell(`rm -rf ${s}`),await this.onShell(`mkdir ${s}`),!this.config.fileDir){console.log("- 请配置待上传文件目录 fileDir"),this.breakConnect();return}const{localFileList:i,dirList:c}=await this.getFilesInDirectory(this.config.fileDir);if(i.length===0){console.log("- 待上传目录没有获取到文件，请检查"),this.breakConnect();return}let a=0,y=i.length;const P=n=>new Promise(async(m,d)=>{try{if(r&&await this.checkRemoteFile(e,`${s}${n.remotePath}`))return m();const g=f.createReadStream(n.localPath),C=e.createWriteStream(`${s}${n.remotePath}`);C.on("close",()=>{this.progressBar(++a,y),m()}),C.on("error",j=>{console.log(`- 文件 ${n.remotePath} 上传失败：${j}`),d(j),this.breakConnect()}),g.pipe(C)}catch(g){d(g)}}),p=(n,m)=>{let d=[];for(let g=0;g<n.length;g+=m)d.push(n.slice(g,g+m));return d},$=n=>{if(n.length===0)return Promise.resolve();const m=n.shift();return Promise.all(m.map(d=>P(d))).then(()=>$(n))},b=n=>{if(n.length===0)return Promise.resolve();let d=n.shift().map(g=>`${s}${g}`).join(" ");return this.onShell(`mkdir -p ${d}`).then(()=>b(n))};let S=[...p(c,this.config.parallelDir||20)];await b(S),console.log("- 创建目录完成"),await new Promise(n=>{setTimeout(()=>{n()},500)});let L=[...p(i,this.config.parallelFile||50)];await $(L),r&&(this.progressBar(y,y),console.log("\x1B[32m%s\x1B[0m",`- 已开启懒上传，本次共上传 ${a} 个文件`)),console.log("- 文件上传成功"),console.log("- 开始推送镜像");let k=`cd ${t} && sh ${this.config.upload.name}`;if(await this.isNewShell(e,t)){const n=this.getArgv("--imageStore")||this.config.imageStore;k+=` ${n}`}else console.log(`
+- warning 检测到当前脚本为手动创建,不支持镜像仓库配置,imageStore将失效`),console.log("- warning 如需支持imageStore参数,请在命令行后添加 --reset 重新生成脚本");const v=this.getArgv("--tmpName")||this.config.tmpName;k+=` ${v}`;const D=Array.from(new Array(o+1)).map(()=>this.onShell(k));await this.pushMirrorImage(D,D.length),this.breakConnect()})}async pushMirrorImage(e,t){if(e.length===0)return console.log("- 镜像推送失败，请添加 --allLog 查看全部日志"),null;const o=await e[0];return o.includes("- 镜像推送失败")?(console.log(o),e.length>1&&console.log(`- 正在尝试第 ${t-e.length+1} 次推送...`),this.pushMirrorImage(e.slice(1),t)):(console.log(o),console.log("- 镜像推送结束"),o)}async isNewShell(e,t){return new Promise((o,l)=>{e.readFile(`${t}/${this.config.upload.name}`,(r,s)=>{if(r)return l(!1);const i=s.toString();i.includes("- 镜像推送失败")||console.log(`
+- warning 检测到当前脚本可能不是最新版本，推送失败可能不会提示，且没有失败自动重试功能，请在命令后添加 --reset 重新生成脚本`),o(i.includes("$2"))})})}progressBar(e,t,o=25){let l=(e/t).toFixed(4),r=Math.floor(l*o),s="";for(let a=0;a<r;a++)s+="█";let i="";for(let a=0;a<o-r;a++)i+="░";let c=`- 文件上传进度: ${s}${i} (${e}/${t}) ${(100*l).toFixed(2)}%`;h(c),e==t&&console.log("")}getFilesInDirectory(e){const t=[],o=[];return new Promise((l,r)=>{const s=(i,c,a)=>{const y=f.readdirSync(i);let P=!1;y.forEach(p=>{const $=u.join(i,p),S=f.statSync($).isDirectory();S?P=!0:t.push({localPath:$,remotePath:`${c}${p}`,level:a}),S&&s($,`${c}${p}/`,a+1)}),P||o.push(c)};s(e,"/",0),l({localFileList:t,dirList:o})})}getArgv(e){const t=process.argv;let o;return t.forEach(l=>{l.indexOf(e)>-1&&(o=l.split("=")[1]||"")}),o}}});

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "yj-deploy",
-  "version": "0.0.7",
+  "version": "0.0.8",
   "description": "ssh sftp",
   "scripts": {
     "build": "vite build"