yj-deploy 0.0.10 → 0.0.11

package/README.md

@@ -82,17 +82,7 @@ const deploy = new yjDeploy({
       'else',
       'echo - 镜像推送失败，请重试或联系运维人员，如需查看全部docker日志，请在命令后添加 --allLog查看更多信息',
       'fi',
-    ],
-    
-    // 自动重启服务的rancher配置
-    rancherConfig: {
-      token: '', // Rancher API 访问令牌 （必填）
-      namespace: '', // 服务所在的命名空间 （必填）
-      workload: '', // 服务名称 （必填）
-
-      // baseUrl: '', // Rancher API 基础地址
-      // clusterId: '', // Rancher 集群 ID
-    }
+    ]
   },
 
   // 上传dist目录信息 （除非运维改变，否则不要配置）
@@ -109,8 +99,46 @@ const deploy = new yjDeploy({
   lazyUpload: false, // 是否开启懒上传，针对小程序图片等仅需要部署新增部分文件的项目有奇效
   
   rePushNum: 3, // 重新推送次数，为0代表不重新推送
+    
+  // 自动重启服务的rancher配置
+  rancherConfig: {
+    token: '', // Rancher API 访问令牌 （必填）
+    namespace: '', // 服务所在的命名空间 （必填）
+    workload: '', // 服务名称 （必填）
+
+    // 非必填
+    baseUrl: '', // Rancher API 基础地址
+    clusterId: '', // Rancher 集群 ID
+  }
+}
+```
+
+
+## rancher配置说明
+需要自动重启服务时，必须配置如下内容，然后在命令后加上`--restart`即可启用自动重启功能（因为仅开发环境支持，所以启用命令只能通过加在命令行里）
+```js
+rancherConfig: {
+  token: '', // Rancher API 访问令牌 （必填）
+  namespace: '', // 服务所在的命名空间 （必填）
+  workload: '', // 服务名称 （必填）
+
+  // 非必填
+  baseUrl: '', // Rancher API 基础地址
+  clusterId: '', // Rancher 集群 ID
 }
 ```
+### token
+需要在rancher主页 -> 个人中心 -> API & Keys 内创建永久key，也可以复制其他已有项目里的token使用
+
+### namespace
+服务所在的命名空间 （必填）
+
+### workload
+服务名称 （必填）
+![服务名称](./img2.png)
+
+### baseUrl clusterId
+非必填，已默认配置为开发环境地址，除非运维更换rancher地址与集群id，否则不用配置
 
 <br />
 
@@ -269,6 +297,12 @@ node uploader.js --tmpName=test
 
 ### --restart
 `--restart` ：是否需要自动重启服务，加上此命令，且配置了rancherConfig，将会自动重启服务
+```javascript
+"scripts": {
+  // 开发环境
+  "deploy": "vite build --mode development -- --deploy --tmpName=dev --restart"
+}
+```
 
 ::: warning
 仅对开发环境生效，并且需要先在rancher创建服务后方能成功

package/dist/yj-deploy.mjs

@@ -1,10 +1,10 @@
-var x = Object.defineProperty;
-var L = (g, e, o) => e in g ? x(g, e, { enumerable: !0, configurable: !0, writable: !0, value: o }) : g[e] = o;
-var $ = (g, e, o) => (L(g, typeof e != "symbol" ? e + "" : e, o), o);
-const { stdout: F } = require("single-line-log"), N = require("path"), S = require("fs"), { Client: U } = require("ssh2"), A = require("axios"), R = require("https");
+var v = Object.defineProperty;
+var L = (u, e, o) => e in u ? v(u, e, { enumerable: !0, configurable: !0, writable: !0, value: o }) : u[e] = o;
+var w = (u, e, o) => (L(u, typeof e != "symbol" ? e + "" : e, o), o);
+const { stdout: U } = require("single-line-log"), F = require("path"), S = require("fs"), { Client: R } = require("ssh2"), N = require("axios"), q = require("https");
 module.exports = class {
   constructor(e) {
-    $(this, "config", {
+    w(this, "config", {
       host: "",
       port: "",
       username: "",
@@ -74,11 +74,11 @@ module.exports = class {
         // 工作负载名称
       }
     });
-    $(this, "ssh2Conn", null);
+    w(this, "ssh2Conn", null);
     // 上传状态
-    $(this, "uploading", !1);
+    w(this, "uploading", !1);
     // 定时器
-    $(this, "trim", null);
+    w(this, "trim", null);
     return this.config = Object.assign(this.config, e), {
       name: "yj-deploy",
       isPut: this.isPut.bind(this),
@@ -125,7 +125,7 @@ module.exports = class {
       console.log("- 请配置跳板机密码 password");
       return;
     }
-    this.uploading || (this.ssh2Conn = new U(), this.ssh2Conn.on("ready", () => {
+    this.uploading || (this.ssh2Conn = new R(), 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}`);
       });
@@ -153,23 +153,23 @@ module.exports = class {
    */
   onShell(e) {
     const o = this.getArgv("--allLog") !== void 0;
-    return new Promise((t, i) => {
-      this.ssh2Conn.shell((l, s) => {
-        if (l) {
-          console.log("- 远程命令错误：" + l, e), this.breakConnect(), i(l);
+    return new Promise((n, i) => {
+      this.ssh2Conn.shell((s, t) => {
+        if (s) {
+          console.log("- 远程命令错误：" + s, e), this.breakConnect(), i(s);
           return;
         }
-        let n = [];
-        s.on("close", () => {
-          t(n.toString());
-        }).on("data", (a) => {
-          let c = a.toString();
-          (o || this.config.allLog || c.startsWith("- ")) && n.push(`
-` + c);
-        }).stderr.on("data", (a) => {
+        let r = [];
+        t.on("close", () => {
+          n(r.toString());
+        }).on("data", (c) => {
+          let a = c.toString();
+          (o || this.config.allLog || a.startsWith("- ")) && r.push(`
+` + a);
+        }).stderr.on("data", (c) => {
           console.log(`- 远程命令错误：
-` + a), this.breakConnect(), i(a);
-        }), s.end(e + `
+` + c), this.breakConnect(), i(c);
+        }), t.end(e + `
 exit
 `);
       });
@@ -181,18 +181,18 @@ exit
    * @param {*} dir 
    */
   projectInit(e, o) {
-    return new Promise(async (t, i) => {
-      e.mkdir(o, async (l) => {
-        if (l)
-          i(l);
+    return new Promise(async (n, i) => {
+      e.mkdir(o, async (s) => {
+        if (s)
+          i(s);
         else {
           console.log("- 正在创建dockerfile");
-          const s = `${o}/${this.config.dockerfile.name}`;
-          await this.onShell(`touch ${s}`), await this.onShell(`echo '${this.config.dockerfile.content.join(`
-`)}' > ${s}`), console.log("- 正在创建upload.sh");
-          const n = `${o}/${this.config.upload.name}`;
-          await this.onShell(`touch ${n}`), await this.onShell(`echo '${this.config.upload.content.join(`
-`)}' > ${n}`), t();
+          const t = `${o}/${this.config.dockerfile.name}`;
+          await this.onShell(`touch ${t}`), await this.onShell(`echo '${this.config.dockerfile.content.join(`
+`)}' > ${t}`), console.log("- 正在创建upload.sh");
+          const r = `${o}/${this.config.upload.name}`;
+          await this.onShell(`touch ${r}`), await this.onShell(`echo '${this.config.upload.content.join(`
+`)}' > ${r}`), n();
         }
       });
     });
@@ -204,9 +204,9 @@ exit
    * @returns 
    */
   checkRemoteFile(e, o) {
-    return new Promise((t) => {
+    return new Promise((n) => {
       e.stat(o, (i) => {
-        t(!i);
+        n(!i);
       });
     });
   }
@@ -216,74 +216,74 @@ exit
    * @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 (i) => {
+    let n = 0;
+    typeof this.config.rePushNum == "number" && this.config.rePushNum > 0 && (n = this.config.rePushNum), e.readdir(o, async (i) => {
       if (i) {
         console.log("- 跳板机不存在项目, 开始创建项目"), this.projectInit(e, o).then(() => {
           console.log(`- ${this.config.namespace}项目创建成功`), this.upLoadProject(e, o);
-        }).catch((r) => {
-          console.log(`- 创建项目失败: ${r}`), this.breakConnect();
+        }).catch((l) => {
+          console.log(`- 创建项目失败: ${l}`), this.breakConnect();
         });
         return;
       }
-      const l = this.getArgv("--lazyUpload") !== void 0 || this.config.lazyUpload, s = `${o}/${this.config.dist.name}`;
-      if (l || await this.onShell(`rm -rf ${s}`), await this.onShell(`mkdir ${s}`), !this.config.fileDir) {
+      const s = this.getArgv("--lazyUpload") !== void 0 || this.config.lazyUpload, t = `${o}/${this.config.dist.name}`;
+      if (s || await this.onShell(`rm -rf ${t}`), await this.onShell(`mkdir ${t}`), !this.config.fileDir) {
         console.log("- 请配置待上传文件目录 fileDir"), this.breakConnect();
         return;
       }
-      const { localFileList: n, dirList: a } = await this.getFilesInDirectory(this.config.fileDir);
-      if (n.length === 0) {
+      const { localFileList: r, dirList: c } = await this.getFilesInDirectory(this.config.fileDir);
+      if (r.length === 0) {
         console.log("- 待上传目录没有获取到文件，请检查"), this.breakConnect();
         return;
       }
-      let c = 0, m = n.length;
-      const w = (r) => new Promise(async (f, u) => {
+      let a = 0, h = r.length;
+      const p = (l) => new Promise(async (d, f) => {
         try {
-          if (l && await this.checkRemoteFile(e, `${s}${r.remotePath}`))
-            return f();
-          const h = S.createReadStream(r.localPath), b = e.createWriteStream(`${s}${r.remotePath}`);
+          if (s && await this.checkRemoteFile(e, `${t}${l.remotePath}`))
+            return d();
+          const g = S.createReadStream(l.localPath), b = e.createWriteStream(`${t}${l.remotePath}`);
           b.on("close", () => {
-            this.progressBar(++c, m), f();
+            this.progressBar(++a, h), d();
           }), b.on("error", (C) => {
-            console.log(`- 文件 ${r.remotePath} 上传失败：${C}`), u(C), this.breakConnect();
-          }), h.pipe(b);
-        } catch (h) {
-          u(h);
+            console.log(`- 文件 ${l.remotePath} 上传失败：${C}`), f(C), this.breakConnect();
+          }), g.pipe(b);
+        } catch (g) {
+          f(g);
         }
-      }), d = (r, f) => {
-        let u = [];
-        for (let h = 0; h < r.length; h += f)
-          u.push(r.slice(h, h + f));
-        return u;
-      }, p = (r) => {
-        if (r.length === 0)
+      }), m = (l, d) => {
+        let f = [];
+        for (let g = 0; g < l.length; g += d)
+          f.push(l.slice(g, g + d));
+        return f;
+      }, $ = (l) => {
+        if (l.length === 0)
           return Promise.resolve();
-        const f = r.shift();
-        return Promise.all(f.map((u) => w(u))).then(() => p(r));
-      }, k = (r) => {
-        if (r.length === 0)
+        const d = l.shift();
+        return Promise.all(d.map((f) => p(f))).then(() => $(l));
+      }, k = (l) => {
+        if (l.length === 0)
           return Promise.resolve();
-        let u = r.shift().map((h) => `${s}${h}`).join(" ");
-        return this.onShell(`mkdir -p ${u}`).then(() => k(r));
+        let f = l.shift().map((g) => `${t}${g}`).join(" ");
+        return this.onShell(`mkdir -p ${f}`).then(() => k(l));
       };
-      let y = [...d(a, this.config.parallelDir || 20)];
-      await k(y), console.log("- 创建目录完成"), await new Promise((r) => {
+      let y = [...m(c, this.config.parallelDir || 20)];
+      await k(y), console.log("- 创建目录完成"), await new Promise((l) => {
         setTimeout(() => {
-          r();
+          l();
         }, 500);
       });
-      let I = [...d(n, this.config.parallelFile || 50)];
-      await p(I), l && (this.progressBar(m, m), console.log("\x1B[32m%s\x1B[0m", `- 已开启懒上传，本次共上传 ${c} 个文件`)), console.log("- 文件上传成功"), console.log("- 开始推送镜像");
+      let I = [...m(r, this.config.parallelFile || 50)];
+      await $(I), s && (this.progressBar(h, h), console.log("\x1B[32m%s\x1B[0m", `- 已开启懒上传，本次共上传 ${a} 个文件`)), console.log("- 文件上传成功"), console.log("- 开始推送镜像");
       let P = `cd ${o} && sh ${this.config.upload.name}`;
       if (await this.isNewShell(e, o)) {
-        const r = this.getArgv("--imageStore") || this.config.imageStore;
-        P += ` ${r}`;
+        const l = this.getArgv("--imageStore") || this.config.imageStore;
+        P += ` ${l}`;
       } else
         console.log(`
 - warning 检测到当前脚本为手动创建,不支持镜像仓库配置,imageStore将失效`), console.log("- warning 如需支持imageStore参数,请在命令行后添加 --reset 重新生成脚本");
-      const v = this.getArgv("--tmpName") || this.config.tmpName;
-      P += ` ${v}`;
-      const D = Array.from(new Array(t + 1)).map(() => this.onShell(P));
+      const x = this.getArgv("--tmpName") || this.config.tmpName;
+      P += ` ${x}`;
+      const D = Array.from(new Array(n + 1)).map(() => this.onShell(P));
       await this.pushMirrorImage(D, D.length), this.breakConnect();
     });
   }
@@ -291,8 +291,8 @@ exit
   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("- 镜像推送结束"), this.getArgv("--restart") !== void 0 && await q(t, this.config.rancherConfig), t);
+    const n = await e[0];
+    return n.includes("- 镜像推送失败") ? (console.log(n), e.length > 1 && console.log(`- 正在尝试第 ${o - e.length + 1} 次推送...`), this.pushMirrorImage(e.slice(1), o)) : (console.log(n), console.log("- 镜像推送结束"), this.getArgv("--restart") !== void 0 && await z(n, this.config.rancherConfig), n);
   }
   /**
    * 获取脚本内容是不是自动创建的脚本
@@ -300,13 +300,13 @@ exit
    * 有 $2代表是自动创建的版本，否则老版本
   */
   async isNewShell(e, o) {
-    return new Promise((t, i) => {
-      e.readFile(`${o}/${this.config.upload.name}`, (l, s) => {
-        if (l)
+    return new Promise((n, i) => {
+      e.readFile(`${o}/${this.config.upload.name}`, (s, t) => {
+        if (s)
           return i(!1);
-        const n = s.toString();
-        n.includes("- 镜像推送失败") || console.log(`
-- warning 检测到当前脚本可能不是最新版本，推送失败可能不会提示，且没有失败自动重试功能，请在命令后添加 --reset 重新生成脚本`), t(n.includes("$2"));
+        const r = t.toString();
+        r.includes("- 镜像推送失败") || console.log(`
+- warning 检测到当前脚本可能不是最新版本，推送失败可能不会提示，且没有失败自动重试功能，请在命令后添加 --reset 重新生成脚本`), n(r.includes("$2"));
       });
     });
   }
@@ -315,41 +315,41 @@ exit
    * @param description 命令行开头的文字信息
    * @param bar_length 进度条的长度(单位：字符)，默认设为 25
    */
-  progressBar(e, o, t = 25) {
-    let i = (e / o).toFixed(4), l = Math.floor(i * t), s = "";
-    for (let c = 0; c < l; c++)
-      s += "█";
-    let n = "";
-    for (let c = 0; c < t - l; c++)
-      n += "░";
-    let a = `- 文件上传进度: ${s}${n} (${e}/${o}) ${(100 * i).toFixed(2)}%`;
-    F(a), e == o && console.log("");
+  progressBar(e, o, n = 25) {
+    let i = (e / o).toFixed(4), s = Math.floor(i * n), t = "";
+    for (let a = 0; a < s; a++)
+      t += "█";
+    let r = "";
+    for (let a = 0; a < n - s; a++)
+      r += "░";
+    let c = `- 文件上传进度: ${t}${r} (${e}/${o}) ${(100 * i).toFixed(2)}%`;
+    U(c), e == o && console.log("");
   }
   /**
    * 获取目录下所有文件并分类
    * @param {*} dir 
    */
   getFilesInDirectory(e) {
-    const o = [], t = [];
-    return new Promise((i, l) => {
-      const s = (n, a, c) => {
-        const m = S.readdirSync(n);
-        let w = !1;
-        m.forEach((d) => {
-          const p = N.join(n, d), y = S.statSync(p).isDirectory();
-          y ? w = !0 : o.push({
-            localPath: p,
+    const o = [], n = [];
+    return new Promise((i, s) => {
+      const t = (r, c, a) => {
+        const h = S.readdirSync(r);
+        let p = !1;
+        h.forEach((m) => {
+          const $ = F.join(r, m), y = S.statSync($).isDirectory();
+          y ? p = !0 : o.push({
+            localPath: $,
             // 本地路径
-            remotePath: `${a}${d}`,
+            remotePath: `${c}${m}`,
             // 远程路径
-            level: c
+            level: a
             // 文件或目录层级
-          }), y && s(p, `${a}${d}/`, c + 1);
-        }), w || t.push(a);
+          }), y && t($, `${c}${m}/`, a + 1);
+        }), p || n.push(c);
       };
-      s(e, "/", 0), i({
+      t(e, "/", 0), i({
         localFileList: o,
-        dirList: t
+        dirList: n
       });
     });
   }
@@ -359,16 +359,20 @@ exit
    */
   getArgv(e) {
     const o = process.argv;
-    let t;
+    let n;
     return o.forEach((i) => {
-      i.indexOf(e) > -1 && (t = i.split("=")[1] || "");
-    }), t;
+      i.indexOf(e) > -1 && (n = i.split("=")[1] || "");
+    }), n;
   }
 };
-const j = new R.Agent({
+const A = new q.Agent({
   rejectUnauthorized: !1
+}), j = N.create({
+  proxy: !1
+  // 禁用代理
 });
-async function q(g, e) {
+async function z(u, e) {
+  var o, n, i;
   try {
     const t = {
       // baseUrl: 'https://paas-test.ymygz.com:10443/v3', // Rancher API 基础地址
@@ -394,34 +398,36 @@ async function q(g, e) {
       return console.error("- 服务所在的命名空间未配置，请检查 rancherConfig.namespace 是否正确");
     if (!t.workload)
       return console.error("- 工作负载名称未配置，请检查 rancherConfig.workload 是否正确");
-    if (!g)
+    if (!u)
       return console.error("- 内部错误");
-    const i = g.match(/- 镜像地址:\s*(.+)/);
-    let l = "";
-    if (i && i[1])
-      l = i[1].trim();
+    const r = u.match(/- 镜像地址:\s*(.+)/);
+    let c = "";
+    if (r && r[1])
+      c = r[1].trim();
     else
       return console.error("- 未提取到镜像地址");
     console.log("- 开始调用 Rancher API 更新服务镜像地址");
-    const s = `${t.baseUrl}/projects/${t.clusterId}/workloads/deployment:${t.namespace}:${t.workload}`, n = await A.get(s, {
+    const a = `${t.baseUrl}/projects/${t.clusterId}/workloads/deployment:${t.namespace}:${t.workload}`;
+    console.log("- 请求的工作负载 URL:", a);
+    const h = await j.get(a, {
       headers: { Authorization: `Bearer ${t.token}` },
-      httpsAgent: j
+      httpsAgent: A
     });
-    if (!n.data || !n.data.containers || n.data.containers.length === 0)
+    if (!h.data || !h.data.containers || h.data.containers.length === 0)
       return console.error("- 未找到工作负载的容器信息，请检查 namespace 和 workload 是否正确");
-    const a = n.data;
-    a.containers[0].image = l, await A.put(s, a, {
+    const p = h.data;
+    p.containers[0].image = c, await j.put(a, p, {
       headers: { Authorization: `Bearer ${t.token}` },
-      httpsAgent: j
-    }), console.log("- 镜像地址更新成功，正在重启服务..."), await A.post(
-      `${s}?action=redeploy`,
+      httpsAgent: A
+    }), console.log("- 镜像地址更新成功，正在重启服务..."), await j.post(
+      `${a}?action=redeploy`,
       {},
       {
         headers: { Authorization: `Bearer ${t.token}` },
-        httpsAgent: j
+        httpsAgent: A
       }
     ), console.log("- 服务重启成功");
-  } catch (o) {
-    console.error("- 调用 Rancher API 失败， 请手动重启服务:", o.message);
+  } catch (s) {
+    console.error("- 调用 Rancher API 失败，请检查以下信息："), console.error("  - 错误代码:", s.code), console.error("  - 错误信息:", s.message), console.error("  - 请求 URL:", (o = s.config) == null ? void 0 : o.url), console.error("  - 响应状态:", (n = s.response) == null ? void 0 : n.status), console.error("  - 响应数据:", (i = s.response) == null ? void 0 : i.data);
   }
 }

package/dist/yj-deploy.umd.js

@@ -1,9 +1,9 @@
-(function(h){typeof define=="function"&&define.amd?define(h):h()})(function(){"use strict";var R=Object.defineProperty;var q=(h,u,f)=>u in h?R(h,u,{enumerable:!0,configurable:!0,writable:!0,value:f}):h[u]=f;var y=(h,u,f)=>(q(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"),b=require("axios"),L=require("https");module.exports=class{constructor(e){y(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:""}});y(this,"ssh2Conn",null);y(this,"uploading",!1);y(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,i)=>{this.ssh2Conn.shell((l,s)=>{if(l){console.log("- 远程命令错误："+l,e),this.breakConnect(),i(l);return}let n=[];s.on("close",()=>{o(n.toString())}).on("data",a=>{let c=a.toString();(t||this.config.allLog||c.startsWith("- "))&&n.push(`
-`+c)}).stderr.on("data",a=>{console.log(`- 远程命令错误：
-`+a),this.breakConnect(),i(a)}),s.end(e+`
+(function(h){typeof define=="function"&&define.amd?define(h):h()})(function(){"use strict";var q=Object.defineProperty;var z=(h,f,d)=>f in h?q(h,f,{enumerable:!0,configurable:!0,writable:!0,value:d}):h[f]=d;var k=(h,f,d)=>(z(h,typeof f!="symbol"?f+"":f,d),d);const{stdout:h}=require("single-line-log"),f=require("path"),d=require("fs"),{Client:v}=require("ssh2"),L=require("axios"),U=require("https");module.exports=class{constructor(e){k(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:""}});k(this,"ssh2Conn",null);k(this,"uploading",!1);k(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,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,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 o=this.getArgv("--allLog")!==void 0;return new Promise((n,i)=>{this.ssh2Conn.shell((s,t)=>{if(s){console.log("- 远程命令错误："+s,e),this.breakConnect(),i(s);return}let r=[];t.on("close",()=>{n(r.toString())}).on("data",c=>{let a=c.toString();(o||this.config.allLog||a.startsWith("- "))&&r.push(`
+`+a)}).stderr.on("data",c=>{console.log(`- 远程命令错误：
+`+c),this.breakConnect(),i(c)}),t.end(e+`
 exit
-`)})})}projectInit(e,t){return new Promise(async(o,i)=>{e.mkdir(t,async l=>{if(l)i(l);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 n=`${t}/${this.config.upload.name}`;await this.onShell(`touch ${n}`),await this.onShell(`echo '${this.config.upload.content.join(`
-`)}' > ${n}`),o()}})})}checkRemoteFile(e,t){return new Promise(o=>{e.stat(t,i=>{o(!i)})})}upLoadProject(e,t){let o=0;typeof this.config.rePushNum=="number"&&this.config.rePushNum>0&&(o=this.config.rePushNum),e.readdir(t,async i=>{if(i){console.log("- 跳板机不存在项目, 开始创建项目"),this.projectInit(e,t).then(()=>{console.log(`- ${this.config.namespace}项目创建成功`),this.upLoadProject(e,t)}).catch(r=>{console.log(`- 创建项目失败: ${r}`),this.breakConnect()});return}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}const{localFileList:n,dirList:a}=await this.getFilesInDirectory(this.config.fileDir);if(n.length===0){console.log("- 待上传目录没有获取到文件，请检查"),this.breakConnect();return}let c=0,w=n.length;const k=r=>new Promise(async(p,d)=>{try{if(l&&await this.checkRemoteFile(e,`${s}${r.remotePath}`))return p();const g=f.createReadStream(r.localPath),D=e.createWriteStream(`${s}${r.remotePath}`);D.on("close",()=>{this.progressBar(++c,w),p()}),D.on("error",I=>{console.log(`- 文件 ${r.remotePath} 上传失败：${I}`),d(I),this.breakConnect()}),g.pipe(D)}catch(g){d(g)}}),m=(r,p)=>{let d=[];for(let g=0;g<r.length;g+=p)d.push(r.slice(g,g+p));return d},$=r=>{if(r.length===0)return Promise.resolve();const p=r.shift();return Promise.all(p.map(d=>k(d))).then(()=>$(r))},A=r=>{if(r.length===0)return Promise.resolve();let d=r.shift().map(g=>`${s}${g}`).join(" ");return this.onShell(`mkdir -p ${d}`).then(()=>A(r))};let P=[...m(a,this.config.parallelDir||20)];await A(P),console.log("- 创建目录完成"),await new Promise(r=>{setTimeout(()=>{r()},500)});let N=[...m(n,this.config.parallelFile||50)];await $(N),l&&(this.progressBar(w,w),console.log("\x1B[32m%s\x1B[0m",`- 已开启懒上传，本次共上传 ${c} 个文件`)),console.log("- 文件上传成功"),console.log("- 开始推送镜像");let j=`cd ${t} && sh ${this.config.upload.name}`;if(await this.isNewShell(e,t)){const r=this.getArgv("--imageStore")||this.config.imageStore;j+=` ${r}`}else console.log(`
-- warning 检测到当前脚本为手动创建,不支持镜像仓库配置,imageStore将失效`),console.log("- warning 如需支持imageStore参数,请在命令行后添加 --reset 重新生成脚本");const U=this.getArgv("--tmpName")||this.config.tmpName;j+=` ${U}`;const x=Array.from(new Array(o+1)).map(()=>this.onShell(j));await this.pushMirrorImage(x,x.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 F(o,this.config.rancherConfig),o)}async isNewShell(e,t){return new Promise((o,i)=>{e.readFile(`${t}/${this.config.upload.name}`,(l,s)=>{if(l)return i(!1);const n=s.toString();n.includes("- 镜像推送失败")||console.log(`
-- warning 检测到当前脚本可能不是最新版本，推送失败可能不会提示，且没有失败自动重试功能，请在命令后添加 --reset 重新生成脚本`),o(n.includes("$2"))})})}progressBar(e,t,o=25){let i=(e/t).toFixed(4),l=Math.floor(i*o),s="";for(let c=0;c<l;c++)s+="█";let n="";for(let c=0;c<o-l;c++)n+="░";let a=`- 文件上传进度: ${s}${n} (${e}/${t}) ${(100*i).toFixed(2)}%`;h(a),e==t&&console.log("")}getFilesInDirectory(e){const t=[],o=[];return new Promise((i,l)=>{const s=(n,a,c)=>{const w=f.readdirSync(n);let k=!1;w.forEach(m=>{const $=u.join(n,m),P=f.statSync($).isDirectory();P?k=!0:t.push({localPath:$,remotePath:`${a}${m}`,level:c}),P&&s($,`${a}${m}/`,c+1)}),k||o.push(a)};s(e,"/",0),i({localFileList:t,dirList:o})})}getArgv(e){const t=process.argv;let o;return t.forEach(i=>{i.indexOf(e)>-1&&(o=i.split("=")[1]||"")}),o}};const C=new L.Agent({rejectUnauthorized:!1});async function F(S,e){try{const o={...{baseUrl:"https://paas-test.ymygz.com:10443/v3",clusterId:"local:p-r7j28"},...e};if(!o.baseUrl)return console.error("- Rancher API 基础地址未配置，请检查 rancherConfig.baseUrl 是否正确");if(!o.token)return console.error("- Rancher API 访问令牌未配置，请检查 rancherConfig.token 是否正确");if(!o.clusterId)return console.error("- Rancher 集群 ID 未配置，请检查 rancherConfig.clusterId 是否正确");if(!o.namespace)return console.error("- 服务所在的命名空间未配置，请检查 rancherConfig.namespace 是否正确");if(!o.workload)return console.error("- 工作负载名称未配置，请检查 rancherConfig.workload 是否正确");if(!S)return console.error("- 内部错误");const i=S.match(/- 镜像地址:\s*(.+)/);let l="";if(i&&i[1])l=i[1].trim();else return console.error("- 未提取到镜像地址");console.log("- 开始调用 Rancher API 更新服务镜像地址");const s=`${o.baseUrl}/projects/${o.clusterId}/workloads/deployment:${o.namespace}:${o.workload}`,n=await b.get(s,{headers:{Authorization:`Bearer ${o.token}`},httpsAgent:C});if(!n.data||!n.data.containers||n.data.containers.length===0)return console.error("- 未找到工作负载的容器信息，请检查 namespace 和 workload 是否正确");const a=n.data;a.containers[0].image=l,await b.put(s,a,{headers:{Authorization:`Bearer ${o.token}`},httpsAgent:C}),console.log("- 镜像地址更新成功，正在重启服务..."),await b.post(`${s}?action=redeploy`,{},{headers:{Authorization:`Bearer ${o.token}`},httpsAgent:C}),console.log("- 服务重启成功")}catch(t){console.error("- 调用 Rancher API 失败， 请手动重启服务:",t.message)}}});
+`)})})}projectInit(e,o){return new Promise(async(n,i)=>{e.mkdir(o,async s=>{if(s)i(s);else{console.log("- 正在创建dockerfile");const t=`${o}/${this.config.dockerfile.name}`;await this.onShell(`touch ${t}`),await this.onShell(`echo '${this.config.dockerfile.content.join(`
+`)}' > ${t}`),console.log("- 正在创建upload.sh");const r=`${o}/${this.config.upload.name}`;await this.onShell(`touch ${r}`),await this.onShell(`echo '${this.config.upload.content.join(`
+`)}' > ${r}`),n()}})})}checkRemoteFile(e,o){return new Promise(n=>{e.stat(o,i=>{n(!i)})})}upLoadProject(e,o){let n=0;typeof this.config.rePushNum=="number"&&this.config.rePushNum>0&&(n=this.config.rePushNum),e.readdir(o,async i=>{if(i){console.log("- 跳板机不存在项目, 开始创建项目"),this.projectInit(e,o).then(()=>{console.log(`- ${this.config.namespace}项目创建成功`),this.upLoadProject(e,o)}).catch(l=>{console.log(`- 创建项目失败: ${l}`),this.breakConnect()});return}const s=this.getArgv("--lazyUpload")!==void 0||this.config.lazyUpload,t=`${o}/${this.config.dist.name}`;if(s||await this.onShell(`rm -rf ${t}`),await this.onShell(`mkdir ${t}`),!this.config.fileDir){console.log("- 请配置待上传文件目录 fileDir"),this.breakConnect();return}const{localFileList:r,dirList:c}=await this.getFilesInDirectory(this.config.fileDir);if(r.length===0){console.log("- 待上传目录没有获取到文件，请检查"),this.breakConnect();return}let a=0,g=r.length;const $=l=>new Promise(async(m,p)=>{try{if(s&&await this.checkRemoteFile(e,`${t}${l.remotePath}`))return m();const u=d.createReadStream(l.localPath),x=e.createWriteStream(`${t}${l.remotePath}`);x.on("close",()=>{this.progressBar(++a,g),m()}),x.on("error",D=>{console.log(`- 文件 ${l.remotePath} 上传失败：${D}`),p(D),this.breakConnect()}),u.pipe(x)}catch(u){p(u)}}),w=(l,m)=>{let p=[];for(let u=0;u<l.length;u+=m)p.push(l.slice(u,u+m));return p},y=l=>{if(l.length===0)return Promise.resolve();const m=l.shift();return Promise.all(m.map(p=>$(p))).then(()=>y(l))},A=l=>{if(l.length===0)return Promise.resolve();let p=l.shift().map(u=>`${t}${u}`).join(" ");return this.onShell(`mkdir -p ${p}`).then(()=>A(l))};let P=[...w(c,this.config.parallelDir||20)];await A(P),console.log("- 创建目录完成"),await new Promise(l=>{setTimeout(()=>{l()},500)});let R=[...w(r,this.config.parallelFile||50)];await y(R),s&&(this.progressBar(g,g),console.log("\x1B[32m%s\x1B[0m",`- 已开启懒上传，本次共上传 ${a} 个文件`)),console.log("- 文件上传成功"),console.log("- 开始推送镜像");let j=`cd ${o} && sh ${this.config.upload.name}`;if(await this.isNewShell(e,o)){const l=this.getArgv("--imageStore")||this.config.imageStore;j+=` ${l}`}else console.log(`
+- warning 检测到当前脚本为手动创建,不支持镜像仓库配置,imageStore将失效`),console.log("- warning 如需支持imageStore参数,请在命令行后添加 --reset 重新生成脚本");const N=this.getArgv("--tmpName")||this.config.tmpName;j+=` ${N}`;const I=Array.from(new Array(n+1)).map(()=>this.onShell(j));await this.pushMirrorImage(I,I.length),this.breakConnect()})}async pushMirrorImage(e,o){if(e.length===0)return console.log("- 镜像推送失败，请添加 --allLog 查看全部日志"),null;const n=await e[0];return n.includes("- 镜像推送失败")?(console.log(n),e.length>1&&console.log(`- 正在尝试第 ${o-e.length+1} 次推送...`),this.pushMirrorImage(e.slice(1),o)):(console.log(n),console.log("- 镜像推送结束"),this.getArgv("--restart")!==void 0&&await F(n,this.config.rancherConfig),n)}async isNewShell(e,o){return new Promise((n,i)=>{e.readFile(`${o}/${this.config.upload.name}`,(s,t)=>{if(s)return i(!1);const r=t.toString();r.includes("- 镜像推送失败")||console.log(`
+- warning 检测到当前脚本可能不是最新版本，推送失败可能不会提示，且没有失败自动重试功能，请在命令后添加 --reset 重新生成脚本`),n(r.includes("$2"))})})}progressBar(e,o,n=25){let i=(e/o).toFixed(4),s=Math.floor(i*n),t="";for(let a=0;a<s;a++)t+="█";let r="";for(let a=0;a<n-s;a++)r+="░";let c=`- 文件上传进度: ${t}${r} (${e}/${o}) ${(100*i).toFixed(2)}%`;h(c),e==o&&console.log("")}getFilesInDirectory(e){const o=[],n=[];return new Promise((i,s)=>{const t=(r,c,a)=>{const g=d.readdirSync(r);let $=!1;g.forEach(w=>{const y=f.join(r,w),P=d.statSync(y).isDirectory();P?$=!0:o.push({localPath:y,remotePath:`${c}${w}`,level:a}),P&&t(y,`${c}${w}/`,a+1)}),$||n.push(c)};t(e,"/",0),i({localFileList:o,dirList:n})})}getArgv(e){const o=process.argv;let n;return o.forEach(i=>{i.indexOf(e)>-1&&(n=i.split("=")[1]||"")}),n}};const b=new U.Agent({rejectUnauthorized:!1}),C=L.create({proxy:!1});async function F(S,e){var o,n,i;try{const t={...{baseUrl:"https://paas-test.ymygz.com:10443/v3",clusterId:"local:p-r7j28"},...e};if(!t.baseUrl)return console.error("- Rancher API 基础地址未配置，请检查 rancherConfig.baseUrl 是否正确");if(!t.token)return console.error("- Rancher API 访问令牌未配置，请检查 rancherConfig.token 是否正确");if(!t.clusterId)return console.error("- Rancher 集群 ID 未配置，请检查 rancherConfig.clusterId 是否正确");if(!t.namespace)return console.error("- 服务所在的命名空间未配置，请检查 rancherConfig.namespace 是否正确");if(!t.workload)return console.error("- 工作负载名称未配置，请检查 rancherConfig.workload 是否正确");if(!S)return console.error("- 内部错误");const r=S.match(/- 镜像地址:\s*(.+)/);let c="";if(r&&r[1])c=r[1].trim();else return console.error("- 未提取到镜像地址");console.log("- 开始调用 Rancher API 更新服务镜像地址");const a=`${t.baseUrl}/projects/${t.clusterId}/workloads/deployment:${t.namespace}:${t.workload}`;console.log("- 请求的工作负载 URL:",a);const g=await C.get(a,{headers:{Authorization:`Bearer ${t.token}`},httpsAgent:b});if(!g.data||!g.data.containers||g.data.containers.length===0)return console.error("- 未找到工作负载的容器信息，请检查 namespace 和 workload 是否正确");const $=g.data;$.containers[0].image=c,await C.put(a,$,{headers:{Authorization:`Bearer ${t.token}`},httpsAgent:b}),console.log("- 镜像地址更新成功，正在重启服务..."),await C.post(`${a}?action=redeploy`,{},{headers:{Authorization:`Bearer ${t.token}`},httpsAgent:b}),console.log("- 服务重启成功")}catch(s){console.error("- 调用 Rancher API 失败，请检查以下信息："),console.error("  - 错误代码:",s.code),console.error("  - 错误信息:",s.message),console.error("  - 请求 URL:",(o=s.config)==null?void 0:o.url),console.error("  - 响应状态:",(n=s.response)==null?void 0:n.status),console.error("  - 响应数据:",(i=s.response)==null?void 0:i.data)}}});

package/package.json

@@ -1,9 +1,10 @@
 {
   "name": "yj-deploy",
-  "version": "0.0.10",
+  "version": "0.0.11",
   "description": "ssh sftp",
   "scripts": {
-    "build": "vite build"
+    "build": "vite build",
+    "deploy": "node test.js --restart"
   },
   "files": [
     "dist",