@dypnb/dev-tools 1.0.7 → 1.0.9

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dypnb/dev-tools",
-  "version": "1.0.7",
+  "version": "1.0.9",
   "description": "开发时的提效工具",
   "main": "lib/bundle.cjs.js",
   "jsnext:main": "lib/bundle.esm.js",
@@ -13,16 +13,14 @@
     "build:types": "npx tsc",
     "publishNpm": "npm run build && npm publish",
     "clean": "rimraf ./dist",
-    "genPage": "node ./dist/genPage/index.js",
+    "genPage": "node ./dist/genPage/index.esm.js",
     "docs:dev": "vitepress dev docs --host ",
     "docs:build": "vitepress build docs",
     "docs:preview": "vitepress preview docs",
     "publishD": "dyp-publish"
   },
   "bin": {
-    "dyp-publish": "src/publish-server/index.js",
-    "dyp-genPage": "src/gen-page/index.js",
-    "dyp-genSwagger": "dist/gen-page/index.js"
+    "dyp-publish": "src/publish-server/index.mjs"
   },
   "dependencies": {
     "@dypnb/dev-tools": "^1.0.5",

package/src/publish-server/index.mjs

@@ -0,0 +1,130 @@
+#! /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: '' //使用 私钥密钥登录 目前测试服务器不需要用到
+    });
+})

package/src/utils/index.js

@@ -3,67 +3,65 @@ import chalk  from "chalk";
 import execa  from "execa";
 
 // 最新 node 核心包的导入写法
-import { fileURLToPath } from 'node:url'
-import { dirname } from 'node:path'
+import { fileURLToPath } from "node:url";
+import { dirname } from "node:path";
+
 
 export async function getGlobalConfig(type) {
-  const name = findup('dyp.config.js', {cwd: process.env.PWD});
+  const name = findup("dyp.config.js", { cwd: process.env.PWD });
   const dypConfig = await import(name);
   if (type) {
-    return dypConfig['default'][type];
+    return dypConfig["default"][type];
   }
-  return dypConfig['default'];
+  return dypConfig["default"];
 }
 
 // 首字母大写
-export  function strCase(str) {  
-  return str.toLowerCase().replace(/( |^)[a-z]/g, (L) => L.toUpperCase());  
+export function strCase(str) {
+  return str.toLowerCase().replace(/( |^)[a-z]/g, (L) => L.toUpperCase());
 }
 
 // 获取文件名
-export  function getFilename() {  
+export function getFilename() {
   return fileURLToPath(import.meta.url);
 }
 
 // 获取根路径
-export  function getDirname() {  
-  return dirname(fileURLToPath(import.meta.url))
+export function getDirname() {
+  return dirname(fileURLToPath(import.meta.url));
 }
 
-
-export function log(mainMsg, laterMsg) {  
-  return chalkLog('blue', mainMsg, laterMsg);
+export function log(mainMsg, laterMsg) {
+  return chalkLog("blue", mainMsg, laterMsg);
 }
 
-export function cyanLog(mainMsg, laterMsg = '') {  
-  return chalkLog('cyan', mainMsg, laterMsg);
+export function cyanLog(mainMsg, laterMsg = "") {
+  return chalkLog("cyan", mainMsg, laterMsg);
 }
 
-export function magentaLog(mainMsg, laterMsg = '') {  
-  return chalkLog('magenta', mainMsg, laterMsg);
+export function magentaLog(mainMsg, laterMsg = "") {
+  return chalkLog("magenta", mainMsg, laterMsg);
 }
 
-export function successLog(mainMsg, laterMsg = '') {  
-  return chalkLog('green', mainMsg, laterMsg);
+export function successLog(mainMsg, laterMsg = "") {
+  return chalkLog("green", mainMsg, laterMsg);
 }
 
-export function warningLog(mainMsg, laterMsg = '') {  
-  return chalkLog('yellow', mainMsg, laterMsg);
+export function warningLog(mainMsg, laterMsg = "") {
+  return chalkLog("yellow", mainMsg, laterMsg);
 }
 
-export  function errorLog(mainMsg, laterMsg = '') {  
-  return chalkLog('red', mainMsg, laterMsg);
+export function errorLog(mainMsg, laterMsg = "") {
+  return chalkLog("red", mainMsg, laterMsg);
 }
 
-export function chalkLog(chalkType, mainMsg, laterMsg = '') {  
+export function chalkLog(chalkType, mainMsg, laterMsg = "") {
   if (!laterMsg) {
     return console.log(chalk[chalkType](`${mainMsg}`));
   }
   return console.log(chalk[chalkType](`${mainMsg}`), laterMsg);
-  
 }
 
-
 /**
  * 获取最新 commit 提交信息
  * git 获取提交信息参考：https://www.cnblogs.com/ruiy/p/15904295.html
@@ -71,15 +69,14 @@ export function chalkLog(chalkType, mainMsg, laterMsg = '') {
  */
 
 export function getGitInfo() {
-  const shortCommid = execa.commandSync('git rev-parse --short HEAD');
+  const shortCommid = execa.commandSync("git rev-parse --short HEAD");
 
-  const gitComMsg = `git log --pretty=format:“%s” ${shortCommid.stdout} -1`
+  const gitComMsg = `git log --pretty=format:“%s” ${shortCommid.stdout} -1`;
 
   const { stdout, stderr } = execa.commandSync(gitComMsg);
 
   return {
     commitId: shortCommid.stdout,
-    commitMsg: stdout
-  }
+    commitMsg: stdout,
+  };
 }
-