feat(Available Cache): add New Cache and NetworkId / ChainId

Author: Littleor

src/provider.ts

@@ -8,8 +8,8 @@ import {
   IProvider,
   IRequestArguments,
 } from './interface/provider'
-import { ConsoleLike } from './utils/types'
-import { callIframe } from './utils/common'
+import { ConsoleLike, IAuthResult } from './utils/types'
+import { callIframe, readCache, setCache } from './utils/common'
 import config from '../package.json'
 import { AddressType, getAddressType } from './utils/address'
 
@@ -22,27 +22,19 @@ import { AddressType, getAddressType } from './utils/address'
  * const provider = new Provider()
  */
 export class Provider implements IProvider {
-  protected logger: ConsoleLike
-  protected appId: string
-  protected address: string[] = []
+  logger: ConsoleLike
+  public readonly appId: string
+  address: string[] = []
+  networkId = -1
+  chainId = -1
 
   constructor({ logger, appId }: BaseProviderOptions) {
     if (!logger) {
       logger = console
     }
     this.logger = logger
     this.appId = appId
-
-    try {
-      this.address =
-        JSON.parse(
-          (window.localStorage &&
-            window.localStorage.getItem('anyweb_address')) ||
-            '[]'
-        ) || []
-    } catch (e) {
-      this.logger.error(e)
-    }
+    readCache(this)
 
     // bind functions (to prevent consumers from making unbound calls)
     this.request = this.request.bind(this)
@@ -125,26 +117,28 @@ export class Provider implements IProvider {
   ): Promise<unknown> {
     switch (method) {
       case 'cfx_netVersion':
-        return 1
+        if (this.networkId === -1) {
+          return 1
+        }
+        return this.networkId
       case 'cfx_chainId':
-        return 1
+        if (this.chainId === -1) {
+          return 1
+        }
+        return this.chainId
       case 'cfx_requestAccounts':
         return this.rawRequest('cfx_accounts')
       case 'cfx_accounts':
         if (this.address.length > 0) {
           return this.address
         }
-        this.address = (await callIframe('pages/dapp/auth', {
+        const result = (await callIframe('pages/dapp/auth', {
           appId: this.appId,
           params: params ? JSON.stringify(params) : '',
           chainId: (await this.request({ method: 'cfx_chainId' })) as string,
           authType: 'account',
-        })) as string[]
-        window.localStorage &&
-          window.localStorage.setItem(
-            'anyweb_address',
-            JSON.stringify(this.address)
-          )
+        })) as IAuthResult
+        setCache(result, this)
         return this.address
       case 'cfx_sendTransaction':
         const paramsObj = params

src/utils/common.ts

@@ -5,6 +5,8 @@
 import * as forge from 'node-forge'
 import axios from 'axios'
 import { API_BASE_URL, BASE_URL } from '../config'
+import { IAuthResult } from './types'
+import { Provider } from '../provider'
 
 /**
  * Check the window width to decide whether to show in full screen
@@ -105,3 +107,41 @@ export const callIframe = async (
   }
   return 'ok'
 }
+
+export const readCache = (provider: Provider) => {
+  try {
+    const result = JSON.parse(
+      (window.localStorage && window.localStorage.getItem('anyweb_info')) ||
+        '{}'
+    )
+    if (
+      Object.keys(result).length > 0 &&
+      Object.keys(result).includes('address') &&
+      Object.keys(result).includes('networkId') &&
+      Object.keys(result).includes('chainId') &&
+      Object.keys(result).includes('expires') &&
+      result.expires > new Date().getTime()
+    ) {
+      provider.address = result.address
+      provider.networkId = result.networkId
+      provider.chainId = result.chainId
+    }
+  } catch (e) {
+    provider.logger.error(e)
+  }
+}
+
+export const setCache = (data: IAuthResult, provider: Provider) => {
+  window.localStorage &&
+    window.localStorage.setItem(
+      'anyweb_info',
+      JSON.stringify({
+        ...data,
+        expires: 10 * 60 * 1000 + new Date().getTime(),
+      })
+    )
+  provider.address = data.address
+  provider.networkId = data.networkId
+  provider.chainId = data.chainId
+  return data
+}

src/utils/types.ts

@@ -6,3 +6,9 @@ export type ConsoleLike = Pick<
   Console,
   'log' | 'warn' | 'error' | 'debug' | 'info' | 'trace'
 >
+
+export interface IAuthResult {
+  chainId: number
+  networkId: number
+  address: string[]
+}