@cloudbase/manager-node 5.5.6-beta.0 → 5.5.6

package/lib/env/index.js

@@ -146,7 +146,7 @@ class EnvService {
         };
         const response = await this.describeEnvInfo(params);
         const envBaseInfo = (_a = response === null || response === void 0 ? void 0 : response.EnvInfo) === null || _a === void 0 ? void 0 : _a.EnvBaseInfo;
-        // 成功获取环境信息，将 EnvBaseInfo 映射到 EnvInfo 类型
+        // 将 EnvBaseInfo 完整映射到 EnvInfo 类型，避免新增字段被丢弃
         const envInfo = {
             EnvId: envBaseInfo.EnvId,
             Alias: envBaseInfo.Alias,
@@ -161,7 +161,22 @@ class EnvService {
             Region: envBaseInfo.Region || '',
             Source: envBaseInfo.Source,
             CreateTime: envBaseInfo.CreateTime,
-            UpdateTime: envBaseInfo.UpdateTime
+            UpdateTime: envBaseInfo.UpdateTime,
+            StaticStorages: envBaseInfo.StaticStorages,
+            IsAutoDegrade: envBaseInfo.IsAutoDegrade,
+            EnvChannel: envBaseInfo.EnvChannel,
+            PayMode: envBaseInfo.PayMode,
+            IsDefault: envBaseInfo.IsDefault,
+            Tags: envBaseInfo.Tags,
+            EnvType: envBaseInfo.EnvType,
+            IsDauPackage: envBaseInfo.IsDauPackage,
+            PackageType: envBaseInfo.PackageType,
+            ArchitectureType: envBaseInfo.ArchitectureType,
+            Recycle: envBaseInfo.Recycle,
+            EnvPreferences: envBaseInfo.EnvPreferences,
+            Meta: envBaseInfo.Meta,
+            PostgreSQL: envBaseInfo.PostgreSQL,
+            EnvStatus: envBaseInfo.EnvStatus
         };
         return {
             EnvInfo: envInfo,
@@ -186,6 +201,18 @@ class EnvService {
     async describeEnvInfo(params) {
         return this.cloudService.request('DescribeEnvInfo', params);
     }
+    /**
+     * 判断当前环境是否为 PostgreSQL 环境
+     * PostgreSQL 字段为数组且长度 > 0 时视为 PG 环境
+     *
+     * @returns 是否为 PG 环境
+     */
+    async isPostgresqlEnv() {
+        var _a, _b;
+        const response = await this.describeEnvInfo({ EnvId: this.envId });
+        const postgresql = (_b = (_a = response === null || response === void 0 ? void 0 : response.EnvInfo) === null || _a === void 0 ? void 0 : _a.EnvBaseInfo) === null || _b === void 0 ? void 0 : _b.PostgreSQL;
+        return Array.isArray(postgresql) && postgresql.length > 0;
+    }
     /**
      * 修改环境名称
      * @param {string} alias 环境名称

package/lib/permission/index.js

@@ -374,11 +374,9 @@ class PermissionService {
     }
     /**
      * 判断当前环境是否为 PostgreSQL 环境
-     * PostgreSQL 是数组且长度 > 0 时为 PG 环境
      */
     async isPostgresqlEnv() {
-        const envBaseInfo = await this.getEnvBaseInfo();
-        return Array.isArray(envBaseInfo.PostgreSQL) && envBaseInfo.PostgreSQL.length > 0;
+        return this.environment.getEnvService().isPostgresqlEnv();
     }
     /**
      * 判断当前环境的 authz_engine 是否为 opa

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@cloudbase/manager-node",
-    "version": "5.5.6-beta.0",
+    "version": "5.5.6",
     "description": "The node manage service api for cloudbase.",
     "main": "lib/index.js",
     "scripts": {

package/types/env/index.d.ts

@@ -640,6 +640,13 @@ export declare class EnvService {
      * @returns 环境信息响应
      */
     describeEnvInfo(params: DescribeEnvInfoParams): Promise<DescribeEnvInfoResponse>;
+    /**
+     * 判断当前环境是否为 PostgreSQL 环境
+     * PostgreSQL 字段为数组且长度 > 0 时视为 PG 环境
+     *
+     * @returns 是否为 PG 环境
+     */
+    isPostgresqlEnv(): Promise<boolean>;
     /**
      * 修改环境名称
      * @param {string} alias 环境名称

package/types/interfaces/tcb.interface.d.ts

@@ -120,12 +120,36 @@ export interface EnvInfo {
     PackageName: string;
     LogServices: LogServiceInfo[];
     CustomLogServices: {
-        CreateTime: string;
-        ClsLogsetId: string;
-        ClsTopicId: string;
-        ClsRegion: string;
+        CreateTime?: string;
+        ClsLogsetId?: string;
+        ClsTopicId?: string;
+        ClsRegion?: string;
     }[];
     Region: string;
+    StaticStorages?: StaticStorageInfo[];
+    IsAutoDegrade?: boolean;
+    EnvChannel?: string;
+    PayMode?: string;
+    IsDefault?: boolean;
+    Tags?: Array<{
+        Key: string;
+        Value: string;
+    }>;
+    EnvType?: string;
+    IsDauPackage?: boolean;
+    PackageType?: string;
+    ArchitectureType?: string;
+    Recycle?: string;
+    EnvPreferences?: Array<{
+        Key?: string;
+        Value?: string;
+    }> | Record<string, any>;
+    Meta?: Array<{
+        Key: string;
+        Value: string;
+    }>;
+    PostgreSQL?: PostgreSQLInfo[] | Record<string, any>;
+    EnvStatus?: string;
 }
 export interface FunctionInfo {
     Namespace?: string;
@@ -135,12 +159,38 @@ export interface DatabasesInfo {
     InstanceId?: string;
     Status?: string;
     Region?: string;
+    UpdateTime?: string;
+}
+export interface ExternalStorage {
+    BucketName?: string;
+    Region?: string;
+    BasePath?: string;
+    Enabled?: boolean;
+    Provider?: string;
 }
 export interface StorageInfo {
     Region?: string;
     Bucket?: string;
     CdnDomain?: string;
     AppId?: string;
+    DomainType?: string;
+    AccessAutoDisable?: boolean;
+    AccessExpire?: number;
+    ExternalStorage?: ExternalStorage;
+    CustomDomain?: string;
+    Status?: string;
+}
+export interface StaticStorageInfo {
+    StaticDomain?: string;
+    DefaultDirName?: string;
+    Status?: string;
+    Region?: string;
+    Bucket?: string;
+    EnvId?: string;
+    DomainType?: string;
+    AccessAutoDisable?: boolean;
+    AccessExpire?: number;
+    ExternalStorage?: ExternalStorage;
 }
 export interface LogServiceInfo {
     LogsetName?: string;
@@ -148,6 +198,15 @@ export interface LogServiceInfo {
     TopicName?: string;
     TopicId?: string;
     Region?: string;
+    Period?: number;
+    BillingMode?: string;
+}
+export interface PostgreSQLInfo {
+    Name?: string;
+    InstanceName?: string;
+    Status?: number;
+    Region?: string;
+    Version?: string;
 }
 export interface VoucherUseHistory {
     VoucherId?: string;
@@ -171,6 +230,27 @@ export interface PackageInfo {
     Desc?: string;
     Detail?: string;
 }
+export interface CodeNumPair {
+    Code: string;
+    Num: number;
+}
+export interface QpsConfig {
+    QpsQuota?: number;
+    QpsCustomLimit?: number;
+}
+export interface OrderInfo {
+    TranId?: string;
+    PackageId?: string;
+    TranType?: string;
+    TranStatus?: string;
+    UpdateTime?: string;
+    CreateTime?: string;
+    PayMode?: string;
+    ExtensionId?: string;
+    ResourceReady?: string;
+    Flag?: string;
+    ReqBody?: string;
+}
 export interface EnvBillingInfoItem {
     EnvId?: string;
     PackageId?: string;
@@ -183,11 +263,25 @@ export interface EnvBillingInfoItem {
     UpdateTime?: string;
     IsAlwaysFree?: boolean;
     PaymentChannel?: string;
+    OrderInfo?: OrderInfo;
+    FreeQuota?: string;
+    EnableOverrun?: boolean;
+    ExtPackageType?: string;
+    EnvCharged?: string;
+    EnvActivated?: string;
+    EnvPaid?: string;
+    EnvOrigin?: string;
+    ResourceId?: string;
+    BillTime?: string;
+    EnvAutoId?: number;
     PackageName?: string;
-    ExtPackageCode?: {
-        Code: string;
-        Num: number;
-    }[];
+    ExtPackageCode?: CodeNumPair[];
+    TipList?: string;
+    EnvDeductionMode?: string;
+    PointsTime?: string;
+    QpsQuota?: number;
+    QpsCustomLimit?: number;
+    EnvQps?: QpsConfig;
 }
 export interface InvoiceVATGeneral {
     TaxPayerType?: string;
@@ -469,62 +563,73 @@ export interface DescribeEnvInfoParams {
 }
 export interface EnvBaseInfo {
     EnvId?: string;
+    Source?: string;
     Alias?: string;
+    CreateTime?: string;
+    UpdateTime?: string;
     Status?: string;
-    EnvType?: string;
-    Region?: string;
-    PackageId?: string;
-    PackageName?: string;
     Databases?: DatabasesInfo[];
     Storages?: StorageInfo[];
     Functions?: FunctionInfo[];
+    PackageId?: string;
+    PackageName?: string;
+    LogServices?: LogServiceInfo[] | null;
+    StaticStorages?: StaticStorageInfo[];
+    IsAutoDegrade?: boolean;
+    EnvChannel?: string;
     PayMode?: string;
-    Source?: string;
+    IsDefault?: boolean;
+    Region?: string;
     Tags?: Array<{
         Key: string;
         Value: string;
     }>;
+    CustomLogServices?: Array<{
+        ClsRegion?: string;
+        ClsLogsetId?: string;
+        ClsTopicId?: string;
+        CreateTime?: string;
+    }> | null;
+    EnvType?: string;
+    IsDauPackage?: boolean;
+    PackageType?: string;
+    ArchitectureType?: string;
+    Recycle?: string;
+    EnvPreferences?: Array<{
+        Key?: string;
+        Value?: string;
+    }> | Record<string, any>;
     Meta?: Array<{
         Key: string;
         Value: string;
     }>;
+    PostgreSQL?: PostgreSQLInfo[] | Record<string, any>;
+    EnvStatus?: string;
+}
+export interface AccountInfoInner {
+    Uin?: number | string;
+    AppId?: number | string;
+    WxAppId?: string;
+    OpenAppId?: string;
     CreateTime?: string;
     UpdateTime?: string;
-    EnvPreferences?: Record<string, any>;
-    IsAutoDegrade?: boolean;
-    IsDauPackage?: boolean;
-    PostgreSQL?: Record<string, any>;
-    LogServices?: Array<{
-        LogsetId?: string;
-        TopicId?: string;
-        TopicName?: string;
-        Region?: string;
-    }> | null;
-    CustomLogServices?: Array<{
-        CreateTime: string;
-        ClsLogsetId: string;
-        ClsTopicId: string;
-        ClsRegion: string;
-    }> | null;
 }
+/**
+ * 计费信息（保留 BillingInfo 用于向后兼容；DescribeEnvInfo 接口的 BillingInfo 实际为 EnvBillingInfoItem）
+ */
 export interface BillingInfo {
     StartTime?: string;
     EndTime?: string;
     Status?: string;
 }
-export interface UserInfo {
-    AppId?: string;
-    Uin?: string;
-    WxAppId?: string;
-}
 export interface DescribeEnvInfoResponse extends IResponseInfo {
     EnvInfo?: {
         EnvBaseInfo?: EnvBaseInfo;
-        BillingInfo?: BillingInfo;
-        UserInfo?: UserInfo;
+        BillingInfo?: EnvBillingInfoItem;
+        UserInfo?: AccountInfoInner;
         Eid?: number;
+        SiteFlag?: string;
         CircleStartTime?: string;
         CircleEndTime?: string;
-        SiteFlag?: number;
     };
 }

package/types/permission/index.d.ts

@@ -66,7 +66,6 @@ export declare class PermissionService {
     private getEnvBaseInfo;
     /**
      * 判断当前环境是否为 PostgreSQL 环境
-     * PostgreSQL 是数组且长度 > 0 时为 PG 环境
      */
     private isPostgresqlEnv;
     /**