Merge pull request #16263 from kongxiaojun/f-taro-storage-cache-opt-3

【Harmony-Hybrid】优化Taro Storage缓存，解决跨Web容器修改Storage后缓存不更新
NervJS · Aug 7, 2024 · 9e13236 · 9e13236
2 parents 86b2973 + 936c61e
commit 9e13236
Show file tree

Hide file tree

Showing 6 changed files with 31 additions and 21 deletions.
diff --git a/examples/mini-program-example/src/pages/index/index.tsx b/examples/mini-program-example/src/pages/index/index.tsx
@@ -49,21 +49,20 @@ export default function Index() {
       </Button>
       <Button
         onClick={()=>{
-          nativeApi.harmonyNavigateTo({
-            indexHtmlPath: '/spa/new/index.html',
-            taroPath: 'pages/performance/index/index'
+          Taro.navigateTo({
+            url: 'pages/harmony-hybrid/mix-router/home/index'
           })
         }}>
-        多实例（多SPA跳转）：性能列表页
+        多实例及混合路由测试页
       </Button>
       <Button
         onClick={()=>{
-          nativeApi.harmonyNavigateTo({
+          nativeApi.navigateToTaroHybrid({
             indexHtmlPath: '/spa/new/index.html',
-            taroPath: 'pages/api/index/index'
+            taroPath: '/pages/index/index'
           })
         }}>
-        单实例（单SPA）：接口列表页
+        多实例（单SPA）：首页
       </Button>
     </View>
   )

diff --git a/examples/mini-program-example/src/util/nativeApi.ts b/examples/mini-program-example/src/util/nativeApi.ts
@@ -1,13 +1,14 @@
 // @ts-ignore
-const decorator = window.MethodChannel && window.MethodChannel.jsBridgeMode({ isAsync: false, autoRelease: true }) || (target => target)
+const sync = window.MethodChannel && window.MethodChannel.jsBridgeMode({ isAsync: false, autoRelease: true }) || (target => target)
 
 // @proxyClassSign('')
 class NativeApi {
-  // @ts-ignore
-  @decorator
-  harmonyNavigateTo(options: any) {
-    return options
-  }
+  @sync
+  navigateToTaroHybrid(_options: any) {}
+
+
+  @sync
+  navigateToNative(_options: any){}
 }
 
 const nativeApi = new NativeApi()

diff --git a/packages/taro-platform-harmony-hybrid/build/config/harmony-definition.json b/packages/taro-platform-harmony-hybrid/build/config/harmony-definition.json
@@ -757,12 +757,7 @@
       "TARO_ENV": true,
       "USER_DATA_PATH": true
     },
-    "exitMiniProgram": {
-      "object": {
-        "url": true,
-        "events": true
-      }
-    },
+    "exitMiniProgram": true,
     "exitVoIPChat": false,
     "faceDetect": false,
     "faceVerifyForPay": false,

diff --git a/packages/taro-platform-harmony-hybrid/src/api/apis/NativeApi.ts b/packages/taro-platform-harmony-hybrid/src/api/apis/NativeApi.ts
@@ -1,6 +1,6 @@
 // import {timeLog} from "./NativeApiLog";
 import { syncApiCache } from './harmony-native/ApiCache'
-import { asyncAndNotRelease, asyncAndRelease, syncAndRelease } from './harmony-native/ApiDecorator'
+import { asyncAndNotRelease, asyncAndRelease, syncAndNotRelease, syncAndRelease } from './harmony-native/ApiDecorator'
 import { storageCacheAndSyncProxy } from './harmony-native/StorageCacheAndSyncProxy'
 import { NativeDataChangeListener, SyncCacheProxyHandler } from './NativeApiSyncCacheProxy'
 
@@ -627,6 +627,12 @@ export class NativeApi {
   exitMiniProgram (option?: any): any {
     return option
   }
+
+  @(syncAndNotRelease)
+  onStorageStatusChange (_options: any): void {}
+
+  @(syncAndNotRelease)
+  offStorageStatusChange (_options: any): void {}
 }
 
 export interface Status {

diff --git a/packages/taro-platform-harmony-hybrid/src/api/apis/harmony-native/ApiDecorator.ts b/packages/taro-platform-harmony-hybrid/src/api/apis/harmony-native/ApiDecorator.ts
@@ -2,7 +2,7 @@
 export const syncAndRelease = window.MethodChannel && window.MethodChannel.jsBridgeMode({ isAsync: false, autoRelease: true }) || (target => target)
 
 // @ts-ignore
-// const syncAndNotRelease = window.MethodChannel && window.MethodChannel.jsBridgeMode({ isAsync: false, autoRelease: false }) || (target => target)
+export const syncAndNotRelease = window.MethodChannel && window.MethodChannel.jsBridgeMode({ isAsync: false, autoRelease: false }) || (target => target)
 
 // @ts-ignore
 export const asyncAndRelease = window.MethodChannel && window.MethodChannel.jsBridgeMode({ isAsync: true, autoRelease: true }) || (target => target)

diff --git a/...ages/taro-platform-harmony-hybrid/src/api/apis/harmony-native/StorageCacheAndSyncProxy.ts b/...ages/taro-platform-harmony-hybrid/src/api/apis/harmony-native/StorageCacheAndSyncProxy.ts
@@ -1,3 +1,4 @@
+const TYPE_STORAGE_UPDATE_EVENT_CLEAR = 'TYPE_STORAGE_UPDATE_EVENT_CLEAR'
 class ProxyHandler {
   private cacheMap: Map<any, any>
   private pageHasShowed: boolean = false
@@ -28,6 +29,14 @@ class ProxyHandler {
         })
       }, 2000)
     })
+
+    native.onStorageStatusChange((type: string, key: string) => {
+      if (type === TYPE_STORAGE_UPDATE_EVENT_CLEAR) {
+        this.cacheMap.clear()
+      } else {
+        this.cacheMap.delete(key)
+      }
+    })
   }
 
   get (target, propKey, receiver) {