@cloudbase/app 2.22.1 → 2.22.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cloudbase/app",
-  "version": "2.22.1",
+  "version": "2.22.2",
   "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.22.1",
-    "@cloudbase/utilities": "2.22.1"
+    "@cloudbase/types": "2.22.2",
+    "@cloudbase/utilities": "2.22.2"
   },
-  "gitHead": "46ebb16422f02fb8cef279ad16d590ad6115abe1"
+  "gitHead": "7e8ca8a2f3834924a14320c383e671cada829d19"
 }

package/src/constants/common.ts

@@ -49,6 +49,7 @@ const END_POINT_INFO_SEARCH_KEYS = ['env', 'endPointKey', 'region']
 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],),)
 }
 
@@ -59,9 +60,11 @@ export function setEndPointInfo(newInfo: EndPointInfo) {
 
   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
     }

package/src/index.ts

@@ -247,6 +247,7 @@ class Cloudbase implements ICloudbase {
     let queryObj: any = {}
     const matched = url.match(/^(data:.*?)(\?[^#\s]*)?$/)
     if (matched) {
+      // eslint-disable-next-line prefer-destructuring
       url = matched[1]
       const search = matched[2]
       if (search) {

package/src/libs/adapter.ts

@@ -73,12 +73,14 @@ export const getWxDefaultAdapter = () => {
       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]

package/src/libs/callApis.ts

@@ -2,7 +2,7 @@ import { ERRORS } from '@cloudbase/utilities/dist/cjs/constants'
 import { ICallApiOptions, KV } from '@cloudbase/types'
 import { ResponseObject } from '@cloudbase/adapter-interface'
 
-export async function callApi(callApiOptions: ICallApiOptions, opts: KV<any>):  Promise<ResponseObject['data']> {
+export async function callApi(callApiOptions: ICallApiOptions, opts?: KV<any>): Promise<ResponseObject['data']> {
   const { name, body, path = '', method = 'POST', headers = {}, token } = callApiOptions || {}
 
   if (!name) {
@@ -33,9 +33,10 @@ export async function callApi(callApiOptions: ICallApiOptions, opts: KV<any>):
 }
 
 const SUPPORT_METHODS = ['GET', 'POST', 'PUT', 'DELETE', 'HEAD', 'OPTIONS', 'PATCH', 'REQUEST']
+declare type MethodType = 'request' | 'post' | 'get' | 'head' | 'patch' | 'delete' | 'put'
 
-export function generateCallApis(apiName: string): { [method: string]: typeof callApi} {
-  return new Proxy({}, {
+export function generateCallApis(apiName: string): { [method in MethodType]: typeof callApi } {
+  return new Proxy({} as any, {
     get: (_, method) => {
       if (typeof method !== 'string') {
         throw new Error('[apis] method must be string')
@@ -47,21 +48,28 @@ export function generateCallApis(apiName: string): { [method: string]: typeof ca
         throw new Error(`[apis] invalid method: ${method}`)
       }
 
-      return async (callApiOptions: ICallApiOptions, opts: KV<any>) => await callApi.call(this, {
-        name: apiName,
-        method: (upMethod === 'REQUEST' ? callApiOptions.method : upMethod) || 'POST',
-        ...callApiOptions,
-      }, opts)
+      return async (callApiOptions: ICallApiOptions, opts: KV<any>) => await callApi.call(
+        this,
+        {
+          name: apiName,
+          method: (upMethod === 'REQUEST' ? callApiOptions.method : upMethod) || 'POST',
+          ...callApiOptions,
+        },
+        opts,
+      )
     },
   })
 }
 
-export function generateApis(): { [apiName: string]: typeof generateCallApis} {
-  return new Proxy({}, {
-    get: (_, apiName) => {
-      if (typeof apiName === 'string') {
-        return generateCallApis.call(this, apiName)
-      }
+export function generateApis(): { [apiName: string]: { [method in MethodType]: typeof callApi } } {
+  return new Proxy(
+    {},
+    {
+      get: (_, apiName) => {
+        if (typeof apiName === 'string') {
+          return generateCallApis.call(this, apiName)
+        }
+      },
     },
-  })
+  )
 }

package/src/libs/request.ts

@@ -120,17 +120,39 @@ 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, customReqOpts?: ICustomReqOpts): Promise<ResponseObject> {
@@ -265,8 +287,12 @@ export class CloudbaseRequest implements ICloudbaseRequest {
     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`
+    if (endPointMode === 'GATEWAY') {
+      // opts.headers.Authorization = `Bearer ${await this.getAccessToken()}`
+
+      if (action === 'functions.invokeFunction' || /^(storage|database)\./.test(action)) {
+        BASE_URL = `${BASE_URL.match(/\/\/([^/?#]*)/)[0]}/web`
+      }
     }
 
     // 生成请求 url
@@ -309,20 +335,6 @@ export class CloudbaseRequest implements ICloudbaseRequest {
 
   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: {
@@ -330,7 +342,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,
       },