qdmp-cli 0.1.14 → 0.1.15

package/.claude/settings.local.json

@@ -0,0 +1,9 @@
+{
+  "permissions": {
+    "allow": [
+      "Bash(npm version:*)",
+      "Bash(xargs cat)",
+      "Bash(xargs ls -la)"
+    ]
+  }
+}

package/actions.js

@@ -125,7 +125,7 @@ export async function uploadAction(option) {
       error(`压缩文件 ${localPath} 未生成`);
     }
     // 上传到oss;
-    await uploadApp(uploadPath, localPath);
+    await uploadApp(appId, uploadPath, localPath, option.env);
     const isAccessible = await isUrlAccessible(url);
     if (!isAccessible) {
       error("上传链接不可用，请检查网络是否正常");

package/api.js

@@ -1,5 +1,6 @@
 import { getToken, saveToken } from "./utils/authorized.js";
 import fs from "fs";
+import path from "path";
 import { promisify } from "util";
 
 const readFile = promisify(fs.readFile);
@@ -104,19 +105,23 @@ export const getUserInfo = async (env = "prod") => {
   }
 };
 /**
- * 获取预上传url
- * @returns {Promise} url
+ * 获取版本包 PostPolicy 直传凭证
+ * @returns {Promise} PostPolicy 参数
  */
-export const getSignInRecords = async (file) => {
+export const getVersionUploadPolicy = async (appId, file, env = "prod") => {
   try {
-    const result = await request("/mp/v1/platform/version/uploadurl", {
-      method: "POST",
-      body: JSON.stringify({ file }),
-    });
-    if (result?.data?.url) {
-      return result.data.url;
+    const result = await request(
+      "/mp/v1/platform/version/upload-policy",
+      {
+        method: "POST",
+        body: JSON.stringify({ appId, file }),
+      },
+      env,
+    );
+    if (result?.data?.host && result?.data?.policy) {
+      return result.data;
     } else {
-      throw new Error(result.error || "获取上传url失败");
+      throw new Error(result?.message || "获取版本包上传凭证失败");
     }
   } catch (error) {
     throw new Error(error?.message);
@@ -126,20 +131,39 @@ export const getSignInRecords = async (file) => {
  * 上传版本
  * @params {string} filename
  */
-export const uploadApp = async (filename, localPath) => {
+export const uploadApp = async (appId, filename, localPath, env = "prod") => {
   try {
-    const signedUrl = await getSignInRecords(filename);
     const fileBuffer = await readFile(localPath);
-    const response = await fetch(signedUrl, {
-      method: "PUT",
-      headers: {
-        "Content-Type": "application/octet-stream",
-      },
-      body: fileBuffer,
+    if (fileBuffer.length === 0) {
+      throw new Error("版本包不能为空");
+    }
+
+    const uploadPolicy = await getVersionUploadPolicy(appId, filename, env);
+    if (fileBuffer.length > uploadPolicy.maxSize) {
+      throw new Error(`版本包大小不能超过 ${uploadPolicy.maxSize / 1024 / 1024}M`);
+    }
+    const form = new FormData();
+    form.append("key", uploadPolicy.key);
+    form.append("OSSAccessKeyId", uploadPolicy.ossAccessKeyId);
+    form.append("policy", uploadPolicy.policy);
+    form.append("Signature", uploadPolicy.signature);
+    form.append("success_action_status", uploadPolicy.successActionStatus);
+    form.append("Content-Type", uploadPolicy.contentType);
+    form.append(
+      "file",
+      new Blob([fileBuffer], { type: uploadPolicy.contentType }),
+      path.basename(localPath),
+    );
+
+    const response = await fetch(uploadPolicy.host, {
+      method: "POST",
+      body: form,
     });
-    if (response.status === 200) {
-      return response;
+    if (!response.ok) {
+      const detail = await response.text();
+      throw new Error(`OSS 上传失败（${response.status}）${detail ? `: ${detail}` : ""}`);
     }
+    return response;
   } catch (error) {
     throw new Error(error?.message);
   }

package/constants.js

@@ -1,16 +1,9 @@
 export const TEMPLATES = [
   {
     name: "default",
-    value: "git@github.com:EchoTechFE/qdmp-taro-template.git",
-    desc: "千岛小程序默认模版(2.0)",
-    emoji: "🟢",
-    fullUrl: true,
-  },
-  {
-    name: "qdmp",
     value: "frontend/miniapp-taro-template",
-    desc: "千岛小程序默认模版(1.0)",
-    emoji: "🟡",
+    desc: "千岛小程序默认模版",
+    emoji: "🟢",
   },
   {
     name: "h5",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "qdmp-cli",
-  "version": "0.1.14",
+  "version": "0.1.15",
   "description": "qdmp-cli",
   "main": "index.js",
   "type": "module",

package/utils/gitClone.js

@@ -38,13 +38,10 @@ export const download = async (projectName, repo) => {
 const clone = async (repo, name) => {
   const spinner = ora("正在拉取项目......").start();
   try {
-    const repoUrl = repo.includes(":")
-      ? repo
-      : `git@g.echo.tech:${repo}.git`;
     await new Promise((resolve, reject) => {
       const child = spawn(
         "git",
-        ["clone", "--depth", "1", repoUrl, name],
+        ["clone", "--depth", "1", `git@g.echo.tech:${repo}.git`, name],
         {
           stdio: ["ignore", "pipe", "pipe"],
           env: {
@@ -58,16 +55,12 @@ const clone = async (repo, name) => {
         if (code === 0) {
           resolve();
         } else {
-          const isGitHub = repoUrl.includes("github.com");
           reject(
             new Error(
               `git clone 失败 (退出码: ${code})，请检查：\n` +
                 `  1. 是否已配置 SSH 密钥：ssh-keygen -t ed25519\n` +
-                (isGitHub
-                  ? `  2. 是否已将公钥添加到 GitHub：https://github.com/settings/keys\n` +
-                    `  3. 网络是否能访问 github.com`
-                  : `  2. 是否已将公钥添加到 GitLab：cat ~/.ssh/id_ed25519.pub\n` +
-                    `  3. 网络是否能访问 g.echo.tech`)
+                `  2. 是否已将公钥添加到 GitLab：cat ~/.ssh/id_ed25519.pub\n` +
+                `  3. 网络是否能访问 g.echo.tech`
             )
           );
         }