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

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

@@ -292,10 +292,6 @@ 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,7 +24,4 @@
 - (void)clear:(RCTPromiseResolveBlock)resolve
        reject:(RCTPromiseRejectBlock)reject;
 
-- (void)reloadManifest:(RCTPromiseResolveBlock)resolve
-                reject:(RCTPromiseRejectBlock)reject;
-
 @end

package/ios/AsyncStorage.mm

@@ -711,20 +711,4 @@ 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

@@ -1,18 +1,6 @@
 "use strict";
 
 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 {
@@ -28,9 +16,7 @@ function createAsyncStorage() {
   };
   const setItem = async (key, value, callback) => {
     try {
-      if (!(await forwardWriteAndReloadManifestIfNeeded('multiSet', [[[key, value]]]))) {
-        await runLocalWriteWithFreshManifest(() => NativeModule.multiSet([[key, value]]));
-      }
+      await NativeModule.multiSet([[key, value]]);
       callback?.(null);
     } catch (e) {
       const error = e instanceof Error ? e : new Error(String(e));
@@ -40,9 +26,7 @@ function createAsyncStorage() {
   };
   const removeItem = async (key, callback) => {
     try {
-      if (!(await forwardWriteAndReloadManifestIfNeeded('multiRemove', [[key]]))) {
-        await runLocalWriteWithFreshManifest(() => NativeModule.multiRemove([key]));
-      }
+      await NativeModule.multiRemove([key]);
       callback?.(null);
     } catch (e) {
       const error = e instanceof Error ? e : new Error(String(e));
@@ -52,9 +36,7 @@ function createAsyncStorage() {
   };
   const mergeItem = async (key, value, callback) => {
     try {
-      if (!(await forwardWriteAndReloadManifestIfNeeded('multiMerge', [[[key, value]]]))) {
-        await runLocalWriteWithFreshManifest(() => NativeModule.multiMerge([[key, value]]));
-      }
+      await NativeModule.multiMerge([[key, value]]);
       callback?.(null);
     } catch (e) {
       const error = e instanceof Error ? e : new Error(String(e));
@@ -64,9 +46,7 @@ function createAsyncStorage() {
   };
   const clear = async callback => {
     try {
-      if (!(await forwardWriteAndReloadManifestIfNeeded('clear', []))) {
-        await NativeModule.clear();
-      }
+      await NativeModule.clear();
       callback?.(null);
     } catch (e) {
       const error = e instanceof Error ? e : new Error(String(e));
@@ -102,9 +82,7 @@ function createAsyncStorage() {
   const multiSet = async (keyValuePairs, callback) => {
     try {
       const mutablePairs = keyValuePairs.map(([k, v]) => [k, v]);
-      if (!(await forwardWriteAndReloadManifestIfNeeded('multiSet', [mutablePairs]))) {
-        await runLocalWriteWithFreshManifest(() => NativeModule.multiSet(mutablePairs));
-      }
+      await NativeModule.multiSet(mutablePairs);
       callback?.(null);
     } catch (e) {
       const error = e instanceof Error ? e : new Error(String(e));
@@ -114,10 +92,7 @@ function createAsyncStorage() {
   };
   const multiRemove = async (keys, callback) => {
     try {
-      const mutableKeys = [...keys];
-      if (!(await forwardWriteAndReloadManifestIfNeeded('multiRemove', [mutableKeys]))) {
-        await runLocalWriteWithFreshManifest(() => NativeModule.multiRemove(mutableKeys));
-      }
+      await NativeModule.multiRemove([...keys]);
       callback?.(null);
     } catch (e) {
       const error = e instanceof Error ? e : new Error(String(e));
@@ -127,9 +102,7 @@ function createAsyncStorage() {
   };
   const multiMerge = async (keyValuePairs, callback) => {
     try {
-      if (!(await forwardWriteAndReloadManifestIfNeeded('multiMerge', [keyValuePairs]))) {
-        await runLocalWriteWithFreshManifest(() => NativeModule.multiMerge(keyValuePairs));
-      }
+      await NativeModule.multiMerge(keyValuePairs);
       callback?.(null);
     } catch (e) {
       const error = e instanceof Error ? e : new Error(String(e));
@@ -153,5 +126,4 @@ function createAsyncStorage() {
 }
 const AsyncStorage = createAsyncStorage();
 export default AsyncStorage;
-export { setAsyncStorageShouldForwardWriteGetter, setAsyncStorageWriteForwarder } from "./runtimeConfig.js";
 //# sourceMappingURL=index.js.map

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

@@ -6,7 +6,6 @@ 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/lib/typescript/src/index.d.ts

@@ -1,7 +1,5 @@
 import type { AsyncStorageStatic } from './types';
 declare const AsyncStorage: AsyncStorageStatic;
 export default AsyncStorage;
-export type { AsyncStorageShouldForwardWriteGetter, AsyncStorageWriteArgs, AsyncStorageWriteArgsByMethod, AsyncStorageWriteForwarder, AsyncStorageWriteMethod, } from './runtimeConfig';
 export type { AsyncStorageStatic, Callback, CallbackWithResult, KeyValuePair, MultiCallback, MultiGetCallback, } from './types';
-export { setAsyncStorageShouldForwardWriteGetter, setAsyncStorageWriteForwarder, } from './runtimeConfig';
 //# sourceMappingURL=index.d.ts.map

package/package.json

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

package/src/NativeAsyncStorage.ts

@@ -8,7 +8,6 @@ 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,27 +1,6 @@
 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 {
@@ -42,15 +21,7 @@ function createAsyncStorage(): AsyncStorageStatic {
     callback
   ) => {
     try {
-      if (
-        !(await forwardWriteAndReloadManifestIfNeeded('multiSet', [
-          [[key, value]],
-        ]))
-      ) {
-        await runLocalWriteWithFreshManifest(() =>
-          NativeModule.multiSet([[key, value]])
-        );
-      }
+      await NativeModule.multiSet([[key, value]]);
       callback?.(null);
     } catch (e) {
       const error = e instanceof Error ? e : new Error(String(e));
@@ -64,13 +35,7 @@ function createAsyncStorage(): AsyncStorageStatic {
     callback
   ) => {
     try {
-      if (
-        !(await forwardWriteAndReloadManifestIfNeeded('multiRemove', [[key]]))
-      ) {
-        await runLocalWriteWithFreshManifest(() =>
-          NativeModule.multiRemove([key])
-        );
-      }
+      await NativeModule.multiRemove([key]);
       callback?.(null);
     } catch (e) {
       const error = e instanceof Error ? e : new Error(String(e));
@@ -85,15 +50,7 @@ function createAsyncStorage(): AsyncStorageStatic {
     callback
   ) => {
     try {
-      if (
-        !(await forwardWriteAndReloadManifestIfNeeded('multiMerge', [
-          [[key, value]],
-        ]))
-      ) {
-        await runLocalWriteWithFreshManifest(() =>
-          NativeModule.multiMerge([[key, value]])
-        );
-      }
+      await NativeModule.multiMerge([[key, value]]);
       callback?.(null);
     } catch (e) {
       const error = e instanceof Error ? e : new Error(String(e));
@@ -104,9 +61,7 @@ function createAsyncStorage(): AsyncStorageStatic {
 
   const clear: AsyncStorageStatic['clear'] = async (callback) => {
     try {
-      if (!(await forwardWriteAndReloadManifestIfNeeded('clear', []))) {
-        await NativeModule.clear();
-      }
+      await NativeModule.clear();
       callback?.(null);
     } catch (e) {
       const error = e instanceof Error ? e : new Error(String(e));
@@ -151,15 +106,7 @@ function createAsyncStorage(): AsyncStorageStatic {
       const mutablePairs = keyValuePairs.map(
         ([k, v]) => [k, v] as [string, string]
       );
-      if (
-        !(await forwardWriteAndReloadManifestIfNeeded('multiSet', [
-          mutablePairs,
-        ]))
-      ) {
-        await runLocalWriteWithFreshManifest(() =>
-          NativeModule.multiSet(mutablePairs)
-        );
-      }
+      await NativeModule.multiSet(mutablePairs);
       callback?.(null);
     } catch (e) {
       const error = e instanceof Error ? e : new Error(String(e));
@@ -173,16 +120,7 @@ function createAsyncStorage(): AsyncStorageStatic {
     callback
   ) => {
     try {
-      const mutableKeys = [...keys];
-      if (
-        !(await forwardWriteAndReloadManifestIfNeeded('multiRemove', [
-          mutableKeys,
-        ]))
-      ) {
-        await runLocalWriteWithFreshManifest(() =>
-          NativeModule.multiRemove(mutableKeys)
-        );
-      }
+      await NativeModule.multiRemove([...keys]);
       callback?.(null);
     } catch (e) {
       const error = e instanceof Error ? e : new Error(String(e));
@@ -196,15 +134,7 @@ function createAsyncStorage(): AsyncStorageStatic {
     callback
   ) => {
     try {
-      if (
-        !(await forwardWriteAndReloadManifestIfNeeded('multiMerge', [
-          keyValuePairs,
-        ]))
-      ) {
-        await runLocalWriteWithFreshManifest(() =>
-          NativeModule.multiMerge(keyValuePairs)
-        );
-      }
+      await NativeModule.multiMerge(keyValuePairs);
       callback?.(null);
     } catch (e) {
       const error = e instanceof Error ? e : new Error(String(e));
@@ -232,13 +162,6 @@ const AsyncStorage = createAsyncStorage();
 
 export default AsyncStorage;
 
-export type {
-  AsyncStorageShouldForwardWriteGetter,
-  AsyncStorageWriteArgs,
-  AsyncStorageWriteArgsByMethod,
-  AsyncStorageWriteForwarder,
-  AsyncStorageWriteMethod,
-} from './runtimeConfig';
 export type {
   AsyncStorageStatic,
   Callback,
@@ -247,7 +170,3 @@ export type {
   MultiCallback,
   MultiGetCallback,
 } from './types';
-export {
-  setAsyncStorageShouldForwardWriteGetter,
-  setAsyncStorageWriteForwarder,
-} from './runtimeConfig';

package/lib/module/runtimeConfig.js

@@ -1,34 +0,0 @@
-"use strict";
-
-const runtimeGlobal = globalThis;
-let shouldForwardWriteGetter = runtimeGlobal.__onekeyAsyncStorageShouldForwardWriteGetter;
-let writeForwarder = runtimeGlobal.__onekeyAsyncStorageWriteForwarder;
-export function setAsyncStorageShouldForwardWriteGetter(getter) {
-  shouldForwardWriteGetter = getter;
-  runtimeGlobal.__onekeyAsyncStorageShouldForwardWriteGetter = getter;
-}
-export function setAsyncStorageWriteForwarder(forwarder) {
-  writeForwarder = forwarder;
-  runtimeGlobal.__onekeyAsyncStorageWriteForwarder = forwarder;
-}
-function getShouldForwardWriteGetter() {
-  return shouldForwardWriteGetter ?? runtimeGlobal.__onekeyAsyncStorageShouldForwardWriteGetter;
-}
-function getWriteForwarder() {
-  return writeForwarder ?? runtimeGlobal.__onekeyAsyncStorageWriteForwarder;
-}
-function shouldForwardWriteToBackground() {
-  return getShouldForwardWriteGetter()?.() ?? false;
-}
-export async function forwardAsyncStorageWriteIfNeeded(method, args) {
-  if (!shouldForwardWriteToBackground()) {
-    return false;
-  }
-  const forwarder = getWriteForwarder();
-  if (!forwarder) {
-    throw new Error('AsyncStorage write forwarder is not configured.');
-  }
-  await forwarder(method, args);
-  return true;
-}
-//# sourceMappingURL=runtimeConfig.js.map

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

@@ -1,14 +0,0 @@
-export type AsyncStorageWriteArgsByMethod = {
-    clear: [];
-    multiSet: [[string, string][]];
-    multiRemove: [string[]];
-    multiMerge: [[string, string][]];
-};
-export type AsyncStorageWriteMethod = keyof AsyncStorageWriteArgsByMethod;
-export type AsyncStorageWriteArgs<T extends AsyncStorageWriteMethod = AsyncStorageWriteMethod> = AsyncStorageWriteArgsByMethod[T];
-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 forwardAsyncStorageWriteIfNeeded<T extends AsyncStorageWriteMethod>(method: T, args: AsyncStorageWriteArgs<T>): Promise<boolean>;
-//# sourceMappingURL=runtimeConfig.d.ts.map

package/src/runtimeConfig.ts

@@ -1,76 +0,0 @@
-export type AsyncStorageWriteArgsByMethod = {
-  clear: [];
-  multiSet: [[string, string][]];
-  multiRemove: [string[]];
-  multiMerge: [[string, string][]];
-};
-
-export type AsyncStorageWriteMethod = keyof AsyncStorageWriteArgsByMethod;
-
-export type AsyncStorageWriteArgs<
-  T extends AsyncStorageWriteMethod = AsyncStorageWriteMethod
-> = AsyncStorageWriteArgsByMethod[T];
-
-export type AsyncStorageShouldForwardWriteGetter = () => boolean;
-
-export type AsyncStorageWriteForwarder = <T extends AsyncStorageWriteMethod>(
-  method: T,
-  args: AsyncStorageWriteArgs<T>
-) => Promise<void>;
-
-type AsyncStorageRuntimeGlobal = typeof globalThis & {
-  __onekeyAsyncStorageShouldForwardWriteGetter?: AsyncStorageShouldForwardWriteGetter;
-  __onekeyAsyncStorageWriteForwarder?: AsyncStorageWriteForwarder;
-};
-
-const runtimeGlobal = globalThis as AsyncStorageRuntimeGlobal;
-
-let shouldForwardWriteGetter: AsyncStorageShouldForwardWriteGetter | undefined =
-  runtimeGlobal.__onekeyAsyncStorageShouldForwardWriteGetter;
-let writeForwarder: AsyncStorageWriteForwarder | undefined =
-  runtimeGlobal.__onekeyAsyncStorageWriteForwarder;
-
-export function setAsyncStorageShouldForwardWriteGetter(
-  getter: AsyncStorageShouldForwardWriteGetter
-) {
-  shouldForwardWriteGetter = getter;
-  runtimeGlobal.__onekeyAsyncStorageShouldForwardWriteGetter = getter;
-}
-
-export function setAsyncStorageWriteForwarder(
-  forwarder: AsyncStorageWriteForwarder
-) {
-  writeForwarder = forwarder;
-  runtimeGlobal.__onekeyAsyncStorageWriteForwarder = forwarder;
-}
-
-function getShouldForwardWriteGetter() {
-  return (
-    shouldForwardWriteGetter ??
-    runtimeGlobal.__onekeyAsyncStorageShouldForwardWriteGetter
-  );
-}
-
-function getWriteForwarder() {
-  return writeForwarder ?? runtimeGlobal.__onekeyAsyncStorageWriteForwarder;
-}
-
-function shouldForwardWriteToBackground() {
-  return getShouldForwardWriteGetter()?.() ?? false;
-}
-
-export async function forwardAsyncStorageWriteIfNeeded<
-  T extends AsyncStorageWriteMethod
->(method: T, args: AsyncStorageWriteArgs<T>): Promise<boolean> {
-  if (!shouldForwardWriteToBackground()) {
-    return false;
-  }
-
-  const forwarder = getWriteForwarder();
-  if (!forwarder) {
-    throw new Error('AsyncStorage write forwarder is not configured.');
-  }
-
-  await forwarder(method, args);
-  return true;
-}