@cloudbase/manager-node 5.5.2-beta.0 → 5.5.3-beta.0

package/jest.config.js

@@ -12,7 +12,7 @@ module.exports = {
     testEnvironment: 'node',
     testPathIgnorePatterns: [
         // PG 集成测试 / smoke 测试需要 PostgreSQL 环境，流水线默认跳过
-        '/pg-storage-integration\\.test\\.ts$/'
+        'pg-storage-integration\\.test\\.ts$'
     ],
     // https://github.com/facebook/jest/issues/5164
     globalSetup: './test/global-setup-hook.ts',

package/lib/database/index.js

@@ -46,6 +46,14 @@ class DatabaseService {
             Tag: Databases[0].InstanceId
         };
     }
+    getMongoConnector() {
+        const currEnv = this.environment;
+        const { Databases } = currEnv.lazyEnvironmentConfig;
+        return {
+            DatabaseName: Databases[0].InstanceId,
+            InstanceId: 'flexdb'
+        };
+    }
     async checkCollectionExists(collectionName) {
         try {
             const result = await this.describeCollection(collectionName);
@@ -63,10 +71,10 @@ class DatabaseService {
         }
     }
     async createCollection(collectionName) {
-        let { Tag } = this.getDatabaseConfig();
+        const MongoConnector = this.getMongoConnector();
         const res = await this.dbOpService.request('CreateTable', {
             EnvId: this.envId,
-            Tag,
+            MongoConnector,
             TableName: collectionName
         });
         return res;
@@ -75,10 +83,10 @@ class DatabaseService {
         // 先检查当前集合是否存在
         const existRes = await this.checkCollectionExists(collectionName);
         if (existRes.Exists) {
-            let { Tag } = this.getDatabaseConfig();
+            const MongoConnector = this.getMongoConnector();
             const res = await this.dbOpService.request('DeleteTable', {
                 EnvId: this.envId,
-                Tag,
+                MongoConnector,
                 TableName: collectionName
             });
             return res;
@@ -88,15 +96,15 @@ class DatabaseService {
         }
     }
     async updateCollection(collectionName, indexiesInfo) {
-        let { Tag } = this.getDatabaseConfig();
-        const res = await this.dbOpService.request('UpdateTable', Object.assign({ EnvId: this.envId, Tag, TableName: collectionName }, indexiesInfo));
+        const MongoConnector = this.getMongoConnector();
+        const res = await this.dbOpService.request('UpdateTable', Object.assign({ EnvId: this.envId, MongoConnector, TableName: collectionName }, indexiesInfo));
         return res;
     }
     async describeCollection(collectionName) {
-        let { Tag } = this.getDatabaseConfig();
+        const MongoConnector = this.getMongoConnector();
         return this.dbOpService.request('DescribeTable', {
             EnvId: this.envId,
-            Tag,
+            MongoConnector,
             TableName: collectionName
         });
     }
@@ -105,14 +113,14 @@ class DatabaseService {
         MgoLimit: this.DEFAULT_MGO_LIMIT,
         MgoOffset: this.DEFAULT_MGO_OFFSET
     }) {
-        let { Tag } = this.getDatabaseConfig();
+        const MongoConnector = this.getMongoConnector();
         if (options.MgoLimit === undefined) {
             options.MgoLimit = this.DEFAULT_MGO_LIMIT;
         }
         if (options.MgoOffset === undefined) {
             options.MgoOffset = this.DEFAULT_MGO_OFFSET;
         }
-        const res = await this.dbOpService.request('ListTables', Object.assign({ EnvId: this.envId, Tag }, options));
+        const res = await this.dbOpService.request('ListTables', Object.assign({ EnvId: this.envId, MongoConnector }, options));
         if (res.Tables === null) {
             // 无集合
             res.Collections = [];
@@ -277,12 +285,16 @@ class DatabaseService {
     }
     /**
      * 执行文档型数据库命令
-     * @param options 命令参数（命令列表、可选的 Tag/EnvId/MongoConnector）
+     * @param options 命令参数（命令列表、可选的 EnvId/MongoConnector）
      * @returns 执行结果，Data 为 JSON 字符串数组
      */
     async runCommands(options) {
-        let { Tag } = this.getDatabaseConfig();
-        return this.dbOpService.request('RunCommands', Object.assign({ MgoCommands: options.MgoCommands, Tag: options.Tag || Tag, EnvId: options.EnvId || this.envId }, (options.MongoConnector ? { MongoConnector: options.MongoConnector } : {})));
+        const MongoConnector = options.MongoConnector || this.getMongoConnector();
+        return this.dbOpService.request('RunCommands', {
+            MgoCommands: options.MgoCommands,
+            MongoConnector,
+            EnvId: options.EnvId || this.envId,
+        });
     }
     /**
      * 在 PostgreSQL 数据库上执行 SQL 语句

package/lib/env/index.js

@@ -12,6 +12,8 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.EnvService = void 0;
 const cos_nodejs_sdk_v5_1 = __importDefault(require("cos-nodejs-sdk-v5"));
 const util_1 = __importDefault(require("util"));
+const http_request_1 = require("../utils/http-request");
+const signature_nodejs_1 = require("@cloudbase/signature-nodejs");
 const error_1 = require("../error");
 const utils_1 = require("../utils");
 const constant_1 = require("../constant");
@@ -26,6 +28,7 @@ class EnvService {
         this.tcbService = new utils_1.CloudService(environment.cloudBaseContext, 'tcb', '2018-06-08');
         this.commonService = environment.getCommonService('lowcode', '2021-01-08');
         this.billingService = new billing_1.BillingService(environment.cloudBaseContext);
+        this.tokenCache = new Map();
     }
     /**
      * 列出所有环境
@@ -410,6 +413,74 @@ class EnvService {
     async describeApiKeyList(options) {
         return this.tcbService.request('DescribeApiKeyList', Object.assign({ EnvId: this.envId }, options));
     }
+    /**
+     * 根据密钥信息获取管理员访问令牌
+     * 使用 secretId、secretKey 和 sessionToken 签发访问令牌
+     * 默认从初始化时的 cloudBaseContext 中读取密钥，也可显式传入 credentials 覆盖
+     * @param {Object} [credentials] 密钥信息，不传则使用初始化时的密钥
+     * @param {string} credentials.secretId 密钥ID
+     * @param {string} credentials.secretKey 密钥Key
+     * @param {string} [credentials.token] sessionToken
+     * @returns {Promise<string>} 访问令牌
+     */
+    async getAdminAccessToken(credentials) {
+        const { secretId, secretKey, token } = credentials || this.environment.cloudBaseContext;
+        if (!secretId || !secretKey) {
+            throw new error_1.CloudBaseError('missing secretId or secretKey of tencent cloud');
+        }
+        const envId = this.envId;
+        const cacheKey = `access_token_secret_${envId}_${secretId}`;
+        const cached = this.tokenCache.get(cacheKey);
+        if (cached && cached.expiry > Date.now()) {
+            return cached.token;
+        }
+        const host = `${envId}${this.environment.cloudBaseContext.isInternalEndpoint()
+            ? '.api.intl.tcloudbasegateway.com'
+            : '.api.tcloudbasegateway.com'}`;
+        const url = `https://${host}/auth/v1/token/clientCredential`;
+        const method = 'POST';
+        const headers = {
+            'Content-Type': 'application/json',
+            Host: host,
+        };
+        const data = { grant_type: 'client_credentials' };
+        const timestamp = Math.floor(new Date().getTime() / 1000) - 1;
+        const { authorization, timestamp: signTimestamp } = (0, signature_nodejs_1.sign)({
+            secretId,
+            secretKey,
+            method,
+            url,
+            headers,
+            params: data,
+            timestamp,
+            withSignedParams: false,
+            isCloudApi: true,
+        });
+        headers['Authorization'] = `${authorization}, Timestamp=${signTimestamp}${token ? `, Token=${token}` : ''}`;
+        headers['X-Signature-Expires'] = 600;
+        headers['X-Timestamp'] = signTimestamp;
+        try {
+            const response = await (0, http_request_1.fetch)(url, {
+                method,
+                headers,
+                body: JSON.stringify(data),
+            });
+            const res = await response.json();
+            const access_token = res === null || res === void 0 ? void 0 : res.access_token;
+            const expires_in = (res === null || res === void 0 ? void 0 : res.expires_in) || 0;
+            if (access_token && expires_in) {
+                this.tokenCache.set(cacheKey, {
+                    token: access_token,
+                    expiry: Date.now() + (expires_in * 1000) / 2,
+                });
+            }
+            return access_token;
+        }
+        catch (e) {
+            console.log(e);
+            throw e;
+        }
+    }
     // 创建自定义登录私钥
     async createCustomLoginKeys() {
         return this.cloudService.request('CreateCustomLoginKeys', {

package/lib/environment.js

@@ -22,7 +22,6 @@ const cloudApp_1 = require("./cloudApp");
 const permission_1 = require("./permission");
 const sandbox_1 = require("./sandbox");
 const aiModel_1 = require("./aiModel");
-const talosSandbox_1 = require("./talosSandbox");
 class Environment {
     constructor(context, envId) {
         this.inited = false;
@@ -48,7 +47,6 @@ class Environment {
         this.cloudAppService = new cloudApp_1.CloudAppService(this);
         this.sandboxService = new sandbox_1.SandboxService(this);
         this.aiModelService = new aiModel_1.AiModelService(this);
-        this.talosSandboxService = new talosSandbox_1.TalosSandboxService(this);
     }
     async lazyInit() {
         if (!this.inited) {
@@ -123,9 +121,6 @@ class Environment {
     getAiModelService() {
         return this.aiModelService;
     }
-    getTalosSandboxService() {
-        return this.talosSandboxService;
-    }
     getCommonService(serviceType = 'tcb', serviceVersion) {
         return new common_1.CommonService(this, serviceType, serviceVersion);
     }

package/lib/index.js

@@ -122,9 +122,6 @@ class CloudBase {
     get aiModel() {
         return this.currentEnvironment().getAiModelService();
     }
-    get talosSandbox() {
-        return this.currentEnvironment().getTalosSandboxService();
-    }
     get docs() {
         if (!this.docsService) {
             this.docsService = new docs_1.DocsService();

package/lib/user/index.js

@@ -188,7 +188,7 @@ class UserService {
     }
     async describeUserList(options = {}) {
         const { EnvId } = this.environment.lazyEnvironmentConfig;
-        const { pageNo = 1, pageSize = 20, name, nickName, phone, email } = options;
+        const { pageNo = 1, pageSize = 20, name, nickName, phone, email, uidList } = options;
         if (!Number.isInteger(pageNo) || pageNo < 1) {
             throw new Error('Invalid pageNo');
         }
@@ -208,6 +208,8 @@ class UserService {
             reqData.Phone = phone;
         if (this.isValidStr(email))
             reqData.Email = email;
+        if (Array.isArray(uidList) && uidList.length > 0)
+            reqData.UidList = uidList;
         return this.tcbService.request('DescribeUserList', reqData);
     }
     async modifyUser(options) {

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@cloudbase/manager-node",
-    "version": "5.5.2-beta.0",
+    "version": "5.5.3-beta.0",
     "description": "The node manage service api for cloudbase.",
     "main": "lib/index.js",
     "scripts": {
@@ -41,6 +41,7 @@
         "typescript": "^5.8.3"
     },
     "dependencies": {
+        "@cloudbase/signature-nodejs": "^1.0.0",
         "@cloudbase/database": "^0.6.2",
         "archiver": "^3.1.1",
         "cos-nodejs-sdk-v5": "^2.14.0",

package/types/database/index.d.ts

@@ -155,6 +155,7 @@ export declare class DatabaseService {
     constructor(environment: Environment);
     getCurrEnvironment(): Environment;
     getDatabaseConfig(): IDatabaseConfig;
+    getMongoConnector(): IMongoConnector;
     checkCollectionExists(collectionName: string): Promise<IExistsRes>;
     createCollection(collectionName: string): Promise<any>;
     deleteCollection(collectionName: string): Promise<any>;
@@ -197,7 +198,7 @@ export declare class DatabaseService {
     restoreTables(time: string, modifyTableNamesInfo: IModifyTableNamesInfo[], instanceId?: string): Promise<IRestoreTCBTablesResult>;
     /**
      * 执行文档型数据库命令
-     * @param options 命令参数（命令列表、可选的 Tag/EnvId/MongoConnector）
+     * @param options 命令参数（命令列表、可选的 EnvId/MongoConnector）
      * @returns 执行结果，Data 为 JSON 字符串数组
      */
     runCommands(options: IRunCommandsOptions): Promise<IRunCommandsResult>;

package/types/env/index.d.ts

@@ -559,6 +559,7 @@ export declare class EnvService {
     private envType?;
     private commonService;
     private billingService;
+    private tokenCache;
     constructor(environment: Environment);
     /**
      * 列出所有环境
@@ -779,6 +780,21 @@ export declare class EnvService {
      * @returns {Promise<IDescribeApiKeyListRes>}
      */
     describeApiKeyList(options?: IDescribeApiKeyListParams): Promise<IDescribeApiKeyListRes>;
+    /**
+     * 根据密钥信息获取管理员访问令牌
+     * 使用 secretId、secretKey 和 sessionToken 签发访问令牌
+     * 默认从初始化时的 cloudBaseContext 中读取密钥，也可显式传入 credentials 覆盖
+     * @param {Object} [credentials] 密钥信息，不传则使用初始化时的密钥
+     * @param {string} credentials.secretId 密钥ID
+     * @param {string} credentials.secretKey 密钥Key
+     * @param {string} [credentials.token] sessionToken
+     * @returns {Promise<string>} 访问令牌
+     */
+    getAdminAccessToken(credentials?: {
+        secretId: string;
+        secretKey: string;
+        token?: string;
+    }): Promise<string>;
     createCustomLoginKeys(): Promise<{
         PrivateKey: string;
         KeyID: string;

package/types/environment.d.ts

@@ -18,7 +18,6 @@ import { EnvInfo } from './interfaces';
 import { PermissionService } from './permission';
 import { SandboxService } from './sandbox';
 import { AiModelService } from './aiModel';
-import { TalosSandboxService } from './talosSandbox';
 export declare class Environment {
     inited: boolean;
     cloudBaseContext: CloudBaseContext;
@@ -42,7 +41,6 @@ export declare class Environment {
     private cloudAppService;
     private sandboxService;
     private aiModelService;
-    private talosSandboxService;
     constructor(context: CloudBaseContext, envId: string);
     lazyInit(): Promise<any>;
     getEnvId(): string;
@@ -64,7 +62,6 @@ export declare class Environment {
     getPermissionService(): PermissionService;
     getSandboxService(): SandboxService;
     getAiModelService(): AiModelService;
-    getTalosSandboxService(): TalosSandboxService;
     getCommonService(serviceType: string, serviceVersion: any): CommonService;
     getServicesEnvInfo(): Promise<any>;
     getAuthConfig(): {

package/types/index.d.ts

@@ -19,7 +19,6 @@ import { PermissionService } from './permission';
 import { SandboxService } from './sandbox';
 import { CloudAppService } from './cloudApp';
 import { AiModelService } from './aiModel';
-import { TalosSandboxService } from './talosSandbox';
 interface CloudBaseConfig {
     secretId?: string;
     secretKey?: string;
@@ -85,7 +84,6 @@ declare class CloudBase {
     get permission(): PermissionService;
     get sandbox(): SandboxService;
     get aiModel(): AiModelService;
-    get talosSandbox(): TalosSandboxService;
     get docs(): DocsService;
     getEnvironmentManager(): EnvironmentManager;
     getManagerConfig(): CloudBaseConfig;

package/types/user/types.d.ts

@@ -42,6 +42,7 @@ export interface DescribeUserListOptions {
     nickName?: string;
     phone?: string;
     email?: string;
+    uidList?: string[];
 }
 export interface TcbUserItem {
     Uid?: string;