qdmp-cli 0.0.8 → 0.0.10

package/actions.js

@@ -110,10 +110,10 @@ export async function uploadAction(option) {
     const code = +remoteApp.latest + 1;
     const uploadPath = getUploadPath(appId, code);
     const url = `https://crane.qiandaocdn.com/${uploadPath}`;
-
+    const loader = remoteApp.loader;
     // 预上传
     const targetName = `${appId}_${code}`;
-    const localPath = await preUpload(targetName);
+    const localPath = await preUpload(loader, targetName);
     if (!localPath) {
       error("预上传失败");
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "qdmp-cli",
-  "version": "0.0.8",
+  "version": "0.0.10",
   "description": "qdmp-cli",
   "main": "index.js",
   "type": "module",
@@ -8,8 +8,8 @@
     "test": "echo \"Error: no test specified\" && exit 1"
   },
   "bin": {
-    "qdmp": "./index.js",
-    "qdmp-cli": "./index.js"
+    "qdmp": "index.js",
+    "qdmp-cli": "index.js"
   },
   "keywords": [
     "千岛小程序",
@@ -18,6 +18,7 @@
   "author": "zhangyanran",
   "license": "ISC",
   "dependencies": {
+    "adm-zip": "^0.5.16",
     "chalk": "^5.4.1",
     "commander": "^14.0.0",
     "figlet": "^1.8.1",
@@ -26,5 +27,8 @@
     "ora": "^8.2.0",
     "shelljs": "^0.10.0",
     "table": "^6.9.0"
+  },
+  "engines": {
+    "node": ">=20"
   }
 }

package/utils/common.js

@@ -1,6 +1,5 @@
 import { info, error, success } from "./logHandler.js";
-import { execSync } from "child_process";
-import chalk from "chalk";
+import AdmZip from "adm-zip";
 import { WORKSPACE_DIR } from "../constants.js";
 import fs from "fs";
 import path from "path";
@@ -48,7 +47,7 @@ export const isUrlAccessible = async (url) => {
 export async function renameDistFolder(dirname, newname) {
   try {
     if (fs.existsSync(newname)) return true;
-    execSync(`mv ${dirname} ${newname}`, { stdio: "inherit" });
+    fs.renameSync(dirname, newname);
     return true;
   } catch (e) {
     error("重命名文件夹失败：", e);
@@ -61,8 +60,10 @@ export async function renameDistFolder(dirname, newname) {
 export async function createWorkSpaceFolder(dirname = "") {
   info("创建工作区...");
   try {
-    execSync(`rm -rf ${dirname}`);
-    execSync(`mkdir ${dirname}`, { stdio: "inherit" });
+    if (fs.existsSync(dirname)) {
+      fs.rmSync(dirname, { recursive: true, force: true });
+    }
+    fs.mkdirSync(dirname, { recursive: true });
     success("创建工作区成功！");
     return true;
   } catch (e) {
@@ -74,11 +75,25 @@ export async function createWorkSpaceFolder(dirname = "") {
  * @param {*} dirname 文件夹名
  */
 // 压缩项目
-async function compressProject(output, dirname = "") {
+async function compressProject(output, dirname = "", loader) {
   try {
-    execSync(`cd ./${dirname} && zip -r ${output}.zip ./h5`, {
-      stdio: "inherit",
-    });
+    if (loader !== "EMP") {
+      const zip = new AdmZip();
+      const h5Path = path.join(dirname, "h5");
+
+      if (!fs.existsSync(h5Path)) {
+        throw new Error("h5 目录不存在");
+      }
+
+      // 添加文件夹时指定目标路径为 h5
+      zip.addLocalFolder(h5Path, "h5");
+      zip.writeZip(path.join(dirname, `${output}.zip`));
+    } else {
+      // 直接压缩dist
+      const zip = new AdmZip();
+      zip.addLocalFolder(path.join(dirname, "dist"), "dist");
+      zip.writeZip(path.join(dirname, `${output}.zip`));
+    }
     return true;
   } catch (error) {
     return false;
@@ -89,41 +104,115 @@ async function compressProject(output, dirname = "") {
  */
 async function copyDistFolder(dirname) {
   try {
-    const indexPath = execSync(`find ${dirname} -name index.html -print -quit`)
-      .toString()
-      .trim();
+    info("正在查找 index.html 文件...");
+    let indexPath = null;
+    function findIndexHtml(dir) {
+      const files = fs.readdirSync(dir);
+      for (const file of files) {
+        const fullPath = path.join(dir, file);
+        const stat = fs.statSync(fullPath);
+        if (stat.isDirectory()) {
+          const found = findIndexHtml(fullPath);
+          if (found) return found;
+        } else if (file === "index.html") {
+          return fullPath;
+        }
+      }
+      return null;
+    }
+    indexPath = findIndexHtml(dirname);
     if (!indexPath) {
       throw new Error("未找到index.html文件");
     }
+    success("找到 index.html 文件");
+
     const parentDir = path.dirname(indexPath);
-    execSync(`cp -r ${parentDir} ./${WORKSPACE_DIR}`, {
-      stdio: "inherit",
-    });
+    const targetDir = path.join(WORKSPACE_DIR, "dist");
+
+    info("正在复制文件...");
+    // 直接复制整个目录
+    fs.cpSync(parentDir, targetDir, { recursive: true });
+    success("文件复制完成");
     return true;
   } catch (e) {
     error(e);
     return false;
   }
 }
-
-/**预上传
- *
+/** 复制EMP文件夹
+ * @param {*} dirname 文件夹名
  */
-export async function preUpload(targetName) {
+async function copyEmpDistFolder() {
+  //直接复制根目录下dist文件夹
   try {
-    if (!(await createWorkSpaceFolder(WORKSPACE_DIR))) return false;
+    fs.cpSync("dist", `${WORKSPACE_DIR}/dist`, { recursive: true });
+    success("文件复制完成");
+    return true;
+  } catch (e) {
+    error(e);
+    return false;
+  }
+}
+/**
+ * 预上传准备工作
+ * 1. 创建工作空间
+ * 2. 复制构建产物
+ * 3. 重命名文件夹（非EMP构建模式）
+ * 4. 压缩项目
+ * @param {string} loader - 构建加载器类型
+ * @param {string} targetName - 目标文件名
+ * @returns {Promise<string|boolean>} 压缩文件路径或操作失败返回false
+ */
+export async function preUpload(loader, targetName) {
+  try {
+    // 1. 创建工作空间文件夹
+    if (!(await createWorkSpaceFolder(WORKSPACE_DIR))) {
+      error("创建工作空间失败");
+      return false;
+    }
 
-    if (!(await copyDistFolder("dist"))) return false;
+    // 2. 根据构建类型复制对应产物
+    const isCopySuccess =
+      loader === "EMP"
+        ? await copyEmpDistFolder()
+        : await copyAndRenameDistFolder();
 
-    if (
-      !(await renameDistFolder(`${WORKSPACE_DIR}/dist`, `${WORKSPACE_DIR}/h5`))
-    )
+    if (!isCopySuccess) {
+      error("复制构建产物失败");
       return false;
+    }
 
-    if (!(await compressProject(targetName, WORKSPACE_DIR))) return false;
-    return `./${WORKSPACE_DIR}/${targetName}.zip`;
-  } catch (e) {
-    error(e);
+    // 3. 压缩项目
+    if (!(await compressProject(targetName, WORKSPACE_DIR, loader))) {
+      error("压缩项目失败");
+      return false;
+    }
+
+    // 4. 返回压缩文件路径
+    const zipFilePath = `./${WORKSPACE_DIR}/${targetName}.zip`;
+    success(`预上传准备完成，压缩包路径: ${zipFilePath}`);
+    return zipFilePath;
+  } catch (error) {
+    error(`预上传过程出错: ${error.message}`);
+    return false;
+  }
+}
+
+/**
+ * 复制并创建标准H5文件夹结构
+ * 对于非EMP构建模式，复制dist内容并重命名为h5
+ * @returns {Promise<boolean>} 操作是否成功
+ */
+async function copyAndRenameDistFolder() {
+  try {
+    if (!(await copyDistFolder("dist"))) {
+      return false;
+    }
+
+    return renameDistFolder(`${WORKSPACE_DIR}/dist`, `${WORKSPACE_DIR}/h5`);
+  } catch (error) {
+    error("复制并重命名文件夹过程出错:", error);
+    return false;
   }
 }
 /** 清理工作文件夹
@@ -131,7 +220,9 @@ export async function preUpload(targetName) {
  */
 export async function cleanWorkSpaceFolder(dirname) {
   try {
-    execSync(`rm -rf ./${WORKSPACE_DIR}`, { stdio: "inherit" });
+    if (fs.existsSync(WORKSPACE_DIR)) {
+      fs.rmSync(WORKSPACE_DIR, { recursive: true, force: true });
+    }
     success("清理工作空间成功！");
     return true;
   } catch (error) {