@dypnb/dev-tools 1.0.11 → 1.0.12

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dypnb/dev-tools",
-  "version": "1.0.11",
+  "version": "1.0.12",
   "description": "开发时的提效工具",
   "main": "lib/bundle.cjs.js",
   "jsnext:main": "lib/bundle.esm.js",

package/src/publish-server/index.js

@@ -17,46 +17,60 @@ async function getUploadServeConfig() {
 }
 
 getUploadServeConfig().then(res => {
-  const uploadServeConfig = res['uploadServeConfig'];
+  const { 
+    projectInfo = {  // 项目基本信息
+      name: '', // 项目名称
+    },
+    locaPath, // 本地上传地址
+    protocol = 'http', //协议 http、https
+    staticPath = {}, // 服务器静态资源地址
+    serverOption = {}, // 服务器配置
+    shell // shell 命令
+  } = res['uploadServeConfig'] || {};
+
   const wxServerConfig = res['wxServerConfig'];
 
-  const isProduction = process.env.VUE_APP_PACK_ENV === "pro"; // 是否是生产环境
+  const isProduction = process.env.VUE_APP_PACK_ENV === "production"; // 是否是生产环境
 
   const lineVersion = process.env.VUE_APP_LINE_VERSION; //线上环境版本（多个显示环境可使用此字段区分）
 
   const isNewPro = isProduction && +lineVersion === 2; // 是否是新的线上版本
 
-  const host = !isNewPro ? uploadServeConfig.host[0] : uploadServeConfig.host[1]; 
-
-  const staticPath = !isProduction ? uploadServeConfig.staticPath.dev : uploadServeConfig.staticPath.pro;
+  const curtHost = !isNewPro ? serverOption.host[0] : serverOption.host[1]; 
 
-  const onlinePath = `${uploadServeConfig.protocol}://${host}/${staticPath}`
+  const curtStaticPath = !isProduction ? staticPath.dev : staticPath.pro;
 
-  const gitInfo = getGitInfo();
+  const onlinePath = `${protocol}://${curtHost}/${curtStaticPath}`;
 
   const server = {
-    host, // 服务器ip
-    port: "22", // 端口一般默认22
-    locaPath: `${process.env.PWD}${uploadServeConfig.locaPath}`, // 本地打包文件的位置
-    ...uploadServeConfig.serverOption,
-    pathNmae: `${uploadServeConfig.serverOption.pathNmae}${staticPath}` // 上传到服务器的位置
+    port: 22, // 端口默认22
+    ...serverOption,
+    host: curtHost, // 服务器 ip
+    locaPath: `${process.env.PWD}${locaPath}`, // 本地打包文件的位置
+    pathNmae: `${serverOption.pathNmae}${curtStaticPath}` // 上传到服务器的位置
   };
 
+
+  // 服务器删除静态资源命令
+  const shellCommand = !shell ? `rm -rf ${server.pathNmae}/*` : shell;
+
+  const gitInfo = getGitInfo();
+
+
   const packInfo =  {
-    ...(uploadServeConfig.baseInfo || {}),
+    ...(projectInfo || {}),
     serverPath: server.pathNmae
   }
 
 
   function wxMsg(status) {
-    return `<div class="gray">${moment().format('lll')}</div><div class="highlight">${uploadServeConfig.projectTitle}${isProduction ? "生产" : "开发"}环境发布${status}</div><div class="normal">commitId：${gitInfo.commitId}</div><div class="normal">commitMsg：${gitInfo.commitMsg}</div><div class="normal">访问地址：${onlinePath}</div>`
+    return `<div class="gray">${moment().format('lll')}</div><div class="highlight">${projectInfo.name}${isProduction ? "生产" : "开发"}环境发布${status}</div><div class="normal">commitId：${gitInfo.commitId}</div><div class="normal">commitMsg：${gitInfo.commitMsg}</div><div class="normal">访问地址：${onlinePath}</div>`
   }
 
 
   cyanLog("本次打包信息 =>", packInfo);
 
 
-
   const spinner = ora(
     "正在发布到" + (isProduction ? "生产" : "开发") + "服务器..."
   );
@@ -75,7 +89,7 @@ getUploadServeConfig().then(res => {
         return false;
       }
       // 这里我拼接了放置服务器资源目录的位置 ，首选通过rm -rf删除了这个目录下的文件
-      conn.exec("rm -rf " + server.pathNmae + "/*", function(err, stream) {
+      conn.exec(shellCommand, function(err, stream) {
         warningLog("已删除服务端文件")
         stream.on("close", function(code, signal) {
           log("开始上传");
@@ -124,7 +138,7 @@ getUploadServeConfig().then(res => {
       host: server.host,
       port: server.port,
       username: server.username,
-      password: server.password
-      //privateKey: '' //使用 私钥密钥登录 目前测试服务器不需要用到
+      password: server.password,
+      privateKey:  server.privateKey || undefined //使用 私钥密钥登录 目前测试服务器不需要用到
     });
 })

package/src/publish-server/index.mjs

@@ -1,130 +0,0 @@
-#! /usr/bin/env node
-
-// scp2 : https://www.npmjs.com/package/
-// 引入scp2
-import client from "scp2";
-import ora from "ora";
-import moment from "moment";
-import { getGlobalConfig, getGitInfo, errorLog, magentaLog, log, warningLog, successLog, cyanLog } from "../utils/index.js";
-import { wxNotify } from "../wx-server-notice/index.js";
-import pkg from 'ssh2';
-const { Client } = pkg;
-
-moment.locale('zh-cn'); 
-
-async function getUploadServeConfig() {
-  return await getGlobalConfig();
-}
-
-getUploadServeConfig().then(res => {
-  const uploadServeConfig = res['uploadServeConfig'];
-  const wxServerConfig = res['wxServerConfig'];
-
-  const isProduction = process.env.VUE_APP_PACK_ENV === "pro"; // 是否是生产环境
-
-  const lineVersion = process.env.VUE_APP_LINE_VERSION; //线上环境版本（多个显示环境可使用此字段区分）
-
-  const isNewPro = isProduction && +lineVersion === 2; // 是否是新的线上版本
-
-  const host = !isNewPro ? uploadServeConfig.host[0] : uploadServeConfig.host[1]; 
-
-  const staticPath = !isProduction ? uploadServeConfig.staticPath.dev : uploadServeConfig.staticPath.pro;
-
-  const onlinePath = `${uploadServeConfig.protocol}://${host}/${staticPath}`
-
-  const gitInfo = getGitInfo();
-
-  const server = {
-    host, // 服务器ip
-    port: "22", // 端口一般默认22
-    locaPath: `${process.env.PWD}${uploadServeConfig.locaPath}`, // 本地打包文件的位置
-    ...uploadServeConfig.serverOption,
-    pathNmae: `${uploadServeConfig.serverOption.pathNmae}${staticPath}` // 上传到服务器的位置
-  };
-
-  const packInfo =  {
-    ...(uploadServeConfig.baseInfo || {}),
-    serverPath: server.pathNmae
-  }
-
-
-  function wxMsg(status) {
-    return `<div class="gray">${moment().format('lll')}</div><div class="highlight">${uploadServeConfig.projectTitle}${isProduction ? "生产" : "开发"}环境发布${status}</div><div class="normal">commitId：${gitInfo.commitId}</div><div class="normal">commitMsg：${gitInfo.commitMsg}</div><div class="normal">访问地址：${onlinePath}</div>`
-  }
-
-
-  cyanLog("本次打包信息 =>", packInfo);
-
-
-
-  const spinner = ora(
-    "正在发布到" + (isProduction ? "生产" : "开发") + "服务器..."
-  );
-  
-  // 创建shell脚本
-  const conn = new Client();
-
-  magentaLog("正在建立连接");
-
-  conn
-    .on("ready", function() {
-      log("已连接");
-      if (!server.pathNmae) {
-        log("连接已关闭");
-        conn.end();
-        return false;
-      }
-      // 这里我拼接了放置服务器资源目录的位置 ，首选通过rm -rf删除了这个目录下的文件
-      conn.exec("rm -rf " + server.pathNmae + "/*", function(err, stream) {
-        warningLog("已删除服务端文件")
-        stream.on("close", function(code, signal) {
-          log("开始上传");
-          spinner.start();
-          client.scp(
-            server.locaPath,
-            {
-              host: server.host,
-              port: server.port,
-              username: server.username,
-              password: server.password,
-              path: server.pathNmae
-            },
-            err => {
-              spinner.stop();
-              if (!err) {
-                successLog("Success! 成功发布到" + (isProduction ? "生产" : "开发") + "服务器!", `访问地址====>${onlinePath}`)
-                wxNotify({
-                  msgtype: "textcard",
-                  textcard: {
-                    title: "发布成功",
-                    description: wxMsg('成功'),
-                    url: onlinePath,
-                    btntxt: "更多"
-                  }
-                }, wxServerConfig);
-              } else {
-                errorLog("发布失败.\n", err);
-                wxNotify({
-                  msgtype: "textcard",
-                  textcard: {
-                    title: "发布失败",
-                    description: wxMsg('失败'),
-                    url: onlinePath,
-                    btntxt: "更多"
-                  }
-                }, wxServerConfig);
-              }
-              conn.end(); // 结束命令
-            }
-          );
-        });
-      });
-    })
-    .connect({
-      host: server.host,
-      port: server.port,
-      username: server.username,
-      password: server.password
-      //privateKey: '' //使用 私钥密钥登录 目前测试服务器不需要用到
-    });
-})