@cloudbase/app 1.5.1-alpha.0 → 2.0.0-alpha.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cloudbase/app",
-  "version": "1.5.1-alpha.0",
+  "version": "2.0.0-alpha.1",
   "description": "cloudbase javascript sdk core",
   "main": "dist/cjs/index.js",
   "module": "dist/esm/index.js",
@@ -28,8 +28,8 @@
   "license": "ISC",
   "dependencies": {
     "@cloudbase/adapter-interface": "^0.4.0",
-    "@cloudbase/types": "^1.2.1-alpha.0",
-    "@cloudbase/utilities": "^1.4.1-alpha.0",
+    "@cloudbase/types": "^2.0.0-alpha.0",
+    "@cloudbase/utilities": "^2.0.0-alpha.0",
     "cloudbase-adapter-wx_mp": "0.2.0",
     "uuid": "^8.3.2"
   },
@@ -53,5 +53,5 @@
       "eslint --fix"
     ]
   },
-  "gitHead": "c462902b6702463670d27acb88ebccf93dbd51cd"
+  "gitHead": "4568e598d198896703ac0e204b3211c14bc79861"
 }

package/src/constants/common.ts

@@ -8,46 +8,53 @@ const { setSdkName: setUtilitiesSdkName, setProtocol: setUtilitiesProtocol } = c
 let sdk_version = '';
 let sdk_name = '@cloudbase/js-sdk';
 
-export function setSdkVersion(version:string){
+export function setSdkVersion(version: string) {
   sdk_version = version;
 }
-export function getSdkVersion(){
+export function getSdkVersion() {
   return sdk_version;
 }
-export function setSdkName(name:string){
+export function setSdkName(name: string) {
   sdk_name = name;
   setUtilitiesSdkName(name);
 }
-export function getSdkName(){
+export function getSdkName() {
   return sdk_name;
 }
 export const DATA_VERSION = '2020-01-10';
 /**
  * request
  */
-let PROTOCOL = typeof location !== 'undefined' && location.protocol === 'http:' 
-  ? 'http:' 
+let PROTOCOL = typeof location !== 'undefined' && location.protocol === 'http:'
+  ? 'http:'
   : 'https:';
 let BASE_URL = typeof process !== 'undefined' && process.env.NODE_ENV === 'e2e' && process.env.END_POINT === 'pre'
   ? '//tcb-pre.tencentcloudapi.com/web'
   : '//tcb-api.tencentcloudapi.com/web';
-export function setEndPoint(url:string,protocol?:'http'|'https'){
+export function setEndPoint(url: string, protocol?: 'http' | 'https') {
   BASE_URL = url;
-  if(protocol){
+  if (protocol) {
     PROTOCOL = protocol;
     setUtilitiesProtocol(protocol);
   }
 }
-export function setRegionLevelEndpoint(env:string,region:string,protocol?:'http'|'https') {
+export function setRegionLevelEndpoint(env: string, region: string, protocol?: 'http' | 'https') {
   const endpoiont = region
     ? `//${env}.${region}.tcb-api.tencentcloudapi.com/web`
     : `//${env}.ap-shanghai.tcb-api.tencentcloudapi.com/web`
   setEndPoint(endpoiont, protocol)
 }
-export function getEndPoint(){
+export function getEndPoint() {
   return { BASE_URL, PROTOCOL };
 }
 
+
+export function getBaseEndPoint() {
+  const { PROTOCOL, BASE_URL } = getEndPoint()
+  const webEndpoint = `${PROTOCOL}${BASE_URL}`
+  return `${new URL(webEndpoint).origin}`
+}
+
 export enum LOGINTYPE {
   NULL = 'NULL',
   ANONYMOUS = 'ANONYMOUS',

package/src/index.ts

@@ -11,6 +11,7 @@ import { initCache, getCacheByEnvId, getLocalCache } from './libs/cache';
 import { ICloudbaseRequest } from '@cloudbase/types/request';
 import { initRequest, getRequestByEnvId } from './libs/request';
 import { getSdkName, setSdkVersion, setEndPoint, setRegionLevelEndpoint, setSdkName } from './constants/common';
+export { getBaseEndPoint } from './constants/common'
 const { useAdapters, useDefaultAdapter, RUNTIME } = adapters;
 const { ERRORS, COMMUNITY_SITE_URL } = constants;
 const { printWarn } = utils;
@@ -33,6 +34,7 @@ const extensionMap: KV<ICloudbaseExtension> = {};
 
 class Cloudbase implements ICloudbase {
   public authInstance: ICloudbaseAuth;
+  public oauthInstance: any;
   public requestClient: any;
   public oauthClient: any
   private _config: ICloudbaseConfig;
@@ -40,6 +42,7 @@ class Cloudbase implements ICloudbase {
   constructor(config?: ICloudbaseConfig) {
     this._config = config ? config : this._config;
     this.authInstance = null;
+    this.oauthInstance = null
   }
 
   get config() {
@@ -122,12 +125,12 @@ class Cloudbase implements ICloudbase {
     // 初始化cache和request
     const { env, persistence, debug, timeout, appSecret, appSign, oauthClient } = this._config;
     initCache({ env, persistence, debug, platformInfo: this.platform });
-    initRequest({ env, region: config.region || '', timeout, appSecret, appSign, oauthClient });
 
-    if (config.region) {
-      setRegionLevelEndpoint(env, config.region || '')
-    }
+
+    setRegionLevelEndpoint(env, config.region || '')
+
     const app = new Cloudbase(this._config);
+    initRequest({ env, region: config.region || '', timeout, appSecret, appSign, oauthClient, _fromApp: app });
     app.requestClient = this.requestClient;
     return app;
   }

package/src/libs/cache.ts

@@ -2,13 +2,13 @@ import { KV } from "@cloudbase/types";
 import { cache } from "@cloudbase/utilities";
 import { ICloudbaseCache, ICacheConfig } from "@cloudbase/types/cache";
 
-const KEY_ACCESS_TOKEN = 'access_token';
-const KEY_ACCESS_TOKEN_EXPIRE = 'access_token_expire';
-const KEY_REFRESH_TOKEN = 'refresh_token';
-const KEY_ANONYMOUS_UUID = 'anonymous_uuid';
-const KEY_LOGIN_TYPE = 'login_type';
 const USER_INFO_KEY = 'user_info';
-const DEVICE_INFO = 'device_id';
+// const KEY_ACCESS_TOKEN = 'access_token';
+// const KEY_ACCESS_TOKEN_EXPIRE = 'access_token_expire';
+// const KEY_REFRESH_TOKEN = 'refresh_token';
+// const KEY_ANONYMOUS_UUID = 'anonymous_uuid';
+// const KEY_LOGIN_TYPE = 'login_type';
+// const DEVICE_INFO = 'device_id';
 
 const { CloudbaseCache } = cache;
 
@@ -16,32 +16,31 @@ const cacheMap: KV<ICloudbaseCache> = {};
 // 本地存储
 const localCacheMap: KV<ICloudbaseCache> = {};
 
-export function initCache(config: ICacheConfig&{env:string}) {
-  const { env,persistence,platformInfo } = config;
+export function initCache(config: ICacheConfig & { env: string }) {
+  const { env, platformInfo } = config;
 
-  const accessTokenKey       = `${KEY_ACCESS_TOKEN}_${env}`;
-  const accessTokenExpireKey = `${KEY_ACCESS_TOKEN_EXPIRE}_${env}`;
-  const refreshTokenKey      = `${KEY_REFRESH_TOKEN}_${env}`;
-  const anonymousUuidKey     = `${KEY_ANONYMOUS_UUID}_${env}`;
-  const loginTypeKey         = `${KEY_LOGIN_TYPE}_${env}`;
-  const userInfoKey          = `${USER_INFO_KEY}_${env}`;
-  const deviceIdKey          = `${DEVICE_INFO}`; // 非环境级别
+  // const accessTokenKey = `${KEY_ACCESS_TOKEN}_${env}`;
+  // const accessTokenExpireKey = `${KEY_ACCESS_TOKEN_EXPIRE}_${env}`;
+  // const refreshTokenKey      = `${KEY_REFRESH_TOKEN}_${env}`;
+  // const anonymousUuidKey     = `${KEY_ANONYMOUS_UUID}_${env}`;
+  // const loginTypeKey         = `${KEY_LOGIN_TYPE}_${env}`;
+  const userInfoKey = `${USER_INFO_KEY}_${env}`;
+  // const deviceIdKey = `${DEVICE_INFO}`; // 非环境级别
 
   const keys = {
-    accessTokenKey,
-    accessTokenExpireKey,
-    refreshTokenKey,
-    anonymousUuidKey,
-    loginTypeKey,
     userInfoKey,
-    deviceIdKey
+    // accessTokenKey,
+    // accessTokenExpireKey,
+    // refreshTokenKey,
+    // anonymousUuidKey,
+    // loginTypeKey,
+    // deviceIdKey
   };
   // 若指定env已存在cache则尝试更新persistence
-  cacheMap[env]?cacheMap[env].updatePersistence(persistence):(cacheMap[env] = new CloudbaseCache({
+  cacheMap[env] = cacheMap[env] || (new CloudbaseCache({
     ...config,
     keys,
     platformInfo,
-    alwaysLocalKeys: ['anonymousUuidKey']
   }));
   localCacheMap[env] = localCacheMap[env] || new CloudbaseCache({
     ...config,

package/src/libs/request.ts

@@ -1,9 +1,8 @@
 import {
   DATA_VERSION,
-  LOGINTYPE,
   getSdkVersion,
   getEndPoint,
-  OAUTH2_LOGINTYPE_PREFIX
+  getBaseEndPoint
 } from '../constants/common';
 import {
   IRequestOptions,
@@ -12,20 +11,16 @@ import {
   IUploadRequestOptions,
   IRequestConfig
 } from '@cloudbase/adapter-interface';
-import { utils, jwt, adapters, constants } from '@cloudbase/utilities';
+import { utils, adapters, constants } from '@cloudbase/utilities';
 import { KV } from '@cloudbase/types';
 import { IGetAccessTokenResult, ICloudbaseRequestConfig, IAppendedRequestInfo, IRequestBeforeHook } from '@cloudbase/types/request';
 import { ICloudbaseCache } from '@cloudbase/types/cache';
-import { cloudbase } from '..';
-import { getCacheByEnvId, getLocalCache } from './cache';
-import { EVENTS } from '../constants/events';
+import { getLocalCache } from './cache';
 import { Platform } from './adapter';
-const { getSdkName, ERRORS } = constants;
+const { ERRORS } = constants;
 const { genSeqId, isFormData, formatUrl, createSign } = utils;
 const { RUNTIME } = adapters;
 
-import { v4 as uuidv4 } from 'uuid'
-
 // import FingerprintJS from '@fingerprintjs/fingerprintjs'
 // const fpPromise = FingerprintJS.load()
 
@@ -87,12 +82,9 @@ function beforeEach(): IAppendedRequestInfo {
   };
 }
 export interface ICloudbaseRequest {
-  fetch: (urlOrPath: string, init?: RequestInit) => Promise<Response>;
   post: (options: IRequestOptions) => Promise<ResponseObject>;
   upload: (options: IUploadRequestOptions) => Promise<ResponseObject>;
   download: (options: IRequestOptions) => Promise<ResponseObject>;
-  refreshAccessToken: () => Promise<IGetAccessTokenResult>;
-  getAccessToken: () => Promise<IGetAccessTokenResult>;
   request: (action: string, params: KV<any>, options?: KV<any>) => Promise<ResponseObject>;
   send: (action: string, data: KV<any>) => Promise<any>;
 }
@@ -107,7 +99,6 @@ export class CloudbaseRequest implements ICloudbaseRequest {
   _reqClass: SDKRequestInterface;
   // 请求失败是否抛出Error
   private _throwWhenRequestFail = false;
-  private _cache: ICloudbaseCache;
   // 持久化本地存储
   private _localCache: ICloudbaseCache;
   /**
@@ -115,6 +106,7 @@ export class CloudbaseRequest implements ICloudbaseRequest {
    * @param config
    */
   constructor(config: ICloudbaseRequestConfig & { throw?: boolean }) {
+
     this.config = config;
     // eslint-disable-next-line
     this._reqClass = new Platform.adapter.reqClass(<IRequestConfig>{
@@ -123,55 +115,12 @@ export class CloudbaseRequest implements ICloudbaseRequest {
       restrictedMethods: ['post']
     });
     this._throwWhenRequestFail = config.throw || false;
-    this._cache = getCacheByEnvId(this.config.env);
     this._localCache = getLocalCache(this.config.env);
     bindHooks(this._reqClass, 'post', [beforeEach]);
     bindHooks(this._reqClass, 'upload', [beforeEach]);
     bindHooks(this._reqClass, 'download', [beforeEach]);
   }
 
-  /**
-   * 套一层 fetch，方便处理请求地址
-   * @param {string}      urlOrPath
-   * @param {RequestInit} init
-   * @returns
-   */
-  public async fetch(urlOrPath: string, init?: RequestInit): Promise<Response> {
-    const deviceId = await this.getDeviceId();
-
-    const headers = {
-      'X-Project-Id': this.config.env,
-      'X-SDK-Version': `@cloudbase/js-sdk/${getSdkVersion()}`,
-      'X-Request-Id': genSeqId(),
-      'X-Request-Timestamp': Date.now(),
-      'X-Device-Id': deviceId
-    }
-    // 非web平台使用凭证检验有效性
-    if (Platform.runtime !== RUNTIME.WEB) {
-      const { appSign, appSecret } = this.config
-      const timestamp = Date.now()
-      const { appAccessKey, appAccessKeyId } = appSecret
-      const sign = createSign({
-        // data: init.body,
-        data: {},
-        timestamp,
-        appAccessKeyId,
-        appSign
-      }, appAccessKey)
-
-      headers['X-TCB-App-Source'] = `timestamp=${timestamp};appAccessKeyId=${appAccessKeyId};appSign=${appSign};sign=${sign}`
-    }
-
-    init.headers = Object.assign({}, init.headers, headers)
-
-    const { PROTOCOL, BASE_URL } = getEndPoint()
-    const webEndpoint = `${PROTOCOL}${BASE_URL}`
-    const url = urlOrPath.startsWith('http')
-      ? urlOrPath
-      : `${new URL(webEndpoint).origin}${urlOrPath}`
-    return await fetch(url, init)
-  }
-
   public async post(options: IRequestOptions): Promise<ResponseObject> {
     const res = await this._reqClass.post(options);
     return res;
@@ -185,123 +134,22 @@ export class CloudbaseRequest implements ICloudbaseRequest {
     return res;
   }
 
-  public async refreshAccessToken(): Promise<IGetAccessTokenResult> {
-    // 可能会同时调用多次刷新access token，这里把它们合并成一个
-    if (!this._refreshAccessTokenPromise) {
-      // 没有正在刷新，那么正常执行刷新逻辑
-      this._refreshAccessTokenPromise = this._refreshAccessToken();
-    }
-
-    let result;
-    let err;
-    try {
-      result = await this._refreshAccessTokenPromise;
-    } catch (e) {
-      err = e;
-    }
-    this._refreshAccessTokenPromise = null;
-    this._shouldRefreshAccessTokenHook = null;
-    if (err) {
-      throw err;
-    }
-    return result;
+  public getBaseEndPoint() {
+    return getBaseEndPoint()
   }
 
-  public async refreshAccessTokenFromOauthServer(clientId: string): Promise<IGetAccessTokenResult> {
-    // 可能会同时调用多次刷新 access token，这里把它们合并成一个
-    if (!this._refreshAccessTokenPromise) {
-      // 没有正在刷新，那么正常执行刷新逻辑
-      this._refreshAccessTokenPromise = this._refreshAccessTokenFromOauthServer(clientId);
+  public async getOauthAccessTokenV2(oauthClient: any): Promise<IGetAccessTokenResult> {
+    const validAccessToken = await oauthClient.getAccessToken()
+    const credentials = await oauthClient._getCredentials()
+    return {
+      accessToken: validAccessToken,
+      accessTokenExpire: new Date(credentials.expires_at).getTime()
     }
-
-    let result;
-    let err;
-    try {
-      result = await this._refreshAccessTokenPromise;
-    } catch (e) {
-      err = e;
-    }
-    this._refreshAccessTokenPromise = null;
-    this._shouldRefreshAccessTokenHook = null;
-    if (err) {
-      throw err;
-    }
-    return result;
   }
 
-  // 获取 OAuth accesstoken
-  public async getOauthAccessToken(): Promise<IGetAccessTokenResult> {
-    const { oauthClient } = this.config
-    if (oauthClient) {
-      const validAccessToken = await oauthClient.getAccessToken()
-      const credentials = await oauthClient._getCredentials()
-      return {
-        accessToken: validAccessToken,
-        accessTokenExpire: new Date(credentials.expires_at).getTime()
-      }
-    }
-  }
-
-  // 获取 access token
-  public async getAccessToken(): Promise<IGetAccessTokenResult> {
-    const { loginTypeKey, accessTokenKey, accessTokenExpireKey, refreshTokenKey } = this._cache.keys;
-    const loginType = await this._cache.getStoreAsync(loginTypeKey);
-    const refreshToken = await this._cache.getStoreAsync(refreshTokenKey);
-    if (!refreshToken) {
-      // 不该出现的状态：有 access token 却没有 refresh token
-      throw new Error(JSON.stringify({
-        code: ERRORS.OPERATION_FAIL,
-        msg: 'refresh token is not exist, your local data might be messed up, please retry after clear localStorage or sessionStorage'
-      }));
-    }
-    // 如果没有access token或者过期，那么刷新
-    const accessToken = await this._cache.getStoreAsync(accessTokenKey);
-    const accessTokenExpire = Number(await this._cache.getStoreAsync(accessTokenExpireKey));
-
-    // 调用钩子函数
-    let shouldRefreshAccessToken = true;
-    if (this._shouldRefreshAccessTokenHook && !(await this._shouldRefreshAccessTokenHook(accessToken, accessTokenExpire))) {
-      shouldRefreshAccessToken = false;
-    }
-
-    if ((!accessToken || !accessTokenExpire || accessTokenExpire < Date.now()) && shouldRefreshAccessToken) {
-      if (loginType.startsWith(OAUTH2_LOGINTYPE_PREFIX)) {
-        // NOTE: 这里需要从 accessToken 解出来部分信息，用于刷新 accessToken
-        // 所以过期的 accessToken 不能删除，而是用新 accessToken 覆盖
-        if (accessToken) {
-          let header = null
-          let payload = null
-          try {
-            header = jwt.decode(accessToken, { header: true })
-            payload = jwt.decode(accessToken)
-          }
-          catch (e) {
-            throw new Error(`[DECODE_ACCESS_TOKEN_ERROR] ${e.message}, accesstoken: ${accessToken}`)
-          }
-          if (header?.kid && payload?.project_id) {
-            return await this.refreshAccessTokenFromOauthServer(payload?.project_id)
-          }
-        }
-        else {
-          // 这里用 env 试一下
-          return await this.refreshAccessTokenFromOauthServer(this.config.env)
-        }
-      }
-      else {
-        return await this.refreshAccessToken();
-      }
-    } else {
-      // 返回本地的access token
-      return {
-        accessToken,
-        accessTokenExpire
-      };
-    }
-  }
 
   /* eslint-disable complexity */
   public async request(action: string, params: KV<any>, options?: KV<any>): Promise<ResponseObject> {
-    const { oauthClient } = this.config
     const tcbTraceKey = `x-tcb-trace_${this.config.env}`;
     let contentType = 'application/x-www-form-urlencoded';
     // const webDeviceId = await getTcbFingerprintId();
@@ -313,19 +161,10 @@ export class CloudbaseRequest implements ICloudbaseRequest {
       ...params
     };
 
-    // 若识别到注册了 Oauth 模块，则使用oauth getAccessToken
-    if (oauthClient) {
-      tmpObj.access_token = (await this.getOauthAccessToken()).accessToken
-    }
-
     if (ACTIONS_WITHOUT_ACCESSTOKEN.indexOf(action) === -1) {
-      const { refreshTokenKey } = this._cache.keys;
-
-      // 若有 refreshToken 则任务有登录态 刷 accessToken
-      const refreshToken = await this._cache.getStoreAsync(refreshTokenKey);
-      if (refreshToken) {
-        tmpObj.access_token = (await this.getAccessToken()).accessToken;
-      }
+      const app = this.config._fromApp
+      const oauthClient = app.oauthInstance.oauth2client
+      tmpObj.access_token = (await this.getOauthAccessTokenV2(oauthClient)).accessToken
     }
 
     // 拼body和content-type
@@ -421,11 +260,6 @@ export class CloudbaseRequest implements ICloudbaseRequest {
 
   public async send(action: string, data: KV<any> = {}): Promise<any> {
     let response = await this.request(action, data, { onUploadProgress: data.onUploadProgress });
-    if (response.data.code === 'ACCESS_TOKEN_EXPIRED' && ACTIONS_WITHOUT_ACCESSTOKEN.indexOf(action) === -1) {
-      // access_token过期，重新获取
-      await this.refreshAccessToken();
-      response = await this.request(action, data, { onUploadProgress: data.onUploadProgress });
-    }
 
     if (response.data.code && this._throwWhenRequestFail) {
       throw new Error(JSON.stringify({
@@ -436,176 +270,6 @@ export class CloudbaseRequest implements ICloudbaseRequest {
 
     return response.data;
   }
-
-  // 调用接口刷新access token，并且返回
-  private async _refreshAccessToken(retryNum = 1): Promise<IGetAccessTokenResult> {
-    const { accessTokenKey, accessTokenExpireKey, refreshTokenKey, loginTypeKey, anonymousUuidKey } = this._cache.keys;
-    await this._cache.removeStoreAsync(accessTokenKey);
-    await this._cache.removeStoreAsync(accessTokenExpireKey);
-
-    let refreshToken = await this._cache.getStoreAsync(refreshTokenKey);
-    if (!refreshToken) {
-      throw new Error(JSON.stringify({
-        code: ERRORS.INVALID_OPERATION,
-        msg: 'not login'
-      }));
-    }
-    const params: KV<string> = {
-      refresh_token: refreshToken
-    };
-    const response = await this.request('auth.fetchAccessTokenWithRefreshToken', params);
-    if (response.data.code) {
-      const { code } = response.data;
-      if (code === 'SIGN_PARAM_INVALID' || code === 'REFRESH_TOKEN_EXPIRED' || code === 'INVALID_REFRESH_TOKEN') {
-        // 这里处理以下逻辑：
-        // 匿名登录时，如果刷新access token报错refresh token过期，此时应该：
-        // 1. 再用 uuid 拿一次新的refresh token
-        // 2. 拿新的refresh token换access token
-        const isAnonymous = await this._cache.getStoreAsync(loginTypeKey) === LOGINTYPE.ANONYMOUS;
-        if (isAnonymous && code === 'INVALID_REFRESH_TOKEN') {
-          // 获取新的 refresh token
-          const anonymous_uuid = await this._cache.getStoreAsync(anonymousUuidKey);
-          // 此处cache为基类property
-          const refresh_token = await this._cache.getStoreAsync(refreshTokenKey);
-          const res = await this.send('auth.signInAnonymously', {
-            anonymous_uuid,
-            refresh_token
-          });
-          this._setRefreshToken(res.refresh_token);
-          if (retryNum >= 1) {
-            return this._refreshAccessToken(--retryNum);
-          } else {
-            throw new Error(
-              JSON.stringify({
-                code: ERRORS.OPERATION_FAIL,
-                message: '重试获取 refresh token 失败'
-              })
-            )
-          }
-        }
-        cloudbase.fire(EVENTS.LOGIN_STATE_EXPIRED);
-        await this._cache.removeStoreAsync(refreshTokenKey);
-      }
-      throw new Error(JSON.stringify({
-        code: ERRORS.NETWORK_ERROR,
-        msg: `refresh access_token failed：${response.data.code}`
-      }));
-    }
-    if (response.data.access_token) {
-      cloudbase.fire(EVENTS.ACCESS_TOKEN_REFRESHD);
-      await this._cache.setStoreAsync(accessTokenKey, response.data.access_token);
-      // 本地时间可能没有同步
-      await this._cache.setStoreAsync(accessTokenExpireKey, response.data.access_token_expire + Date.now());
-      return {
-        accessToken: response.data.access_token,
-        accessTokenExpire: response.data.access_token_expire
-      };
-    }
-    // 匿名登录refresh_token过期情况下返回refresh_token
-    // 此场景下使用新的refresh_token获取access_token
-    if (response.data.refresh_token) {
-      await this._cache.removeStoreAsync(refreshTokenKey);
-      await this._cache.setStoreAsync(refreshTokenKey, response.data.refresh_token);
-      await this._refreshAccessToken();
-    }
-  }
-
-  private async _fetchAccessTokenFromOauthServer(refreshToken: string, clientId: string) {
-    const resp = await this.fetch('/auth/v1/token', {
-      method: 'POST',
-      headers: {
-        'Accept': 'application/json',
-        'Content-Type': 'application/json'
-      },
-      body: JSON.stringify({
-        grant_type: 'refresh_token',
-        client_id: clientId,
-        refresh_token: refreshToken
-      })
-    })
-    // Resp:
-    // {
-    //   "token_type": "Bearer",
-    //   "access_token": "",
-    //   "refresh_token":"",
-    //   "expires_in": 259200,
-    //   "sub": ""
-    // }
-    // 以下代码重复
-    const seqIdFromHeader = resp.headers.get('SeqId') || resp.headers.get('RequestId')
-    if (resp.status >= 400 && resp.status < 500) {
-      const body: any = await resp.json()
-      const seqId = body.request_id || seqIdFromHeader
-      throw new Error(`[${getSdkName()}/${getSdkVersion()}][OAuth2AuthProvider][status:${resp.status}][${body.error}(${body.error_code})] ${body.error_description} (${seqId})`)
-    }
-    else if (resp.status >= 500) {
-      const body: any = await resp.json()
-      const seqId = body.request_id || seqIdFromHeader
-      throw new Error(`[${getSdkName()}/${getSdkVersion()}][OAuth2AuthProvider][status:${resp.status}][${body.error}(${body.error_code})] ${body.error_description} (${seqId})`)
-    }
-    return resp.json()
-  }
-
-  // 调用接口刷新access token，并且返回
-  private async _refreshAccessTokenFromOauthServer(clientId: string): Promise<IGetAccessTokenResult> {
-    const { accessTokenKey, accessTokenExpireKey, refreshTokenKey } = this._cache.keys;
-    const refreshToken = await this._cache.getStoreAsync(refreshTokenKey);
-    if (!refreshToken) {
-      throw new Error(JSON.stringify({
-        code: ERRORS.INVALID_OPERATION,
-        msg: 'not login'
-      }));
-    }
-
-    const token = await this._fetchAccessTokenFromOauthServer(refreshToken, clientId);
-    const { refresh_token: newRefreshToken, access_token: accessToken, expires_in: accessTokenExpire } = token
-
-    // 错误处理
-    if (!accessToken || !accessTokenExpire) {
-      throw new Error(JSON.stringify({
-        code: ERRORS.NETWORK_ERROR,
-        msg: 'refresh access_token failed'
-      }));
-    }
-    if (accessToken && accessTokenExpire) {
-      if (newRefreshToken === refreshToken) {
-        await this._cache.setStoreAsync(refreshTokenKey, newRefreshToken);
-      }
-      await this._cache.setStoreAsync(accessTokenKey, accessToken);
-      await this._cache.setStoreAsync(accessTokenExpireKey, accessTokenExpire * 1000 + Date.now());
-      cloudbase.fire(EVENTS.ACCESS_TOKEN_REFRESHD);
-      return {
-        accessToken: accessToken,
-        accessTokenExpire: accessTokenExpire
-      };
-    }
-  }
-
-  private async _setRefreshToken(refreshToken: string) {
-    const { accessTokenKey, accessTokenExpireKey, refreshTokenKey } = this._cache.keys;
-    // refresh token设置前，先清掉 access token
-    // 设置是直接拉取新 access token 覆盖，而不是 remove
-    await this._cache.removeStoreAsync(accessTokenKey);
-    await this._cache.removeStoreAsync(accessTokenExpireKey);
-    await this._cache.setStoreAsync(refreshTokenKey, refreshToken);
-  }
-
-  private async getDeviceId(): Promise<string> {
-    const { deviceIdKey } = this._cache.keys
-    const deviceId = await this._cache.getStoreAsync(deviceIdKey)
-
-    if (!deviceId) {
-      // const fp = await fpPromise
-      // const result = await fp.get()
-      // const deviceId = result.visitorId
-      const newDeviceId = uuidv4()
-      this._cache.setStoreAsync(deviceIdKey, newDeviceId)
-      return newDeviceId
-    }
-    else {
-      return deviceId
-    }
-  }
 }
 
 const requestMap: KV<CloudbaseRequest> = {};

package/dist/cjs/constants/events.d.ts

@@ -1,7 +0,0 @@
-export declare const EVENTS: {
-    LOGIN_STATE_CHANGED: string;
-    LOGIN_STATE_EXPIRED: string;
-    LOGIN_TYPE_CHANGED: string;
-    ANONYMOUS_CONVERTED: string;
-    ACCESS_TOKEN_REFRESHD: string;
-};

package/dist/cjs/constants/events.js

@@ -1,11 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.EVENTS = void 0;
-exports.EVENTS = {
-    LOGIN_STATE_CHANGED: 'loginStateChanged',
-    LOGIN_STATE_EXPIRED: 'loginStateExpire',
-    LOGIN_TYPE_CHANGED: 'loginTypeChanged',
-    ANONYMOUS_CONVERTED: 'anonymousConverted',
-    ACCESS_TOKEN_REFRESHD: 'refreshAccessToken'
-};
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZXZlbnRzLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vc3JjL2NvbnN0YW50cy9ldmVudHMudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7O0FBQWEsUUFBQSxNQUFNLEdBQUc7SUFDcEIsbUJBQW1CLEVBQUksbUJBQW1CO0lBQzFDLG1CQUFtQixFQUFJLGtCQUFrQjtJQUN6QyxrQkFBa0IsRUFBSyxrQkFBa0I7SUFDekMsbUJBQW1CLEVBQUksb0JBQW9CO0lBQzNDLHFCQUFxQixFQUFFLG9CQUFvQjtDQUM1QyxDQUFDIiwic291cmNlc0NvbnRlbnQiOlsiZXhwb3J0IGNvbnN0IEVWRU5UUyA9IHtcbiAgTE9HSU5fU1RBVEVfQ0hBTkdFRCAgOiAnbG9naW5TdGF0ZUNoYW5nZWQnLFxuICBMT0dJTl9TVEFURV9FWFBJUkVEICA6ICdsb2dpblN0YXRlRXhwaXJlJyxcbiAgTE9HSU5fVFlQRV9DSEFOR0VEICAgOiAnbG9naW5UeXBlQ2hhbmdlZCcsXG4gIEFOT05ZTU9VU19DT05WRVJURUQgIDogJ2Fub255bW91c0NvbnZlcnRlZCcsIC8v5Yy/5ZCN6LSm5oi36KKr6L2s5q2j5ZCO6Kem5Y+RXG4gIEFDQ0VTU19UT0tFTl9SRUZSRVNIRDogJ3JlZnJlc2hBY2Nlc3NUb2tlbidcbn07XG4iXX0=