@ttmg/cli 0.3.1-unity.14 → 0.3.1-unity.16

package/dist/index.js

@@ -13,6 +13,7 @@ var cheerio = require('cheerio');
 var os = require('os');
 var worker_threads = require('worker_threads');
 var axios = require('axios');
+var qs = require('qs');
 var handlebars = require('handlebars');
 var esbuild = require('esbuild');
 var archiver = require('archiver');
@@ -21,8 +22,9 @@ var WebSocket = require('ws');
 var glob = require('glob');
 var got = require('got');
 var FormData$1 = require('form-data');
-var http = require('http');
+var stream = require('stream');
 var ttmgPack = require('ttmg-pack');
+var http = require('http');
 var fs$1 = require('node:fs');
 var path$1 = require('node:path');
 var zlib = require('zlib');
@@ -276,7 +278,7 @@ const LOGIN_TT4D = 'https://developers.tiktok.com/passport/web/email/login';
 const params = {
     aid: '2471',
     account_sdk_source: 'web',
-    sdk_version: '2.1.1',
+    sdk_version: '2.1.6-tiktok',
 };
 const prompt = inquirer.createPromptModule();
 async function login() {
@@ -318,8 +320,11 @@ async function login() {
     const url = LOGIN_TT4D + '?' + new URLSearchParams(params);
     const headers = {
         'Content-Type': 'application/x-www-form-urlencoded',
-        'User-Agent': 'curl/8.5.0',
         Accept: '*/*',
+        'Accept-Encoding': 'gzip, deflate, br',
+        Origin: 'https://developers.tiktok.com',
+        Referer: 'https://developers.tiktok.com/passport/web/email/login',
+        'User-Agent': 'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/119.0 Safari/537.36',
     };
     const ora = await import('ora');
     spinner$1 = ora.default({
@@ -327,12 +332,32 @@ async function login() {
         spinner: 'dots',
     });
     spinner$1.start();
+    const data = qs.stringify({
+        email,
+        password,
+        mix_mode: '1',
+        fixed_mix_mode: '1',
+    });
     try {
-        const response = await axios.post(url, {
-            email,
-            password,
-        }, { headers, maxRedirects: 20, timeout: 30000 });
-        if (response?.data?.data?.user_id) {
+        const response = await axios.post(url, data, {
+            headers,
+            maxRedirects: 20,
+            timeout: 30000,
+        });
+        if (!response?.data?.data?.user_id) {
+            const errCode = response.data?.data?.error_code;
+            const errMsg = response.data?.data?.description;
+            if (errCode || errMsg) {
+                spinner$1.fail(chalk.red(`login failed: ${errMsg}${errCode ? `, error_code: ${errCode}` : ''}`));
+            }
+            else {
+                spinner$1.fail(chalk.red(`login failed`));
+                console.log(response.data);
+            }
+            spinner$1.stop();
+            process.exit(1);
+        }
+        else {
             const data = {
                 email,
                 user_id: response?.data?.data?.user_id,
@@ -342,15 +367,15 @@ async function login() {
             spinner$1.succeed(chalk.bold.green('login successfully!'));
             process.exit(0);
         }
-        else {
-            spinner$1.fail(chalk.red(`login failed: ${response.data?.data?.description || response.data?.data?.error_code}`));
-            spinner$1.stop();
-            process.exit(1);
-        }
     }
     catch (error) {
-        spinner$1.fail(chalk.red(`❌：${error.message}, please check your network, make sure your Shell can access TikTok Developer Platform， you can try by run command 'curl https://developers.tiktok.com' to check if it's accessible;\n`));
-        console.log(chalk.yellow('🔔 You can follow this doc to modify your terminal network settings:'), chalk.underline.yellow('https://bytedance.larkoffice.com/wiki/ZblJwT0ZNil9jJkS8EgcFlcQnFc'));
+        // 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'));
         process.exit(1);
     }
 }
@@ -366,8 +391,8 @@ async function request({ url, method, data, headers, params, }) {
             data,
             params,
             headers: {
-                ...(headers || {}),
                 Cookie: cookie,
+                ...(headers || {}),
             },
         });
         // @ts-ignore
@@ -495,7 +520,7 @@ async function fetchGameInfo(clientKey) {
             params: {
                 client_key: clientKey,
                 // version_type: 1,
-            },
+            }
             // headers: {
             //   'x-use-ppe': '1',
             //   'x-tt-env': 'ppe_mg_revamp',
@@ -1795,6 +1820,50 @@ function showTips(context) {
     console.log(chalk.gray('─────────────────────────────────────────────'));
 }
 
+/**
+ * 辅助函数：将当前工作目录打包为 Buffer
+ * @param customIgnores - 可选的自定义忽略规则数组 (支持 glob 模式，如 ['dist/**', '*.log'])
+ */
+const zipCwdToBuffer = (customIgnores = []) => {
+    return new Promise((resolve, reject) => {
+        const chunks = [];
+        const output = new stream.Writable({
+            write(chunk, encoding, next) {
+                chunks.push(chunk);
+                next();
+            },
+        });
+        const archive = archiver('zip', { zlib: { level: 9 } });
+        output.on('finish', () => {
+            resolve(Buffer.concat(chunks));
+        });
+        archive.on('error', err => {
+            reject(err);
+        });
+        archive.pipe(output);
+        const cwd = process.cwd();
+        // 1. 基础忽略列表 (建议保留这些基础规则，防止包过大)
+        const defaultIgnores = [
+            'node_modules/**',
+            '.git/**',
+            '.DS_Store',
+            ttmgPack.TTMG_TEMP_DIR,
+            '*.zip', // 忽略自身生成的 zip
+        ];
+        // 2. 合并自定义规则
+        // Set 去重，防止重复添加
+        const finalIgnores = Array.from(new Set([...defaultIgnores, ...customIgnores]));
+        // 3. 执行打包
+        // 注意：ignore 规则必须使用正斜杠 /，即使在 Windows 下
+        archive.glob('**/*', {
+            cwd: cwd,
+            ignore: finalIgnores,
+            dot: true, // 包含 .env 等点文件
+        });
+        archive.finalize();
+    });
+};
+
 const BASE_URL = 'https://developers.tiktok.com';
 const DEV_HEADERS = {
 // 'x-use-ppe': '1',
@@ -2750,22 +2819,57 @@ async function start() {
     /**
      * @description 上传游戏代码到服务器
      */
+    // app.post('/game/upload', async (req, res) => {
+    //   /**
+    //    * 我要新版本不做开发者选择，直接当前 cwd 作为 entryDir，压缩成 game.zip 进行上传
+    //    */
+    //   const fileKeys = Object.keys(req.files);
+    //   const uploadedFile = req.files[fileKeys[0]];
+    //   if (!uploadedFile) {
+    //     res.status(400).send({ code: errorCode, data: 'No file uploaded' }); // 使用正确的 HTTP 状态码
+    //     return;
+    //   }
+    //   try {
+    //     // 通过 header 获取 desc
+    //     const desc = req.headers['ttmg-game-desc'];
+    //     // 需要做 decodeURIComponent 处理
+    //     const decodedDesc = decodeURIComponent(desc || '--');
+    //     // 直接传递需要的信息
+    //     const { data, error } = await uploadGameToPlatform({
+    //       data: uploadedFile.data, // 这是 Buffer
+    //       name: uploadedFile.name, // 这是文件名
+    //       clientKey: getClientKey().clientKey,
+    //       note: decodedDesc,
+    //       appId: store.getState().appId,
+    //       sandboxId: store.getState().sandboxId,
+    //     });
+    //     if (error) {
+    //       res.send({ code: errorCode, error });
+    //     } else {
+    //       res.send({ code: successCode, data });
+    //     }
+    //   } catch (error) {
+    //     // 错误处理可以更具体
+    //     let errorMessage = 'An unknown error occurred.';
+    //     if (error instanceof Error) {
+    //       errorMessage = error.message;
+    //     }
+    //     // 打印详细错误到服务器日志，方便排查
+    //     res.status(500).send({ code: errorCode, data: errorMessage }); // 使用正确的 HTTP 状态码
+    //   }
+    // });
     app.post('/game/upload', async (req, res) => {
-        const fileKeys = Object.keys(req.files);
-        const uploadedFile = req.files[fileKeys[0]];
-        if (!uploadedFile) {
-            res.status(400).send({ code: errorCode, data: 'No file uploaded' }); // 使用正确的 HTTP 状态码
-            return;
-        }
         try {
-            // 通过 header 获取 desc
+            console.log(`正在打包当前目录: ${process.cwd()} ...`);
+            const gameZipBuffer = await zipCwdToBuffer();
+            // 变成 MB
+            console.log(`打包完成，大小: ${(gameZipBuffer.length / 1024 / 1024).toFixed(2)} MB`);
             const desc = req.headers['ttmg-game-desc'];
-            // 需要做 decodeURIComponent 处理
             const decodedDesc = decodeURIComponent(desc || '--');
-            // 直接传递需要的信息
             const { data, error } = await uploadGameToPlatform({
-                data: uploadedFile.data, // 这是 Buffer
-                name: uploadedFile.name, // 这是文件名
+                // @ts-ignore
+                data: gameZipBuffer,
+                name: 'game.zip',
                 clientKey: getClientKey().clientKey,
                 note: decodedDesc,
                 appId: store.getState().appId,
@@ -2779,13 +2883,12 @@ async function start() {
             }
         }
         catch (error) {
-            // 错误处理可以更具体
             let errorMessage = 'An unknown error occurred.';
             if (error instanceof Error) {
                 errorMessage = error.message;
             }
-            // 打印详细错误到服务器日志，方便排查
-            res.status(500).send({ code: errorCode, data: errorMessage }); // 使用正确的 HTTP 状态码
+            console.error('Upload failed:', errorMessage);
+            res.status(500).send({ code: errorCode, data: errorMessage });
         }
     });
     app.get('/game/wasm-split-config', (req, res) => {
@@ -3229,7 +3332,7 @@ async function dev() {
     watch();
 }
 
-var version = "0.3.1-unity.14";
+var version = "0.3.1-unity.16";
 var pkg = {
 	version: version};