@cloudbase/app 3.0.0 → 3.0.2

package/src/constants/common.ts

@@ -1,5 +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
 /**
@@ -23,15 +26,16 @@ export function getSdkName() {
 }
 export const DATA_VERSION = '2020-01-10'
 
-export type EndPointKey = 'CLOUD_API' | 'GATEWAY'
-
 interface EndPointInfo {
   env: string
   endPointKey: EndPointKey
   region?: string
   baseUrl?: string
-  protocol?: string
+  protocol?: Protocol
 }
+
+type Protocol = 'http' | 'https' | 'http:' | 'https:'
+
 /**
  *  所有 endPoint 信息
  *  避免直接操作该数组
@@ -42,18 +46,25 @@ const END_POINT_INFO_ARR: Array<EndPointInfo> = []
 /** 用来查找 endPoint 的字段 */
 const END_POINT_INFO_SEARCH_KEYS = ['env', 'endPointKey', 'region']
 
-const DEFAULT_PROTOCOL = 'https:'
+export const DEFAULT_PROTOCOL: 'http:' | 'https:' = 'https:'
 
 function findMatchedInfo(info: EndPointInfo) {
+  // eslint-disable-next-line max-len, eqeqeq
   return END_POINT_INFO_ARR.find(targetInfo => END_POINT_INFO_SEARCH_KEYS.filter(searchKey => info[searchKey] != null).every(searchKey => targetInfo[searchKey] === info[searchKey],),)
 }
 
 export function setEndPointInfo(newInfo: EndPointInfo) {
+  if (newInfo.protocol && !/:$/.test(newInfo.protocol)) {
+    newInfo.protocol = `${newInfo.protocol}:` as Protocol
+  }
+
   const endPointInfo = findMatchedInfo(newInfo)
   if (endPointInfo) {
+    // eslint-disable-next-line eqeqeq
     if (newInfo.baseUrl != null) {
       endPointInfo.baseUrl = newInfo.baseUrl
     }
+    // eslint-disable-next-line eqeqeq
     if (newInfo.protocol != null) {
       endPointInfo.protocol = newInfo.protocol
     }
@@ -63,7 +74,7 @@ export function setEndPointInfo(newInfo: EndPointInfo) {
 
   // 保持旧代码逻辑
   if (newInfo.endPointKey === 'CLOUD_API') {
-    setUtilitiesProtocol((newInfo.protocol ?? DEFAULT_PROTOCOL) as 'http' | 'https')
+    setUtilitiesProtocol((newInfo.protocol ?? DEFAULT_PROTOCOL) as 'http:' | 'https:')
   }
 }
 
@@ -77,18 +88,23 @@ 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?: Protocol, 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 = region
-    ? `//${env}.${region}.tcb-api.tencentcloudapi.com/web`
-    : `//${env}.ap-shanghai.tcb-api.tencentcloudapi.com/web`
+export function setRegionLevelEndpoint(env: string, region: string, protocol?: Protocol) {
+  const baseUrl = `//${env}.${region || 'ap-shanghai'}.tcb-api.tencentcloudapi.com/web`
   setEndPointInfo({ env, region, baseUrl, protocol, endPointKey: 'CLOUD_API' })
 }
 
-export function getBaseEndPoint(env: string) {
-  const info = getEndPointInfo(env, 'CLOUD_API')
+export function getBaseEndPoint(env: string, endPointKey: EndPointKey = 'CLOUD_API') {
+  const info = getEndPointInfo(env, endPointKey || 'CLOUD_API')
 
   const { protocol: PROTOCOL, baseUrl: BASE_URL } = info
   const webEndpoint = `${PROTOCOL}${BASE_URL}`

package/src/index.d.ts

@@ -1,9 +1,10 @@
 import cloudbase from '@cloudbase/app';
 import { ICloudbase } from '@cloudbase/types';
 declare global {
-    interface Window {
-        cloudbase: ICloudbase;
-    }
+  interface Window {
+    cloudbase: ICloudbase;
+  }
 }
+// @ts-ignore
 export = cloudbase;
 export default cloudbase;

package/src/index.ts

@@ -7,11 +7,12 @@ import {
   ICloudbaseExtension,
   KV,
   ICloudbasePlatformInfo,
+  EndPointKey,
+  ICloudbaseApis,
 } from '@cloudbase/types'
 import { ICloudbaseAuth } from '@cloudbase/types/auth'
-import adapterForWxMp from '@cloudbase/adapter-wx_mp'
 import { registerComponent, registerHook } from './libs/component'
-import { Platform } from './libs/adapter'
+import { getWxDefaultAdapter, Platform } from './libs/adapter'
 import { ICloudbaseComponent, ICloudbaseHook } from '@cloudbase/types/component'
 import { ICloudbaseCache } from '@cloudbase/types/cache'
 import { initCache, getCacheByEnvId, getLocalCache } from './libs/cache'
@@ -23,14 +24,13 @@ import {
   setRegionLevelEndpoint,
   setSdkName,
   setGatewayEndPointWithEnv,
-  type EndPointKey,
   type ISetEndPointWithKey,
   setEndPointInfo,
   getEndPointInfo,
   getSdkVersion,
+  DEFAULT_PROTOCOL,
 } from './constants/common'
 import { i18nProxy, LANGS } from './libs/lang'
-import { generateApis, generateCallApis } from './libs/callApis'
 export { getBaseEndPoint } from './constants/common'
 export { LANGS } from './libs/lang'
 const { useAdapters, useDefaultAdapter } = adapters
@@ -43,7 +43,7 @@ const { catchErrorsDecorator } = helpers
  */
 const DEFAULT_INIT_CONFIG: Partial<ICloudbaseConfig> = {
   timeout: 15000,
-  persistence: 'local',
+  persistence: 'local', // 持久化存储类型
 }
 
 // timeout上限10分钟
@@ -59,6 +59,8 @@ class Cloudbase implements ICloudbase {
   public requestClient: any
   public oauthClient: any
   public version: string
+  public auth: ICloudbase['auth'] & ICloudbaseAuth
+  public apis: ICloudbaseApis
   private cloudbaseConfig: ICloudbaseConfig
 
   constructor(config?: ICloudbaseConfig) {
@@ -88,10 +90,6 @@ class Cloudbase implements ICloudbase {
     return getRequestByEnvId(this.cloudbaseConfig.env)
   }
 
-  get apis(): { [key: string]: typeof generateCallApis } {
-    return generateApis.call(this)
-  }
-
   @catchErrorsDecorator({
     mode: 'sync',
     title: 'Cloudbase 初始化失败',
@@ -109,6 +107,8 @@ class Cloudbase implements ICloudbase {
         msg: 'env must not be specified',
       }),)
     }
+    config.endPointMode = config.endPointMode || 'GATEWAY'
+
     // 初始化时若未兼容平台，则使用默认adapter
     if (!Platform.adapter) {
       this.useDefaultAdapter()
@@ -137,12 +137,23 @@ class Cloudbase implements ICloudbase {
     initCache({ env, persistence, debug, platformInfo: this.platform })
 
     setRegionLevelEndpoint(env, config.region || '')
-    setGatewayEndPointWithEnv(env)
+    setGatewayEndPointWithEnv(env, DEFAULT_PROTOCOL, config.region || '')
 
     const app = new Cloudbase(this.cloudbaseConfig)
-    initRequest({ env, region: config.region || '', timeout, oauthClient, _fromApp: app, i18n })
+    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(app)
+
     return app
   }
 
@@ -233,38 +244,11 @@ class Cloudbase implements ICloudbase {
 
   // 解析URL参数
   public parseCaptcha(url) {
-    let queryObj: any = {}
-    const matched = url.match(/^(data:.*?)(\?[^#\s]*)?$/)
-    if (matched) {
-      url = matched[1]
-      const search = matched[2]
-      if (search) {
-        queryObj = utils.parseQueryString(search)
-      }
-    }
-    const { token, ...restQueryObj } = queryObj
-    if (/^data:/.test(url) && !token) {
-      return {
-        error: 'invalid_argument',
-        error_description: `invalid captcha data: ${url}`,
-      }
-    }
-    if (!token) {
-      return {
-        error: 'unimplemented',
-        error_description: 'need to impl captcha data',
-      }
-    }
-    // 解析url得到的参数
-    return {
-      state: restQueryObj.state,
-      token, // 验证码token
-      captchaData: url, // 验证码base64图片
-    }
+    return utils.parseCaptcha(url)
   }
 
   private useDefaultAdapter() {
-    const { adapter, runtime } = useDefaultAdapter()
+    const { adapter, runtime } = useDefaultAdapter.bind(this)()
     Platform.adapter = adapter as SDKAdapterInterface
     Platform.runtime = runtime as string
   }
@@ -281,9 +265,23 @@ class Cloudbase implements ICloudbase {
         return timeout
     }
   }
+
+  private try2InitAuth(app) {
+    try {
+      app.auth()
+    } catch (error) {
+      console.log('try2InitAuth error:', error)
+    }
+  }
 }
 
+// 类型导出
+export type { Cloudbase }
+
+// 值导出
 export const cloudbase: ICloudbase = new Cloudbase()
-cloudbase.useAdapters(adapterForWxMp)
 
+cloudbase.useAdapters(getWxDefaultAdapter())
+
+// 默认导出实例
 export default cloudbase

package/src/libs/adapter.ts

@@ -1,3 +1,132 @@
 import { ICloudbasePlatformInfo } from '@cloudbase/types'
+import adapterForWxMp, { WxRequest, WxMpWebSocket, wxMpStorage, parseQueryString } from '@cloudbase/adapter-wx_mp'
+import { IUploadRequestOptions, StorageType } from '@cloudbase/adapter-interface'
+
+declare const wx: any
+declare const App: any
+declare const getApp: any
 
 export const Platform: ICloudbasePlatformInfo = {}
+
+export const getWxDefaultAdapter = () => {
+  WxRequest.prototype.upload = function (options: IUploadRequestOptions) {
+    // eslint-disable-next-line @typescript-eslint/no-this-alias
+    const self = this
+    return new Promise((resolve) => {
+      const { url, file, data, headers } = options
+      const fs = wx.getFileSystemManager() // 读取文件 二进制内容
+      const task = wx.request({
+        url,
+        method: options.method,
+        header: {
+          'content-type': ' ', // 小程序 content-type 默认为 application/json， 这里一定要强制为 空， 否则签名错误
+          ...headers,
+        },
+        data: fs.readFileSync(file), // 将二进制文件转为字符串直接赋值到 request payload， 不要以 form 的方式传输
+        timeout: this._timeout,
+        success(res: { statusCode: number; data: unknown }) {
+          const result = {
+            statusCode: res.statusCode,
+            data: res.data || {},
+          }
+          if (res.statusCode === 200 && data?.success_action_status) {
+            result.statusCode = parseInt(data.success_action_status, 10)
+          }
+          resolve(result)
+        },
+        fail(err: unknown) {
+          resolve(err)
+        },
+        complete(err: { errMsg: string }) {
+          if (!err?.errMsg) {
+            return
+          }
+          if (!self._timeout || self._restrictedMethods.indexOf('upload') === -1) {
+            return
+          }
+          const { errMsg } = err
+          if (errMsg === 'request:fail timeout') {
+            console.warn(self._timeoutMsg)
+            try {
+              task.abort()
+            } catch (e) {}
+          }
+        },
+      })
+    })
+  }
+
+  function isPlugin() {
+    return (
+      typeof App === 'undefined'
+      && typeof getApp === 'undefined'
+      && !wx.onAppHide
+      && !wx.offAppHide
+      && !wx.onAppShow
+      && !wx.offAppShow
+    )
+  }
+  adapterForWxMp.genAdapter = function genAdapter(options) {
+    const adapter = {
+      root: { globalThis: {} },
+      reqClass: WxRequest,
+      wsClass: WxMpWebSocket,
+      captchaOptions: {
+        openURIWithCallback: (_url: string) => {
+          // eslint-disable-next-line @typescript-eslint/naming-convention
+          const { EventBus } = options
+          let queryObj: Record<string, string> = {}
+          let url = _url
+          console.log('openURIWithCallback', _url)
+          const matched = _url.match(/^(data:.*?)(\?[^#\s]*)?$/)
+          if (matched) {
+            // eslint-disable-next-line prefer-destructuring
+            url = matched[1]
+            console.log('openURIWithCallback url', url)
+            const search = matched[2]
+            if (search) {
+              queryObj = parseQueryString(search)
+            }
+          }
+          console.log('openURIWithCallback queryObj', queryObj)
+          const { token, ...restQueryObj } = queryObj
+          if (/^data:/.test(url) && !token) {
+            // 如果是 data: 开头的 URL 且没有 token，则直接返回
+            return Promise.reject({
+              error: 'invalid_argument',
+              error_description: `invalie captcha data: ${_url}`,
+            })
+          }
+          if (!token) {
+            return Promise.reject({
+              error: 'unimplemented',
+              error_description: 'need to impl captcha data',
+            })
+          }
+          return new Promise((resolve) => {
+            console.log('wait for captcha...')
+            EventBus.$emit('CAPTCHA_DATA_CHANGE', { ...restQueryObj, token, url })
+
+            // 监听事件总线，等待验证码数据变化
+            EventBus.$once('RESOLVE_CAPTCHA_DATA', (res: { captcha_token: string; expires_in: number }) => {
+              resolve(res)
+            })
+          })
+        },
+      },
+      localStorage: wxMpStorage,
+      primaryStorage: StorageType.local,
+      getAppSign() {
+        const info = wx.getAccountInfoSync()
+        if (isPlugin()) {
+          // 插件环境返回插件appid
+          return info && info.plugin ? info.plugin.appId : ''
+        }
+        return info && info.miniProgram ? info.miniProgram.appId : ''
+      },
+    }
+    return adapter
+  }
+
+  return adapterForWxMp
+}

package/src/libs/request.ts

@@ -8,7 +8,8 @@ import {
   IFetchOptions,
 } from '@cloudbase/adapter-interface'
 import { utils, constants, langEvent } from '@cloudbase/utilities'
-import { KV } from '@cloudbase/types'
+import { EndPointKey, KV } from '@cloudbase/types'
+import { ICustomReqOpts } from '@cloudbase/types/functions'
 import {
   IGetAccessTokenResult,
   ICloudbaseRequestConfig,
@@ -79,6 +80,14 @@ function beforeEach(): IAppendedRequestInfo {
     },
   }
 }
+export interface IGateWayOptions {
+  name?: string
+  data?: any
+  path?: string
+  method: string
+  header?: {}
+  url?: string
+}
 export interface ICloudbaseRequest {
   post: (options: IRequestOptions) => Promise<ResponseObject>
   upload: (options: IUploadRequestOptions) => Promise<ResponseObject>
@@ -112,21 +121,47 @@ export class CloudbaseRequest implements ICloudbaseRequest {
     this.reqClass = new Platform.adapter.reqClass(reqConfig)
     this.throwWhenRequestFail = config.throw || false
     this.localCache = getLocalCache(this.config.env)
-    bindHooks(this.reqClass, 'post', [beforeEach])
-    bindHooks(this.reqClass, 'upload', [beforeEach])
-    bindHooks(this.reqClass, 'download', [beforeEach])
+
+    if (this.config.endPointMode !== 'GATEWAY') {
+      bindHooks(this.reqClass, 'post', [beforeEach])
+      bindHooks(this.reqClass, 'upload', [beforeEach])
+      bindHooks(this.reqClass, 'download', [beforeEach])
+    }
 
     langEvent.bus.on(langEvent.LANG_CHANGE_EVENT, (params) => {
       this.config.i18n = params.data?.i18n || this.config.i18n
     })
   }
 
+  public async getAccessToken(token = null) {
+    // eslint-disable-next-line eqeqeq
+    if (token != null) {
+      return token
+    }
+    const app = this.config._fromApp
+
+    if (!app.oauthInstance) {
+      throw new Error('you can\'t request without auth')
+    }
+
+    const { oauthInstance } = app
+    const oauthClient = oauthInstance.oauth2client
+    return (await this.getOauthAccessTokenV2(oauthClient)).accessToken
+  }
+
   public getDefaultHeaders() {
-    return { [this.config.i18n?.LANG_HEADER_KEY]: this.config.i18n?.lang }
+    return {
+      [this.config.i18n?.LANG_HEADER_KEY]: this.config.i18n?.lang,
+      'X-SDK-Version': `@cloudbase/js-sdk/${getSdkVersion()}`,
+    }
   }
 
-  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> {
@@ -134,12 +169,15 @@ 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
   }
 
-  public getBaseEndPoint() {
-    return getBaseEndPoint(this.config.env)
+  public getBaseEndPoint(endPointKey: EndPointKey = 'CLOUD_API') {
+    return getBaseEndPoint(this.config.env, endPointKey)
   }
 
   public async getOauthAccessTokenV2(oauthClient: any): Promise<IGetAccessTokenResult> {
@@ -162,7 +200,9 @@ export class CloudbaseRequest implements ICloudbaseRequest {
       inQuery?: KV<any>
       search?: string
       defaultQuery?: KV<any>
+      headers?: KV<string>
     },
+    customReqOpts?: ICustomReqOpts,
   ): Promise<ResponseObject> {
     const tcbTraceKey = `x-tcb-trace_${this.config.env}`
     let contentType = 'application/x-www-form-urlencoded'
@@ -209,6 +249,7 @@ export class CloudbaseRequest implements ICloudbaseRequest {
       headers: {
         'content-type': contentType,
         ...this.getDefaultHeaders(),
+        ...options?.headers,
       },
     }
     if (options?.onUploadProgress) {
@@ -243,13 +284,25 @@ export class CloudbaseRequest implements ICloudbaseRequest {
         ...formatQuery,
       })
 
-    const { baseUrl: BASE_URL, protocol: PROTOCOL } = getEndPointInfo(this.config.env, '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 (endPointMode === 'GATEWAY') {
+      if (/^((database)\.)|(auth\.wsWebSign)/.test(action)) {
+        const url = getEndPointInfo(this.config.env, 'CLOUD_API')
+        BASE_URL = `${url.baseUrl.match(/\/\/([^/?#]*)/)[0]}/web`
+      }
+    }
+
     // 生成请求 url
     let newUrl
     if (options.pathname) {
       newUrl = formatUrl(
         PROTOCOL,
-        `${getBaseEndPoint(this.config.env)?.replace(/^https?:/, '')}/${options.pathname}`,
+        `${getBaseEndPoint(this.config.env, endPointMode)?.replace(/^https?:/, '')}/${options.pathname}`,
         formatQuery,
       )
     } else {
@@ -260,11 +313,14 @@ export class CloudbaseRequest implements ICloudbaseRequest {
       newUrl += search
     }
 
-    const res: ResponseObject = await this.post({
-      url: newUrl,
-      data: payload,
-      ...opts,
-    })
+    const res: ResponseObject = await this.post(
+      {
+        url: newUrl,
+        data: payload,
+        ...opts,
+      },
+      customReqOpts,
+    )
 
     // 保存 trace header
     const resTraceHeader = res.header?.['x-tcb-trace']
@@ -279,22 +335,8 @@ 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) {
-        return token
-      }
-      const app = this.config._fromApp
-
-      if (!app.oauthInstance) {
-        throw new Error('you can\'t request without auth')
-      }
-
-      const { oauthInstance } = app
-      const oauthClient = oauthInstance.oauth2client
-      return (await this.getOauthAccessTokenV2(oauthClient)).accessToken
-    }
 
     const doFetch = async () => this.reqClass.fetch({
       headers: {
@@ -302,7 +344,7 @@ export class CloudbaseRequest implements ICloudbaseRequest {
         // 'X-Request-Id': `${utils.generateRequestId()}`,
         // 'X-Request-Timestamp': `${Date.now()}`,
         'X-SDK-Version': `@cloudbase/js-sdk/${getSdkVersion()}`,
-        Authorization: `Bearer ${await getAccessToken()}`,
+        Authorization: `Bearer ${await this.getAccessToken(token)}`,
         ...this.getDefaultHeaders(),
         ...headers,
       },
@@ -327,8 +369,18 @@ 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({
@@ -339,6 +391,62 @@ export class CloudbaseRequest implements ICloudbaseRequest {
 
     return response.data
   }
+
+  public async gateWay(options: IGateWayOptions, customReqOpts?: ICustomReqOpts) {
+    const { url, name, data, path = '', method, header = {} } = options
+
+    if ((!name || !path) && !url) {
+      throw new Error(JSON.stringify({
+        code: ERRORS.INVALID_PARAMS,
+        msg: '[gateWay] invalid function name or path or url',
+      }),)
+    }
+    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')
+    let endpoint = `${protocol}${baseUrl}${url || `/${path}/${name}`}`
+
+    const isGetAndHead = ['GET', 'HEAD'].includes(method?.toUpperCase?.())
+
+    if (isGetAndHead) {
+      try {
+        let dataParse = {}
+        try {
+          dataParse = JSON.parse(data as any)
+        } catch (error) {
+          dataParse = data || {}
+        }
+        endpoint = `${endpoint}${endpoint.includes('?') ? '&' : '?'}${Object.keys(dataParse)
+          .map(key => `${key}=${dataParse[key]}`)
+          .join('&')}`
+      } catch (error) {
+        //
+      }
+    }
+
+    const response = await this.fetch({
+      method: method || 'POST',
+      headers: {
+        'Content-Type': 'application/json; charset=utf-8',
+        'X-Request-Id': requestId,
+        ...header,
+      },
+      ...(isGetAndHead ? {} : { body: jsonData }),
+      url: endpoint,
+      customReqOpts,
+    })
+
+    return { requestId, ...response, data: await response.data }
+  }
 }
 
 const requestMap: KV<CloudbaseRequest> = {}

package/dist/cjs/libs/callApis.d.ts

@@ -1,9 +0,0 @@
-import { ICallApiOptions, KV } from '@cloudbase/types';
-import { ResponseObject } from '@cloudbase/adapter-interface';
-export declare function callApi(callApiOptions: ICallApiOptions, opts: KV<any>): Promise<ResponseObject['data']>;
-export declare function generateCallApis(apiName: string): {
-    [apiName: string]: typeof callApi;
-};
-export declare function generateApis(): {
-    [apiName: string]: typeof generateCallApis;
-};