@cloudbase/app 2.21.2 → 2.21.4

package/src/index.ts

@@ -8,6 +8,7 @@ import {
   KV,
   ICloudbasePlatformInfo,
   EndPointKey,
+  ICloudbaseApis,
 } from '@cloudbase/types'
 import { ICloudbaseAuth } from '@cloudbase/types/auth'
 import adapterForWxMp from '@cloudbase/adapter-wx_mp'
@@ -30,7 +31,7 @@ import {
   getSdkVersion,
 } from './constants/common'
 import { i18nProxy, LANGS } from './libs/lang'
-import { generateApis, generateCallApis } from './libs/callApis'
+import { generateApis } from './libs/callApis'
 export { getBaseEndPoint } from './constants/common'
 export { LANGS } from './libs/lang'
 const { useAdapters, useDefaultAdapter } = adapters
@@ -88,7 +89,7 @@ class Cloudbase implements ICloudbase {
     return getRequestByEnvId(this.cloudbaseConfig.env)
   }
 
-  get apis(): { [key: string]: typeof generateCallApis } {
+  get apis(): ICloudbaseApis {
     return generateApis.call(this)
   }
 
@@ -140,7 +141,15 @@ class Cloudbase implements ICloudbase {
     setGatewayEndPointWithEnv(env)
 
     const app = new Cloudbase(this.cloudbaseConfig)
-    initRequest({ env, region: config.region || '', timeout, oauthClient, _fromApp: app, i18n, endPointMode: config.endPointMode })
+    initRequest({
+      env,
+      region: config.region || '',
+      timeout,
+      oauthClient,
+      _fromApp: app,
+      i18n,
+      endPointMode: config.endPointMode,
+    })
     app.requestClient = this.requestClient
     ;(this as any)?.fire?.('cloudbase_init', app)
     this.try2InitAuth(config, app)

package/src/libs/callApis.ts

@@ -34,7 +34,7 @@ export async function callApi(callApiOptions: ICallApiOptions, opts: KV<any>):
 
 const SUPPORT_METHODS = ['GET', 'POST', 'PUT', 'DELETE', 'HEAD', 'OPTIONS', 'PATCH', 'REQUEST']
 
-export function generateCallApis(apiName: string): { [apiName: string]: typeof callApi} {
+export function generateCallApis(apiName: string): { [method: string]: typeof callApi} {
   return new Proxy({}, {
     get: (_, method) => {
       if (typeof method !== 'string') {

package/src/libs/request.ts

@@ -9,6 +9,7 @@ import {
 } from '@cloudbase/adapter-interface'
 import { utils, constants, langEvent } from '@cloudbase/utilities'
 import { EndPointKey, KV } from '@cloudbase/types'
+import { ICustomReqOpts } from '@cloudbase/types/functions'
 import {
   IGetAccessTokenResult,
   ICloudbaseRequestConfig,
@@ -125,8 +126,8 @@ export class CloudbaseRequest implements ICloudbaseRequest {
     return { [this.config.i18n?.LANG_HEADER_KEY]: this.config.i18n?.lang }
   }
 
-  public async post(options: IRequestOptions): Promise<ResponseObject> {
-    const res = await this.reqClass.post({ ...options, headers: { ...options.headers, ...this.getDefaultHeaders() } })
+  public async post(options: IRequestOptions, customReqOpts?: ICustomReqOpts): Promise<ResponseObject> {
+    const res = await this.reqClass.post({ ...options, headers: { ...options.headers, ...this.getDefaultHeaders() }, customReqOpts })
     return res
   }
   public async upload(options: IUploadRequestOptions): Promise<ResponseObject> {
@@ -163,6 +164,7 @@ export class CloudbaseRequest implements ICloudbaseRequest {
       search?: string
       defaultQuery?: KV<any>
     },
+    customReqOpts?: ICustomReqOpts
   ): Promise<ResponseObject> {
     const tcbTraceKey = `x-tcb-trace_${this.config.env}`
     let contentType = 'application/x-www-form-urlencoded'
@@ -243,13 +245,22 @@ export class CloudbaseRequest implements ICloudbaseRequest {
         ...formatQuery,
       })
 
-    const { baseUrl: BASE_URL, protocol: PROTOCOL } = getEndPointInfo(this.config.env, this.config.endPointMode || 'CLOUD_API')
+    const endPointMode = this.config.endPointMode || 'CLOUD_API'
+
+    const url = getEndPointInfo(this.config.env, endPointMode)
+    let BASE_URL = url.baseUrl
+    const PROTOCOL = url.protocol
+
+    if ((action === 'functions.invokeFunction' || /^(storage|database)\./.test(action)) && endPointMode === 'GATEWAY') {
+      BASE_URL = `${BASE_URL.match(/\/\/([^/?#]*)/)[0]}/web`
+    }
+
     // 生成请求 url
     let newUrl
     if (options.pathname) {
       newUrl = formatUrl(
         PROTOCOL,
-        `${getBaseEndPoint(this.config.env, this.config.endPointMode || 'CLOUD_API')?.replace(/^https?:/, '')}/${options.pathname}`,
+        `${getBaseEndPoint(this.config.env, endPointMode)?.replace(/^https?:/, '')}/${options.pathname}`,
         formatQuery,
       )
     } else {
@@ -264,7 +275,7 @@ export class CloudbaseRequest implements ICloudbaseRequest {
       url: newUrl,
       data: payload,
       ...opts,
-    })
+    }, customReqOpts)
 
     // 保存 trace header
     const resTraceHeader = res.header?.['x-tcb-trace']
@@ -327,8 +338,8 @@ export class CloudbaseRequest implements ICloudbaseRequest {
     }
   }
 
-  public async send(action: string, data: KV<any> = {}, options: KV<any> = {}): Promise<any> {
-    const response = await this.request(action, data, { ...options, onUploadProgress: data.onUploadProgress })
+  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({