@cloudbase/app 3.1.3 → 3.1.5

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cloudbase/app",
-  "version": "3.1.3",
+  "version": "3.1.5",
   "description": "cloudbase javascript sdk core",
   "main": "dist/cjs/index.js",
   "module": "dist/esm/index.js",
@@ -43,8 +43,8 @@
   "dependencies": {
     "@cloudbase/adapter-interface": "^0.7.1",
     "@cloudbase/adapter-wx_mp": "^1.3.1",
-    "@cloudbase/types": "3.1.3",
-    "@cloudbase/utilities": "3.1.3"
+    "@cloudbase/types": "3.1.5",
+    "@cloudbase/utilities": "3.1.5"
   },
   "peerDependencies": {
     "@cloudbase/signature-nodejs": ">=1.0.0",
@@ -62,5 +62,5 @@
       "optional": true
     }
   },
-  "gitHead": "63a9f4c3588fa05f12f225b26750c3133766132b"
+  "gitHead": "63822375a03bda6d80761231321860f2c9ea3980"
 }

package/src/libs/request.ts

@@ -206,135 +206,142 @@ export class CloudbaseRequest implements ICloudbaseRequest {
     },
     customReqOpts?: ICustomReqOpts,
   ): Promise<ResponseObject> {
-    const tcbTraceKey = `x-tcb-trace_${this.config.env}`
-    let contentType = 'application/x-www-form-urlencoded'
+    try {
+      const tcbTraceKey = `x-tcb-trace_${this.config.env}`
+      let contentType = 'application/x-www-form-urlencoded'
+
+      const tmpObj: KV<any> = {
+        action,
+        dataVersion: DATA_VERSION,
+        env: this.config.env,
+        ...params,
+      }
 
-    const tmpObj: KV<any> = {
-      action,
-      dataVersion: DATA_VERSION,
-      env: this.config.env,
-      ...params,
-    }
+      if (ACTIONS_WITHOUT_ACCESSTOKEN.indexOf(action) === -1) {
+        const app = this.config._fromApp
 
-    if (ACTIONS_WITHOUT_ACCESSTOKEN.indexOf(action) === -1) {
-      const app = this.config._fromApp
+        if (!app.oauthInstance) {
+          throw new Error('you can\'t request without auth')
+        }
 
-      if (!app.oauthInstance) {
-        throw new Error('you can\'t request without auth')
+        const { oauthInstance } = app
+        const oauthClient = oauthInstance.oauth2client
+        tmpObj.access_token = (await this.getOauthAccessTokenV2(oauthClient)).accessToken
       }
 
-      const { oauthInstance } = app
-      const oauthClient = oauthInstance.oauth2client
-      tmpObj.access_token = (await this.getOauthAccessTokenV2(oauthClient)).accessToken
-    }
+      // 拼body和content-type
+      let payload
+      if (action === 'storage.uploadFile') {
+        payload = new FormData()
+        Object.keys(payload).forEach((key) => {
+          if (Object.prototype.hasOwnProperty.call(payload, key) && payload[key] !== undefined) {
+            payload.append(key, tmpObj[key])
+          }
+        })
+        contentType = 'multipart/form-data'
+      } else {
+        contentType = 'application/json;charset=UTF-8'
+        payload = {}
+        Object.keys(tmpObj).forEach((key) => {
+          if (tmpObj[key] !== undefined) {
+            payload[key] = tmpObj[key]
+          }
+        })
+      }
+      const opts: any = {
+        headers: {
+          'content-type': contentType,
+          ...this.getDefaultHeaders(),
+          ...options?.headers,
+        },
+      }
+      if (options?.onUploadProgress) {
+        opts.onUploadProgress = options.onUploadProgress
+      }
 
-    // 拼body和content-type
-    let payload
-    if (action === 'storage.uploadFile') {
-      payload = new FormData()
-      Object.keys(payload).forEach((key) => {
-        if (Object.prototype.hasOwnProperty.call(payload, key) && payload[key] !== undefined) {
-          payload.append(key, tmpObj[key])
-        }
-      })
-      contentType = 'multipart/form-data'
-    } else {
-      contentType = 'application/json;charset=UTF-8'
-      payload = {}
-      Object.keys(tmpObj).forEach((key) => {
-        if (tmpObj[key] !== undefined) {
-          payload[key] = tmpObj[key]
-        }
-      })
-    }
-    const opts: any = {
-      headers: {
-        'content-type': contentType,
-        ...this.getDefaultHeaders(),
-        ...options?.headers,
-      },
-    }
-    if (options?.onUploadProgress) {
-      opts.onUploadProgress = options.onUploadProgress
-    }
+      if (this.config.region) {
+        opts.headers['X-TCB-Region'] = this.config.region
+      }
 
-    if (this.config.region) {
-      opts.headers['X-TCB-Region'] = this.config.region
-    }
+      const traceHeader = this.localCache.getStore(tcbTraceKey)
+      if (traceHeader) {
+        opts.headers['X-TCB-Trace'] = traceHeader
+      }
 
-    const traceHeader = this.localCache.getStore(tcbTraceKey)
-    if (traceHeader) {
-      opts.headers['X-TCB-Trace'] = traceHeader
-    }
+      // 发出请求
+      // 新的 url 需要携带 env 参数进行 CORS 校验
+      // 请求链接支持添加动态 query 参数，方便用户调试定位请求
+      const parse = options?.parse !== undefined ? options.parse : params.parse
+      const inQuery = options?.inQuery !== undefined ? options.inQuery : params.inQuery
+      const search = options?.search !== undefined ? options.search : params.search
 
-    // 发出请求
-    // 新的 url 需要携带 env 参数进行 CORS 校验
-    // 请求链接支持添加动态 query 参数，方便用户调试定位请求
-    const parse = options?.parse !== undefined ? options.parse : params.parse
-    const inQuery = options?.inQuery !== undefined ? options.inQuery : params.inQuery
-    const search = options?.search !== undefined ? options.search : params.search
+      let formatQuery: Record<string, any> = {
+        ...(options?.defaultQuery || {}),
+        env: this.config.env,
+      }
+      // 尝试解析响应数据为 JSON
+      parse && (formatQuery.parse = true)
+      inQuery
+        && (formatQuery = {
+          ...inQuery,
+          ...formatQuery,
+        })
+
+      const endPointMode = options?.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`
+        }
+      }
 
-    let formatQuery: Record<string, any> = {
-      ...(options?.defaultQuery || {}),
-      env: this.config.env,
-    }
-    // 尝试解析响应数据为 JSON
-    parse && (formatQuery.parse = true)
-    inQuery
-      && (formatQuery = {
-        ...inQuery,
-        ...formatQuery,
-      })
-
-    const endPointMode = options?.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, endPointMode)?.replace(/^https?:/, '')}/${options.pathname}`,
+          formatQuery,
+        )
+      } else {
+        newUrl = formatUrl(PROTOCOL, BASE_URL, formatQuery)
       }
-    }
 
-    // 生成请求 url
-    let newUrl
-    if (options.pathname) {
-      newUrl = formatUrl(
-        PROTOCOL,
-        `${getBaseEndPoint(this.config.env, endPointMode)?.replace(/^https?:/, '')}/${options.pathname}`,
-        formatQuery,
-      )
-    } else {
-      newUrl = formatUrl(PROTOCOL, BASE_URL, formatQuery)
-    }
+      if (search) {
+        newUrl += search
+      }
 
-    if (search) {
-      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']
+      if (resTraceHeader) {
+        this.localCache.setStore(tcbTraceKey, resTraceHeader)
+      }
 
-    // 保存 trace header
-    const resTraceHeader = res.header?.['x-tcb-trace']
-    if (resTraceHeader) {
-      this.localCache.setStore(tcbTraceKey, resTraceHeader)
-    }
+      if ((Number(res.status) !== 200 && Number(res.statusCode) !== 200) || !res.data) {
+        throw new Error('network request error')
+      }
 
-    if ((Number(res.status) !== 200 && Number(res.statusCode) !== 200) || !res.data) {
-      throw new Error('network request error')
+      return res
+    } catch (err) {
+      try {
+        err.requestId = err.requestId || options?.headers['x-request-id'] || options?.headers['X-Request-Id'] || ''
+      } catch (error) {}
+      throw err
     }
-
-    return res
   }
 
   public async fetch(options: IFetchOptions & { token?: string; customReqOpts?: ICustomReqOpts },): Promise<ResponseObject> {
@@ -357,6 +364,9 @@ export class CloudbaseRequest implements ICloudbaseRequest {
       const result = await doFetch()
       return result
     } catch (err) {
+      try {
+        err.requestId = err.requestId || headers['x-request-id'] || headers['X-Request-Id'] || ''
+      } catch (error) {}
       if (err?.code === 'ACCESS_TOKEN_EXPIRED') {
         // 如果是因为 token 过期失败，刷 token 后再试一次
         if (typeof this.config?._fromApp?.oauthInstance?.authApi?.refreshTokenForce !== 'function') {