@cloudbase/manager-node 5.5.0 → 5.5.1-beta.0

package/lib/context.js

@@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.CloudBaseContext = void 0;
 const constant_1 = require("./constant");
 class CloudBaseContext {
-    constructor({ secretId = '', secretKey = '', token = '', proxy = '', region = '', envType = '', useInternalEndpoint = undefined, internalEndpointRegion = undefined }) {
+    constructor({ secretId = '', secretKey = '', token = '', proxy = '', region = '', envType = '', useInternalEndpoint = undefined, internalEndpointRegion = undefined, requestFn = undefined }) {
         this.secretId = secretId;
         this.secretKey = secretKey;
         this.token = token;
@@ -12,6 +12,7 @@ class CloudBaseContext {
         this.envType = envType;
         this.useInternalEndpoint = useInternalEndpoint;
         this.internalEndpointRegion = internalEndpointRegion;
+        this.requestFn = requestFn;
     }
     isInternalEndpoint() {
         return this.useInternalEndpoint !== undefined ? this.useInternalEndpoint : constant_1.USE_INTERNAL_ENDPOINT;

package/lib/index.js

@@ -19,9 +19,9 @@ class CloudBase {
     }
     constructor(config = {}) {
         this.cloudBaseConfig = {};
-        let { secretId, secretKey, token, envId, proxy, region, envType, useInternalEndpoint, internalEndpointRegion } = config;
-        // config 中传入的 secretId secretkey 必须同时存在
-        if ((secretId && !secretKey) || (!secretId && secretKey)) {
+        let { secretId, secretKey, token, envId, proxy, region, envType, useInternalEndpoint, internalEndpointRegion, requestFn } = config;
+        // config 中传入的 secretId secretkey 必须同时存在（有 requestFn 时可以不传）
+        if (!requestFn && ((secretId && !secretKey) || (!secretId && secretKey))) {
             throw new Error('secretId and secretKey must be a pair');
         }
         this.cloudBaseConfig = {
@@ -34,6 +34,7 @@ class CloudBase {
             region,
             useInternalEndpoint,
             internalEndpointRegion,
+            requestFn,
         };
         // 初始化 context
         this.context = new context_1.CloudBaseContext(this.cloudBaseConfig);

package/lib/utils/cloud-api-request.js

@@ -53,12 +53,13 @@ function getDate(timestamp) {
 }
 class CloudService {
     /* eslint-disable-next-line */
-    constructor(context, service, version, baseParams) {
+    constructor(context, service, version, baseParams, requestFn) {
         this.service = service;
         this.version = version;
         this.timeout = 60000;
         this.baseParams = baseParams || {};
         this.cloudBaseContext = context;
+        this.requestFn = requestFn !== null && requestFn !== void 0 ? requestFn : context.requestFn;
     }
     get baseUrl() {
         const internalEndpoint = this.cloudBaseContext.isInternalEndpoint();
@@ -90,8 +91,31 @@ class CloudService {
         }
     }
     async request(action, data = {}, method = 'POST') {
+        var _a;
         this.action = action;
         this.data = deepRemoveVoid(Object.assign(Object.assign({}, data), this.baseParams));
+        // 如果注入了 requestFn，直接委托，跳过 TC3 签名逻辑
+        if (this.requestFn) {
+            try {
+                const result = await this.requestFn({
+                    service: this.service,
+                    action,
+                    version: this.version,
+                    region: (_a = this.cloudBaseContext.region) !== null && _a !== void 0 ? _a : '',
+                    payload: this.data,
+                });
+                return result;
+            }
+            catch (e) {
+                if (e.name === 'CloudBaseError') {
+                    throw e;
+                }
+                throw new error_1.CloudBaseError(e.message, {
+                    action,
+                    code: e.code
+                });
+            }
+        }
         this.method = method;
         this.url = this.baseUrl;
         let { secretId, secretKey, token } = this.cloudBaseContext;

package/package.json

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

package/types/context.d.ts

@@ -1,3 +1,15 @@
+/**
+ * 自定义 API 请求函数，由外部注入，替代 TC3 签名发请求。
+ * 入参对齐 CAPI 模式：service + action + version + region + payload。
+ * 返回腾讯云 API 响应中 Response 字段的内容（已解包，不含 Response 包装层）。
+ */
+export type CloudApiRequestFn = (params: {
+    service: string;
+    action: string;
+    version: string;
+    region: string;
+    payload: Record<string, any>;
+}) => Promise<any>;
 export declare class CloudBaseContext {
     readonly secretId: string;
     readonly secretKey: string;
@@ -8,15 +20,17 @@ export declare class CloudBaseContext {
     readonly envType: string;
     readonly useInternalEndpoint?: boolean;
     readonly internalEndpointRegion?: string;
-    constructor({ secretId, secretKey, token, proxy, region, envType, useInternalEndpoint, internalEndpointRegion }: {
+    readonly requestFn?: CloudApiRequestFn;
+    constructor({ secretId, secretKey, token, proxy, region, envType, useInternalEndpoint, internalEndpointRegion, requestFn }: {
         secretId?: string;
         secretKey?: string;
         token?: string;
         proxy?: string;
         region?: string;
         envType?: string;
-        useInternalEndpoint?: any;
-        internalEndpointRegion?: any;
+        useInternalEndpoint?: boolean;
+        internalEndpointRegion?: string;
+        requestFn?: CloudApiRequestFn;
     });
     isInternalEndpoint(): boolean;
     getInternalEndpointRegion(): string;

package/types/index.d.ts

@@ -5,6 +5,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';
@@ -29,6 +30,7 @@ interface CloudBaseConfig {
     envType?: string;
     useInternalEndpoint?: boolean;
     internalEndpointRegion?: string;
+    requestFn?: CloudApiRequestFn;
 }
 declare class CloudBase {
     private static cloudBase;
@@ -89,4 +91,7 @@ declare class CloudBase {
     getManagerConfig(): CloudBaseConfig;
     get isInternalEndpoint(): Boolean;
 }
+declare namespace CloudBase {
+    type RequestFn = CloudApiRequestFn;
+}
 export = CloudBase;

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>;