@xcanwin/manyoyo 3.8.6 → 3.9.3

package/README.md

@@ -120,6 +120,8 @@ manyoyo -y oc         # OpenCode（或 opencode）
 manyoyo -l
 manyoyo -n myy-dev -x /bin/bash
 manyoyo -n myy-dev --crm
+manyoyo --server 3000
+manyoyo --server 3000 --server-user admin --server-pass 123456
 
 # 调试配置与命令拼装
 manyoyo --show-config

package/bin/manyoyo.js

@@ -12,6 +12,7 @@ const crypto = require('crypto');
 const readline = require('readline');
 const { Command } = require('commander');
 const JSON5 = require('json5');
+const { startWebServer } = require('../lib/web/server');
 const { version: BIN_VERSION, imageVersion: IMAGE_VERSION_BASE } = require('../package.json');
 
 // Helper function to format date like bash $(date +%m%d-%H%M)
@@ -57,6 +58,12 @@ let QUIET = {};
 let SHOW_COMMAND = false;
 let YES_MODE = false;
 let RM_ON_EXIT = false;
+let SERVER_MODE = false;
+let SERVER_PORT = 3000;
+let SERVER_AUTH_USER = "";
+let SERVER_AUTH_PASS = "";
+let SERVER_AUTH_PASS_AUTO = false;
+const SAFE_CONTAINER_NAME_PATTERN = /^[A-Za-z0-9][A-Za-z0-9_.-]*$/;
 
 // Color definitions using ANSI codes
 const RED = '\x1b[0;31m';
@@ -83,6 +90,37 @@ function normalizeCommandSuffix(suffix) {
     return trimmed ? ` ${trimmed}` : "";
 }
 
+function parseServerPort(rawPort) {
+    if (rawPort === true || rawPort === undefined || rawPort === null || rawPort === '') {
+        return 3000;
+    }
+
+    const value = String(rawPort).trim();
+    if (!/^\d+$/.test(value)) {
+        console.error(`${RED}⚠️  错误: --server 端口必须是 1-65535 的整数: ${rawPort}${NC}`);
+        process.exit(1);
+    }
+
+    const port = Number(value);
+    if (port < 1 || port > 65535) {
+        console.error(`${RED}⚠️  错误: --server 端口超出范围 (1-65535): ${rawPort}${NC}`);
+        process.exit(1);
+    }
+
+    return port;
+}
+
+function ensureWebServerAuthCredentials() {
+    if (!SERVER_AUTH_USER) {
+        SERVER_AUTH_USER = 'admin';
+    }
+
+    if (!SERVER_AUTH_PASS) {
+        SERVER_AUTH_PASS = crypto.randomBytes(12).toString('hex');
+        SERVER_AUTH_PASS_AUTO = true;
+    }
+}
+
 /**
  * 计算文件的 SHA256 哈希值（跨平台）
  * @param {string} filePath - 文件路径
@@ -101,7 +139,7 @@ function getFileSha256(filePath) {
  * @returns {Object} 脱敏后的配置对象
  */
 function sanitizeSensitiveData(obj) {
-    const sensitiveKeys = ['KEY', 'TOKEN', 'SECRET', 'PASSWORD', 'AUTH', 'CREDENTIAL'];
+    const sensitiveKeys = ['KEY', 'TOKEN', 'SECRET', 'PASSWORD', 'PASS', 'AUTH', 'CREDENTIAL'];
 
     function sanitizeValue(key, value) {
         if (typeof value !== 'string') return value;
@@ -264,6 +302,10 @@ function validateName(label, value, pattern) {
     }
 }
 
+function isValidContainerName(value) {
+    return typeof value === 'string' && SAFE_CONTAINER_NAME_PATTERN.test(value);
+}
+
 // ==============================================================================
 // SECTION: Environment Variables and Volume Handling
 // ==============================================================================
@@ -858,6 +900,8 @@ function setupCommander() {
   ${MANYOYO_NAME} -n test --ef ./myenv.env -y c       使用当前目录 ./myenv.env 环境变量文件
   ${MANYOYO_NAME} -n test -- -c                       恢复之前会话
   ${MANYOYO_NAME} -x echo 123                         指定命令执行
+  ${MANYOYO_NAME} --server --server-user admin --server-pass 123456   启动带登录认证的网页服务
+  ${MANYOYO_NAME} --server 3000                       启动网页交互服务
   ${MANYOYO_NAME} -n test -q tip -q cmd               多次使用静默选项
         `);
 
@@ -886,6 +930,9 @@ function setupCommander() {
         .option('--install <name>', '安装manyoyo命令 (docker-cli-plugin)')
         .option('--show-config', '显示最终生效配置并退出')
         .option('--show-command', '显示将执行的 docker run 命令并退出')
+        .option('--server [port]', '启动网页交互服务 (默认端口: 3000)')
+        .option('--server-user <username>', '网页服务登录用户名 (默认 admin)')
+        .option('--server-pass <password>', '网页服务登录密码 (默认自动生成随机密码)')
         .option('--yes', '所有提示自动确认 (用于CI/脚本)')
         .option('--rm-on-exit', '退出后自动删除容器 (一次性模式)')
         .option('-q, --quiet <item>', '静默显示 (可多次使用: cnew,crm,tip,cmd,full)', (value, previous) => [...(previous || []), value], []);
@@ -907,6 +954,11 @@ function setupCommander() {
         process.argv.splice(2, 1);
     }
 
+    // No args: show help instead of starting container
+    if (process.argv.length <= 2) {
+        program.help();
+    }
+
     // Ensure docker/podman is available
     ensureDocker();
 
@@ -950,7 +1002,7 @@ function setupCommander() {
     }
 
     // Basic name validation to reduce injection risk
-    validateName('containerName', CONTAINER_NAME, /^[A-Za-z0-9][A-Za-z0-9_.-]*$/);
+    validateName('containerName', CONTAINER_NAME, SAFE_CONTAINER_NAME_PATTERN);
     validateName('imageName', IMAGE_NAME, /^[A-Za-z0-9][A-Za-z0-9._/:-]*$/);
     validateName('imageVersion', IMAGE_VERSION, /^[A-Za-z0-9][A-Za-z0-9_.-]*$/);
 
@@ -1005,6 +1057,26 @@ function setupCommander() {
         RM_ON_EXIT = true;
     }
 
+    if (options.server !== undefined) {
+        SERVER_MODE = true;
+        SERVER_PORT = parseServerPort(options.server);
+    }
+
+    const serverUserValue = options.serverUser || runConfig.serverUser || config.serverUser || process.env.MANYOYO_SERVER_USER;
+    if (serverUserValue) {
+        SERVER_AUTH_USER = String(serverUserValue);
+    }
+
+    const serverPassValue = options.serverPass || runConfig.serverPass || config.serverPass || process.env.MANYOYO_SERVER_PASS;
+    if (serverPassValue) {
+        SERVER_AUTH_PASS = String(serverPassValue);
+        SERVER_AUTH_PASS_AUTO = false;
+    }
+
+    if (SERVER_MODE) {
+        ensureWebServerAuthCredentials();
+    }
+
     if (options.showConfig) {
         const finalConfig = {
             hostPath: HOST_PATH,
@@ -1022,6 +1094,10 @@ function setupCommander() {
             shellSuffix: EXEC_COMMAND_SUFFIX || "",
             yolo: yoloValue || "",
             quiet: quietValue || [],
+            server: SERVER_MODE,
+            serverPort: SERVER_MODE ? SERVER_PORT : null,
+            serverUser: SERVER_AUTH_USER || "",
+            serverPass: SERVER_AUTH_PASS || "",
             exec: {
                 prefix: EXEC_COMMAND_PREFIX,
                 shell: EXEC_COMMAND,
@@ -1287,6 +1363,50 @@ async function handlePostExit(defaultCommand) {
     }
 }
 
+// ==============================================================================
+// SECTION: Web Server
+// ==============================================================================
+
+async function runWebServerMode() {
+    ensureWebServerAuthCredentials();
+
+    await startWebServer({
+        serverPort: SERVER_PORT,
+        authUser: SERVER_AUTH_USER,
+        authPass: SERVER_AUTH_PASS,
+        authPassAuto: SERVER_AUTH_PASS_AUTO,
+        dockerCmd: DOCKER_CMD,
+        hostPath: HOST_PATH,
+        containerPath: CONTAINER_PATH,
+        imageName: IMAGE_NAME,
+        imageVersion: IMAGE_VERSION,
+        execCommandPrefix: EXEC_COMMAND_PREFIX,
+        execCommand: EXEC_COMMAND,
+        execCommandSuffix: EXEC_COMMAND_SUFFIX,
+        contModeArgs: CONT_MODE_ARGS,
+        containerEnvs: CONTAINER_ENVS,
+        containerVolumes: CONTAINER_VOLUMES,
+        validateHostPath,
+        formatDate,
+        isValidContainerName,
+        containerExists,
+        getContainerStatus,
+        waitForContainerReady,
+        dockerExecArgs,
+        showImagePullHint,
+        removeContainer,
+        webHistoryDir: path.join(os.homedir(), '.manyoyo', 'web-history'),
+        colors: {
+            RED,
+            GREEN,
+            YELLOW,
+            BLUE,
+            CYAN,
+            NC
+        }
+    });
+}
+
 // ==============================================================================
 // Main Function
 // ==============================================================================
@@ -1296,25 +1416,31 @@ async function main() {
         // 1. Setup commander and parse arguments
         setupCommander();
 
-        // 2. Handle image build operation
+        // 2. Start web server mode
+        if (SERVER_MODE) {
+            await runWebServerMode();
+            return;
+        }
+
+        // 3. Handle image build operation
         if (IMAGE_BUILD_NEED) {
             await buildImage(IMAGE_BUILD_ARGS, IMAGE_NAME, IMAGE_VERSION.split('-')[0]);
             process.exit(0);
         }
 
-        // 3. Handle remove container operation
+        // 4. Handle remove container operation
         handleRemoveContainer();
 
-        // 4. Validate host path safety
+        // 5. Validate host path safety
         validateHostPath();
 
-        // 5. Setup container (create or connect)
+        // 6. Setup container (create or connect)
         const defaultCommand = await setupContainer();
 
-        // 6. Execute command in container
+        // 7. Execute command in container
         executeInContainer(defaultCommand);
 
-        // 7. Handle post-exit interactions
+        // 8. Handle post-exit interactions
         await handlePostExit(defaultCommand);
 
     } catch (e) {

package/config.example.json

@@ -12,6 +12,8 @@
     "shell": "",
     "shellSuffix": "",
     "yolo": "",
+    "serverUser": "admin",
+    "serverPass": "change-this-password",
 
     // 合并型参数（配置文件和命令行会累加）
     "env": ["IS_SANDBOX=1"],

package/docker/manyoyo.Dockerfile

@@ -183,6 +183,9 @@ EOF
         mkdir -p ~/.codex
         cat > ~/.codex/config.toml <<EOF
 check_for_update_on_startup = false
+
+[analytics]
+enabled = false
 EOF
     ;; esac