fix ios later case

Author: sunnylqm

Example/e2etest/e2e/local-merge.test.ts

@@ -195,6 +195,11 @@ describe('Local Update Merge E2E', () => {
         ? LOCAL_UPDATE_HASHES.packagePatch
         : LOCAL_UPDATE_HASHES.ppkPatch;
 
+    await relaunchAppPreservingData();
+    await waitForReady();
+    await waitForBundleLabel(finalLabel);
+    await waitForHash(finalHash);
+
     await tapCheckUpdate();
     await waitForCheckState('completed', 'upToDate');
     await waitForBundleLabel(finalLabel);

ios/RCTPushy/RCTPushy.mm

@@ -71,6 +71,11 @@ typedef NS_ENUM(NSInteger, PushyType) {
     return [NSUserDefaults standardUserDefaults];
 }
 
+static void PushyPersistDefaults(NSUserDefaults *defaults) {
+    (void)defaults;
+    CFPreferencesAppSynchronize(kCFPreferencesCurrentApplication);
+}
+
 static NSString *PushyFromStdString(const std::string &value) {
     if (value.empty()) {
         return nil;
@@ -180,6 +185,7 @@ static void PushyApplyStateToDefaults(NSUserDefaults *defaults, const pushy::sta
         defaults,
         keyRolledBackMarked,
         PushyFromStdString(state.rolled_back_version));
+    PushyPersistDefaults(defaults);
 }
 
 @interface RCTPushy ()
@@ -253,6 +259,7 @@ + (NSURL *)bundleURL
             // bundleURL may be called many times, ignore rollbacks before process restarted again.
             ignoreRollback = true;
             [defaults setObject:@(YES) forKey:keyFirstLoadMarked];
+            PushyPersistDefaults(defaults);
         }
 
         NSString *loadVersion = PushyFromStdString(decision.load_version);
@@ -317,7 +324,7 @@ - (NSDictionary *)constantsToExport
         [defaults removeObjectForKey:KeyPackageUpdatedMarked];
         [self clearInvalidFiles];
     }
-    
+    PushyPersistDefaults(defaults);
 
     return ret;
 }
@@ -341,6 +348,7 @@ - (instancetype)init
 
     NSUserDefaults *defaults = PushyDefaults();
     [defaults setObject:uuid forKey:keyUuid];
+    PushyPersistDefaults(defaults);
     resolve(@true);
 }
 
@@ -359,6 +367,7 @@ - (instancetype)init
     if (object && [object isKindOfClass:[NSDictionary class]]) {
         NSUserDefaults *defaults = PushyDefaults();
         [defaults setObject:value forKey:PushyHashInfoKey(hash)];
+        PushyPersistDefaults(defaults);
 
         resolve(@true);
     } else {

src/__tests__/client.test.ts

@@ -10,7 +10,13 @@ const createJsonResponse = (payload: unknown) =>
     json: async () => payload,
   }) as Response;
 
-const setupClientMocks = () => {
+const setupClientMocks = ({
+  isFirstTime = false,
+  markSuccess = mock(() => {}),
+}: {
+  isFirstTime?: boolean;
+  markSuccess?: ReturnType<typeof mock>;
+} = {}) => {
   (globalThis as any).__DEV__ = false;
 
   mock.module('react-native', () => ({
@@ -29,7 +35,7 @@ const setupClientMocks = () => {
 
   mock.module('../core', () => ({
     PushyModule: {
-      markSuccess: mock(() => {}),
+      markSuccess,
       reloadUpdate: mock(() => Promise.resolve()),
       setNeedUpdate: mock(() => Promise.resolve()),
       downloadPatchFromPpk: mock(() => Promise.resolve()),
@@ -47,7 +53,7 @@ const setupClientMocks = () => {
     },
     currentVersion: 'hash',
     currentVersionInfo: {},
-    isFirstTime: false,
+    isFirstTime,
     isRolledBack: false,
     packageVersion: '1.0.0',
     pushyNativeEventEmitter: {
@@ -199,4 +205,40 @@ describe('Pushy server config', () => {
       error: fetchError,
     });
   });
+
+  test('waits for native markSuccess before logging success', async () => {
+    let resolveNativeMarkSuccess = () => {};
+    const nativeMarkSuccess = mock(
+      () =>
+        new Promise<void>(resolve => {
+          resolveNativeMarkSuccess = resolve;
+        }),
+    );
+    const logger = mock(() => {});
+    setupClientMocks({
+      isFirstTime: true,
+      markSuccess: nativeMarkSuccess,
+    });
+
+    const { Pushy, sharedState } = await importFreshClient('mark-success-awaits-native');
+    const client = new Pushy({
+      appKey: 'demo-app',
+      logger,
+    });
+
+    const markPromise = client.markSuccess();
+    expect(nativeMarkSuccess).toHaveBeenCalledTimes(1);
+    expect(sharedState.marked).toBe(false);
+    expect(logger).not.toHaveBeenCalled();
+
+    resolveNativeMarkSuccess();
+    await markPromise;
+
+    expect(sharedState.marked).toBe(true);
+    expect(logger).toHaveBeenCalledWith(
+      expect.objectContaining({
+        type: 'markSuccess',
+      }),
+    );
+  });
 });

src/client.ts

@@ -310,13 +310,13 @@ export class Pushy {
     }
     return true;
   };
-  markSuccess = () => {
+  markSuccess = async () => {
     if (sharedState.marked || __DEV__ || !isFirstTime) {
       return;
     }
+    await Promise.resolve(PushyModule.markSuccess());
     sharedState.marked = true;
-    PushyModule.markSuccess();
-    this.report({ type: 'markSuccess' });
+    await this.report({ type: 'markSuccess' });
   };
   switchVersion = async (hash: string) => {
     if (!this.assertDebug('switchVersion()')) {

src/provider.tsx

@@ -293,7 +293,7 @@ export const UpdateProvider = ({
     const { checkStrategy, dismissErrorAfter, autoMarkSuccess } = options;
     if (autoMarkSuccess) {
       setTimeout(() => {
-        markSuccess();
+        void markSuccess();
       }, 1000);
     }
     if (checkStrategy === 'both' || checkStrategy === 'onAppResume') {