react-native-update 8.5.6 → 8.5.8

package/.cursor/mcp.json

@@ -0,0 +1,4 @@
+{
+  "mcpServers": {
+  }
+}

package/dist/endpoint.js

@@ -9,13 +9,12 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.setCustomEndpoints = exports.getCheckUrl = exports.updateBackupEndpoints = void 0;
+exports.updateBackupEndpoints = updateBackupEndpoints;
+exports.getCheckUrl = getCheckUrl;
+exports.setCustomEndpoints = setCustomEndpoints;
 const utils_1 = require("./utils");
 let currentEndpoint = 'https://update.react-native.cn/api';
-let backupEndpoints = [
-    'https://pushy-koa-qgbgqmcpis.cn-beijing.fcapp.run',
-    'https://update.reactnative.cn/api',
-];
+let backupEndpoints = ['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',
@@ -39,11 +38,9 @@ function updateBackupEndpoints() {
         return backupEndpoints;
     });
 }
-exports.updateBackupEndpoints = updateBackupEndpoints;
 function getCheckUrl(APPKEY, endpoint = currentEndpoint) {
     return `${endpoint}/checkUpdate/${APPKEY}`;
 }
-exports.getCheckUrl = getCheckUrl;
 /**
  * @param {string} main - The main api endpoint
  * @param {string[]} [backups] - The back up endpoints.
@@ -59,4 +56,3 @@ function setCustomEndpoints({ main, backups, backupQueryUrls, }) {
         backupEndpointsQueryUrls = backupQueryUrls;
     }
 }
-exports.setCustomEndpoints = setCustomEndpoints;

package/dist/main.js

@@ -9,7 +9,15 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.downloadAndInstallApk = exports.markSuccess = exports.switchVersionLater = exports.switchVersion = exports.downloadUpdate = exports.checkUpdate = exports.cInfo = exports.onPushyEvents = exports.getCurrentVersionInfo = exports.buildTime = exports.isRolledBack = exports.isFirstTime = exports.currentVersion = exports.packageVersion = exports.downloadRootDir = exports.PushyModule = exports.setCustomEndpoints = void 0;
+exports.cInfo = exports.buildTime = exports.isRolledBack = exports.isFirstTime = exports.currentVersion = exports.packageVersion = exports.downloadRootDir = exports.PushyModule = exports.setCustomEndpoints = void 0;
+exports.getCurrentVersionInfo = getCurrentVersionInfo;
+exports.onPushyEvents = onPushyEvents;
+exports.checkUpdate = checkUpdate;
+exports.downloadUpdate = downloadUpdate;
+exports.switchVersion = switchVersion;
+exports.switchVersionLater = switchVersionLater;
+exports.markSuccess = markSuccess;
+exports.downloadAndInstallApk = downloadAndInstallApk;
 const endpoint_1 = require("./endpoint");
 Object.defineProperty(exports, "setCustomEndpoints", { enumerable: true, get: function () { return endpoint_1.setCustomEndpoints; } });
 const react_native_1 = require("react-native");
@@ -46,7 +54,6 @@ function getCurrentVersionInfo() {
         return exports.currentVersion ? (yield getLocalHashInfo(exports.currentVersion)) || {} : {};
     });
 }
-exports.getCurrentVersionInfo = getCurrentVersionInfo;
 const eventEmitter = new react_native_1.NativeEventEmitter(exports.PushyModule);
 if (!uuid) {
     uuid = require('nanoid/non-secure').nanoid();
@@ -65,7 +72,6 @@ function onPushyEvents(customReporter) {
         });
     }
 }
-exports.onPushyEvents = onPushyEvents;
 function report({ type, message = '', data = {}, }) {
     (0, utils_1.logger)(type + ' ' + message);
     reporter({
@@ -119,7 +125,7 @@ function checkUpdate(APPKEY) {
         };
         let resp;
         try {
-            resp = yield fetch((0, endpoint_1.getCheckUrl)(APPKEY), fetchPayload);
+            resp = yield (0, utils_1.enhancedFetch)((0, endpoint_1.getCheckUrl)(APPKEY), fetchPayload);
         }
         catch (e) {
             report({
@@ -129,7 +135,7 @@ function checkUpdate(APPKEY) {
             const backupEndpoints = yield (0, endpoint_1.updateBackupEndpoints)();
             if (backupEndpoints) {
                 try {
-                    resp = yield (0, utils_1.promiseAny)(backupEndpoints.map((endpoint) => fetch((0, endpoint_1.getCheckUrl)(APPKEY, endpoint), fetchPayload)));
+                    resp = yield (0, utils_1.promiseAny)(backupEndpoints.map((endpoint) => (0, utils_1.enhancedFetch)((0, endpoint_1.getCheckUrl)(APPKEY, endpoint), fetchPayload)));
                 }
                 catch (_a) { }
             }
@@ -155,7 +161,6 @@ function checkUpdate(APPKEY) {
         return result;
     });
 }
-exports.checkUpdate = checkUpdate;
 function checkOperation(op) {
     if (!Array.isArray(op)) {
         return;
@@ -267,7 +272,6 @@ function downloadUpdate(options, eventListeners) {
         return options.hash;
     });
 }
-exports.downloadUpdate = downloadUpdate;
 function assertHash(hash) {
     if (!downloadedHash) {
         (0, utils_1.logger)(`no downloaded hash`);
@@ -286,7 +290,6 @@ function switchVersion(hash) {
         exports.PushyModule.reloadUpdate({ hash });
     }
 }
-exports.switchVersion = switchVersion;
 function switchVersionLater(hash) {
     (0, utils_1.assertRelease)();
     if (assertHash(hash)) {
@@ -294,7 +297,6 @@ function switchVersionLater(hash) {
         exports.PushyModule.setNeedUpdate({ hash });
     }
 }
-exports.switchVersionLater = switchVersionLater;
 let marked = false;
 function markSuccess() {
     (0, utils_1.assertRelease)();
@@ -306,9 +308,8 @@ function markSuccess() {
     exports.PushyModule.markSuccess();
     report({ type: 'markSuccess' });
 }
-exports.markSuccess = markSuccess;
-function downloadAndInstallApk({ url, onDownloadProgress, }) {
-    return __awaiter(this, void 0, void 0, function* () {
+function downloadAndInstallApk(_a) {
+    return __awaiter(this, arguments, void 0, function* ({ url, onDownloadProgress, }) {
         if (react_native_1.Platform.OS !== 'android') {
             return;
         }
@@ -343,4 +344,3 @@ function downloadAndInstallApk({ url, onDownloadProgress, }) {
         progressHandler && progressHandler.remove();
     });
 }
-exports.downloadAndInstallApk = downloadAndInstallApk;

package/dist/simpleUpdate.d.ts

@@ -5,7 +5,7 @@ export declare function simpleUpdate(WrappedComponent: ComponentType, options?:
     appKey?: string;
     onPushyEvents?: UpdateEventsListener;
 }): React.ComponentType | {
-    new (props: {} | Readonly<{}>): {
+    new (props: {}): {
         stateListener: NativeEventSubscription | null;
         componentDidMount(): void;
         componentWillUnmount(): void;

package/dist/simpleUpdate.js

@@ -15,13 +15,23 @@ var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (
 }) : function(o, v) {
     o["default"] = v;
 });
-var __importStar = (this && this.__importStar) || function (mod) {
-    if (mod && mod.__esModule) return mod;
-    var result = {};
-    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
-    __setModuleDefault(result, mod);
-    return result;
-};
+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) {
@@ -32,7 +42,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.simpleUpdate = void 0;
+exports.simpleUpdate = simpleUpdate;
 const react_1 = __importStar(require("react"));
 const react_native_1 = require("react-native");
 const main_1 = require("./main");
@@ -143,4 +153,3 @@ function simpleUpdate(WrappedComponent, options = {}) {
             }
         };
 }
-exports.simpleUpdate = simpleUpdate;

package/dist/utils.d.ts

@@ -1,4 +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<{} | null>;
+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

@@ -9,7 +9,10 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.testUrls = exports.assertRelease = exports.logger = exports.promiseAny = void 0;
+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) => {
@@ -26,31 +29,28 @@ function promiseAny(promises) {
         });
     });
 }
-exports.promiseAny = promiseAny;
 function logger(...args) {
     console.log('Pushy: ', ...args);
 }
-exports.logger = logger;
 function assertRelease() {
     if (__DEV__) {
         throw new Error('react-native-update 只能在 RELEASE 版本中运行.');
     }
 }
-exports.assertRelease = assertRelease;
 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([
-            fetch(url, {
+            (0, exports.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) => {
@@ -81,3 +81,20 @@ const testUrls = (urls) => __awaiter(void 0, void 0, void 0, function* () {
     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)
+        .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',

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,7 +153,7 @@ export async function checkUpdate(APPKEY: string) {
   };
   let resp;
   try {
-    resp = await fetch(getCheckUrl(APPKEY), fetchPayload);
+    resp = await enhancedFetch(getCheckUrl(APPKEY), fetchPayload);
   } catch (e: any) {
     report({
       type: 'errorChecking',
@@ -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 {}

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,25 @@ 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)
+    .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,11 +1,11 @@
 {
   "name": "react-native-update",
-  "version": "8.5.6",
+  "version": "8.5.8",
   "description": "react-native hot update",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
   "scripts": {
-    "prepublish": "yarn submodule && yarn build",
+    "prepublishOnly": "yarn submodule && yarn build",
     "build": "yarn clean && tsc",
     "clean": "rm -rf dist",
     "submodule": "git submodule update --init --recursive",

package/.swcrc

@@ -1,15 +0,0 @@
-{
-  "jsc": {
-    "loose": true,
-    "target": "es2018",
-    "parser": {
-      "syntax": "typescript",
-      "tsx": false,
-      "decorators": false,
-      "dynamicImport": false
-    }
-  },
-  "module": {
-    "type": "commonjs"
-  }
-}