listpage_cli 0.0.294 → 0.0.296

package/bin/services/config-value-utils.js

@@ -0,0 +1,44 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.asObject = asObject;
+exports.asOptionalObject = asOptionalObject;
+exports.asRequiredString = asRequiredString;
+exports.asRequiredNumber = asRequiredNumber;
+exports.asOptionalString = asOptionalString;
+function asObject(value, fieldName) {
+    if (!value || typeof value !== "object" || Array.isArray(value)) {
+        throw new Error(`缺少对象字段: ${fieldName}`);
+    }
+    return value;
+}
+function asOptionalObject(value) {
+    if (!value || typeof value !== "object" || Array.isArray(value)) {
+        return undefined;
+    }
+    return value;
+}
+function asRequiredString(value, fieldName) {
+    if (typeof value === "string" && value.trim() !== "") {
+        return value.trim();
+    }
+    throw new Error(`缺少字段: ${fieldName}`);
+}
+function asRequiredNumber(value, fieldName) {
+    if (typeof value === "number" && Number.isFinite(value)) {
+        return value;
+    }
+    if (typeof value === "string" && value.trim() !== "") {
+        const parsed = Number(value);
+        if (Number.isFinite(parsed)) {
+            return parsed;
+        }
+    }
+    throw new Error(`字段类型无效: ${fieldName} (需要 number)`);
+}
+function asOptionalString(value) {
+    if (typeof value !== "string") {
+        return undefined;
+    }
+    const normalized = value.trim();
+    return normalized === "" ? undefined : normalized;
+}

package/bin/services/deploy-project-service.js

@@ -0,0 +1,390 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.runDeployProjectFlow = runDeployProjectFlow;
+const command_result_1 = require("../domain/command-result");
+const config_loader_1 = require("./config-loader");
+const dockerode_client_1 = require("../adapters/dockerode-client");
+const config_value_utils_1 = require("./config-value-utils");
+const DEPLOY_STAGE = "deploy";
+const ANSI = {
+    reset: "\u001b[0m",
+    dim: "\u001b[2m",
+    red: "\u001b[31m",
+    green: "\u001b[32m",
+    yellow: "\u001b[33m",
+    blue: "\u001b[34m",
+    magenta: "\u001b[35m",
+    cyan: "\u001b[36m",
+};
+const USE_COLOR = process.env.NO_COLOR === undefined;
+const CONFIG_ERROR_CODE_MAP = {
+    CONFIG_NOT_FOUND: "E_CONFIG_NOT_FOUND",
+    CONFIG_READ_FAILED: "E_CONFIG_READ_FAILED",
+    CONFIG_INVALID_JSON: "E_CONFIG_INVALID_JSON",
+    CONFIG_REQUIRED_FIELD_MISSING: "E_CONFIG_REQUIRED_FIELD_MISSING",
+};
+async function runDeployProjectFlow(deps) {
+    const projectRoot = deps.fs.cwd();
+    const configPath = (0, config_loader_1.getDefaultConfigPath)(projectRoot, deps.fs.join);
+    let configResult;
+    try {
+        configResult = (0, config_loader_1.loadProjectConfig)({
+            readText: deps.fs.readText,
+        }, configPath);
+    }
+    catch (error) {
+        if (error instanceof config_loader_1.ConfigLoaderError) {
+            return (0, command_result_1.commandError)(error.message, CONFIG_ERROR_CODE_MAP[error.code], 1);
+        }
+        const message = error instanceof Error ? error.message : String(error);
+        return (0, command_result_1.commandError)(message, command_result_1.COMMAND_ERROR_CODES.invalidPath, 1);
+    }
+    let executionInput;
+    try {
+        executionInput = resolveRuntimeConfig(configResult.config, deps.cliOverrides);
+        console.log(`[${DEPLOY_STAGE}][config]`, JSON.stringify(executionInput, null, 2));
+    }
+    catch (error) {
+        const message = error instanceof Error ? error.message : String(error);
+        return (0, command_result_1.commandError)(`[${DEPLOY_STAGE}][config] 部署配置无效: ${message}`, "E_CONFIG_REQUIRED_FIELD_MISSING", 1);
+    }
+    const createClient = deps.createDockerClient ?? dockerode_client_1.createDockerodeClient;
+    let client;
+    try {
+        client = createClient(executionInput.connection);
+        await client.ping();
+    }
+    catch (error) {
+        const message = error instanceof Error ? error.message : String(error);
+        return (0, command_result_1.commandError)(`[${DEPLOY_STAGE}][connect] Docker 连接失败: ${message}`, command_result_1.COMMAND_ERROR_CODES.executionFailed, 1);
+    }
+    if (deps.executeDeploy) {
+        try {
+            const result = await deps.executeDeploy({
+                projectRoot,
+                configPath: configResult.configPath,
+                config: configResult.config,
+                remoteImage: executionInput.remoteImage,
+                docker: executionInput.docker,
+                deploy: {
+                    ...executionInput.connection,
+                    containerName: executionInput.runtime.containerName,
+                    envFilePath: executionInput.runtime.envFilePath,
+                    env: executionInput.runtime.env,
+                    ports: executionInput.runtime.ports,
+                    binds: executionInput.runtime.binds,
+                    nanoCpus: executionInput.runtime.nanoCpus,
+                    memory: executionInput.runtime.memory,
+                },
+            });
+            return normalizeDeployResult(result);
+        }
+        catch (error) {
+            const message = error instanceof Error ? error.message : String(error);
+            return (0, command_result_1.commandError)(`[${DEPLOY_STAGE}] 部署执行异常: ${message}`, command_result_1.COMMAND_ERROR_CODES.executionFailed, 1);
+        }
+    }
+    return runDockerDeploy({
+        client,
+        projectRoot,
+        executionInput,
+        resolve: deps.fs.resolve,
+        readText: deps.fs.readText,
+    });
+}
+function resolveRuntimeConfig(config, cliOverrides) {
+    const typedConfig = config;
+    const dockerRaw = (0, config_value_utils_1.asObject)(typedConfig.docker, "docker");
+    const registry = (0, config_value_utils_1.asObject)(dockerRaw.registry, "docker.registry");
+    const imageName = (0, config_value_utils_1.asRequiredString)(dockerRaw.imageName, "docker.imageName");
+    const profileName = cliOverrides?.profile?.trim() || "dev";
+    const profile = resolveProfile(dockerRaw.releaseProfiles, profileName);
+    const imageTag = resolveImageTag(cliOverrides?.tag, (0, config_value_utils_1.asOptionalString)(profile.tag), (0, config_value_utils_1.asOptionalString)(dockerRaw.imageTag));
+    const containerConfig = resolveContainerConfig((dockerRaw.container ?? {}), profile, cliOverrides);
+    const remoteConfig = resolveRemoteConfig(dockerRaw.remote);
+    const registryUrl = (0, config_value_utils_1.asRequiredString)(registry.url, "docker.registry.url");
+    const registryNamespace = (0, config_value_utils_1.asOptionalString)(registry.namespace);
+    const registryUsername = (0, config_value_utils_1.asOptionalString)(registry.username);
+    const registryPassword = (0, config_value_utils_1.asOptionalString)(registry.password);
+    const repositoryPath = registryNamespace && registryNamespace !== ""
+        ? `${registryNamespace}/${imageName}`
+        : imageName;
+    const remoteImage = `${registryUrl}/${repositoryPath}:${imageTag}`;
+    const containerName = normalizeContainerName(containerConfig.name || `${imageName}:${imageTag}`);
+    if (!containerConfig.ports &&
+        (0, config_value_utils_1.asOptionalString)(dockerRaw.container?.port)) {
+        throw new Error("旧字段 docker.container.port 不再支持，请改用 docker.container.ports[]");
+    }
+    return {
+        remoteImage,
+        docker: {
+            imageName,
+            imageTag,
+            registryUrl,
+            registryNamespace,
+            registryUsername,
+            registryPassword,
+        },
+        connection: remoteConfig,
+        runtime: {
+            containerName,
+            envFilePath: containerConfig.envFile,
+            env: containerConfig.env,
+            cliEnv: cliOverrides?.env,
+            ports: containerConfig.ports,
+            binds: containerConfig.volumes,
+            nanoCpus: containerConfig.nanoCpus,
+            memory: containerConfig.memory,
+        },
+    };
+}
+async function runDockerDeploy(input) {
+    const { client, executionInput } = input;
+    const remoteImage = executionInput.remoteImage;
+    logDeployStep("run", `开始部署镜像: ${remoteImage}`);
+    try {
+        logDeployStep("run", `检查本地镜像是否存在: ${remoteImage}`);
+        const exists = await client.imageExists(remoteImage);
+        logDeployStep("run", `本地镜像检查结果: exists=${exists ? "yes" : "no"}`);
+        if (exists) {
+            logDeployStep("run", `删除旧镜像: ${remoteImage}`);
+            await client.removeImage(remoteImage);
+            logDeployStep("run", `旧镜像删除完成: ${remoteImage}`);
+        }
+    }
+    catch (error) {
+        return (0, command_result_1.commandError)(`[${DEPLOY_STAGE}][run] 清理镜像缓存失败: ${toErrorMessage(error)}`, command_result_1.COMMAND_ERROR_CODES.executionFailed, 1);
+    }
+    try {
+        const auth = buildPullAuth(executionInput.docker);
+        logDeployStep("run", `开始拉取镜像: ${remoteImage} (auth=${auth ? "yes" : "no"})`);
+        await client.pullImage(remoteImage, auth);
+        logDeployStep("run", `镜像拉取完成: ${remoteImage}`);
+    }
+    catch (error) {
+        return (0, command_result_1.commandError)(`[${DEPLOY_STAGE}][run] 拉取镜像失败: ${toErrorMessage(error)}`, command_result_1.COMMAND_ERROR_CODES.executionFailed, 1);
+    }
+    try {
+        logDeployStep("run", `检查已有容器: ${executionInput.runtime.containerName}`);
+        const existingContainerId = await client.findContainerIdByName(executionInput.runtime.containerName);
+        logDeployStep("run", `容器检查结果: existingContainerId=${existingContainerId ?? "none"}`);
+        if (existingContainerId) {
+            logDeployStep("run", `停止容器: ${existingContainerId}`);
+            await client.stopContainer(existingContainerId);
+            logDeployStep("run", `删除容器: ${existingContainerId}`);
+            await client.removeContainer(existingContainerId);
+            logDeployStep("run", `旧容器替换完成: ${existingContainerId}`);
+        }
+    }
+    catch (error) {
+        return (0, command_result_1.commandError)(`[${DEPLOY_STAGE}][run] 替换容器失败: ${toErrorMessage(error)}`, command_result_1.COMMAND_ERROR_CODES.executionFailed, 1);
+    }
+    let createContainerInput;
+    try {
+        createContainerInput = (0, dockerode_client_1.toRuntimeContainerInput)({
+            runtime: {
+                name: executionInput.runtime.containerName,
+                image: remoteImage,
+                projectRoot: input.projectRoot,
+                envFilePath: executionInput.runtime.envFilePath,
+                env: executionInput.runtime.env,
+                cliEnv: executionInput.runtime.cliEnv,
+                ports: executionInput.runtime.ports,
+                binds: executionInput.runtime.binds,
+                nanoCpus: executionInput.runtime.nanoCpus,
+                memory: executionInput.runtime.memory,
+            },
+            resolve: input.resolve,
+            readText: input.readText,
+        });
+        logDeployStep("run", `环境变量加载完成: count=${createContainerInput.env.length}`);
+    }
+    catch (error) {
+        return (0, command_result_1.commandError)(`[${DEPLOY_STAGE}][config] 环境变量文件无效: ${toErrorMessage(error)}`, "E_CONFIG_REQUIRED_FIELD_MISSING", 1);
+    }
+    try {
+        logDeployStep("run", `创建容器参数: ${JSON.stringify(createContainerInput)}`);
+        logDeployStep("run", `创建容器: name=${executionInput.runtime.containerName}, image=${remoteImage}`);
+        const containerId = await client.createContainer(createContainerInput);
+        logDeployStep("run", `容器创建完成: containerId=${containerId}`);
+        logDeployStep("run", `启动容器: ${containerId}`);
+        await client.startContainer(containerId);
+        logDeployStep("run", `容器启动完成: ${containerId}`);
+        const containerState = await client.inspectContainer(containerId);
+        logDeployStep("run", `容器状态: running=${containerState.running ?? "unknown"}, ` +
+            `status=${containerState.status ?? "unknown"}, ` +
+            `exitCode=${containerState.exitCode ?? "unknown"}, ` +
+            `health=${containerState.health ?? "unknown"}`);
+        logDeployStep("run", `容器端口映射: ${containerState.portMappings && containerState.portMappings.length > 0
+            ? containerState.portMappings.join(", ")
+            : "<none>"}`);
+        if (containerState.running === false) {
+            return (0, command_result_1.commandError)(`[${DEPLOY_STAGE}][run] 容器启动后已退出: ` +
+                `status=${containerState.status ?? "unknown"}, ` +
+                `exitCode=${containerState.exitCode ?? "unknown"}, ` +
+                `error=${containerState.error ?? "none"}`, command_result_1.COMMAND_ERROR_CODES.executionFailed, 1);
+        }
+        logDeployStep("run", `拉取容器启动日志: containerId=${containerId}, tail=100`);
+        try {
+            const startupLogs = await client.getContainerLogs(containerId, 100);
+            const trimmed = startupLogs.trim();
+            if (trimmed === "") {
+                logDeployStep("run", "容器启动日志为空");
+            }
+            else {
+                console.log(colorizeMultiline(`[${DEPLOY_STAGE}][container-logs]\n${trimmed}`));
+            }
+        }
+        catch (error) {
+            logDeployStep("run", `拉取容器启动日志失败(不影响部署结果): ${toErrorMessage(error)}`);
+        }
+    }
+    catch (error) {
+        return (0, command_result_1.commandError)(`[${DEPLOY_STAGE}][run] 创建或启动容器失败: ${toErrorMessage(error)}`, command_result_1.COMMAND_ERROR_CODES.executionFailed, 1);
+    }
+    return (0, command_result_1.commandOk)(`${colorizeDeployLine(`[${DEPLOY_STAGE}] 部署完成: ${remoteImage}`)}\n` +
+        `${colorizeDeployLine(`[${DEPLOY_STAGE}] 容器名称: ${executionInput.runtime.containerName}`)}`);
+}
+function buildPullAuth(docker) {
+    if (!docker.registryUsername || !docker.registryPassword) {
+        return undefined;
+    }
+    return {
+        username: docker.registryUsername,
+        password: docker.registryPassword,
+        serveraddress: docker.registryUrl,
+    };
+}
+function asOptionalNumber(value) {
+    if (typeof value === "number" && Number.isFinite(value)) {
+        return value;
+    }
+    if (typeof value === "string" && value.trim() !== "") {
+        const parsed = Number(value);
+        if (Number.isFinite(parsed)) {
+            return parsed;
+        }
+    }
+    return undefined;
+}
+function resolveProfile(profiles, profileName) {
+    const profile = profiles && typeof profiles === "object" && !Array.isArray(profiles)
+        ? profiles[profileName]
+        : undefined;
+    if (!profile) {
+        throw new Error(`缺少字段: docker.releaseProfiles.${profileName}`);
+    }
+    return profile;
+}
+function resolveImageTag(cliTag, profileTag, fallbackTag) {
+    const normalizedCli = cliTag?.trim();
+    if (normalizedCli) {
+        return normalizedCli;
+    }
+    if (profileTag && profileTag.trim() !== "") {
+        return profileTag;
+    }
+    if (fallbackTag && fallbackTag.trim() !== "") {
+        return fallbackTag;
+    }
+    throw new Error("缺少字段: docker.releaseProfiles.<profile>.tag");
+}
+function resolveContainerConfig(baseContainer, profile, cliOverrides) {
+    const containerOverrides = ((0, config_value_utils_1.asOptionalObject)(profile.containerOverrides) ??
+        {});
+    const mergedEnv = {
+        ...(baseContainer.env ?? {}),
+        ...(containerOverrides.env ?? {}),
+    };
+    const merged = {
+        ...baseContainer,
+        ...containerOverrides,
+        ...(Object.keys(mergedEnv).length > 0 ? { env: mergedEnv } : {}),
+    };
+    if (profile.envFile && profile.envFile.trim() !== "") {
+        merged.envFile = profile.envFile.trim();
+    }
+    if (cliOverrides?.env && Object.keys(cliOverrides.env).length > 0) {
+        merged.env = {
+            ...(merged.env ?? {}),
+            ...cliOverrides.env,
+        };
+    }
+    return merged;
+}
+function resolveRemoteConfig(remote) {
+    const remoteObj = ((0, config_value_utils_1.asOptionalObject)(remote) ?? {});
+    const protocol = (remoteObj.protocol ?? "https").toLowerCase();
+    if (!["http", "https"].includes(protocol)) {
+        throw new Error("docker.remote.protocol 仅支持 http 或 https");
+    }
+    return {
+        socketPath: (0, config_value_utils_1.asOptionalString)(remoteObj.socketPath),
+        host: (0, config_value_utils_1.asOptionalString)(remoteObj.host) ?? "127.0.0.1",
+        port: asOptionalNumber(remoteObj.port) ?? 2376,
+        protocol,
+        ca: (0, config_value_utils_1.asOptionalString)(remoteObj.tls?.ca),
+        cert: (0, config_value_utils_1.asOptionalString)(remoteObj.tls?.cert),
+        key: (0, config_value_utils_1.asOptionalString)(remoteObj.tls?.key),
+    };
+}
+function toErrorMessage(error) {
+    if (error instanceof Error) {
+        return error.message;
+    }
+    return String(error ?? "unknown");
+}
+function normalizeContainerName(raw) {
+    return raw.replace(/[^a-zA-Z0-9_.-]/g, "-");
+}
+function normalizeDeployResult(result) {
+    if (result.ok) {
+        if (result.exitCode === 0) {
+            return result;
+        }
+        return (0, command_result_1.commandError)(`[${DEPLOY_STAGE}] 部署执行器返回成功但退出码非零 (exit=${result.exitCode})`, command_result_1.COMMAND_ERROR_CODES.executionFailed, result.exitCode);
+    }
+    if (result.exitCode !== 0) {
+        return result;
+    }
+    return (0, command_result_1.commandError)(result.message ?? `[${DEPLOY_STAGE}] 部署执行器返回失败但退出码为 0`, result.errorCode ?? command_result_1.COMMAND_ERROR_CODES.executionFailed, 1);
+}
+function logDeployStep(stage, message) {
+    console.log(colorizeDeployLine(`[${DEPLOY_STAGE}][${stage}] ${message}`));
+}
+function colorizeDeployLine(line) {
+    if (!USE_COLOR || line.trim() === "") {
+        return line;
+    }
+    if (line.startsWith("[deploy][run]")) {
+        return wrapColor(line, ANSI.cyan);
+    }
+    if (line.startsWith("[deploy][container-logs]")) {
+        return wrapColor(line, ANSI.yellow);
+    }
+    if (line.startsWith("[deploy][config]")) {
+        return wrapColor(line, ANSI.blue);
+    }
+    if (line.startsWith("[deploy][connect]")) {
+        return wrapColor(line, ANSI.magenta);
+    }
+    if (line.startsWith("[deploy] 部署完成")) {
+        return wrapColor(line, ANSI.green);
+    }
+    if (line.startsWith("[deploy] 容器名称")) {
+        return wrapColor(line, ANSI.dim);
+    }
+    if (line.startsWith("[deploy]")) {
+        return wrapColor(line, ANSI.blue);
+    }
+    return line;
+}
+function colorizeMultiline(text) {
+    return text
+        .split("\n")
+        .map((line) => colorizeDeployLine(line))
+        .join("\n");
+}
+function wrapColor(text, color) {
+    return `${color}${text}${ANSI.reset}`;
+}

package/bin/services/filesystem-capability-service.js

@@ -1,7 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.createFilesystemCapabilityService = createFilesystemCapabilityService;
-const utils_1 = require("../utils");
+const package_name_1 = require("../domain/package-name");
+const json_with_comments_1 = require("../shared/json-with-comments");
 function createFilesystemCapabilityService(fs, options) {
     return {
         isDirEmpty: (dir) => {
@@ -15,40 +16,35 @@ function createFilesystemCapabilityService(fs, options) {
             const projects = [];
             if (feAppName) {
                 projects.push({
-                    packageName: (0, utils_1.composePkgName)(feAppName),
+                    packageName: (0, package_name_1.composePkgName)(feAppName),
                     projectFolder: `apps/${feAppName}`,
                     reviewCategory: "production",
                 });
             }
             if (beAppName) {
                 projects.push({
-                    packageName: (0, utils_1.composePkgName)(beAppName),
+                    packageName: (0, package_name_1.composePkgName)(beAppName),
                     projectFolder: `servers/${beAppName}`,
                     reviewCategory: "production",
                 });
             }
             const content = fs.readText(filepath);
-            const json = (0, utils_1.readJsonWithComments)(content);
+            const json = (0, json_with_comments_1.parseJsonWithComments)(content);
             json.projects = projects;
             fs.writeText(filepath, JSON.stringify(json, null, 2));
         },
         copyFrontendTemplate: (targetDir, vars) => {
-            const appName = (0, utils_1.composePkgName)(vars.FRONTEND_NAME);
+            const appName = (0, package_name_1.composePkgName)(vars.FRONTEND_NAME);
             const resolvedTargetDir = fs.join(targetDir, `apps/${appName}`);
             const source = getTemplateDir(fs, options.templateRootDir, "frontend");
             copyDir(fs, source, resolvedTargetDir, vars);
         },
         copyBackendTemplate: (targetDir, vars) => {
-            const appName = (0, utils_1.composePkgName)(vars.BACKEND_NAME);
+            const appName = (0, package_name_1.composePkgName)(vars.BACKEND_NAME);
             const resolvedTargetDir = fs.join(targetDir, `servers/${appName}`);
             const source = getTemplateDir(fs, options.templateRootDir, "backend");
             copyDir(fs, source, resolvedTargetDir, vars);
         },
-        copyDeployScriptTemplate: (targetDir, vars) => {
-            const resolvedTargetDir = fs.join(targetDir, "common", "scripts", "package-app");
-            const source = getTemplateDir(fs, options.templateRootDir, "package-app");
-            copyDir(fs, source, resolvedTargetDir, vars);
-        },
         copySkillDir: (sourceDir, targetDir) => {
             syncDirWithRename(fs, sourceDir, targetDir);
         },

package/bin/services/init-service.js

@@ -34,13 +34,6 @@ async function runInitRushFlow(deps, targetDir, projectName) {
         FRONTEND_NAME: frontendName,
     };
     deps.files.copyRushTemplate(targetDir, vars);
-    const installDeployScriptResult = await deps.prompts.askInstallDeployScript();
-    if (installDeployScriptResult.status !== "value") {
-        return mapInteractionToCommandResult(installDeployScriptResult, "部署脚本确认");
-    }
-    if (installDeployScriptResult.value) {
-        deps.files.copyDeployScriptTemplate(targetDir, vars);
-    }
     deps.files.updateRushJsonProjects(deps.fs.join(targetDir, "rush.json"), frontendName, backendName);
     if (frontendName) {
         deps.files.copyFrontendTemplate(targetDir, vars);