qdmp-cli 0.0.2 → 0.0.4

package/README.md

@@ -20,6 +20,7 @@ npm install -g qdmp-cli
 ```json
 {
   "appId": "your_app_id",
+  "devAppId": "your_dev_app_id",
 }
 ```
 ### 初始化项目
@@ -33,12 +34,15 @@ qdmp-cli list
 ### 登录
 ```bash
 qdmp-cli login
+qdmp-cli login -e dev //登录开发环境
 ```
 ### 查看当前用户
 ```bash
 qdmp-cli getMe
+qdmp-cli getMe -e dev //查看开发环境用户
 ```
 ### 上传版本
 ```bash
 qdmp-cli upload
+qdmp-cli upload -e dev //上传开发环境
 ```

package/actions.js

@@ -72,10 +72,10 @@ export const listAction = () => {
   console.log(table.table(tableData));
 };
 
-export const loginAction = async () => {
+export const loginAction = async (option) => {
   try {
     const { account, password } = await inquirerAccountPassword();
-    const result = await login(account, password);
+    const result = await login(account, password, option.env);
     if (result.success) {
       success("登录成功");
     } else {
@@ -85,25 +85,25 @@ export const loginAction = async () => {
     error(e.message);
   }
 };
-export const getMyInfoAction = async () => {
+export const getMyInfoAction = async (option) => {
   try {
-    const nickname = await getUserInfo();
-    const appId = await getAppId();
-    const appInfo = await getAppInfo(appId);
+    const nickname = await getUserInfo(option.env);
+    const appId = await getAppId(option.env);
+    const appInfo = await getAppInfo(appId, option.env);
     info(`当前用户：${nickname}`);
     info(`当前授权应用：${appInfo?.name} - ${appId}`);
-  } catch (error) {
-    error(error?.message);
+  } catch (e) {
+    error(e?.message);
   }
 };
 
-export async function uploadAction() {
+export async function uploadAction(option) {
   try {
-    const appId = await getAppId();
+    const appId = await getAppId(option.env);
     if (!appId) {
       error("未授权应用，请在根目录下qdmp.json配置对应的appId");
     }
-    const remoteApp = await getAppInfo(appId);
+    const remoteApp = await getAppInfo(appId, option.env);
     if (!remoteApp) {
       error("未找到应用，请检查appId是否正确");
     }
@@ -128,11 +128,13 @@ export async function uploadAction() {
       error("上传链接不可用，请检查网络是否正常");
     }
     // 更新远端版本信息;
-    await uploadVersion(appId, url);
+    await uploadVersion(appId, url, option.env);
     // 清理工作文件夹;
     await cleanWorkSpaceFolder();
     success(
-      `上传成功，版本号：${code}，可前往官网进行小程序发布：https://mp.qiandao.com`
+      `上传成功，版本号：${code}，可前往官网进行小程序发布：https://${
+        option.env === "prod" ? "" : "dev-"
+      }mp.qiandao.com`
     );
   } catch (e) {
     error(`${e.message}`);

package/api.js

@@ -3,9 +3,9 @@ import fs from "fs";
 import { promisify } from "util";
 
 const readFile = promisify(fs.readFile);
+
 // API 基础配置
 const API_CONFIG = {
-  baseURL: "https://api.qiandao.com",
   timeout: 10000,
   headers: {
     "content-type": "application/json",
@@ -18,13 +18,16 @@ const API_CONFIG = {
  * @param {object} options - 请求选项
  * @returns {Promise} 请求结果
  */
-export const request = async (url, options = {}) => {
+export const request = async (url, options = {}, env = "prod") => {
   const config = {
+    baseURL:
+      env === "prod"
+        ? "https://api.qiandao.com"
+        : "https://dev-api.qiandao.com",
     method: "GET",
     headers: { ...API_CONFIG.headers },
     ...options,
   };
-
   // 添加认证头（如果有 token）
   const token = getToken();
   if (token) {
@@ -32,7 +35,7 @@ export const request = async (url, options = {}) => {
   }
 
   try {
-    const response = await fetch(`${API_CONFIG.baseURL}${url}`, config);
+    const response = await fetch(`${config.baseURL}${url}`, config);
 
     // 检查响应状态
     if (!response.ok) {
@@ -55,12 +58,16 @@ export const request = async (url, options = {}) => {
  * @param {string} password - 密码
  * @returns {Promise} 登录结果
  */
-export const login = async (username, password) => {
+export const login = async (username, password, env = "prod") => {
   try {
-    const result = await request("/mp/v1/user/login", {
-      method: "POST",
-      body: JSON.stringify({ username, password }),
-    });
+    const result = await request(
+      "/mp/v1/user/login",
+      {
+        method: "POST",
+        body: JSON.stringify({ username, password }),
+      },
+      env
+    );
     if (result?.data?.token) {
       saveToken(result.data.token); // 保存token
       return { success: true };
@@ -75,9 +82,9 @@ export const login = async (username, password) => {
  * 获取用户信息
  * @returns {Promise} 用户信息
  */
-export const getUserInfo = async () => {
+export const getUserInfo = async (env = "prod") => {
   try {
-    const result = await request("/mp/v1/user/me");
+    const result = await request("/mp/v1/user/me", {}, env);
     return result?.data?.nickname;
   } catch (error) {
     throw new Error(error?.message);
@@ -128,9 +135,9 @@ export const uploadApp = async (filename, localPath) => {
  * 获取app信息
  * @params {string} appId - appId
  */
-export const getAppInfo = async (appId) => {
+export const getAppInfo = async (appId, env = "prod") => {
   try {
-    const result = await request("/mp/v1/lookup/app/" + appId);
+    const result = await request("/mp/v1/lookup/app/" + appId, {}, env);
     return result?.data;
   } catch (error) {
     throw new Error(error?.message);
@@ -141,15 +148,19 @@ export const getAppInfo = async (appId) => {
  * @params {string} appId - appId
  * @params {string} downloadUrl - 上传链接
  */
-export const uploadVersion = async (appId, downloadUrl) => {
+export const uploadVersion = async (appId, downloadUrl, env = "prod") => {
   try {
-    const result = await request("/mp/v1/platform/version/update", {
-      method: "POST",
-      body: JSON.stringify({
-        appId,
-        downloadUrl,
-      }),
-    });
+    const result = await request(
+      "/mp/v1/platform/version/update",
+      {
+        method: "POST",
+        body: JSON.stringify({
+          appId,
+          downloadUrl,
+        }),
+      },
+      env
+    );
     return result;
   } catch (error) {
     throw new Error(error?.message);

package/index.js

@@ -40,10 +40,19 @@ program
   .action(initAction);
 
 program.command("list").description("列出可选模版").action(listAction);
-program.command("login").description("登录").action(loginAction);
+program
+  .command("login")
+  .description("登录")
+  .option("-e, --env <env>", "当前环境")
+  .action(loginAction);
 program
   .command("getMe")
-  .description("查看当前登陆用户")
+  .description("查看登录用户")
+  .option("-e, --env <env>", "当前环境")
   .action(getMyInfoAction);
-program.command("upload").description("上传项目").action(uploadAction);
+program
+  .command("upload")
+  .description("上传项目")
+  .option("-e, --env <env>", "当前环境")
+  .action(uploadAction);
 program.parse(process.argv);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "qdmp-cli",
-  "version": "0.0.2",
+  "version": "0.0.4",
   "description": "qdmp-cli",
   "main": "index.js",
   "type": "module",
@@ -11,7 +11,10 @@
     "qdmp": "./index.js",
     "qdmp-cli": "./index.js"
   },
-  "keywords": [],
+  "keywords": [
+    "千岛小程序",
+    "千岛小程序脚手架"
+  ],
   "author": "zhangyanran",
   "license": "ISC",
   "dependencies": {

package/utils/common.js

@@ -17,12 +17,12 @@ export const getUploadPath = (appId, code) => {
  *
  * @returns appId
  */
-export function getAppId() {
+export function getAppId(env = "prod") {
   try {
     const qdmpJsonPath = `${process.cwd()}/qdmp.json`;
     const data = fs.readFileSync(path.resolve(qdmpJsonPath), "utf8");
     const qdmpJson = JSON.parse(data);
-    return qdmpJson?.appId || "";
+    return env === "prod" ? qdmpJson?.appId || "" : qdmpJson?.devAppId || "";
   } catch (e) {
     error("未授权应用，请在根目录下qdmp.json配置对应的appId");
   }
@@ -47,7 +47,7 @@ export const isUrlAccessible = async (url) => {
  */
 export async function renameDistFolder(dirname, newname) {
   try {
-    execSync(`rm -rf ./h5`, { stdio: "inherit" });
+    if (fs.existsSync(newname)) return true;
     execSync(`mv ${dirname} ${newname}`, { stdio: "inherit" });
     return true;
   } catch (e) {
@@ -89,7 +89,14 @@ async function compressProject(output, dirname = "") {
  */
 async function copyDistFolder(dirname) {
   try {
-    execSync(`cp -r ${dirname} ./${WORKSPACE_DIR}`, {
+    const indexPath = execSync(`find ${dirname} -name index.html -print -quit`)
+      .toString()
+      .trim();
+    if (!indexPath) {
+      throw new Error("未找到index.html文件");
+    }
+    const parentDir = path.dirname(indexPath);
+    execSync(`cp -r ${parentDir} ./${WORKSPACE_DIR}`, {
       stdio: "inherit",
     });
     return true;