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

package/android/src/main/java/com/asyncstorage/RNCAsyncStorageModule.kt

@@ -292,6 +292,10 @@ class RNCAsyncStorageModule(reactContext: ReactApplicationContext) :
         }
     }
 
+    override fun reloadManifest(promise: Promise) {
+        promise.resolve(null)
+    }
+
     // --- Private helpers (ported from AsyncLocalStorageUtil.java) ---
 
     private fun ensureDatabase(): Boolean {

package/ios/AsyncStorage.h

@@ -24,4 +24,7 @@
 - (void)clear:(RCTPromiseResolveBlock)resolve
        reject:(RCTPromiseRejectBlock)reject;
 
+- (void)reloadManifest:(RCTPromiseResolveBlock)resolve
+                reject:(RCTPromiseRejectBlock)reject;
+
 @end

package/ios/AsyncStorage.mm

@@ -711,4 +711,20 @@ static void RCTStorageDirectoryMigrationCheck(NSString *fromStorageDirectory,
     });
 }
 
+- (void)reloadManifest:(RCTPromiseResolveBlock)resolve
+                reject:(RCTPromiseRejectBlock)reject
+{
+    dispatch_async(RCTGetMethodQueue(), ^{
+        self->_haveSetup = NO;
+        NSDictionary *ensureSetupError = [self _ensureSetup];
+        if (ensureSetupError) {
+            reject(@"ASYNC_STORAGE_ERROR",
+                   ensureSetupError[@"message"] ?: @"Storage setup failed",
+                   nil);
+            return;
+        }
+        resolve(nil);
+    });
+}
+
 @end

package/lib/module/index.js

@@ -2,6 +2,17 @@
 
 import NativeModule from './NativeAsyncStorage';
 import { forwardAsyncStorageWriteIfNeeded } from "./runtimeConfig.js";
+async function forwardWriteAndReloadManifestIfNeeded(method, args) {
+  if (!(await forwardAsyncStorageWriteIfNeeded(method, args))) {
+    return false;
+  }
+  await NativeModule.reloadManifest();
+  return true;
+}
+async function runLocalWriteWithFreshManifest(write) {
+  await NativeModule.reloadManifest();
+  await write();
+}
 function createAsyncStorage() {
   const getItem = async (key, callback) => {
     try {
@@ -17,8 +28,8 @@ function createAsyncStorage() {
   };
   const setItem = async (key, value, callback) => {
     try {
-      if (!(await forwardAsyncStorageWriteIfNeeded('multiSet', [[[key, value]]]))) {
-        await NativeModule.multiSet([[key, value]]);
+      if (!(await forwardWriteAndReloadManifestIfNeeded('multiSet', [[[key, value]]]))) {
+        await runLocalWriteWithFreshManifest(() => NativeModule.multiSet([[key, value]]));
       }
       callback?.(null);
     } catch (e) {
@@ -29,8 +40,8 @@ function createAsyncStorage() {
   };
   const removeItem = async (key, callback) => {
     try {
-      if (!(await forwardAsyncStorageWriteIfNeeded('multiRemove', [[key]]))) {
-        await NativeModule.multiRemove([key]);
+      if (!(await forwardWriteAndReloadManifestIfNeeded('multiRemove', [[key]]))) {
+        await runLocalWriteWithFreshManifest(() => NativeModule.multiRemove([key]));
       }
       callback?.(null);
     } catch (e) {
@@ -41,8 +52,8 @@ function createAsyncStorage() {
   };
   const mergeItem = async (key, value, callback) => {
     try {
-      if (!(await forwardAsyncStorageWriteIfNeeded('multiMerge', [[[key, value]]]))) {
-        await NativeModule.multiMerge([[key, value]]);
+      if (!(await forwardWriteAndReloadManifestIfNeeded('multiMerge', [[[key, value]]]))) {
+        await runLocalWriteWithFreshManifest(() => NativeModule.multiMerge([[key, value]]));
       }
       callback?.(null);
     } catch (e) {
@@ -53,7 +64,7 @@ function createAsyncStorage() {
   };
   const clear = async callback => {
     try {
-      if (!(await forwardAsyncStorageWriteIfNeeded('clear', []))) {
+      if (!(await forwardWriteAndReloadManifestIfNeeded('clear', []))) {
         await NativeModule.clear();
       }
       callback?.(null);
@@ -91,8 +102,8 @@ function createAsyncStorage() {
   const multiSet = async (keyValuePairs, callback) => {
     try {
       const mutablePairs = keyValuePairs.map(([k, v]) => [k, v]);
-      if (!(await forwardAsyncStorageWriteIfNeeded('multiSet', [mutablePairs]))) {
-        await NativeModule.multiSet(mutablePairs);
+      if (!(await forwardWriteAndReloadManifestIfNeeded('multiSet', [mutablePairs]))) {
+        await runLocalWriteWithFreshManifest(() => NativeModule.multiSet(mutablePairs));
       }
       callback?.(null);
     } catch (e) {
@@ -104,8 +115,8 @@ function createAsyncStorage() {
   const multiRemove = async (keys, callback) => {
     try {
       const mutableKeys = [...keys];
-      if (!(await forwardAsyncStorageWriteIfNeeded('multiRemove', [mutableKeys]))) {
-        await NativeModule.multiRemove(mutableKeys);
+      if (!(await forwardWriteAndReloadManifestIfNeeded('multiRemove', [mutableKeys]))) {
+        await runLocalWriteWithFreshManifest(() => NativeModule.multiRemove(mutableKeys));
       }
       callback?.(null);
     } catch (e) {
@@ -116,8 +127,8 @@ function createAsyncStorage() {
   };
   const multiMerge = async (keyValuePairs, callback) => {
     try {
-      if (!(await forwardAsyncStorageWriteIfNeeded('multiMerge', [keyValuePairs]))) {
-        await NativeModule.multiMerge(keyValuePairs);
+      if (!(await forwardWriteAndReloadManifestIfNeeded('multiMerge', [keyValuePairs]))) {
+        await runLocalWriteWithFreshManifest(() => NativeModule.multiMerge(keyValuePairs));
       }
       callback?.(null);
     } catch (e) {

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

@@ -6,6 +6,7 @@ export interface Spec extends TurboModule {
     multiMerge(keyValuePairs: [string, string][]): Promise<void>;
     getAllKeys(): Promise<string[]>;
     clear(): Promise<void>;
+    reloadManifest(): Promise<void>;
 }
 declare const _default: Spec;
 export default _default;

package/package.json

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

package/src/NativeAsyncStorage.ts

@@ -8,6 +8,7 @@ export interface Spec extends TurboModule {
   multiMerge(keyValuePairs: [string, string][]): Promise<void>;
   getAllKeys(): Promise<string[]>;
   clear(): Promise<void>;
+  reloadManifest(): Promise<void>;
 }
 
 export default TurboModuleRegistry.getEnforcing<Spec>('RNCAsyncStorage');

package/src/index.tsx

@@ -1,7 +1,27 @@
 import NativeModule from './NativeAsyncStorage';
 import { forwardAsyncStorageWriteIfNeeded } from './runtimeConfig';
+import type {
+  AsyncStorageWriteArgs,
+  AsyncStorageWriteMethod,
+} from './runtimeConfig';
 import type { AsyncStorageStatic } from './types';
 
+async function forwardWriteAndReloadManifestIfNeeded<
+  T extends AsyncStorageWriteMethod
+>(method: T, args: AsyncStorageWriteArgs<T>) {
+  if (!(await forwardAsyncStorageWriteIfNeeded(method, args))) {
+    return false;
+  }
+
+  await NativeModule.reloadManifest();
+  return true;
+}
+
+async function runLocalWriteWithFreshManifest(write: () => Promise<void>) {
+  await NativeModule.reloadManifest();
+  await write();
+}
+
 function createAsyncStorage(): AsyncStorageStatic {
   const getItem: AsyncStorageStatic['getItem'] = async (key, callback) => {
     try {
@@ -23,9 +43,13 @@ function createAsyncStorage(): AsyncStorageStatic {
   ) => {
     try {
       if (
-        !(await forwardAsyncStorageWriteIfNeeded('multiSet', [[[key, value]]]))
+        !(await forwardWriteAndReloadManifestIfNeeded('multiSet', [
+          [[key, value]],
+        ]))
       ) {
-        await NativeModule.multiSet([[key, value]]);
+        await runLocalWriteWithFreshManifest(() =>
+          NativeModule.multiSet([[key, value]])
+        );
       }
       callback?.(null);
     } catch (e) {
@@ -40,8 +64,12 @@ function createAsyncStorage(): AsyncStorageStatic {
     callback
   ) => {
     try {
-      if (!(await forwardAsyncStorageWriteIfNeeded('multiRemove', [[key]]))) {
-        await NativeModule.multiRemove([key]);
+      if (
+        !(await forwardWriteAndReloadManifestIfNeeded('multiRemove', [[key]]))
+      ) {
+        await runLocalWriteWithFreshManifest(() =>
+          NativeModule.multiRemove([key])
+        );
       }
       callback?.(null);
     } catch (e) {
@@ -58,11 +86,13 @@ function createAsyncStorage(): AsyncStorageStatic {
   ) => {
     try {
       if (
-        !(await forwardAsyncStorageWriteIfNeeded('multiMerge', [
+        !(await forwardWriteAndReloadManifestIfNeeded('multiMerge', [
           [[key, value]],
         ]))
       ) {
-        await NativeModule.multiMerge([[key, value]]);
+        await runLocalWriteWithFreshManifest(() =>
+          NativeModule.multiMerge([[key, value]])
+        );
       }
       callback?.(null);
     } catch (e) {
@@ -74,7 +104,7 @@ function createAsyncStorage(): AsyncStorageStatic {
 
   const clear: AsyncStorageStatic['clear'] = async (callback) => {
     try {
-      if (!(await forwardAsyncStorageWriteIfNeeded('clear', []))) {
+      if (!(await forwardWriteAndReloadManifestIfNeeded('clear', []))) {
         await NativeModule.clear();
       }
       callback?.(null);
@@ -122,9 +152,13 @@ function createAsyncStorage(): AsyncStorageStatic {
         ([k, v]) => [k, v] as [string, string]
       );
       if (
-        !(await forwardAsyncStorageWriteIfNeeded('multiSet', [mutablePairs]))
+        !(await forwardWriteAndReloadManifestIfNeeded('multiSet', [
+          mutablePairs,
+        ]))
       ) {
-        await NativeModule.multiSet(mutablePairs);
+        await runLocalWriteWithFreshManifest(() =>
+          NativeModule.multiSet(mutablePairs)
+        );
       }
       callback?.(null);
     } catch (e) {
@@ -141,9 +175,13 @@ function createAsyncStorage(): AsyncStorageStatic {
     try {
       const mutableKeys = [...keys];
       if (
-        !(await forwardAsyncStorageWriteIfNeeded('multiRemove', [mutableKeys]))
+        !(await forwardWriteAndReloadManifestIfNeeded('multiRemove', [
+          mutableKeys,
+        ]))
       ) {
-        await NativeModule.multiRemove(mutableKeys);
+        await runLocalWriteWithFreshManifest(() =>
+          NativeModule.multiRemove(mutableKeys)
+        );
       }
       callback?.(null);
     } catch (e) {
@@ -159,9 +197,13 @@ function createAsyncStorage(): AsyncStorageStatic {
   ) => {
     try {
       if (
-        !(await forwardAsyncStorageWriteIfNeeded('multiMerge', [keyValuePairs]))
+        !(await forwardWriteAndReloadManifestIfNeeded('multiMerge', [
+          keyValuePairs,
+        ]))
       ) {
-        await NativeModule.multiMerge(keyValuePairs);
+        await runLocalWriteWithFreshManifest(() =>
+          NativeModule.multiMerge(keyValuePairs)
+        );
       }
       callback?.(null);
     } catch (e) {