@cloudbase/app 2.25.2 → 2.25.4

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cloudbase/app",
-  "version": "2.25.2",
+  "version": "2.25.4",
   "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.4",
+    "@cloudbase/utilities": "2.25.4"
   },
-  "gitHead": "a969396226f0243d84c914ebda039e58a1158674"
+  "gitHead": "cb3b43f79a34d6216a45f065ab940c4225fe55d5"
 }

package/src/libs/request.ts

@@ -81,11 +81,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>
@@ -290,7 +291,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 +393,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 +413,26 @@ export class CloudbaseRequest implements ICloudbaseRequest {
 
     const requestId = utils.generateRequestId()
     const { baseUrl, protocol } = getEndPointInfo(this.config.env, 'GATEWAY')
-    const endpoint = `${protocol}${baseUrl}/${path}/${name}`
+    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: {
@@ -420,7 +440,7 @@ export class CloudbaseRequest implements ICloudbaseRequest {
         'X-Request-Id': requestId,
         ...header,
       },
-      body: jsonData,
+      ...(isGetAndHead ? {} : { body: jsonData }),
       url: endpoint,
       customReqOpts,
     })