@cloudbase/app 1.5.3-alpha.0 → 1.8.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cloudbase/app",
-  "version": "1.5.3-alpha.0",
+  "version": "1.8.2",
   "description": "cloudbase javascript sdk core",
   "main": "dist/cjs/index.js",
   "module": "dist/esm/index.js",
@@ -28,20 +28,9 @@
   "license": "ISC",
   "dependencies": {
     "@cloudbase/adapter-interface": "^0.4.0",
-    "@cloudbase/types": "^1.2.3-alpha.0",
-    "@cloudbase/utilities": "^1.4.3-alpha.0",
-    "cloudbase-adapter-wx_mp": "0.2.0",
-    "uuid": "^8.3.2"
-  },
-  "devDependencies": {
-    "@types/uuid": "^8.3.1",
-    "@typescript-eslint/eslint-plugin": "^2.30.0",
-    "@typescript-eslint/parser": "^2.30.0",
-    "eslint": "^6.8.0",
-    "eslint-config-alloy": "^3.7.1",
-    "husky": "^4.2.5",
-    "lint-staged": "^10.2.0",
-    "typescript": "^3.8.3"
+    "@cloudbase/types": "^1.8.2",
+    "@cloudbase/utilities": "^1.8.2",
+    "cloudbase-adapter-wx_mp": "0.2.0"
   },
   "husky": {
     "hooks": {
@@ -53,5 +42,5 @@
       "eslint --fix"
     ]
   },
-  "gitHead": "eb161dd3c79b90a95a877984bf7c07cdb4563077"
+  "gitHead": "5b3ac0446269ebb9ad2b22cdcb48c379ded1cb07"
 }

package/src/constants/common.ts

@@ -31,40 +31,26 @@ let PROTOCOL = typeof location !== 'undefined' && location.protocol === 'http:'
 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) {
     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)
+    : `//${env}.ap-shanghai.tcb-api.tencentcloudapi.com/web`;
+  setEndPoint(endpoiont, protocol);
 }
 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',
   WECHAT = 'WECHAT',
-  WECHAT_PUBLIC = 'WECHAT-PUBLIC',
-  WECHAT_OPEN = 'WECHAT-OPEN',
   CUSTOM = 'CUSTOM',
-  EMAIL = 'EMAIL',
-  USERNAME = 'USERNAME',
-  PHONE = 'PHONE'
+  NULL = 'NULL' // 保留字，代表未登录
 }
-
-export const OAUTH2_LOGINTYPE_PREFIX = 'OAUTH2'

package/src/constants/events.ts

@@ -1,7 +1,7 @@
 export const EVENTS = {
-  LOGIN_STATE_CHANGED  : 'loginStateChanged',
-  LOGIN_STATE_EXPIRED  : 'loginStateExpire',
-  LOGIN_TYPE_CHANGED   : 'loginTypeChanged',
-  ANONYMOUS_CONVERTED  : 'anonymousConverted', //匿名账户被转正后触发
-  ACCESS_TOKEN_REFRESHD: 'refreshAccessToken'
+  LOGIN_STATE_CHANGED: 'loginStateChanged',
+  LOGIN_STATE_EXPIRED: 'loginStateExpire',
+  LOGIN_TYPE_CHANGED: 'loginTypeChanged',
+  ANONYMOUS_CONVERTED: 'anonymousConverted', // 匿名账户被转正后触发
+  ACCESS_TOKEN_REFRESHD: 'refreshAccessToken',
 };

package/src/global.d.ts

@@ -1,2 +1,2 @@
 declare module '*.json';
-declare module 'cloudbase-adapter-wx_mp';
+declare module 'cloudbase-adapter-wx_mp';

package/src/index.ts

@@ -1,3 +1,5 @@
+/* eslint-disable no-useless-escape */
+/* eslint-disable @typescript-eslint/consistent-type-assertions */
 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';
@@ -11,7 +13,6 @@ 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;
@@ -22,7 +23,7 @@ const { catchErrorsDecorator } = helpers;
  */
 const DEFAULT_INIT_CONFIG: Partial<ICloudbaseConfig> = {
   timeout: 15000,
-  persistence: 'local'
+  persistence: 'local',
 };
 
 // timeout上限10分钟
@@ -34,15 +35,12 @@ const extensionMap: KV<ICloudbaseExtension> = {};
 
 class Cloudbase implements ICloudbase {
   public authInstance: ICloudbaseAuth;
-  public oauthInstance: any;
   public requestClient: any;
-  public oauthClient: any
   private _config: ICloudbaseConfig;
 
   constructor(config?: ICloudbaseConfig) {
     this._config = config ? config : this._config;
     this.authInstance = null;
-    this.oauthInstance = null
   }
 
   get config() {
@@ -73,14 +71,14 @@ class Cloudbase implements ICloudbase {
       '请确认以下各项：',
       '  1 - 调用 cloudbase.init() 的语法或参数是否正确',
       '  2 - 如果是非浏览器环境，是否配置了安全应用来源（https://docs.cloudbase.net/api-reference/webv2/adapter.html#jie-ru-liu-cheng）',
-      `如果问题依然存在，建议到官方问答社区提问或寻找帮助：${COMMUNITY_SITE_URL}`
-    ]
+      `如果问题依然存在，建议到官方问答社区提问或寻找帮助：${COMMUNITY_SITE_URL}`,
+    ],
   })
   public init(config: ICloudbaseConfig): Cloudbase {
     if (!config.env) {
       throw new Error(JSON.stringify({
         code: ERRORS.INVALID_PARAMS,
-        msg: 'env must not be specified'
+        msg: 'env must not be specified',
       }));
     }
     // 初始化时若未兼容平台，则使用默认adapter
@@ -90,13 +88,13 @@ class Cloudbase implements ICloudbase {
 
     this.requestClient = new Platform.adapter.reqClass({
       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`,
     } as IRequestConfig);
     if (Platform.runtime !== RUNTIME.WEB) {
       if (!config.appSecret) {
         throw new Error(JSON.stringify({
           code: ERRORS.INVALID_PARAMS,
-          msg: 'invalid appSecret'
+          msg: 'invalid appSecret',
         }));
       }
       // adapter提供获取应用标识的接口
@@ -105,32 +103,32 @@ class Cloudbase implements ICloudbase {
         // 传入的appSign与sdk获取的不一致
         throw new Error(JSON.stringify({
           code: ERRORS.INVALID_PARAMS,
-          msg: 'invalid appSign'
+          msg: 'invalid appSign',
         }));
       }
       appSign && (config.appSign = appSign);
       if (!config.appSign) {
         throw new Error(JSON.stringify({
           code: ERRORS.INVALID_PARAMS,
-          msg: 'invalid appSign'
+          msg: 'invalid appSign',
         }));
       }
     }
     this._config = {
       ...DEFAULT_INIT_CONFIG,
-      ...config
+      ...config,
     };
     // 修正timeout取值
     this._config.timeout = this._formatTimeout(this._config.timeout);
     // 初始化cache和request
-    const { env, persistence, debug, timeout, appSecret, appSign, oauthClient } = this._config;
+    const { env, persistence, debug, timeout, appSecret, appSign } = this._config;
     initCache({ env, persistence, debug, platformInfo: this.platform });
+    initRequest({ env, region: config.region || '', timeout, appSecret, appSign });
 
     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;
   }
@@ -152,15 +150,15 @@ class Cloudbase implements ICloudbase {
       '请确认以下各项：',
       '  1 - 调用 invokeExtension() 的语法或参数是否正确',
       '  2 - 被调用的扩展能力是否已经安装并通过 registerExtension() 注册',
-      `如果问题依然存在，建议到官方问答社区提问或寻找帮助：${COMMUNITY_SITE_URL}`
-    ]
+      `如果问题依然存在，建议到官方问答社区提问或寻找帮助：${COMMUNITY_SITE_URL}`,
+    ],
   })
   public async invokeExtension(name: string, opts: any) {
     const ext = extensionMap[name];
     if (!ext) {
       throw new Error(JSON.stringify({
         code: ERRORS.INVALID_PARAMS,
-        msg: `extension:${name} must be registered before invoke`
+        msg: `extension:${name} must be registered before invoke`,
       }));
     }
 
@@ -174,7 +172,7 @@ class Cloudbase implements ICloudbase {
   }
 
   public registerHook(hook: ICloudbaseHook) {
-    registerHook(Cloudbase, hook)
+    registerHook(Cloudbase, hook);
   }
 
   public registerComponent(component: ICloudbaseComponent) {
@@ -190,7 +188,7 @@ class Cloudbase implements ICloudbase {
   }
 
   public registerEndPoint(url: string, protocol?: 'http' | 'https') {
-    setEndPoint(url, protocol)
+    setEndPoint(url, protocol);
   }
 
   private _useDefaultAdapter() {
@@ -216,4 +214,4 @@ class Cloudbase implements ICloudbase {
 export const cloudbase: ICloudbase = new Cloudbase();
 cloudbase.useAdapters(adapterForWxMp);
 
-export default cloudbase;
+export default cloudbase;

package/src/libs/adapter.ts

@@ -1,3 +1,3 @@
-import { ICloudbasePlatformInfo } from "@cloudbase/types";
+import { ICloudbasePlatformInfo } from '@cloudbase/types';
 
-export const Platform:ICloudbasePlatformInfo = {};
+export const Platform: ICloudbasePlatformInfo = {};

package/src/libs/cache.ts

@@ -1,6 +1,6 @@
-import { KV } from "@cloudbase/types";
-import { cache } from "@cloudbase/utilities";
-import { ICloudbaseCache, ICacheConfig } from "@cloudbase/types/cache";
+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';
@@ -8,7 +8,6 @@ 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 { CloudbaseCache } = cache;
 
@@ -16,8 +15,8 @@ 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, persistence, platformInfo } = config;
 
   const accessTokenKey       = `${KEY_ACCESS_TOKEN}_${env}`;
   const accessTokenExpireKey = `${KEY_ACCESS_TOKEN_EXPIRE}_${env}`;
@@ -25,7 +24,6 @@ export function initCache(config: ICacheConfig&{env:string}) {
   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,
@@ -34,20 +32,19 @@ export function initCache(config: ICacheConfig&{env:string}) {
     anonymousUuidKey,
     loginTypeKey,
     userInfoKey,
-    deviceIdKey
   };
   // 若指定env已存在cache则尝试更新persistence
-  cacheMap[env]?cacheMap[env].updatePersistence(persistence):(cacheMap[env] = new CloudbaseCache({
+  cacheMap[env] ? cacheMap[env].updatePersistence(persistence) : (cacheMap[env] = new CloudbaseCache({
     ...config,
     keys,
     platformInfo,
-    alwaysLocalKeys: ['anonymousUuidKey']
+    alwaysLocalKeys: ['anonymousUuidKey'],
   }));
   localCacheMap[env] = localCacheMap[env] || new CloudbaseCache({
     ...config,
     keys,
     platformInfo,
-    persistence: 'local'
+    persistence: 'local',
   });
 }
 

package/src/libs/component.ts

@@ -1,26 +1,28 @@
+/* eslint-disable no-prototype-builtins */
+/* eslint-disable no-case-declarations */
 import { KV } from '@cloudbase/types';
 import { ICloudbaseComponent, ICloudbaseHook } from '@cloudbase/types/component';
 import { constants } from '@cloudbase/utilities';
 
 const { ERRORS } = constants;
 
-const components:KV<ICloudbaseComponent> = {};
+const components: KV<ICloudbaseComponent> = {};
 
-export function registerComponent(app:any,component:ICloudbaseComponent){
-  const { name, namespace, entity, injectEvents, IIFE=false } = component;
+export function registerComponent(app: any, component: ICloudbaseComponent) {
+  const { name, namespace, entity, injectEvents, IIFE = false } = component;
   // 不允许重复注册或命名空间重名
-  if(components[name]||(namespace&&app[namespace])){
+  if (components[name] || (namespace && app[namespace])) {
     throw new Error(JSON.stringify({
       code: ERRORS.INVALID_OPERATION,
-      msg: `Duplicate component ${name}`
+      msg: `Duplicate component ${name}`,
     }));
   }
   // IIFE类型的组件以app为scope执行entity函数，不挂载到app.prototype上
-  if(IIFE){
-    if(!entity||typeof entity !== 'function'){
+  if (IIFE) {
+    if (!entity || typeof entity !== 'function') {
       throw new Error(JSON.stringify({
         code: ERRORS.INVALID_PARAMS,
-        msg: 'IIFE component\'s entity must be a function'
+        msg: 'IIFE component\'s entity must be a function',
       }));
     }
     entity.call(app);
@@ -28,40 +30,40 @@ export function registerComponent(app:any,component:ICloudbaseComponent){
 
   components[name] = component;
 
-  if(namespace){
+  if (namespace) {
     (app as any).prototype[namespace] = entity;
-  }else{
-    deepExtend((app as any).prototype,entity);
+  } else {
+    deepExtend((app as any).prototype, entity);
   }
-  if(injectEvents){
+  if (injectEvents) {
     const { bus, events } = injectEvents;
-    if(!bus||!events||events.length===0){
-      return
+    if (!bus || !events || events.length === 0) {
+      return;
     }
-    const originCallback = (app as any).prototype.fire || function(){};
-    if(!(app as any).prototype.events){
+    const originCallback = (app as any).prototype.fire || function () {};
+    if (!(app as any).prototype.events) {
       (app as any).prototype.events = {};
     }
-    const originEvents:KV<any> = (app as any).prototype.events || {};
-    if(originEvents[name]){
-      (app as any).prototype.events[name].events = [...(app as any).prototype.events[name].events,...events];
-    }else{
-      (app as any).prototype.events[name] = {bus,events};
+    const originEvents: KV<any> = (app as any).prototype.events || {};
+    if (originEvents[name]) {
+      (app as any).prototype.events[name].events = [...(app as any).prototype.events[name].events, ...events];
+    } else {
+      (app as any).prototype.events[name] = { bus, events };
     }
-    (app as any).prototype.fire = function(eventName:string,data?:any){
-      originCallback(eventName,data);
-      for(const name in this.events){
-        const { bus, events:eventList } = this.events[name];
-        if(eventList.includes(eventName)){
-          bus.fire(eventName,data);
+    (app as any).prototype.fire = function (eventName: string, data?: any) {
+      originCallback(eventName, data);
+      for (const name in this.events) {
+        const { bus, events: eventList } = this.events[name];
+        if (eventList.includes(eventName)) {
+          bus.fire(eventName, data);
           break;
         }
       }
-    }
+    };
   }
 }
 
-function deepExtend(target:any,source:any):KV<any>{
+function deepExtend(target: any, source: any): KV<any> {
   if (!(source instanceof Object)) {
     return source;
   }
@@ -85,29 +87,29 @@ function deepExtend(target:any,source:any):KV<any>{
     if (!source.hasOwnProperty(key)) {
       continue;
     }
-    target[key] = deepExtend(target[key],source[key]);
+    target[key] = deepExtend(target[key], source[key]);
   }
 
   return target;
 }
 
-export function registerHook(app:any,hook:ICloudbaseHook){
+export function registerHook(app: any, hook: ICloudbaseHook) {
   const { entity, target } = hook;
-  if(!app.prototype.hasOwnProperty(target)){
+  if (!app.prototype.hasOwnProperty(target)) {
     throw new Error(JSON.stringify({
       code: ERRORS.INVALID_OPERATION,
-      msg: `target:${target} is not exist`
+      msg: `target:${target} is not exist`,
     }));
   }
   const originMethod = app.prototype[target];
-  if(typeof originMethod !== 'function'){
+  if (typeof originMethod !== 'function') {
     throw new Error(JSON.stringify({
       code: ERRORS.INVALID_OPERATION,
-      msg: `target:${target} is not a function which is the only type supports hook`
+      msg: `target:${target} is not a function which is the only type supports hook`,
     }));
   }
-  app.prototype[target] = function(...args:any){
-    entity.call(this,...args);
-    return originMethod.call(this,...args);
-  }
-}
+  app.prototype[target] = function (...args: any) {
+    entity.call(this, ...args);
+    return originMethod.call(this, ...args);
+  };
+}