@taole/deploy-helper 0.2.7 → 0.2.9

package/index.mjs

@@ -2,7 +2,7 @@
 
 import { Client } from 'node-scp'
 import fs from 'fs';
-import { join } from "path";
+import { join, basename, dirname } from "path";
 import { simpleGit } from 'simple-git';
 import { homedir } from 'os'
 
@@ -58,11 +58,31 @@ function hasChangeMe(content) {
     return content.includes("CHANGE_ME");
 }
 
-async function main() {
+async function getScpClient() {
+    let scpClient = null;
+    // 不能放密码。。残念
+    const scpClientConfig = {
+        host: '192.168.0.35',
+        username: 'root',
+        tryKeyboard: true,
+    }
+    const sshKeyPath = join(homedir(), ".ssh/id_rsa");
+    if (fs.existsSync(sshKeyPath)) {
+        scpClientConfig.privateKey = fs.readFileSync(sshKeyPath, "utf-8");
+    } else {
+        console.log(`${sshKeyPath}不存在, 建议配置本机ssh免密登录, 参考地址：https://foochane.cn/article/2019061601.html`);
+    }
+    scpClient = await Client(scpClientConfig);
+    return scpClient;
+}
+
 
+async function main() {
+    // console.log(`process.argv: ${process.argv[2]} ${process.argv[3]} ${process.argv[4]}`);
+    // return;
     // other commands
     let command = process.argv[2];
-    if (!["init", "prod", "test"].includes(command)) {
+    if (!["init", "prod", "test", "scp", "scpevt"].includes(command)) {
         command = "help";
     }
 
@@ -72,10 +92,52 @@ async function main() {
         console.log(`command: init 初始化配置`);
         console.log(`command: prod 生产环境部署`);
         console.log(`command: test 测试环境部署`);
+        console.log(`command: scp {file} 复制文件{file}到OfficialSite测试服务器{file}`);
+        console.log(`command: scp {file} {dest} 复制文件{file}到OfficialSite测试服务器{dest}`);
+        console.log(`command: scpevt {file} 复制文件{file}到events测试服务器{file}`);
+        console.log(`command: scpevt {file} {dest} 复制文件{file}到events测试服务器{dest}`);
         process.exit(0);
     } else if (command === "init") {
         await initConfigJson();
         process.exit(0);
+    } else if (["scp", "scpevt"].includes(command)) {
+        const file = process.argv[3];
+        if (!file) {
+            console.log(`file参数不能为空`);
+            process.exit(1);
+        }
+        const workDir = process.cwd(); // 当前项目根目录
+        
+        const srcFilePath = join(workDir, file);
+        if (!fs.existsSync(srcFilePath)) {
+            console.log(`${srcFilePath}不存在`);
+            process.exit(1);
+        }
+        if (fs.statSync(srcFilePath).isDirectory()) {
+            console.log(`${srcFilePath}是目录, 不支持scp目录`);
+            process.exit(1);
+        }
+        // 获取srcFilePath的目录
+        const fileDir = dirname(srcFilePath);
+        const fileName = basename(srcFilePath);
+        const dest = process.argv[4] || fileName;
+        if(dest.includes("/") || dest.includes("\\")){
+            console.log(`dest不能包含/或\\`);
+            process.exit(1);
+        }
+
+        if(workDir !== fileDir){
+            console.log(`仅支持scp当前目录下的文件(不带子目录)`);
+            process.exit(1);
+        }
+
+        const destPath = "/home/web/website/tuwan_www/templets/static/play/" + (command === 'scp' ? '' : 'events/')  + dest;
+
+        const scpClient = await getScpClient();
+        console.log(`scp: ${srcFilePath} -> ${destPath}`);
+        await scpClient.uploadFile(srcFilePath, destPath);
+        console.log(`scp done.`);
+        process.exit(0);
     }
     try {
         const workDir = process.cwd(); // 当前项目根目录
@@ -255,17 +317,7 @@ async function main() {
             // 8 测试环境将entry scp至测试环境
             if (mode === 'test' && config.testSync) {
                 const syncTestFiles = config.testSync;
-                // 不能放密码。。残念
-                const scpClientConfig = {
-                    host: '192.168.0.35',
-                    username: 'root',
-                    tryKeyboard: true,
-                }
-                const sshKeyPath = join(homedir(), ".ssh/id_rsa");
-                if (fs.existsSync(sshKeyPath)) {
-                    scpClientConfig.privateKey = fs.readFileSync(sshKeyPath, "utf-8");
-                }
-                const scpClient = await Client(scpClientConfig);
+                const scpClient = await getScpClient();
                 for (const [src, dest] of Object.entries(syncTestFiles)) {
                     const srcPath = join(workDir, src);
                     const destPath = "/home/web/website/tuwan_www/templets/static/play/" + dest;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@taole/deploy-helper",
-  "version": "0.2.7",
+  "version": "0.2.9",
   "description": "脚本部署工具，用于将项目部署到测试环境或生产环境",
   "main": "index.mjs",
   "type": "module",