@gmcb/cli 0.6.1 → 0.6.2

package/CHANGELOG.md

@@ -3,6 +3,17 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [0.6.2](http://10.10.10.16/caoben/front-end/compare/@gmcb/cli@0.5.5...@gmcb/cli@0.6.2) (2026-07-05)
+
+
+### Features
+
+* 优化cli ([676ac43](http://10.10.10.16/caoben/front-end/commits/676ac4381ca645ef232936b86e3b77124337a03c))
+
+
+
+
+
 # [0.6.0](http://10.10.10.16/caoben/front-end/compare/@gmcb/cli@0.5.5...@gmcb/cli@0.6.0) (2026-07-05)
 
 

package/lib/actions/build.js

@@ -69,6 +69,7 @@ async function getCommands(...args) {
     const buildEnv = ['master', 'main'].includes(opts.branch) ? 'prod' : opts.branch || opts.env;
     if (buildEnv) {
         commands.push(`BUILD_ENV=${buildEnv}`);
+        process.env.BUILD_ENV = buildEnv;
     }
     const currentName = (0, path_1.basename)(utils_1.COMMAND_PATH);
     const projectName = opts.project || currentName;
@@ -313,22 +314,28 @@ async function fetchRemoteResources(opts) {
             spinner.fail(`${appName} wgt链接未上传`);
             process.exit(1);
         }
-        const assetsDir = (0, path_1.join)(utils_1.COMMAND_PATH, 'app', 'src', 'main', 'assets', 'apps', appId, 'www');
-        (0, fs_extra_1.removeSync)(assetsDir);
-        (0, fs_extra_1.ensureDirSync)(assetsDir);
+        const appDir = (0, path_1.join)(utils_1.COMMAND_PATH, 'app', 'src', 'main', 'assets', 'apps');
+        const tempDir = (0, path_1.join)(appDir, appId);
+        (0, fs_extra_1.removeSync)(tempDir);
+        (0, fs_extra_1.ensureDirSync)(tempDir);
         const tmpWgt = (0, path_1.join)(utils_1.COMMAND_PATH, '__tmp_remote.wgt');
         await downloadFile(wgtUrl, tmpWgt);
         const wgtZip = new adm_zip_1.default(tmpWgt);
-        wgtZip.extractAllTo(assetsDir, true);
+        wgtZip.extractAllTo(tempDir, true);
         (0, fs_extra_1.removeSync)(tmpWgt);
         // 从目标目录读取 manifest
-        const manifest = (0, fs_extra_1.readJsonSync)((0, path_1.join)(assetsDir, 'manifest.json'));
-        const { versionName, versionCode } = manifest;
+        const manifest = (0, fs_extra_1.readJsonSync)((0, path_1.join)(tempDir, 'manifest.json'));
+        const { version, id } = manifest;
+        const assetsDir = (0, path_1.join)(appDir, id, 'www');
+        // 将解压内容复制到 assetsDir，然后删除临时目录
+        (0, fs_extra_1.ensureDirSync)(assetsDir);
+        (0, fs_extra_1.copySync)(tempDir, assetsDir, { overwrite: true });
+        (0, fs_extra_1.removeSync)(tempDir);
         // 替换 build.gradle
         const gradlePath = (0, path_1.join)(utils_1.COMMAND_PATH, 'app', 'build.gradle');
         let gradleContent = (0, fs_1.readFileSync)(gradlePath, 'utf-8');
-        gradleContent = gradleContent.replace(/versionCode\s+\d+/, `versionCode ${versionCode}`);
-        gradleContent = gradleContent.replace(/versionName\s+"[^"]*"/, `versionName "${versionName}"`);
+        gradleContent = gradleContent.replace(/versionCode\s+\d+/, `versionCode ${version.code}`);
+        gradleContent = gradleContent.replace(/versionName\s+"[^"]*"/, `versionName "${version.name}"`);
         (0, fs_1.writeFileSync)(gradlePath, gradleContent);
         // 替换 strings.xml
         const stringsPath = (0, path_1.join)(utils_1.COMMAND_PATH, 'app', 'src', 'main', 'res', 'values', 'strings.xml');
@@ -348,14 +355,10 @@ async function fetchRemoteResources(opts) {
 }
 async function default_1(...args) {
     const opts = args[0];
-    if (opts.remote) {
-        const buildEnv = ['master', 'main'].includes(opts.branch) ? 'prod' : opts.branch || opts.env;
-        if (buildEnv)
-            process.env.BUILD_ENV = String(buildEnv);
+    const commands = await getCommands(...args);
+    if (opts.remote && ['electron-vite', 'gradlew'].includes(opts.compiler)) {
         await fetchRemoteResources(opts);
-        return [];
     }
-    const commands = await getCommands(...args);
     const command = commands.join(' ');
     const time = Date.now();
     (0, utils_1.spawnSync)(command);

package/lib/apis/index.js

@@ -80,155 +80,173 @@ function getVersionHistory(params) {
  * 上传新版本
  */
 async function uploadVersion(params) {
-    const { brand, username, password, type, status, platform, path, remoteUrl, versionName, versionCode, } = params;
-    let brandId = '';
-    const { data: { accessToken }, } = await login({ username, password });
-    (0, http_1.setToken)(accessToken);
-    const { data: brandList } = await getBrandList();
-    const brandItem = brandList?.find(({ name, id }) => name === brand && Number(id) > 10000);
-    brandId = brandItem?.id;
-    const packageName = path?.split('/').filter(Boolean).pop();
-    const { data: latest } = await getLastVersion({ type, platform, packageName, version: 0 });
-    await saveVersion({
-        type,
-        status: status || 4,
-        platform,
-        brandId,
-        fileUrl: latest?.fileUrl || 'none',
-        hotUpdateUrl: remoteUrl,
-        name: versionName,
-        version: versionCode,
-        packageName,
-        comment: '修复一些已知问题',
-    });
+    try {
+        const { brand, username, password, type, status, platform, path, remoteUrl, versionName, versionCode, } = params;
+        let brandId = '';
+        const { data: { accessToken }, } = await login({ username, password });
+        (0, http_1.setToken)(accessToken);
+        const { data: brandList } = await getBrandList();
+        const brandItem = brandList?.find(({ name, id }) => name === brand && Number(id) > 10000);
+        brandId = brandItem?.id;
+        const packageName = path?.split('/').filter(Boolean).pop();
+        const { data: latest } = await getLastVersion({ type, platform, packageName, version: 0 });
+        await saveVersion({
+            type,
+            status: status || 4,
+            platform,
+            brandId,
+            fileUrl: latest?.fileUrl || 'none',
+            hotUpdateUrl: remoteUrl,
+            name: versionName,
+            version: versionCode,
+            packageName,
+            comment: '修复一些已知问题',
+        });
+    }
+    catch (err) {
+        console.error(err);
+        process.exit(1);
+    }
 }
 /**
  * 发布版本
  */
 async function publishVersion(params) {
-    const { brandName, brandId, appId, username, password, remoteUrl, versionName, versionCode, channel, versionDesc, platform, ...rest } = params;
-    const publishType = Number(rest.publishType) || 3;
-    const updateType = Number(rest.updateType) || 2;
-    const { data: { accessToken }, } = await login({ username, password });
-    (0, http_1.setToken)(accessToken);
-    const { data: pageData } = await getVersionPage({ appId, publishType, pageNo: 1, pageSize: 10 });
-    const pageList = pageData?.list?.filter((item) => {
-        if (publishType == 1) {
-            return item.platformType === const_1.PLATFORM_TYPE[platform];
+    try {
+        const { brandName, brandId, appId, username, password, remoteUrl, versionName, versionCode, channel, versionDesc, platform, ...rest } = params;
+        const publishType = Number(rest.publishType) || 3;
+        const updateType = Number(rest.updateType) || 2;
+        const { data: { accessToken }, } = await login({ username, password });
+        (0, http_1.setToken)(accessToken);
+        const { data: pageData } = await getVersionPage({ appId, publishType, pageNo: 1, pageSize: 10 });
+        const pageList = pageData?.list?.filter((item) => {
+            if (publishType == 1) {
+                return item.platformType === const_1.PLATFORM_TYPE[platform];
+            }
+            return true;
+        }) || [];
+        const existingVersion = pageList.find((item) => String(item.versionNum) === String(versionCode));
+        let latest;
+        const firstPage = pageList[0];
+        if (firstPage) {
+            let historyParams;
+            if (firstPage.publishType == 1) {
+                historyParams = {
+                    publishType: firstPage.publishType,
+                    appName: firstPage.appName,
+                    channelType: firstPage.channelType,
+                    platformType: firstPage.platformType,
+                };
+            }
+            else {
+                historyParams = {
+                    publishType,
+                    appMofangId: firstPage.appMofangId,
+                };
+            }
+            const { data: historyData } = await getVersionHistory({ ...historyParams, pageNo: 1, pageSize: 1 });
+            latest = (Array.isArray(historyData) ? historyData : historyData?.list)?.[0];
         }
-        return true;
-    }) || [];
-    const existingVersion = pageList.find((item) => String(item.versionNum) === String(versionCode));
-    let latest;
-    const firstPage = pageList[0];
-    if (firstPage) {
-        let historyParams;
-        if (firstPage.publishType == 1) {
-            historyParams = {
-                publishType: firstPage.publishType,
-                appName: firstPage.appName,
-                channelType: firstPage.channelType,
-                platformType: firstPage.platformType,
-            };
+        if (!existingVersion && latest && Number(versionCode) <= Number(latest.versionNum)) {
+            throw new Error(`版本号不能小于上次发布 ${latest.versionNum}`);
         }
-        else {
-            historyParams = {
-                publishType,
-                appMofangId: firstPage.appMofangId,
-            };
-        }
-        const { data: historyData } = await getVersionHistory({ ...historyParams, pageNo: 1, pageSize: 1 });
-        latest = (Array.isArray(historyData) ? historyData : historyData?.list)?.[0];
-    }
-    if (!existingVersion && latest && Number(versionCode) <= Number(latest.versionNum)) {
-        throw new Error(`版本号不能小于上次发布 ${latest.versionNum}`);
-    }
-    let versionId;
-    if (existingVersion) {
-        versionId = existingVersion.id;
-    }
-    else {
-        let createData;
-        if (publishType == 1) {
-            const { data: brandList } = await getBrandList();
-            const brandItem = brandList?.find(({ name, id }) => {
-                if (Number(id) > 10000) {
-                    if (brandId && id === brandId) {
-                        return true;
-                    }
-                    if (brandName && name === brandName) {
-                        return true;
-                    }
-                }
-                return false;
-            });
-            createData = {
-                brandId: brandItem?.id,
-                appName: brandItem?.name,
-                channelType: const_1.CHANNEL_TYPE[channel],
-                platformType: const_1.PLATFORM_TYPE[platform],
-                updateType,
-                versionName,
-                versionNum: versionCode,
-                versionDesc: versionDesc || '修复一些已知问题',
-                fullPackageUrl: '',
-                fullPackageFileName: '',
-                resourcePackageUrl: '',
-                resourcePackageFileName: '',
-                publishType,
-            };
+        let versionId;
+        if (existingVersion) {
+            versionId = existingVersion.id;
         }
         else {
-            const { data: appList } = await getAppList();
-            const appItem = appList?.find((item) => item.appId === appId);
-            createData = {
-                appMofangId: appItem?.id,
-                appId,
-                appName: appItem?.name,
-                updateType,
-                versionName,
-                versionNum: versionCode,
-                versionDesc: versionDesc || '修复一些已知问题',
-                resourcePackageUrl: '',
-                resourcePackageFileName: '',
-                publishType,
-            };
+            let createData;
+            if (publishType == 1) {
+                const { data: brandList } = await getBrandList();
+                const brandItem = brandList?.find(({ name, id }) => {
+                    if (Number(id) > 10000) {
+                        if (brandId && id === brandId) {
+                            return true;
+                        }
+                        if (brandName && name === brandName) {
+                            return true;
+                        }
+                    }
+                    return false;
+                });
+                createData = {
+                    brandId: brandItem?.id,
+                    appName: brandItem?.name,
+                    channelType: const_1.CHANNEL_TYPE[channel],
+                    platformType: const_1.PLATFORM_TYPE[platform],
+                    updateType,
+                    versionName,
+                    versionNum: versionCode,
+                    versionDesc: versionDesc || '修复一些已知问题',
+                    fullPackageUrl: '',
+                    fullPackageFileName: '',
+                    resourcePackageUrl: '',
+                    resourcePackageFileName: '',
+                    publishType,
+                };
+            }
+            else {
+                const { data: appList } = await getAppList();
+                const appItem = appList?.find((item) => item.appId === appId);
+                createData = {
+                    appMofangId: appItem?.id,
+                    appId,
+                    appName: appItem?.name,
+                    updateType,
+                    versionName,
+                    versionNum: versionCode,
+                    versionDesc: versionDesc || '修复一些已知问题',
+                    resourcePackageUrl: '',
+                    resourcePackageFileName: '',
+                    publishType,
+                };
+            }
+            const { data: newId } = await createVersion(createData);
+            versionId = newId;
         }
-        const { data: newId } = await createVersion(createData);
-        versionId = newId;
+        const urls = Array.isArray(remoteUrl) ? remoteUrl : [remoteUrl || ''];
+        const fullUrl = urls.find((u) => !/\.zip$/i.test(u)) || '';
+        const resUrl = urls.find((u) => /\.zip$/i.test(u)) || '';
+        const fallbackFullUrl = existingVersion?.fullPackageUrl || latest?.fullPackageUrl || '';
+        const fallbackResUrl = existingVersion?.resourcePackageUrl || latest?.resourcePackageUrl || '';
+        await postVersion({
+            id: versionId,
+            fullPackageUrl: fullUrl || fallbackFullUrl,
+            resourcePackageUrl: resUrl || fallbackResUrl,
+        });
+    }
+    catch (err) {
+        console.error(err);
+        process.exit(1);
     }
-    const urls = Array.isArray(remoteUrl) ? remoteUrl : [remoteUrl || ''];
-    const fullUrl = urls.find((u) => !/\.zip$/i.test(u)) || '';
-    const resUrl = urls.find((u) => /\.zip$/i.test(u)) || '';
-    const fallbackFullUrl = existingVersion?.fullPackageUrl || latest?.fullPackageUrl || '';
-    const fallbackResUrl = existingVersion?.resourcePackageUrl || latest?.resourcePackageUrl || '';
-    await postVersion({
-        id: versionId,
-        fullPackageUrl: fullUrl || fallbackFullUrl,
-        resourcePackageUrl: resUrl || fallbackResUrl,
-    });
 }
 /**
  * 获取远程版本信息（自动登录）
  */
 async function fetchRemoteVersionInfo(appId) {
-    const web = config_1.CONFIG_DATA.web;
-    const creds = (web?.[process.env.BUILD_ENV || ''] || web || {});
-    const { data: { accessToken }, } = await login({ username: creds.username, password: creds.password });
-    (0, http_1.setToken)(accessToken);
-    const { data: pageData } = await getVersionPage({ appId, publishType: 2, pageNo: 1, pageSize: 10 });
-    const version = pageData?.list?.[0];
-    if (!version)
-        throw new Error(`未查询到 ${appId} 应用数据`);
-    const { data: appDetail } = await getAppDetail(version.appMofangId);
-    let configJson = {};
     try {
-        configJson = JSON.parse(appDetail?.configJson || '{}');
+        const web = config_1.CONFIG_DATA.web;
+        const creds = (web?.[process.env.BUILD_ENV || ''] || web || {});
+        const { data: { accessToken }, } = await login({ username: creds.username, password: creds.password });
+        (0, http_1.setToken)(accessToken);
+        const { data: pageData } = await getVersionPage({ appId, publishType: 2, pageNo: 1, pageSize: 10 });
+        const version = pageData?.list?.[0];
+        if (!version)
+            throw new Error(`未查询到 ${appId} 应用数据`);
+        const { data: appDetail } = await getAppDetail(version.appMofangId);
+        let configJson = {};
+        try {
+            configJson = JSON.parse(appDetail?.configJson || '{}');
+        }
+        catch { }
+        return {
+            ...version,
+            iconUrl: appDetail?.iconUrl,
+            configJson,
+        };
+    }
+    catch (err) {
+        console.error(err);
+        process.exit(1);
     }
-    catch { }
-    return {
-        ...version,
-        iconUrl: appDetail?.iconUrl,
-        configJson,
-    };
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gmcb/cli",
-  "version": "0.6.1",
+  "version": "0.6.2",
   "description": "工茂草本前端命令行工具",
   "author": "yinjiazeng@163.com",
   "license": "MIT",
@@ -58,6 +58,5 @@
     "@types/inquirer": "^9.0.7",
     "@types/rimraf": "^4.0.5",
     "@types/user-home": "^2.0.2"
-  },
-  "gitHead": "7c47fc74419f1ef0f1b3f70148c6dfabb4251f14"
+  }
 }

package/LICENSE

@@ -1,21 +0,0 @@
-MIT License
-
-Copyright (c) 2024 aniu
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.