@ttmg/cli 0.3.2-beta.3 → 0.3.2-beta.5

package/dist/index.js

@@ -1,16 +1,16 @@
 #!/usr/bin/env node
 'use strict';
 
-var os = require('os');
-var path = require('path');
-var fs = require('fs');
 var commander = require('commander');
 var inquirer = require('inquirer');
+var fs = require('fs');
 var jsdom = require('jsdom');
 var prettier = require('prettier');
 var chalk = require('chalk');
 var express = require('express');
+var path = require('path');
 var cheerio = require('cheerio');
+var os = require('os');
 var worker_threads = require('worker_threads');
 var axios = require('axios');
 var qs = require('qs');
@@ -50,9 +50,9 @@ function _interopNamespaceDefault(e) {
   return Object.freeze(n);
 }
 
-var os__namespace = /*#__PURE__*/_interopNamespaceDefault(os);
-var path__namespace = /*#__PURE__*/_interopNamespaceDefault(path);
 var fs__namespace = /*#__PURE__*/_interopNamespaceDefault(fs);
+var path__namespace = /*#__PURE__*/_interopNamespaceDefault(path);
+var os__namespace = /*#__PURE__*/_interopNamespaceDefault(os);
 var glob__namespace = /*#__PURE__*/_interopNamespaceDefault(glob);
 
 const CONFIG_FILE_NAME = 'minigame.config.json';
@@ -274,6 +274,11 @@ const setTTMGRC = (config) => {
     fs.writeFileSync(CONFIG_PATH, JSON.stringify({ ...originConfig, ...config }));
 };
 
+function printMessage(type, message) {
+    const prefix = type === 'Error' ? chalk.red('Error: ') : chalk.yellow('Warning: ');
+    const log = type === 'Error' ? console.error : console.warn;
+    log(prefix + message);
+}
 let spinner$1;
 const LOGIN_TT4D = 'https://developers.tiktok.com/passport/web/email/login';
 const params = {
@@ -361,14 +366,40 @@ async function login(options) {
         if (!response?.data?.data?.user_id) {
             const errCode = response.data?.data?.error_code;
             const errMsg = response.data?.data?.description;
+            const statusText = response?.statusText ?? '';
+            spinner$1.fail(chalk.red('login failed'));
+            if (verbose) {
+                console.log(chalk.gray('Response status:'), response?.status);
+                console.log(chalk.gray('Response statusText:'), statusText || '(empty)');
+                console.log(chalk.gray('Response data:'), response?.data ?? '(empty)');
+                console.log('');
+            }
             if (errCode || errMsg) {
                 log('Login failed (api)', { errCode, errMsg, fullData: response?.data });
-                spinner$1.fail(chalk.red(`login failed: ${errMsg}${errCode ? `, error_code: ${errCode}` : ''}`));
+                printMessage('Error', `Login failed: ${errMsg}${errCode ? `, error_code: ${errCode}` : ''}`);
             }
             else {
-                log('Login failed (no user_id)', { fullResponse: response?.data });
-                spinner$1.fail(chalk.red(`login failed`));
-                log('Login failed', { fullResponse: response });
+                log('Login failed (no user_id)', { responseBody: response?.data });
+                if (verbose)
+                    log('Full response (for debugging)', response);
+                const looksLikeProxyResponse = statusText === 'Connection established' ||
+                    (response?.status === 200 &&
+                        (response?.data == null ||
+                            typeof response.data !== 'object' ||
+                            !('data' in response.data)));
+                if (looksLikeProxyResponse) {
+                    printMessage('Warning', [
+                        'The response does not look like the login API (e.g. proxy returned "Connection established" instead of forwarding the real response).',
+                        '',
+                        'The 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.',
+                        '',
+                        'Proxy troubleshooting doc:',
+                        'https://bytedance.larkoffice.com/wiki/ZblJwT0ZNil9jJkS8EgcFlcQnFc',
+                    ].join('\n'));
+                }
+                else {
+                    printMessage('Error', 'Login failed. No user_id in response.');
+                }
             }
             spinner$1.stop();
             process.exit(1);
@@ -387,13 +418,13 @@ async function login(options) {
     }
     catch (error) {
         log('Request error', error instanceof Error ? { message: error.message, name: error.name, stack: error.stack } : error);
-        // 1. Error Title: Red and bold
         spinner$1.fail(chalk.red.bold('Failed to connect to login service'));
-        // 2. Description: Normal text with bold keywords
-        console.log("   Detected that the current terminal's " +
-            chalk.bold('network proxy settings') +
-            ' are preventing external network access.', chalk.yellow('Please check your local terminal proxy configuration.'));
-        console.log(chalk.yellow('You can follow this doc to modify your terminal network settings:'), chalk.underline.yellow('https://bytedance.larkoffice.com/wiki/ZblJwT0ZNil9jJkS8EgcFlcQnFc'));
+        printMessage('Error', [
+            "Detected that the current terminal's network proxy settings are preventing external network access.",
+            '',
+            'Please check your local terminal proxy configuration. You can follow this doc to modify your terminal network settings:',
+            'https://bytedance.larkoffice.com/wiki/ZblJwT0ZNil9jJkS8EgcFlcQnFc',
+        ].join('\n'));
         process.exit(1);
     }
 }
@@ -429,6 +460,8 @@ async function request({ url, method, data, headers, params, }) {
             params,
             headers: {
                 Cookie: cookie,
+                'x-use-ppe': '1',
+                'x-tt-env': 'ppe_upgrade_script',
                 ...(headers || {}),
             },
         });
@@ -618,23 +651,6 @@ function ensureDirSync(dirPath) {
     }
 }
 
-var index = /*#__PURE__*/Object.freeze({
-  __proto__: null,
-  checkUpdate: checkUpdate,
-  download: download,
-  ensureDirSync: ensureDirSync,
-  fetchGameInfo: fetchGameInfo,
-  getCurrentUser: getCurrentUser,
-  getLocalIP: getLocalIP,
-  getTTMGRC: getTTMGRC,
-  login: login,
-  openUrl: openUrl,
-  request: request,
-  setTTMGRC: setTTMGRC,
-  setup: setup,
-  uploadGameToPlatform: uploadGameToPlatform
-});
-
 const bareToRelativePlugin = {
     name: 'bare-to-relative',
     setup(build) {
@@ -2836,7 +2852,25 @@ async function start() {
     app.use(express.urlencoded({ extended: true }));
     app.use('/game/files', express.static(outputDir));
     app.get('/game/config', async (req, res) => {
-        const basic = await ttmgPack.getPkgs({ entryDir: process.cwd() });
+        const [basic, checkResult] = await Promise.all([
+            ttmgPack.getPkgs({ entryDir: process.cwd() }),
+            ttmgPack.checkPkgs({
+                entry: process.cwd(),
+                output: outputDir,
+                dev: {
+                    enable: true,
+                    port: store.getState().nodeServerPort,
+                    host: 'localhost',
+                    enableSourcemap: false,
+                    enableLog: false,
+                },
+                build: {
+                    enableOdr: false,
+                    enableAPICheck: true,
+                    ...PKG_SIZE_LIMIT,
+                },
+            }),
+        ]);
         const user = getCurrentUser();
         const { clientKey } = getClientKey();
         res.send({
@@ -2849,6 +2883,7 @@ async function start() {
                 schema: `https://www.tiktok.com/ttmg/dev/${clientKey}?host=${getLocalIP()}&port=${store.getState().nodeWsPort}&host_list=${encodeURIComponent(JSON.stringify(getLocalIPs()))}`,
                 ...basic,
                 devToolVersion,
+                checkResult,
             },
         });
     });
@@ -3337,7 +3372,7 @@ async function dev() {
     watch();
 }
 
-var version = "0.3.2-beta.3";
+var version = "0.3.2-beta.5";
 var pkg = {
 	version: version};
 
@@ -3383,12 +3418,6 @@ program
     .command('dev')
     .description('Open browser dev environment')
     .action(async () => {
-    const { getCurrentUser } = await Promise.resolve().then(function () { return index; });
-    const user = getCurrentUser();
-    if (!user) {
-        console.log('\n❌ 请先登录 TikTok 账号，执行命令: ttmg login\n');
-        process.exit(1);
-    }
     const options = program.opts();
     if (options.h5) {
         await dev$1();