yj-deploy 0.0.8 → 0.0.9

package/README.md

@@ -12,6 +12,7 @@
 - ✔ 支持多种方式配置 `镜像仓库` `镜像环境`等参数
 - ✔ 支持懒上传，仅上传新增部分文件，提升上传效率
 - ✔ 支持失败自动重新上传，支持配置次数，防止网络不稳定可能导致上传失败
+- ✔ 镜像推送成功支持自动重启服务，减少部署流程
 > 全程不需要连接跳板机做任何操作即可完成镜像推送
 
 ## 运行情况
@@ -81,7 +82,17 @@ const deploy = new yjDeploy({
       'else',
       'echo - 镜像推送失败，请重试或联系运维人员，如需查看全部docker日志，请在命令后添加 --allLog查看更多信息',
       'fi',
-    ]
+    ],
+    
+    // 自动重启服务的rancher配置
+    rancherConfig: {
+      token: '', // Rancher API 访问令牌 （必填）
+      namespace: '', // 服务所在的命名空间 （必填）
+      workload: '', // 服务名称 （必填）
+
+      // baseUrl: '', // Rancher API 基础地址
+      // clusterId: '', // Rancher 集群 ID
+    }
   },
 
   // 上传dist目录信息 （除非运维改变，否则不要配置）
@@ -256,6 +267,15 @@ node uploader.js --tmpName=test
 如果小程序修改了相同路径和文件名的文件，会存在无法判断的情况（使用hash值能判断，但是成本过高），这种情况请关掉此选项，或使用 --reset 重置项目
 :::
 
+### --restart
+`--restart` ：是否需要自动重启服务，加上此命令，且配置了rancherConfig，将会自动重启服务
+
+::: warning
+仅对开发环境生效，并且需要先在rancher创建服务后方能成功
+:::
+
+<br />
+
 
 <br />
 
@@ -268,6 +288,9 @@ node uploader.js --tmpName=test
 
 ## 升级日志
 
+### v0.0.9
+  支持自动重启服务，上传完后，可以根据配置自动重启rancher服务
+
 ### v0.0.8
   支持判断是否推送成功，如果推送失败，则自动重试三次，可以手动配置重试次数
 

package/dist/yj-deploy.mjs

@@ -1,7 +1,7 @@
-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");
+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: A } = require("single-line-log"), F = require("path"), C = require("fs"), { Client: N } = require("ssh2"), I = require("./rancher");
 module.exports = class {
   constructor(e) {
     $(this, "config", {
@@ -60,8 +60,19 @@ module.exports = class {
       // 是否显示全部日志
       lazyUpload: !1,
       // 是否开启懒上传
-      rePushNum: 3
+      rePushNum: 3,
       // 重新推送次数，为0代表不重新推送
+      // 仅能通过命令启用
+      rancherConfig: {
+        // baseUrl: '', // Rancher API 基础地址
+        // clusterId: '', // Rancher 集群 ID
+        token: "",
+        // Rancher API 访问令牌
+        namespace: "",
+        // 服务所在的命名空间
+        workload: ""
+        // 工作负载名称
+      }
     });
     $(this, "ssh2Conn", null);
     // 上传状态
@@ -115,8 +126,8 @@ module.exports = class {
       return;
     }
     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}`);
+      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,
@@ -141,24 +152,24 @@ module.exports = class {
    * @returns Promise
    */
   onShell(e) {
-    const o = this.getArgv("--allLog") !== void 0;
-    return new Promise((t, r) => {
-      this.ssh2Conn.shell((l, n) => {
+    const t = this.getArgv("--allLog") !== void 0;
+    return new Promise((o, r) => {
+      this.ssh2Conn.shell((l, s) => {
         if (l) {
           console.log("- 远程命令错误：" + l, e), this.breakConnect(), r(l);
           return;
         }
         let i = [];
-        n.on("close", () => {
-          t(i.toString());
+        s.on("close", () => {
+          o(i.toString());
         }).on("data", (c) => {
           let a = c.toString();
-          (o || this.config.allLog || a.startsWith("- ")) && i.push(`
+          (t || this.config.allLog || a.startsWith("- ")) && i.push(`
 ` + a);
         }).stderr.on("data", (c) => {
           console.log(`- 远程命令错误：
 ` + c), this.breakConnect(), r(c);
-        }), n.end(e + `
+        }), s.end(e + `
 exit
 `);
       });
@@ -169,19 +180,19 @@ exit
    * @param {*} sftp 
    * @param {*} dir 
    */
-  projectInit(e, o) {
-    return new Promise(async (t, r) => {
-      e.mkdir(o, async (l) => {
+  projectInit(e, t) {
+    return new Promise(async (o, r) => {
+      e.mkdir(t, async (l) => {
         if (l)
           r(l);
         else {
           console.log("- 正在创建dockerfile");
-          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}`;
+          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}`), t();
+`)}' > ${i}`), o();
         }
       });
     });
@@ -192,10 +203,10 @@ exit
    * @param {*} remotePath 
    * @returns 
    */
-  checkRemoteFile(e, o) {
-    return new Promise((t) => {
-      e.stat(o, (r) => {
-        t(!r);
+  checkRemoteFile(e, t) {
+    return new Promise((o) => {
+      e.stat(t, (r) => {
+        o(!r);
       });
     });
   }
@@ -204,19 +215,19 @@ exit
    * @param {*} sftp 
    * @param {*} dir 
    */
-  upLoadProject(e, o) {
-    let t = 0;
-    typeof this.config.rePushNum == "number" && this.config.rePushNum > 0 && (t = this.config.rePushNum), e.readdir(o, async (r) => {
+  upLoadProject(e, t) {
+    let o = 0;
+    typeof this.config.rePushNum == "number" && this.config.rePushNum > 0 && (o = this.config.rePushNum), e.readdir(t, 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();
+        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 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) {
+      const l = this.getArgv("--lazyUpload") !== void 0 || this.config.lazyUpload, s = `${t}/${this.config.dist.name}`;
+      if (l || await this.onShell(`rm -rf ${s}`), await this.onShell(`mkdir ${s}`), !this.config.fileDir) {
         console.log("- 请配置待上传文件目录 fileDir"), this.breakConnect();
         return;
       }
@@ -226,76 +237,76 @@ exit
         return;
       }
       let a = 0, p = i.length;
-      const y = (s) => new Promise(async (u, g) => {
+      const y = (n) => new Promise(async (u, g) => {
         try {
-          if (l && await this.checkRemoteFile(e, `${n}${s.remotePath}`))
+          if (l && await this.checkRemoteFile(e, `${s}${n.remotePath}`))
             return u();
-          const h = C.createReadStream(s.localPath), b = e.createWriteStream(`${n}${s.remotePath}`);
-          b.on("close", () => {
+          const h = C.createReadStream(n.localPath), k = e.createWriteStream(`${s}${n.remotePath}`);
+          k.on("close", () => {
             this.progressBar(++a, p), u();
-          }), b.on("error", (k) => {
-            console.log(`- 文件 ${s.remotePath} 上传失败：${k}`), g(k), this.breakConnect();
-          }), h.pipe(b);
+          }), k.on("error", (b) => {
+            console.log(`- 文件 ${n.remotePath} 上传失败：${b}`), g(b), this.breakConnect();
+          }), h.pipe(k);
         } catch (h) {
           g(h);
         }
-      }), d = (s, u) => {
+      }), d = (n, u) => {
         let g = [];
-        for (let h = 0; h < s.length; h += u)
-          g.push(s.slice(h, h + u));
+        for (let h = 0; h < n.length; h += u)
+          g.push(n.slice(h, h + u));
         return g;
-      }, m = (s) => {
-        if (s.length === 0)
+      }, m = (n) => {
+        if (n.length === 0)
           return Promise.resolve();
-        const u = s.shift();
-        return Promise.all(u.map((g) => y(g))).then(() => m(s));
-      }, P = (s) => {
-        if (s.length === 0)
+        const u = n.shift();
+        return Promise.all(u.map((g) => y(g))).then(() => m(n));
+      }, P = (n) => {
+        if (n.length === 0)
           return Promise.resolve();
-        let g = s.shift().map((h) => `${n}${h}`).join(" ");
-        return this.onShell(`mkdir -p ${g}`).then(() => P(s));
+        let g = n.shift().map((h) => `${s}${h}`).join(" ");
+        return this.onShell(`mkdir -p ${g}`).then(() => P(n));
       };
       let w = [...d(c, this.config.parallelDir || 20)];
-      await P(w), console.log("- 创建目录完成"), await new Promise((s) => {
+      await P(w), console.log("- 创建目录完成"), await new Promise((n) => {
         setTimeout(() => {
-          s();
+          n();
         }, 500);
       });
       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}`;
+      let S = `cd ${t} && sh ${this.config.upload.name}`;
+      if (await this.isNewShell(e, t)) {
+        const n = this.getArgv("--imageStore") || this.config.imageStore;
+        S += ` ${n}`;
       } else
         console.log(`
 - warning 检测到当前脚本为手动创建,不支持镜像仓库配置,imageStore将失效`), console.log("- warning 如需支持imageStore参数,请在命令行后添加 --reset 重新生成脚本");
-      const x = this.getArgv("--tmpName") || this.config.tmpName;
-      S += ` ${x}`;
-      const j = Array.from(new Array(t + 1)).map(() => this.onShell(S));
+      const v = this.getArgv("--tmpName") || this.config.tmpName;
+      S += ` ${v}`;
+      const j = Array.from(new Array(o + 1)).map(() => this.onShell(S));
       await this.pushMirrorImage(j, j.length), this.breakConnect();
     });
   }
   // 推送镜像
-  async pushMirrorImage(e, o) {
+  async pushMirrorImage(e, t) {
     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);
+    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("- 镜像推送结束"), this.getArgv("--restart") !== void 0 && await I(o, this.config.rancherConfig), o);
   }
   /**
    * 获取脚本内容是不是自动创建的脚本
    * 兼容用户手动根据运维文档创建的推送脚本，因参数不同可能报错的问题
    * 有 $2代表是自动创建的版本，否则老版本
   */
-  async isNewShell(e, o) {
-    return new Promise((t, r) => {
-      e.readFile(`${o}/${this.config.upload.name}`, (l, n) => {
+  async isNewShell(e, t) {
+    return new Promise((o, r) => {
+      e.readFile(`${t}/${this.config.upload.name}`, (l, s) => {
         if (l)
           return r(!1);
-        const i = n.toString();
+        const i = s.toString();
         i.includes("- 镜像推送失败") || console.log(`
-- warning 检测到当前脚本可能不是最新版本，推送失败可能不会提示，且没有失败自动重试功能，请在命令后添加 --reset 重新生成脚本`), t(i.includes("$2"));
+- warning 检测到当前脚本可能不是最新版本，推送失败可能不会提示，且没有失败自动重试功能，请在命令后添加 --reset 重新生成脚本`), o(i.includes("$2"));
       });
     });
   }
@@ -304,41 +315,41 @@ exit
    * @param description 命令行开头的文字信息
    * @param bar_length 进度条的长度(单位：字符)，默认设为 25
    */
-  progressBar(e, o, t = 25) {
-    let r = (e / o).toFixed(4), l = Math.floor(r * t), n = "";
+  progressBar(e, t, o = 25) {
+    let r = (e / t).toFixed(4), l = Math.floor(r * o), s = "";
     for (let a = 0; a < l; a++)
-      n += "█";
+      s += "█";
     let i = "";
-    for (let a = 0; a < t - l; a++)
+    for (let a = 0; a < o - l; a++)
       i += "░";
-    let c = `- 文件上传进度: ${n}${i} (${e}/${o}) ${(100 * r).toFixed(2)}%`;
-    F(c), e == o && console.log("");
+    let c = `- 文件上传进度: ${s}${i} (${e}/${t}) ${(100 * r).toFixed(2)}%`;
+    A(c), e == t && console.log("");
   }
   /**
    * 获取目录下所有文件并分类
    * @param {*} dir 
    */
   getFilesInDirectory(e) {
-    const o = [], t = [];
+    const t = [], o = [];
     return new Promise((r, l) => {
-      const n = (i, c, a) => {
+      const s = (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({
+          const m = F.join(i, d), w = C.statSync(m).isDirectory();
+          w ? y = !0 : t.push({
             localPath: m,
             // 本地路径
             remotePath: `${c}${d}`,
             // 远程路径
             level: a
             // 文件或目录层级
-          }), w && n(m, `${c}${d}/`, a + 1);
-        }), y || t.push(c);
+          }), w && s(m, `${c}${d}/`, a + 1);
+        }), y || o.push(c);
       };
-      n(e, "/", 0), r({
-        localFileList: o,
-        dirList: t
+      s(e, "/", 0), r({
+        localFileList: t,
+        dirList: o
       });
     });
   }
@@ -347,10 +358,10 @@ exit
    * @param { string } name
    */
   getArgv(e) {
-    const o = process.argv;
-    let t;
-    return o.forEach((r) => {
-      r.indexOf(e) > -1 && (t = r.split("=")[1] || "");
-    }), t;
+    const t = process.argv;
+    let o;
+    return t.forEach((r) => {
+      r.indexOf(e) > -1 && (o = r.split("=")[1] || "");
+    }), o;
   }
 };

package/dist/yj-deploy.umd.js

@@ -1,9 +1,9 @@
-(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(`
+(function(h){typeof define=="function"&&define.amd?define(h):h()})(function(){"use strict";var F=Object.defineProperty;var N=(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)=>(N(h,typeof u!="symbol"?u+"":u,f),f);const{stdout:h}=require("single-line-log"),u=require("path"),f=require("fs"),{Client:v}=require("ssh2"),x=require("./rancher");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,rancherConfig:{token:"",namespace:"",workload:""}});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 v,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,r)=>{this.ssh2Conn.shell((l,i)=>{if(l){console.log("- 远程命令错误："+l,e),this.breakConnect(),r(l);return}let s=[];i.on("close",()=>{o(s.toString())}).on("data",c=>{let a=c.toString();(t||this.config.allLog||a.startsWith("- "))&&s.push(`
 `+a)}).stderr.on("data",c=>{console.log(`- 远程命令错误：
-`+c),this.breakConnect(),l(c)}),s.end(e+`
+`+c),this.breakConnect(),r(c)}),i.end(e+`
 exit
-`)})})}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}}});
+`)})})}projectInit(e,t){return new Promise(async(o,r)=>{e.mkdir(t,async l=>{if(l)r(l);else{console.log("- 正在创建dockerfile");const i=`${t}/${this.config.dockerfile.name}`;await this.onShell(`touch ${i}`),await this.onShell(`echo '${this.config.dockerfile.content.join(`
+`)}' > ${i}`),console.log("- 正在创建upload.sh");const s=`${t}/${this.config.upload.name}`;await this.onShell(`touch ${s}`),await this.onShell(`echo '${this.config.upload.content.join(`
+`)}' > ${s}`),o()}})})}checkRemoteFile(e,t){return new Promise(o=>{e.stat(t,r=>{o(!r)})})}upLoadProject(e,t){let o=0;typeof this.config.rePushNum=="number"&&this.config.rePushNum>0&&(o=this.config.rePushNum),e.readdir(t,async r=>{if(r){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 l=this.getArgv("--lazyUpload")!==void 0||this.config.lazyUpload,i=`${t}/${this.config.dist.name}`;if(l||await this.onShell(`rm -rf ${i}`),await this.onShell(`mkdir ${i}`),!this.config.fileDir){console.log("- 请配置待上传文件目录 fileDir"),this.breakConnect();return}const{localFileList:s,dirList:c}=await this.getFilesInDirectory(this.config.fileDir);if(s.length===0){console.log("- 待上传目录没有获取到文件，请检查"),this.breakConnect();return}let a=0,y=s.length;const P=n=>new Promise(async(m,d)=>{try{if(l&&await this.checkRemoteFile(e,`${i}${n.remotePath}`))return m();const g=f.createReadStream(n.localPath),C=e.createWriteStream(`${i}${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))},k=n=>{if(n.length===0)return Promise.resolve();let d=n.shift().map(g=>`${i}${g}`).join(" ");return this.onShell(`mkdir -p ${d}`).then(()=>k(n))};let S=[...p(c,this.config.parallelDir||20)];await k(S),console.log("- 创建目录完成"),await new Promise(n=>{setTimeout(()=>{n()},500)});let L=[...p(s,this.config.parallelFile||50)];await $(L),l&&(this.progressBar(y,y),console.log("\x1B[32m%s\x1B[0m",`- 已开启懒上传，本次共上传 ${a} 个文件`)),console.log("- 文件上传成功"),console.log("- 开始推送镜像");let b=`cd ${t} && sh ${this.config.upload.name}`;if(await this.isNewShell(e,t)){const n=this.getArgv("--imageStore")||this.config.imageStore;b+=` ${n}`}else console.log(`
+- warning 检测到当前脚本为手动创建,不支持镜像仓库配置,imageStore将失效`),console.log("- warning 如需支持imageStore参数,请在命令行后添加 --reset 重新生成脚本");const A=this.getArgv("--tmpName")||this.config.tmpName;b+=` ${A}`;const D=Array.from(new Array(o+1)).map(()=>this.onShell(b));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("- 镜像推送结束"),this.getArgv("--restart")!==void 0&&await x(o,this.config.rancherConfig),o)}async isNewShell(e,t){return new Promise((o,r)=>{e.readFile(`${t}/${this.config.upload.name}`,(l,i)=>{if(l)return r(!1);const s=i.toString();s.includes("- 镜像推送失败")||console.log(`
+- warning 检测到当前脚本可能不是最新版本，推送失败可能不会提示，且没有失败自动重试功能，请在命令后添加 --reset 重新生成脚本`),o(s.includes("$2"))})})}progressBar(e,t,o=25){let r=(e/t).toFixed(4),l=Math.floor(r*o),i="";for(let a=0;a<l;a++)i+="█";let s="";for(let a=0;a<o-l;a++)s+="░";let c=`- 文件上传进度: ${i}${s} (${e}/${t}) ${(100*r).toFixed(2)}%`;h(c),e==t&&console.log("")}getFilesInDirectory(e){const t=[],o=[];return new Promise((r,l)=>{const i=(s,c,a)=>{const y=f.readdirSync(s);let P=!1;y.forEach(p=>{const $=u.join(s,p),S=f.statSync($).isDirectory();S?P=!0:t.push({localPath:$,remotePath:`${c}${p}`,level:a}),S&&i($,`${c}${p}/`,a+1)}),P||o.push(c)};i(e,"/",0),r({localFileList:t,dirList:o})})}getArgv(e){const t=process.argv;let o;return t.forEach(r=>{r.indexOf(e)>-1&&(o=r.split("=")[1]||"")}),o}}});

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "yj-deploy",
-  "version": "0.0.8",
+  "version": "0.0.9",
   "description": "ssh sftp",
   "scripts": {
     "build": "vite build"
@@ -25,6 +25,7 @@
     "ssh2": "^1.15.0"
   },
   "devDependencies": {
+    "axios": "^1.13.5",
     "vite": "4.5"
   },
   "publishConfig": {