@xcanwin/manyoyo 5.1.5 → 5.1.8

package/lib/plugin/playwright.js

@@ -4,6 +4,7 @@ const fs = require('fs');
 const net = require('net');
 const os = require('os');
 const path = require('path');
+const crypto = require('crypto');
 const { spawn, spawnSync } = require('child_process');
 
 const EXTENSIONS = [
@@ -56,6 +57,14 @@ const SCENE_DEFS = {
 const VALID_RUNTIME = new Set(['container', 'host', 'mixed']);
 const VALID_ACTIONS = new Set(['up', 'down', 'status', 'health', 'logs']);
 const CONTAINER_EXTENSION_ROOT = '/app/extensions';
+const DEFAULT_FINGERPRINT_PROFILE = {
+    userAgent: 'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/146.0.0.0 Safari/537.36',
+    locale: 'zh-CN',
+    acceptLanguage: 'zh-CN,zh;q=0.9',
+    timezoneId: 'Asia/Shanghai',
+    width: 1366,
+    height: 768
+};
 
 function sleep(ms) {
     return new Promise(resolve => setTimeout(resolve, ms));
@@ -227,7 +236,6 @@ class PlaywrightPlugin {
             hostListen: '127.0.0.1',
             mcpDefaultHost: 'host.docker.internal',
             dockerTag: process.env.PLAYWRIGHT_MCP_DOCKER_TAG || 'latest',
-            npmVersion: process.env.PLAYWRIGHT_MCP_NPM_VERSION || 'latest',
             containerRuntime: 'podman',
             vncPasswordEnvKey: 'VNC_PASSWORD',
             headedImage: 'localhost/xcanwin/manyoyo-playwright-headed',
@@ -285,6 +293,15 @@ class PlaywrightPlugin {
         this.stderr.write(`${line}\n`);
     }
 
+    randomAlnum(length = 16) {
+        const chars = 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789';
+        let out = '';
+        for (let i = 0; i < length; i += 1) {
+            out += chars[crypto.randomInt(0, chars.length)];
+        }
+        return out;
+    }
+
     runCmd(args, { env = null, captureOutput = false, check = true } = {}) {
         const result = spawnSync(args[0], args.slice(1), {
             encoding: 'utf8',
@@ -362,7 +379,7 @@ class PlaywrightPlugin {
         if (!this.sceneConfigMissing(sceneName)) {
             return;
         }
-        this.runCmd(['npx', '-y', 'playwright-core', 'install', '--with-deps', this.defaultBrowserName(sceneName)], { check: true });
+        this.runCmd([this.localBinPath('playwright'), 'install', '--with-deps', this.defaultBrowserName(sceneName)], { check: true });
     }
 
     scenePidFile(sceneName) {
@@ -373,6 +390,15 @@ class PlaywrightPlugin {
         return path.join(this.config.runDir, `${sceneName}.log`);
     }
 
+    localBinPath(binName) {
+        const filename = process.platform === 'win32' ? `${binName}.cmd` : binName;
+        const binPath = path.join(this.projectRoot, 'node_modules', '.bin', filename);
+        if (!fs.existsSync(binPath)) {
+            throw new Error(`local binary not found: ${binPath}. Run npm install first.`);
+        }
+        return binPath;
+    }
+
     extensionDirPath() {
         return path.join(os.homedir(), '.manyoyo', 'plugin', 'playwright', 'extensions');
     }
@@ -510,13 +536,21 @@ class PlaywrightPlugin {
         const def = SCENE_DEFS[sceneName];
         const port = this.scenePort(sceneName);
         const extensionPaths = asStringArray(options.extensionPaths, []);
+        const baseLaunchArgs = [
+            `--user-agent=${DEFAULT_FINGERPRINT_PROFILE.userAgent}`,
+            `--lang=${DEFAULT_FINGERPRINT_PROFILE.locale}`,
+            `--window-size=${DEFAULT_FINGERPRINT_PROFILE.width},${DEFAULT_FINGERPRINT_PROFILE.height}`,
+            '--disable-blink-features=AutomationControlled',
+            '--force-webrtc-ip-handling-policy=disable_non_proxied_udp'
+        ];
         const launchOptions = {
             channel: 'chromium',
-            headless: def.headless
+            headless: def.headless,
+            args: [...baseLaunchArgs]
         };
 
         if (extensionPaths.length > 0) {
-            launchOptions.args = this.buildExtensionLaunchArgs(extensionPaths);
+            launchOptions.args.push(...this.buildExtensionLaunchArgs(extensionPaths));
         }
 
         return {
@@ -535,7 +569,20 @@ class PlaywrightPlugin {
                 browserName: 'chromium',
                 launchOptions,
                 contextOptions: {
-                    userAgent: 'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/144.0.0.0 Safari/537.36'
+                    userAgent: DEFAULT_FINGERPRINT_PROFILE.userAgent,
+                    locale: DEFAULT_FINGERPRINT_PROFILE.locale,
+                    timezoneId: DEFAULT_FINGERPRINT_PROFILE.timezoneId,
+                    viewport: {
+                        width: DEFAULT_FINGERPRINT_PROFILE.width,
+                        height: DEFAULT_FINGERPRINT_PROFILE.height
+                    },
+                    screen: {
+                        width: DEFAULT_FINGERPRINT_PROFILE.width,
+                        height: DEFAULT_FINGERPRINT_PROFILE.height
+                    },
+                    extraHTTPHeaders: {
+                        'Accept-Language': DEFAULT_FINGERPRINT_PROFILE.acceptLanguage
+                    }
                 }
             }
         };
@@ -571,7 +618,7 @@ class PlaywrightPlugin {
     }
 
     async waitForPort(port) {
-        for (let i = 0; i < 30; i += 1) {
+        for (let i = 0; i < 60; i += 1) {
             // eslint-disable-next-line no-await-in-loop
             if (await this.portReady(port)) {
                 return true;
@@ -597,13 +644,14 @@ class PlaywrightPlugin {
 
         if (sceneName === 'cont-headed') {
             const envKey = this.config.vncPasswordEnvKey;
-            const password = process.env[envKey];
-            if (!password && requireVncPassword) {
-                throw new Error(`${envKey} is required for cont-headed`);
+            let password = process.env[envKey];
+            if (!password) {
+                password = this.randomAlnum(16);
+                if (requireVncPassword) {
+                    this.writeStdout(`[up] cont-headed ${envKey} not set; generated random 16-char password: ${password}`);
+                }
             }
-            // podman-compose resolves ${VNC_PASSWORD:?..} even for `down`.
-            // Keep `up` strict, but use a non-empty placeholder for non-up actions.
-            env.VNC_PASSWORD = password || '__MANYOYO_PLACEHOLDER__';
+            env.VNC_PASSWORD = password;
         }
 
         return env;
@@ -784,8 +832,8 @@ class PlaywrightPlugin {
         return cp.returncode === 0 ? 0 : 1;
     }
 
-    spawnHostProcess(cfgPath, logFd) {
-        return spawn('npx', [`@playwright/mcp@${this.config.npmVersion}`, '--config', String(cfgPath)], {
+    spawnHostProcess(mcpBinPath, cfgPath, logFd) {
+        return spawn(mcpBinPath, ['--config', String(cfgPath)], {
             detached: true,
             stdio: ['ignore', logFd, logFd]
         });
@@ -843,14 +891,10 @@ class PlaywrightPlugin {
     }
 
     async startHost(sceneName, options = {}) {
-        if (!this.ensureCommandAvailable('npx')) {
-            this.writeStderr(`[up] ${sceneName} failed: npx command not found.`);
-            return 1;
-        }
-
         try {
             this.ensureHostScenePrerequisites(sceneName);
         } catch (error) {
+            this.writeStderr(`[up] ${sceneName} failed: ${error.message || String(error)}`);
             return error.returncode || 1;
         }
 
@@ -874,7 +918,16 @@ class PlaywrightPlugin {
 
         fs.rmSync(pidFile, { force: true });
         const logFd = fs.openSync(logFile, 'a');
-        const starter = this.spawnHostProcess(cfgPath, logFd);
+        let mcpBinPath = '';
+        try {
+            mcpBinPath = this.localBinPath('playwright-mcp');
+        } catch (error) {
+            fs.closeSync(logFd);
+            this.writeStderr(`[up] ${sceneName} failed: ${error.message || String(error)}`);
+            return 1;
+        }
+
+        const starter = this.spawnHostProcess(mcpBinPath, cfgPath, logFd);
         fs.closeSync(logFd);
         if (typeof starter.unref === 'function') {
             starter.unref();

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@xcanwin/manyoyo",
-    "version": "5.1.5",
+    "version": "5.1.8",
     "imageVersion": "1.8.1-common",
     "description": "AI Agent CLI Security Sandbox for Docker and Podman",
     "keywords": [
@@ -53,10 +53,12 @@
         "config.example.json"
     ],
     "dependencies": {
+        "@playwright/mcp": "0.0.68",
         "@xterm/addon-fit": "^0.11.0",
         "@xterm/xterm": "^6.0.0",
         "commander": "^12.0.0",
         "json5": "^2.2.3",
+        "playwright": "1.58.2",
         "ws": "^8.19.0"
     },
     "devDependencies": {