yj-deploy 0.0.2 → 0.0.3

package/README.md

@@ -1,19 +1,18 @@
 # yj-deploy
 
-> `yj-deploy` 是为解决公司内部项目部署到镜像服务器开发的工具，可解决每次开发完需通过繁琐的步骤才能获得镜像地址的问题。
-
-<br />
-<br />
+`yj-deploy` 是为解决公司内部项目部署到镜像服务器开发的工具，可帮助开发者自动构建镜像，并自动部署到镜像服务器上。
 
 ## 目前已实现如下功能
 - &#x2714; 项目打包完成后自动上传到跳板机
-- &#x2714; 自动生成目录，自动创建dockerfile，upload.sh脚本文件
+- &#x2714; 自动生成项目目录，自动创建dockerfile，upload.sh脚本文件
 - &#x2714; 自动运行脚本，自动打包镜像，自动推送到镜像服务器（全程不用手动操作）
 - &#x2714; 直接集成到vite，webpack项目
 - &#x2714; 支持手动上传其他任何类型项目
 - &#x2714; 支持灵活配置dockerfile，upload.sh等脚本内容
 - &#x2714; 支持多种方式配置 `镜像仓库` `镜像环境`等参数
+> 全程不需要连接跳板机做任何操作即可完成镜像推送
 
+## 运行情况
 ![预览](./img.png)
 
 ## 安装
@@ -28,14 +27,14 @@ $ npm i yj-deploy -D
 
 ```javascript
 import path from 'path'
-import yjDeploy from './lib/main.js'
+import yjDeploy from 'yj-deploy'
 
 const deploy = new yjDeploy({
   host: '', // ip
   port: '', // 端口
   username: '', // 账号
   password: '', // 密码
-  namespace: '', // 项目命名空间，等同于镜像地址目录名称
+  namespace: '', // 项目名称，等同git地址目录名称
   // 本地文件目录
   fileDir: path.resolve('./dist'),
 })
@@ -48,7 +47,7 @@ const deploy = new yjDeploy({
   port: '', // 端口 (必填)
   username: '', // 账号 (必填)
   password: '', // 密码 (必填)
-  namespace: '', // 项目命名空间，等同于镜像地址目录名称 (必填)
+  namespace: '', // 项目名称，等同git地址目录名称(必填)
   imageStore: 'dev-images', // 镜像仓库， 默认为 dev-images
   tmpName: 'dev', // 镜像环境， 默认 dev
   delay: 0, // 延迟上传时间 （部分项目构建需要时间，延迟上传可以解决）
@@ -64,7 +63,7 @@ const deploy = new yjDeploy({
     ]
   },
 
-  // upload.sh文件信息（可覆盖，单需要注意 $1 和 $2参数的顺序）
+  // upload.sh文件信息（可覆盖，但需要注意 $1 和 $2参数的顺序）
   upload: {
     name: 'upload.sh',
     content: [
@@ -85,6 +84,8 @@ const deploy = new yjDeploy({
 }
 ```
 
+<br />
+
 # 使用
 ## 配合打包命令使用
 ```javascript
@@ -101,7 +102,7 @@ module.exports = {
           port: '',
           username: '',
           password: '',
-          namespace: '', // 项目命名空间，等同于镜像地址目录名称
+          namespace: '', // 项目名称，等同git地址目录名称
           // 本地文件目录
           fileDir: path.resolve('./dist'),
         })
@@ -130,7 +131,7 @@ export default defineConfig({
       port: '',
       username: '',
       password: '',
-      namespace: '', // 项目命名空间，等同于镜像地址目录名称
+      namespace: '', // 项目名称，等同git地址目录名称
       // 本地文件目录
       fileDir: path.resolve('./dist'),
     })
@@ -139,7 +140,7 @@ export default defineConfig({
 
 // package.json
 "scripts": {
-  "deploy": "vue-cli-service build --mode development -- --deploy"
+  "deploy": "vite build --mode development -- --deploy"
 }
 // 使用 yarn deploy 或 npm run deploy
 ```
@@ -152,7 +153,7 @@ export default defineConfig({
 ```javascript
 // vite项目 package.json
 "scripts": {
-  "deploy": "vue-cli-service build --mode development -- --deploy"
+  "deploy": "vite build --mode development -- --deploy"
 }
 
 // webpack项目 package.json
@@ -166,7 +167,7 @@ export default defineConfig({
 
 <br />
 
-`--reset` ：是否重置项目，如果配置了此选项，则每次执行命令时会删除`dockerfile``upload.sh`配置文件，然后重新初始化项目，默认为不重置
+`--reset` ：是否重置项目，如果配置了此选项，则每次执行命令时会删除 `dockerfile` `upload.sh` 配置文件，然后重新初始化项目，默认为不重置
 
 <br />
 
@@ -174,9 +175,9 @@ export default defineConfig({
 ```javascript
 "scripts": {
   // 开发环境
-  "deploy": "vue-cli-service build --mode development -- --deploy"
+  "deploy": "vite build --mode development -- --deploy"
   // 测试环境
-  "deploy-test": "vue-cli-service build --mode development -- --deploy --imageStore=sot-admin"
+  "deploy-test": "vite build --mode test -- --deploy --imageStore=sot-admin"
 }
 ```
 
@@ -186,11 +187,11 @@ export default defineConfig({
 ```javascript
 "scripts": {
   // 开发环境
-  "deploy": "vue-cli-service build --mode development -- --deploy --tmpName=dev"
+  "deploy": "vite build --mode development -- --deploy --tmpName=dev"
   // 测试环境
-  "deploy-test": "vue-cli-service build --mode development -- --deploy --tmpName=test"
-  // 测试环境
-  "deploy-prod": "vue-cli-service build --mode development -- --deploy --tmpName=prod"
+  "deploy-test": "vite build --mode test -- --deploy --tmpName=test"
+  // 正式环境
+  "deploy-prod": "vite build --mode production -- --deploy --tmpName=prod"
 }
 ```
 
@@ -216,3 +217,11 @@ node uploader.js
 // 增加动态配置
 node uploader.js --tmpName=test
 ```
+
+
+# 最后
+如有意见或建议，或bug或文档不清晰等问题，可随时向我反馈，或直接修改后提交，共同完善这个工具。
+
+<br />
+
+项目已提交到git：https://gitlab.yunjingtech.cn:10010/frontend/yj-deploy

package/dist/yj-deploy.mjs

@@ -1,10 +1,10 @@
-var S = Object.defineProperty;
-var C = (h, o, e) => o in h ? S(h, o, { enumerable: !0, configurable: !0, writable: !0, value: e }) : h[o] = e;
-var g = (h, o, e) => (C(h, typeof o != "symbol" ? o + "" : o, e), e);
-const { stdout: j } = require("single-line-log"), D = require("path"), m = require("fs"), { Client: v } = require("ssh2");
-class F {
+var C = Object.defineProperty;
+var j = (a, o, e) => o in a ? C(a, o, { enumerable: !0, configurable: !0, writable: !0, value: e }) : a[o] = e;
+var d = (a, o, e) => (j(a, typeof o != "symbol" ? o + "" : o, e), e);
+const { stdout: D } = require("single-line-log"), v = require("path"), $ = require("fs"), { Client: x } = require("ssh2");
+module.exports = class {
   constructor(o) {
-    g(this, "config", {
+    d(this, "config", {
       host: "",
       port: "",
       username: "",
@@ -48,11 +48,11 @@ class F {
         name: "dist"
       }
     });
-    g(this, "ssh2Conn", null);
+    d(this, "ssh2Conn", null);
     // 上传状态
-    g(this, "uploading", !1);
+    d(this, "uploading", !1);
     // 定时器
-    g(this, "trim", null);
+    d(this, "trim", null);
     return this.config = Object.assign(this.config, o), {
       name: "yj-deploy",
       isPut: this.isPut.bind(this),
@@ -99,7 +99,7 @@ class F {
       console.log("- 请配置跳板机密码 password");
       return;
     }
-    this.uploading || (this.ssh2Conn = new v(), this.ssh2Conn.on("ready", () => {
+    this.uploading || (this.ssh2Conn = new x(), this.ssh2Conn.on("ready", () => {
       console.log("- 跳板机连接成功！"), this.ssh2Conn.sftp(async (o, e) => {
         o && (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(e, `${this.config.rootDir}/${this.config.namespace}`);
       });
@@ -114,6 +114,9 @@ class F {
       this.uploading = !1;
     }));
   }
+  /**
+   * 断开连接
+   */
   breakConnect() {
     this.uploading = !1, console.log("- 已断开连接"), console.log("-------------- deploy-end --------------"), this.ssh2Conn.end();
   }
@@ -124,20 +127,20 @@ class F {
    */
   onShell(o) {
     return new Promise((e, r) => {
-      this.ssh2Conn.shell((i, s) => {
-        if (i) {
-          this.breakConnect();
+      this.ssh2Conn.shell((n, s) => {
+        if (n) {
+          console.log("- 远程命令错误：" + n, o), this.breakConnect(), r(n);
           return;
         }
         let l = [];
         s.on("close", () => {
           e(l.toString());
-        }).on("data", (t) => {
+        }).on("data", (i) => {
           l.push(`
-` + t);
-        }).stderr.on("data", (t) => {
+` + i);
+        }).stderr.on("data", (i) => {
           console.log(`- 远程命令错误：
-` + t), this.ssh2Conn.end(), r(t);
+` + i), this.breakConnect(), r(i);
         }), s.end(o + `
 exit
 `);
@@ -150,18 +153,18 @@ exit
    * @param {*} dir 
    */
   projectInit(o, e) {
-    return new Promise(async (r, i) => {
+    return new Promise(async (r, n) => {
       o.mkdir(e, async (s) => {
         if (s)
-          console.log(s), i();
+          n(s);
         else {
           console.log("- 正在创建dockerfile");
           const l = `${e}/${this.config.dockerfile.name}`;
           await this.onShell(`touch ${l}`), await this.onShell(`echo '${this.config.dockerfile.content.join(`
 `)}' > ${l}`), console.log("- 正在创建upload.sh");
-          const t = `${e}/${this.config.upload.name}`;
-          await this.onShell(`touch ${t}`), await this.onShell(`echo '${this.config.upload.content.join(`
-`)}' > ${t}`), r();
+          const i = `${e}/${this.config.upload.name}`;
+          await this.onShell(`touch ${i}`), await this.onShell(`echo '${this.config.upload.content.join(`
+`)}' > ${i}`), r();
         }
       });
     });
@@ -176,43 +179,56 @@ exit
       if (r) {
         console.log("- 跳板机不存在项目, 开始创建项目"), this.projectInit(o, e).then(() => {
           console.log(`- ${this.config.namespace}项目创建成功`), this.upLoadProject(o, e);
-        }).catch(() => {
-          console.log("- 创建项目失败"), this.breakConnect();
+        }).catch((t) => {
+          console.log(`- 创建项目失败: ${t}`), this.breakConnect();
         });
         return;
       }
       console.log("- 开始上传文件");
-      const i = `${e}/${this.config.dist.name}`;
-      await this.onShell(`rm -rf ${i}`), await this.onShell(`mkdir ${i}`), this.config.fileDir || (console.log("- 请配置本地文件目录 fileDir"), this.breakConnect());
+      const n = `${e}/${this.config.dist.name}`;
+      if (await this.onShell(`rm -rf ${n}`), await this.onShell(`mkdir ${n}`), !this.config.fileDir) {
+        console.log("- 请配置待上传文件目录 fileDir"), this.breakConnect();
+        return;
+      }
       const s = await this.getFilesInDirectory(this.config.fileDir);
-      s.length === 0 && (console.log("- 待上传目录为空，请检查"), this.breakConnect());
-      let l = 0;
-      const t = (n, k = 0) => n.isDirectory ? this.onShell(`mkdir ${i}${n.remotePath}`) : new Promise((P, y) => {
+      if (s.length === 0) {
+        console.log("- 待上传目录为空，请检查"), this.breakConnect();
+        return;
+      }
+      let l = 0, i = s.length;
+      const g = (t) => t.isDirectory ? this.onShell(`mkdir ${n}${t.remotePath}`).then(() => {
+        this.progressBar(++l, i);
+      }) : new Promise((f, w) => {
         try {
-          const f = m.createReadStream(n.localPath), p = o.createWriteStream(`${e}/dist${n.remotePath}`);
-          p.on("close", () => {
-            this.progressBar(++l, k), P();
-          }), p.on("error", (w) => {
-            console.log(`- 文件 ${n.remotePath} 上传失败：${w}`), y(w), this.breakConnect();
-          }), f.pipe(p);
-        } catch (f) {
-          y(f);
+          const p = $.createReadStream(t.localPath), m = o.createWriteStream(`${n}${t.remotePath}`);
+          m.on("close", () => {
+            this.progressBar(++l, i), f();
+          }), m.on("error", (b) => {
+            console.log(`- 文件 ${t.remotePath} 上传失败：${b}`), w(b), this.breakConnect();
+          }), p.pipe(m);
+        } catch (p) {
+          w(p);
         }
-      }), d = s.filter((n) => n.isDirectory);
-      await Promise.all(d.map((n) => t(n))), await new Promise((n) => {
+      }), c = (t) => {
+        if (t.length === 0)
+          return Promise.resolve();
+        const f = t.shift();
+        return g(f).then(() => c(t));
+      }, u = s.filter((t) => t.isDirectory);
+      await c(u), await new Promise((t) => {
         setTimeout(() => {
-          n();
+          t();
         }, 500);
       });
-      const a = s.filter((n) => !n.isDirectory);
-      await Promise.all(a.map((n) => t(n, a.length))), console.log("- 文件上传成功"), console.log("- 开始推送镜像");
-      let c = `cd ${e} && sh ${this.config.upload.name}`;
-      const $ = this.getArgv("--imageStore") || this.config.imageStore;
-      c += ` ${$}`;
-      const u = this.getArgv("--tmpName") || this.config.tmpName;
-      c += ` ${u}`;
-      const b = await this.onShell(c);
-      console.log(b), console.log("- 镜像推送完成"), this.ssh2Conn.end();
+      const y = s.filter((t) => !t.isDirectory);
+      await Promise.all(y.map((t) => g(t))), console.log("- 文件上传成功"), console.log("- 开始推送镜像");
+      let h = `cd ${e} && sh ${this.config.upload.name}`;
+      const k = this.getArgv("--imageStore") || this.config.imageStore;
+      h += ` ${k}`;
+      const P = this.getArgv("--tmpName") || this.config.tmpName;
+      h += ` ${P}`;
+      const S = await this.onShell(h);
+      console.log(S), console.log("- 镜像推送完成"), this.breakConnect();
     });
   }
   /**
@@ -221,32 +237,32 @@ exit
    * @param bar_length 进度条的长度(单位：字符)，默认设为 25
    */
   progressBar(o, e, r = 25) {
-    let i = (o / e).toFixed(4), s = Math.floor(i * r), l = "";
-    for (let a = 0; a < s; a++)
+    let n = (o / e).toFixed(4), s = Math.floor(n * r), l = "";
+    for (let c = 0; c < s; c++)
       l += "█";
-    let t = "";
-    for (let a = 0; a < r - s; a++)
-      t += "░";
-    let d = `- 上传进度: ${l}${t} ${(100 * i).toFixed(2)}% (${o}/${e})`;
-    j(d), o == e && console.log("");
+    let i = "";
+    for (let c = 0; c < r - s; c++)
+      i += "░";
+    let g = `- 上传进度: ${l}${i} ${(100 * n).toFixed(2)}% (${o}/${e})`;
+    D(g), o == e && console.log("");
   }
   /**
-   * 获取目录下所有文件
+   * 获取目录下所有文件并分类
    * @param {*} dir 
    */
   getFilesInDirectory(o) {
     const e = [];
-    return new Promise((r, i) => {
-      const s = (l, t) => {
-        m.readdirSync(l).forEach((a) => {
-          const c = D.join(l, a), u = m.statSync(c).isDirectory();
+    return new Promise((r, n) => {
+      const s = (l, i) => {
+        $.readdirSync(l).forEach((c) => {
+          const u = v.join(l, c), h = $.statSync(u).isDirectory();
           e.push({
-            isDirectory: u,
-            localPath: c,
+            isDirectory: h,
+            localPath: u,
             // 本地路径
-            remotePath: `${t}${a}`
+            remotePath: `${i}${c}`
             // 远程路径
-          }), u && s(c, `${t}${a}/`);
+          }), h && s(u, `${i}${c}/`);
         });
       };
       s(o, "/"), r(e);
@@ -259,11 +275,8 @@ exit
   getArgv(o) {
     const e = process.argv;
     let r;
-    return e.forEach((i) => {
-      i.indexOf(o) > -1 && (r = i.split("=")[1] || "");
+    return e.forEach((n) => {
+      n.indexOf(o) > -1 && (r = n.split("=")[1] || "");
     }), r;
   }
-}
-export {
-  F as default
 };

package/dist/yj-deploy.umd.js

@@ -1,7 +1,7 @@
-(function(h,r){typeof exports=="object"&&typeof module<"u"?module.exports=r():typeof define=="function"&&define.amd?define(r):(h=typeof globalThis<"u"?globalThis:h||self,h["yj-deploy"]=r())})(this,function(){"use strict";var D=Object.defineProperty;var v=(h,r,g)=>r in h?D(h,r,{enumerable:!0,configurable:!0,writable:!0,value:g}):h[r]=g;var u=(h,r,g)=>(v(h,typeof r!="symbol"?r+"":r,g),g);const{stdout:h}=require("single-line-log"),r=require("path"),g=require("fs"),{Client:k}=require("ssh2");class P{constructor(e){u(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"}});u(this,"ssh2Conn",null);u(this,"uploading",!1);u(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 k,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){return new Promise((o,l)=>{this.ssh2Conn.shell((i,n)=>{if(i){this.breakConnect();return}let c=[];n.on("close",()=>{o(c.toString())}).on("data",t=>{c.push(`
-`+t)}).stderr.on("data",t=>{console.log(`- 远程命令错误：
-`+t),this.ssh2Conn.end(),l(t)}),n.end(e+`
+(function(a){typeof define=="function"&&define.amd?define(a):a()})(function(){"use strict";var D=Object.defineProperty;var v=(a,h,g)=>h in a?D(a,h,{enumerable:!0,configurable:!0,writable:!0,value:g}):a[h]=g;var p=(a,h,g)=>(v(a,typeof h!="symbol"?h+"":h,g),g);const{stdout:a}=require("single-line-log"),h=require("path"),g=require("fs"),{Client:P}=require("ssh2");module.exports=class{constructor(e){p(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"}});p(this,"ssh2Conn",null);p(this,"uploading",!1);p(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 P,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){return new Promise((o,r)=>{this.ssh2Conn.shell((n,s)=>{if(n){console.log("- 远程命令错误："+n,e),this.breakConnect(),r(n);return}let l=[];s.on("close",()=>{o(l.toString())}).on("data",i=>{l.push(`
+`+i)}).stderr.on("data",i=>{console.log(`- 远程命令错误：
+`+i),this.breakConnect(),r(i)}),s.end(e+`
 exit
-`)})})}projectInit(e,o){return new Promise(async(l,i)=>{e.mkdir(o,async n=>{if(n)console.log(n),i();else{console.log("- 正在创建dockerfile");const c=`${o}/${this.config.dockerfile.name}`;await this.onShell(`touch ${c}`),await this.onShell(`echo '${this.config.dockerfile.content.join(`
-`)}' > ${c}`),console.log("- 正在创建upload.sh");const t=`${o}/${this.config.upload.name}`;await this.onShell(`touch ${t}`),await this.onShell(`echo '${this.config.upload.content.join(`
-`)}' > ${t}`),l()}})})}upLoadProject(e,o){e.readdir(o,async l=>{if(l){console.log("- 跳板机不存在项目, 开始创建项目"),this.projectInit(e,o).then(()=>{console.log(`- ${this.config.namespace}项目创建成功`),this.upLoadProject(e,o)}).catch(()=>{console.log("- 创建项目失败"),this.breakConnect()});return}console.log("- 开始上传文件");const i=`${o}/${this.config.dist.name}`;await this.onShell(`rm -rf ${i}`),await this.onShell(`mkdir ${i}`),this.config.fileDir||(console.log("- 请配置本地文件目录 fileDir"),this.breakConnect());const n=await this.getFilesInDirectory(this.config.fileDir);n.length===0&&(console.log("- 待上传目录为空，请检查"),this.breakConnect());let c=0;const t=(s,C=0)=>s.isDirectory?this.onShell(`mkdir ${i}${s.remotePath}`):new Promise((j,w)=>{try{const m=g.createReadStream(s.localPath),$=e.createWriteStream(`${o}/dist${s.remotePath}`);$.on("close",()=>{this.progressBar(++c,C),j()}),$.on("error",b=>{console.log(`- 文件 ${s.remotePath} 上传失败：${b}`),w(b),this.breakConnect()}),m.pipe($)}catch(m){w(m)}}),f=n.filter(s=>s.isDirectory);await Promise.all(f.map(s=>t(s))),await new Promise(s=>{setTimeout(()=>{s()},500)});const a=n.filter(s=>!s.isDirectory);await Promise.all(a.map(s=>t(s,a.length))),console.log("- 文件上传成功"),console.log("- 开始推送镜像");let d=`cd ${o} && sh ${this.config.upload.name}`;const y=this.getArgv("--imageStore")||this.config.imageStore;d+=` ${y}`;const p=this.getArgv("--tmpName")||this.config.tmpName;d+=` ${p}`;const S=await this.onShell(d);console.log(S),console.log("- 镜像推送完成"),this.ssh2Conn.end()})}progressBar(e,o,l=25){let i=(e/o).toFixed(4),n=Math.floor(i*l),c="";for(let a=0;a<n;a++)c+="█";let t="";for(let a=0;a<l-n;a++)t+="░";let f=`- 上传进度: ${c}${t} ${(100*i).toFixed(2)}% (${e}/${o})`;h(f),e==o&&console.log("")}getFilesInDirectory(e){const o=[];return new Promise((l,i)=>{const n=(c,t)=>{g.readdirSync(c).forEach(a=>{const d=r.join(c,a),p=g.statSync(d).isDirectory();o.push({isDirectory:p,localPath:d,remotePath:`${t}${a}`}),p&&n(d,`${t}${a}/`)})};n(e,"/"),l(o)})}getArgv(e){const o=process.argv;let l;return o.forEach(i=>{i.indexOf(e)>-1&&(l=i.split("=")[1]||"")}),l}}return P});
+`)})})}projectInit(e,o){return new Promise(async(r,n)=>{e.mkdir(o,async s=>{if(s)n(s);else{console.log("- 正在创建dockerfile");const l=`${o}/${this.config.dockerfile.name}`;await this.onShell(`touch ${l}`),await this.onShell(`echo '${this.config.dockerfile.content.join(`
+`)}' > ${l}`),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}`),r()}})})}upLoadProject(e,o){e.readdir(o,async r=>{if(r){console.log("- 跳板机不存在项目, 开始创建项目"),this.projectInit(e,o).then(()=>{console.log(`- ${this.config.namespace}项目创建成功`),this.upLoadProject(e,o)}).catch(t=>{console.log(`- 创建项目失败: ${t}`),this.breakConnect()});return}console.log("- 开始上传文件");const n=`${o}/${this.config.dist.name}`;if(await this.onShell(`rm -rf ${n}`),await this.onShell(`mkdir ${n}`),!this.config.fileDir){console.log("- 请配置待上传文件目录 fileDir"),this.breakConnect();return}const s=await this.getFilesInDirectory(this.config.fileDir);if(s.length===0){console.log("- 待上传目录为空，请检查"),this.breakConnect();return}let l=0,i=s.length;const d=t=>t.isDirectory?this.onShell(`mkdir ${n}${t.remotePath}`).then(()=>{this.progressBar(++l,i)}):new Promise((m,b)=>{try{const $=g.createReadStream(t.localPath),y=e.createWriteStream(`${n}${t.remotePath}`);y.on("close",()=>{this.progressBar(++l,i),m()}),y.on("error",k=>{console.log(`- 文件 ${t.remotePath} 上传失败：${k}`),b(k),this.breakConnect()}),$.pipe(y)}catch($){b($)}}),c=t=>{if(t.length===0)return Promise.resolve();const m=t.shift();return d(m).then(()=>c(t))},f=s.filter(t=>t.isDirectory);await c(f),await new Promise(t=>{setTimeout(()=>{t()},500)});const w=s.filter(t=>!t.isDirectory);await Promise.all(w.map(t=>d(t))),console.log("- 文件上传成功"),console.log("- 开始推送镜像");let u=`cd ${o} && sh ${this.config.upload.name}`;const S=this.getArgv("--imageStore")||this.config.imageStore;u+=` ${S}`;const C=this.getArgv("--tmpName")||this.config.tmpName;u+=` ${C}`;const j=await this.onShell(u);console.log(j),console.log("- 镜像推送完成"),this.breakConnect()})}progressBar(e,o,r=25){let n=(e/o).toFixed(4),s=Math.floor(n*r),l="";for(let c=0;c<s;c++)l+="█";let i="";for(let c=0;c<r-s;c++)i+="░";let d=`- 上传进度: ${l}${i} ${(100*n).toFixed(2)}% (${e}/${o})`;a(d),e==o&&console.log("")}getFilesInDirectory(e){const o=[];return new Promise((r,n)=>{const s=(l,i)=>{g.readdirSync(l).forEach(c=>{const f=h.join(l,c),u=g.statSync(f).isDirectory();o.push({isDirectory:u,localPath:f,remotePath:`${i}${c}`}),u&&s(f,`${i}${c}/`)})};s(e,"/"),r(o)})}getArgv(e){const o=process.argv;let r;return o.forEach(n=>{n.indexOf(e)>-1&&(r=n.split("=")[1]||"")}),r}}});

package/package.json

@@ -1,33 +1,33 @@
-{
-  "name": "yj-deploy",
-  "version": "0.0.2",
-  "description": "ssh sftp",
-  "scripts": {
-    "build": "vite build"
-  },
-  "files": [
-    "dist",
-    "package.json",
-    "README.md"
-  ],
-  "main": "./dist/yj-deploy.umd.js",
-  "module": "./dist/yj-deploy.mjs",
-  "exports": {
-    ".": {
-      "import": "./dist/yj-deploy.mjs",
-      "require": "./dist/yj-deploy.umd.js"
-    }
-  },
-  "author": "",
-  "license": "ISC",
-  "dependencies": {
-    "single-line-log": "^1.1.2",
-    "ssh2": "^1.15.0"
-  },
-  "devDependencies": {
-    "vite": "4.5"
-  },
-  "publishConfig": {
-    "registry": "https://registry.npmjs.org"
-  }
-}
+{
+  "name": "yj-deploy",
+  "version": "0.0.3",
+  "description": "ssh sftp",
+  "scripts": {
+    "build": "vite build"
+  },
+  "files": [
+    "dist",
+    "package.json",
+    "README.md"
+  ],
+  "main": "./dist/yj-deploy.umd.js",
+  "module": "./dist/yj-deploy.mjs",
+  "exports": {
+    ".": {
+      "import": "./dist/yj-deploy.mjs",
+      "require": "./dist/yj-deploy.umd.js"
+    }
+  },
+  "author": "",
+  "license": "ISC",
+  "dependencies": {
+    "single-line-log": "^1.1.2",
+    "ssh2": "^1.15.0"
+  },
+  "devDependencies": {
+    "vite": "4.5"
+  },
+  "publishConfig": {
+    "registry": "https://registry.npmjs.org"
+  }
+}