react-native-update 10.48.2 → 10.49.0

package/src/client.ts

@@ -1,24 +1,38 @@
 import {
   DeviceEventEmitter,
-  EmitterSubscription,
+  type EmitterSubscription,
   Platform,
 } from 'react-native';
 import {
-  PushyModule,
   buildTime,
   cInfo,
   currentVersion,
   currentVersionInfo,
-  supportedDiffVersion,
+  getBundleHash,
   isFirstTime,
   isRolledBack,
+  PushyModule,
   packageVersion,
   pushyNativeEventEmitter,
   rolledBackVersion,
   setLocalHashInfo,
+  supportedDiffVersion,
 } from './core';
+import { dedupeEndpoints, executeEndpointFallback } from './endpoint';
+import {
+  asUpdateErrorCode,
+  toUpdateError,
+  UpdateError,
+  type UpdateErrorCode,
+} from './error';
+import i18n from './i18n';
 import { PermissionsAndroid } from './permissions';
 import {
+  resolveServerEventHash,
+  resolveServerEventType,
+  truncateDetail,
+} from './telemetry';
+import type {
   BeforeReloadContext,
   CheckResult,
   ClientOptions,
@@ -38,20 +52,8 @@ import {
   noop,
   promiseAny,
   testUrls,
+  warn,
 } from './utils';
-import i18n from './i18n';
-import {
-  asUpdateErrorCode,
-  toUpdateError,
-  UpdateError,
-  UpdateErrorCode,
-} from './error';
-import { dedupeEndpoints, executeEndpointFallback } from './endpoint';
-import {
-  resolveServerEventHash,
-  resolveServerEventType,
-  truncateDetail,
-} from './telemetry';
 
 /**
  * Receives every error the client reports, alongside the report event type.
@@ -60,13 +62,16 @@ import {
  */
 export type UpdateErrorListener = (
   error: UpdateError,
-  eventType: EventType,
+  eventType: EventType
 ) => void;
 
 const SERVER_PRESETS = {
   // cn
   Pushy: {
-    main: ['https://update.react-native.cn/api', 'https://update.reactnative.cn/api'],
+    main: [
+      'https://update.react-native.cn/api',
+      'https://update.reactnative.cn/api',
+    ],
     queryUrls: [
       'https://gitee.com/sunnylqm/react-native-pushy/raw/master/endpoints.json',
       'https://cdn.jsdelivr.net/gh/reactnativecn/react-native-update@master/endpoints.json',
@@ -88,15 +93,15 @@ const cloneServerConfig = (server: UpdateServerConfig): UpdateServerConfig => ({
 
 const excludeConfiguredEndpoints = (
   endpoints: string[],
-  configuredEndpoints: string[],
+  configuredEndpoints: string[]
 ) => {
   const configured = new Set(configuredEndpoints);
-  return endpoints.filter(endpoint => !configured.has(endpoint));
+  return endpoints.filter((endpoint) => !configured.has(endpoint));
 };
 
 assertWeb();
 
-const defaultClientOptions: ClientOptions = {
+const createDefaultClientOptions = (): ClientOptions => ({
   appKey: '',
   autoMarkSuccess: true,
   updateStrategy: __DEV__ ? 'alwaysAlert' : 'alertUpdateAndIgnoreError',
@@ -104,7 +109,7 @@ const defaultClientOptions: ClientOptions = {
   logger: noop,
   debug: false,
   throwError: false,
-};
+});
 
 export const sharedState: {
   progressHandlers: Record<string, EmitterSubscription>;
@@ -142,7 +147,7 @@ const assertHash = (hash: string) => {
 
 // for China users
 export class Pushy {
-  options = { ...defaultClientOptions };
+  options: ClientOptions = createDefaultClientOptions();
   clientType: 'Pushy' | 'Cresc' = 'Pushy';
   lastChecking?: number;
   lastRespJson?: Promise<CheckResult>;
@@ -153,7 +158,7 @@ export class Pushy {
   version = cInfo.rnu;
   loggerPromise = (() => {
     let resolve: (value?: unknown) => void = () => {};
-    const promise = new Promise(res => {
+    const promise = new Promise((res) => {
       resolve = res;
     });
     return {
@@ -167,14 +172,14 @@ export class Pushy {
     this.options.server = cloneServerConfig(SERVER_PRESETS[this.clientType]);
 
     i18n.setLocale(
-      options.locale ?? (this.clientType === 'Pushy' ? 'zh' : 'en'),
+      options.locale ?? (this.clientType === 'Pushy' ? 'zh' : 'en')
     );
 
     if (Platform.OS === 'ios' || Platform.OS === 'android') {
       if (!options.appKey) {
         throw new UpdateError(
           i18n.t('error_appkey_required'),
-          'APPKEY_REQUIRED',
+          'APPKEY_REQUIRED'
         );
       }
     }
@@ -235,7 +240,7 @@ export class Pushy {
       // no logger is ever provided.
       await Promise.race([
         this.loggerPromise.promise,
-        new Promise(resolve => setTimeout(resolve, 10 * 1000)),
+        new Promise((resolve) => setTimeout(resolve, 10 * 1000)),
       ]);
     }
     const { logger = noop, appKey } = this.options;
@@ -314,7 +319,7 @@ export class Pushy {
               detail: truncateDetail(detail),
             }),
           },
-          DEFAULT_FETCH_TIMEOUT_MS,
+          DEFAULT_FETCH_TIMEOUT_MS
         ).catch((e: any) => {
           log('telemetry report failed:', e?.message || e);
         });
@@ -366,7 +371,7 @@ export class Pushy {
     {
       message = error.message,
       data,
-    }: { message?: string; data?: Record<string, string | number> } = {},
+    }: { message?: string; data?: Record<string, string | number> } = {}
   ) => {
     this.emittedErrors.add(error);
     this.report({
@@ -424,20 +429,20 @@ export class Pushy {
     }
     try {
       const resp = await promiseAny(
-        server.queryUrls.map(queryUrl =>
-          fetchWithTimeout(queryUrl, {}, DEFAULT_FETCH_TIMEOUT_MS),
-        ),
+        server.queryUrls.map((queryUrl) =>
+          fetchWithTimeout(queryUrl, {}, DEFAULT_FETCH_TIMEOUT_MS)
+        )
       );
       const remoteEndpoints = await resp.json();
       log('fetch endpoints:', remoteEndpoints);
       if (Array.isArray(remoteEndpoints)) {
         return excludeConfiguredEndpoints(
           dedupeEndpoints(
-          remoteEndpoints.filter(
-            (endpoint): endpoint is string => typeof endpoint === 'string',
-          ),
+            remoteEndpoints.filter(
+              (endpoint): endpoint is string => typeof endpoint === 'string'
+            )
           ),
-          this.getConfiguredCheckEndpoints(),
+          this.getConfiguredCheckEndpoints()
         );
       }
     } catch (e) {
@@ -447,12 +452,12 @@ export class Pushy {
   };
   requestCheckResult = async (
     endpoint: string,
-    fetchPayload: Parameters<typeof fetch>[1],
+    fetchPayload: Parameters<typeof fetch>[1]
   ) => {
     const resp = await fetchWithTimeout(
       this.getCheckUrl(endpoint),
       fetchPayload,
-      DEFAULT_FETCH_TIMEOUT_MS,
+      DEFAULT_FETCH_TIMEOUT_MS
     );
 
     if (!resp.ok) {
@@ -463,7 +468,7 @@ export class Pushy {
           statusText: respText,
         }),
         'HTTP_STATUS',
-        { extra: { status: resp.status } },
+        { extra: { status: resp.status } }
       );
     }
 
@@ -473,7 +478,7 @@ export class Pushy {
     const { endpoint, value } = await executeEndpointFallback<CheckResult>({
       configuredEndpoints: this.getConfiguredCheckEndpoints(),
       getRemoteEndpoints: this.getRemoteEndpoints,
-      tryEndpoint: async currentEndpoint => {
+      tryEndpoint: async (currentEndpoint) => {
         try {
           return await this.requestCheckResult(currentEndpoint, fetchPayload);
         } catch (e) {
@@ -588,6 +593,11 @@ export class Pushy {
       this.notifyAfterCheckUpdate({ status: 'skipped' });
       return;
     }
+    // 内容寻址的二进制身份,服务端据此精确判定 pdiff 适用性(取代 buildTime
+    // 启发式)。同步读 core 里已预取的值:还没算完就省略字段(服务端回退
+    // buildTime 启发式),下一次检查自然带上——绝不为它 await、拖慢或复杂化
+    // 检查流程。
+    const bundleHash = __DEV__ ? '' : getBundleHash();
     const now = Date.now();
     if (
       this.lastRespJson &&
@@ -617,6 +627,7 @@ export class Pushy {
       cInfo,
       // 可消费的 diff 轨道版本(2 = hdiffv2 轨道),服务端据此门控下发
       ...(supportedDiffVersion ? { diffV: supportedDiffVersion } : {}),
+      ...(bundleHash ? { bundleHash } : {}),
       ...extra,
     };
     if (__DEV__) {
@@ -648,6 +659,16 @@ export class Pushy {
 
       log('checking result:', result);
 
+      if (result?.bundleStatus === 'unknownBundle') {
+        // 服务端判定当前二进制内嵌 bundle 未注册,增量已被降级为全量。只面向
+        // 开发者(日志 + 遥测,控制台聚合是主渠道);终端用户无感知。
+        warn(this.t('warn_unknown_bundle'));
+        this.report({
+          type: 'bundleMismatch',
+          data: bundleHash ? { bundleHash } : {},
+        });
+      }
+
       this.notifyAfterCheckUpdate({ status: 'completed', result });
       return result;
     } catch (e: any) {
@@ -666,7 +687,7 @@ export class Pushy {
   };
   downloadUpdate = async (
     updateInfo: CheckResult,
-    onDownloadProgress?: (data: ProgressData) => void,
+    onDownloadProgress?: (data: ProgressData) => void
   ) => {
     const { hash } = updateInfo;
     if (
@@ -713,7 +734,7 @@ export class Pushy {
   };
   private performDownload = async (
     updateInfo: CheckResult,
-    onDownloadProgress?: (data: ProgressData) => void,
+    onDownloadProgress?: (data: ProgressData) => void
   ) => {
     const {
       hash,
@@ -746,7 +767,9 @@ export class Pushy {
         ...data,
         progress: computeProgress(data.received, data.total),
       };
-      callbacks.forEach(callback => callback(payload));
+      callbacks.forEach((callback) => {
+        callback(payload);
+      });
     };
     const onNativeProgress = (progressData: ProgressData) => {
       if (progressData.hash === hash) {
@@ -757,12 +780,12 @@ export class Pushy {
     if (Platform.OS === 'harmony') {
       sharedState.progressHandlers[hash] = DeviceEventEmitter.addListener(
         'RCTPushyDownloadProgress',
-        onNativeProgress,
+        onNativeProgress
       );
     } else {
       sharedState.progressHandlers[hash] = pushyNativeEventEmitter.addListener(
         'RCTPushyDownloadProgress',
-        onNativeProgress,
+        onNativeProgress
       );
     }
     const maxRetries = Math.max(0, Math.floor(this.options.maxRetries ?? 3));
@@ -778,7 +801,10 @@ export class Pushy {
     type DownloadStrategy = {
       name: string;
       candidate: string | undefined;
-      errorKey: 'error_diff_failed' | 'error_pdiff_failed' | 'error_full_patch_failed';
+      errorKey:
+        | 'error_diff_failed'
+        | 'error_pdiff_failed'
+        | 'error_full_patch_failed';
       skipInDev: boolean;
       devNoopWhenNoUrl: boolean;
       run: (url: string) => Promise<void>;
@@ -790,7 +816,7 @@ export class Pushy {
         errorKey: 'error_diff_failed',
         skipInDev: true,
         devNoopWhenNoUrl: false,
-        run: url =>
+        run: (url) =>
           PushyModule.downloadPatchFromPpk({
             updateUrl: url,
             hash,
@@ -803,7 +829,7 @@ export class Pushy {
         errorKey: 'error_pdiff_failed',
         skipInDev: true,
         devNoopWhenNoUrl: false,
-        run: url =>
+        run: (url) =>
           PushyModule.downloadPatchFromPackage({
             updateUrl: url,
             hash,
@@ -815,7 +841,7 @@ export class Pushy {
         errorKey: 'error_full_patch_failed',
         skipInDev: false,
         devNoopWhenNoUrl: true,
-        run: url =>
+        run: (url) =>
           PushyModule.downloadFullUpdate({
             updateUrl: url,
             hash,
@@ -827,7 +853,7 @@ export class Pushy {
       if (attempt > 0) {
         const backoffMs = Math.min(1000 * 2 ** (attempt - 1), 10000);
         log(`retry attempt ${attempt}/${maxRetries}, waiting ${backoffMs}ms`);
-        await new Promise(r => setTimeout(r, backoffMs));
+        await new Promise((r) => setTimeout(r, backoffMs));
         errorMessages.length = 0;
         lastError = undefined;
         succeeded = '';
@@ -860,7 +886,7 @@ export class Pushy {
             lastError = new UpdateError(
               errorMessage,
               asUpdateErrorCode(e?.code) ?? 'DOWNLOAD_FAILED',
-              { cause: e },
+              { cause: e }
             );
             log(errorMessage);
           }
@@ -926,7 +952,7 @@ export class Pushy {
   };
   downloadAndInstallApk = async (
     url: string,
-    onDownloadProgress?: (data: ProgressData) => void,
+    onDownloadProgress?: (data: ProgressData) => void
   ) => {
     if (Platform.OS !== 'android') {
       return;
@@ -937,7 +963,7 @@ export class Pushy {
     if (sharedState.apkStatus === 'downloaded') {
       const err = new UpdateError(
         this.t('error_apk_pending_install'),
-        'APK_INSTALL_PENDING',
+        'APK_INSTALL_PENDING'
       );
       this.emitError(err, 'errorInstallApk');
       this.throwIfEnabled(err);
@@ -946,12 +972,12 @@ export class Pushy {
     if (Platform.Version <= 23) {
       try {
         const granted = await PermissionsAndroid.request(
-          PermissionsAndroid.PERMISSIONS.WRITE_EXTERNAL_STORAGE,
+          PermissionsAndroid.PERMISSIONS.WRITE_EXTERNAL_STORAGE
         );
         if (granted !== PermissionsAndroid.RESULTS.GRANTED) {
           const err = new UpdateError(
             this.t('error_storage_permission_rejected'),
-            'STORAGE_PERMISSION_REJECTED',
+            'STORAGE_PERMISSION_REJECTED'
           );
           this.emitError(err, 'rejectStoragePermission');
           this.throwIfEnabled(err);
@@ -978,7 +1004,7 @@ export class Pushy {
             if (progressData.hash === progressKey) {
               onDownloadProgress(progressData);
             }
-          },
+          }
         );
     }
     try {
@@ -1045,7 +1071,7 @@ export class Pushy {
       // native module predates this method.
       const err = new UpdateError(
         this.t('error_reset_not_supported'),
-        'RESET_FAILED',
+        'RESET_FAILED'
       );
       this.emitError(err, 'errorReset');
       this.throwIfEnabled(err);

package/src/context.ts

@@ -1,10 +1,10 @@
 import { createContext, useContext, useMemo } from 'react';
-import { CheckResult, ProgressData } from './type';
-import { Pushy, Cresc } from './client';
+import type { Cresc, Pushy } from './client';
 import i18n from './i18n';
+import type { CheckResult, ProgressData } from './type';
 
 const noop = () => {};
-const asyncNoop = () => Promise.resolve();
+const asyncNoop = () => Promise.resolve(undefined);
 
 export const defaultContext = {
   checkUpdate: asyncNoop,
@@ -24,12 +24,12 @@ export const defaultContext = {
 };
 
 export const UpdateContext = createContext<{
-  checkUpdate: () => Promise<void | CheckResult>;
+  checkUpdate: () => Promise<undefined | CheckResult>;
   switchVersion: () => Promise<void>;
   switchVersionLater: () => Promise<void>;
   markSuccess: () => void;
   dismissError: () => void;
-  downloadUpdate: () => Promise<boolean | void>;
+  downloadUpdate: () => Promise<boolean | undefined>;
   downloadAndInstallApk: (url: string) => Promise<void>;
   // @deprecated use currentVersionInfo instead
   getCurrentVersionInfo: () => Promise<{
@@ -46,7 +46,7 @@ export const UpdateContext = createContext<{
   restartApp: () => Promise<void>;
   resetToPackagedBundle: (options?: {
     restart?: boolean;
-  }) => Promise<boolean | void>;
+  }) => Promise<boolean | undefined>;
   currentHash: string;
   packageVersion: string;
   client?: Pushy | Cresc;
@@ -58,7 +58,7 @@ export const UpdateContext = createContext<{
 // otherwise every tick would re-render all useUpdate() consumers even when
 // they never read progress.
 export const ProgressContext = createContext<ProgressData | undefined>(
-  undefined,
+  undefined
 );
 
 /**

package/src/core.ts

@@ -1,61 +1,61 @@
 import { NativeEventEmitter, NativeModules, Platform } from 'react-native';
-import i18n from './i18n';
 import { UpdateError } from './error';
+import i18n from './i18n';
 import { emptyModule, error, log } from './utils';
 
 /* eslint-disable @react-native/no-deep-imports */
 const {
-	version: v,
+  version: v,
 } = require('react-native/Libraries/Core/ReactNativeVersion');
 const RNVersion = `${v.major}.${v.minor}.${v.patch}`;
 const isTurboModuleEnabled =
-	// https://github.com/facebook/react-native/pull/48362
-	(global as any).__turboModuleProxy || (global as any).RN$Bridgeless;
+  // https://github.com/facebook/react-native/pull/48362
+  (global as any).__turboModuleProxy || (global as any).RN$Bridgeless;
 
 export const PushyModule =
-	Platform.OS === 'web'
-		? emptyModule
-		: isTurboModuleEnabled
-			? require('./NativePushy').default
-			: NativeModules.Pushy;
+  Platform.OS === 'web'
+    ? emptyModule
+    : isTurboModuleEnabled
+      ? require('./NativePushy').default
+      : NativeModules.Pushy;
 
 export const UpdateModule = PushyModule;
 
 if (!PushyModule) {
-	throw new UpdateError(
-		'Failed to load react-native-update native module, please try to recompile',
-		'MODULE_NOT_LOADED',
-	);
+  throw new UpdateError(
+    'Failed to load react-native-update native module, please try to recompile',
+    'MODULE_NOT_LOADED'
+  );
 }
 
 const PushyConstants = isTurboModuleEnabled
-	? PushyModule.getConstants()
-	: PushyModule;
+  ? PushyModule.getConstants()
+  : PushyModule;
 
 export const downloadRootDir: string = PushyConstants.downloadRootDir;
 export const packageVersion: string = PushyConstants.packageVersion;
 export const currentVersion: string = PushyConstants.currentVersion;
 
 export function setLocalHashInfo(hash: string, info: Record<string, any>) {
-	PushyModule.setLocalHashInfo(hash, JSON.stringify(info));
+  PushyModule.setLocalHashInfo(hash, JSON.stringify(info));
 }
 
 const currentVersionInfoString: string = PushyConstants.currentVersionInfo;
 let _currentVersionInfo: Record<string, any> = {};
 let isDebugChannel = false;
 if (currentVersionInfoString) {
-	try {
-		_currentVersionInfo = JSON.parse(currentVersionInfoString);
-		if (_currentVersionInfo.debugChannel) {
-			isDebugChannel = true;
-			delete _currentVersionInfo.debugChannel;
-			setLocalHashInfo(currentVersion, _currentVersionInfo);
-		}
-	} catch {
-		error(
-			i18n.t('error_parse_version_info', { info: currentVersionInfoString }),
-		);
-	}
+  try {
+    _currentVersionInfo = JSON.parse(currentVersionInfoString);
+    if (_currentVersionInfo.debugChannel) {
+      isDebugChannel = true;
+      delete _currentVersionInfo.debugChannel;
+      setLocalHashInfo(currentVersion, _currentVersionInfo);
+    }
+  } catch {
+    error(
+      i18n.t('error_parse_version_info', { info: currentVersionInfoString })
+    );
+  }
 }
 export const currentVersionInfo = _currentVersionInfo;
 
@@ -68,46 +68,73 @@ export const buildTime: string = PushyConstants.buildTime;
 // 原生 patch 内核可消费的 diff 轨道版本(2 = hdiffv2 轨道:HBC 变换 +
 // 流式容器);旧原生无此常量时为 0(不上报,服务端只发 baseline)
 export const supportedDiffVersion: number =
-	PushyConstants.supportedDiffVersion || 0;
+  PushyConstants.supportedDiffVersion || 0;
 let uuid = PushyConstants.uuid;
 
+// bundleHash = sha256 of the JS bundle embedded in the binary (the pdiff
+// source). Content identity for the server's pdiff-applicability check,
+// replacing the buildTime heuristic. Natively lazy-computed and cached;
+// prefetched fire-and-forget at module load so the value is usually settled
+// before the first checkUpdate builds its body. Until then (first install,
+// slow device) getBundleHash returns '' and the field is simply omitted — the
+// server falls back to the buildTime heuristic and the next check carries it.
+// Deliberately synchronous at read time: checkUpdate must not await anything
+// between its dedup window and the fetch, and a hash is never worth delaying
+// a check for.
+let bundleHash = '';
+// The JS layer can arrive via hot update onto an older binary whose native
+// module predates the method, hence the feature detect. On web PushyModule is
+// a noop Proxy and the call settles to ''.
+if (typeof PushyModule.getBundleHash === 'function') {
+  Promise.resolve(PushyModule.getBundleHash())
+    .then((hash: unknown) => {
+      bundleHash = String(hash || '');
+    })
+    .catch((e: any) => {
+      log('getBundleHash failed:', e?.message || e);
+    });
+}
+
+/** '' while unknown (not yet computed, debug build, no embedded bundle, older native). */
+export const getBundleHash = (): string => bundleHash;
+
 async function getLocalHashInfo(hash: string) {
-	return JSON.parse(await PushyModule.getLocalHashInfo(hash));
+  return JSON.parse(await PushyModule.getLocalHashInfo(hash));
 }
 
 // @deprecated use currentVersionInfo instead
 export async function getCurrentVersionInfo(): Promise<{
-	name?: string;
-	description?: string;
-	metaInfo?: string;
+  name?: string;
+  description?: string;
+  metaInfo?: string;
 }> {
-	return currentVersion ? (await getLocalHashInfo(currentVersion)) || {} : {};
+  return currentVersion ? (await getLocalHashInfo(currentVersion)) || {} : {};
 }
 
 export const pushyNativeEventEmitter = new NativeEventEmitter(PushyModule);
 
 if (!uuid) {
-	uuid = require('nanoid/non-secure').nanoid();
-	// If persisting fails the uuid drifts on every launch, which skews gray
-	// release bucketing and inflates stats — log it instead of failing silently.
-	Promise.resolve(PushyModule.setUuid(uuid)).catch((e: any) => {
-		log('setUuid error:', e?.message || e);
-	});
+  uuid = require('nanoid/non-secure').nanoid();
+  // If persisting fails the uuid drifts on every launch, which skews gray
+  // release bucketing and inflates stats — log it instead of failing silently.
+  Promise.resolve(PushyModule.setUuid(uuid)).catch((e: any) => {
+    log('setUuid error:', e?.message || e);
+  });
 }
 
 export const cInfo = {
-	rnu: require('../package.json').version,
-	rn: RNVersion,
-	os: `${Platform.OS} ${Platform.Version}`,
-	uuid,
+  rnu: require('../package.json').version,
+  rn: RNVersion,
+  os: `${Platform.OS} ${Platform.Version}`,
+  uuid,
 };
 
 log('bootup status', {
-	packageVersion,
-	currentVersion,
-	currentVersionInfo,
-	isFirstTime,
-	isFirstTimeDebug,
-	isDebugChannel,
-	cInfo,
+  packageVersion,
+  currentVersion,
+  currentVersionInfo,
+  isFirstTime,
+  isFirstTimeDebug,
+  isDebugChannel,
+  cInfo,
 });