react-native-update 10.37.15 → 10.37.16

package/src/client.ts

@@ -22,6 +22,7 @@ import {
   assertWeb,
   emptyObj,
   enhancedFetch,
+  info,
   joinUrls,
   log,
   noop,
@@ -189,7 +190,7 @@ export class Pushy {
   };
   assertDebug = (matter: string) => {
     if (__DEV__ && !this.options.debug) {
-      console.info(this.t('dev_debug_disabled', { matter }));
+      info(this.t('dev_debug_disabled', { matter }));
       return false;
     }
     return true;
@@ -345,9 +346,14 @@ export class Pushy {
         const remoteEndpoints = await resp.json();
         log('fetch endpoints:', remoteEndpoints);
         if (Array.isArray(remoteEndpoints)) {
-          server.backups = Array.from(
-            new Set([...(server.backups || []), ...remoteEndpoints]),
-          );
+          const backups = server.backups || [];
+          const set = new Set(backups);
+          for (const endpoint of remoteEndpoints) {
+            set.add(endpoint);
+          }
+          if (set.size !== backups.length) {
+            server.backups = Array.from(set);
+          }
         }
       } catch (e: any) {
         log('failed to fetch endpoints from: ', server.queryUrls);
@@ -356,7 +362,7 @@ export class Pushy {
     return server.backups;
   };
   downloadUpdate = async (
-    info: CheckResult,
+    updateInfo: CheckResult,
     onDownloadProgress?: (data: ProgressData) => void,
   ) => {
     const {
@@ -368,15 +374,15 @@ export class Pushy {
       name,
       description = '',
       metaInfo,
-    } = info;
+    } = updateInfo;
     if (
       this.options.beforeDownloadUpdate &&
-      (await this.options.beforeDownloadUpdate(info)) === false
+      (await this.options.beforeDownloadUpdate(updateInfo)) === false
     ) {
       log('beforeDownloadUpdate returned false, skipping download');
       return;
     }
-    if (!info.update || !hash) {
+    if (!updateInfo.update || !hash) {
       return;
     }
     if (rolledBackVersion === hash) {

package/src/core.ts

@@ -1,5 +1,6 @@
 import { NativeEventEmitter, NativeModules, Platform } from 'react-native';
-import { emptyModule, log } from './utils';
+import { emptyModule, error, log } from './utils';
+import i18n from './i18n';
 const {
   version: v,
 } = require('react-native/Libraries/Core/ReactNativeVersion');
@@ -46,10 +47,9 @@ if (currentVersionInfoString) {
       delete _currentVersionInfo.debugChannel;
       setLocalHashInfo(currentVersion, _currentVersionInfo);
     }
-  } catch (error) {
-    console.error(
-      'Failed to parse currentVersionInfo:',
-      currentVersionInfoString,
+  } catch (err) {
+    error(
+      i18n.t('error_parse_version_info', { info: currentVersionInfoString }),
     );
   }
 }

package/src/locales/en.ts

@@ -44,6 +44,7 @@ export default {
 
   // Error messages
   error_appkey_required: 'appKey is required',
+  error_parse_version_info: 'Failed to parse currentVersionInfo: {{info}}',
   error_update_check_failed: 'Update check failed',
   error_cannot_connect_server:
     'Can not connect to update server. Please check your network.',

package/src/locales/zh.ts

@@ -42,6 +42,7 @@ export default {
 
   // Error messages
   error_appkey_required: '需要提供 appKey',
+  error_parse_version_info: '解析 currentVersionInfo 失败: {{info}}',
   error_update_check_failed: '更新检查失败',
   error_cannot_connect_server: '无法连接到更新服务器。请检查网络连接。',
   error_cannot_connect_backup:

package/src/utils.ts

@@ -5,6 +5,18 @@ export function log(...args: any[]) {
   console.log(i18n.t('dev_log_prefix'), ...args);
 }
 
+export function info(...args: any[]) {
+  console.info(i18n.t('dev_log_prefix'), ...args);
+}
+
+export function warn(...args: any[]) {
+  console.warn(i18n.t('dev_log_prefix'), ...args);
+}
+
+export function error(...args: any[]) {
+  console.error(i18n.t('dev_log_prefix'), ...args);
+}
+
 export const isWeb = Platform.OS === 'web';
 
 export function promiseAny<T>(promises: Promise<T>[]) {
@@ -93,7 +105,7 @@ export const testUrls = async (urls?: string[]) => {
 
 export const assertWeb = () => {
   if (isWeb) {
-    console.warn(i18n.t('dev_web_not_supported'));
+    warn(i18n.t('dev_web_not_supported'));
     return false;
   }
   return true;