@onekeyfe/react-native-async-storage 3.0.77 → 3.0.78

package/lib/module/NativeAsyncStorage.web.js

@@ -135,7 +135,8 @@ const AsyncStorage = {
   multiMerge: (keyValuePairs, callback) => {
     const promises = keyValuePairs.map(item => AsyncStorage.mergeItem(item[0], item[1]));
     return createPromiseAll(promises, callback);
-  }
+  },
+  reloadManifest: () => Promise.resolve()
 };
 export default AsyncStorage;
 //# sourceMappingURL=NativeAsyncStorage.web.js.map

package/lib/module/index.js

@@ -1,7 +1,7 @@
 "use strict";
 
 import NativeModule from './NativeAsyncStorage';
-import { forwardAsyncStorageWriteIfNeeded } from "./runtimeConfig.js";
+import { forwardAsyncStorageWrite, forwardAsyncStorageWriteIfNeeded, shouldForwardAsyncStorageWrite } from "./runtimeConfig.js";
 async function forwardWriteAndReloadManifestIfNeeded(method, args) {
   if (!(await forwardAsyncStorageWriteIfNeeded(method, args))) {
     return false;
@@ -10,13 +10,36 @@ async function forwardWriteAndReloadManifestIfNeeded(method, args) {
   return true;
 }
 async function runLocalWriteWithFreshManifest(write) {
+  // This narrows the local-write stale manifest window, but it does not make
+  // uninjected writes cross-runtime serialized. Writes that already completed
+  // before forwarder installation keep the legacy local-write semantics.
   await NativeModule.reloadManifest();
   await write();
 }
+async function runReadWithFreshManifest(read) {
+  // iOS keeps one manifest cache per runtime/module instance while the files on
+  // disk are shared. Refresh before reads so main can observe bg-origin writes
+  // without routing reads through the bg runtime. Android/web implementations
+  // expose reloadManifest as a no-op.
+  await NativeModule.reloadManifest();
+  return read();
+}
+async function forwardClearAsMultiRemoveIfNeeded() {
+  if (!shouldForwardAsyncStorageWrite()) {
+    return false;
+  }
+  await NativeModule.reloadManifest();
+  const keys = [...(await NativeModule.getAllKeys())];
+  // Use the fresh main-runtime key list; bg clear may enumerate from a stale
+  // manifest.
+  await forwardAsyncStorageWrite('multiRemove', [keys]);
+  await NativeModule.reloadManifest();
+  return true;
+}
 function createAsyncStorage() {
   const getItem = async (key, callback) => {
     try {
-      const result = await NativeModule.multiGet([key]);
+      const result = await runReadWithFreshManifest(() => NativeModule.multiGet([key]));
       const value = result?.[0]?.[1] ?? null;
       callback?.(null, value);
       return value;
@@ -64,7 +87,7 @@ function createAsyncStorage() {
   };
   const clear = async callback => {
     try {
-      if (!(await forwardWriteAndReloadManifestIfNeeded('clear', []))) {
+      if (!(await forwardClearAsMultiRemoveIfNeeded())) {
         await NativeModule.clear();
       }
       callback?.(null);
@@ -76,7 +99,7 @@ function createAsyncStorage() {
   };
   const getAllKeys = async callback => {
     try {
-      const keys = await NativeModule.getAllKeys();
+      const keys = await runReadWithFreshManifest(() => NativeModule.getAllKeys());
       callback?.(null, keys);
       return keys;
     } catch (e) {
@@ -90,7 +113,7 @@ function createAsyncStorage() {
   };
   const multiGet = async (keys, callback) => {
     try {
-      const result = await NativeModule.multiGet([...keys]);
+      const result = await runReadWithFreshManifest(() => NativeModule.multiGet([...keys]));
       callback?.(null, result);
       return result;
     } catch (e) {

package/lib/module/runtimeConfig.js

@@ -20,15 +20,21 @@ function getWriteForwarder() {
 function shouldForwardWriteToBackground() {
   return getShouldForwardWriteGetter()?.() ?? false;
 }
-export async function forwardAsyncStorageWriteIfNeeded(method, args) {
-  if (!shouldForwardWriteToBackground()) {
-    return false;
-  }
+export function shouldForwardAsyncStorageWrite() {
+  return shouldForwardWriteToBackground();
+}
+export async function forwardAsyncStorageWrite(method, args) {
   const forwarder = getWriteForwarder();
   if (!forwarder) {
     throw new Error('AsyncStorage write forwarder is not configured.');
   }
   await forwarder(method, args);
+}
+export async function forwardAsyncStorageWriteIfNeeded(method, args) {
+  if (!shouldForwardAsyncStorageWrite()) {
+    return false;
+  }
+  await forwardAsyncStorageWrite(method, args);
   return true;
 }
 //# sourceMappingURL=runtimeConfig.js.map

package/lib/typescript/src/NativeAsyncStorage.web.d.ts

@@ -6,6 +6,9 @@
  * LICENSE file in the root directory of this source tree.
  */
 import type { AsyncStorageStatic } from './types';
-declare const AsyncStorage: AsyncStorageStatic;
+type AsyncStorageWebStatic = AsyncStorageStatic & {
+    reloadManifest: () => Promise<void>;
+};
+declare const AsyncStorage: AsyncStorageWebStatic;
 export default AsyncStorage;
 //# sourceMappingURL=NativeAsyncStorage.web.d.ts.map

package/lib/typescript/src/runtimeConfig.d.ts

@@ -10,5 +10,7 @@ export type AsyncStorageShouldForwardWriteGetter = () => boolean;
 export type AsyncStorageWriteForwarder = <T extends AsyncStorageWriteMethod>(method: T, args: AsyncStorageWriteArgs<T>) => Promise<void>;
 export declare function setAsyncStorageShouldForwardWriteGetter(getter: AsyncStorageShouldForwardWriteGetter): void;
 export declare function setAsyncStorageWriteForwarder(forwarder: AsyncStorageWriteForwarder): void;
+export declare function shouldForwardAsyncStorageWrite(): boolean;
+export declare function forwardAsyncStorageWrite<T extends AsyncStorageWriteMethod>(method: T, args: AsyncStorageWriteArgs<T>): Promise<void>;
 export declare function forwardAsyncStorageWriteIfNeeded<T extends AsyncStorageWriteMethod>(method: T, args: AsyncStorageWriteArgs<T>): Promise<boolean>;
 //# sourceMappingURL=runtimeConfig.d.ts.map

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@onekeyfe/react-native-async-storage",
-  "version": "3.0.77",
+  "version": "3.0.78",
   "description": "react-native-async-storage",
   "main": "./lib/module/index.js",
   "types": "./lib/typescript/src/index.d.ts",

package/src/NativeAsyncStorage.web.ts

@@ -17,6 +17,9 @@ import type {
 type OnMultiResult = Function;
 // eslint-disable-next-line @typescript-eslint/ban-types
 type OnResult = Function;
+type AsyncStorageWebStatic = AsyncStorageStatic & {
+  reloadManifest: () => Promise<void>;
+};
 
 const merge = mergeOptions.bind({
   concatArrays: true,
@@ -73,7 +76,7 @@ function createPromiseAll<
   );
 }
 
-const AsyncStorage: AsyncStorageStatic = {
+const AsyncStorage: AsyncStorageWebStatic = {
   /**
    * Fetches `key` value.
    */
@@ -176,6 +179,8 @@ const AsyncStorage: AsyncStorageStatic = {
     );
     return createPromiseAll(promises, callback);
   },
+
+  reloadManifest: () => Promise.resolve(),
 };
 
 export default AsyncStorage;

package/src/index.tsx

@@ -1,5 +1,9 @@
 import NativeModule from './NativeAsyncStorage';
-import { forwardAsyncStorageWriteIfNeeded } from './runtimeConfig';
+import {
+  forwardAsyncStorageWrite,
+  forwardAsyncStorageWriteIfNeeded,
+  shouldForwardAsyncStorageWrite,
+} from './runtimeConfig';
 import type {
   AsyncStorageWriteArgs,
   AsyncStorageWriteMethod,
@@ -18,14 +22,42 @@ async function forwardWriteAndReloadManifestIfNeeded<
 }
 
 async function runLocalWriteWithFreshManifest(write: () => Promise<void>) {
+  // This narrows the local-write stale manifest window, but it does not make
+  // uninjected writes cross-runtime serialized. Writes that already completed
+  // before forwarder installation keep the legacy local-write semantics.
   await NativeModule.reloadManifest();
   await write();
 }
 
+async function runReadWithFreshManifest<T>(read: () => Promise<T>): Promise<T> {
+  // iOS keeps one manifest cache per runtime/module instance while the files on
+  // disk are shared. Refresh before reads so main can observe bg-origin writes
+  // without routing reads through the bg runtime. Android/web implementations
+  // expose reloadManifest as a no-op.
+  await NativeModule.reloadManifest();
+  return read();
+}
+
+async function forwardClearAsMultiRemoveIfNeeded() {
+  if (!shouldForwardAsyncStorageWrite()) {
+    return false;
+  }
+
+  await NativeModule.reloadManifest();
+  const keys = [...(await NativeModule.getAllKeys())];
+  // Use the fresh main-runtime key list; bg clear may enumerate from a stale
+  // manifest.
+  await forwardAsyncStorageWrite('multiRemove', [keys]);
+  await NativeModule.reloadManifest();
+  return true;
+}
+
 function createAsyncStorage(): AsyncStorageStatic {
   const getItem: AsyncStorageStatic['getItem'] = async (key, callback) => {
     try {
-      const result = await NativeModule.multiGet([key]);
+      const result = await runReadWithFreshManifest(() =>
+        NativeModule.multiGet([key])
+      );
       const value = result?.[0]?.[1] ?? null;
       callback?.(null, value);
       return value;
@@ -104,7 +136,7 @@ function createAsyncStorage(): AsyncStorageStatic {
 
   const clear: AsyncStorageStatic['clear'] = async (callback) => {
     try {
-      if (!(await forwardWriteAndReloadManifestIfNeeded('clear', []))) {
+      if (!(await forwardClearAsMultiRemoveIfNeeded())) {
         await NativeModule.clear();
       }
       callback?.(null);
@@ -117,7 +149,9 @@ function createAsyncStorage(): AsyncStorageStatic {
 
   const getAllKeys: AsyncStorageStatic['getAllKeys'] = async (callback) => {
     try {
-      const keys = await NativeModule.getAllKeys();
+      const keys = await runReadWithFreshManifest(() =>
+        NativeModule.getAllKeys()
+      );
       callback?.(null, keys);
       return keys;
     } catch (e) {
@@ -133,7 +167,9 @@ function createAsyncStorage(): AsyncStorageStatic {
 
   const multiGet: AsyncStorageStatic['multiGet'] = async (keys, callback) => {
     try {
-      const result = await NativeModule.multiGet([...keys]);
+      const result = await runReadWithFreshManifest(() =>
+        NativeModule.multiGet([...keys])
+      );
       callback?.(null, result);
       return result;
     } catch (e) {

package/src/runtimeConfig.ts

@@ -59,18 +59,28 @@ function shouldForwardWriteToBackground() {
   return getShouldForwardWriteGetter()?.() ?? false;
 }
 
-export async function forwardAsyncStorageWriteIfNeeded<
-  T extends AsyncStorageWriteMethod
->(method: T, args: AsyncStorageWriteArgs<T>): Promise<boolean> {
-  if (!shouldForwardWriteToBackground()) {
-    return false;
-  }
+export function shouldForwardAsyncStorageWrite() {
+  return shouldForwardWriteToBackground();
+}
 
+export async function forwardAsyncStorageWrite<
+  T extends AsyncStorageWriteMethod
+>(method: T, args: AsyncStorageWriteArgs<T>): Promise<void> {
   const forwarder = getWriteForwarder();
   if (!forwarder) {
     throw new Error('AsyncStorage write forwarder is not configured.');
   }
 
   await forwarder(method, args);
+}
+
+export async function forwardAsyncStorageWriteIfNeeded<
+  T extends AsyncStorageWriteMethod
+>(method: T, args: AsyncStorageWriteArgs<T>): Promise<boolean> {
+  if (!shouldForwardAsyncStorageWrite()) {
+    return false;
+  }
+
+  await forwardAsyncStorageWrite(method, args);
   return true;
 }