@ttmg/cli 0.1.0-beta.12 → 0.1.0-beta.14

package/CHANGELOG.md

@@ -26,3 +26,11 @@ feat: 先关闭自动上传能力
 ## 0.1.0-beta.12
 
 feat: 支持文件变更监听，告知浏览器文件变更，提醒开发者重新加载游戏
+
+## 0.1.0-beta.13
+
+1. 支持 sourcemap
+2. 优化上传环节产物，过滤 sourcemap 文件，提高上传效率
+
+## 0.1.0-beta.14
+1. 修复 client key 未成功写入 mock meta 的问题，导致不一致

package/dist/index.js

@@ -16,11 +16,31 @@ var require$$6 = require('crypto');
 var require$$5$1 = require('archiver');
 var multer = require('multer');
 var WebSocket = require('ws');
+var glob = require('glob');
 var got = require('got');
 var FormData = require('form-data');
 var ttmgPack = require('ttmg-pack');
 var qrcode = require('qrcode-terminal');
 
+function _interopNamespaceDefault(e) {
+	var n = Object.create(null);
+	if (e) {
+		Object.keys(e).forEach(function (k) {
+			if (k !== 'default') {
+				var d = Object.getOwnPropertyDescriptor(e, k);
+				Object.defineProperty(n, k, d.get ? d : {
+					enumerable: true,
+					get: function () { return e[k]; }
+				});
+			}
+		});
+	}
+	n.default = e;
+	return Object.freeze(n);
+}
+
+var glob__namespace = /*#__PURE__*/_interopNamespaceDefault(glob);
+
 function getDefaultExportFromCjs (x) {
 	return x && x.__esModule && Object.prototype.hasOwnProperty.call(x, 'default') ? x['default'] : x;
 }
@@ -275,10 +295,10 @@ async function openUrl(url) {
                 '--auto-open-devtools-for-tabs', // 自动打开 DevTools
                 '--no-default-browser-check',
                 '--allow-insecure-localhost',
-                '--ignore-certificate-errors',
                 '--allow-running-insecure-content',
                 '--remote-allow-origins=*',
                 '--user-data-dir=/tmp/chrome-debug-profile',
+                '--disable-popup-blocking',
             ],
         });
         await new Promise(() => { });
@@ -676,6 +696,79 @@ function requireBundle () {
 var bundleExports = requireBundle();
 var index = /*@__PURE__*/getDefaultExportFromCjs(bundleExports);
 
+const CONFIG_DIR = path.join(os.homedir(), '.ttmg-cli');
+path.join(CONFIG_DIR, 'config.json');
+/**
+ * 获取 Client Key（选择或输入）
+ */
+function getClientKey() {
+    /**
+     * 读取 project.config.json 中的 appid/appId
+     */
+    const projectConfigPath = path.join(process.cwd(), 'project.config.json');
+    let clientKey;
+    try {
+        const projectConfig = JSON.parse(fs.readFileSync(projectConfigPath, 'utf-8'));
+        clientKey = projectConfig.appid || projectConfig.appId;
+    }
+    catch (e) {
+        console.log('read project.config.json failed', e);
+        clientKey = '';
+    }
+    if (clientKey) {
+        return clientKey;
+    }
+    else {
+        console.log(chalk.red.bold('No appid found in project.config.json, you should provide it in project.config.json'));
+        process.exit(1);
+    }
+    // const keys = readClientKeys();
+    // if (keys.length > 0) {
+    //   // 有历史 key，展示选择框
+    //   const { selectedKey } = await inquirer.prompt([
+    //     {
+    //       type: 'list',
+    //       name: 'selectedKey',
+    //       message: 'Please select your game id（client_key）：',
+    //       choices: [...keys, new inquirer.Separator(), 'Add new game id'],
+    //     },
+    //   ]);
+    //   if (selectedKey === 'Add new game id') {
+    //     // 输入新 key
+    //     const { newKey } = await inquirer.prompt([
+    //       {
+    //         type: 'input',
+    //         name: 'newKey',
+    //         message: 'Please input your new game id（client_key）：',
+    //         validate: (input: string) => (input ? true : 'Please input game id'),
+    //       },
+    //     ]);
+    //     saveClientKey(newKey);
+    //     clientKey = newKey;
+    //   } else {
+    //     clientKey = selectedKey;
+    //   }
+    // } else {
+    //   // 没有历史 key，让用户输入
+    //   const { newKey } = await inquirer.prompt([
+    //     {
+    //       type: 'input',
+    //       name: 'newKey',
+    //       message: 'Please input your game id（client_key）：',
+    //       validate: (input: string) => (input ? true : 'Please input game id'),
+    //     },
+    //   ]);
+    //   saveClientKey(newKey);
+    //   clientKey = newKey;
+    // }
+    // return clientKey;
+}
+
+function getOutputDir() {
+    const clientKey = getClientKey();
+    return path.join(os.homedir(), '__TTMG__', clientKey);
+}
+
 class Store {
     constructor(initialState) {
         this.listeners = [];
@@ -746,6 +839,24 @@ async function createServer() {
     app.use(express.json());
     // 解析 FormData body
     app.use(express.urlencoded({ extended: true }));
+    /**
+     * 支持文件访问
+     */
+    const outputDir = getOutputDir();
+    /**
+     *
+     */
+    app.use(express.static(outputDir));
+    /**
+     * 支持获取文件
+     */
+    app.get('/game/files/:fileName', async (req, res) => {
+        const { fileName } = req.params;
+        res.sendFile(path.join(outputDir, fileName));
+    });
+    /**
+     * 支持文件访问
+     */
     /**
      * TODO: 提供的接口供客户端进行调用，告诉 NodeServer 客户端的 host 和 port
      */
@@ -797,79 +908,6 @@ function closeServer() {
     });
 }
 
-const CONFIG_DIR = path.join(os.homedir(), '.ttmg-cli');
-path.join(CONFIG_DIR, 'config.json');
-/**
- * 获取 Client Key（选择或输入）
- */
-function getClientKey() {
-    /**
-     * 读取 project.config.json 中的 appid/appId
-     */
-    const projectConfigPath = path.join(process.cwd(), 'project.config.json');
-    let clientKey;
-    try {
-        const projectConfig = JSON.parse(fs.readFileSync(projectConfigPath, 'utf-8'));
-        clientKey = projectConfig.appid || projectConfig.appId;
-    }
-    catch (e) {
-        console.log('read project.config.json failed', e);
-        clientKey = '';
-    }
-    if (clientKey) {
-        return clientKey;
-    }
-    else {
-        console.log(chalk.red.bold('No appid found in project.config.json, you should provide it in project.config.json'));
-        process.exit(1);
-    }
-    // const keys = readClientKeys();
-    // if (keys.length > 0) {
-    //   // 有历史 key，展示选择框
-    //   const { selectedKey } = await inquirer.prompt([
-    //     {
-    //       type: 'list',
-    //       name: 'selectedKey',
-    //       message: 'Please select your game id（client_key）：',
-    //       choices: [...keys, new inquirer.Separator(), 'Add new game id'],
-    //     },
-    //   ]);
-    //   if (selectedKey === 'Add new game id') {
-    //     // 输入新 key
-    //     const { newKey } = await inquirer.prompt([
-    //       {
-    //         type: 'input',
-    //         name: 'newKey',
-    //         message: 'Please input your new game id（client_key）：',
-    //         validate: (input: string) => (input ? true : 'Please input game id'),
-    //       },
-    //     ]);
-    //     saveClientKey(newKey);
-    //     clientKey = newKey;
-    //   } else {
-    //     clientKey = selectedKey;
-    //   }
-    // } else {
-    //   // 没有历史 key，让用户输入
-    //   const { newKey } = await inquirer.prompt([
-    //     {
-    //       type: 'input',
-    //       name: 'newKey',
-    //       message: 'Please input your game id（client_key）：',
-    //       validate: (input: string) => (input ? true : 'Please input game id'),
-    //     },
-    //   ]);
-    //   saveClientKey(newKey);
-    //   clientKey = newKey;
-    // }
-    // return clientKey;
-}
-
-function getOutputDir() {
-    const clientKey = getClientKey();
-    return path.join(os.homedir(), '__TTMG__', clientKey);
-}
-
 async function uploadGame() {
     const outputDir = getOutputDir();
     console.log(chalk.yellow.bold('Start compress game resource'));
@@ -881,58 +919,40 @@ async function uploadGame() {
         isSuccess: res?.statusCode === 200,
     };
 }
-function zipDirectory(sourceDir, outPath) {
-    return new Promise((resolve, reject) => {
-        const output = fs.createWriteStream(outPath); // 修正：传入输出路径
-        const archive = require$$5$1('zip', { zlib: { level: 9 } });
-        output.on('close', () => {
-            // console.log('Compress directory done');
-            resolve();
-        });
-        output.on('error', err => {
-            // console.error('Compress directory error:', err);
-            reject(err);
-        });
-        archive.on('error', err => {
-            reject(err);
-        });
+async function zipDirectory(sourceDir, outPath) {
+    const output = fs.createWriteStream(outPath);
+    const archive = require$$5$1('zip', { zlib: { level: 9 } });
+    return new Promise(async (resolve, reject) => {
+        output.on('close', () => resolve());
+        output.on('error', err => reject(err));
+        archive.on('error', err => reject(err));
         archive.pipe(output);
-        archive.directory(sourceDir, false);
-        archive.finalize();
+        try {
+            // 注意这里用 await glob.glob
+            const files = await glob__namespace.glob('**/*', {
+                cwd: sourceDir,
+                nodir: true,
+                ignore: '**/*.js.map',
+            });
+            files.forEach(file => {
+                archive.file(path.join(sourceDir, file), { name: file });
+            });
+            archive.finalize();
+        }
+        catch (err) {
+            reject(err);
+        }
     });
 }
-/**
- * 上传 zip 文件到指定接口
- * @param zipFilePath zip 文件路径
- * @param uploadUrl 上传接口
- */
-// export async function uploadZip(zipPath: string) {
-//   const form = new FormData();
-//   form.append('file', fs.createReadStream(zipPath), 'upload.zip');
-//   try {
-//     console.log(chalk.yellow.bold('Start upload resource to client'));
-//     const { clientServerHost, clientServerPort } = store.getState();
-//     const res = await axios.post(
-//       `http://${clientServerHost}:${clientServerPort}/game/upload`,
-//       form,
-//       {
-//         headers: form.getHeaders(),
-//       },
-//     );
-//     fs.unlinkSync(zipPath);
-//     return res;
-//   } catch (err: any) {
-//     console.error('Upload resource to client failed:', err.message);
-//   }
-// }
-// 使用 require 语法，完全兼容 CommonJS
 async function uploadZip(zipPath) {
     const form = new FormData();
     form.append('file', fs.createReadStream(zipPath), {
         filename: 'upload.zip',
         contentType: 'application/zip',
     });
-    console.log(chalk.yellow.bold('Start upload resource to client'));
+    // 帮我计算下文件大小，变成 MB 为单位
+    const fileSize = fs.statSync(zipPath).size / 1024 / 1024;
+    console.log(chalk.yellow.bold(`Start upload resource to client, size: ${fileSize.toFixed(2)} MB`));
     const { clientServerHost, clientServerPort } = store.getState();
     const url = `http://${clientServerHost}:${clientServerPort}/game/upload`;
     try {
@@ -948,6 +968,7 @@ async function uploadZip(zipPath) {
             process.stdout.write(`\r${chalk.cyan('Uploading progress:  ')}${chalk.green(percent + '%')}`);
             // 生成标准的 百分比
             wsServer?.sendUploadStatus('process', {
+                status: 'process',
                 progress: `${percent}%`,
             });
         });
@@ -1015,18 +1036,22 @@ class WsServer {
                                 .then(res => {
                                 if (res.isSuccess) {
                                     this.sendUploadStatus('success', {
+                                        status: 'success',
                                         packages: store.getState().packages,
+                                        clientKey: getClientKey(),
                                         isSuccess: res.isSuccess,
                                     });
                                 }
                                 else {
                                     this.sendUploadStatus('error', {
+                                        status: 'error',
                                         errMsg: res.errorMsg,
                                     });
                                 }
                             })
                                 .catch(() => {
                                 this.sendUploadStatus('error', {
+                                    status: 'error',
                                     isSuccess: false,
                                 });
                                 console.log(chalk.red.bold('Start upload resource to client failed!'));
@@ -1101,10 +1126,20 @@ async function prepareResource() {
     if (!fs.existsSync(outputDir)) {
         fs.mkdirSync(outputDir, { recursive: true });
     }
-    await console.log(entryDir);
     const { isSuccess, errorMsg, packages } = await ttmgPack.debugPkgs({
         entry: entryDir,
         output: outputDir,
+        dev: {
+            enable: true,
+            port: DEV_PORT,
+            host: 'localhost',
+            enableSourcemap: true,
+            enableLog: false,
+        },
+        build: {
+            pkgSizeLimit: 30 * 1024 * 1024,
+            mainPkgSizeLimit: 4 * 1024 * 1024,
+        },
     });
     if (!isSuccess) {
         console.log(chalk.redBright('Build game package failed, Please check the error message below:'));
@@ -1123,12 +1158,12 @@ async function prepareResource() {
 async function watchChange() {
     let debounceTimer = null;
     fs.watch(process.cwd(), (eventType, filename) => {
-        console.log(chalk.yellow('game resource change, restart to upload'));
         // 清除之前的定时器
         if (debounceTimer)
             clearTimeout(debounceTimer);
         // 重新设置定时器
         debounceTimer = setTimeout(async () => {
+            console.log(chalk.yellow('game resource change, restart to upload'));
             await prepareResource();
             wsServer.send({
                 method: 'resourceChange',
@@ -1187,7 +1222,7 @@ async function dev() {
     await watchChange();
 }
 
-var version = "0.1.0-beta.12";
+var version = "0.1.0-beta.14";
 var pkg = {
 	version: version};
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ttmg/cli",
-  "version": "0.1.0-beta.12",
+  "version": "0.1.0-beta.14",
   "description": "TikTok Mini Game Command Line Tool",
   "license": "ISC",
   "bin": {
@@ -34,6 +34,7 @@
     "estraverse": "^5.3.0",
     "express": "^5.1.0",
     "form-data": "^4.0.4",
+    "glob": "^11.0.3",
     "got": "^11.8.5",
     "inquirer": "^12.7.0",
     "jsdom": "^26.1.0",
@@ -41,7 +42,7 @@
     "open": "^10.2.0",
     "prettier": "^3.6.2",
     "qrcode-terminal": "^0.12.0",
-    "ttmg-pack": "^0.0.19",
+    "ttmg-pack": "^0.0.20",
     "ws": "^8.18.3"
   },
   "devDependencies": {