@cloudbase/manager-node 5.8.2 → 5.8.4

package/lib/deploy/FunctionDeployer.js

@@ -14,7 +14,7 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
     for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.IMAGE_PULL_GRANT_URL = exports.REQUIRED_IMAGE_PULL_POLICY = exports.SCF_PULL_IMAGE_ROLE = exports.isCamPermissionError = exports.runImagePullAuthPreflight = exports.runImageRemotePreflight = exports.runLocalPreflight = exports.createCloudBuildService = exports.buildImageOnCloud = exports.toCloudFunction = exports.createImageArtifactFromConfig = exports.createCodeArtifact = exports.toCurrentState = exports.createDeployPlan = exports.parseImageReference = exports.normalizeGatewayPath = exports.normalizeDeployConfig = exports.isCustomImageRuntime = exports.checkDeployConfig = exports.assertDeployConfig = exports.FunctionDeployer = void 0;
+exports.IMAGE_PULL_GRANT_URL = exports.REQUIRED_IMAGE_PULL_POLICY = exports.SCF_PULL_IMAGE_ROLE = exports.isCamPermissionError = exports.runImagePullAuthPreflight = exports.runImageRemotePreflight = exports.runLocalPreflight = exports.createCloudBuildService = exports.buildImageOnCloud = exports.toCloudFunction = exports.createImageArtifactFromConfig = exports.createCodeArtifact = exports.toCurrentState = exports.createDeployPlan = exports.parseImageReference = exports.normalizeGatewayPath = exports.normalizeDeployConfig = exports.isCustomImageRuntime = exports.prepareMinimalDeployConfig = exports.getMissingDeployInputs = exports.applyMinimalDeployConfigDefaults = exports.checkDeployConfig = exports.assertDeployConfig = exports.FunctionDeployer = void 0;
 const error_1 = require("../error");
 const artifact_1 = require("./function/artifact");
 const config_guard_1 = require("./function/config-guard");
@@ -26,6 +26,8 @@ const GatewayDeployer_1 = require("./GatewayDeployer");
 const domain_1 = require("./domain");
 const image_preflight_1 = require("./function/image-preflight");
 const local_builder_1 = require("./function/local-builder");
+const enterprise_tcr_1 = require("./function/enterprise-tcr");
+const personal_tcr_1 = require("./function/personal-tcr");
 const planner_1 = require("./function/planner");
 const preflight_1 = require("./function/preflight");
 const types_1 = require("./types");
@@ -41,16 +43,21 @@ const AUTHZ_USER_REGO_KEY = 'authz.user.rego';
  *
  * 已支持代码包、已有镜像、云端构建、本地构建、匿名访问与网关路径收敛；
  * 函数类型、运行时或协议等创建期字段变化时不会自动删除函数，而是引导用户
- * 在控制台确认并手工删除后重新部署。local 企业版 TCR 等未实现能力会显式报错。
+ * 在控制台确认并手工删除后重新部署。
  */
 class FunctionDeployer {
     constructor(environment, deps) {
-        var _a;
+        var _a, _b, _c;
         this.environment = environment;
         this.functionService = environment.getFunctionService();
         this.imagePreflightDeps = deps === null || deps === void 0 ? void 0 : deps.imagePreflightDeps;
         this.cloudBuildServiceFactory =
             (_a = deps === null || deps === void 0 ? void 0 : deps.cloudBuildServiceFactory) !== null && _a !== void 0 ? _a : (() => (0, cloud_build_service_1.createCloudBuildService)(this.environment.getCloudAppService()));
+        this.localBuilderDeps = deps === null || deps === void 0 ? void 0 : deps.localBuilderDeps;
+        this.tcrServiceFactory =
+            (_b = deps === null || deps === void 0 ? void 0 : deps.tcrServiceFactory) !== null && _b !== void 0 ? _b : (() => (0, enterprise_tcr_1.createTcrApiService)(this.environment));
+        this.personalTcrServiceFactory =
+            (_c = deps === null || deps === void 0 ? void 0 : deps.personalTcrServiceFactory) !== null && _c !== void 0 ? _c : (() => (0, personal_tcr_1.createPersonalTcrService)(this.environment));
     }
     /**
      * 兼容既有声明式部署入口
@@ -88,7 +95,12 @@ class FunctionDeployer {
             return;
         }
         const rule = this.buildPublicAccessRego(functionName);
-        const mergedRego = currentRego.trim() ? `${currentRego.trim()}\n\n${rule}` : rule;
+        // 云端 Rego 校验器要求首条有效语句（注释不计）必须是 package 声明。
+        // currentRego 非空时已含 package authz.user，直接追加规则体即可；
+        // 为空（新环境首次配置）时需补齐 package 声明，否则触发 2:1: package expected。
+        const mergedRego = currentRego.trim()
+            ? `${currentRego.trim()}\n\n${rule}`
+            : `package authz.user\n\n${rule}`;
         await permissionService.modifyEnvAuthzConfig({
             key: AUTHZ_USER_REGO_KEY,
             value: mergedRego
@@ -169,6 +181,24 @@ class FunctionDeployer {
     checkConfig(config) {
         return (0, config_guard_1.checkDeployConfig)(config);
     }
+    /**
+     * 计算最小化部署配置的默认值，不执行网络或云端变更。
+     */
+    applyMinimalConfigDefaults(config, context = {}) {
+        return (0, config_guard_1.applyMinimalDeployConfigDefaults)(config, context);
+    }
+    /**
+     * 返回最小化配置仍缺失的字段，不执行网络或云端变更。
+     */
+    getMissingConfigInputs(config, context = {}) {
+        return (0, config_guard_1.getMissingDeployInputs)(config, context);
+    }
+    /**
+     * 应用安全默认值并返回缺失字段，供 CLI/MCP 逐步收集用户输入。
+     */
+    prepareMinimalConfig(config, context = {}) {
+        return (0, config_guard_1.prepareMinimalDeployConfig)(config, context);
+    }
     /**
      * 生成部署计划
      *
@@ -195,13 +225,14 @@ class FunctionDeployer {
      * @param options 部署选项，dryRun 时只生成计划不做任何变更
      */
     async deployFunction(config, options = {}) {
+        const deployConfig = config;
         const startTime = Date.now();
         const ctx = { steps: [], options };
         const warnings = [];
-        const report = (0, config_guard_1.checkDeployConfig)(config);
+        const report = (0, config_guard_1.checkDeployConfig)(deployConfig);
         this.appendWarnings(warnings, report);
         const normalized = await this.runStep(ctx, 'validate', async () => {
-            return (0, config_guard_1.assertDeployConfig)(config);
+            return (0, config_guard_1.assertDeployConfig)(deployConfig);
         });
         const plan = await this.runStep(ctx, 'plan', async () => {
             const current = await this.getCurrentFunction(normalized.name, normalized.codeSecret);
@@ -214,27 +245,52 @@ class FunctionDeployer {
                 steps: ctx.steps,
                 warnings,
                 startTime,
-                dryRun: true
+                dryRun: true,
+                options
             });
         }
         // 不可原地更新的变更必须在任何可能产生副作用的 Preflight 之前中止。
         // 尤其避免镜像拉取授权自动补齐等云端写操作先发生，再提示用户手工删除函数。
         this.assertPlanExecutable(plan);
-        await this.runStep(ctx, 'preflight', async () => {
-            const report = (0, preflight_1.runLocalPreflight)(normalized);
-            this.appendWarnings(warnings, report);
-            this.assertPreflightReady(report);
-        });
-        await this.runStep(ctx, 'preflight', async () => {
-            const report = await (0, cam_preflight_1.runImagePullAuthPreflight)(this.createCamPreflightAdapter(), normalized, options.autoGrant !== false);
-            this.appendWarnings(warnings, report);
-            this.assertPreflightReady(report);
-        });
-        await this.runStep(ctx, 'preflight', async () => {
-            const report = await (0, image_preflight_1.runImageRemotePreflight)(normalized, this.resolveDeployRegion(), this.imagePreflightDeps);
-            this.appendWarnings(warnings, report);
-            this.assertPreflightReady(report);
-        });
+        if (normalized.type === 'HTTP' &&
+            (normalized.buildStrategy === 'cloud' || normalized.buildStrategy === 'zip')) {
+            await this.runLabeledStep(ctx, {
+                stage: 'preflight',
+                handler: async () => {
+                    const report = (0, preflight_1.runLocalPreflight)(normalized);
+                    this.appendWarnings(warnings, report);
+                    this.assertPreflightReady(report);
+                },
+                label: normalized.buildStrategy === 'cloud'
+                    ? '检查云端构建上下文'
+                    : '检查函数代码包'
+            });
+        }
+        if (normalized.type === 'HTTP' &&
+            (normalized.buildStrategy === 'image' ||
+                normalized.buildStrategy === 'local' ||
+                normalized.buildStrategy === 'cloud')) {
+            await this.runLabeledStep(ctx, {
+                stage: 'preflight',
+                handler: async () => {
+                    const report = await (0, cam_preflight_1.runImagePullAuthPreflight)(this.createCamPreflightAdapter(), normalized, options.autoGrant !== false);
+                    this.appendWarnings(warnings, report);
+                    this.assertPreflightReady(report);
+                },
+                label: '检查镜像仓库访问权限'
+            });
+        }
+        if (normalized.type === 'HTTP' && normalized.buildStrategy === 'image') {
+            await this.runLabeledStep(ctx, {
+                stage: 'preflight',
+                handler: async () => {
+                    const report = await (0, image_preflight_1.runImageRemotePreflight)(normalized, this.resolveDeployRegion(), this.imagePreflightDeps);
+                    this.appendWarnings(warnings, report);
+                    this.assertPreflightReady(report);
+                },
+                label: '检查远端镜像与地域'
+            });
+        }
         // noop：函数本身无变更，但仍可能需要收敛访问配置
         if (plan.action === 'noop') {
             await this.applyAccessPlan(ctx, normalized, plan);
@@ -244,7 +300,8 @@ class FunctionDeployer {
                 steps: ctx.steps,
                 warnings,
                 startTime,
-                dryRun: false
+                dryRun: false,
+                options
             });
         }
         const artifact = await this.prepareArtifact(ctx, normalized, warnings);
@@ -257,6 +314,7 @@ class FunctionDeployer {
             warnings,
             startTime,
             dryRun: false,
+            options,
             artifact
         });
     }
@@ -264,7 +322,7 @@ class FunctionDeployer {
      * 将既有声明式调用补齐为完整部署配置
      */
     withLegacyDeployContext(func, functionRootPath, functionPath) {
-        var _a, _b;
+        var _a, _b, _c, _d, _e;
         const config = Object.assign({}, func);
         const strategy = this.resolveStrategy(config);
         if (functionPath) {
@@ -282,16 +340,14 @@ class FunctionDeployer {
                 (effectiveFunctionRootPath
                     ? `${effectiveFunctionRootPath}/${config.name}`
                     : undefined);
-            if (buildCwd || ((_a = config.build) === null || _a === void 0 ? void 0 : _a.cwd)) {
-                config.build = Object.assign(Object.assign({}, (config.build || {})), { cwd: ((_b = config.build) === null || _b === void 0 ? void 0 : _b.cwd) || buildCwd });
+            const existingCwd = (_b = (_a = config.imageConfig) === null || _a === void 0 ? void 0 : _a.build) === null || _b === void 0 ? void 0 : _b.cwd;
+            if (buildCwd || existingCwd) {
+                config.imageConfig = Object.assign(Object.assign({}, (config.imageConfig || {})), { build: Object.assign(Object.assign({}, (((_c = config.imageConfig) === null || _c === void 0 ? void 0 : _c.build) || {})), { cwd: existingCwd || buildCwd }) });
             }
         }
-        // 兼容旧声明式 imageUri 字段，统一转换到运行时 imageConfig 契约
-        if (strategy === 'image' && config.imageUri && !config.imageConfig) {
-            config.imageType = config.imageType || 'personal';
-            config.imageConfig = {
-                imageUri: config.imageUri
-            };
+        // 兼容旧声明式顶层 imageUri 字段，统一收敛到 imageConfig 契约
+        if (strategy === 'image' && config.imageUri && !((_d = config.imageConfig) === null || _d === void 0 ? void 0 : _d.imageUri)) {
+            config.imageConfig = Object.assign(Object.assign({ imageType: ((_e = config.imageConfig) === null || _e === void 0 ? void 0 : _e.imageType) || 'personal' }, (config.imageConfig || {})), { imageUri: config.imageUri });
             delete config.imageUri;
         }
         return config;
@@ -310,6 +366,21 @@ class FunctionDeployer {
             return undefined;
         }
     }
+    resolveEnvironmentId() {
+        try {
+            return this.environment.getEnvId();
+        }
+        catch (_a) {
+            return '';
+        }
+    }
+    requireDeployRegion() {
+        const region = this.resolveDeployRegion();
+        if (!region) {
+            throw new error_1.CloudBaseError('企业版 TCR 自动发现需要明确部署地域，请在环境配置中设置 region。', { code: types_1.FUNCTION_DEPLOY_ERROR.TCR_REGION_MISSING });
+        }
+        return region;
+    }
     /**
      * 构造镜像拉取授权 Preflight 所需的 CAM 适配器
      *
@@ -398,6 +469,66 @@ class FunctionDeployer {
                 '\n部署器不会自动删除已有云函数。请先在云开发控制台确认触发器、访问配置和服务中断影响，手工删除该函数后重新部署。', { code: types_1.FUNCTION_DEPLOY_ERROR.FUNCTION_RECREATE_REQUIRED });
         }
     }
+    async prepareEnterpriseBuildConfig(ctx, config) {
+        const build = config.imageConfig.build;
+        const repository = build.repository || '';
+        const hasPreparedTarget = Boolean((config.imageConfig.registryId || build.registryId) && repository.split('/').length >= 3);
+        if (config.imageConfig.imageType !== 'enterprise' || hasPreparedTarget) {
+            return { config };
+        }
+        const prepared = await this.runLabeledStep(ctx, {
+            stage: 'preflight',
+            label: '准备企业版 TCR 目标仓库',
+            handler: () => (0, enterprise_tcr_1.prepareEnterpriseTcrTarget)(config, {
+                envId: this.resolveEnvironmentId(),
+                region: this.requireDeployRegion(),
+                service: this.tcrServiceFactory()
+            })
+        });
+        return { config: prepared.config, target: prepared.target };
+    }
+    async preparePersonalBuildConfig(ctx, config) {
+        var _a, _b, _c;
+        if (config.imageConfig.imageType !== 'personal') {
+            return config;
+        }
+        const envId = this.resolveEnvironmentId();
+        const build = config.imageConfig.build;
+        const configuredNamespace = (_a = build.namespace) === null || _a === void 0 ? void 0 : _a.trim();
+        const hasConfiguredRepository = Boolean((_b = build.repository) === null || _b === void 0 ? void 0 : _b.trim());
+        const configuredRepository = ((_c = build.repository) === null || _c === void 0 ? void 0 : _c.trim()) || config.name;
+        const parsedRepository = (0, config_guard_1.parseImageReference)(configuredRepository);
+        if (!parsedRepository || parsedRepository.tag || parsedRepository.digest) {
+            throw new error_1.CloudBaseError('个人版 TCR repository 不合法。', {
+                code: types_1.FUNCTION_DEPLOY_ERROR.BUILD_REPOSITORY_INVALID
+            });
+        }
+        const repositoryParts = parsedRepository.repository.split('/');
+        const repository = repositoryParts[repositoryParts.length - 1];
+        const repositoryNamespace = repositoryParts.length > 1 ? repositoryParts.slice(0, -1).join('/') : undefined;
+        const namespace = configuredNamespace || repositoryNamespace || envId;
+        const hasConfiguredNamespace = Boolean(configuredNamespace || repositoryNamespace);
+        const registry = parsedRepository.registry || personal_tcr_1.DEFAULT_PERSONAL_TCR_REGISTRY;
+        const credential = build.registryCredential;
+        if (!(credential === null || credential === void 0 ? void 0 : credential.username) || !credential.password) {
+            throw new error_1.CloudBaseError('个人版 TCR 构建缺少推送凭证。', {
+                code: types_1.FUNCTION_DEPLOY_ERROR.CLOUD_REGISTRY_CREDENTIAL_MISSING
+            });
+        }
+        await this.runLabeledStep(ctx, {
+            stage: 'preflight',
+            label: '准备个人版 TCR 目标仓库',
+            handler: () => this.personalTcrServiceFactory().ensurePushTarget({
+                namespace,
+                repository,
+                ensureNamespace: !hasConfiguredNamespace,
+                ensureRepository: !hasConfiguredRepository
+            })
+        });
+        const targetRepository = `${registry}/${namespace}/${repository}`;
+        const preparedConfig = Object.assign(Object.assign({}, config), { imageConfig: Object.assign(Object.assign({}, config.imageConfig), { build: Object.assign(Object.assign({}, build), { namespace, repository: targetRepository, registryCredential: credential }) }) });
+        return preparedConfig;
+    }
     /**
      * 准备部署物
      *
@@ -406,8 +537,22 @@ class FunctionDeployer {
      * 其余策略走同步的 pack。
      */
     async prepareArtifact(ctx, config, warnings) {
+        var _a;
         if (config.buildStrategy === 'cloud') {
-            const cloudConfig = config;
+            const prepared = await this.prepareEnterpriseBuildConfig(ctx, config);
+            const cloudConfig = await this.preparePersonalBuildConfig(ctx, prepared.config);
+            // 企业版登录凭证在触发 CloudApp 构建前换取，构建容器只消费 Secrets，
+            // 不再自行签名调用 TCR API。
+            const cloudRegistryId = ((_a = prepared.target) === null || _a === void 0 ? void 0 : _a.registryId) ||
+                cloudConfig.imageConfig.build.registryId ||
+                cloudConfig.imageConfig.registryId;
+            const enterpriseCredential = cloudConfig.imageConfig.imageType === 'enterprise' && cloudRegistryId
+                ? await this.runLabeledStep(ctx, {
+                    stage: 'preflight',
+                    label: '获取企业版 TCR 临时登录凭证',
+                    handler: () => (0, enterprise_tcr_1.createEnterpriseTcrCredential)(this.tcrServiceFactory(), cloudRegistryId)
+                })
+                : undefined;
             const buildResult = await this.runStep(ctx, 'build', async () => {
                 const cloudBuildService = this.cloudBuildServiceFactory();
                 return (0, cloud_1.buildImageOnCloud)(cloudConfig, cloudBuildService, {
@@ -416,27 +561,100 @@ class FunctionDeployer {
                         status: 'start',
                         message: line
                     }),
-                    region: this.resolveDeployRegion()
+                    enterpriseCredential
                 });
             });
-            return (0, artifact_1.createImageArtifactFromCloudBuild)(config, buildResult);
+            return (0, artifact_1.createImageArtifactFromCloudBuild)(cloudConfig, buildResult);
         }
         if (config.buildStrategy === 'local') {
-            await this.runStep(ctx, 'preflight', async () => {
-                const report = await (0, docker_preflight_1.runDockerPreflight)();
-                this.appendWarnings(warnings, report);
-                this.assertPreflightReady(report);
+            await this.runLabeledStep(ctx, {
+                stage: 'preflight',
+                handler: async () => {
+                    const report = await (0, docker_preflight_1.runDockerPreflight)();
+                    this.appendWarnings(warnings, report);
+                    this.assertPreflightReady(report);
+                },
+                label: '检查本地 Docker 环境'
             });
-            const localConfig = config;
-            const buildResult = await this.runStep(ctx, 'build', async () => {
-                return (0, local_builder_1.buildAndPushImage)(localConfig, line => this.emitProgress(ctx.options, { stage: 'build', status: 'start', message: line }));
-            });
-            return (0, artifact_1.createImageArtifactFromBuild)(config, buildResult);
+            const prepared = await this.prepareEnterpriseBuildConfig(ctx, config);
+            const localConfig = await this.preparePersonalBuildConfig(ctx, prepared.config);
+            const credential = await this.resolveLocalRegistryCredential(localConfig);
+            const dockerConfig = credential ? (0, local_builder_1.createTemporaryDockerConfig)() : undefined;
+            const commandOptions = dockerConfig ? { env: dockerConfig.env } : undefined;
+            try {
+                if (credential) {
+                    await this.runStep(ctx, 'login', async () => {
+                        await (0, local_builder_1.loginDockerRegistry)(this.resolveRegistryFromRepository(localConfig.imageConfig.build.repository), credential, { deps: this.localBuilderDeps, commandOptions });
+                    });
+                }
+                const buildResult = await this.runStep(ctx, 'build', async () => {
+                    return (0, local_builder_1.buildLocalImage)(localConfig, line => this.emitProgress(ctx.options, {
+                        stage: 'build',
+                        status: 'start',
+                        message: line
+                    }), { deps: this.localBuilderDeps, commandOptions });
+                });
+                const pushResult = await this.runStep(ctx, 'push', async () => {
+                    return (0, local_builder_1.pushLocalImage)(buildResult.imageUri, line => this.emitProgress(ctx.options, {
+                        stage: 'push',
+                        status: 'start',
+                        message: line
+                    }), { deps: this.localBuilderDeps, commandOptions });
+                });
+                if (localConfig.imageConfig.imageType === 'personal') {
+                    await this.runLabeledStep(ctx, {
+                        stage: 'push',
+                        label: '清理历史镜像标签',
+                        handler: () => this.personalTcrServiceFactory().cleanupTags({
+                            namespace: localConfig.imageConfig.build.namespace,
+                            repository: localConfig.imageConfig.build.repository,
+                            retain: localConfig.imageConfig.build.retainedTags
+                        })
+                    });
+                }
+                return (0, artifact_1.createImageArtifactFromBuild)(localConfig, {
+                    imageUri: buildResult.imageUri,
+                    imageDigest: pushResult.imageDigest
+                });
+            }
+            finally {
+                dockerConfig === null || dockerConfig === void 0 ? void 0 : dockerConfig.cleanup();
+            }
         }
         return this.runStep(ctx, 'pack', async () => {
             return this.createArtifact(config);
         });
     }
+    async resolveLocalRegistryCredential(config) {
+        var _a, _b, _c;
+        const build = config.imageConfig.build;
+        const imageType = (_a = config.imageConfig.imageType) !== null && _a !== void 0 ? _a : (((_b = config.imageConfig.registryId) !== null && _b !== void 0 ? _b : build.registryId) ? 'enterprise' : 'personal');
+        if (imageType === 'enterprise') {
+            const registryId = (_c = config.imageConfig.registryId) !== null && _c !== void 0 ? _c : build.registryId;
+            if (!registryId) {
+                throw new error_1.CloudBaseError('企业版 TCR local 构建缺少 registryId。', {
+                    code: types_1.FUNCTION_DEPLOY_ERROR.IMAGE_REGISTRY_ID_MISSING
+                });
+            }
+            const credential = await (0, enterprise_tcr_1.createEnterpriseTcrCredential)(this.tcrServiceFactory(), registryId);
+            return { username: credential.username, secret: credential.token };
+        }
+        const credential = build.registryCredential;
+        if (!credential) {
+            return undefined;
+        }
+        return { username: credential.username, secret: credential.password };
+    }
+    resolveRegistryFromRepository(repository) {
+        const normalized = typeof repository === 'string' ? repository.trim() : '';
+        const slashIndex = normalized.indexOf('/');
+        if (slashIndex <= 0) {
+            throw new error_1.CloudBaseError('local 策略的目标镜像地址缺少仓库域名', {
+                code: types_1.FUNCTION_DEPLOY_ERROR.LOCAL_BUILD_REPOSITORY_MISSING
+            });
+        }
+        return normalized.slice(0, slashIndex);
+    }
     /** 生成部署物 */
     createArtifact(config) {
         if (config.buildStrategy === 'image') {
@@ -499,24 +717,53 @@ class FunctionDeployer {
             });
         }
     }
-    /** 执行单个步骤并记录耗时与进度 */
+    /** 执行普通步骤并记录耗时与进度 */
     async runStep(ctx, stage, handler) {
+        return this.executeStep(ctx, { stage, handler });
+    }
+    /** 执行带具体名称的步骤并记录耗时与进度 */
+    async runLabeledStep(ctx, options) {
+        return this.executeStep(ctx, options);
+    }
+    async executeStep(ctx, options) {
+        var _a, _b, _c, _d, _e;
+        const { stage, handler, label } = options;
         const startTime = Date.now();
-        this.emitProgress(ctx.options, { stage, status: 'start' });
+        this.emitProgress(ctx.options, { stage, label, status: 'start' });
         try {
             const result = await handler();
-            ctx.steps.push({ stage, status: 'success', elapsedTime: Date.now() - startTime });
-            this.emitProgress(ctx.options, { stage, status: 'success' });
+            const elapsedTime = Date.now() - startTime;
+            ctx.steps.push({ stage, label, status: 'success', elapsedTime });
+            this.emitProgress(ctx.options, { stage, label, status: 'success', elapsedTime });
             return result;
         }
         catch (error) {
+            const elapsedTime = Date.now() - startTime;
             ctx.steps.push({
                 stage,
+                label,
+                status: 'failed',
+                elapsedTime,
+                detail: error === null || error === void 0 ? void 0 : error.message,
+                errorCode: error === null || error === void 0 ? void 0 : error.code
+            });
+            this.emitProgress(ctx.options, {
+                stage,
+                label,
                 status: 'failed',
-                elapsedTime: Date.now() - startTime,
-                detail: error === null || error === void 0 ? void 0 : error.message
+                message: error === null || error === void 0 ? void 0 : error.message,
+                elapsedTime,
+                errorCode: error === null || error === void 0 ? void 0 : error.code,
+                requestId: (error === null || error === void 0 ? void 0 : error.requestId) ||
+                    (error === null || error === void 0 ? void 0 : error.RequestId) ||
+                    ((_a = error === null || error === void 0 ? void 0 : error.original) === null || _a === void 0 ? void 0 : _a.requestId) ||
+                    ((_b = error === null || error === void 0 ? void 0 : error.original) === null || _b === void 0 ? void 0 : _b.RequestId) ||
+                    ((_d = (_c = error === null || error === void 0 ? void 0 : error.original) === null || _c === void 0 ? void 0 : _c.Response) === null || _d === void 0 ? void 0 : _d.RequestId) ||
+                    ((_e = error === null || error === void 0 ? void 0 : error.response) === null || _e === void 0 ? void 0 : _e.RequestId)
             });
-            this.emitProgress(ctx.options, { stage, status: 'failed', message: error === null || error === void 0 ? void 0 : error.message });
+            if (error && !error.failedStage) {
+                error.failedStage = stage;
+            }
             throw error;
         }
     }
@@ -567,11 +814,19 @@ class FunctionDeployer {
         return result;
     }
     emitProgressDone(params) {
+        const elapsedTime = Date.now() - params.startTime;
         params.steps.push({
             stage: 'done',
             status: 'success',
-            elapsedTime: Date.now() - params.startTime
+            elapsedTime
         });
+        if (params.options) {
+            this.emitProgress(params.options, {
+                stage: 'done',
+                status: 'success',
+                elapsedTime
+            });
+        }
     }
 }
 exports.FunctionDeployer = FunctionDeployer;
@@ -579,6 +834,9 @@ __exportStar(require("./types"), exports);
 var config_guard_2 = require("./function/config-guard");
 Object.defineProperty(exports, "assertDeployConfig", { enumerable: true, get: function () { return config_guard_2.assertDeployConfig; } });
 Object.defineProperty(exports, "checkDeployConfig", { enumerable: true, get: function () { return config_guard_2.checkDeployConfig; } });
+Object.defineProperty(exports, "applyMinimalDeployConfigDefaults", { enumerable: true, get: function () { return config_guard_2.applyMinimalDeployConfigDefaults; } });
+Object.defineProperty(exports, "getMissingDeployInputs", { enumerable: true, get: function () { return config_guard_2.getMissingDeployInputs; } });
+Object.defineProperty(exports, "prepareMinimalDeployConfig", { enumerable: true, get: function () { return config_guard_2.prepareMinimalDeployConfig; } });
 Object.defineProperty(exports, "isCustomImageRuntime", { enumerable: true, get: function () { return config_guard_2.isCustomImageRuntime; } });
 Object.defineProperty(exports, "normalizeDeployConfig", { enumerable: true, get: function () { return config_guard_2.normalizeDeployConfig; } });
 Object.defineProperty(exports, "normalizeGatewayPath", { enumerable: true, get: function () { return config_guard_2.normalizeGatewayPath; } });

package/lib/deploy/StaticDeployer.js

@@ -73,7 +73,13 @@ class StaticDeployer {
         const hostingOptions = {
             localPath: outputDir,
             cloudPath,
-            ignore: config.ignore || ['.DS_Store']
+            ignore: config.ignore || ['.DS_Store'],
+            // 声明式配置名为 entryFile，透传到 uploadFiles 时对应 entryFiles
+            entryFiles: config.entryFile,
+            // 一致性发布开关：任一开启即走一致性上传（uploadDirectoryConsistent）
+            verify: config.verify,
+            safe: config.safe,
+            prune: config.prune
         };
         await this.environment.getHostingService().uploadFiles(hostingOptions);
         const url = await this.resolveHostingUrl(cloudPath);