@ttmg/cli 0.4.1 → 0.4.3

package/dist/index.js

@@ -6615,8 +6615,9 @@ function verboseWarn(...args) {
 /**
  * PPE / 测试环境开关。
  *
- * 所有 CLI 接口（`stark_wasm/v4/*`, `wasm-collect/v1/*`, portal 鉴权等）
- * 都共用本文件的 `request()`，所以在这里统一注入 PPE header 就能覆盖全量。
+ * 除登录和本地客户端请求外，CLI 后端接口（`stark_wasm/v4/*`,
+ * `wasm-collect/v1/*`, portal 业务接口等）都共用本文件的 `request()`，
+ * 所以在这里统一注入 PPE header 就能覆盖主要平台请求。
  * 不在 `DEV_HEADERS` 里改是因为那份常量只被 `remotePipeline.ts` 里的老
  * 远程分包接口 spread 用；新加的 `startSession.ts` / `finishSession.ts` /
  * `getCollectedFuncIds.ts` 都没 spread，漏一处就会绕开 PPE。
@@ -6624,8 +6625,8 @@ function verboseWarn(...args) {
  * 要切回线上环境，直接把 `CLI_PPE_ENV` 设成空串即可（下方条件 spread 会
  * 自动不带这两个 header）。
  */
-// const CLI_PPE_ENV: string = 'ppe_wasm_test'; // 走 PPE 测试环境
-const CLI_PPE_ENV = ''; // 走线上服务（空串 => 下方条件 spread 不注入 PPE header）
+const CLI_PPE_ENV = 'ppe_role_perm'; // 走权限体系 PPE 环境
+const NETWORK_PROXY_ERROR_CODE = -1001;
 function getAxiosProxyConfig() {
     const config = getTTMGRC();
     // 优先级: http-proxy > socks-proxy > proxy (老字段兼容)
@@ -6818,21 +6819,31 @@ async function request({ url, method, data, headers, params, logRequestBody = tr
         };
     }
     catch (err) {
+        const axiosError = err;
+        const responseData = axiosError.response?.data;
+        const networkError = responseData
+            ? responseData
+            : {
+                StatusCode: NETWORK_PROXY_ERROR_CODE,
+                StatusMessage: 'Platform API request failed. Check whether the terminal proxy or VPN is applied to ttmg.',
+                NetworkCode: axiosError.code,
+                NetworkMessage: axiosError.message,
+            };
         if (isVerboseEnabled()) {
             printApiResponseLog('API Error', {
-                status: err?.response?.status,
-                logid: err?.response?.headers['x-tt-logid'],
-                data: err?.response?.data,
+                status: axiosError.response?.status,
+                logid: axiosError.response?.headers['x-tt-logid'],
+                data: networkError,
             });
         }
         // @ts-ignore
         return {
             data: null,
             ctx: {
-                logid: err.response?.headers['x-tt-logid'],
-                httpStatusCode: err.response?.status,
+                logid: axiosError.response?.headers['x-tt-logid'],
+                httpStatusCode: axiosError.response?.status ?? 0,
             },
-            error: err.response?.data,
+            error: networkError,
         };
     }
 }
@@ -6995,6 +7006,7 @@ async function fetchGameAssets({ miniGameId, }) {
     });
 }
 
+const GAME_INFO_NETWORK_ERROR_CODE = -1001;
 async function fetchGameInfo(clientKey) {
     // 访问 V4 接口
     const response = await request({
@@ -7005,10 +7017,14 @@ async function fetchGameInfo(clientKey) {
         },
     });
     if (!response?.data) {
+        const error = response?.error;
+        const hasHttpResponse = Boolean(response?.ctx?.httpStatusCode);
+        const fallbackErrorCode = hasHttpResponse ? -1 : GAME_INFO_NETWORK_ERROR_CODE;
         return {
             error: {
-                errorCode: response?.error?.StatusCode,
-                errorMsg: response?.error?.StatusMessage,
+                errorCode: error?.StatusCode ?? fallbackErrorCode,
+                errorMsg: error?.StatusMessage ||
+                    'Platform API request failed. Check terminal proxy or VPN configuration.',
                 clientKey: clientKey,
             },
             data: null,
@@ -7189,6 +7205,7 @@ const messages = {
         'cli.command.reset.desc': 'Reset local CLI state',
         'cli.command.init.desc': 'Initialize project',
         'cli.command.dev.desc': 'Open browser dev environment',
+        'cli.command.dev.clientKey': 'Client Key of the Mini Game',
         'cli.command.build.desc': 'Bundle project',
         'cli.command.config.desc': 'Manage configuration',
         'cli.command.config.set.desc': 'Set a configuration value',
@@ -7320,6 +7337,7 @@ const messages = {
         'cli.command.reset.desc': '重置本地 CLI 状态',
         'cli.command.init.desc': '初始化项目',
         'cli.command.dev.desc': '打开浏览器调试环境',
+        'cli.command.dev.clientKey': '小游戏的 Client Key',
         'cli.command.build.desc': '打包项目',
         'cli.command.config.desc': '管理配置',
         'cli.command.config.set.desc': '设置配置项',
@@ -8873,7 +8891,14 @@ function getLocalIP() {
     return '127.0.0.1';
 }
 
-async function init() {
+async function init(options = {}) {
+    const providedClientKey = options.clientKey?.trim();
+    if (providedClientKey) {
+        setTTMGRC({
+            clientKey: providedClientKey,
+        });
+        return;
+    }
     const promptModule = inquirer.createPromptModule();
     const { clientKey: lastUsedClientKey } = getTTMGRC() || {};
     if (lastUsedClientKey) {
@@ -9440,6 +9465,52 @@ const gameCheckRoute = {
 };
 
 const changelog = [
+    {
+        title: '0.4.3',
+        target: {
+            iOS: '>=43.1',
+            Android: '>=43.1',
+        },
+        changes: {
+            feature: [
+                {
+                    desc: {
+                        'zh-CN': '新增子包收集能力：通过真机预览记录启动阶段实际预下载的子包，并生成预加载配置，帮助减少后续资源加载等待。当前仅支持非 Unity 小游戏。',
+                        'en-US': 'Add Subpackage Collection: use real-device preview to record subpackages downloaded during startup and generate preload configuration, helping reduce subsequent resource loading waits. Currently available for non-Unity mini games only.',
+                    },
+                    module: 'new',
+                    link: 'https://bytedance.my.larkoffice.com/docx/MIyMdmzb0oOQAKxNHGNmR5hDyAh',
+                },
+            ],
+        },
+    },
+    {
+        title: '0.4.2',
+        target: {
+            iOS: '>=43.1',
+            Android: '>=43.1',
+        },
+        changes: {
+            optimize: [
+                {
+                    desc: {
+                        'zh-CN': "优化异常状态提示文案，更准确地引导开发者解决问题",
+                        'en-US': "Optimize exception status prompt text, guide developers to solve problems more accurately",
+                    },
+                    module: 'new',
+                },
+            ],
+            feature: [
+                {
+                    desc: {
+                        'zh-CN': '新增版本信息模块，展示游戏版本信息，包括版本号、发布时间、发布者等',
+                        'en-US': 'Add version information module to display game version information, including version number, release time, release author, etc.',
+                    },
+                    module: 'detail',
+                },
+            ],
+        },
+    },
     {
         title: '0.4.1',
         target: {
@@ -13249,6 +13320,35 @@ function collectPreloadSubpackages(entry, reported) {
     }
     return { entry, parallelPreloadSubpackages };
 }
+/**
+ * 重新收集前清除当前入口已写入的预加载配置。
+ *
+ * 与空采集写入不同，这里直接删除 `parallelPreloadSubpackages` 字段，让源码
+ * game.json 回到“未配置”的状态，避免下一轮真机预览仍携带旧启动预加载策略。
+ */
+function clearPreloadSubpackagesConfig(entry) {
+    const game = readRawGameJson();
+    validateCollect(game, entry, []);
+    let started = false;
+    try {
+        const container = isGameEntry(entry)
+            ? game.json
+            : findSubpackage(game, entry);
+        if (!container) {
+            throw new Error(`入口 ${entry} 不存在`);
+        }
+        started = true;
+        delete container[PRELOAD_FIELD_NAME];
+        writeGameJson(game);
+    }
+    catch (err) {
+        if (started) {
+            restoreGameJson(game);
+        }
+        throw err;
+    }
+    return { entry, parallelPreloadSubpackages: [] };
+}
 
 /**
  * 读取某个启动入口已有的 parallelPreloadSubpackages（只读），用于 UI 初始化
@@ -13327,6 +13427,31 @@ const gameCollectPreloadSubpackagesRoute = {
     },
 };
 
+/**
+ * 删除某个启动入口已写入的 parallelPreloadSubpackages，用于重新收集前清理
+ * 旧配置，避免下一轮真机预览仍携带上一轮结果。
+ *
+ * body: `{ entry }`（缺省按主包 `__GAME__` 处理）。
+ */
+const gameClearPreloadSubpackagesConfigRoute = {
+    method: 'post',
+    path: '/game/clear-preload-subpackages-config',
+    handler: async (req, res) => {
+        const entry = req.body?.entry || GAME_ENTRY;
+        console.log('clear-preload-subpackages-config', { entry });
+        try {
+            const data = clearPreloadSubpackagesConfig(entry);
+            res.send({ code: successCode, data });
+        }
+        catch (err) {
+            res.send({
+                code: errorCode,
+                error: { message: err.message },
+            });
+        }
+    },
+};
+
 const routes = [
     gameAssetPreviewUrlRoute,
     gameAssetsRoute,
@@ -13363,6 +13488,7 @@ const routes = [
     gamePreloadSubpackagesConfigRoute,
     gamePreloadSubpackageCandidatesRoute,
     gameCollectPreloadSubpackagesRoute,
+    gameClearPreloadSubpackagesConfigRoute,
 ];
 /**
  * Express 4 does not catch rejections from async route handlers — an
@@ -13444,9 +13570,9 @@ async function start() {
     openUrl(url);
 }
 
-async function dev() {
+async function dev(options = {}) {
     await check();
-    await init();
+    await init({ clientKey: options.clientKey });
     await start();
     await compile();
     listen$1();
@@ -13863,7 +13989,7 @@ async function upload({ clientKey, note = '--', dir, }) {
     }
 }
 
-var version = "0.4.1";
+var version = "0.4.3";
 var pkg = {
 	version: version};
 
@@ -13950,14 +14076,15 @@ withVerboseOption(program
 withVerboseOption(program
     .option('--h5', t('cli.option.h5'))
     .command('dev')
-    .description(t('cli.command.dev.desc')))
-    .action(async () => {
+    .description(t('cli.command.dev.desc'))
+    .option('-ck, --client-key <clientKey>', t('cli.command.dev.clientKey')))
+    .action(async (cmd) => {
     const options = program.opts();
     if (options.h5) {
         await dev$1();
     }
     else {
-        await dev();
+        await dev({ clientKey: cmd.clientKey });
     }
     checkUpdate();
 });