@cloudbase/app 2.8.26-beta.0 → 2.8.28-beta.0

package/src/index.ts

@@ -1,6 +1,13 @@
 import { adapters, constants, utils, helpers } from '@cloudbase/utilities'
 import { SDKAdapterInterface, CloudbaseAdapter, IRequestConfig } from '@cloudbase/adapter-interface'
-import { ICloudbaseConfig, ICloudbaseUpgradedConfig, ICloudbase, ICloudbaseExtension, KV, ICloudbasePlatformInfo } from '@cloudbase/types'
+import {
+  ICloudbaseConfig,
+  ICloudbaseUpgradedConfig,
+  ICloudbase,
+  ICloudbaseExtension,
+  KV,
+  ICloudbasePlatformInfo,
+} from '@cloudbase/types'
 import { ICloudbaseAuth } from '@cloudbase/types/auth'
 import adapterForWxMp from '@cloudbase/adapter-wx_mp'
 import { registerComponent, registerHook } from './libs/component'
@@ -13,14 +20,14 @@ import { initRequest, getRequestByEnvId } from './libs/request'
 import {
   getSdkName,
   setSdkVersion,
-  setEndPoint,
   setRegionLevelEndpoint,
   setSdkName,
   setGatewayEndPointWithEnv,
-  setEndPointWithKey,
-  getEndPointWithKey,
-  type ISetEndPointWithKey,
   type EndPointKey,
+  type ISetEndPointWithKey,
+  setEndPointInfo,
+  getEndPointInfo,
+  getSdkVersion,
 } from './constants/common'
 export { getBaseEndPoint } from './constants/common'
 const { useAdapters, useDefaultAdapter } = adapters
@@ -48,12 +55,14 @@ class Cloudbase implements ICloudbase {
   public oauthInstance: any
   public requestClient: any
   public oauthClient: any
+  public version: string
   private cloudbaseConfig: ICloudbaseConfig
 
   constructor(config?: ICloudbaseConfig) {
     this.cloudbaseConfig = config ? config : this.cloudbaseConfig
     this.authInstance = null
     this.oauthInstance = null
+    this.version = getSdkVersion()
   }
 
   get config() {
@@ -76,7 +85,6 @@ class Cloudbase implements ICloudbase {
     return getRequestByEnvId(this.cloudbaseConfig.env)
   }
 
-
   @catchErrorsDecorator({
     mode: 'sync',
     title: 'Cloudbase 初始化失败',
@@ -92,7 +100,7 @@ class Cloudbase implements ICloudbase {
       throw new Error(JSON.stringify({
         code: ERRORS.INVALID_PARAMS,
         msg: 'env must not be specified',
-      }))
+      }),)
     }
     // 初始化时若未兼容平台，则使用默认adapter
     if (!Platform.adapter) {
@@ -101,7 +109,9 @@ class Cloudbase implements ICloudbase {
 
     const reqConfig: IRequestConfig = {
       timeout: config.timeout || 5000,
-      timeoutMsg: `[${getSdkName()}][REQUEST TIMEOUT] request had been abort since didn't finished within${config.timeout / 1000}s`,
+      timeoutMsg: `[${getSdkName()}][REQUEST TIMEOUT] request had been abort since didn't finished within${
+        config.timeout / 1000
+      }s`,
     }
 
     this.requestClient = new Platform.adapter.reqClass(reqConfig)
@@ -115,13 +125,13 @@ class Cloudbase implements ICloudbase {
     const { env, persistence, debug, timeout, oauthClient } = this.cloudbaseConfig
     initCache({ env, persistence, debug, platformInfo: this.platform })
 
-
     setRegionLevelEndpoint(env, config.region || '')
     setGatewayEndPointWithEnv(env)
 
     const app = new Cloudbase(this.cloudbaseConfig)
     initRequest({ env, region: config.region || '', timeout, oauthClient, _fromApp: app })
     app.requestClient = this.requestClient
+    ;(this as any)?.fire?.('cloudbase_init', app)
     return app
   }
 
@@ -151,7 +161,7 @@ class Cloudbase implements ICloudbase {
       throw new Error(JSON.stringify({
         code: ERRORS.INVALID_PARAMS,
         msg: `extension:${name} must be registered before invoke`,
-      }))
+      }),)
     }
 
     return await ext.invoke(opts, this)
@@ -173,22 +183,35 @@ class Cloudbase implements ICloudbase {
 
   public registerVersion(version: string) {
     setSdkVersion(version)
+    this.version = version
   }
 
   public registerSdkName(name: string) {
     setSdkName(name)
   }
 
+  /** 设置 tcb api 的 endpoint */
   public registerEndPoint(url: string, protocol?: 'http' | 'https') {
-    setEndPoint(url, protocol)
+    setEndPointInfo({ baseUrl: url, protocol, env: this.config.env, endPointKey: 'CLOUD_API' })
   }
 
+  /** 设置网关/tcb api的 endPoint，通过 key 指定 */
   public registerEndPointWithKey(props: ISetEndPointWithKey) {
-    setEndPointWithKey(props)
+    setEndPointInfo({
+      env: this.config.env,
+      endPointKey: props.key,
+      baseUrl: props.url,
+      protocol: props.protocol,
+    })
   }
 
+  /** 拿网关/tcb api的 endPoint，通过 key 指定 */
   public getEndPointWithKey(key: EndPointKey) {
-    return getEndPointWithKey(key)
+    const info = getEndPointInfo(this.config.env, key)
+    return {
+      BASE_URL: info.baseUrl,
+      PROTOCOL: info.protocol,
+    }
   }
 
   private useDefaultAdapter() {

package/src/libs/request.ts

@@ -1,4 +1,4 @@
-import { DATA_VERSION, getSdkVersion, getEndPoint, getBaseEndPoint } from '../constants/common'
+import { DATA_VERSION, getSdkVersion, getBaseEndPoint, getEndPointInfo } from '../constants/common'
 import {
   IRequestOptions,
   SDKRequestInterface,
@@ -131,7 +131,7 @@ export class CloudbaseRequest implements ICloudbaseRequest {
   }
 
   public getBaseEndPoint() {
-    return getBaseEndPoint()
+    return getBaseEndPoint(this.config.env)
   }
 
   public async getOauthAccessTokenV2(oauthClient: any): Promise<IGetAccessTokenResult> {
@@ -233,11 +233,16 @@ export class CloudbaseRequest implements ICloudbaseRequest {
         ...inQuery,
         ...formatQuery,
       })
-    const { BASE_URL, PROTOCOL } = getEndPoint()
+
+    const { baseUrl: BASE_URL, protocol: PROTOCOL } = getEndPointInfo(this.config.env, 'CLOUD_API')
     // 生成请求 url
     let newUrl
     if (options.pathname) {
-      newUrl = formatUrl(PROTOCOL, `${getBaseEndPoint()?.replace(/^https?:/, '')}/${options.pathname}`, formatQuery)
+      newUrl = formatUrl(
+        PROTOCOL,
+        `${getBaseEndPoint(this.config.env)?.replace(/^https?:/, '')}/${options.pathname}`,
+        formatQuery,
+      )
     } else {
       newUrl = formatUrl(PROTOCOL, BASE_URL, formatQuery)
     }