@ttmg/cli 0.3.1-unity.9 → 0.3.2-beta.1

package/CHANGELOG.md

@@ -174,3 +174,12 @@ feat: 支持文件变更监听，告知浏览器文件变更，提醒开发者
 修复启动模式模块，自定义query 参数无法持久化的问题
 修复扫描二维码模块，内容过多，纵向无法滚动问题
 
+## 0.3.1
+- 支持 unity 小游戏本地一些列调试功能，如 Wasm 分包、包大小校验、一键上传代码包至平台等 了解如何使用
+- 增加用户登录过期的异常提示，提醒开发者重新登录
+- 优化上传代码包至平台功能，开发者只用添加描述后点击上传便可自动压缩当前目录下的代码包上传至开发者平台
+- 优化 ttmg login 终端网络代理异常导致无法登录的报错引导，提示用户检查网络设置
+
+## 0.3.2-beta.1
+支持 cocos 2.0 openDataContext 相关适配
+

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,13 +332,28 @@ 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?.error_code) {
-            spinner$1.fail(chalk.red(`login failed: ${response.data?.data?.description || response.data?.data?.error_code}`));
+        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);
         }
@@ -349,8 +369,13 @@ async function login() {
         }
     }
     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',
@@ -639,6 +664,17 @@ function ensureDirSync(dirPath) {
     }
 }
 
+const bareToRelativePlugin = {
+    name: 'bare-to-relative',
+    setup(build) {
+        // 匹配不以 . 或 / 开头的 .js 文件路径
+        build.onResolve({ filter: /^[^./].*\.js$/ }, args => {
+            return {
+                path: path.resolve(args.resolveDir, args.path),
+            };
+        });
+    },
+};
 function buildOpenContext(sourcePath) {
     const result = esbuild.buildSync({
         entryPoints: [sourcePath],
@@ -655,6 +691,7 @@ function buildOpenContext(sourcePath) {
             '.svg': 'dataurl',
             '.webp': 'dataurl',
         },
+        plugins: [bareToRelativePlugin],
     });
     const jsCode = result.outputFiles[0].text;
     return jsCode;
@@ -1795,14 +1832,58 @@ function showTips(context) {
     console.log(chalk.gray('─────────────────────────────────────────────'));
 }
 
-const UNITY_PPE_ENV = 'ppe_op_unity';
+/**
+ * 辅助函数：将当前工作目录打包为 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',
-    'x-tt-env': UNITY_PPE_ENV,
-    // 'x-tt-target-idc': 'sg',
+// 'x-use-ppe': '1',
+// 'x-tt-env': UNITY_PPE_ENV,
+// 'x-tt-target-idc': 'sg',
 };
-const WASM_SPLIT_CACHE_DIR = '__TTMG_TEMP__/wasmcode/';
+const TTMG_TEMP_DIR = '__TTMG_TEMP__';
+const WASM_SPLIT_CACHE_DIR = `${TTMG_TEMP_DIR}/wasmcode/`;
 const WASM_SYMBOL_FILE_NAME = 'webgl.symbols.json';
 const UNITY_WASM_SPLIT_CONFIG_FIELD_SCHEME = {
     ENABLEWASMCOLLECT: `"$ENABLEWASMCOLLECT"`,
@@ -1835,13 +1916,14 @@ const WASM_SPLIT_SUBPACKAGE_CONFIG = {
         root: 'wasmcode1-android/',
     },
     ios: {
-        name: 'wasmcode-ios',
         root: 'wasmcode-ios/',
     },
     iosMain: {
+        name: 'wasmcode-ios',
         root: 'wasmcode-ios/',
     },
     iosSub: {
+        name: 'wasmcode1-ios',
         root: 'wasmcode1-ios/',
     },
 };
@@ -1869,7 +1951,34 @@ async function startPrepare(params) {
         // 部分后端会依赖 content-type；如果不确定就用 application/octet-stream
         contentType: 'application/wasm',
     });
-    form.append('wasm_symbol_file', fs$1.createReadStream(path$1.join(process.cwd(), WASM_SYMBOL_FILE_NAME)), {
+    /**
+     * 兼容 WASM_SYMBOL_FILE_NAME
+     * case 1：项目根目录有 webgl.symbols.json 文件
+     * case 2：项目根目录没有 webgl.symbols.json 文件，但 TTMG_TEMP_DIR 有
+     * 优先读 2
+     */
+    let symbolFilePath = path$1.join(process.cwd(), TTMG_TEMP_DIR, WASM_SYMBOL_FILE_NAME);
+    if (!fs$1.existsSync(symbolFilePath)) {
+        symbolFilePath = path$1.join(process.cwd(), WASM_SYMBOL_FILE_NAME);
+    }
+    /**
+     * 判断是否有 symbol 文件，有则上传，没有直接接口报错
+     */
+    if (!fs$1.existsSync(symbolFilePath)) {
+        return {
+            error: {
+                code: 400,
+                message: `${WASM_SYMBOL_FILE_NAME} not found at ${path$1.join(process.cwd())}，use unity plugin to rebuild`,
+                client_key: params.client_key,
+            },
+            data: null,
+            ctx: {
+                logid: '',
+                httpStatusCode: 400,
+            },
+        };
+    }
+    form.append('wasm_symbol_file', fs$1.createReadStream(symbolFilePath), {
         filename: WASM_SYMBOL_FILE_NAME,
         contentType: 'application/octet-stream',
     });
@@ -2303,7 +2412,8 @@ function updateSubpackageConfigSync() {
      */
     filtered.push(WASM_SPLIT_SUBPACKAGE_CONFIG.androidMain);
     filtered.push(WASM_SPLIT_SUBPACKAGE_CONFIG.androidSub);
-    filtered.push(WASM_SPLIT_SUBPACKAGE_CONFIG.ios);
+    filtered.push(WASM_SPLIT_SUBPACKAGE_CONFIG.iosMain);
+    filtered.push(WASM_SPLIT_SUBPACKAGE_CONFIG.iosSub);
     // 合并去重：存在则更新 root，不存在则新增
     const map = new Map(filtered.map(s => [s.name, s]));
     gameJson[fieldName] = Array.from(map.values());
@@ -2311,7 +2421,7 @@ function updateSubpackageConfigSync() {
 }
 
 async function downloadAndCompress(opts) {
-    const { startDownloadStatus, downloadDoneStatus, startCompressStatus, compressDoneStatus, url, out, } = opts;
+    const { startDownloadStatus, downloadDoneStatus, startCompressStatus, compressDoneStatus, url, out, enableCompress = false, } = opts;
     if (!url)
         return;
     const willDownloadedFileIsBr = url.includes(BR_SUFFIX);
@@ -2332,7 +2442,7 @@ async function downloadAndCompress(opts) {
         await promises.rm(wasmBrOutName);
         throw e;
     }
-    if (!willDownloadedFileIsBr) {
+    if (enableCompress) {
         console.log(`compress start: ${path.basename(out)}${BR_SUFFIX}`);
         // 压缩
         wsServer.sendUnitySplitStatus({ status: startCompressStatus });
@@ -2401,11 +2511,11 @@ async function downloadSplited(context) {
                 url: context.main_wasm_h5_download_url,
                 out: mainIosWasmCodeTempPath,
             })),
-            // 下载 ios sub   json
+            // 下载 ios sub js range  json
             limit(() => downloadAndCompress({
                 startDownloadStatus: 'start_download_ios_range_json',
                 downloadDoneStatus: 'download_ios_range_json_done',
-                url: context.sub_js_download_url,
+                url: context.sub_js_range_download_url,
                 out: path.join(subIosDir, 'func_bytes_range.json'),
             })),
             // 下载 ios sub js data br
@@ -2738,22 +2848,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,
@@ -2767,13 +2912,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) => {
@@ -2820,6 +2964,7 @@ async function start() {
             wasm_md5: codeMd5,
             wasm_file_path: codePath,
         });
+        console.log('wasm-prepare-end', result);
         if (result.error) {
             res.send({
                 code: errorCode,
@@ -3038,6 +3183,31 @@ async function start() {
             });
         }
     });
+    /**
+     *
+  高鹏
+  抄一下码下面的话
+  我试试这个咋样看[看]闵行的是好吃的
+  可以
+  下周大哥来 让他别整一群的 就咱们几个吃个串挺好
+  哪个unity筹备群拉你了哈
+  好
+  新知识 30% 等于部分用户
+  0.3.1-unity.6
+  {
+      "code": 0,
+      "data": {
+          "isSuccess": true
+      },
+      "msg": "download success",
+      "ctx":
+  }
+  发现个小问题
+  wasmcode1-ios 下面下载缺了一个func_bytes_range.json 以及subjs.data.br 多了一个 br 后缀
+     ​​​
+  Shift + Enter 换行
+  
+     */
     app.post('/game/wasm-split-download-result', async (req, res) => {
         const { clientKey, codeMd5, codePath } = req.body;
         console.log('game/wasm-split-download-result-start', req.body);
@@ -3191,7 +3361,7 @@ async function dev() {
     watch();
 }
 
-var version = "0.3.1-unity.9";
+var version = "0.3.2-beta.1";
 var pkg = {
 	version: version};