@cloudbase/manager-node 5.8.2 → 5.8.4

package/lib/deploy/function/image-tag.js

@@ -0,0 +1,31 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.resolveImageTag = resolveImageTag;
+const child_process_1 = require("child_process");
+const util_1 = require("util");
+const execFileAsync = (0, util_1.promisify)(child_process_1.execFile);
+async function readGitShortSha(cwd) {
+    try {
+        const { stdout } = await execFileAsync('git', ['rev-parse', '--short=7', 'HEAD'], { cwd });
+        const sha = stdout.trim();
+        return /^[0-9a-f]{7}$/i.test(sha) ? sha.toLowerCase() : undefined;
+    }
+    catch (_) {
+        return undefined;
+    }
+}
+/**
+ * 生成镜像 tag：显式配置优先，其次 Git short SHA，最后回退到毫秒时间戳。
+ */
+async function resolveImageTag(options) {
+    var _a;
+    const explicitTag = (_a = options.explicitTag) === null || _a === void 0 ? void 0 : _a.trim();
+    if (explicitTag) {
+        return explicitTag;
+    }
+    const gitShortSha = await (options.readGitShortSha || readGitShortSha)(options.cwd);
+    if (gitShortSha) {
+        return gitShortSha;
+    }
+    return String((options.now || Date.now)());
+}

package/lib/deploy/function/local-builder.js

@@ -3,12 +3,18 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.buildLocalImage = buildLocalImage;
+exports.pushLocalImage = pushLocalImage;
+exports.loginDockerRegistry = loginDockerRegistry;
+exports.createTemporaryDockerConfig = createTemporaryDockerConfig;
 exports.buildAndPushImage = buildAndPushImage;
 const child_process_1 = require("child_process");
 const fs_1 = __importDefault(require("fs"));
+const os_1 = __importDefault(require("os"));
 const path_1 = __importDefault(require("path"));
 const error_1 = require("../../error");
 const types_1 = require("../types");
+const image_tag_1 = require("./image-tag");
 /**
  * 本地镜像构建与推送（local 策略，个人版先行版）
  *
@@ -24,15 +30,26 @@ const types_1 = require("../types");
 /** 构建/推送命令超时（毫秒），镜像构建较慢，给足时间 */
 const BUILD_TIMEOUT = 10 * 60 * 1000;
 /** 默认命令执行器：固定参数数组、无 shell、带超时与最大缓冲 */
-function defaultRunCommand(command, args) {
+function defaultRunCommand(command, args, options = {}) {
     return new Promise(resolve => {
-        (0, child_process_1.execFile)(command, args, { timeout: BUILD_TIMEOUT, shell: false, windowsHide: true, maxBuffer: 32 * 1024 * 1024 }, (error, stdout, stderr) => {
+        var _a, _b;
+        const child = (0, child_process_1.execFile)(command, args, {
+            timeout: BUILD_TIMEOUT,
+            shell: false,
+            windowsHide: true,
+            maxBuffer: 32 * 1024 * 1024,
+            env: options.env ? Object.assign(Object.assign({}, process.env), options.env) : process.env
+        }, (error, stdout, stderr) => {
             resolve({
                 ok: !error,
                 stdout: (stdout || '').toString(),
                 stderr: (stderr || '').toString()
             });
         });
+        if (options.input !== undefined) {
+            (_a = child.stdin) === null || _a === void 0 ? void 0 : _a.write(options.input);
+            (_b = child.stdin) === null || _b === void 0 ? void 0 : _b.end();
+        }
     });
 }
 /** 默认依赖：真实命令执行与 fs 检查 */
@@ -44,19 +61,19 @@ const defaultDeps = {
 };
 /** 解析构建上下文目录（绝对路径） */
 function resolveContext(config) {
-    const cwd = config.build.cwd || config.functionPath || process.cwd();
+    const cwd = config.imageConfig.build.cwd || config.functionPath || process.cwd();
     return path_1.default.resolve(cwd);
 }
 /** 解析目标镜像完整引用 imageUri（repository 需为含域名与命名空间的完整仓库地址，个人版/企业版通用） */
-function resolveImageUri(config) {
-    const repository = config.build.repository;
+async function resolveImageUri(config, context) {
+    const build = config.imageConfig.build;
+    const repository = build.repository;
     if (typeof repository !== 'string' || !repository.trim()) {
-        throw new error_1.CloudBaseError('local 策略缺少目标镜像仓库地址 build.repository', {
+        throw new error_1.CloudBaseError('local 策略缺少目标镜像仓库地址 imageConfig.build.repository', {
             code: types_1.FUNCTION_DEPLOY_ERROR.LOCAL_BUILD_REPOSITORY_MISSING
         });
     }
-    // tag 缺省用时间戳，避免 latest；不可变 tag 便于回溯
-    const tag = config.build.tag || `v${Date.now()}`;
+    const tag = await (0, image_tag_1.resolveImageTag)({ explicitTag: build.tag, cwd: context });
     return `${repository.trim()}:${tag}`;
 }
 /** 从 buildx imagetools inspect 输出解析 digest */
@@ -80,50 +97,179 @@ function formatBuildCommandForLog(args) {
     }
     return `docker ${displayArgs.join(' ')}`;
 }
-/**
- * 本地构建镜像并推送到目标仓库
- *
- * @param config 规范化的 local 部署配置
- * @param onLog 可选日志回调，用于透出构建输出（不含凭证）
- * @param deps 可注入依赖，默认真实命令与 fs；测试可传 mock
- * @returns 最终镜像引用与 digest
- */
-async function buildAndPushImage(config, onLog, deps = defaultDeps) {
+/** 本地构建镜像，不执行推送。 */
+async function buildLocalImage(config, onLog, options = {}) {
+    const deps = options.deps || defaultDeps;
+    const commandOptions = options.commandOptions || {};
     const context = resolveContext(config);
     if (!deps.existsSync(context) || !deps.isDirectory(context)) {
         throw new error_1.CloudBaseError(`构建上下文目录不存在：${context}`, {
             code: types_1.FUNCTION_DEPLOY_ERROR.LOCAL_BUILD_CONTEXT_MISSING
         });
     }
-    const dockerfile = config.build.dockerfile || types_1.DEFAULT_DOCKERFILE;
+    const dockerfile = config.imageConfig.build.dockerfile || types_1.DEFAULT_DOCKERFILE;
     const dockerfilePath = path_1.default.resolve(context, dockerfile);
     if (!deps.existsSync(dockerfilePath) || !deps.isFile(dockerfilePath)) {
         throw new error_1.CloudBaseError(`Dockerfile 不存在：${dockerfilePath}`, {
             code: types_1.FUNCTION_DEPLOY_ERROR.LOCAL_BUILD_DOCKERFILE_MISSING
         });
     }
-    const imageUri = resolveImageUri(config);
-    const platform = config.build.platform || types_1.DEFAULT_IMAGE_PLATFORM;
-    // 组装 buildx 参数：构建目标平台镜像并直接推送
-    const args = ['buildx', 'build', '--platform', platform, '-f', dockerfilePath, '-t', imageUri];
-    if (config.build.forceBuild) {
+    const imageUri = await resolveImageUri(config, context);
+    const platform = config.imageConfig.build.platform || types_1.DEFAULT_IMAGE_PLATFORM;
+    const args = [
+        'buildx',
+        'build',
+        '--platform',
+        platform,
+        '-f',
+        dockerfilePath,
+        '-t',
+        imageUri,
+        '--load'
+    ];
+    if (config.imageConfig.build.forceBuild) {
         args.push('--no-cache');
     }
-    // 追加构建参数（键值均作为独立参数，无 shell 拼接）
-    const buildArgs = config.build.buildArgs || {};
+    const buildArgs = config.imageConfig.build.buildArgs || {};
     for (const key of Object.keys(buildArgs)) {
         args.push('--build-arg', `${key}=${buildArgs[key]}`);
     }
-    args.push('--push', context);
+    args.push(context);
     onLog === null || onLog === void 0 ? void 0 : onLog(`执行 ${formatBuildCommandForLog(args)}`);
-    const build = await deps.runCommand('docker', args);
+    const buildStartedAt = Date.now();
+    const build = await deps.runCommand('docker', args, commandOptions);
+    const buildDurationMs = Date.now() - buildStartedAt;
     if (!build.ok) {
-        throw new error_1.CloudBaseError('镜像构建或推送失败，请查看 Docker 构建输出定位具体原因', {
-            code: types_1.FUNCTION_DEPLOY_ERROR.LOCAL_PUSH_FAILED
+        throw new error_1.CloudBaseError('镜像构建失败，请检查 Dockerfile、构建上下文和本地 Docker 输出。', {
+            code: types_1.FUNCTION_DEPLOY_ERROR.LOCAL_BUILD_FAILED
         });
     }
-    // 查询远端 digest，产出不可变引用
-    const inspect = await deps.runCommand('docker', ['buildx', 'imagetools', 'inspect', imageUri]);
+    return { imageUri, buildDurationMs };
+}
+/** 推送已构建镜像，并尽力查询远端 digest。 */
+async function pushLocalImage(imageUri, onLog, options = {}) {
+    const deps = options.deps || defaultDeps;
+    const commandOptions = options.commandOptions || {};
+    onLog === null || onLog === void 0 ? void 0 : onLog(`执行 docker push ${imageUri}`);
+    const pushStartedAt = Date.now();
+    const push = await deps.runCommand('docker', ['push', imageUri], commandOptions);
+    const pushDurationMs = Date.now() - pushStartedAt;
+    if (!push.ok) {
+        const authFailed = /unauthorized|authentication required|denied|no basic auth credentials/i.test(`${push.stdout}\n${push.stderr}`);
+        throw new error_1.CloudBaseError(authFailed
+            ? '镜像推送鉴权失败，请确认镜像仓库登录凭证有效，并且当前身份具备目标仓库写权限。'
+            : '镜像推送失败，请检查网络、镜像仓库地址和写入权限。', { code: types_1.FUNCTION_DEPLOY_ERROR.LOCAL_PUSH_FAILED });
+    }
+    const inspect = await deps.runCommand('docker', ['buildx', 'imagetools', 'inspect', imageUri], commandOptions);
     const imageDigest = inspect.ok ? parseDigest(inspect.stdout) : undefined;
-    return { imageUri, imageDigest };
+    if (!inspect.ok) {
+        onLog === null || onLog === void 0 ? void 0 : onLog('镜像已推送成功，但未能查询远端 digest，将继续使用镜像 tag 部署');
+    }
+    return { imageDigest, pushDurationMs };
+}
+function resolveRegistry(imageUri) {
+    const repositoryWithRegistry = imageUri.split('@')[0].replace(/:[^/:]+$/, '');
+    const slashIndex = repositoryWithRegistry.indexOf('/');
+    if (slashIndex <= 0) {
+        throw new error_1.CloudBaseError('local 策略的目标镜像地址缺少仓库域名', {
+            code: types_1.FUNCTION_DEPLOY_ERROR.LOCAL_BUILD_REPOSITORY_MISSING
+        });
+    }
+    return repositoryWithRegistry.slice(0, slashIndex);
+}
+async function loginDockerRegistry(registry, credential, options = {}) {
+    const deps = options.deps || defaultDeps;
+    const commandOptions = options.commandOptions || {};
+    const result = await deps.runCommand('docker', ['login', '--username', credential.username, '--password-stdin', registry], Object.assign(Object.assign({}, commandOptions), { input: credential.secret }));
+    if (!result.ok) {
+        throw new error_1.CloudBaseError('镜像仓库 Docker 登录失败，请检查登录凭证、仓库地址和访问权限。', {
+            code: types_1.FUNCTION_DEPLOY_ERROR.TCR_DOCKER_LOGIN_FAILED
+        });
+    }
+}
+function linkDockerState(sourceDir, targetDir, name) {
+    const source = path_1.default.join(sourceDir, name);
+    const target = path_1.default.join(targetDir, name);
+    if (!fs_1.default.existsSync(source)) {
+        return;
+    }
+    try {
+        fs_1.default.symlinkSync(source, target, 'junction');
+    }
+    catch (_a) {
+        // Docker 状态继承失败时继续使用已复制的基础配置，后续命令会返回稳定错误码
+    }
+}
+function copySanitizedDockerConfig(sourceDir, targetDir) {
+    const source = path_1.default.join(sourceDir, 'config.json');
+    if (!fs_1.default.existsSync(source)) {
+        return;
+    }
+    try {
+        const config = JSON.parse(fs_1.default.readFileSync(source, 'utf8'));
+        delete config.auths;
+        delete config.credsStore;
+        delete config.credHelpers;
+        fs_1.default.writeFileSync(path_1.default.join(targetDir, 'config.json'), JSON.stringify(config, null, 2), {
+            encoding: 'utf8',
+            mode: 0o600
+        });
+    }
+    catch (_a) {
+        // 配置不可读或格式异常时使用空配置，避免复制潜在认证信息
+    }
+}
+function createTemporaryDockerConfig() {
+    const sourceDir = process.env.DOCKER_CONFIG || path_1.default.join(os_1.default.homedir(), '.docker');
+    const configDir = fs_1.default.mkdtempSync(path_1.default.join(os_1.default.tmpdir(), 'tcb-docker-config-'));
+    copySanitizedDockerConfig(sourceDir, configDir);
+    ['cli-plugins', 'contexts', 'buildx'].forEach(name => linkDockerState(sourceDir, configDir, name));
+    return {
+        env: { DOCKER_CONFIG: configDir },
+        cleanup: () => {
+            try {
+                ;
+                fs_1.default.rmSync(configDir, { recursive: true, force: true });
+            }
+            catch (_a) {
+                // 临时登录态清理失败不覆盖部署主错误
+            }
+        }
+    };
+}
+/**
+ * 本地构建镜像并推送到目标仓库。
+ *
+ * 保留组合入口以兼容已有调用；需要实时阶段进度的编排器应分别调用
+ * buildLocalImage 与 pushLocalImage。
+ */
+async function buildAndPushImage(config, onLog, deps = defaultDeps) {
+    const startedAt = Date.now();
+    const credential = config.imageConfig.build.registryCredential;
+    const dockerConfig = credential ? createTemporaryDockerConfig() : undefined;
+    const commandOptions = dockerConfig ? { env: dockerConfig.env } : undefined;
+    try {
+        const { imageUri, buildDurationMs } = await buildLocalImage(config, onLog, {
+            deps,
+            commandOptions
+        });
+        if (credential) {
+            const registry = resolveRegistry(imageUri);
+            await loginDockerRegistry(registry, { username: credential.username, secret: credential.password }, { deps, commandOptions });
+        }
+        const { imageDigest, pushDurationMs } = await pushLocalImage(imageUri, onLog, {
+            deps,
+            commandOptions
+        });
+        return {
+            imageUri,
+            imageDigest,
+            buildDurationMs,
+            pushDurationMs,
+            durationMs: Date.now() - startedAt
+        };
+    }
+    finally {
+        dockerConfig === null || dockerConfig === void 0 ? void 0 : dockerConfig.cleanup();
+    }
 }

package/lib/deploy/function/personal-tcr.js

@@ -0,0 +1,153 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.PersonalTcrService = exports.DEFAULT_PERSONAL_TCR_REGISTRY = void 0;
+exports.createPersonalTcrService = createPersonalTcrService;
+const config_guard_1 = require("./config-guard");
+const PERSONAL_TCR_VERSION = '2019-09-24';
+exports.DEFAULT_PERSONAL_TCR_REGISTRY = 'ccr.ccs.tencentyun.com';
+const DEFAULT_RETAINED_TAGS = 30;
+const ALREADY_EXISTS_CODES = new Set([
+    'InvalidParameter.ErrNamespaceExist',
+    'InvalidParameter.ErrRepoExist',
+    'ResourceInUse.NamespaceExist',
+    'ResourceInUse.RepositoryExist',
+    'FailedOperation.AlreadyExists',
+    'ResourceConflict'
+]);
+function dataOf(response) {
+    var _a;
+    return (response === null || response === void 0 ? void 0 : response.Data) || ((_a = response === null || response === void 0 ? void 0 : response.Response) === null || _a === void 0 ? void 0 : _a.Data) || (response === null || response === void 0 ? void 0 : response.Response) || response || {};
+}
+function getErrorCode(error) {
+    var _a, _b;
+    return (error === null || error === void 0 ? void 0 : error.code) || (error === null || error === void 0 ? void 0 : error.Code) || ((_b = (_a = error === null || error === void 0 ? void 0 : error.response) === null || _a === void 0 ? void 0 : _a.Error) === null || _b === void 0 ? void 0 : _b.Code) || '';
+}
+function toTagTimestamp(item) {
+    const value = item.PushTime || item.CreationTime;
+    if (!value) {
+        return 0;
+    }
+    const timestamp = Date.parse(value);
+    return Number.isFinite(timestamp) ? timestamp : 0;
+}
+function resolvePersonalRepoName(namespace, repository) {
+    const parsed = (0, config_guard_1.parseImageReference)(repository);
+    if (parsed === null || parsed === void 0 ? void 0 : parsed.registry) {
+        return parsed.repository;
+    }
+    if (parsed === null || parsed === void 0 ? void 0 : parsed.repository.includes('/')) {
+        return parsed.repository;
+    }
+    return `${namespace}/${repository}`;
+}
+function isAlreadyExists(error) {
+    const code = getErrorCode(error);
+    const message = (error === null || error === void 0 ? void 0 : error.message) || (error === null || error === void 0 ? void 0 : error.Message) || '';
+    return (ALREADY_EXISTS_CODES.has(code) ||
+        /Err(?:Namespace|Repo)Exist|AlreadyExists|ResourceInUse|ResourceConflict/i.test(code) ||
+        /already exists?|has already (?:exist|register)|已存在/i.test(message));
+}
+class PersonalTcrService {
+    constructor(environment) {
+        const service = environment.getCommonService('tcr', PERSONAL_TCR_VERSION);
+        this.request = (action, data = {}) => service.call({ Action: action, Param: data });
+    }
+    async ensurePushTarget(options) {
+        const { namespace, repository, ensureNamespace, ensureRepository } = options;
+        if (ensureNamespace && !(await this.namespaceExists(namespace))) {
+            await this.createIgnoringExisting('CreateNamespacePersonal', {
+                Namespace: namespace
+            });
+        }
+        if (ensureRepository && !(await this.repositoryExists(namespace, repository))) {
+            await this.createIgnoringExisting('CreateRepositoryPersonal', {
+                RepoName: `${namespace}/${repository}`,
+                Public: 0,
+                Description: 'Managed by CloudBase CLI'
+            });
+        }
+    }
+    async cleanupTags(options) {
+        var _a;
+        const retain = (_a = options.retain) !== null && _a !== void 0 ? _a : DEFAULT_RETAINED_TAGS;
+        const repoName = resolvePersonalRepoName(options.namespace, options.repository);
+        const tags = await this.listAllTags(repoName);
+        const staleTags = tags
+            .filter(item => item.TagName)
+            .sort((left, right) => toTagTimestamp(right) - toTagTimestamp(left))
+            .slice(retain);
+        for (const item of staleTags) {
+            try {
+                await this.request('DeleteImagePersonal', {
+                    RepoName: repoName,
+                    Tag: item.TagName
+                });
+            }
+            catch (error) {
+                const code = getErrorCode(error);
+                if (!/not.?found|not.?exist/i.test(code) && !/不存在/i.test((error === null || error === void 0 ? void 0 : error.message) || '')) {
+                    throw error;
+                }
+            }
+        }
+    }
+    async namespaceExists(namespace) {
+        const response = await this.request('DescribeNamespacePersonal', {
+            Namespace: namespace,
+            Limit: 100,
+            Offset: 0
+        });
+        const data = dataOf(response);
+        const namespaces = Array.isArray(data.NamespaceInfo)
+            ? data.NamespaceInfo
+            : [];
+        return namespaces.some(item => item.Namespace === namespace);
+    }
+    async repositoryExists(namespace, repository) {
+        const repoName = `${namespace}/${repository}`;
+        const response = await this.request('DescribeRepositoryFilterPersonal', {
+            RepoName: repoName,
+            Limit: 100,
+            Offset: 0
+        });
+        const data = dataOf(response);
+        const repositories = Array.isArray(data.RepoInfo)
+            ? data.RepoInfo
+            : [];
+        return repositories.some(item => item.RepoName === repoName);
+    }
+    async createIgnoringExisting(action, data) {
+        try {
+            await this.request(action, data);
+        }
+        catch (error) {
+            if (!isAlreadyExists(error)) {
+                throw error;
+            }
+        }
+    }
+    async listAllTags(repoName) {
+        var _a;
+        const result = [];
+        const limit = 100;
+        let offset = 0;
+        while (true) {
+            const response = await this.request('DescribeImagePersonal', {
+                RepoName: repoName,
+                Limit: limit,
+                Offset: offset
+            });
+            const data = (response === null || response === void 0 ? void 0 : response.Data) || ((_a = response === null || response === void 0 ? void 0 : response.Response) === null || _a === void 0 ? void 0 : _a.Data) || {};
+            const page = data.TagInfo || [];
+            result.push(...page);
+            offset += page.length;
+            if (!page.length || offset >= Number(data.TagCount || result.length)) {
+                return result;
+            }
+        }
+    }
+}
+exports.PersonalTcrService = PersonalTcrService;
+function createPersonalTcrService(environment) {
+    return new PersonalTcrService(environment);
+}

package/lib/deploy/function/preflight.js

@@ -71,7 +71,8 @@ function safeStat(target) {
 }
 /** 检查 cloud 构建上下文与 Dockerfile，确保任何云端操作前即可失败 */
 function checkCloudBuildSource(config, checks) {
-    const cwd = path_1.default.resolve(config.build.cwd || config.functionPath || process.cwd());
+    const build = config.imageConfig.build;
+    const cwd = path_1.default.resolve(build.cwd || config.functionPath || process.cwd());
     const contextStat = safeStat(cwd);
     if (contextStat === null) {
         checks.push(fail(types_1.FUNCTION_DEPLOY_ERROR.BUILD_CONTEXT_INVALID, '云端镜像构建上下文目录不存在', {
@@ -87,7 +88,7 @@ function checkCloudBuildSource(config, checks) {
         }));
         return;
     }
-    const dockerfile = config.build.dockerfile || types_1.DEFAULT_DOCKERFILE;
+    const dockerfile = build.dockerfile || types_1.DEFAULT_DOCKERFILE;
     const dockerfilePath = path_1.default.resolve(cwd, dockerfile);
     const dockerfileStat = safeStat(dockerfilePath);
     if (dockerfileStat === null || !dockerfileStat.isFile()) {

package/lib/deploy/types.js

@@ -55,6 +55,17 @@ exports.FUNCTION_DEPLOY_ERROR = {
     BUILD_ARG_INVALID: 'BUILD_ARG_INVALID',
     CLOUD_REGISTRY_CREDENTIAL_MISSING: 'CLOUD_REGISTRY_CREDENTIAL_MISSING',
     CLOUD_REGISTRY_CREDENTIAL_INVALID: 'CLOUD_REGISTRY_CREDENTIAL_INVALID',
+    TCR_REGION_MISSING: 'TCR_REGION_MISSING',
+    TCR_INSTANCE_DISCOVERY_FAILED: 'TCR_INSTANCE_DISCOVERY_FAILED',
+    TCR_INSTANCE_NOT_FOUND: 'TCR_INSTANCE_NOT_FOUND',
+    TCR_INSTANCE_AMBIGUOUS: 'TCR_INSTANCE_AMBIGUOUS',
+    TCR_INSTANCE_INVALID: 'TCR_INSTANCE_INVALID',
+    TCR_NAMESPACE_INVALID: 'TCR_NAMESPACE_INVALID',
+    TCR_NAMESPACE_QUERY_FAILED: 'TCR_NAMESPACE_QUERY_FAILED',
+    TCR_NAMESPACE_CREATE_FAILED: 'TCR_NAMESPACE_CREATE_FAILED',
+    TCR_TOKEN_CREATE_FAILED: 'TCR_TOKEN_CREATE_FAILED',
+    TCR_TOKEN_INVALID: 'TCR_TOKEN_INVALID',
+    TCR_DOCKER_LOGIN_FAILED: 'TCR_DOCKER_LOGIN_FAILED',
     GATEWAY_PATH_INVALID: 'GATEWAY_PATH_INVALID',
     LOCAL_FALLBACK_INVALID: 'LOCAL_FALLBACK_INVALID',
     // Preflight（有 IO 的本地检查）

package/lib/hosting/index.js

@@ -348,19 +348,35 @@ class HostingService {
     }
     /**
      * 查询域名状态信息
+     *
+     * 仅在 CDN 域名（domainType=cdn）或老环境（未返回 domainType）时调用 CDN 接口，
+     * 其他域名类型（gateway / eo 等）返回空结果
      * @param options
      */
     async tcbCheckResource(options) {
+        const domainType = await this.getStorageDomainType();
+        // 白名单：只有 cdn 或空值（老环境）才调用 CDN 接口
+        if (domainType !== 'cdn' && domainType) {
+            return { Domains: [], RecordCount: 0, RequestId: '' };
+        }
         return this.cdnService.request('TcbCheckResource', {
             Domains: options.domains
         });
     }
     /**
      * 域名配置变更
+     *
+     * 仅在 CDN 域名（domainType=cdn）或老环境（未返回 domainType）时调用 CDN 接口，
+     * 其他域名类型（gateway / eo 等）返回空结果
      * @param options
      */
     async tcbModifyAttribute(options) {
         const { domain, domainId, domainConfig } = options;
+        const domainType = await this.getStorageDomainType();
+        // 白名单：只有 cdn 或空值（老环境）才调用 CDN 接口
+        if (domainType !== 'cdn' && domainType) {
+            return { RequestId: '' };
+        }
         const res = await this.cdnService.request('TcbModifyAttribute', {
             Domain: domain,
             DomainId: domainId,
@@ -445,6 +461,17 @@ class HostingService {
         }
         return cloudPath[cloudPath.length - 1] === '/' ? cloudPath : `${cloudPath}/`;
     }
+    /**
+     * 获取静态托管域名类型（cdn / gateway / eo）
+     *
+     * 后端通过 DescribeEnvInfo 返回 StaticStorages[0].DomainType，
+     * 仅 cdn 或空值（老环境）才允许调用 CDN 相关接口。
+     */
+    async getStorageDomainType() {
+        var _a, _b;
+        const { EnvInfo } = await this.environment.getEnvService().getEnvInfo();
+        return (_b = (_a = EnvInfo === null || EnvInfo === void 0 ? void 0 : EnvInfo.StaticStorages) === null || _a === void 0 ? void 0 : _a[0]) === null || _b === void 0 ? void 0 : _b.DomainType;
+    }
 }
 exports.HostingService = HostingService;
 __decorate([

package/lib/projectValidator/index.js

@@ -23,7 +23,6 @@ const path_1 = __importDefault(require("path"));
 const toolbox_1 = require("@cloudbase/toolbox");
 class ProjectValidator {
     async validate(options = {}) {
-        var _a;
         const cwd = path_1.default.resolve(options.cwd || process.cwd());
         const errors = [];
         const warnings = [];
@@ -32,7 +31,6 @@ class ProjectValidator {
             mode: options.mode,
             errors,
         });
-        const version = String(((_a = loaded.rawConfig) === null || _a === void 0 ? void 0 : _a.version) || '2.1');
         if (loaded.rawConfig) {
             this.validateSchema(loaded.rawConfig, errors);
         }
@@ -47,7 +45,6 @@ class ProjectValidator {
         const summary = this.getSummary(loaded.config);
         return {
             valid: errors.length === 0,
-            version,
             errors,
             warnings,
             summary,
@@ -92,12 +89,25 @@ class ProjectValidator {
     }
     validateSchema(config, errors) {
         const result = (0, toolbox_1.validateCloudBaseConfigBySchema)(config);
-        result.errors.forEach((error) => {
+        result.errors
+            .filter((error) => error.keyword !== 'if')
+            .forEach((error) => {
+            const errorParams = error.params;
+            const missingProperty = error.keyword === 'required' && typeof errorParams.missingProperty === 'string'
+                ? errorParams.missingProperty
+                : undefined;
+            const baseField = this.normalizeSchemaPath(error.dataPath);
+            const field = [baseField, missingProperty].filter(Boolean).join('.');
+            const isImageTypeMissing = missingProperty === 'imageType';
             errors.push({
                 level: 'error',
-                field: this.normalizeSchemaPath(error.dataPath),
-                message: `配置不符合 v2.1 Schema：${error.message}`,
-                fix: `请检查 ${this.normalizeSchemaPath(error.dataPath) || 'cloudbaserc'} 字段`,
+                field,
+                message: isImageTypeMissing
+                    ? 'local/cloud 镜像构建必须显式声明 imageConfig.imageType'
+                    : `配置不符合 v2.1 Schema：${error.message}`,
+                fix: isImageTypeMissing
+                    ? '请根据镜像仓库类型填写 imageConfig.imageType: "enterprise" 或 "personal"'
+                    : `请检查 ${field || 'cloudbaserc'} 字段`,
             });
         });
     }
@@ -133,8 +143,9 @@ class ProjectValidator {
         });
     }
     /**
-     * 个人版 TCR 的 username/password/namespace 必须在 cloudbaserc 中显式声明。
-     * ConfigParser 已先解析 {{env.*}}，因此这里同时承担缺失 env 值的前置校验。
+     * 个人版 TCR 的 username/password 必须在 cloudbaserc 中显式声明。
+     * namespace/repository 可省略，分别由部署器按 envId/函数名推导。
+     * ConfigParser 已先解析 {{env.*}}，因此这里同时承担缺失凭证 env 值的前置校验。
      */
     validatePersonalRegistryConfig(config, errors) {
         ;
@@ -144,16 +155,6 @@ class ProjectValidator {
                 return;
             }
             const build = (_a = func.imageConfig) === null || _a === void 0 ? void 0 : _a.build;
-            const namespace = build === null || build === void 0 ? void 0 : build.namespace;
-            if (typeof namespace !== 'string' || !namespace.trim()) {
-                errors.push({
-                    level: 'error',
-                    resource: `functions[${index}]`,
-                    field: 'imageConfig.build.namespace',
-                    message: '个人版 TCR 缺少 namespace，或对应环境变量未赋值',
-                    fix: '声明 namespace: "{{env.TCB_TCR_NAMESPACE}}"，并在 .env* 中设置该变量',
-                });
-            }
             const credential = build === null || build === void 0 ? void 0 : build.registryCredential;
             if (!credential || typeof credential !== 'object') {
                 errors.push({
@@ -190,12 +191,10 @@ class ProjectValidator {
         return (config.functions || []).some((func) => this.isPersonalCloudFunction(func));
     }
     isPersonalCloudFunction(func) {
-        var _a, _b, _c, _d, _e, _f;
-        const registryId = (_b = (_a = func.imageConfig) === null || _a === void 0 ? void 0 : _a.registryId) !== null && _b !== void 0 ? _b : (_d = (_c = func.imageConfig) === null || _c === void 0 ? void 0 : _c.build) === null || _d === void 0 ? void 0 : _d.registryId;
-        const imageType = (_f = (_e = func.imageConfig) === null || _e === void 0 ? void 0 : _e.imageType) !== null && _f !== void 0 ? _f : (registryId ? 'enterprise' : 'personal');
+        var _a;
         return (func.type === 'HTTP' &&
             func.buildStrategy === 'cloud' &&
-            imageType === 'personal');
+            ((_a = func.imageConfig) === null || _a === void 0 ? void 0 : _a.imageType) === 'personal');
     }
     validateResources(cwd, config) {
         const errors = [];

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@cloudbase/manager-node",
-    "version": "5.8.2",
+    "version": "5.8.4",
     "description": "The node manage service api for cloudbase.",
     "main": "lib/index.js",
     "scripts": {
@@ -42,7 +42,7 @@
     },
     "dependencies": {
         "@cloudbase/signature-nodejs": "^1.0.0",
-        "@cloudbase/toolbox": "~0.8.3",
+        "@cloudbase/toolbox": "~0.8.4",
         "@cloudbase/database": "^0.6.2",
         "archiver": "^3.1.1",
         "cos-nodejs-sdk-v5": "^2.14.0",