Merge branch 'x' into fix/db-perf-fix

OneKeyHQ · Dec 26, 2024 · 57de8fa · 57de8fa
2 parents 518f3fc + 3cd6641
commit 57de8fa
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 7 deletions.
diff --git a/packages/shared/src/storage/appStorageUtils.ts b/packages/shared/src/storage/appStorageUtils.ts
@@ -9,7 +9,7 @@ let _canSaveAsObject: boolean | null = null;
 function canSaveAsObject(): boolean {
   if (_canSaveAsObject === null) {
     _canSaveAsObject = false;
-    if (platformEnv.isRuntimeBrowser) {
+    if (platformEnv.isRuntimeBrowser || platformEnv.isExtension) {
       const isIndexedDB: boolean = (
         appStorage as unknown as WebStorage
       )?.isIndexedDB();

diff --git a/packages/shared/src/storage/syncStorage.ts b/packages/shared/src/storage/syncStorage.ts
@@ -2,6 +2,7 @@ import { isPlainObject } from 'lodash';
 
 import appGlobals from '../appGlobals';
 import platformEnv from '../platformEnv';
+import { ensureRunOnBackground } from '../utils/assertUtils';
 import dbPerfMonitor from '../utils/debug/dbPerfMonitor';
 import resetUtils from '../utils/resetUtils';
 
@@ -30,14 +31,18 @@ export const buildAppStorageFactory = (
   const setItem: IAppStorage['setItem'] = (key, value, callback) => {
     resetUtils.checkNotInResetting();
     dbPerfMonitor.logAppStorageCall('setItem', key);
+    ensureRunOnBackground();
     return originalSetItem.call(storage, key, value, callback);
   };
   const getItem: IAppStorage['getItem'] = (key, callback) => {
     dbPerfMonitor.logAppStorageCall('getItem', key);
+    ensureRunOnBackground();
     return originalGetItem.call(storage, key, callback);
   };
-  const removeItem: IAppStorage['removeItem'] = (key, callback) =>
-    originalRemoveItem.call(storage, key, callback);
+  const removeItem: IAppStorage['removeItem'] = (key, callback) => {
+    ensureRunOnBackground();
+    return originalRemoveItem.call(storage, key, callback);
+  };
 
   storage.setItem = setItem;
   storage.getItem = getItem;

diff --git a/packages/shared/src/utils/assertUtils.ts b/packages/shared/src/utils/assertUtils.ts
@@ -10,10 +10,10 @@ import {
   isUndefined,
 } from 'lodash';
 
+import appGlobals from '../appGlobals';
 import errorUtils from '../errors/utils/errorUtils';
 import platformEnv from '../platformEnv';
-import appStorage from '../storage/appStorage';
-import { EAppSyncStorageKeys } from '../storage/syncStorage';
+import { EAppSyncStorageKeys } from '../storage/syncStorageKeys';
 
 import { isPromiseObject } from './promiseUtils';
 import timerUtils from './timerUtils';
@@ -108,15 +108,15 @@ export function toggleBgApiSerializableChecking(enabled: boolean) {
     disabled: !enabled,
     updateAt: Date.now(),
   };
-  appStorage.syncStorage.setObject(
+  appGlobals.$appStorage?.syncStorage.setObject(
     EAppSyncStorageKeys.onekey_disable_bg_api_serializable_checking,
     data,
   );
 }
 export function isBgApiSerializableCheckingDisabled() {
   try {
     const data =
-      appStorage.syncStorage.getObject<ISerializableCheckingDisabledConfig>(
+      appGlobals.$appStorage?.syncStorage.getObject<ISerializableCheckingDisabledConfig>(
         EAppSyncStorageKeys.onekey_disable_bg_api_serializable_checking,
       );
     if (!data) {