feat: preserve native-first identity and invalidate superseded configuration rounds

Author: github-actions[bot]

android/src/main/java/cn/reactnative/modules/update/NativeCheckOrchestrator.java

@@ -76,6 +76,7 @@ final class NativeCheckOrchestrator {
     private static volatile NativeUpdateResult roundResult =
         NativeUpdateResult.of(NativeUpdateResult.FAILED, "check_failed");
     private static volatile long roundGeneration = -1;
+    private static volatile long roundConfigGeneration = -1;
     private static volatile String roundConfigJson;
 
     /** Blocking only on the host API's worker; never call on the UI thread. */
@@ -106,7 +107,8 @@ static NativeUpdateResult checkAndUpdate(UpdateContext context) throws Interrupt
             return NativeUpdateResult.of(NativeUpdateResult.SKIPPED, "config_changed");
         }
         roundDone.await();
-        if (!configJson.equals(roundConfigJson) || !configJson.equals(context.getKv(KEY_CONFIG))) {
+        if (roundConfigGeneration != UpdateContext.getNativeConfigGeneration()
+            || !configJson.equals(roundConfigJson) || !configJson.equals(context.getKv(KEY_CONFIG))) {
             return NativeUpdateResult.of(NativeUpdateResult.CANCELLED, "config_changed");
         }
         if (roundGeneration != UpdateContext.getResetGeneration()) {
@@ -300,6 +302,7 @@ private static void runOnce(
     ) throws JSONException {
         final long resetGeneration = UpdateContext.getResetGeneration();
         roundGeneration = resetGeneration;
+        roundConfigGeneration = UpdateContext.getNativeConfigGeneration();
         roundResult = NativeUpdateResult.of(NativeUpdateResult.FAILED, "check_failed");
         String configJson = context.getKv(KEY_CONFIG);
         roundConfigJson = configJson;

android/src/main/java/cn/reactnative/modules/update/UpdateContext.java

@@ -738,18 +738,34 @@ public String getBundleUrl(String defaultAssetsUrl) {
 
     /** Sampled/compared by the native check orchestrator; see resetGeneration. */
     /** Shared by JS and native hosts. Config replacement invalidates old native decisions. */
+    private static final java.util.concurrent.atomic.AtomicLong nativeConfigGeneration =
+        new java.util.concurrent.atomic.AtomicLong(0);
+
+    static long getNativeConfigGeneration() {
+        return nativeConfigGeneration.get();
+    }
+
     void setNativeConfig(String config) {
         synchronized (commitLock) {
-            if (config.equals(sp.getString(NativeCheckOrchestrator.KEY_CONFIG, null))) {
-                return;
-            }
-            // Also invalidate on a failed persistence attempt: never allow an
-            // older round to commit over uncertain configuration state.
-            resetGeneration.incrementAndGet();
+            boolean changed = !config.equals(sp.getString(NativeCheckOrchestrator.KEY_CONFIG, null));
             SharedPreferences.Editor editor = sp.edit();
+            if (changed) {
+                // Also invalidate on a failed persistence attempt: an older
+                // round must not commit over uncertain configuration state.
+                resetGeneration.incrementAndGet();
+                nativeConfigGeneration.incrementAndGet();
+                editor.remove(NativeCheckOrchestrator.KEY_RESP_CACHE);
+                NativeCheckOrchestrator.markJsCheckCompleted(null);
+            }
+            // A native-only first launch needs a stable gray-release identity
+            // before JS initializes. Never replace an existing installation ID.
+            String uuid = sp.getString("uuid", null);
+            if (uuid == null || uuid.isEmpty()) {
+                editor.putString("uuid", java.util.UUID.randomUUID().toString());
+            }
             editor.putString(NativeCheckOrchestrator.KEY_CONFIG, config);
-            editor.remove(NativeCheckOrchestrator.KEY_RESP_CACHE);
-            NativeCheckOrchestrator.markJsCheckCompleted(null);
+            // Persist even an equal value: a previous commit may have updated
+            // SharedPreferences memory but failed to write its file.
             persistEditorOrThrow(editor, "configure native update");
         }
         NativeCheckOrchestrator.onConfigured(this);

harmony/pushy/src/main/ets/NativeCheckOrchestrator.ts

@@ -113,6 +113,7 @@ const hostRound = new NativeUpdateRound();
 let scheduledContext: UpdateContext | undefined;
 let scheduledRollback = '';
 let roundGeneration = -1;
+let roundConfigGeneration = -1;
 let roundConfigJson: string | undefined;
 let roundResult = nativeUpdateResult('failed', 'check_failed');
 
@@ -184,7 +185,8 @@ export async function checkAndUpdateNative(
     return nativeUpdateResult('failed', 'invalid_config');
   }
   const result = await startNativeRound(context, scheduledRollback);
-  if (configJson !== roundConfigJson || configJson !== context.getKv(KEY_CONFIG)) {
+  if (roundConfigGeneration !== context.getNativeConfigGeneration()
+      || configJson !== roundConfigJson || configJson !== context.getKv(KEY_CONFIG)) {
     return nativeUpdateResult('cancelled', 'config_changed');
   }
   if (roundGeneration !== context.getResetGeneration()) {
@@ -247,6 +249,7 @@ async function runOnce(
   // reset 必须赢过本轮的决策。
   const resetGeneration = context.getResetGeneration();
   roundGeneration = resetGeneration;
+  roundConfigGeneration = context.getNativeConfigGeneration();
   roundResult = nativeUpdateResult('failed', 'check_failed');
   const configJson = context.getKv(KEY_CONFIG);
   roundConfigJson = configJson;

harmony/pushy/src/main/ets/UpdateContext.ts

@@ -461,10 +461,20 @@ export class UpdateContext {
 
   /** 写入并落盘;flushSync 不可用时以 flush() 的结果拒绝。 */
   /** Shared JS/native configuration writer; all mutations precede the first await. */
+  private static nativeConfigGeneration: number = 0;
+
+  public getNativeConfigGeneration(): number {
+    return UpdateContext.nativeConfigGeneration;
+  }
+
   public setNativeConfig(config: string): Promise<void> {
+    if (!this.getKv('uuid')) {
+      this.preferences.putSync('uuid', util.generateRandomUUID());
+    }
     if (this.getKv(KEY_CONFIG) !== config) {
       // Also guards A -> B -> A replacements and late download commits.
       UpdateContext.resetGeneration += 1;
+      UpdateContext.nativeConfigGeneration += 1;
       this.preferences.putSync(KEY_CONFIG, config);
       this.preferences.deleteSync(KEY_RESP_CACHE);
       markJsCheckCompleted('');

ios/RCTPushy/RCTPushy.mm

@@ -778,6 +778,8 @@ + (BOOL)commitRoundWithGeneration:(uint64_t)generation
 static NSDictionary *pushyHostRoundResult = nil;
 static NSString *pushyHostRoundConfig = nil;
 static uint64_t pushyHostRoundGeneration = 0;
+static std::atomic<uint64_t> pushyNativeConfigGeneration{0};
+static uint64_t pushyHostRoundConfigGeneration = 0;
 
 static const NSTimeInterval kPushyRescueTriggerUptime = 60;
 static const NSTimeInterval kPushyRescueBudgetBackgroundThread = 10;
@@ -2216,12 +2218,16 @@ @implementation RCTPushyOrchestrator
 + (void)persistConfiguration:(NSString *)config {
     PushyWithStateLock(^{
         NSUserDefaults *defaults = PushyDefaults();
+        if ([defaults stringForKey:keyUuid].length == 0) {
+            [defaults setObject:[NSUUID UUID].UUIDString forKey:keyUuid];
+        }
         if ([[defaults stringForKey:keyNativeConfig] isEqualToString:config]) {
             return;
         }
         // The same generation protects reset and replacement of the request
         // identity/policy, including a late crash-rescue activation.
         pushyResetGeneration.fetch_add(1);
+        pushyNativeConfigGeneration.fetch_add(1);
         [defaults setObject:config forKey:keyNativeConfig];
         [defaults removeObjectForKey:keyNativeCheckCache];
         [self markJsCheckCompleted:nil];
@@ -2309,7 +2315,8 @@ + (NSDictionary *)checkAndUpdate {
         return PushyHostResult(@"skipped", @"config_changed", nil, NO);
     }
     dispatch_group_wait(pushyHostRoundGroup, DISPATCH_TIME_FOREVER);
-    if (![configJson isEqualToString:pushyHostRoundConfig]
+    if (pushyHostRoundConfigGeneration != pushyNativeConfigGeneration.load()
+        || ![configJson isEqualToString:pushyHostRoundConfig]
         || ![configJson isEqualToString:[PushyDefaults() stringForKey:keyNativeConfig]]) {
         return PushyHostResult(@"cancelled", @"config_changed", nil, NO);
     }
@@ -2449,6 +2456,7 @@ + (RCTPushy *)engine {
 + (void)runOnce:(NSString *)launchRolledBackVersion deadline:(NSTimeInterval)deadlineUptime {
     const uint64_t resetGeneration = pushyResetGeneration.load();
     pushyHostRoundGeneration = resetGeneration;
+    pushyHostRoundConfigGeneration = pushyNativeConfigGeneration.load();
     pushyHostRoundResult = PushyHostResult(@"failed", @"check_failed", nil, NO);
     NSUserDefaults *defaults = PushyDefaults();
     NSString *configJson = [defaults stringForKey:keyNativeConfig];

ios/RCTPushy/RCTPushyNativeConfig.mm

@@ -75,7 +75,7 @@ static void PushyConfigInvalid(NSString *message) {
             PushyConfigInvalid(@"afterDownload must be none or setNeedUpdate");
         }
         id disabled = options[@"disabled"] ?: @NO;
-        if (CFGetTypeID((__bridge CFTypeRef)disabled) != CFBooleanGetTypeID()) {
+        if (![disabled isKindOfClass:NSNumber.class] || CFGetTypeID((__bridge CFTypeRef)disabled) != CFBooleanGetTypeID()) {
             PushyConfigInvalid(@"disabled must be a boolean");
         }
         NSMutableDictionary *result = [@{

src/__tests__/nativeConfiguration.test.ts

@@ -12,7 +12,9 @@ function runtimeSource(relativePath: string): string {
   return new Bun.Transpiler({ loader: 'ts' }).transformSync(source);
 }
 
-const storeSource = runtimeSource('../../harmony/pushy/src/main/ets/UpdateContext.ts');
+const storeSource = runtimeSource(
+  '../../harmony/pushy/src/main/ets/UpdateContext.ts'
+);
 const clientSource = runtimeSource('../client.ts');
 
 interface ConfigStore {
@@ -45,6 +47,7 @@ function storeHarness() {
     `${storeSource}\nconst store = Object.create(UpdateContext.prototype); store.preferences = preferences; store.flushBatchDepth = 0; store;`,
     {
       preferences,
+      util: { generateRandomUUID: () => 'native-installation-id' },
       KEY_CONFIG: 'nativeConfig',
       KEY_RESP_CACHE: 'nativeCheckResp',
       markJsCheckCompleted: (config: string) => clearedSignals.push(config),
@@ -53,8 +56,12 @@ function storeHarness() {
     }
   ) as ConfigStore;
   return {
-    store, values, clearedSignals,
-    fail: (value: boolean) => { shouldFail = value; },
+    store,
+    values,
+    clearedSignals,
+    fail: (value: boolean) => {
+      shouldFail = value;
+    },
     flushes: () => flushes,
   };
 }
@@ -77,7 +84,9 @@ function clientHarness(native: boolean) {
       i18n: { setLocale() {} },
       dedupeEndpoints: (urls: string[]) => [...new Set(urls)],
       PushyModule: {
-        syncNativeConfig: async (config: string) => { writes.push(config); },
+        syncNativeConfig: async (config: string) => {
+          writes.push(config);
+        },
       },
     }
   ) as { setOptions: (options: Record<string, unknown>) => void };
@@ -86,9 +95,12 @@ function clientHarness(native: boolean) {
 
 describe('native configuration normalization', () => {
   test('appKey alone supplies Pushy endpoints without automatically activating', () => {
-    const config = JSON.parse(normalizeNativeUpdateConfig({ appKey: 'test-app' }));
+    const config = JSON.parse(
+      normalizeNativeUpdateConfig({ appKey: 'test-app' })
+    );
     expect(config.endpoints).toEqual([
-      'https://update.react-native.cn/api', 'https://update.reactnative.cn/api',
+      'https://update.react-native.cn/api',
+      'https://update.reactnative.cn/api',
     ]);
     expect(config.queryUrls).toHaveLength(2);
     expect(config.afterDownload).toBe('none');
@@ -99,7 +111,10 @@ describe('native configuration normalization', () => {
   test('custom endpoints do not inherit public discovery, and are deduplicated', () => {
     const options: NativeUpdateConfig = {
       appKey: 'test-app',
-      endpoints: ['https://updates.example/api/', 'https://updates.example/api'],
+      endpoints: [
+        'https://updates.example/api/',
+        'https://updates.example/api',
+      ],
       afterDownload: 'setNeedUpdate',
     };
     const original = JSON.stringify(options);
@@ -111,24 +126,34 @@ describe('native configuration normalization', () => {
   });
 
   test('allows explicit discovery URLs and version identity overrides', () => {
-    const config = JSON.parse(normalizeNativeUpdateConfig({
-      appKey: 'test-app', endpoints: ['http://localhost:8080/api'],
-      queryUrls: ['https://updates.example/endpoints.json?v=1'],
-      packageVersion: '2.0', rn: '0.77.3', rnu: 'test-sdk', disabled: true,
-    }));
+    const config = JSON.parse(
+      normalizeNativeUpdateConfig({
+        appKey: 'test-app',
+        endpoints: ['http://localhost:8080/api'],
+        queryUrls: ['https://updates.example/endpoints.json?v=1'],
+        packageVersion: '2.0',
+        rn: '0.77.3',
+        rnu: 'test-sdk',
+        disabled: true,
+      })
+    );
     expect(config.packageVersion).toBe('2.0');
     expect(config.disabled).toBe(true);
     expect(config.queryUrls[0]).toContain('?v=1');
   });
 
   for (const [name, options] of [
-    ['missing key', {}], ['blank key', { appKey: '   ' }],
+    ['missing key', {}],
+    ['blank key', { appKey: '   ' }],
     ['wrong key type', { appKey: 12 }],
     ['empty endpoints', { appKey: 'a', endpoints: [] }],
     ['null endpoints', { appKey: 'a', endpoints: null }],
     ['non-array endpoints', { appKey: 'a', endpoints: 'https://example.com' }],
     ['unsafe scheme', { appKey: 'a', endpoints: ['file:///tmp/update'] }],
-    ['credentials', { appKey: 'a', endpoints: ['https://user:pass@example.com'] }],
+    [
+      'credentials',
+      { appKey: 'a', endpoints: ['https://user:pass@example.com'] },
+    ],
     ['relative URL', { appKey: 'a', endpoints: ['/api'] }],
     ['base query', { appKey: 'a', endpoints: ['https://example.com/api?x=1'] }],
     ['wrong discovery type', { appKey: 'a', queryUrls: [42] }],
@@ -138,7 +163,9 @@ describe('native configuration normalization', () => {
     ['unknown option', { appKey: 'a', endponts: ['https://example.com'] }],
   ] as const) {
     test(`rejects ${name} before storage is touched`, () => {
-      expect(() => normalizeNativeUpdateConfig(options as unknown as NativeUpdateConfig)).toThrow();
+      expect(() =>
+        normalizeNativeUpdateConfig(options as unknown as NativeUpdateConfig)
+      ).toThrow();
     });
   }
 });
@@ -153,8 +180,17 @@ describe('actual native configuration store', () => {
     expect(h.values.has('nativeCheckResp')).toBe(false);
     await h.store.setNativeConfig('A');
     expect(h.store.getResetGeneration()).toBe(oldGeneration + 2);
-    expect(await h.store.commitNativeCheckResult(oldGeneration, 'old', '{}', true, 'stale')).toBe(false);
+    expect(
+      await h.store.commitNativeCheckResult(
+        oldGeneration,
+        'old',
+        '{}',
+        true,
+        'stale'
+      )
+    ).toBe(false);
     expect(h.values.has('hash_old')).toBe(false);
+    expect(h.values.get('uuid')).toBe('native-installation-id');
     expect(h.clearedSignals).toEqual(['', '', '']);
   });
 
@@ -170,7 +206,9 @@ describe('actual native configuration store', () => {
   test('storage errors reject and an equal-value retry can recover', async () => {
     const h = storeHarness();
     h.fail(true);
-    await expect(h.store.setNativeConfig('A')).rejects.toThrow('storage unavailable');
+    await expect(h.store.setNativeConfig('A')).rejects.toThrow(
+      'storage unavailable'
+    );
     h.fail(false);
     await h.store.setNativeConfig('A');
     expect(h.flushes()).toBe(2);

src/__tests__/nativeHostApi.test.ts

@@ -53,6 +53,7 @@ function harness() {
       values.delete(key);
     },
     getResetGeneration: () => state.generation,
+    getNativeConfigGeneration: () => 0,
     getCurrentVersion: () => '',
     getPackageVersion: () => '1.0',
     getBuildTime: () => '123',
@@ -205,3 +206,35 @@ describe('native host API orchestration', () => {
     expect(h.state.checks).toBe(1);
   });
 });
+
+test('automatic preflight without configuration leaves a round for later native provisioning', async () => {
+  const h = harness();
+  h.values.delete('nativeConfig');
+  h.initialize();
+  for (const timer of h.timers) timer();
+  await Promise.resolve();
+  expect(h.state.checks).toBe(0);
+  h.values.set(
+    'nativeConfig',
+    JSON.stringify({
+      appKey: 'native-first-app',
+      afterDownload: 'setNeedUpdate',
+    })
+  );
+  h.state.decision = { action: 'download', hash: 'v2', activate: true };
+  expect((await h.check()).activated).toBe(true);
+  expect(h.state.checks).toBe(1);
+});
+
+test('configuration replacement during an update cancels its returned snapshot', async () => {
+  const h = harness();
+  h.initialize();
+  h.state.decision = { action: 'download', hash: 'v2', activate: true };
+  h.state.beforeResponse = async () => {
+    h.values.set('nativeConfig', JSON.stringify({ appKey: 'replacement' }));
+    h.state.generation += 1;
+  };
+  expect(await h.check()).toEqual(
+    nativeUpdateResult('cancelled', 'config_changed')
+  );
+});