@xcanwin/manyoyo 8.6.0 → 8.6.2

package/lib/container-exec.js

@@ -129,4 +129,23 @@ function buildExecArgs(ctx, containerName, options = {}) {
     return { args, cleanup, invalid, containerId };
 }
 
-module.exports = { ID_LABEL, resolveContainerId, composeEnvLines, buildExecArgs };
+/**
+ * 读出一个容器 exec 时会拿到的合并后 env（managed → 环境变量文件 → box/env），只在宿主机上读文件、不进容器。
+ * 旧容器（没有状态目录）返回空对象。调用方只能挑非敏感字段（如 *_MODEL）展示，不要整份下发给前端。
+ * @returns {Record<string, string>}
+ */
+function readMergedEnv(ctx, containerName) {
+    const homeDir = ctx.homeDir || os.homedir();
+    const containerId = resolveContainerId(ctx.dockerExecArgs, containerName);
+    if (!containerId || !state.stateExists(homeDir, containerId)) return {};
+    const p = state.paths(homeDir, containerId);
+    const { lines } = composeEnvLines(readTextOrEmpty(p.managedEnv), readTextOrEmpty(p.env, true), [], state.envFileEntries(homeDir, containerId));
+    const env = {};
+    lines.forEach(line => {
+        const i = line.indexOf('=');
+        if (i > 0) env[line.slice(0, i)] = line.slice(i + 1);
+    });
+    return env;
+}
+
+module.exports = { ID_LABEL, resolveContainerId, composeEnvLines, buildExecArgs, readMergedEnv };

package/lib/web/container-manage.js

@@ -15,6 +15,21 @@ const { isBrowserBackground } = require('../browser-background');
 // 全部挂在全局认证网关之后；非只读请求由 handleWebApi 统一校验 X-Requested-With。
 const LEGACY_MESSAGE = '该容器创建于旧版本，重建后可用';
 
+// 本机可用于访问端口暴露的 IPv4 地址（绑定 0.0.0.0 时前端据此列出全部访问链接）；
+// 回环排第一，容器 / 虚拟网桥的地址对访问者没用，过滤掉
+const VIRTUAL_IFACE_RE = /^(docker|br-|veth|cni|podman|virbr|lo$)/;
+function listHostIps() {
+    const ips = ['127.0.0.1'];
+    const ifaces = os.networkInterfaces();
+    Object.keys(ifaces).forEach(name => {
+        if (VIRTUAL_IFACE_RE.test(name)) return;
+        (ifaces[name] || []).forEach(addr => {
+            if (addr.family === 'IPv4' && !addr.internal && !ips.includes(addr.address)) ips.push(addr.address);
+        });
+    });
+    return ips;
+}
+
 function isLoopbackBind(bind) {
     return bind === '127.0.0.1' || bind === '::1';
 }
@@ -191,6 +206,7 @@ function createContainerManageRoutes({ ctx, state, req, res, deps }) {
             policy,
             status: state_.readNetStatus(homeDir, target.id),
             forwards: getPortForwarder().list(target.id),
+            hostIps: listHostIps(),
             peers,
             derived,
             unrestricted: isUnrestricted(policy),