react-native-update 10.0.0-beta.0 → 10.0.0-beta.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native-update",
-  "version": "10.0.0-beta.0",
+  "version": "10.0.0-beta.2",
   "description": "react-native hot update",
   "main": "src/index.ts",
   "scripts": {
@@ -40,7 +40,7 @@
   },
   "peerDependencies": {
     "react": ">=16.8.0",
-    "react-native": ">=0.57.0"
+    "react-native": ">=0.59.0"
   },
   "homepage": "https://github.com/reactnativecn/react-native-pushy#readme",
   "dependencies": {

package/src/client.tsx

@@ -154,7 +154,6 @@ export class Pushy {
     if (resp.status !== 200) {
       report({
         type: 'errorChecking',
-        //@ts-ignore
         message: result.message,
       });
     }
@@ -187,11 +186,11 @@ export class Pushy {
     onDownloadProgress?: (data: ProgressData) => void,
   ) => {
     assertRelease();
-    if (!('update' in info)) {
-      return;
-    }
     const { hash, diffUrl, pdiffUrl, updateUrl, name, description, metaInfo } =
       info;
+    if (!info.update || !hash) {
+      return;
+    }
     if (rolledBackVersion === hash) {
       log(`rolledback hash ${rolledBackVersion}, ignored`);
       return;

package/src/client.web.js

@@ -0,0 +1,13 @@
+const noop = () => {};
+export class Pushy {
+  constructor() {
+    console.warn(
+      'react-native-update is not supported and will do nothing on web.',
+    );
+    return new Proxy(this, {
+      get() {
+        return noop;
+      },
+    });
+  }
+}

package/src/context.ts

@@ -12,19 +12,23 @@ export const defaultContext = {
   markSuccess: noop,
   dismissError: noop,
   downloadUpdate: noop,
+  currentHash: '',
+  packageVersion: '',
 };
 
 export const PushyContext = createContext<{
   checkUpdate: () => void;
   switchVersion: () => void;
   switchVersionLater: () => void;
-  progress?: ProgressData;
   markSuccess: () => void;
-  updateInfo?: CheckResult;
-  lastError?: Error;
   dismissError: () => void;
-  client?: Pushy;
   downloadUpdate: () => void;
+  currentHash: string;
+  packageVersion: string;
+  client?: Pushy;
+  progress?: ProgressData;
+  updateInfo?: CheckResult;
+  lastError?: Error;
 }>(defaultContext);
 
 export const usePushy = () => useContext(PushyContext);

package/src/provider.tsx

@@ -13,7 +13,7 @@ import {
   Linking,
 } from 'react-native';
 import { Pushy } from './client';
-import { isFirstTime } from './core';
+import { currentVersion, isFirstTime, packageVersion } from './core';
 import { CheckResult } from './type';
 import { PushyContext } from './context';
 
@@ -45,19 +45,19 @@ export const PushyProvider = ({
   );
 
   const switchVersion = useCallback(() => {
-    if (updateInfo && 'hash' in updateInfo) {
+    if (updateInfo && updateInfo.hash) {
       client.switchVersion(updateInfo.hash);
     }
   }, [client, updateInfo]);
 
   const switchVersionLater = useCallback(() => {
-    if (updateInfo && 'hash' in updateInfo) {
+    if (updateInfo && updateInfo.hash) {
       client.switchVersionLater(updateInfo.hash);
     }
   }, [client, updateInfo]);
 
   const downloadUpdate = useCallback(async () => {
-    if (!updateInfo || !('update' in updateInfo)) {
+    if (!updateInfo || !updateInfo.update) {
       return;
     }
     try {
@@ -98,7 +98,7 @@ export const PushyProvider = ({
       return;
     }
     setUpdateInfo(info);
-    if ('expired' in info) {
+    if (info.expired) {
       const { downloadUrl } = info;
       showAlert('提示', '您的应用版本已更新，点击更新下载安装新版本', [
         {
@@ -114,7 +114,7 @@ export const PushyProvider = ({
           },
         },
       ]);
-    } else if ('update' in info) {
+    } else if (info.update) {
       showAlert(
         '提示',
         '检查到新的版本' + info.name + ',是否下载?\n' + info.description,
@@ -176,6 +176,8 @@ export const PushyProvider = ({
         markSuccess,
         client,
         downloadUpdate,
+        packageVersion,
+        currentHash: currentVersion,
       }}
     >
       {children}

package/src/provider.web.js

@@ -0,0 +1,2 @@
+import { Fragment } from 'react';
+export const PushyProvider = Fragment;

package/src/type.ts

@@ -1,31 +1,19 @@
-export interface ExpiredResult {
-  expired: true;
-  downloadUrl: string;
-}
-
-export interface UpTodateResult {
-  upToDate: true;
-  paused?: 'app' | 'package';
-}
-
-export interface UpdateAvailableResult {
-  upToDate: false;
-  update: true;
-  name: string; // version name
-  hash: string;
-  description: string;
-  metaInfo: string;
-  pdiffUrl: string;
+export interface CheckResult {
+  upToDate?: true;
+  expired?: true;
+  downloadUrl?: string;
+  update?: true;
+  name?: string; // version name
+  hash?: string;
+  description?: string;
+  metaInfo?: string;
+  pdiffUrl?: string;
   diffUrl?: string;
   updateUrl?: string;
+  paused?: 'app' | 'package';
+  message?: string;
 }
 
-export type CheckResult =
-  | ExpiredResult
-  | UpTodateResult
-  | UpdateAvailableResult
-  | {};
-
 export interface ProgressData {
   hash: string;
   received: number;
@@ -59,6 +47,7 @@ export interface EventData {
   newVersion?: string;
   [key: string]: any;
 }
+
 export type UpdateEventsLogger = ({
   type,
   data,
@@ -72,6 +61,7 @@ export interface PushyServerConfig {
   backups?: string[];
   queryUrl?: string;
 }
+
 export interface PushyOptions {
   appKey: string;
   server?: PushyServerConfig;

package/src/index.web.js

@@ -1,17 +0,0 @@
-import { Fragment } from 'react';
-
-const noop = () => {};
-export class Pushy {
-  constructor() {
-    console.warn('react-native-update is not supported and will do nothing on web.');
-    return new Proxy(this, {
-      get() {
-        return noop;
-      },
-    });
-  }
-}
-
-export { PushyContext, usePushy } from './context';
-
-export const PushyProvider = Fragment;