@cloudbase/app 2.25.2 → 2.25.3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cloudbase/app",
-  "version": "2.25.2",
+  "version": "2.25.3",
   "description": "cloudbase javascript sdk core",
   "main": "dist/cjs/index.js",
   "module": "dist/esm/index.js",
@@ -31,8 +31,8 @@
   "dependencies": {
     "@cloudbase/adapter-interface": "^0.7.1",
     "@cloudbase/adapter-wx_mp": "^1.2.1",
-    "@cloudbase/types": "2.25.2",
-    "@cloudbase/utilities": "2.25.2"
+    "@cloudbase/types": "2.25.3",
+    "@cloudbase/utilities": "2.25.3"
   },
-  "gitHead": "a969396226f0243d84c914ebda039e58a1158674"
+  "gitHead": "2bf2f90d89b7e9b2a4bd232836f32b5f46868bb5"
 }

package/src/libs/request.ts

@@ -48,19 +48,18 @@ function bindHooks(instance: SDKRequestInterface, name: string, hooks: IRequestB
       Object.assign(headers, appendedHeaders)
     })
     const originData = options.data
-    originData
-      && (() => {
-        if (isFormData(originData)) {
-          Object.keys(data).forEach((key) => {
-            (originData as FormData).append(key, data[key])
-          })
-          return
-        }
-        options.data = {
-          ...originData,
-          ...data,
-        }
-      })()
+    originData && (() => {
+      if (isFormData(originData)) {
+        Object.keys(data).forEach((key) => {
+          (originData as FormData).append(key, data[key])
+        })
+        return
+      }
+      options.data = {
+        ...originData,
+        ...data,
+      }
+    })()
     options.headers = {
       ...(options.headers || {}),
       ...headers,
@@ -81,11 +80,12 @@ function beforeEach(): IAppendedRequestInfo {
   }
 }
 export interface IGateWayOptions {
-  name: string
+  name?: string
   data?: any
-  path: string
+  path?: string
   method: string
   header?: {}
+  url?: string
 }
 export interface ICloudbaseRequest {
   post: (options: IRequestOptions) => Promise<ResponseObject>
@@ -277,11 +277,10 @@ export class CloudbaseRequest implements ICloudbaseRequest {
     }
     // 尝试解析响应数据为 JSON
     parse && (formatQuery.parse = true)
-    inQuery
-      && (formatQuery = {
-        ...inQuery,
-        ...formatQuery,
-      })
+    inQuery && (formatQuery = {
+      ...inQuery,
+      ...formatQuery,
+    })
 
     const endPointMode = this.config.endPointMode || 'CLOUD_API'
 
@@ -290,7 +289,7 @@ export class CloudbaseRequest implements ICloudbaseRequest {
     const PROTOCOL = url.protocol
 
     if (endPointMode === 'GATEWAY') {
-      if (/^(database)\./.test(action)) {
+      if (/^((database)\.)|(auth\.wsWebSign)/.test(action)) {
         const url = getEndPointInfo(this.config.env, 'CLOUD_API')
         BASE_URL = `${url.baseUrl.match(/\/\/([^/?#]*)/)[0]}/web`
       }
@@ -392,12 +391,12 @@ export class CloudbaseRequest implements ICloudbaseRequest {
   }
 
   public async gateWay(options: IGateWayOptions, customReqOpts?: ICustomReqOpts) {
-    const { name, data, path = '', method, header = {} } = options
+    const { url, name, data, path = '', method, header = {} } = options
 
-    if (!name || !path) {
+    if ((!name || !path) && !url) {
       throw new Error(JSON.stringify({
         code: ERRORS.INVALID_PARAMS,
-        msg: '[gateWay] invalid function name or path',
+        msg: '[gateWay] invalid function name or path or url',
       }),)
     }
     let jsonData
@@ -412,7 +411,7 @@ export class CloudbaseRequest implements ICloudbaseRequest {
 
     const requestId = utils.generateRequestId()
     const { baseUrl, protocol } = getEndPointInfo(this.config.env, 'GATEWAY')
-    const endpoint = `${protocol}${baseUrl}/${path}/${name}`
+    const endpoint = `${protocol}${baseUrl}${url || `/${path}/${name}`}`
     const response = await this.fetch({
       method: method || 'POST',
       headers: {
@@ -420,7 +419,7 @@ export class CloudbaseRequest implements ICloudbaseRequest {
         'X-Request-Id': requestId,
         ...header,
       },
-      body: jsonData,
+      ...(['GET', 'HEAD'].includes(method?.toUpperCase?.()) ? {} : { body: jsonData }),
       url: endpoint,
       customReqOpts,
     })