react-native-update 8.5.5 → 8.5.7

package/dist/simpleUpdate.js

@@ -0,0 +1,155 @@
+"use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || (function () {
+    var ownKeys = function(o) {
+        ownKeys = Object.getOwnPropertyNames || function (o) {
+            var ar = [];
+            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
+            return ar;
+        };
+        return ownKeys(o);
+    };
+    return function (mod) {
+        if (mod && mod.__esModule) return mod;
+        var result = {};
+        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
+        __setModuleDefault(result, mod);
+        return result;
+    };
+})();
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.simpleUpdate = simpleUpdate;
+const react_1 = __importStar(require("react"));
+const react_native_1 = require("react-native");
+const main_1 = require("./main");
+function simpleUpdate(WrappedComponent, options = {}) {
+    const { appKey, onPushyEvents: eventListeners } = options;
+    if (!appKey) {
+        throw new Error('appKey is required for simpleUpdate()');
+    }
+    if (typeof eventListeners === 'function') {
+        (0, main_1.onPushyEvents)(eventListeners);
+    }
+    return __DEV__
+        ? WrappedComponent
+        : class AppUpdate extends react_1.PureComponent {
+            constructor() {
+                super(...arguments);
+                this.stateListener = null;
+                this.doUpdate = (info) => __awaiter(this, void 0, void 0, function* () {
+                    try {
+                        const hash = yield (0, main_1.downloadUpdate)(info);
+                        if (!hash) {
+                            return;
+                        }
+                        this.stateListener && this.stateListener.remove();
+                        react_native_1.Alert.alert('提示', '下载完毕，是否立即更新?', [
+                            {
+                                text: '以后再说',
+                                style: 'cancel',
+                                onPress: () => {
+                                    (0, main_1.switchVersionLater)(hash);
+                                },
+                            },
+                            {
+                                text: '立即更新',
+                                style: 'default',
+                                onPress: () => {
+                                    (0, main_1.switchVersion)(hash);
+                                },
+                            },
+                        ]);
+                    }
+                    catch (err) {
+                        react_native_1.Alert.alert('更新失败', err.message);
+                    }
+                });
+                this.checkUpdate = () => __awaiter(this, void 0, void 0, function* () {
+                    let info;
+                    try {
+                        info = yield (0, main_1.checkUpdate)(appKey);
+                    }
+                    catch (err) {
+                        react_native_1.Alert.alert('更新检查失败', err.message);
+                        return;
+                    }
+                    if (info.expired) {
+                        react_native_1.Alert.alert('提示', '您的应用版本已更新，点击确定下载安装新版本', [
+                            {
+                                text: '确定',
+                                onPress: () => {
+                                    if (info.downloadUrl) {
+                                        if (react_native_1.Platform.OS === 'android' &&
+                                            info.downloadUrl.endsWith('.apk')) {
+                                            (0, main_1.downloadAndInstallApk)({
+                                                url: info.downloadUrl,
+                                            });
+                                        }
+                                        else {
+                                            react_native_1.Linking.openURL(info.downloadUrl);
+                                        }
+                                    }
+                                },
+                            },
+                        ]);
+                    }
+                    else if (info.update) {
+                        react_native_1.Alert.alert('提示', '检查到新的版本' + info.name + ',是否下载?\n' + info.description, [
+                            { text: '否', style: 'cancel' },
+                            {
+                                text: '是',
+                                style: 'default',
+                                onPress: () => {
+                                    this.doUpdate(info);
+                                },
+                            },
+                        ]);
+                    }
+                });
+            }
+            componentDidMount() {
+                if (main_1.isRolledBack) {
+                    react_native_1.Alert.alert('抱歉', '刚刚更新遭遇错误，已为您恢复到更新前版本');
+                }
+                else if (main_1.isFirstTime) {
+                    (0, main_1.markSuccess)();
+                }
+                this.stateListener = react_native_1.AppState.addEventListener('change', (nextAppState) => {
+                    if (nextAppState === 'active') {
+                        this.checkUpdate();
+                    }
+                });
+                this.checkUpdate();
+            }
+            componentWillUnmount() {
+                this.stateListener && this.stateListener.remove();
+            }
+            render() {
+                return <WrappedComponent {...this.props}/>;
+            }
+        };
+}

package/dist/type.d.ts

@@ -0,0 +1,51 @@
+export interface ExpiredResult {
+    upToDate?: false;
+    expired: true;
+    downloadUrl: string;
+}
+export interface UpTodateResult {
+    expired?: false;
+    upToDate: true;
+    paused?: 'app' | 'package';
+}
+export interface UpdateAvailableResult {
+    expired?: false;
+    upToDate?: false;
+    update: true;
+    name: string;
+    hash: string;
+    description: string;
+    metaInfo: string;
+    pdiffUrl: string;
+    pdiffUrls?: string[];
+    diffUrl?: string;
+    diffUrls?: string[];
+    updateUrl?: string;
+    updateUrls?: string[];
+}
+export type CheckResult = ExpiredResult | UpTodateResult | UpdateAvailableResult | {};
+export interface ProgressData {
+    hash: string;
+    received: number;
+    total: number;
+}
+export type EventType = 'rollback' | 'errorChecking' | 'checking' | 'downloading' | 'errorUpdate' | 'markSuccess' | 'downloadingApk' | 'rejectStoragePermission' | 'errorStoragePermission' | 'errowDownloadAndInstallApk';
+export interface EventData {
+    currentVersion: string;
+    cInfo: {
+        pushy: string;
+        rn: string;
+        os: string;
+        uuid: string;
+    };
+    packageVersion: string;
+    buildTime: number;
+    message?: string;
+    rolledBackVersion?: string;
+    newVersion?: string;
+    [key: string]: any;
+}
+export type UpdateEventsListener = ({ type, data, }: {
+    type: EventType;
+    data: EventData;
+}) => void;

package/dist/type.js

@@ -0,0 +1,2 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });

package/dist/utils.d.ts

@@ -0,0 +1,5 @@
+export declare function promiseAny<T>(promises: Promise<T>[]): Promise<T>;
+export declare function logger(...args: any[]): void;
+export declare function assertRelease(): void;
+export declare const testUrls: (urls?: string[]) => Promise<any>;
+export declare const enhancedFetch: (url: string, params: Parameters<typeof fetch>[1], isRetry?: boolean) => any;

package/dist/utils.js

@@ -0,0 +1,106 @@
+"use strict";
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.enhancedFetch = exports.testUrls = void 0;
+exports.promiseAny = promiseAny;
+exports.logger = logger;
+exports.assertRelease = assertRelease;
+const react_native_1 = require("react-native");
+function promiseAny(promises) {
+    return new Promise((resolve, reject) => {
+        let count = 0;
+        promises.forEach((promise) => {
+            Promise.resolve(promise)
+                .then(resolve)
+                .catch(() => {
+                count++;
+                if (count === promises.length) {
+                    reject(new Error('All promises were rejected'));
+                }
+            });
+        });
+    });
+}
+function logger(...args) {
+    console.log('Pushy: ', ...args);
+}
+function assertRelease() {
+    if (__DEV__) {
+        throw new Error('react-native-update 只能在 RELEASE 版本中运行.');
+    }
+}
+const ping = react_native_1.Platform.OS === 'web'
+    ? Promise.resolve
+    : (url) => __awaiter(void 0, void 0, void 0, function* () {
+        let pingFinished = false;
+        return Promise.race([
+            (0, exports.enhancedFetch)(url, {
+                method: 'HEAD',
+            })
+                .then(({ status, statusText, url: finalUrl }) => {
+                pingFinished = true;
+                if (status === 200) {
+                    return finalUrl;
+                }
+                logger('ping failed', finalUrl, status, statusText);
+                throw new Error('Ping failed');
+            })
+                .catch((e) => {
+                pingFinished = true;
+                logger('ping error', url, e);
+                throw e;
+            }),
+            new Promise((_, reject) => setTimeout(() => {
+                reject(new Error('Ping timeout'));
+                if (!pingFinished) {
+                    logger('ping timeout', url);
+                }
+            }, 2000)),
+        ]);
+    });
+const testUrls = (urls) => __awaiter(void 0, void 0, void 0, function* () {
+    if (!(urls === null || urls === void 0 ? void 0 : urls.length)) {
+        return null;
+    }
+    try {
+        const ret = yield promiseAny(urls.map(ping));
+        if (ret) {
+            return ret;
+        }
+    }
+    catch (_a) { }
+    logger('all ping failed, use first url:', urls[0]);
+    return urls[0];
+});
+exports.testUrls = testUrls;
+// export const isAndroid70AndBelow = () => {
+//   // android 7.0 and below devices do not support letsencrypt cert
+//   // https://letsencrypt.org/2023/07/10/cross-sign-expiration/
+//   return Platform.OS === 'android' && Platform.Version <= 24;
+// };
+const enhancedFetch = (url_1, params_1, ...args_1) => __awaiter(void 0, [url_1, params_1, ...args_1], void 0, function* (url, params, isRetry = false) {
+    return fetch(url, params)
+        .then((r) => {
+        if (r.ok) {
+            return r;
+        }
+        throw new Error(`${r.status} ${r.statusText}`);
+    })
+        .catch((e) => {
+        logger('fetch error', url, e);
+        if (isRetry) {
+            throw e;
+        }
+        logger('trying fallback to http');
+        return (0, exports.enhancedFetch)(url.replace('https', 'http'), params, true);
+    });
+});
+exports.enhancedFetch = enhancedFetch;

package/lib/endpoint.ts

@@ -1,10 +1,7 @@
 import { logger, promiseAny } from './utils';
 
 let currentEndpoint = 'https://update.react-native.cn/api';
-let backupEndpoints: string[] = [
-  'https://pushy-koa-qgbgqmcpis.cn-beijing.fcapp.run',
-  'https://update.reactnative.cn/api',
-];
+let backupEndpoints: string[] = ['https://update.reactnative.cn/api'];
 let backupEndpointsQueryUrls = [
   'https://gitee.com/sunnylqm/react-native-pushy/raw/master/endpoints.json',
   'https://cdn.jsdelivr.net/gh/reactnativecn/react-native-pushy@master/endpoints.json',
@@ -24,7 +21,7 @@ export async function updateBackupEndpoints() {
         logger('fetch remote endpoints:', remoteEndpoints);
         logger('merged backup endpoints:', backupEndpoints);
       }
-    } catch (e) {
+    } catch (e: any) {
       logger('fetch remote endpoints failed');
     }
   }

package/lib/main.ts

@@ -16,7 +16,7 @@ import {
   UpdateAvailableResult,
   UpdateEventsListener,
 } from './type';
-import { assertRelease, logger, promiseAny, testUrls } from './utils';
+import { assertRelease, enhancedFetch, logger, promiseAny, testUrls } from './utils';
 export { setCustomEndpoints };
 const {
   version: v,
@@ -153,8 +153,8 @@ export async function checkUpdate(APPKEY: string) {
   };
   let resp;
   try {
-    resp = await fetch(getCheckUrl(APPKEY), fetchPayload);
-  } catch (e) {
+    resp = await enhancedFetch(getCheckUrl(APPKEY), fetchPayload);
+  } catch (e: any) {
     report({
       type: 'errorChecking',
       message: '无法连接主更新服务器，尝试备用节点',
@@ -164,7 +164,7 @@ export async function checkUpdate(APPKEY: string) {
       try {
         resp = await promiseAny(
           backupEndpoints.map((endpoint) =>
-            fetch(getCheckUrl(APPKEY, endpoint), fetchPayload),
+            enhancedFetch(getCheckUrl(APPKEY, endpoint), fetchPayload),
           ),
         );
       } catch {}
@@ -265,7 +265,7 @@ export async function downloadUpdate(
         originHash: currentVersion,
       });
       succeeded = true;
-    } catch (e) {
+    } catch (e: any) {
       logger(`diff error: ${e.message}, try pdiff`);
     }
   }
@@ -279,7 +279,7 @@ export async function downloadUpdate(
           hash: options.hash,
         });
         succeeded = true;
-      } catch (e) {
+      } catch (e: any) {
         logger(`pdiff error: ${e.message}, try full patch`);
       }
     }
@@ -294,7 +294,7 @@ export async function downloadUpdate(
           hash: options.hash,
         });
         succeeded = true;
-      } catch (e) {
+      } catch (e: any) {
         logger(`full patch error: ${e.message}`);
       }
     }
@@ -371,7 +371,7 @@ export async function downloadAndInstallApk({
       if (granted !== PermissionsAndroid.RESULTS.GRANTED) {
         return report({ type: 'rejectStoragePermission' });
       }
-    } catch (err) {
+    } catch (err: any) {
       return report({ type: 'errorStoragePermission' });
     }
   }

package/lib/simpleUpdate.tsx

@@ -34,7 +34,7 @@ export function simpleUpdate(
   return __DEV__
     ? WrappedComponent
     : class AppUpdate extends PureComponent {
-        stateListener: NativeEventSubscription;
+        stateListener: NativeEventSubscription | null = null;
         componentDidMount() {
           if (isRolledBack) {
             Alert.alert('抱歉', '刚刚更新遭遇错误，已为您恢复到更新前版本');
@@ -77,7 +77,7 @@ export function simpleUpdate(
                 },
               },
             ]);
-          } catch (err) {
+          } catch (err: any) {
             Alert.alert('更新失败', err.message);
           }
         };
@@ -86,7 +86,7 @@ export function simpleUpdate(
           let info;
           try {
             info = await checkUpdate(appKey!);
-          } catch (err) {
+          } catch (err: any) {
             Alert.alert('更新检查失败', err.message);
             return;
           }

package/lib/utils.ts

@@ -33,15 +33,15 @@ const ping =
     : async (url: string) => {
         let pingFinished = false;
         return Promise.race([
-          fetch(url, {
+          enhancedFetch(url, {
             method: 'HEAD',
           })
-            .then(({ status, statusText }) => {
+            .then(({ status, statusText, url: finalUrl }) => {
               pingFinished = true;
               if (status === 200) {
-                return url;
+                return finalUrl;
               }
-              logger('ping failed', url, status, statusText);
+              logger('ping failed', finalUrl, status, statusText);
               throw new Error('Ping failed');
             })
             .catch((e) => {
@@ -73,3 +73,31 @@ export const testUrls = async (urls?: string[]) => {
   logger('all ping failed, use first url:', urls[0]);
   return urls[0];
 };
+
+// export const isAndroid70AndBelow = () => {
+//   // android 7.0 and below devices do not support letsencrypt cert
+//   // https://letsencrypt.org/2023/07/10/cross-sign-expiration/
+//   return Platform.OS === 'android' && Platform.Version <= 24;
+// };
+
+export const enhancedFetch = async (
+  url: string,
+  params: Parameters<typeof fetch>[1],
+  isRetry = false,
+) => {
+  return fetch(url, params)
+    .then((r) => {
+      if (r.ok) {
+        return r;
+      }
+      throw new Error(`${r.status} ${r.statusText}`);
+    })
+    .catch((e) => {
+      logger('fetch error', url, e);
+      if (isRetry) {
+        throw e;
+      }
+      logger('trying fallback to http');
+      return enhancedFetch(url.replace('https', 'http'), params, true);
+    });
+};

package/package.json

@@ -1,10 +1,13 @@
 {
   "name": "react-native-update",
-  "version": "8.5.5",
+  "version": "8.5.7",
   "description": "react-native hot update",
-  "main": "lib/index.ts",
+  "main": "dist/index.js",
+  "types": "dist/index.d.ts",
   "scripts": {
-    "prepublish": "yarn submodule",
+    "prepublishOnly": "yarn submodule && yarn build",
+    "build": "yarn clean && tsc",
+    "clean": "rm -rf dist",
     "submodule": "git submodule update --init --recursive",
     "test": "echo \"Error: no test specified\" && exit 1",
     "build-lib": "yarn submodule && $ANDROID_HOME/ndk/20.1.5948944/ndk-build NDK_PROJECT_PATH=android APP_BUILD_SCRIPT=android/jni/Android.mk NDK_APPLICATION_MK=android/jni/Application.mk NDK_LIBS_OUT=android/lib"
@@ -25,7 +28,7 @@
     "url": "https://github.com/reactnativecn/react-native-pushy/issues"
   },
   "peerDependencies": {
-    "react-native": ">=0.57.0"
+    "react-native": "*"
   },
   "homepage": "https://github.com/reactnativecn/react-native-pushy#readme",
   "dependencies": {

package/tsconfig.json

@@ -0,0 +1,18 @@
+{
+  "compilerOptions": {
+    "target": "es2016",
+    "module": "commonjs",
+    "declaration": true,
+    "outDir": "./dist",
+    "strict": true,
+    "noImplicitAny": false,
+    "esModuleInterop": true,
+    "skipLibCheck": true,
+    "forceConsistentCasingInFileNames": true,
+    "jsx": "react-native",
+    "lib": ["es2016", "dom"],
+    "moduleResolution": "node"
+  },
+  "include": ["lib/**/*"],
+  "exclude": ["node_modules", "dist", "Example"]
+}