@ttmg/cli 0.1.0-alpha.2 → 0.1.0-alpha.4

package/dist/index.js

@@ -10,7 +10,8 @@ var chalk = require('chalk');
 var express = require('express');
 var path = require('path');
 var require$$4 = require('cheerio');
-var chromeLauncher = require('chrome-launcher');
+var puppeteer = require('puppeteer');
+var child_process = require('child_process');
 var os = require('os');
 var require$$6 = require('crypto');
 var require$$5$1 = require('archiver');
@@ -287,25 +288,286 @@ function requireInit () {
 var initExports = requireInit();
 var index$2 = /*@__PURE__*/getDefaultExportFromCjs(initExports);
 
-async function openUrl(url) {
-    try {
-        await chromeLauncher.launch({
-            startingUrl: url,
-            chromeFlags: [
-                '--auto-open-devtools-for-tabs', // 自动打开 DevTools
+const iPhone12 = puppeteer.KnownDevices['iPhone 12 Pro'];
+const DEBUGGING_PORT = 9222;
+async function waitForEndpoint(url, timeout = 30000) {
+    const startTime = Date.now();
+    while (Date.now() - startTime < timeout) {
+        try {
+            const response = await fetch(url);
+            if (response.ok) {
+                console.log(`端点 ${url} 已可用！`);
+                return;
+            }
+        }
+        catch (error) { }
+        await new Promise(resolve => setTimeout(resolve, 500));
+    }
+    throw new Error(`等待端点 ${url} 可用超时 (${timeout}ms)`);
+}
+class BrowserManager {
+    constructor() {
+        this.browser = null;
+        this.page = null;
+        this.isClosing = false;
+        this.monitorInterval = null;
+        this.chromeProcess = null;
+        this.isReusedInstance = false;
+    }
+    getSystemChromePath() {
+        try {
+            const platform = os.platform();
+            if (platform === 'win32') {
+                const paths = [
+                    process.env.PROGRAMFILES +
+                        '\\Google\\Chrome\\Application\\chrome.exe',
+                    process.env['PROGRAMFILES(X86)'] +
+                        '\\Google\\Chrome\\Application\\chrome.exe',
+                    process.env.LOCALAPPDATA +
+                        '\\Google\\Chrome\\Application\\chrome.exe',
+                    'C:\\Program Files\\Google\\Chrome\\Application\\chrome.exe',
+                    'C:\\Program Files (x86)\\Google\\Chrome\\Application\\chrome.exe',
+                ];
+                for (const path of paths) {
+                    if (path && fs.existsSync(path))
+                        return path;
+                }
+            }
+            else if (platform === 'darwin') {
+                const macPaths = [
+                    '/Applications/Google Chrome.app/Contents/MacOS/Google Chrome',
+                    '/Applications/Chromium.app/Contents/MacOS/Chromium',
+                ];
+                for (const path of macPaths) {
+                    if (fs.existsSync(path))
+                        return path;
+                }
+            }
+            else {
+                const linuxPaths = [
+                    '/usr/bin/google-chrome',
+                    '/usr/bin/google-chrome-stable',
+                    '/usr/bin/chromium-browser',
+                    '/usr/bin/chromium',
+                    '/snap/bin/chromium',
+                    '/snap/bin/google-chrome',
+                ];
+                for (const path of linuxPaths) {
+                    if (fs.existsSync(path))
+                        return path;
+                }
+                try {
+                    const chromePath = child_process.execSync('which google-chrome || which google-chrome-stable || which chromium-browser || which chromium', { encoding: 'utf8' }).trim();
+                    if (chromePath && fs.existsSync(chromePath))
+                        return chromePath;
+                }
+                catch (e) { }
+            }
+            throw new Error('未在常见位置找到系统 Chrome 浏览器');
+        }
+        catch (error) {
+            return '';
+        }
+    }
+    async initializeBrowser() {
+        const browserURL = `http://127.0.0.1:${DEBUGGING_PORT}`;
+        const versionURL = `${browserURL}/json/version`;
+        try {
+            this.browser = await puppeteer.connect({
+                browserURL,
+                defaultViewport: null,
+            });
+            this.isReusedInstance = true;
+        }
+        catch (error) {
+            this.isReusedInstance = false;
+            const chromePath = this.getSystemChromePath();
+            if (!chromePath) {
+                console.error('错误：未找到可用的 Chrome 或 Chromium 浏览器！\n请前往 https://www.google.com/chrome/ 下载并安装。\n');
+                process.exit(1);
+            }
+            const launchArgs = [
+                `--remote-debugging-port=${DEBUGGING_PORT}`,
+                '--auto-open-devtools-for-tabs',
                 '--no-default-browser-check',
-                '--allow-insecure-localhost',
-                '--allow-running-insecure-content',
                 '--remote-allow-origins=*',
-                '--user-data-dir=/tmp/chrome-debug-profile',
-                '--disable-popup-blocking',
-            ],
+                `--user-data-dir=/tmp/chrome-persistent-profile`,
+                '--no-first-run',
+                '--homepage=about:blank',
+            ];
+            this.chromeProcess = child_process.spawn(chromePath, launchArgs, {
+                detached: true,
+                stdio: 'ignore',
+            });
+            this.chromeProcess.unref();
+            try {
+                await waitForEndpoint(versionURL);
+            }
+            catch (waitError) {
+                console.error(waitError);
+                if (this.chromeProcess && this.chromeProcess.pid) {
+                    process.kill(this.chromeProcess.pid);
+                }
+                throw waitError;
+            }
+            try {
+                this.browser = await puppeteer.connect({ browserURL });
+                console.log(`✅ 新浏览器实例已启动并连接成功 (PID: ${this.chromeProcess.pid})`);
+            }
+            catch (connectError) {
+                throw connectError;
+            }
+        }
+        const allPages = await this.browser.pages();
+        this.page =
+            allPages.find(p => p.url() !== 'about:blank') || allPages[0] || null;
+        if (!this.page) {
+            this.page = await this.browser.newPage();
+        }
+        this.setupBrowserListeners();
+    }
+    async openUrlWithIntelligence(url) {
+        try {
+            if (!this.browser || !this.browser.isConnected()) {
+                await this.initializeBrowser();
+            }
+            const existingPage = await this.findPageByUrl(url);
+            if (existingPage) {
+                await this.switchToPageAndRefresh(existingPage, url);
+            }
+            else {
+                await this.openNewPage(url);
+            }
+            this.startNonBlockingMonitor();
+        }
+        catch (error) {
+            await this.cleanup();
+            throw error;
+        }
+    }
+    startNonBlockingMonitor() {
+        if (this.monitorInterval)
+            clearInterval(this.monitorInterval);
+        this.monitorInterval = setInterval(() => {
+            if (this.isClosing || !this.browser || !this.browser.isConnected()) {
+                if (this.monitorInterval)
+                    clearInterval(this.monitorInterval);
+                this.monitorInterval = null;
+            }
+        }, 5000);
+    }
+    async findPageByUrl(targetUrl) {
+        if (!this.browser)
+            return null;
+        const pages = await this.browser.pages();
+        for (const page of pages) {
+            if (this.isSamePage(page.url(), targetUrl)) {
+                return page;
+            }
+        }
+        return null;
+    }
+    isSamePage(url1, url2) {
+        try {
+            const parsedUrl1 = new URL(url1);
+            const parsedUrl2 = new URL(url2);
+            return (parsedUrl1.hostname === parsedUrl2.hostname &&
+                parsedUrl1.pathname === parsedUrl2.pathname);
+        }
+        catch (error) {
+            return false;
+        }
+    }
+    async switchToPageAndRefresh(page, url) {
+        await page.bringToFront();
+        try {
+            await page.emulate(iPhone12);
+            await page.evaluate(() => {
+                window.location.href = url;
+            });
+        }
+        catch (error) { }
+        this.page = page;
+    }
+    async openNewPage(url) {
+        if (!this.browser)
+            throw new Error('Browser not initialized.');
+        if (this.page) {
+            try {
+                await this.page.emulate(iPhone12);
+                await this.page.goto(url, { waitUntil: 'load', timeout: 60000 });
+                return;
+            }
+            catch (error) {
+                console.error(`在现有页面导航失败，将尝试创建新页面。错误: ${error}`);
+            }
+        }
+        await this.page.emulate(iPhone12);
+        this.page = await this.browser.newPage();
+        this.setupPageListeners(this.page);
+        try {
+            await this.page.goto(url, { waitUntil: 'load', timeout: 60000 });
+        }
+        catch (error) {
+            throw error;
+        }
+    }
+    setupBrowserListeners() {
+        if (!this.browser)
+            return;
+        this.browser.on('disconnected', () => {
+            this.cleanup();
+        });
+    }
+    setupPageListeners(page) {
+        page.on('close', () => {
+            if (this.page === page) {
+                this.page = null;
+            }
         });
+    }
+    async close() {
+        if (this.isClosing)
+            return;
+        this.isClosing = true;
+        if (this.monitorInterval)
+            clearInterval(this.monitorInterval);
+        try {
+            if (this.browser && this.browser.isConnected()) {
+                await this.browser.disconnect();
+            }
+            if (!this.isReusedInstance &&
+                this.chromeProcess &&
+                this.chromeProcess.pid) {
+                process.kill(this.chromeProcess.pid);
+            }
+        }
+        catch (error) {
+        }
+        finally {
+            this.cleanup();
+        }
+    }
+    cleanup() {
+        if (this.monitorInterval)
+            clearInterval(this.monitorInterval);
+        this.monitorInterval = null;
+        this.browser = null;
+        this.page = null;
+        this.chromeProcess = null;
+        this.isClosing = false;
+    }
+}
+async function openUrl(url) {
+    const browserManager = new BrowserManager();
+    try {
+        await browserManager.openUrlWithIntelligence(url);
         await new Promise(() => { });
+        return browserManager;
     }
-    catch (e) {
-        // const open = await import('open');
-        // await open.default(url);
+    catch (error) {
+        await browserManager.close();
+        throw error;
     }
 }
 
@@ -968,6 +1230,7 @@ async function uploadZip(zipPath) {
             process.stdout.write(`\r${chalk.cyan('Uploading progress:  ')}${chalk.green(percent + '%')}`);
             // 生成标准的 百分比
             wsServer?.sendUploadStatus('process', {
+                status: 'process',
                 progress: `${percent}%`,
             });
         });
@@ -1035,18 +1298,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!'));
@@ -1153,12 +1420,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',
@@ -1217,7 +1484,7 @@ async function dev() {
     await watchChange();
 }
 
-var version = "0.1.0-alpha.2";
+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-alpha.2",
+  "version": "0.1.0-alpha.4",
   "description": "TikTok Mini Game Command Line Tool",
   "license": "ISC",
   "bin": {
@@ -13,7 +13,8 @@
     "prepublish": "npm run build",
     "build": "rollup -c",
     "watch": "rollup -c -w",
-    "perf": "rollup -c --perf"
+    "perf": "rollup -c --perf",
+    "dev": "ts-node -r tsconfig-paths/register src/index.ts"
   },
   "keywords": [
     "TTMG",
@@ -41,6 +42,7 @@
     "multer": "^2.0.2",
     "open": "^10.2.0",
     "prettier": "^3.6.2",
+    "puppeteer": "^24.17.1",
     "qrcode-terminal": "^0.12.0",
     "ttmg-pack": "^0.0.20-alpha.1",
     "ws": "^8.18.3"
@@ -60,6 +62,8 @@
     "eslint": "^9.31.0",
     "rollup": "^4.46.4",
     "rollup-plugin-visualizer": "^6.0.3",
+    "ts-node": "^10.9.2",
+    "tsconfig-paths": "^4.2.0",
     "typescript": "^5.9.2"
   },
   "engines": {