react-native-update 10.60.0 → 10.61.0

package/harmony/pushy/src/main/ets/Texts.ts

@@ -14,11 +14,16 @@ export function revealText(hex: string): string {
 }
 
 // Protocol values, version-info flags and storage names, stored encoded.
+// <generated:texts> (scripts/contract.ts; bun scripts/generate-contract.ts)
+// The round status / decision reason when nothing is to be installed.
 export const STATUS_NONE: string = revealText('3418c1c1aa8a7c40');
-export const STORAGE_DIR_NAME: string = revealText('0502e4d5af9f6d');
 export const PREFERENCES_NAME: string = revealText('2f07f0d0ba8e');
-export const PPK_DELTA_SUFFIX: string = revealText('7407e4dae09b69512137');
-export const APP_DELTA_SUFFIX: string = revealText('7416e4c1e09b69512137');
+export const STORAGE_DIR_NAME: string = revealText('0502e4d5af9f6d');
+// The bundle patch entry inside a patch archive.
 export const BUNDLE_DELTA_ENTRY: string = revealText('3802fad5a28e264d232d11f6d8aade67596914e0ead8b0');
+export const PPK_DELTA_SUFFIX: string = revealText('7407e4dae09b69512137');
+// Archive suffix of a patch against the installed package.
+export const PACKAGE_DELTA_SUFFIX: string = revealText('7416e4c1e09b69512137');
 export const DEVTOOLS_RESTART_EVENT: string = revealText('0832d8fe8faf');
 export const DEVTOOLS_RESTART_REASON: string = revealText('1218e0e3ab876744266d');
+// </generated:texts>

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

@@ -29,11 +29,12 @@ import NativePatchCore, {
 import { assertSafePathComponent } from './PathUtils';
 import { withRawFd } from './SaveFile';
 import {
+  createPushyError,
   ERROR_SWITCH_VERSION_FAILED,
   getErrorMessage,
   toPushyError,
 } from './ErrorCodes';
-import { APP_DELTA_SUFFIX, PPK_DELTA_SUFFIX, PREFERENCES_NAME, STORAGE_DIR_NAME } from './Texts';
+import { PACKAGE_DELTA_SUFFIX, PPK_DELTA_SUFFIX, PREFERENCES_NAME, STORAGE_DIR_NAME } from './Texts';
 
 export { isSafePathComponent } from './PathUtils';
 
@@ -55,11 +56,34 @@ function nativeConfigsEquivalent(a: string | undefined, b: string | undefined):
   return NativePatchCore.configsEquivalent(a, b);
 }
 
+// Per-version info key prefix and the first-load marker key.
+const HASH_INFO_PREFIX = 'hash_';
+const FIRST_LOAD_MARKED_KEY = 'firstLoadMarked';
+
+interface ClearedKeys {
+  keys: string[];
+  prefixes: string[];
+}
+
+// <generated:lifecycle> (scripts/contract.ts; bun scripts/generate-contract.ts)
+// What a reset to the packaged bundle and a binary upgrade delete besides
+// the state fields (scripts/contract.ts storedItems; every other item survives
+// both: the uuid, the native config, the round breadcrumb, the bundle hash
+// cache).
+const RESET_CLEARED: ClearedKeys = {
+  keys: [FIRST_LOAD_MARKED_KEY, KEY_RESP_CACHE],
+  prefixes: [HASH_INFO_PREFIX],
+};
+const UPGRADE_CLEARED: ClearedKeys = {
+  keys: [FIRST_LOAD_MARKED_KEY, KEY_RESP_CACHE],
+  prefixes: [HASH_INFO_PREFIX],
+};
+// </generated:lifecycle>
+
 interface PersistOptions {
   removeStaleHash?: boolean;
   cleanUp?: boolean;
   markFirstLoadMarker?: boolean;
-  clearFirstLoadMarker?: boolean;
 }
 
 export class UpdateContext {
@@ -140,7 +164,7 @@ export class UpdateContext {
         ` cv=${snap.currentVersion} lv=${snap.lastVersion}` +
         ` ft=${snap.firstTime} fto=${snap.firstTimeOk}` +
         ` rb=${snap.rolledBackVersion}` +
-        ` flm=${this.readString('firstLoadMarked')}` +
+        ` flm=${this.readString(FIRST_LOAD_MARKED_KEY)}` +
         ` uuidSet=${!!this.readString('uuid')}`,
     );
   }
@@ -209,6 +233,18 @@ export class UpdateContext {
         `Failed to read build time from raw file: ${getErrorMessage(error)}`,
       );
     }
+    // 绝不返回空串(与 iOS 用 Info.plist mtime 兜底一致):buildTime 为空时
+    // syncStateWithBinaryVersion 整体跳过,保留 versionName 的重装二进制会
+    // 让旧热更活过应用升级。每次(覆盖)安装 updateTime 都会变,用它顶替。
+    const updateTime = this.getBundleModifiedTime();
+    if (updateTime > 0) {
+      logger.warn(
+        TAG,
+        'meta.json has no build stamp; using the app install time as buildTime',
+      );
+      UpdateContext.cachedBuildTime = String(updateTime);
+      return UpdateContext.cachedBuildTime;
+    }
     return '';
   }
 
@@ -359,10 +395,7 @@ export class UpdateContext {
       this.preferences.deleteSync(`hash_${state.staleVersionToDelete}`);
     }
     if (options.markFirstLoadMarker) {
-      this.preferences.putSync('firstLoadMarked', 'true');
-    }
-    if (options.clearFirstLoadMarker) {
-      this.preferences.deleteSync('firstLoadMarked');
+      this.preferences.putSync(FIRST_LOAD_MARKED_KEY, 'true');
     }
     if (options.cleanUp) {
       this.cleanUp();
@@ -411,6 +444,60 @@ export class UpdateContext {
   // switchVersion 激活。
   private taskChain: Promise<void> = Promise.resolve();
 
+  // 在途的破坏性清理(常规清理与 reset 清理)及其开始次数。激活与破坏性清理
+  // 互斥(Android 的 versionFilesLock):激活校验前先等在途清理结束,校验后
+  // 若期间又有清理开始则重来。清理的保留名单在任务开始时(主线程)取,而
+  // 校验通过到 applySwitch 之间没有 await,所以此后开始的清理一定看得到
+  // 刚激活的版本。
+  private cleanupInFlight: Promise<void> | null = null;
+  private cleanupStarts: number = 0;
+
+  private enqueueCleanupTask(job: () => Promise<void>): Promise<void> {
+    return this.enqueueSerialTask(() => {
+      this.cleanupStarts += 1;
+      const running = job();
+      const tracked = running.then(
+        () => undefined,
+        () => undefined,
+      );
+      this.cleanupInFlight = tracked;
+      tracked.then(() => {
+        if (this.cleanupInFlight === tracked) {
+          this.cleanupInFlight = null;
+        }
+      });
+      return running;
+    });
+  }
+
+  private static readonly MAX_ACTIVATION_VERIFY_ATTEMPTS = 3;
+
+  /**
+   * verifyActivation,并保证返回时没有破坏性清理在途、校验期间也没有清理
+   * 开始过(见 cleanupInFlight)。调用方须在返回后、下一个 await 之前完成
+   * applySwitch。
+   */
+  private async verifyActivationExclusive(hash: string): Promise<void> {
+    for (
+      let attempt = 0;
+      attempt < UpdateContext.MAX_ACTIVATION_VERIFY_ATTEMPTS;
+      attempt++
+    ) {
+      while (this.cleanupInFlight !== null) {
+        await this.cleanupInFlight;
+      }
+      const starts = this.cleanupStarts;
+      await this.verifyActivation(hash);
+      if (this.cleanupInFlight === null && this.cleanupStarts === starts) {
+        return;
+      }
+    }
+    throw createPushyError(
+      ERROR_SWITCH_VERSION_FAILED,
+      `Version ${hash} kept racing cleanup while switching.`,
+    );
+  }
+
   private enqueueSerialTask<T>(job: () => Promise<T>): Promise<T> {
     const run = this.taskChain.then(job);
     this.taskChain = run.then(
@@ -432,6 +519,27 @@ export class UpdateContext {
     });
   }
 
+  // Deletes `cleared` from the store (in memory; the caller flushes). A
+  // failed read leaves harmless orphans: none of them affects the state.
+  private removeKeys(cleared: ClearedKeys, event: string): void {
+    for (const key of cleared.keys) {
+      this.preferences.deleteSync(key);
+    }
+    if (cleared.prefixes.length === 0) {
+      return;
+    }
+    try {
+      const all = this.preferences.getAllSync();
+      for (const key of Object.keys(all)) {
+        if (cleared.prefixes.some(prefix => key.startsWith(prefix))) {
+          this.preferences.deleteSync(key);
+        }
+      }
+    } catch (e) {
+      logger.error(TAG, `Failed to clear keys on ${event}: ${getErrorMessage(e)}`);
+    }
+  }
+
   public syncStateWithBinaryVersion(
     packageVersion: string,
     buildTime: string,
@@ -455,10 +563,11 @@ export class UpdateContext {
     );
     UpdateContext.ignoreRollback = false;
     this.cleanUp();
-    // 仅重置状态机字段（currentVersion / lastVersion / firstTime / firstTimeOk /
-    // rolledBackVersion）。不再 clearExisting，避免连带清除 uuid / firstLoadMarked /
-    // hash_* 等与 binary 版本无关的 KV —— 它们在多实例场景下本就脆弱，连带清除会
-    // 让 getConstants() 永远读到空，从而 isFirstTime=false、markSuccess 永不执行。
+    // 旧二进制的版本已不在状态里:删掉它们的元信息、首启标记与响应缓存,与
+    // 各端一致(scripts/contract.ts storedItems)。uuid、原生配置等属于安装本身的
+    // 键保留——不走 clearExisting(那会让 getConstants 读到空的 uuid)。升级后
+    // 没有运行中的热更版本,首启标记不会在本次启动里先写后删。
+    this.removeKeys(UPGRADE_CLEARED, 'binary upgrade');
     this.writeState(nextState, {});
     this.flushInBackground('sync binary version');
   }
@@ -562,25 +671,11 @@ export class UpdateContext {
     this.beginFlushBatch();
     let flushed: Promise<void> = Promise.resolve();
     try {
-      // 删除已下载版本的 hash_* 元信息（不走 clear()：它是异步的，且会连带清掉
-      // uuid —— 见 syncStateWithBinaryVersion 的注释）。读取失败时残留的
-      // hash_* 只是无害孤儿数据，不影响 reset 语义。
-      try {
-        const all = this.preferences.getAllSync();
-        for (const key of Object.keys(all)) {
-          if (key.startsWith('hash_')) {
-            this.preferences.deleteSync(key);
-          }
-        }
-      } catch (e) {
-        logger.error(
-          TAG,
-          `Failed to clear hash info on reset: ${getErrorMessage(e)}`,
-        );
-      }
-      this.writeState(resetState, { clearFirstLoadMarker: true });
-      // 缓存里的响应仍在宣告本次 reset 刚删掉的版本,一并丢弃,避免 JS 侧复用。
-      this.preferences.deleteSync(KEY_RESP_CACHE);
+      // 删除版本元信息、首启标记与响应缓存(缓存仍在宣告本次 reset 刚删掉的
+      // 版本),与各端一致(scripts/contract.ts storedItems)。不走 clear():
+      // 它是异步的,且会连带清掉 uuid。
+      this.removeKeys(RESET_CLEARED, 'reset');
+      this.writeState(resetState, {});
     } finally {
       flushed = this.endFlushBatch('reset to packaged bundle');
     }
@@ -589,7 +684,7 @@ export class UpdateContext {
 
     // maxAgeDays=0：删除下载目录内容，仅保留当前运行版本的目录（残留目录由
     // 下次常规清理回收）。挂到串行任务链尾，避免与在飞的解压/打补丁并发。
-    this.enqueueSerialTask(() =>
+    this.enqueueCleanupTask(() =>
       NativePatchCore.cleanupOldEntries(
         this.rootDir,
         [UpdateContext.launchVersion].filter(name => name.length > 0),
@@ -626,7 +721,7 @@ export class UpdateContext {
     }
     const shouldSwitch = activate && !!hash;
     if (shouldSwitch) {
-      await this.verifyActivation(hash);
+      await this.verifyActivationExclusive(hash);
       if (UpdateContext.resetGeneration !== expectedGeneration) {
         return false;
       }
@@ -697,7 +792,7 @@ export class UpdateContext {
       url,
       hash,
     );
-    params.targetFile = `${this.rootDir}/${hash}${APP_DELTA_SUFFIX}`;
+    params.targetFile = `${this.rootDir}/${hash}${PACKAGE_DELTA_SUFFIX}`;
     params.unzipDirectory = `${this.rootDir}/${hash}`;
     params.deadlineUptimeMs = deadlineUptimeMs;
     await this.executeTask(params);
@@ -757,7 +852,16 @@ export class UpdateContext {
   public async switchVersion(hash: string): Promise<void> {
     try {
       const safeHash = assertSafePathComponent(hash);
-      await this.verifyActivation(safeHash);
+      const generation = UpdateContext.resetGeneration;
+      await this.verifyActivationExclusive(safeHash);
+      // 与 commitSyncResult 一致:校验期间发生过 reset(它会删掉刚校验过的
+      // 目录),不能再把下次启动指向它。
+      if (UpdateContext.resetGeneration !== generation) {
+        throw createPushyError(
+          ERROR_SWITCH_VERSION_FAILED,
+          `Reset to the packaged bundle while switching to ${safeHash}.`,
+        );
+      }
       this.applySwitch(safeHash);
       await this.flushPreferences(`switch version ${safeHash}`);
     } catch (e) {
@@ -767,10 +871,10 @@ export class UpdateContext {
   }
 
   public consumeFirstLoadMarker(): boolean {
-    const marked = this.readString('firstLoadMarked') === 'true';
+    const marked = this.readString(FIRST_LOAD_MARKED_KEY) === 'true';
     this.trace(`consumeFirstLoadMarker:marked=${marked}`);
     if (marked) {
-      this.preferences.deleteSync('firstLoadMarked');
+      this.preferences.deleteSync(FIRST_LOAD_MARKED_KEY);
       this.flushInBackground('clear first load marker');
     }
     return marked;
@@ -872,19 +976,21 @@ export class UpdateContext {
    * executor)。
    */
   public cleanUp(): void {
-    const state = this.getStateSnapshot();
-    const keepNames = [
-      state.currentVersion || '',
-      state.lastVersion || '',
-      UpdateContext.launchVersion,
-    ].filter(name => name.length > 0);
-    this.enqueueSerialTask(() =>
-      NativePatchCore.cleanupOldEntries(
+    // 保留名单在任务真正开始时取,不在入队时取(与 Android 一致):清理可能
+    // 排在一个长下载后面,期间激活的版本必须在名单里。
+    this.enqueueCleanupTask(() => {
+      const state = this.getStateSnapshot();
+      const keepNames = [
+        state.currentVersion || '',
+        state.lastVersion || '',
+        UpdateContext.launchVersion,
+      ].filter(name => name.length > 0);
+      return NativePatchCore.cleanupOldEntries(
         this.rootDir,
         keepNames,
         CLEANUP_MAX_AGE_DAYS,
-      ),
-    ).catch((error: Object) => {
+      );
+    }).catch((error: Object) => {
       logger.error(TAG, `cleanupOldEntries failed: ${getErrorMessage(error)}`);
     });
   }

package/ios/RCTPushy/RCTPushy+Launch.mm

@@ -65,6 +65,11 @@ static NSString *PushyReadBuildTime(void) {
                 PushyToStdString(curBuildTime)
             );
             if (sync.changed) {
+                // The old binary's versions are gone from the state: drop
+                // their info, the first-load marker and the response cache,
+                // as every platform does (scripts/contract.ts storedItems).
+                PushyRemoveKeys(defaults, PushyKeysClearedOnUpgrade(),
+                                PushyKeyPrefixesClearedOnUpgrade());
                 [defaults setObject:@(YES) forKey:KeyPackageUpdatedMarked()];
                 state = sync.state;
                 PushyApplyStateToDefaults(defaults, state);

package/ios/RCTPushy/RCTPushy.mm

@@ -41,10 +41,11 @@ static void PushyTriggerReload(NSString *reason) {
     });
 }
 
-// A promise rejection for an exception caught around a state transition.
-static void PushyRejectException(RCTPromiseRejectBlock reject, const char *code,
-                                 NSException *exception, NSString *fallback) {
-    PushyRejectError(reject, PushyErrorWithCode(code, exception.reason ?: fallback));
+// A promise rejection for an exception caught (`@catch (...)`) around a
+// state transition.
+static void PushyRejectCaught(RCTPromiseRejectBlock reject, const char *code,
+                              NSString *fallback) {
+    PushyRejectError(reject, PushyErrorWithCode(code, PushyCaughtReason(fallback)));
 }
 
 // Host preparation runs off the caller's thread; the completion is delivered
@@ -61,8 +62,9 @@ static void PushyRunHostPreparation(NSDictionary *(^work)(void),
         NSDictionary *result;
         @try {
             result = work();
-        } @catch (NSException *exception) {
-            RCTLogWarn(@"RCTPushy -- native host sync failed: %@", exception.reason);
+        } @catch (...) {
+            RCTLogWarn(@"RCTPushy -- native host sync failed: %@",
+                       PushyCaughtReason(@"unknown exception"));
             result = PushyHostResult(@"failed", @"internal_error");
         }
         if (completion != nil) {
@@ -101,11 +103,20 @@ RCT_EXPORT_MODULE(RCTPushy);
         }
 #endif
         return resolvedURL ?: [RCTPushy binaryBundleURL];
+    } @catch (...) {
+        // An exception here would end every launch the same way; the
+        // packaged bundle always loads, and the round scheduled below can
+        // still repair the state.
+        RCTLogError(@"RCTPushy -- cannot resolve the launch bundle: %@",
+                    PushyCaughtReason(@"unknown exception"));
+        return [RCTPushy binaryBundleURL];
     } @finally {
         // State corruption is exactly when the rescue path matters most. If
         // resolution throws before a snapshot exists, nil safely omits only
         // this launch's rollback guard instead of disabling the check.
-        [RCTPushyOrchestrator scheduleFromColdStart:launchRolledBackVersion];
+        PushyGuard(@"native sync schedule", ^{
+            [RCTPushyOrchestrator scheduleFromColdStart:launchRolledBackVersion];
+        });
     }
 }
 
@@ -122,9 +133,9 @@ RCT_EXPORT_MODULE(RCTPushy);
         if (config != nil) {
             @try {
                 [RCTPushyOrchestrator persistConfiguration:config];
-            } @catch (NSException *exception) {
+            } @catch (...) {
                 failure = PushyErrorWithCode(pushy::error_codes::kFileOperationFailed,
-                    exception.reason ?: @"Native configuration failed");
+                    PushyCaughtReason(@"Native configuration failed"));
             }
         }
         if (completion != nil) {
@@ -158,7 +169,9 @@ RCT_EXPORT_MODULE(RCTPushy);
 - (NSDictionary *)constantsToExport
 {
     NSMutableDictionary *ret = [NSMutableDictionary new];
-    PushyWithStateLock(^{
+    // Whatever was gathered before a failure is still returned: throwing out
+    // of getConstants takes the app down.
+    PushyGuard(@"constants", ^{ PushyWithStateLock(^{
         NSUserDefaults *defaults = PushyDefaults();
 
         ret[@"downloadRootDir"] = [RCTPushy downloadDir];
@@ -194,7 +207,7 @@ RCT_EXPORT_MODULE(RCTPushy);
             [defaults removeObjectForKey:KeyPackageUpdatedMarked()];
             [RCTPushyInstaller clearInvalidFiles];
         }
-    });
+    }); });
 
     return ret;
 }
@@ -233,9 +246,9 @@ RCT_EXPORT_METHOD(syncNativeConfig:(NSString *)config
     @try {
         [RCTPushyOrchestrator persistConfiguration:config];
         resolve(@true);
-    } @catch (NSException *exception) {
-        PushyRejectException(reject, pushy::error_codes::kFileOperationFailed, exception,
-                             @"Native configuration failed");
+    } @catch (...) {
+        PushyRejectCaught(reject, pushy::error_codes::kFileOperationFailed,
+                          @"Native configuration failed");
     }
 }
 
@@ -366,7 +379,11 @@ RCT_EXPORT_METHOD(getBundleHash:(RCTPromiseResolveBlock)resolve
     resolve(@"");
 #else
     dispatch_async(PushyFileQueue(), ^{
-        resolve(PushyBundleHashSync(YES));
+        __block NSString *hash = @"";
+        PushyGuard(@"bundle hash", ^{
+            hash = PushyBundleHashSync(YES);
+        });
+        resolve(hash);
     });
 #endif
 }
@@ -390,9 +407,8 @@ RCT_EXPORT_METHOD(markSuccess:(RCTPromiseResolveBlock)resolve
             }
             PushyApplyStateToDefaults(defaults, result.state);
         });
-    } @catch (NSException *exception) {
-        PushyRejectException(reject, pushy::error_codes::kMarkSuccessFailed, exception,
-                             @"markSuccess failed");
+    } @catch (...) {
+        PushyRejectCaught(reject, pushy::error_codes::kMarkSuccessFailed, @"markSuccess failed");
         return;
     }
 
@@ -429,43 +445,43 @@ RCT_EXPORT_METHOD(resetToPackagedBundle:(RCTPromiseResolveBlock)resolve
             state.build_time = PushyToStdString([RCTPushy buildTime]);
             PushyApplyStateToDefaults(defaults, state);
 
-            for (NSString *key in [defaults dictionaryRepresentation].allKeys) {
-                if ([key hasPrefix:keyHashInfo]) {
-                    [defaults removeObjectForKey:key];
-                }
-            }
-            [defaults removeObjectForKey:keyFirstLoadMarked];
-            [defaults removeObjectForKey:KeyPackageUpdatedMarked()];
-            // A cached response still advertises the version this reset just
-            // removed; dropping it stops the JS side from reusing that answer.
-            [defaults removeObjectForKey:keyNativeCheckCache];
+            // Version info, the first-load and package-updated markers and the
+            // response cache (it still advertises the versions this reset just
+            // removed), the same on every platform (scripts/contract.ts).
+            PushyRemoveKeys(defaults, PushyKeysClearedOnReset(),
+                            PushyKeyPrefixesClearedOnReset());
             ignoreRollback = false;
         });
-    } @catch (NSException *exception) {
-        PushyRejectException(reject, pushy::error_codes::kResetFailed, exception, @"reset failed");
+    } @catch (...) {
+        PushyRejectCaught(reject, pushy::error_codes::kResetFailed, @"reset failed");
         return;
     }
 
+    // The reset is done once the state is: the next launch resolves to the
+    // packaged bundle. Settle now, as Android and Harmony do; deleting the
+    // downloaded versions is best-effort below and never delays the caller
+    // (it queues behind any unzip/patch on the file queue). A directory a
+    // failed delete leaves behind is no longer referenced by any state, so
+    // the regular cleanup removes it later.
+    resolve(@true);
+
     dispatch_async(PushyFileQueue(), ^{
         // maxAgeDays=0: remove every downloaded entry except the running
         // version's directory (cleaned up by the next regular cleanup). The
-        // state was just wiped, so that is the only name left to keep. The
-        // promise settles here, after the cleanup, so a failed wipe reaches
-        // JS as RESET_FAILED (Android parity) instead of a warning nobody
-        // aggregates.
-        pushy::delta::Status status = pushy::delta::CleanupOldEntries(
-            PushyToStdString([RCTPushy downloadDir]),
-            std::vector<std::string>{PushyToStdString(keepVersion)},
-            0
-        );
+        // state was just wiped, so that is the only name left to keep.
+        pushy::delta::Status status = pushy::delta::Status::Ok();
+        try {
+            status = pushy::delta::CleanupOldEntries(
+                PushyToStdString([RCTPushy downloadDir]),
+                std::vector<std::string>{PushyToStdString(keepVersion)},
+                0
+            );
+        } catch (const std::exception &error) {
+            status = pushy::delta::Status::Error(error.what());
+        }
         if (!status.ok) {
             RCTLogWarn(@"Pushy reset cleanup error: %s", status.message.c_str());
-            PushyRejectError(reject, PushyErrorWithCode(
-                pushy::error_codes::kResetFailed,
-                [NSString stringWithUTF8String:status.message.c_str()] ?: @"reset cleanup failed"));
-            return;
         }
-        resolve(@true);
     });
 }
 

package/ios/RCTPushy/RCTPushyCommon.h

@@ -17,12 +17,6 @@
 static NSString *const RCTPushyErrorDomain = @"cn.reactnative.pushy";
 static NSString *const RCTPushyErrorCodeKey = @"PushyErrorCode";
 
-// Text produced by scripts/encode-native-text.ts, decoded with
-// pushy::text::Reveal (cpp/patch_core/obscured_text.h). Keeps service
-// addresses, paths and protocol strings out of static string scans of the
-// binary; not a secret.
-PUSHY_HIDDEN NSString *RCTPushyRevealText(const char *hex);
-
 // Whether following a redirect from `from` to `to` would leave https for
 // plaintext http. Every https request (check and artifact) refuses that
 // downgrade before the redirected request is sent.

package/ios/RCTPushy/RCTPushyConfiguration.mm

@@ -1,17 +1,8 @@
 #import "RCTPushyConfiguration.h"
 #import "RCTPushyCommon.h"
 #include "../../cpp/patch_core/error_codes.h"
-#include "../../cpp/patch_core/obscured_text.h"
 #include "../../cpp/update_flow_core/native_config.h"
 
-NSString *RCTPushyRevealText(const char *hex) {
-    // The texts are ASCII (scripts/encode-native-text.ts).
-    std::string text = pushy::text::Reveal(hex);
-    return [[NSString alloc] initWithBytes:text.data()
-                                    length:text.size()
-                                  encoding:NSUTF8StringEncoding] ?: @"";
-}
-
 // Validation and defaults are the shared core's (flowcore::NormalizeConfiguration,
 // also used by Android and Harmony); this only bridges the dictionary.
 NSString *RCTPushyNormalizeConfiguration(NSDictionary *options, NSError **error) {
@@ -27,7 +18,14 @@ NSString *RCTPushyNormalizeConfiguration(NSDictionary *options, NSError **error)
     }
     std::string config;
     std::string message;
-    if (flowcore::NormalizeConfiguration(optionsJson, &config, &message)) {
+    bool normalized = false;
+    try {
+        normalized = flowcore::NormalizeConfiguration(optionsJson, &config, &message);
+    } catch (const std::exception &failure) {
+        // Called on the host's thread (CODE_AUDIT 4.4).
+        message = std::string("Invalid native configuration: ") + failure.what();
+    }
+    if (normalized) {
         NSString *result = [[NSString alloc] initWithBytes:config.data()
                                                     length:config.size()
                                                   encoding:NSUTF8StringEncoding];