@ttmg/cli 0.3.2-beta.9 → 0.3.3

package/CHANGELOG.md

@@ -198,4 +198,7 @@ API 预检建议文案统一收敛，避免重复提示，阅读更清晰
 顶部区域透出项目预检错误与警告信息，便于开发者及时发现问题并修复
 语言选择策略优化：优先使用 CLI 本地设置，未设置时自动回退浏览器语言
 启动校验增强：检查是否在小游戏根目录执行，对于分包配置 subPackages 给出明确报错，引导开发者修改为 subpackages
-修复项目详情中展示的主包大小限制和代码预检不一致的情况
+修复项目详情中展示的主包大小限制和代码预检不一致的情况
+
+## 0.3.3
+升级 ttmg-pack 到 0.4.5，解决安卓无法调试 unity 项目问题

package/dist/index.js

@@ -6507,7 +6507,14 @@ const getCurrentUser = () => {
 // ppe_dev_tool
 function getAxiosProxyConfig() {
     const config = getTTMGRC();
-    const proxyUrl = config?.proxy;
+    // 优先级: http-proxy > socks-proxy > proxy (老字段兼容)
+    let proxyUrl = config?.['http-proxy'];
+    if (!proxyUrl) {
+        proxyUrl = config?.['socks-proxy'];
+    }
+    if (!proxyUrl) {
+        proxyUrl = config?.proxy;
+    }
     if (proxyUrl) {
         let agent;
         if (proxyUrl.startsWith('socks')) {
@@ -6779,6 +6786,7 @@ const messages = {
         'cli.option.dev.h5': 'Debug TikTok Mini Games for Web',
         'cli.command.login.desc': 'Login with developer account',
         'cli.command.login.verbose': 'Print verbose logs for debugging',
+        'cli.command.logout.desc': 'Logout and clear local user data',
         'cli.command.setup.desc': 'Initialize ttmg environment',
         'cli.command.setup.lang': 'Language (only supports): en-US | zh-CN',
         'cli.command.reset.desc': 'Reset local CLI state',
@@ -6789,6 +6797,10 @@ const messages = {
         'cli.command.config.set.desc': 'Set a configuration value',
         'cli.command.config.get.desc': 'Get a configuration value',
         'cli.command.config.delete.desc': 'Delete a configuration value',
+        'cli.command.upload.desc': 'Upload Mini Game to Developer Platform',
+        'cli.command.upload.clientKey': 'Client Key of the Mini Game',
+        'cli.command.upload.note': 'Note for the upload',
+        'cli.command.upload.dir': 'Game project directory (default: current directory)',
         'cli.option.h5': 'H5 Mini Game',
         'cli.native.init.placeholder': 'Native Mini Game initialize',
         'cli.native.build.placeholder': 'Native Mini Game bundle',
@@ -6830,9 +6842,12 @@ const messages = {
         'login.error.withCode': 'Login failed: {message}, error_code: {code}',
         'login.error.withMessage': 'Login failed: {message}',
         'login.error.noUserId': 'Login failed. No user_id in response.',
-        'login.warning.proxyIssue': 'The response does not look like the login API (e.g. proxy returned "Connection established" instead of forwarding the real response).\n\nThe API is not reachable from mainland without proxy. Please ensure your proxy correctly forwards HTTPS to developers.tiktok.com: try another proxy node, or check that the proxy is in global/tunnel mode and not intercepting HTTPS.\n\nProxy troubleshooting doc:\nhttps://bytedance.larkoffice.com/wiki/ZblJwT0ZNil9jJkS8EgcFlcQnFc',
+        'login.warning.proxyIssue': 'The response does not look like the login API (e.g. proxy returned "Connection established" instead of forwarding the real response).\n\nThe API is not reachable from mainland without proxy. Please ensure your proxy correctly forwards HTTPS to developers.tiktok.com: try another proxy node, or configure the CLI internal proxy using `ttmg config set proxy socks5://...`.\n\nProxy troubleshooting doc:\nhttps://bytedance.larkoffice.com/wiki/PeIawT4M4ia9R8kYyLMcjwHknOg',
         'login.error.connectService': 'Failed to connect to login service',
-        'login.error.networkBlocked': "Detected that the current terminal's network proxy settings are preventing external network access.\n\nPlease check your local terminal proxy configuration. You can follow this doc to modify your terminal network settings:\nhttps://bytedance.larkoffice.com/wiki/ZblJwT0ZNil9jJkS8EgcFlcQnFc",
+        'login.error.networkBlocked': "Network connection failed. This is usually caused by advanced proxy settings (e.g., fake-ip mode) or incorrect terminal proxy environment variables.\n\nWe strongly recommend turning off global proxy mode and configuring the CLI internal proxy using:\n  ttmg config set proxy socks5://127.0.0.1:<your_socks_port>\n\nFor detailed solutions, please refer to the proxy troubleshooting doc:\nhttps://bytedance.larkoffice.com/wiki/PeIawT4M4ia9R8kYyLMcjwHknOg",
+        'logout.spinner.loggingOut': 'Logging out...',
+        'logout.success': 'Logged out successfully!',
+        'logout.fail': 'Logout failed: {error}',
         'h5.dev.configMissing': '{file} is not exist, please run minis game init first',
         'h5.dev.precheckTips': '⚠️ Before dev, please ensure:\n 1. The account used to login www.tiktok.com is in the sandbox target user range of Minis developer platform, otherwise login authorization will throw an error.\n 2. The browser allows www.tiktok.com <popup and redirect>, because the authorization login linkage needs to open a new tab popup for operation, otherwise the authorization login linkage will not be able to debug normally.',
         'h5.dev.startingBanner': '\n \n============== start dev your game, it will take a few seconds ============ \n \n',
@@ -6884,8 +6899,16 @@ const messages = {
         'native.tips.3': ' After scanning the QR code with your phone for Test User authentication,',
         'native.tips.3.sub1': '   the compiled code package will be uploaded to the client automatically.',
         'native.tips.3.sub2': '   Game debugging will start right away.',
-        'native.tips.4': ' Before scanning with TikTok, make sure your phone and computer are on the same Wi-Fi.',
-        'native.tips.4.sub1': '   This is required for stable local connection and debugging.',
+        'native.tips.4': ' How to ensure a smooth connection?',
+        'native.tips.4.sub1': '   https://bytedance.larkoffice.com/wiki/WvifwWjGri7bTzkPbqKcqVi5ntc',
+        'upload.spinner.fetchInfo': 'Fetching game info for client key {clientKey} ...',
+        'upload.spinner.zipping': 'Zipping game assets in directory: {dir} ...',
+        'upload.spinner.uploading': 'Uploading game to platform (size: {size} MB)...',
+        'upload.success': 'Upload success! View version at: {url}',
+        'upload.fail': 'Upload failed: {error}',
+        'upload.error.noClientKey': 'Client Key is required for upload. Use --client-key <key>',
+        'upload.error.notLoggedIn': 'Not logged in. Please run `ttmg login` first.',
+        'upload.error.dirNotExist': 'The specified directory does not exist: {dir}',
     },
     'zh-CN': {
         'cli.description': 'TikTok 小游戏命令行工具',
@@ -6894,6 +6917,7 @@ const messages = {
         'cli.option.dev.h5': 'Web 调试 TikTok 小游戏',
         'cli.command.login.desc': '使用开发者账号登录',
         'cli.command.login.verbose': '输出调试用详细日志',
+        'cli.command.logout.desc': '退出登录并清除本地用户信息',
         'cli.command.setup.desc': '初始化 ttmg 环境',
         'cli.command.setup.lang': '语言（仅支持）：en-US | zh-CN',
         'cli.command.reset.desc': '重置本地 CLI 状态',
@@ -6904,6 +6928,10 @@ const messages = {
         'cli.command.config.set.desc': '设置配置项',
         'cli.command.config.get.desc': '获取配置项',
         'cli.command.config.delete.desc': '删除配置项',
+        'cli.command.upload.desc': '上传小游戏到开发者平台',
+        'cli.command.upload.clientKey': '小游戏的 Client Key',
+        'cli.command.upload.note': '上传备注',
+        'cli.command.upload.dir': '小游戏项目根目录（默认为当前目录）',
         'cli.option.h5': 'H5 小游戏',
         'cli.native.init.placeholder': 'Native 小游戏初始化',
         'cli.native.build.placeholder': 'Native 小游戏打包',
@@ -6945,9 +6973,12 @@ const messages = {
         'login.error.withCode': '登录失败：{message}，错误码：{code}',
         'login.error.withMessage': '登录失败：{message}',
         'login.error.noUserId': '登录失败，响应中未返回 user_id。',
-        'login.warning.proxyIssue': '当前响应看起来不是登录接口返回（例如代理返回了 "Connection established"，而不是转发真实响应）。\n\n该接口在大陆网络通常需要代理。请确认代理可正确转发 developers.tiktok.com 的 HTTPS 请求：尝试切换节点，或检查代理是否为全局/隧道模式且未拦截 HTTPS。\n\n代理排查文档：\nhttps://bytedance.larkoffice.com/wiki/ZblJwT0ZNil9jJkS8EgcFlcQnFc',
+        'login.warning.proxyIssue': '当前响应看起来不是登录接口返回（例如代理返回了 "Connection established"，而不是转发真实响应）。\n\n该接口在大陆网络通常需要代理。请确认代理可正确转发 developers.tiktok.com 的 HTTPS 请求：尝试切换节点，或者使用 `ttmg config set proxy socks5://...` 配置 CLI 内置代理。\n\n代理排查文档：\nhttps://bytedance.larkoffice.com/wiki/PeIawT4M4ia9R8kYyLMcjwHknOg',
         'login.error.connectService': '连接登录服务失败',
-        'login.error.networkBlocked': '检测到当前终端代理设置导致无法访问外网。\n\n请检查本地终端代理配置，可参考以下文档修改：\nhttps://bytedance.larkoffice.com/wiki/ZblJwT0ZNil9jJkS8EgcFlcQnFc',
+        'login.error.networkBlocked': '网络连接失败。这通常是由于代理软件的高级设置（如 fake-ip 模式）或终端残留了错误的代理环境变量导致的。\n\n我们强烈建议你关闭全局代理，并为 CLI 配置内置 SOCKS5 代理：\n  ttmg config set proxy socks5://127.0.0.1:<你的socks端口>\n\n详细排查方案请参考最新代理设置文档：\nhttps://bytedance.larkoffice.com/wiki/PeIawT4M4ia9R8kYyLMcjwHknOg',
+        'logout.spinner.loggingOut': '正在退出登录...',
+        'logout.success': '退出登录成功！',
+        'logout.fail': '退出登录失败：{error}',
         'h5.dev.configMissing': '{file} 不存在，请先执行 minis game init',
         'h5.dev.precheckTips': '⚠️ 开始调试前请确认：\n 1. 当前登录 www.tiktok.com 的账号在小程序开发者平台沙盒目标用户范围内，否则登录授权会报错。\n 2. 浏览器允许 www.tiktok.com 弹窗与重定向，授权登录链路需要新开标签页进行操作，否则无法正常调试。',
         'h5.dev.startingBanner': '\n \n============== 已开始调试你的游戏，通常需要几秒钟 ============ \n \n',
@@ -6999,8 +7030,16 @@ const messages = {
         'native.tips.3': ' 手机扫码通过 Test User 认证后，',
         'native.tips.3.sub1': '   编译后的代码包会自动上传到客户端。',
         'native.tips.3.sub2': '   随即开始游戏调试。',
-        'native.tips.4': ' 在使用 TikTok 扫码前，请确保手机和电脑处于同一个 Wi-Fi。',
-        'native.tips.4.sub1': '   这是本地连接与正常调试的前提条件。',
+        'native.tips.4': ' 如何保证可以顺利连接？',
+        'native.tips.4.sub1': '   https://bytedance.larkoffice.com/wiki/WvifwWjGri7bTzkPbqKcqVi5ntc',
+        'upload.spinner.fetchInfo': '正在获取游戏信息 (client key: {clientKey}) ...',
+        'upload.spinner.zipping': '正在压缩游戏资源目录: {dir} ...',
+        'upload.spinner.uploading': '正在上传游戏到平台 (大小: {size} MB) ...',
+        'upload.success': '上传成功！可在以下地址查看版本：{url}',
+        'upload.fail': '上传失败：{error}',
+        'upload.error.noClientKey': '上传必须提供 Client Key，请使用 --client-key <key> 参数',
+        'upload.error.notLoggedIn': '未登录，请先执行 `ttmg login` 登录开发者平台账号。',
+        'upload.error.dirNotExist': '指定的项目目录不存在：{dir}',
     },
 };
 
@@ -8458,15 +8497,16 @@ function showTips(context) {
     console.log('');
     console.log(chalk.red.bold('4. ⚠️') +
         t('native.tips.4'));
-    console.log(t('native.tips.4.sub1'));
+    console.log(chalk.cyan.underline(t('native.tips.4.sub1')));
     console.log(chalk.gray('─────────────────────────────────────────────'));
 }
 
 /**
- * 辅助函数：将当前工作目录打包为 Buffer
+ * 辅助函数：将指定目录(默认为当前工作目录)打包为 Buffer
  * @param customIgnores - 可选的自定义忽略规则数组 (支持 glob 模式，如 ['dist/**', '*.log'])
+ * @param targetDir - 可选的目标目录，默认为 process.cwd()
  */
-const zipCwdToBuffer = (customIgnores = []) => {
+const zipCwdToBuffer = (customIgnores = [], targetDir = process.cwd()) => {
     return new Promise((resolve, reject) => {
         const chunks = [];
         const output = new require$$2$1.Writable({
@@ -8483,7 +8523,6 @@ const zipCwdToBuffer = (customIgnores = []) => {
             reject(err);
         });
         archive.pipe(output);
-        const cwd = process.cwd();
         // 1. 基础忽略列表 (建议保留这些基础规则，防止包过大)
         const defaultIgnores = [
             'node_modules/**',
@@ -8498,7 +8537,7 @@ const zipCwdToBuffer = (customIgnores = []) => {
         // 3. 执行打包
         // 注意：ignore 规则必须使用正斜杠 /，即使在 Windows 下
         archive.glob('**/*', {
-            cwd: cwd,
+            cwd: targetDir,
             ignore: finalIgnores,
             dot: true, // 包含 .env 等点文件
         });
@@ -10281,6 +10320,7 @@ async function login(options) {
             headers,
             maxRedirects: 20,
             timeout: 30000,
+            ...getAxiosProxyConfig(),
         });
         log('Response status', response.status);
         log('Response data', response?.data);
@@ -10345,6 +10385,30 @@ async function login(options) {
     }
 }
 
+async function logout() {
+    const ora = await import('ora');
+    const spinner = ora.default({
+        text: chalk.cyan.bold(t('logout.spinner.loggingOut')),
+        spinner: 'dots',
+    }).start();
+    try {
+        const config = getTTMGRC();
+        if (config) {
+            // Remove sensitive user info
+            delete config.email;
+            delete config.user_id;
+            delete config.cookie;
+            resetTTMGRC(config);
+        }
+        spinner.succeed(chalk.green.bold(t('logout.success')));
+        process.exit(0);
+    }
+    catch (err) {
+        spinner.fail(chalk.red.bold(t('logout.fail', { error: err.message || String(err) })));
+        process.exit(1);
+    }
+}
+
 const supportedLangs$1 = ['en-US', 'zh-CN'];
 function isSupportedLang$1(lang) {
     return supportedLangs$1.includes(lang);
@@ -10448,9 +10512,9 @@ const config = {
                 spinner.fail(chalk.red(`Value is required for config key: ${key}`));
                 process.exit(1);
             }
-            if (key === 'proxy') {
-                setTTMGRC({ proxy: value });
-                spinner.succeed(chalk.green(`Set proxy to ${value}`));
+            if (key === 'proxy' || key === 'http-proxy' || key === 'socks-proxy') {
+                setTTMGRC({ [key]: value });
+                spinner.succeed(chalk.green(`Set ${key} to ${value}`));
             }
             else if (key === 'lang') {
                 if (!isSupportedLang(value)) {
@@ -10476,8 +10540,8 @@ const config = {
         const spinner = ora(`Getting ${key}...`).start();
         try {
             const rc = getTTMGRC();
-            if (key === 'proxy') {
-                spinner.succeed(chalk.green(`proxy=${rc?.proxy || ''}`));
+            if (key === 'proxy' || key === 'http-proxy' || key === 'socks-proxy') {
+                spinner.succeed(chalk.green(`${key}=${rc?.[key] || ''}`));
             }
             else if (key === 'lang') {
                 spinner.succeed(chalk.green(`lang=${rc?.lang || ''}`));
@@ -10496,9 +10560,9 @@ const config = {
         const ora = (oraModule.default || oraModule);
         const spinner = ora(`Deleting ${key}...`).start();
         try {
-            if (key === 'proxy') {
-                setTTMGRC({ proxy: undefined });
-                spinner.succeed(chalk.green(`Deleted proxy config`));
+            if (key === 'proxy' || key === 'http-proxy' || key === 'socks-proxy') {
+                setTTMGRC({ [key]: undefined });
+                spinner.succeed(chalk.green(`Deleted ${key} config`));
             }
             else if (key === 'lang') {
                 setTTMGRC({ lang: undefined });
@@ -10515,7 +10579,71 @@ const config = {
     }
 };
 
-var version = "0.3.2-beta.9";
+async function upload({ clientKey, note = '--', dir, }) {
+    const ora = await import('ora');
+    const spinner = ora.default({
+        text: chalk.cyan.bold(t('upload.spinner.fetchInfo', { clientKey: clientKey || 'unknown' })),
+        spinner: 'dots',
+    }).start();
+    try {
+        console.log(chalk.gray(`[upload] Start uploading process...`));
+        console.log(chalk.gray(`[upload] Parameters: clientKey=${clientKey}, note=${note}, dir=${dir || process.cwd()}`));
+        const user = getCurrentUser();
+        if (!user || !user.cookie) {
+            throw new Error(t('upload.error.notLoggedIn'));
+        }
+        if (!clientKey) {
+            throw new Error(t('upload.error.noClientKey'));
+        }
+        // 1. 获取游戏信息，主要是为了拿 appId
+        console.log(chalk.gray(`[upload] Step 1: Fetching game info for clientKey ${clientKey}`));
+        const infoRes = await fetchGameInfo(clientKey);
+        console.log(chalk.gray(`[upload] Game info response: ${JSON.stringify(infoRes)}`));
+        if (infoRes.error) {
+            throw new Error(infoRes.error.errorMsg || 'Failed to fetch game info');
+        }
+        const appId = infoRes.data?.app_id;
+        const name = infoRes.data?.name || 'game';
+        if (!appId) {
+            throw new Error('No appId found for this client key');
+        }
+        // 2. 打包指定或当前目录
+        const targetDir = dir ? path.resolve(process.cwd(), dir) : process.cwd();
+        // 检查目录是否存在
+        if (!fs.existsSync(targetDir)) {
+            throw new Error(t('upload.error.dirNotExist', { dir: targetDir }));
+        }
+        console.log(chalk.gray(`[upload] Step 2: Zipping directory ${targetDir}`));
+        spinner.text = chalk.cyan.bold(t('upload.spinner.zipping', { dir: targetDir }));
+        const zipBuffer = await zipCwdToBuffer([], targetDir);
+        // 计算文件大小 (MB)
+        const fileSizeMB = (zipBuffer.length / (1024 * 1024)).toFixed(2);
+        console.log(chalk.gray(`[upload] Zipping completed. File size: ${fileSizeMB} MB`));
+        // 3. 上传到平台
+        console.log(chalk.gray(`[upload] Step 3: Uploading to platform...`));
+        spinner.text = chalk.cyan.bold(t('upload.spinner.uploading', { size: fileSizeMB }));
+        const uploadRes = await uploadGameToPlatform({
+            data: zipBuffer.buffer.slice(zipBuffer.byteOffset, zipBuffer.byteOffset + zipBuffer.byteLength),
+            name,
+            clientKey,
+            note,
+            appId,
+        });
+        console.log(chalk.gray(`[upload] Upload response: ${JSON.stringify({ ...uploadRes, data: uploadRes.data ? { ...uploadRes.data, detail: uploadRes.data.detail } : null })}`));
+        if (uploadRes.error) {
+            throw new Error(uploadRes.error.message || 'Upload failed');
+        }
+        console.log(chalk.gray(`[upload] Upload finished successfully.`));
+        spinner.succeed(chalk.green.bold(t('upload.success', { url: uploadRes.data?.detail || '' })));
+        process.exit(0);
+    }
+    catch (error) {
+        spinner.fail(chalk.red.bold(t('upload.fail', { error: error.message || String(error) })));
+        process.exit(1);
+    }
+}
+
+var version = "0.3.3";
 var pkg = {
 	version: version};
 
@@ -10534,6 +10662,21 @@ program
     .action(async (cmd) => {
     await login({ verbose: cmd.verbose });
 });
+program
+    .command('logout')
+    .description(t('cli.command.logout.desc'))
+    .action(async () => {
+    await logout();
+});
+program
+    .command('upload')
+    .description(t('cli.command.upload.desc'))
+    .option('-ck, --client-key <clientKey>', t('cli.command.upload.clientKey'))
+    .option('-n, --note <note>', t('cli.command.upload.note'))
+    .option('-d, --dir <dir>', t('cli.command.upload.dir'))
+    .action(async (cmd) => {
+    await upload({ clientKey: cmd.clientKey, note: cmd.note, dir: cmd.dir });
+});
 program
     .command('setup')
     .description(t('cli.command.setup.desc'))