@xcanwin/manyoyo 8.6.12 → 8.7.0

package/bin/manyoyo.js

@@ -61,18 +61,14 @@ const {
     formatServeLogValue,
     getServeProcessSnapshot
 } = require('../lib/serve-log');
+const { formatNow, resolveQuickChatPath, expandTemplate } = require('../lib/name-template');
 const { version: BIN_VERSION, imageVersion: IMAGE_VERSION_DEFAULT } = require('../package.json');
 const IMAGE_VERSION_BASE = String(IMAGE_VERSION_DEFAULT || '1.0.0').split('-')[0];
 const IMAGE_VERSION_HELP_EXAMPLE = IMAGE_VERSION_DEFAULT || `${IMAGE_VERSION_BASE}-common`;
 
-// Helper function to format date like bash $(date +%m%d-%H%M)
+// {now} 与默认容器名用的时间：年月日-时分秒（命令行与网页共用 lib/name-template.js）
 function formatDate() {
-    const now = new Date();
-    const month = String(now.getMonth() + 1).padStart(2, '0');
-    const day = String(now.getDate()).padStart(2, '0');
-    const hour = String(now.getHours()).padStart(2, '0');
-    const minute = String(now.getMinutes()).padStart(2, '0');
-    return `${month}${day}-${hour}${minute}`;
+    return formatNow();
 }
 
 function detectCommandName() {
@@ -95,6 +91,7 @@ const CONFIG = {
 // Default configuration
 let CONTAINER_NAME = `my-${formatDate()}`;
 let HOST_PATH = process.cwd();
+let HOST_PATH_TEMPLATED = false;
 let CONTAINER_PATH = HOST_PATH;
 let IMAGE_NAME = "ghcr.io/xcanwin/manyoyo";
 let IMAGE_VERSION = IMAGE_VERSION_DEFAULT || `${IMAGE_VERSION_BASE}-common`;
@@ -159,11 +156,7 @@ function normalizeCommandSuffix(suffix) {
 }
 
 function resolveContainerNameTemplate(name) {
-    if (typeof name !== 'string') {
-        return name;
-    }
-    const nowValue = formatDate();
-    return name.replace(/\{now\}|\$\{now\}/g, nowValue);
+    return expandTemplate(name, { now: formatDate() }).value;
 }
 
 function pickConfigValue(...values) {
@@ -1598,6 +1591,7 @@ https://github.com/xcanwin/manyoyo
         isServerStopMode,
         pickConfigValue,
         resolveContainerNameTemplate,
+        templateVars: { now: formatDate(), quickChatPath: resolveQuickChatPath(config) },
         normalizeCommandSuffix,
         normalizeJsonEnvMap,
         normalizeCliEnvMap,
@@ -1608,6 +1602,7 @@ https://github.com/xcanwin/manyoyo
     });
 
     HOST_PATH = resolvedRuntime.hostPath;
+    HOST_PATH_TEMPLATED = resolvedRuntime.hostPathTemplated === true;
     CONTAINER_NAME = resolvedRuntime.containerName;
     CONTAINER_PATH = resolvedRuntime.containerPath;
     IMAGE_NAME = resolvedRuntime.imageName;
@@ -1827,6 +1822,7 @@ function createRuntimeContext(modeState = {}) {
     return {
         containerName: CONTAINER_NAME,
         hostPath: HOST_PATH,
+        hostPathTemplated: HOST_PATH_TEMPLATED,
         containerPath: CONTAINER_PATH,
         imageName: IMAGE_NAME,
         imageVersion: IMAGE_VERSION,
@@ -1877,6 +1873,10 @@ function handleRemoveContainer(runtime) {
 }
 
 function validateHostPath(runtime) {
+    // 目录是按模板（{now} / {quickChatPath}）生成的：此刻才建，只在真的要用它的时候建
+    if (runtime.hostPathTemplated && !fs.existsSync(runtime.hostPath)) {
+        fs.mkdirSync(runtime.hostPath, { recursive: true });
+    }
     if (!fs.existsSync(runtime.hostPath)) {
         console.log(`${RED}⚠️  错误: 宿主机路径不存在: ${runtime.hostPath}${NC}`);
         process.exit(1);

package/lib/container-network.js

@@ -701,5 +701,6 @@ module.exports = {
     parseHostsAndResolv,
     parseUrlHostPort,
     isHostTarget,
+    isMissingImageError,
     createNetworkManager
 };

package/lib/name-template.js

@@ -0,0 +1,52 @@
+'use strict';
+
+const os = require('os');
+const path = require('path');
+
+// 配置里 containerName / hostPath / containerPath 的占位符，命令行与网页共用这一个展开函数：
+//   {now}（也认 ${now}）→ 年月日-时分秒，如 20261024-230915
+//   {quickChatPath}      → 快捷对话目录（serve.quickChat.path），没配置就是默认工作目录 ~/.manyoyo/work
+const NOW_TOKEN = /\{now\}|\$\{now\}/g;
+const QUICK_CHAT_PATH_TOKEN = /\{quickChatPath\}/g;
+
+function formatNow(date = new Date()) {
+    const pad = value => String(value).padStart(2, '0');
+    return `${date.getFullYear()}${pad(date.getMonth() + 1)}${pad(date.getDate())}-${pad(date.getHours())}${pad(date.getMinutes())}${pad(date.getSeconds())}`;
+}
+
+function expandHome(value, homeDir = os.homedir()) {
+    const text = String(value || '').trim();
+    if (text === '~') return homeDir;
+    if (text.startsWith('~/')) return path.join(homeDir, text.slice(2));
+    return text;
+}
+
+/** 快捷对话目录的绝对路径（去掉末尾斜杠）；没配置返回 defaultDir */
+function resolveQuickChatPath(config, { homeDir = os.homedir(), defaultDir = path.join(os.homedir(), '.manyoyo', 'work') } = {}) {
+    const quickChat = config && config.serve && typeof config.serve === 'object' ? config.serve.quickChat : null;
+    const raw = quickChat && typeof quickChat.path === 'string' ? quickChat.path.trim() : '';
+    if (!raw) return defaultDir;
+    const resolved = path.resolve(expandHome(raw, homeDir));
+    return resolved;
+}
+
+/**
+ * 展开占位符。返回 { value, templated }：templated 表示原文里确实有占位符
+ * （调用方据此决定要不要替用户建目录：只有按模板生成的目录才自动建）。
+ */
+function expandTemplate(value, vars = {}) {
+    if (typeof value !== 'string') return { value, templated: false };
+    const now = vars.now === undefined ? formatNow() : vars.now;
+    let templated = false;
+    let result = value.replace(NOW_TOKEN, () => {
+        templated = true;
+        return now;
+    });
+    result = result.replace(QUICK_CHAT_PATH_TOKEN, () => {
+        templated = true;
+        return String(vars.quickChatPath || '').replace(/\/+$/, '');
+    });
+    return { value: result, templated };
+}
+
+module.exports = { formatNow, expandHome, resolveQuickChatPath, expandTemplate };

package/lib/runtime-resolver.js

@@ -1,6 +1,7 @@
 'use strict';
 
 const crypto = require('crypto');
+const { expandTemplate } = require('./name-template');
 
 function toArray(value) {
     return Array.isArray(value) ? value : (value ? [value] : []);
@@ -17,6 +18,8 @@ function resolveRuntimeConfig(options = {}) {
     const envVars = params.envVars || process.env;
     const pickConfigValue = params.pickConfigValue;
     const resolveContainerNameTemplate = params.resolveContainerNameTemplate;
+    // 占位符变量（{now} / {quickChatPath}）：一次解析里只取一个时间，容器名和目录用同一个时间戳
+    const templateVars = params.templateVars || null;
     const normalizeCommandSuffix = params.normalizeCommandSuffix;
     const normalizeJsonEnvMap = params.normalizeJsonEnvMap;
     const normalizeCliEnvMap = params.normalizeCliEnvMap;
@@ -29,18 +32,25 @@ function resolveRuntimeConfig(options = {}) {
     const isServerStopMode = params.isServerStopMode === true;
 
     let hostPath = pickConfigValue(cliOptions.hostPath, runConfig.hostPath, globalConfig.hostPath, defaults.hostPath) || defaults.hostPath;
+    let hostPathTemplated = false;
+    if (templateVars) {
+        const expanded = expandTemplate(hostPath, templateVars);
+        hostPath = expanded.value;
+        hostPathTemplated = expanded.templated;
+    }
     let containerName = defaults.containerName;
     const mergedContainerName = pickConfigValue(cliOptions.contName, runConfig.containerName, globalConfig.containerName);
     if (mergedContainerName) {
         containerName = mergedContainerName;
     }
-    containerName = resolveContainerNameTemplate(containerName);
+    containerName = templateVars ? expandTemplate(containerName, templateVars).value : resolveContainerNameTemplate(containerName);
 
     let containerPath = defaults.containerPath;
     const mergedContainerPath = pickConfigValue(cliOptions.contPath, runConfig.containerPath, globalConfig.containerPath);
     if (mergedContainerPath) {
         containerPath = mergedContainerPath;
     }
+    if (templateVars) containerPath = expandTemplate(containerPath, templateVars).value;
 
     const imageName = pickConfigValue(cliOptions.imageName, runConfig.imageName, globalConfig.imageName, defaults.imageName) || defaults.imageName;
     const imageVersion = pickConfigValue(cliOptions.imageVer, runConfig.imageVersion, globalConfig.imageVersion, defaults.imageVersion) || defaults.imageVersion;
@@ -182,6 +192,8 @@ function resolveRuntimeConfig(options = {}) {
 
     return {
         hostPath,
+        // 宿主机目录是按模板（{now} / {quickChatPath}）生成的：真正创建容器时才替用户建目录
+        hostPathTemplated,
         containerName,
         containerPath,
         imageName,