cmyr-template-cli 1.45.3 → 1.45.5

package/dist/plopfile.js

@@ -24,7 +24,7 @@ var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__ge
 
 // src/plopfile.ts
 var import_path11 = __toESM(require("path"));
-var import_fs_extra11 = __toESM(require("fs-extra"));
+var import_fs_extra12 = __toESM(require("fs-extra"));
 var import_ora11 = __toESM(require("ora"));
 
 // src/config/env.ts
@@ -35,8 +35,10 @@ var PACKAGE_MANAGER = "pnpm";
 // src/utils/utils.ts
 var import_path10 = __toESM(require("path"));
 var import_colors3 = __toESM(require("@colors/colors"));
-var import_download_git_repo = __toESM(require("download-git-repo"));
 var import_ora10 = __toESM(require("ora"));
+var import_axios2 = __toESM(require("axios"));
+var import_adm_zip = __toESM(require("adm-zip"));
+var import_fs_extra11 = __toESM(require("fs-extra"));
 
 // src/utils/constants.ts
 var GITHUB_API_URL = "https://api.github.com";
@@ -2321,31 +2323,59 @@ async function initCursorDirectory(projectPath) {
 }
 
 // src/utils/utils.ts
-async function downloadGitRepo(repository, destination, options = {}) {
+async function downloadGitRepo(repository, destination) {
   const fastRepo = await getFastGitRepo(repository);
   const loading = (0, import_ora10.default)(`正在下载模板 - ${repository}`);
   loading.start();
   return Promise.any([
-    new Promise((resolve) => {
-      (0, import_download_git_repo.default)(fastRepo, destination, options, (err) => {
-        if (err) {
-          loading.fail("下载模板失败！");
-          process.exit(1);
-        }
-        loading.succeed(`成功下载模板 - ${repository}`);
-        resolve(true);
-      });
-    }),
+    downloadAndExtractZip(fastRepo, destination, loading, repository),
     new Promise((_resolve, reject) => setTimeout(reject, 60 * 1e3))
   ]);
 }
+async function downloadAndExtractZip(url, destination, loading, repository) {
+  try {
+    const response = await import_axios2.default.get(url, { responseType: "arraybuffer" });
+    const buffer = Buffer.from(response.data);
+    const zip = new import_adm_zip.default(buffer);
+    const entries = zip.getEntries();
+    const topDir = entries[0]?.entryName.split("/")[0];
+    if (!topDir) {
+      throw new Error("无效的 zip 文件");
+    }
+    await import_fs_extra11.default.ensureDir(destination);
+    for (const entry of entries) {
+      if (entry.entryName.startsWith(`${topDir}/`)) {
+        const relativePath = entry.entryName.slice(topDir.length + 1);
+        if (!relativePath) {
+          continue;
+        }
+        const targetPath = import_path10.default.join(destination, relativePath);
+        const resolvedPath = import_path10.default.resolve(targetPath);
+        if (!resolvedPath.startsWith(import_path10.default.resolve(destination))) {
+          throw new Error(`路径遍历攻击检测: ${relativePath}`);
+        }
+        if (entry.isDirectory) {
+          await import_fs_extra11.default.ensureDir(targetPath);
+        } else {
+          await import_fs_extra11.default.ensureDir(import_path10.default.dirname(targetPath));
+          await import_fs_extra11.default.writeFile(targetPath, entry.getData());
+        }
+      }
+    }
+    loading.succeed(`成功下载模板 - ${repository}`);
+    return true;
+  } catch {
+    loading.fail("下载模板失败！");
+    process.exit(1);
+  }
+}
 async function getFastGitRepo(repository) {
   const loading = (0, import_ora10.default)(`正在选择镜像源 - ${repository}`);
   loading.start();
   try {
     const fastUrl = await getFastUrl(REMOTES.map((remote) => `${remote}/${repository}/archive/refs/heads/master.zip`));
     loading.succeed(`成功选择了镜像源 - ${fastUrl}`);
-    return `direct:${fastUrl}`;
+    return fastUrl;
   } catch (error) {
     console.error(error);
     loading.fail("选择镜像源失败！");
@@ -2507,7 +2537,7 @@ async function getGitUserName() {
 }
 
 // src/utils/ai-api.ts
-var import_axios2 = __toESM(require("axios"));
+var import_axios3 = __toESM(require("axios"));
 
 // src/pure/ai.ts
 var MAX_USER_INPUT_LENGTH = 500;
@@ -2590,7 +2620,7 @@ async function chatCompletion(request) {
     throw new Error("AI_API_BASE must use HTTPS for security (except for localhost)");
   }
   try {
-    const response = await import_axios2.default.post(
+    const response = await import_axios3.default.post(
       endpoint,
       {
         model,
@@ -2616,7 +2646,7 @@ async function chatCompletion(request) {
     }
     return content;
   } catch (error) {
-    if (import_axios2.default.isAxiosError(error)) {
+    if (import_axios3.default.isAxiosError(error)) {
       const axiosError = error;
       if (axiosError.code === "ECONNABORTED" || axiosError.message.includes("timeout")) {
         throw new Error(`AI API request timed out after ${AI_TIMEOUT / 1e3} seconds. Please try again.`);
@@ -2869,7 +2899,7 @@ module.exports = function(plop) {
           name: "license",
           message: "请选择开源协议",
           async choices() {
-            return import_fs_extra11.default.readdir(import_path11.default.join(__dirname, "../templates/licenses/"));
+            return import_fs_extra12.default.readdir(import_path11.default.join(__dirname, "../templates/licenses/"));
           },
           default: "MIT",
           when(answers2) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cmyr-template-cli",
-  "version": "1.45.3",
+  "version": "1.45.5",
   "description": "草梅友仁自制的项目模板创建器",
   "author": "CaoMeiYouRen",
   "license": "MIT",
@@ -38,6 +38,7 @@
     "@commitlint/cli": "^21.0.1",
     "@semantic-release/changelog": "^6.0.3",
     "@semantic-release/git": "^10.0.1",
+    "@types/adm-zip": "^0.5.8",
     "@types/debug": "^4.1.13",
     "@types/ejs": "^3.1.0",
     "@types/fs-extra": "^11.0.0",
@@ -45,17 +46,17 @@
     "@types/libsodium-wrappers": "^0.8.2",
     "@types/lodash": "^4.17.24",
     "@types/minimist": "^1.2.5",
-    "@types/node": "^25.7.0",
+    "@types/node": "^26.0.1",
     "@vitest/coverage-v8": "^4.1.6",
     "commitizen": "^4.3.1",
     "commitlint-config-cmyr": "1.0.0",
     "conventional-changelog-cmyr-config": "^3.0.0",
-    "conventional-changelog-writer": "^8.4.0",
+    "conventional-changelog-writer": "^9.1.0",
     "cross-env": "^10.1.0",
     "cz-conventional-changelog-cmyr": "2.0.0",
     "debug": "^4.4.3",
     "eslint": "^9.34.0",
-    "eslint-config-cmyr": "2.3.0",
+    "eslint-config-cmyr": "2.3.1",
     "husky": "^9.0.5",
     "lint-staged": "^17.0.4",
     "rimraf": "^6.1.3",
@@ -72,11 +73,11 @@
     "@lint-md/core": "^2.0.0",
     "acorn": "^8.16.0",
     "acorn-walk": "^8.3.5",
+    "adm-zip": "^0.6.0",
     "axios": "^1.16.1",
-    "commander": "^14.0.3",
+    "commander": "^15.0.0",
     "dayjs": "^1.11.20",
-    "download-git-repo": "^3.0.2",
-    "ejs": "^5.0.2",
+    "ejs": "^6.0.1",
     "fs-extra": "^11.3.5",
     "json5": "^2.2.1",
     "libsodium-wrappers": "0.8.4",