Add simple update

lib/index.d.ts

@@ -83,3 +83,5 @@ interface ProgressData {
   received: number;
   total: number;
 }
+
+export function simpleUpdate(wrappedComponent: any): any;

lib/index.js

@@ -1,314 +1,2 @@
-import {
+export * from './main';
-  tryBackupEndpoints,
+export * from './simpleUpdate';
-  getCheckUrl,
-  setCustomEndpoints,
-} from './endpoint';
-import {
-  NativeEventEmitter,
-  NativeModules,
-  Platform,
-  PermissionsAndroid,
-} from 'react-native';
-export { setCustomEndpoints };
-const {
-  version: v,
-} = require('react-native/Libraries/Core/ReactNativeVersion');
-const RNVersion = `${v.major}.${v.minor}.${v.patch}`;
-
-let Pushy = NativeModules.Pushy;
-
-if (!Pushy) {
-  throw new Error('react-native-update模块无法加载，请对照安装文档检查配置。');
-}
-
-export const downloadRootDir = Pushy.downloadRootDir;
-export const packageVersion = Pushy.packageVersion;
-export const currentVersion = Pushy.currentVersion;
-export const isFirstTime = Pushy.isFirstTime;
-export const isRolledBack = Pushy.isRolledBack;
-export const buildTime = Pushy.buildTime;
-let blockUpdate = Pushy.blockUpdate;
-let uuid = Pushy.uuid;
-
-if (Platform.OS === 'android' && !Pushy.isUsingBundleUrl) {
-  throw new Error(
-    'react-native-update模块无法加载，请对照文档检查Bundle URL的配置',
-  );
-}
-
-function setLocalHashInfo(hash, info) {
-  Pushy.setLocalHashInfo(hash, JSON.stringify(info));
-}
-
-async function getLocalHashInfo(hash) {
-  return JSON.parse(await Pushy.getLocalHashInfo(hash));
-}
-
-export async function getCurrentVersionInfo() {
-  return currentVersion ? await getLocalHashInfo(currentVersion) || {} : {};
-}
-
-const eventEmitter = new NativeEventEmitter(Pushy);
-
-if (!uuid) {
-  uuid = require('nanoid/non-secure').nanoid();
-  Pushy.setUuid(uuid);
-}
-
-function logger(text) {
-  console.log(`Pushy: ${text}`);
-}
-
-logger('uuid: ' + uuid);
-
-/*
-Return json:
-Package expired:
-{
-  expired: true,
-  downloadUrl: 'http://appstore/downloadUrl',
-}
-Package is up to date:
-{
-  upToDate: true,
-}
-There is available update:
-{
-  update: true,
-  name: '1.0.3-rc',
-  hash: 'hash',
-  description: '添加聊天功能\n修复商城页面BUG',
-  metaInfo: '{"silent":true}',
-  pdiffUrl: 'http://update-packages.reactnative.cn/hash',
-  diffUrl: 'http://update-packages.reactnative.cn/hash',
-}
- */
-
-export const cInfo = {
-  pushy: require('../package.json').version,
-  rn: RNVersion,
-  os: Platform.OS + ' ' + Platform.Version,
-  uuid,
-};
-
-function assertRelease() {
-  if (__DEV__) {
-    throw new Error('react-native-update can only run on RELEASE version.');
-  }
-}
-
-let checkingThrottling = false;
-export async function checkUpdate(APPKEY, isRetry) {
-  assertRelease();
-  if (checkingThrottling) {
-    logger('repeated checking, ignored');
-    return;
-  }
-  checkingThrottling = true;
-  setTimeout(() => {
-    checkingThrottling = false;
-  }, 3000);
-  if (blockUpdate && blockUpdate.until > Date.now() / 1000) {
-    throw new Error(
-      `热更新已暂停，原因：${blockUpdate.reason}。请在"${new Date(
-        blockUpdate.until * 1000,
-      ).toLocaleString()}"之后重试。`,
-    );
-  }
-  if (typeof APPKEY !== 'string') {
-    throw new Error('未检查到合法的APPKEY，请查看update.json文件是否正确生成');
-  }
-  logger('checking update');
-  let resp;
-  try {
-    resp = await fetch(getCheckUrl(APPKEY), {
-      method: 'POST',
-      headers: {
-        Accept: 'application/json',
-        'Content-Type': 'application/json',
-      },
-      body: JSON.stringify({
-        packageVersion,
-        hash: currentVersion,
-        buildTime,
-        cInfo,
-      }),
-    });
-  } catch (e) {
-    if (isRetry) {
-      throw new Error('Could not connect to pushy server');
-    }
-    await tryBackupEndpoints(APPKEY);
-    return checkUpdate(APPKEY, true);
-  }
-  const result = await resp.json();
-  checkOperation(result.op);
-
-  if (resp.status !== 200) {
-    throw new Error(result.message);
-  }
-
-  return result;
-}
-
-function checkOperation(op) {
-  if (!Array.isArray(op)) {
-    return;
-  }
-  op.forEach((action) => {
-    if (action.type === 'block') {
-      blockUpdate = {
-        reason: action.reason,
-        until: Math.round((Date.now() + action.duration) / 1000),
-      };
-      Pushy.setBlockUpdate(blockUpdate);
-    }
-  });
-}
-
-let downloadingThrottling = false;
-let downloadedHash;
-export async function downloadUpdate(options, eventListeners) {
-  assertRelease();
-  if (!options.update) {
-    return;
-  }
-  if (downloadedHash === options.hash) {
-    logger(`duplicated downloaded hash ${downloadedHash}, ignored`);
-    return;
-  }
-  if (readyHash) {
-    logger(`hash ${readyHash} applied. reboot first`);
-    return;
-  }
-  if (downloadingThrottling) {
-    logger('repeated downloading, ignored');
-    return;
-  }
-  downloadingThrottling = true;
-  setTimeout(() => {
-    downloadingThrottling = false;
-  }, 3000);
-  let progressHandler;
-  if (eventListeners) {
-    if (eventListeners.onDownloadProgress) {
-      const downloadCallback = eventListeners.onDownloadProgress;
-      progressHandler = eventEmitter.addListener(
-        'RCTPushyDownloadProgress',
-        (progressData) => {
-          if (progressData.hash === options.hash) {
-            downloadCallback(progressData);
-          }
-        },
-      );
-    }
-  }
-  if (options.diffUrl) {
-    logger('downloading diff');
-    try {
-      await Pushy.downloadPatchFromPpk({
-        updateUrl: options.diffUrl,
-        hash: options.hash,
-        originHash: currentVersion,
-      });
-    } catch (e) {
-      logger(e.message);
-      logger('diff error, try pdiff');
-      await Pushy.downloadPatchFromPackage({
-        updateUrl: options.pdiffUrl,
-        hash: options.hash,
-      });
-    }
-  } else if (options.pdiffUrl) {
-    logger('downloading pdiff');
-    await Pushy.downloadPatchFromPackage({
-      updateUrl: options.pdiffUrl,
-      hash: options.hash,
-    });
-  }
-  setLocalHashInfo(options.hash, {
-    name: options.name,
-    description: options.description,
-    metaInfo: options.metaInfo,
-  });
-  progressHandler && progressHandler.remove();
-  downloadedHash = options.hash;
-  return options.hash;
-}
-
-let readyHash;
-function assertHash(hash) {
-  if (!downloadedHash) {
-    logger(`no downloaded hash`);
-    return;
-  }
-  if (hash !== downloadedHash) {
-    logger(`use downloaded hash ${downloadedHash} first`);
-    return;
-  }
-  if (readyHash === hash) {
-    logger(`hash ${readyHash} already applied. reboot first.`);
-    return;
-  }
-  readyHash = hash;
-}
-
-export function switchVersion(hash) {
-  assertRelease();
-  assertHash(hash);
-  logger('switchVersion: ' + hash);
-  Pushy.reloadUpdate({ hash });
-}
-
-export function switchVersionLater(hash) {
-  assertRelease();
-  assertHash(hash);
-  logger('switchVersionLater: ' + hash);
-  Pushy.setNeedUpdate({ hash });
-}
-
-let marked = false;
-export function markSuccess() {
-  assertRelease();
-  if (marked) {
-    logger('repeated markSuccess, ignored');
-    return;
-  }
-  marked = true;
-  logger('markSuccess');
-  Pushy.markSuccess();
-}
-
-export async function downloadAndInstallApk({ url, onDownloadProgress }) {
-  logger('downloadAndInstallApk');
-  if (Platform.OS === 'android' && Platform.Version <= 23) {
-    try {
-      const granted = await PermissionsAndroid.request(
-        PermissionsAndroid.PERMISSIONS.WRITE_EXTERNAL_STORAGE,
-      );
-      if (granted !== PermissionsAndroid.RESULTS.GRANTED) {
-        return;
-      }
-    } catch (err) {
-      console.warn(err);
-    }
-  }
-  let hash = Date.now().toString();
-  let progressHandler;
-  if (onDownloadProgress) {
-    progressHandler = eventEmitter.addListener(
-      'RCTPushyDownloadProgress',
-      (progressData) => {
-        if (progressData.hash === hash) {
-          onDownloadProgress(progressData);
-        }
-      },
-    );
-  }
-  await Pushy.downloadAndInstallApk({
-    url,
-    target: 'update.apk',
-    hash,
-  });
-  progressHandler && progressHandler.remove();
-}

lib/main.js

@@ -0,0 +1,314 @@
+import {
+  tryBackupEndpoints,
+  getCheckUrl,
+  setCustomEndpoints,
+} from './endpoint';
+import {
+  NativeEventEmitter,
+  NativeModules,
+  Platform,
+  PermissionsAndroid,
+} from 'react-native';
+export { setCustomEndpoints };
+const {
+  version: v,
+} = require('react-native/Libraries/Core/ReactNativeVersion');
+const RNVersion = `${v.major}.${v.minor}.${v.patch}`;
+
+let Pushy = NativeModules.Pushy;
+
+if (!Pushy) {
+  throw new Error('react-native-update模块无法加载，请对照安装文档检查配置。');
+}
+
+export const downloadRootDir = Pushy.downloadRootDir;
+export const packageVersion = Pushy.packageVersion;
+export const currentVersion = Pushy.currentVersion;
+export const isFirstTime = Pushy.isFirstTime;
+export const isRolledBack = Pushy.isRolledBack;
+export const buildTime = Pushy.buildTime;
+let blockUpdate = Pushy.blockUpdate;
+let uuid = Pushy.uuid;
+
+if (Platform.OS === 'android' && !Pushy.isUsingBundleUrl) {
+  throw new Error(
+    'react-native-update模块无法加载，请对照文档检查Bundle URL的配置',
+  );
+}
+
+function setLocalHashInfo(hash, info) {
+  Pushy.setLocalHashInfo(hash, JSON.stringify(info));
+}
+
+async function getLocalHashInfo(hash) {
+  return JSON.parse(await Pushy.getLocalHashInfo(hash));
+}
+
+export async function getCurrentVersionInfo() {
+  return currentVersion ? await getLocalHashInfo(currentVersion) || {} : {};
+}
+
+const eventEmitter = new NativeEventEmitter(Pushy);
+
+if (!uuid) {
+  uuid = require('nanoid/non-secure').nanoid();
+  Pushy.setUuid(uuid);
+}
+
+function logger(text) {
+  console.log(`Pushy: ${text}`);
+}
+
+logger('uuid: ' + uuid);
+
+/*
+Return json:
+Package expired:
+{
+  expired: true,
+  downloadUrl: 'http://appstore/downloadUrl',
+}
+Package is up to date:
+{
+  upToDate: true,
+}
+There is available update:
+{
+  update: true,
+  name: '1.0.3-rc',
+  hash: 'hash',
+  description: '添加聊天功能\n修复商城页面BUG',
+  metaInfo: '{"silent":true}',
+  pdiffUrl: 'http://update-packages.reactnative.cn/hash',
+  diffUrl: 'http://update-packages.reactnative.cn/hash',
+}
+ */
+
+export const cInfo = {
+  pushy: require('../package.json').version,
+  rn: RNVersion,
+  os: Platform.OS + ' ' + Platform.Version,
+  uuid,
+};
+
+function assertRelease() {
+  if (__DEV__) {
+    throw new Error('react-native-update can only run on RELEASE version.');
+  }
+}
+
+let checkingThrottling = false;
+export async function checkUpdate(APPKEY, isRetry) {
+  assertRelease();
+  if (checkingThrottling) {
+    logger('repeated checking, ignored');
+    return;
+  }
+  checkingThrottling = true;
+  setTimeout(() => {
+    checkingThrottling = false;
+  }, 3000);
+  if (blockUpdate && blockUpdate.until > Date.now() / 1000) {
+    throw new Error(
+      `热更新已暂停，原因：${blockUpdate.reason}。请在"${new Date(
+        blockUpdate.until * 1000,
+      ).toLocaleString()}"之后重试。`,
+    );
+  }
+  if (typeof APPKEY !== 'string') {
+    throw new Error('未检查到合法的APPKEY，请查看update.json文件是否正确生成');
+  }
+  logger('checking update');
+  let resp;
+  try {
+    resp = await fetch(getCheckUrl(APPKEY), {
+      method: 'POST',
+      headers: {
+        Accept: 'application/json',
+        'Content-Type': 'application/json',
+      },
+      body: JSON.stringify({
+        packageVersion,
+        hash: currentVersion,
+        buildTime,
+        cInfo,
+      }),
+    });
+  } catch (e) {
+    if (isRetry) {
+      throw new Error('Could not connect to pushy server');
+    }
+    await tryBackupEndpoints(APPKEY);
+    return checkUpdate(APPKEY, true);
+  }
+  const result = await resp.json();
+  checkOperation(result.op);
+
+  if (resp.status !== 200) {
+    throw new Error(result.message);
+  }
+
+  return result;
+}
+
+function checkOperation(op) {
+  if (!Array.isArray(op)) {
+    return;
+  }
+  op.forEach((action) => {
+    if (action.type === 'block') {
+      blockUpdate = {
+        reason: action.reason,
+        until: Math.round((Date.now() + action.duration) / 1000),
+      };
+      Pushy.setBlockUpdate(blockUpdate);
+    }
+  });
+}
+
+let downloadingThrottling = false;
+let downloadedHash;
+export async function downloadUpdate(options, eventListeners) {
+  assertRelease();
+  if (!options.update) {
+    return;
+  }
+  if (downloadedHash === options.hash) {
+    logger(`duplicated downloaded hash ${downloadedHash}, ignored`);
+    return;
+  }
+  if (readyHash) {
+    logger(`hash ${readyHash} applied. reboot first`);
+    return;
+  }
+  if (downloadingThrottling) {
+    logger('repeated downloading, ignored');
+    return;
+  }
+  downloadingThrottling = true;
+  setTimeout(() => {
+    downloadingThrottling = false;
+  }, 3000);
+  let progressHandler;
+  if (eventListeners) {
+    if (eventListeners.onDownloadProgress) {
+      const downloadCallback = eventListeners.onDownloadProgress;
+      progressHandler = eventEmitter.addListener(
+        'RCTPushyDownloadProgress',
+        (progressData) => {
+          if (progressData.hash === options.hash) {
+            downloadCallback(progressData);
+          }
+        },
+      );
+    }
+  }
+  if (options.diffUrl) {
+    logger('downloading diff');
+    try {
+      await Pushy.downloadPatchFromPpk({
+        updateUrl: options.diffUrl,
+        hash: options.hash,
+        originHash: currentVersion,
+      });
+    } catch (e) {
+      logger(e.message);
+      logger('diff error, try pdiff');
+      await Pushy.downloadPatchFromPackage({
+        updateUrl: options.pdiffUrl,
+        hash: options.hash,
+      });
+    }
+  } else if (options.pdiffUrl) {
+    logger('downloading pdiff');
+    await Pushy.downloadPatchFromPackage({
+      updateUrl: options.pdiffUrl,
+      hash: options.hash,
+    });
+  }
+  setLocalHashInfo(options.hash, {
+    name: options.name,
+    description: options.description,
+    metaInfo: options.metaInfo,
+  });
+  progressHandler && progressHandler.remove();
+  downloadedHash = options.hash;
+  return options.hash;
+}
+
+let readyHash;
+function assertHash(hash) {
+  if (!downloadedHash) {
+    logger(`no downloaded hash`);
+    return;
+  }
+  if (hash !== downloadedHash) {
+    logger(`use downloaded hash ${downloadedHash} first`);
+    return;
+  }
+  if (readyHash === hash) {
+    logger(`hash ${readyHash} already applied. reboot first.`);
+    return;
+  }
+  readyHash = hash;
+}
+
+export function switchVersion(hash) {
+  assertRelease();
+  assertHash(hash);
+  logger('switchVersion: ' + hash);
+  Pushy.reloadUpdate({ hash });
+}
+
+export function switchVersionLater(hash) {
+  assertRelease();
+  assertHash(hash);
+  logger('switchVersionLater: ' + hash);
+  Pushy.setNeedUpdate({ hash });
+}
+
+let marked = false;
+export function markSuccess() {
+  assertRelease();
+  if (marked) {
+    logger('repeated markSuccess, ignored');
+    return;
+  }
+  marked = true;
+  logger('markSuccess');
+  Pushy.markSuccess();
+}
+
+export async function downloadAndInstallApk({ url, onDownloadProgress }) {
+  logger('downloadAndInstallApk');
+  if (Platform.OS === 'android' && Platform.Version <= 23) {
+    try {
+      const granted = await PermissionsAndroid.request(
+        PermissionsAndroid.PERMISSIONS.WRITE_EXTERNAL_STORAGE,
+      );
+      if (granted !== PermissionsAndroid.RESULTS.GRANTED) {
+        return;
+      }
+    } catch (err) {
+      console.warn(err);
+    }
+  }
+  let hash = Date.now().toString();
+  let progressHandler;
+  if (onDownloadProgress) {
+    progressHandler = eventEmitter.addListener(
+      'RCTPushyDownloadProgress',
+      (progressData) => {
+        if (progressData.hash === hash) {
+          onDownloadProgress(progressData);
+        }
+      },
+    );
+  }
+  await Pushy.downloadAndInstallApk({
+    url,
+    target: 'update.apk',
+    hash,
+  });
+  progressHandler && progressHandler.remove();
+}

lib/simpleUpdate.js

@@ -0,0 +1,116 @@
+import React, { Component } from 'react';
+import { Platform, Alert, Linking, AppState } from 'react-native';
+
+import {
+  isFirstTime,
+  isRolledBack,
+  checkUpdate,
+  downloadUpdate,
+  switchVersion,
+  switchVersionLater,
+  markSuccess,
+  downloadAndInstallApk,
+} from './main';
+
+import _updateConfig from '../../../update.json';
+const { appKey } = _updateConfig[Platform.OS];
+
+export function simpleUpdate(WrappedComponent) {
+  return __DEV__
+    ? WrappedComponent
+    : class AppUpdate extends Component {
+        componentDidMount() {
+          if (isRolledBack) {
+            Alert.alert('抱歉', '刚刚更新遭遇错误，已为您恢复到更新前版本');
+          } else if (isFirstTime) {
+            markSuccess();
+          }
+          this.stateListener = AppState.addEventListener(
+            'change',
+            (nextAppState) => {
+              if (nextAppState === 'active') {
+                this.checkUpdate();
+              }
+            },
+          );
+          this.checkUpdate();
+        }
+        componentWillUnmount() {
+          this.stateListener.remove();
+        }
+        doUpdate = async (info) => {
+          try {
+            const hash = await downloadUpdate(info);
+            this.stateListener.remove();
+            Alert.alert('提示', '下载完毕，是否立即更新?', [
+              {
+                text: '以后再说',
+                style: 'cancel',
+                onPress: () => {
+                  switchVersionLater(hash);
+                },
+              },
+              {
+                text: '立即更新',
+                style: 'default',
+                onPress: () => {
+                  switchVersion(hash);
+                },
+              },
+            ]);
+          } catch (err) {
+            Alert.alert('更新失败', err.message);
+          }
+        };
+
+        checkUpdate = async () => {
+          let info;
+          try {
+            info = await checkUpdate(appKey);
+          } catch (err) {
+            Alert.alert('更新检查失败', err.message);
+            return;
+          }
+          if (info.expired) {
+            Alert.alert('提示', '您的应用版本已更新，点击确定下载安装新版本', [
+              {
+                text: '确定',
+                onPress: () => {
+                  if (info.downloadUrl) {
+                    if (
+                      Platform.OS === 'android' &&
+                      info.downloadUrl.endsWith('.apk')
+                    ) {
+                      downloadAndInstallApk({
+                        url: info.downloadUrl,
+                      });
+                    } else {
+                      Linking.openURL(info.downloadUrl);
+                    }
+                  }
+                },
+              },
+            ]);
+          } else {
+            Alert.alert(
+              '提示',
+              '检查到新的版本' + info.name + ',是否下载?\n' + info.description,
+              [
+                { text: '否', style: 'cancel' },
+                {
+                  text: '是',
+                  style: 'default',
+                  onPress: () => {
+                    this.doUpdate(info);
+                  },
+                },
+              ],
+            );
+          }
+        };
+
+        render() {
+          return <WrappedComponent {...this.props} />;
+        }
+      };
+}