@cloudbase/manager-node 5.8.1 → 5.8.3

package/types/deploy/function/enterprise-tcr.d.ts

@@ -0,0 +1,32 @@
+import { INormalizedHttpCloudConfig, INormalizedHttpLocalConfig } from '../types';
+type EnterpriseBuildConfig = INormalizedHttpCloudConfig | INormalizedHttpLocalConfig;
+export interface ITcrApiService {
+    call: (options: {
+        Action: string;
+        Param: Record<string, unknown>;
+    }) => Promise<any>;
+}
+export interface IEnterpriseTcrTarget {
+    registryId: string;
+    registry: string;
+    namespace: string;
+    repository: string;
+    imageRepository: string;
+}
+export interface IEnterpriseTcrCredential {
+    username: string;
+    token: string;
+}
+export declare function prepareEnterpriseTcrTarget(config: EnterpriseBuildConfig, options: {
+    envId: string;
+    region: string;
+    service: ITcrApiService;
+}): Promise<{
+    config: EnterpriseBuildConfig;
+    target: IEnterpriseTcrTarget;
+}>;
+export declare function createEnterpriseTcrCredential(service: ITcrApiService, registryId: string): Promise<IEnterpriseTcrCredential>;
+export declare function createTcrApiService(environment: {
+    getCommonService: (serviceType: string, serviceVersion: string) => ITcrApiService;
+}): ITcrApiService;
+export {};

package/types/deploy/function/image-tag.d.ts

@@ -0,0 +1,10 @@
+export interface IResolveImageTagOptions {
+    explicitTag?: string;
+    cwd: string;
+    now?: () => number;
+    readGitShortSha?: (cwd: string) => Promise<string | undefined>;
+}
+/**
+ * 生成镜像 tag：显式配置优先，其次 Git short SHA，最后回退到毫秒时间戳。
+ */
+export declare function resolveImageTag(options: IResolveImageTagOptions): Promise<string>;

package/types/deploy/function/local-builder.d.ts

@@ -2,25 +2,54 @@ import { INormalizedHttpLocalConfig } from '../types';
 export interface ILocalBuildResult {
     imageUri: string;
     imageDigest?: string;
+    buildDurationMs: number;
+    pushDurationMs: number;
+    durationMs: number;
 }
 export interface IExecResult {
     ok: boolean;
     stdout: string;
     stderr: string;
 }
+export interface ILocalCommandOptions {
+    env?: NodeJS.ProcessEnv;
+    input?: string;
+}
 /** 可注入依赖：命令执行与文件系统检查 */
 export interface ILocalBuilderDeps {
-    runCommand: (command: string, args: string[]) => Promise<IExecResult>;
+    runCommand: (command: string, args: string[], options?: ILocalCommandOptions) => Promise<IExecResult>;
     existsSync: (target: string) => boolean;
     isDirectory: (target: string) => boolean;
     isFile: (target: string) => boolean;
 }
+/** 本地镜像构建阶段结果 */
+export interface ILocalImageBuildResult {
+    imageUri: string;
+    buildDurationMs: number;
+}
+export interface ILocalBuilderOptions {
+    deps?: ILocalBuilderDeps;
+    commandOptions?: ILocalCommandOptions;
+}
+/** 本地构建镜像，不执行推送。 */
+export declare function buildLocalImage(config: INormalizedHttpLocalConfig, onLog?: (line: string) => void, options?: ILocalBuilderOptions): Promise<ILocalImageBuildResult>;
+/** 推送已构建镜像，并尽力查询远端 digest。 */
+export declare function pushLocalImage(imageUri: string, onLog?: (line: string) => void, options?: ILocalBuilderOptions): Promise<{
+    imageDigest?: string;
+    pushDurationMs: number;
+}>;
+export declare function loginDockerRegistry(registry: string, credential: {
+    username: string;
+    secret: string;
+}, options?: ILocalBuilderOptions): Promise<void>;
+export declare function createTemporaryDockerConfig(): {
+    env: NodeJS.ProcessEnv;
+    cleanup: () => void;
+};
 /**
- * 本地构建镜像并推送到目标仓库
+ * 本地构建镜像并推送到目标仓库。
  *
- * @param config 规范化的 local 部署配置
- * @param onLog 可选日志回调，用于透出构建输出（不含凭证）
- * @param deps 可注入依赖，默认真实命令与 fs；测试可传 mock
- * @returns 最终镜像引用与 digest
+ * 保留组合入口以兼容已有调用；需要实时阶段进度的编排器应分别调用
+ * buildLocalImage 与 pushLocalImage。
  */
 export declare function buildAndPushImage(config: INormalizedHttpLocalConfig, onLog?: (line: string) => void, deps?: ILocalBuilderDeps): Promise<ILocalBuildResult>;

package/types/deploy/function/personal-tcr.d.ts

@@ -0,0 +1,35 @@
+import { Environment } from '../../environment';
+export declare const DEFAULT_PERSONAL_TCR_REGISTRY = "ccr.ccs.tencentyun.com";
+export interface IPersonalTcrService {
+    ensurePushTarget: (options: {
+        namespace: string;
+        repository: string;
+        ensureNamespace?: boolean;
+        ensureRepository?: boolean;
+    }) => Promise<void>;
+    cleanupTags: (options: {
+        namespace: string;
+        repository: string;
+        retain?: number;
+    }) => Promise<void>;
+}
+export declare class PersonalTcrService implements IPersonalTcrService {
+    private readonly request;
+    constructor(environment: Environment);
+    ensurePushTarget(options: {
+        namespace: string;
+        repository: string;
+        ensureNamespace?: boolean;
+        ensureRepository?: boolean;
+    }): Promise<void>;
+    cleanupTags(options: {
+        namespace: string;
+        repository: string;
+        retain?: number;
+    }): Promise<void>;
+    private namespaceExists;
+    private repositoryExists;
+    private createIgnoringExisting;
+    private listAllTags;
+}
+export declare function createPersonalTcrService(environment: Environment): IPersonalTcrService;

package/types/deploy/types.d.ts

@@ -22,7 +22,7 @@ export type DeployActionKind = 'create' | 'update' | 'replace' | 'noop';
 /** 部署计划中的细粒度操作 */
 export type DeployOperation = 'create-function' | 'update-code' | 'update-config' | 'replace-function' | 'configure-access' | 'configure-gateway';
 /** 统一进度阶段 */
-export type DeployStage = 'validate' | 'preflight' | 'plan' | 'pack' | 'upload' | 'build' | 'push' | 'deploy-function' | 'wait-active' | 'configure-access' | 'configure-gateway' | 'done';
+export type DeployStage = 'validate' | 'preflight' | 'plan' | 'pack' | 'upload' | 'login' | 'build' | 'push' | 'deploy-function' | 'wait-active' | 'configure-access' | 'configure-gateway' | 'done';
 /** 单项检查结论 */
 export type CheckStatus = 'pass' | 'warn' | 'fail';
 /**
@@ -94,6 +94,17 @@ export declare const FUNCTION_DEPLOY_ERROR: {
     readonly BUILD_ARG_INVALID: "BUILD_ARG_INVALID";
     readonly CLOUD_REGISTRY_CREDENTIAL_MISSING: "CLOUD_REGISTRY_CREDENTIAL_MISSING";
     readonly CLOUD_REGISTRY_CREDENTIAL_INVALID: "CLOUD_REGISTRY_CREDENTIAL_INVALID";
+    readonly TCR_REGION_MISSING: "TCR_REGION_MISSING";
+    readonly TCR_INSTANCE_DISCOVERY_FAILED: "TCR_INSTANCE_DISCOVERY_FAILED";
+    readonly TCR_INSTANCE_NOT_FOUND: "TCR_INSTANCE_NOT_FOUND";
+    readonly TCR_INSTANCE_AMBIGUOUS: "TCR_INSTANCE_AMBIGUOUS";
+    readonly TCR_INSTANCE_INVALID: "TCR_INSTANCE_INVALID";
+    readonly TCR_NAMESPACE_INVALID: "TCR_NAMESPACE_INVALID";
+    readonly TCR_NAMESPACE_QUERY_FAILED: "TCR_NAMESPACE_QUERY_FAILED";
+    readonly TCR_NAMESPACE_CREATE_FAILED: "TCR_NAMESPACE_CREATE_FAILED";
+    readonly TCR_TOKEN_CREATE_FAILED: "TCR_TOKEN_CREATE_FAILED";
+    readonly TCR_TOKEN_INVALID: "TCR_TOKEN_INVALID";
+    readonly TCR_DOCKER_LOGIN_FAILED: "TCR_DOCKER_LOGIN_FAILED";
     readonly GATEWAY_PATH_INVALID: "GATEWAY_PATH_INVALID";
     readonly LOCAL_FALLBACK_INVALID: "LOCAL_FALLBACK_INVALID";
     readonly PREFLIGHT_CODE_PATH_MISSING: "PREFLIGHT_CODE_PATH_MISSING";
@@ -243,7 +254,7 @@ export interface IHttpZipDeployConfig extends IHttpFunctionDeployCommon, ILocalC
      */
     installDependency?: boolean | 'TRUE' | 'FALSE';
 }
-/** 个人版 TCR 云端推送凭证，只能通过 CloudApp Secrets 传递密码。 */
+/** 个人版 TCR 推送凭证，local/cloud 均可使用。 */
 export interface IRegistryCredential {
     /** 腾讯云账号 ID（UIN），作为个人版 CCR 登录用户名 */
     username: string;
@@ -258,12 +269,14 @@ export interface IImageBuildTarget {
     dockerfile?: string;
     /** 目标镜像仓库实例 ID */
     registryId?: string;
-    /** 目标镜像命名空间；个人版 cloud 构建必填，推荐使用 {{env.TCB_TCR_NAMESPACE}} */
+    /**
+     * 目标镜像命名空间。personal local/cloud 优先使用显式配置；
+     * 缺省时使用当前 CloudBase envId。enterprise 可省略并由实例准备逻辑创建或复用。
+     */
     namespace?: string;
     /**
-     * 目标镜像仓库路径。
-     * personal cloud 可省略并默认使用函数名；enterprise cloud 在自动实例发现完成前需提供完整地址；
-     * local 策略当前需提供可直接 push 的完整 registry/namespace/repository 地址。
+     * 目标镜像仓库路径。local/cloud 均可省略并默认使用函数名；
+     * manager-node 会结合目标 registry 与 namespace 组装最终推送地址。
      */
     repository?: string;
     /** local 策略的目标镜像 tag；cloud 策略由平台生成，不接受自定义 tag */
@@ -272,10 +285,15 @@ export interface IImageBuildTarget {
     platform?: string;
     /** 构建参数，不得写入敏感值 */
     buildArgs?: Record<string, string>;
-    /** 个人版 TCR 云端推送凭证；personal + cloud 必填，推荐使用 {{env.*}} */
+    /**
+     * 个人版 TCR 推送凭证。personal local/cloud 必须由调用方显式提供；
+     * manager-node 仅使用该凭证登录，不创建用户、不修改远端密码，也不持久化凭证。
+     */
     registryCredential?: IRegistryCredential;
     /** 忽略同摘要镜像复用，强制重新构建 */
     forceBuild?: boolean;
+    /** 个人版 TCR 保留的最新镜像标签数量 */
+    retainedTags?: number;
 }
 /** HTTP 自定义镜像公共配置 */
 export interface IHttpImageRuntimeCommon extends IHttpFunctionDeployCommon {
@@ -413,16 +431,25 @@ export interface IFunctionDeployPlan {
 /** 单步执行结果 */
 export interface IDeployStepResult {
     stage: DeployStage;
+    /** 同一 stage 下的具体步骤名称，例如 Docker 环境检查、镜像仓库权限检查 */
+    label?: string;
     status: 'success' | 'skipped' | 'failed';
     /** 毫秒 */
     elapsedTime: number;
     detail?: string;
+    errorCode?: string;
 }
 /** 进度事件 */
 export interface IDeployProgressEvent {
     stage: DeployStage;
+    /** 同一 stage 下的具体步骤名称，例如 Docker 环境检查、镜像仓库权限检查 */
+    label?: string;
     status: 'start' | 'success' | 'skipped' | 'failed';
     message?: string;
+    /** 当前阶段耗时（毫秒），仅 success/failed 时提供 */
+    elapsedTime?: number;
+    errorCode?: string;
+    requestId?: string;
 }
 /** 部署结果 */
 export interface IFunctionDeployResult {
@@ -447,7 +474,6 @@ export interface IFunctionDeployResult {
     warnings: string[];
     plan: IFunctionDeployPlan;
 }
-/** 部署选项 */
 export interface IFunctionDeployOptions {
     /** 只生成计划，不执行任何变更 */
     dryRun?: boolean;

package/types/hosting/index.d.ts

@@ -229,6 +229,9 @@ export declare class HostingService {
     }>;
     /**
      * 查询域名状态信息
+     *
+     * 仅在 CDN 域名（domainType=cdn）或老环境（未返回 domainType）时调用 CDN 接口，
+     * 其他域名类型（gateway / eo 等）返回空结果
      * @param options
      */
     tcbCheckResource(options: ICheckSourceOptions): Promise<{
@@ -238,6 +241,9 @@ export declare class HostingService {
     }>;
     /**
      * 域名配置变更
+     *
+     * 仅在 CDN 域名（domainType=cdn）或老环境（未返回 domainType）时调用 CDN 接口，
+     * 其他域名类型（gateway / eo 等）返回空结果
      * @param options
      */
     tcbModifyAttribute(options: IModifyOptions): Promise<{}>;
@@ -263,4 +269,11 @@ export declare class HostingService {
      * 将 cloudPath 转换成 cloudPath/ 形式
      */
     private getCloudKey;
+    /**
+     * 获取静态托管域名类型（cdn / gateway / eo）
+     *
+     * 后端通过 DescribeEnvInfo 返回 StaticStorages[0].DomainType，
+     * 仅 cdn 或空值（老环境）才允许调用 CDN 相关接口。
+     */
+    private getStorageDomainType;
 }

package/types/index.d.ts

@@ -6,6 +6,7 @@ import { AgentService } from './agent';
 import { StorageService } from './storage';
 import { DatabaseService } from './database';
 import { LogService } from './log';
+import { CloudApiRequestFn } from './context';
 import { CommonService } from './common';
 import { HostingService } from './hosting';
 import { Environment } from './environment';
@@ -34,6 +35,7 @@ interface CloudBaseConfig {
     envType?: string;
     useInternalEndpoint?: boolean;
     internalEndpointRegion?: string;
+    requestFn?: CloudApiRequestFn;
 }
 declare class CloudBase {
     private static cloudBase;
@@ -123,4 +125,7 @@ declare class CloudBase {
     getManagerConfig(): CloudBaseConfig;
     get isInternalEndpoint(): Boolean;
 }
+declare namespace CloudBase {
+    type RequestFn = CloudApiRequestFn;
+}
 export = CloudBase;

package/types/projectValidator/index.d.ts

@@ -5,8 +5,9 @@ export declare class ProjectValidator {
     private validateSchema;
     private validateEnvId;
     /**
-     * 个人版 TCR 的 username/password/namespace 必须在 cloudbaserc 中显式声明。
-     * ConfigParser 已先解析 {{env.*}}，因此这里同时承担缺失 env 值的前置校验。
+     * 个人版 TCR 的 username/password 必须在 cloudbaserc 中显式声明。
+     * namespace/repository 可省略，分别由部署器按 envId/函数名推导。
+     * ConfigParser 已先解析 {{env.*}}，因此这里同时承担缺失凭证 env 值的前置校验。
      */
     private validatePersonalRegistryConfig;
     private hasPersonalCloudFunction;

package/types/utils/cloud-api-request.d.ts

@@ -1,4 +1,4 @@
-import { CloudBaseContext } from '../context';
+import { CloudBaseContext, CloudApiRequestFn } from '../context';
 export declare class CloudService {
     service: string;
     version: string;
@@ -13,7 +13,8 @@ export declare class CloudService {
     payload: Record<string, any>;
     baseParams: Record<string, any>;
     cloudBaseContext: CloudBaseContext;
-    constructor(context: CloudBaseContext, service: string, version: string, baseParams?: Record<string, any>);
+    private requestFn?;
+    constructor(context: CloudBaseContext, service: string, version: string, baseParams?: Record<string, any>, requestFn?: CloudApiRequestFn);
     get baseUrl(): any;
     request<T extends {}>(action: string, data?: Record<string, any>, method?: 'POST' | 'GET'): Promise<T>;
     requestWithSign(): Promise<any>;