@cloudbase/app 2.21.5 → 2.21.7

package/src/constants/common.ts

@@ -1,6 +1,8 @@
 import { EndPointKey } from '@cloudbase/types'
 import { constants } from '@cloudbase/utilities'
 
+const ZONE_CHINA = ['ap-shanghai', 'ap-guangzhou', 'ap-shenzhen-fsi', 'ap-shanghai-fsi', 'ap-nanjing', 'ap-beijing', 'ap-chengdu', 'ap-chongqing', 'ap-hongkong']
+
 // @ts-ignore
 const { setSdkName: setUtilitiesSdkName, setProtocol: setUtilitiesProtocol } = constants
 /**
@@ -76,8 +78,15 @@ export interface ISetEndPointWithKey {
   protocol?: 'http' | 'https'
 }
 
-export function setGatewayEndPointWithEnv(env: string, protocol?: 'http' | 'https') {
-  setEndPointInfo({ endPointKey: 'GATEWAY', env, baseUrl: `//${env}.api.tcloudbasegateway.com/v1`, protocol })
+export function setGatewayEndPointWithEnv(env: string, protocol?: 'http' | 'https', region = 'ap-shanghai') {
+  region = region || 'ap-shanghai'
+  let baseUrl = `//${env}.api.tcloudbasegateway.com/v1`
+
+  if (!ZONE_CHINA.includes(region)) {
+    baseUrl = `//${env}.api.intl.tcloudbasegateway.com/v1`
+  }
+
+  setEndPointInfo({ endPointKey: 'GATEWAY', env, baseUrl, protocol })
 }
 export function setRegionLevelEndpoint(env: string, region: string, protocol?: 'http' | 'https') {
   const baseUrl = `//${env}.${region || 'ap-shanghai'}.tcb-api.tencentcloudapi.com/web`

package/src/index.ts

@@ -138,7 +138,7 @@ class Cloudbase implements ICloudbase {
     initCache({ env, persistence, debug, platformInfo: this.platform })
 
     setRegionLevelEndpoint(env, config.region || '')
-    setGatewayEndPointWithEnv(env)
+    setGatewayEndPointWithEnv(env, 'https', config.region || '')
 
     const app = new Cloudbase(this.cloudbaseConfig)
     initRequest({

package/src/libs/request.ts

@@ -80,6 +80,13 @@ function beforeEach(): IAppendedRequestInfo {
     },
   }
 }
+export interface IGateWayOptions {
+  name: string
+  data?: any
+  path: string
+  method: string
+  header?: {}
+}
 export interface ICloudbaseRequest {
   post: (options: IRequestOptions) => Promise<ResponseObject>
   upload: (options: IUploadRequestOptions) => Promise<ResponseObject>
@@ -127,7 +134,11 @@ export class CloudbaseRequest implements ICloudbaseRequest {
   }
 
   public async post(options: IRequestOptions, customReqOpts?: ICustomReqOpts): Promise<ResponseObject> {
-    const res = await this.reqClass.post({ ...options, headers: { ...options.headers, ...this.getDefaultHeaders() }, customReqOpts })
+    const res = await this.reqClass.post({
+      ...options,
+      headers: { ...options.headers, ...this.getDefaultHeaders() },
+      customReqOpts,
+    })
     return res
   }
   public async upload(options: IUploadRequestOptions): Promise<ResponseObject> {
@@ -135,7 +146,10 @@ export class CloudbaseRequest implements ICloudbaseRequest {
     return res
   }
   public async download(options: IRequestOptions): Promise<ResponseObject> {
-    const res = await this.reqClass.download({ ...options, headers: { ...options.headers, ...this.getDefaultHeaders() } })
+    const res = await this.reqClass.download({
+      ...options,
+      headers: { ...options.headers, ...this.getDefaultHeaders() },
+    })
     return res
   }
 
@@ -164,7 +178,7 @@ export class CloudbaseRequest implements ICloudbaseRequest {
       search?: string
       defaultQuery?: KV<any>
     },
-    customReqOpts?: ICustomReqOpts
+    customReqOpts?: ICustomReqOpts,
   ): Promise<ResponseObject> {
     const tcbTraceKey = `x-tcb-trace_${this.config.env}`
     let contentType = 'application/x-www-form-urlencoded'
@@ -271,11 +285,14 @@ export class CloudbaseRequest implements ICloudbaseRequest {
       newUrl += search
     }
 
-    const res: ResponseObject = await this.post({
-      url: newUrl,
-      data: payload,
-      ...opts,
-    }, customReqOpts)
+    const res: ResponseObject = await this.post(
+      {
+        url: newUrl,
+        data: payload,
+        ...opts,
+      },
+      customReqOpts,
+    )
 
     // 保存 trace header
     const resTraceHeader = res.header?.['x-tcb-trace']
@@ -290,7 +307,7 @@ export class CloudbaseRequest implements ICloudbaseRequest {
     return res
   }
 
-  public async fetch(options: IFetchOptions & { token?: string }): Promise<ResponseObject> {
+  public async fetch(options: IFetchOptions & { token?: string; customReqOpts?: ICustomReqOpts },): Promise<ResponseObject> {
     const { token, headers = {}, ...restOptions } = options
     const getAccessToken = async () => {
       if (token != null) {
@@ -338,8 +355,18 @@ export class CloudbaseRequest implements ICloudbaseRequest {
     }
   }
 
-  public async send(action: string, data: KV<any> = {}, options: KV<any> = {}, customReqOpts?: ICustomReqOpts): Promise<any> {
-    const response = await this.request(action, data, { ...options, onUploadProgress: data.onUploadProgress }, customReqOpts)
+  public async send(
+    action: string,
+    data: KV<any> = {},
+    options: KV<any> = {},
+    customReqOpts?: ICustomReqOpts,
+  ): Promise<any> {
+    const response = await this.request(
+      action,
+      data,
+      { ...options, onUploadProgress: data.onUploadProgress },
+      customReqOpts,
+    )
 
     if (response.data.code && this.throwWhenRequestFail) {
       throw new Error(JSON.stringify({
@@ -350,6 +377,43 @@ export class CloudbaseRequest implements ICloudbaseRequest {
 
     return response.data
   }
+
+  public async gateWay(options: IGateWayOptions, customReqOpts?: ICustomReqOpts) {
+    const { name, data, path = '', method, header = {} } = options
+
+    if (!name || !path) {
+      throw new Error(JSON.stringify({
+        code: ERRORS.INVALID_PARAMS,
+        msg: '[gateWay] invalid function name or path',
+      }),)
+    }
+    let jsonData
+    try {
+      jsonData = data ? JSON.stringify(data) : ''
+    } catch (e) {
+      throw new Error(JSON.stringify({
+        code: ERRORS.INVALID_PARAMS,
+        msg: '[gateWay] invalid data',
+      }),)
+    }
+
+    const requestId = utils.generateRequestId()
+    const { baseUrl, protocol } = getEndPointInfo(this.config.env, 'GATEWAY')
+    const endpoint = `${protocol}${baseUrl}/${path}/${name}`
+    const response = await this.fetch({
+      method: method || 'POST',
+      headers: {
+        'Content-Type': 'application/json; charset=utf-8',
+        'X-Request-Id': requestId,
+        ...header,
+      },
+      body: jsonData,
+      url: endpoint,
+      customReqOpts,
+    })
+
+    return { requestId, ...response, data: await response.data }
+  }
 }
 
 const requestMap: KV<CloudbaseRequest> = {}