v5.8.0-beta1

This reverts commit 2d805fb38e.

.gitignore

@@ -1,10 +1,6 @@
-/.idea
+.vscode
-/node_modules
+android/build
-/local-cli/lib
+android/obj
-/react-native-pushy-cli/node_modules
-/react-native-pushy-cli/lib
-/android/build
-/android/obj
 *.iml
 
 # OSX

.npmignore

@@ -1,13 +1,11 @@
-/.idea
+.babelrc
-/.babelrc
+.npmignore
-/.npmignore
+.eslintrc
-/.eslintrc
+.nvmrc
-/.nvmrc
+.travis.yml
-/.travis.yml
+Example
-/local-cli/src
+android/build
-/react-native-pushy-cli
+.vscode
-/Example
-/android/build
 
 # OSX
 #
@@ -45,4 +43,7 @@ node_modules/
 npm-debug.log
 Example
 yarn.lock
-android/jni
+android/jni
+
+domains.json
+endpoints.json

.prettierrc.js

@@ -1,5 +1,4 @@
 module.exports = {
-  printWidth: 120,
   trailingComma: 'all',
   singleQuote: true,
 };

CHANGELOG.md

@@ -1,65 +0,0 @@
-### 最近更新
-
-## 5.5.0 (2019-11-24)
-
-1. 打包时加入时间戳
-
-## 5.4.0 (2019-11-16)
-
-1. 修改类名方法名
-
-## 5.3.2 (2019-10-25)
-
-1. 可以禁用ios端以避免审核被拒
-
-## 5.3.0 (2019-09-19)
-
-1. 替换 apk reader 以避免某些环境读取 apk 版本号报错的问题
-
-## 5.2.9 (2019-09-18)
-
-1. 添加 proguard 混淆规则以解决开启混淆后闪退的问题
-
-## 5.2.8
-
-1. 解决某些情形下 Android 调用 switchVersion 不能重启的问题
-
-## 5.2.7
-
-1. 改进 windows 端打更新包的兼容性（部分 windows 机器上会产生空 ppk 文件）
-
-## 5.2.4
-
-1. 支持 RN 0.61 的 hermes（路径变化）
-2. iOS 端使用第三方的 SSZipArchive 以减少重名冲突
-
-## 5.2.2
-
-1. 修复一处导致 iOS 回滚的问题
-
-## 5.2.1
-
-1. 检测如果开启了 hermes，则自动编译为 hermes 字节码格式
-
-## 5.2.0
-
-1. 添加 typescript 声明
-2. 支持 cocoapods
-
-## 5.1.9
-
-1. 重写 bundle 命令以提升版本兼容性
-2. 改进命令行的输出样式
-
-## 5.1.8
-
-1. 服务器迁移到 https
-2. android 支持 64 位
-
-## 5.1.6
-
-解决 Android 热更新后部分图片丢失问题：
-
-同一个项目中放置了多个完全相同的文件，在 5.1.0 至 5.1.5 之间的版本中，更新后有时会出现其中的部分无法显示。此问题在 5.1.6 版本修复。
-
-修复此问题涉及原生部分，需要重新打包。

Example/testHotUpdate/.flowconfig

@@ -1,75 +0,0 @@
-[ignore]
-; We fork some components by platform
-.*/*[.]android.js
-
-; Ignore "BUCK" generated dirs
-<PROJECT_ROOT>/\.buckd/
-
-; Ignore polyfills
-node_modules/react-native/Libraries/polyfills/.*
-
-; These should not be required directly
-; require from fbjs/lib instead: require('fbjs/lib/warning')
-node_modules/warning/.*
-
-; Flow doesn't support platforms
-.*/Libraries/Utilities/LoadingView.js
-
-[untyped]
-.*/node_modules/@react-native-community/cli/.*/.*
-
-[include]
-
-[libs]
-node_modules/react-native/Libraries/react-native/react-native-interface.js
-node_modules/react-native/flow/
-
-[options]
-emoji=true
-
-esproposal.optional_chaining=enable
-esproposal.nullish_coalescing=enable
-
-module.file_ext=.js
-module.file_ext=.json
-module.file_ext=.ios.js
-
-munge_underscores=true
-
-module.name_mapper='^react-native$' -> '<PROJECT_ROOT>/node_modules/react-native/Libraries/react-native/react-native-implementation'
-module.name_mapper='^react-native/\(.*\)$' -> '<PROJECT_ROOT>/node_modules/react-native/\1'
-module.name_mapper='^[./a-zA-Z0-9$_-]+\.\(bmp\|gif\|jpg\|jpeg\|png\|psd\|svg\|webp\|m4v\|mov\|mp4\|mpeg\|mpg\|webm\|aac\|aiff\|caf\|m4a\|mp3\|wav\|html\|pdf\)$' -> '<PROJECT_ROOT>/node_modules/react-native/Libraries/Image/RelativeImageStub'
-
-suppress_type=$FlowIssue
-suppress_type=$FlowFixMe
-suppress_type=$FlowFixMeProps
-suppress_type=$FlowFixMeState
-
-suppress_comment=\\(.\\|\n\\)*\\$FlowFixMe\\($\\|[^(]\\|(\\(<VERSION>\\)? *\\(site=[a-z,_]*react_native\\(_ios\\)?_\\(oss\\|fb\\)[a-z,_]*\\)?)\\)
-suppress_comment=\\(.\\|\n\\)*\\$FlowIssue\\((\\(<VERSION>\\)? *\\(site=[a-z,_]*react_native\\(_ios\\)?_\\(oss\\|fb\\)[a-z,_]*\\)?)\\)?:? #[0-9]+
-suppress_comment=\\(.\\|\n\\)*\\$FlowExpectedError
-
-[lints]
-sketchy-null-number=warn
-sketchy-null-mixed=warn
-sketchy-number=warn
-untyped-type-import=warn
-nonstrict-import=warn
-deprecated-type=warn
-unsafe-getters-setters=warn
-inexact-spread=warn
-unnecessary-invariant=warn
-signature-verification-failure=warn
-deprecated-utility=error
-
-[strict]
-deprecated-type
-nonstrict-import
-sketchy-null
-unclear-type
-unsafe-getters-setters
-untyped-import
-untyped-type-import
-
-[version]
-^0.105.0

Example/testHotUpdate/android/app/build.gradle

@@ -15,10 +15,12 @@ import com.android.build.OutputFile
  *   // the name of the generated asset file containing your JS bundle
  *   bundleAssetName: "index.android.bundle",
  *
- *   // the entry file for bundle generation
+ *   // the entry file for bundle generation. If none specified and
+ *   // "index.android.js" exists, it will be used. Otherwise "index.js" is
+ *   // default. Can be overridden with ENTRY_FILE environment variable.
  *   entryFile: "index.android.js",
  *
- *   // https://facebook.github.io/react-native/docs/performance#enable-the-ram-format
+ *   // https://reactnative.dev/docs/performance#enable-the-ram-format
  *   bundleCommand: "ram-bundle",
  *
  *   // whether to bundle JS and assets in debug mode
@@ -76,7 +78,6 @@ import com.android.build.OutputFile
  */
 
 project.ext.react = [
-    entryFile: "index.js",
     enableHermes: false,  // clean and rebuild if changing
 ]
 
@@ -156,12 +157,13 @@ android {
         }
         release {
             // Caution! In production, you need to generate your own keystore file.
-            // see https://facebook.github.io/react-native/docs/signed-apk-android.
+            // see https://reactnative.dev/docs/signed-apk-android.
             signingConfig signingConfigs.debug
             minifyEnabled enableProguardInReleaseBuilds
             proguardFiles getDefaultProguardFile("proguard-android.txt"), "proguard-rules.pro"
         }
     }
+
     // applicationVariants are e.g. debug, release
     applicationVariants.all { variant ->
         variant.outputs.each { output ->
@@ -180,8 +182,24 @@ android {
 
 dependencies {
     implementation fileTree(dir: "libs", include: ["*.jar"])
+    //noinspection GradleDynamicVersion
     implementation "com.facebook.react:react-native:+"  // From node_modules
 
+    implementation "androidx.swiperefreshlayout:swiperefreshlayout:1.0.0"
+
+    debugImplementation("com.facebook.flipper:flipper:${FLIPPER_VERSION}") {
+      exclude group:'com.facebook.fbjni'
+    }
+
+    debugImplementation("com.facebook.flipper:flipper-network-plugin:${FLIPPER_VERSION}") {
+        exclude group:'com.facebook.flipper'
+        exclude group:'com.squareup.okhttp3', module:'okhttp'
+    }
+
+    debugImplementation("com.facebook.flipper:flipper-fresco-plugin:${FLIPPER_VERSION}") {
+        exclude group:'com.facebook.flipper'
+    }
+
     if (enableHermes) {
         def hermesPath = "../../node_modules/hermes-engine/android/";
         debugImplementation files(hermesPath + "hermes-debug.aar")
@@ -198,4 +216,4 @@ task copyDownloadableDepsToLibs(type: Copy) {
     into 'libs'
 }
 
-apply from: file("../../node_modules/@react-native-community/cli-platform-android/native_modules.gradle"); applyNativeModulesAppBuildGradle(project)
+apply from: file("../../node_modules/@react-native-community/cli-platform-android/native_modules.gradle"); applyNativeModulesAppBuildGradle(project)

Example/testHotUpdate/android/app/src/debug/java/com/testhotupdate/ReactNativeFlipper.java

@@ -0,0 +1,72 @@
+/**
+ * Copyright (c) Facebook, Inc. and its affiliates.
+ *
+ * <p>This source code is licensed under the MIT license found in the LICENSE file in the root
+ * directory of this source tree.
+ */
+package com.testhotupdate;
+
+import android.content.Context;
+import com.facebook.flipper.android.AndroidFlipperClient;
+import com.facebook.flipper.android.utils.FlipperUtils;
+import com.facebook.flipper.core.FlipperClient;
+import com.facebook.flipper.plugins.crashreporter.CrashReporterPlugin;
+import com.facebook.flipper.plugins.databases.DatabasesFlipperPlugin;
+import com.facebook.flipper.plugins.fresco.FrescoFlipperPlugin;
+import com.facebook.flipper.plugins.inspector.DescriptorMapping;
+import com.facebook.flipper.plugins.inspector.InspectorFlipperPlugin;
+import com.facebook.flipper.plugins.network.FlipperOkhttpInterceptor;
+import com.facebook.flipper.plugins.network.NetworkFlipperPlugin;
+import com.facebook.flipper.plugins.react.ReactFlipperPlugin;
+import com.facebook.flipper.plugins.sharedpreferences.SharedPreferencesFlipperPlugin;
+import com.facebook.react.ReactInstanceManager;
+import com.facebook.react.bridge.ReactContext;
+import com.facebook.react.modules.network.NetworkingModule;
+import okhttp3.OkHttpClient;
+
+public class ReactNativeFlipper {
+  public static void initializeFlipper(Context context, ReactInstanceManager reactInstanceManager) {
+    if (FlipperUtils.shouldEnableFlipper(context)) {
+      final FlipperClient client = AndroidFlipperClient.getInstance(context);
+
+      client.addPlugin(new InspectorFlipperPlugin(context, DescriptorMapping.withDefaults()));
+      client.addPlugin(new ReactFlipperPlugin());
+      client.addPlugin(new DatabasesFlipperPlugin(context));
+      client.addPlugin(new SharedPreferencesFlipperPlugin(context));
+      client.addPlugin(CrashReporterPlugin.getInstance());
+
+      NetworkFlipperPlugin networkFlipperPlugin = new NetworkFlipperPlugin();
+      NetworkingModule.setCustomClientBuilder(
+          new NetworkingModule.CustomClientBuilder() {
+            @Override
+            public void apply(OkHttpClient.Builder builder) {
+              builder.addNetworkInterceptor(new FlipperOkhttpInterceptor(networkFlipperPlugin));
+            }
+          });
+      client.addPlugin(networkFlipperPlugin);
+      client.start();
+
+      // Fresco Plugin needs to ensure that ImagePipelineFactory is initialized
+      // Hence we run if after all native modules have been initialized
+      ReactContext reactContext = reactInstanceManager.getCurrentReactContext();
+      if (reactContext == null) {
+        reactInstanceManager.addReactInstanceEventListener(
+            new ReactInstanceManager.ReactInstanceEventListener() {
+              @Override
+              public void onReactContextInitialized(ReactContext reactContext) {
+                reactInstanceManager.removeReactInstanceEventListener(this);
+                reactContext.runOnNativeModulesQueueThread(
+                    new Runnable() {
+                      @Override
+                      public void run() {
+                        client.addPlugin(new FrescoFlipperPlugin());
+                      }
+                    });
+              }
+            });
+      } else {
+        client.addPlugin(new FrescoFlipperPlugin());
+      }
+    }
+  }
+}

Example/testHotUpdate/android/app/src/main/AndroidManifest.xml

@@ -4,6 +4,7 @@
     <uses-permission android:name="android.permission.INTERNET" />
 
     <application
+      android:usesCleartextTraffic="true"
       android:name=".MainApplication"
       android:label="@string/app_name"
       android:icon="@mipmap/ic_launcher"
@@ -13,7 +14,8 @@
       <activity
         android:name=".MainActivity"
         android:label="@string/app_name"
-        android:configChanges="keyboard|keyboardHidden|orientation|screenSize"
+        android:configChanges="keyboard|keyboardHidden|orientation|screenSize|uiMode"
+        android:launchMode="singleTask"
         android:windowSoftInputMode="adjustResize">
         <intent-filter>
             <action android:name="android.intent.action.MAIN" />

Example/testHotUpdate/android/app/src/main/java/com/testhotupdate/MainApplication.java

@@ -4,6 +4,7 @@ import android.app.Application;
 import android.content.Context;
 import com.facebook.react.PackageList;
 import com.facebook.react.ReactApplication;
+import com.facebook.react.ReactInstanceManager;
 import com.facebook.react.ReactNativeHost;
 import com.facebook.react.ReactPackage;
 import com.facebook.soloader.SoLoader;
@@ -50,23 +51,28 @@ public class MainApplication extends Application implements ReactApplication {
   public void onCreate() {
     super.onCreate();
     SoLoader.init(this, /* native exopackage */ false);
-    initializeFlipper(this); // Remove this line if you don't want Flipper enabled
+    initializeFlipper(this, getReactNativeHost().getReactInstanceManager());
   }
 
-  /**
+   /**
-   * Loads Flipper in React Native templates.
+   * Loads Flipper in React Native templates. Call this in the onCreate method with something like
+   * initializeFlipper(this, getReactNativeHost().getReactInstanceManager());
    *
    * @param context
+   * @param reactInstanceManager
    */
-  private static void initializeFlipper(Context context) {
+  private static void initializeFlipper(
+      Context context, ReactInstanceManager reactInstanceManager) {
     if (BuildConfig.DEBUG) {
       try {
         /*
          We use reflection here to pick up the class that initializes Flipper,
         since Flipper library is not available in release mode
         */
-        Class<?> aClass = Class.forName("com.facebook.flipper.ReactNativeFlipper");
+        Class<?> aClass = Class.forName("com.testhotupdate.ReactNativeFlipper");
-        aClass.getMethod("initializeFlipper", Context.class).invoke(null, context);
+        aClass
+            .getMethod("initializeFlipper", Context.class, ReactInstanceManager.class)
+            .invoke(null, context, reactInstanceManager);
       } catch (ClassNotFoundException e) {
         e.printStackTrace();
       } catch (NoSuchMethodException e) {

Example/testHotUpdate/android/build.gradle

@@ -2,17 +2,17 @@
 
 buildscript {
     ext {
-        buildToolsVersion = "28.0.3"
+        buildToolsVersion = "29.0.2"
-        minSdkVersion = 16
+        minSdkVersion = 21
-        compileSdkVersion = 28
+        compileSdkVersion = 29
-        targetSdkVersion = 28
+        targetSdkVersion = 29
     }
     repositories {
         google()
         jcenter()
     }
     dependencies {
-        classpath('com.android.tools.build:gradle:3.5.1')
+        classpath('com.android.tools.build:gradle:3.5.3')
 
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files
@@ -33,6 +33,6 @@ allprojects {
 
         google()
         jcenter()
-        maven { url 'https://jitpack.io' }
+        maven { url 'https://www.jitpack.io' }
     }
 }

Example/testHotUpdate/android/gradle.properties

@@ -17,5 +17,12 @@
 # http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
 # org.gradle.parallel=true
 
+# AndroidX package structure to make it clearer which packages are bundled with the
+# Android operating system, and which are packaged with your app's APK
+# https://developer.android.com/topic/libraries/support-library/androidx-rn
 android.useAndroidX=true
+# Automatically convert third-party libraries to use AndroidX
 android.enableJetifier=true
+
+# Version of flipper SDK to use with React Native
+FLIPPER_VERSION=0.54.0

Example/testHotUpdate/android/gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.2-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.6-all.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

Example/testHotUpdate/android/gradlew

@@ -7,7 +7,7 @@
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at
 #
-#      http://www.apache.org/licenses/LICENSE-2.0
+#      https://www.apache.org/licenses/LICENSE-2.0
 #
 # Unless required by applicable law or agreed to in writing, software
 # distributed under the License is distributed on an "AS IS" BASIS,
@@ -125,8 +125,8 @@ if $darwin; then
     GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
 fi
 
-# For Cygwin, switch paths to Windows format before running java
+# For Cygwin or MSYS, switch paths to Windows format before running java
-if $cygwin ; then
+if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then
     APP_HOME=`cygpath --path --mixed "$APP_HOME"`
     CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
     JAVACMD=`cygpath --unix "$JAVACMD"`
@@ -154,19 +154,19 @@ if $cygwin ; then
         else
             eval `echo args$i`="\"$arg\""
         fi
-        i=$((i+1))
+        i=`expr $i + 1`
     done
     case $i in
-        (0) set -- ;;
+        0) set -- ;;
-        (1) set -- "$args0" ;;
+        1) set -- "$args0" ;;
-        (2) set -- "$args0" "$args1" ;;
+        2) set -- "$args0" "$args1" ;;
-        (3) set -- "$args0" "$args1" "$args2" ;;
+        3) set -- "$args0" "$args1" "$args2" ;;
-        (4) set -- "$args0" "$args1" "$args2" "$args3" ;;
+        4) set -- "$args0" "$args1" "$args2" "$args3" ;;
-        (5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
+        5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
-        (6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
+        6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
-        (7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
+        7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
-        (8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
+        8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
-        (9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
+        9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
     esac
 fi
 
@@ -175,14 +175,9 @@ save () {
     for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
     echo " "
 }
-APP_ARGS=$(save "$@")
+APP_ARGS=`save "$@"`
 
 # Collect all arguments for the java command, following the shell quoting and substitution rules
 eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS"
 
-# by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong
+exec "$JAVACMD" "$@"
-if [ "$(uname)" = "Darwin" ] && [ "$HOME" = "$PWD" ]; then
-  cd "$(dirname "$0")"
-fi
-
-exec "$JAVACMD" "$@"

Example/testHotUpdate/android/gradlew.bat

@@ -5,7 +5,7 @@
 @rem you may not use this file except in compliance with the License.
 @rem You may obtain a copy of the License at
 @rem
-@rem      http://www.apache.org/licenses/LICENSE-2.0
+@rem      https://www.apache.org/licenses/LICENSE-2.0
 @rem
 @rem Unless required by applicable law or agreed to in writing, software
 @rem distributed under the License is distributed on an "AS IS" BASIS,
@@ -29,6 +29,9 @@ if "%DIRNAME%" == "" set DIRNAME=.
 set APP_BASE_NAME=%~n0
 set APP_HOME=%DIRNAME%
 
+@rem Resolve any "." and ".." in APP_HOME to make it shorter.
+for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi
+
 @rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
 set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m"
 
@@ -97,4 +100,4 @@ exit /b 1
 :mainEnd
 if "%OS%"=="Windows_NT" endlocal
 
-:omega
+:omega

Example/testHotUpdate/ios/Podfile

@@ -1,39 +1,20 @@
-platform :ios, '9.0'
+require_relative '../node_modules/react-native/scripts/react_native_pods'
 require_relative '../node_modules/@react-native-community/cli-platform-ios/native_modules'
 
+platform :ios, '10.0'
+
 target 'testHotUpdate' do
-  # Pods for testHotUpdate
+  config = use_native_modules!
-  pod 'FBLazyVector', :path => "../node_modules/react-native/Libraries/FBLazyVector"
-  pod 'FBReactNativeSpec', :path => "../node_modules/react-native/Libraries/FBReactNativeSpec"
-  pod 'RCTRequired', :path => "../node_modules/react-native/Libraries/RCTRequired"
-  pod 'RCTTypeSafety', :path => "../node_modules/react-native/Libraries/TypeSafety"
-  pod 'React', :path => '../node_modules/react-native/'
-  pod 'React-Core', :path => '../node_modules/react-native/'
-  pod 'React-CoreModules', :path => '../node_modules/react-native/React/CoreModules'
-  pod 'React-Core/DevSupport', :path => '../node_modules/react-native/'
-  pod 'React-RCTActionSheet', :path => '../node_modules/react-native/Libraries/ActionSheetIOS'
-  pod 'React-RCTAnimation', :path => '../node_modules/react-native/Libraries/NativeAnimation'
-  pod 'React-RCTBlob', :path => '../node_modules/react-native/Libraries/Blob'
-  pod 'React-RCTImage', :path => '../node_modules/react-native/Libraries/Image'
-  pod 'React-RCTLinking', :path => '../node_modules/react-native/Libraries/LinkingIOS'
-  pod 'React-RCTNetwork', :path => '../node_modules/react-native/Libraries/Network'
-  pod 'React-RCTSettings', :path => '../node_modules/react-native/Libraries/Settings'
-  pod 'React-RCTText', :path => '../node_modules/react-native/Libraries/Text'
-  pod 'React-RCTVibration', :path => '../node_modules/react-native/Libraries/Vibration'
-  pod 'React-Core/RCTWebSocket', :path => '../node_modules/react-native/'
 
-  pod 'React-cxxreact', :path => '../node_modules/react-native/ReactCommon/cxxreact'
+  use_react_native!(:path => config["reactNativePath"])
-  pod 'React-jsi', :path => '../node_modules/react-native/ReactCommon/jsi'
-  pod 'React-jsiexecutor', :path => '../node_modules/react-native/ReactCommon/jsiexecutor'
-  pod 'React-jsinspector', :path => '../node_modules/react-native/ReactCommon/jsinspector'
-  pod 'ReactCommon/jscallinvoker', :path => "../node_modules/react-native/ReactCommon"
-  pod 'ReactCommon/turbomodule/core', :path => "../node_modules/react-native/ReactCommon"
-  pod 'Yoga', :path => '../node_modules/react-native/ReactCommon/yoga'
 
-  pod 'DoubleConversion', :podspec => '../node_modules/react-native/third-party-podspecs/DoubleConversion.podspec'
+    # Enables Flipper.
-  pod 'glog', :podspec => '../node_modules/react-native/third-party-podspecs/glog.podspec'
+  #
-  pod 'Folly', :podspec => '../node_modules/react-native/third-party-podspecs/Folly.podspec'
+  # Note that if you have use_frameworks! enabled, Flipper will not work and
-
+  # you should disable these next few lines.
-  use_native_modules!
+  use_flipper!('Flipper' => '0.54.0')
+  post_install do |installer|
+    flipper_post_install(installer)
+  end
 end
 

Example/testHotUpdate/ios/Podfile.lock

@@ -1,245 +1,346 @@
 PODS:
   - boost-for-react-native (1.63.0)
+  - CocoaAsyncSocket (7.6.4)
+  - CocoaLibEvent (1.0.0)
   - DoubleConversion (1.1.6)
-  - FBLazyVector (0.61.4)
+  - FBLazyVector (0.63.2)
-  - FBReactNativeSpec (0.61.4):
+  - FBReactNativeSpec (0.63.2):
-    - Folly (= 2018.10.22.00)
+    - Folly (= 2020.01.13.00)
-    - RCTRequired (= 0.61.4)
+    - RCTRequired (= 0.63.2)
-    - RCTTypeSafety (= 0.61.4)
+    - RCTTypeSafety (= 0.63.2)
-    - React-Core (= 0.61.4)
+    - React-Core (= 0.63.2)
-    - React-jsi (= 0.61.4)
+    - React-jsi (= 0.63.2)
-    - ReactCommon/turbomodule/core (= 0.61.4)
+    - ReactCommon/turbomodule/core (= 0.63.2)
-  - Folly (2018.10.22.00):
+  - Flipper (0.54.0):
+    - Flipper-Folly (~> 2.2)
+    - Flipper-RSocket (~> 1.1)
+  - Flipper-DoubleConversion (1.1.7)
+  - Flipper-Folly (2.2.0):
+    - boost-for-react-native
+    - CocoaLibEvent (~> 1.0)
+    - Flipper-DoubleConversion
+    - Flipper-Glog
+    - OpenSSL-Universal (= 1.0.2.19)
+  - Flipper-Glog (0.3.6)
+  - Flipper-PeerTalk (0.0.4)
+  - Flipper-RSocket (1.1.0):
+    - Flipper-Folly (~> 2.2)
+  - FlipperKit (0.54.0):
+    - FlipperKit/Core (= 0.54.0)
+  - FlipperKit/Core (0.54.0):
+    - Flipper (~> 0.54.0)
+    - FlipperKit/CppBridge
+    - FlipperKit/FBCxxFollyDynamicConvert
+    - FlipperKit/FBDefines
+    - FlipperKit/FKPortForwarding
+  - FlipperKit/CppBridge (0.54.0):
+    - Flipper (~> 0.54.0)
+  - FlipperKit/FBCxxFollyDynamicConvert (0.54.0):
+    - Flipper-Folly (~> 2.2)
+  - FlipperKit/FBDefines (0.54.0)
+  - FlipperKit/FKPortForwarding (0.54.0):
+    - CocoaAsyncSocket (~> 7.6)
+    - Flipper-PeerTalk (~> 0.0.4)
+  - FlipperKit/FlipperKitHighlightOverlay (0.54.0)
+  - FlipperKit/FlipperKitLayoutPlugin (0.54.0):
+    - FlipperKit/Core
+    - FlipperKit/FlipperKitHighlightOverlay
+    - FlipperKit/FlipperKitLayoutTextSearchable
+    - YogaKit (~> 1.18)
+  - FlipperKit/FlipperKitLayoutTextSearchable (0.54.0)
+  - FlipperKit/FlipperKitNetworkPlugin (0.54.0):
+    - FlipperKit/Core
+  - FlipperKit/FlipperKitReactPlugin (0.54.0):
+    - FlipperKit/Core
+  - FlipperKit/FlipperKitUserDefaultsPlugin (0.54.0):
+    - FlipperKit/Core
+  - FlipperKit/SKIOSNetworkPlugin (0.54.0):
+    - FlipperKit/Core
+    - FlipperKit/FlipperKitNetworkPlugin
+  - Folly (2020.01.13.00):
     - boost-for-react-native
     - DoubleConversion
-    - Folly/Default (= 2018.10.22.00)
+    - Folly/Default (= 2020.01.13.00)
     - glog
-  - Folly/Default (2018.10.22.00):
+  - Folly/Default (2020.01.13.00):
     - boost-for-react-native
     - DoubleConversion
     - glog
   - glog (0.3.5)
-  - RCTRequired (0.61.4)
+  - OpenSSL-Universal (1.0.2.19):
-  - RCTTypeSafety (0.61.4):
+    - OpenSSL-Universal/Static (= 1.0.2.19)
-    - FBLazyVector (= 0.61.4)
+  - OpenSSL-Universal/Static (1.0.2.19)
-    - Folly (= 2018.10.22.00)
+  - RCTRequired (0.63.2)
-    - RCTRequired (= 0.61.4)
+  - RCTTypeSafety (0.63.2):
-    - React-Core (= 0.61.4)
+    - FBLazyVector (= 0.63.2)
-  - React (0.61.4):
+    - Folly (= 2020.01.13.00)
-    - React-Core (= 0.61.4)
+    - RCTRequired (= 0.63.2)
-    - React-Core/DevSupport (= 0.61.4)
+    - React-Core (= 0.63.2)
-    - React-Core/RCTWebSocket (= 0.61.4)
+  - React (0.63.2):
-    - React-RCTActionSheet (= 0.61.4)
+    - React-Core (= 0.63.2)
-    - React-RCTAnimation (= 0.61.4)
+    - React-Core/DevSupport (= 0.63.2)
-    - React-RCTBlob (= 0.61.4)
+    - React-Core/RCTWebSocket (= 0.63.2)
-    - React-RCTImage (= 0.61.4)
+    - React-RCTActionSheet (= 0.63.2)
-    - React-RCTLinking (= 0.61.4)
+    - React-RCTAnimation (= 0.63.2)
-    - React-RCTNetwork (= 0.61.4)
+    - React-RCTBlob (= 0.63.2)
-    - React-RCTSettings (= 0.61.4)
+    - React-RCTImage (= 0.63.2)
-    - React-RCTText (= 0.61.4)
+    - React-RCTLinking (= 0.63.2)
-    - React-RCTVibration (= 0.61.4)
+    - React-RCTNetwork (= 0.63.2)
-  - React-Core (0.61.4):
+    - React-RCTSettings (= 0.63.2)
-    - Folly (= 2018.10.22.00)
+    - React-RCTText (= 0.63.2)
+    - React-RCTVibration (= 0.63.2)
+  - React-callinvoker (0.63.2)
+  - React-Core (0.63.2):
+    - Folly (= 2020.01.13.00)
     - glog
-    - React-Core/Default (= 0.61.4)
+    - React-Core/Default (= 0.63.2)
-    - React-cxxreact (= 0.61.4)
+    - React-cxxreact (= 0.63.2)
-    - React-jsi (= 0.61.4)
+    - React-jsi (= 0.63.2)
-    - React-jsiexecutor (= 0.61.4)
+    - React-jsiexecutor (= 0.63.2)
     - Yoga
-  - React-Core/CoreModulesHeaders (0.61.4):
+  - React-Core/CoreModulesHeaders (0.63.2):
-    - Folly (= 2018.10.22.00)
+    - Folly (= 2020.01.13.00)
     - glog
     - React-Core/Default
-    - React-cxxreact (= 0.61.4)
+    - React-cxxreact (= 0.63.2)
-    - React-jsi (= 0.61.4)
+    - React-jsi (= 0.63.2)
-    - React-jsiexecutor (= 0.61.4)
+    - React-jsiexecutor (= 0.63.2)
     - Yoga
-  - React-Core/Default (0.61.4):
+  - React-Core/Default (0.63.2):
-    - Folly (= 2018.10.22.00)
+    - Folly (= 2020.01.13.00)
     - glog
-    - React-cxxreact (= 0.61.4)
+    - React-cxxreact (= 0.63.2)
-    - React-jsi (= 0.61.4)
+    - React-jsi (= 0.63.2)
-    - React-jsiexecutor (= 0.61.4)
+    - React-jsiexecutor (= 0.63.2)
     - Yoga
-  - React-Core/DevSupport (0.61.4):
+  - React-Core/DevSupport (0.63.2):
-    - Folly (= 2018.10.22.00)
+    - Folly (= 2020.01.13.00)
     - glog
-    - React-Core/Default (= 0.61.4)
+    - React-Core/Default (= 0.63.2)
-    - React-Core/RCTWebSocket (= 0.61.4)
+    - React-Core/RCTWebSocket (= 0.63.2)
-    - React-cxxreact (= 0.61.4)
+    - React-cxxreact (= 0.63.2)
-    - React-jsi (= 0.61.4)
+    - React-jsi (= 0.63.2)
-    - React-jsiexecutor (= 0.61.4)
+    - React-jsiexecutor (= 0.63.2)
-    - React-jsinspector (= 0.61.4)
+    - React-jsinspector (= 0.63.2)
     - Yoga
-  - React-Core/RCTActionSheetHeaders (0.61.4):
+  - React-Core/RCTActionSheetHeaders (0.63.2):
-    - Folly (= 2018.10.22.00)
+    - Folly (= 2020.01.13.00)
     - glog
     - React-Core/Default
-    - React-cxxreact (= 0.61.4)
+    - React-cxxreact (= 0.63.2)
-    - React-jsi (= 0.61.4)
+    - React-jsi (= 0.63.2)
-    - React-jsiexecutor (= 0.61.4)
+    - React-jsiexecutor (= 0.63.2)
     - Yoga
-  - React-Core/RCTAnimationHeaders (0.61.4):
+  - React-Core/RCTAnimationHeaders (0.63.2):
-    - Folly (= 2018.10.22.00)
+    - Folly (= 2020.01.13.00)
     - glog
     - React-Core/Default
-    - React-cxxreact (= 0.61.4)
+    - React-cxxreact (= 0.63.2)
-    - React-jsi (= 0.61.4)
+    - React-jsi (= 0.63.2)
-    - React-jsiexecutor (= 0.61.4)
+    - React-jsiexecutor (= 0.63.2)
     - Yoga
-  - React-Core/RCTBlobHeaders (0.61.4):
+  - React-Core/RCTBlobHeaders (0.63.2):
-    - Folly (= 2018.10.22.00)
+    - Folly (= 2020.01.13.00)
     - glog
     - React-Core/Default
-    - React-cxxreact (= 0.61.4)
+    - React-cxxreact (= 0.63.2)
-    - React-jsi (= 0.61.4)
+    - React-jsi (= 0.63.2)
-    - React-jsiexecutor (= 0.61.4)
+    - React-jsiexecutor (= 0.63.2)
     - Yoga
-  - React-Core/RCTImageHeaders (0.61.4):
+  - React-Core/RCTImageHeaders (0.63.2):
-    - Folly (= 2018.10.22.00)
+    - Folly (= 2020.01.13.00)
     - glog
     - React-Core/Default
-    - React-cxxreact (= 0.61.4)
+    - React-cxxreact (= 0.63.2)
-    - React-jsi (= 0.61.4)
+    - React-jsi (= 0.63.2)
-    - React-jsiexecutor (= 0.61.4)
+    - React-jsiexecutor (= 0.63.2)
     - Yoga
-  - React-Core/RCTLinkingHeaders (0.61.4):
+  - React-Core/RCTLinkingHeaders (0.63.2):
-    - Folly (= 2018.10.22.00)
+    - Folly (= 2020.01.13.00)
     - glog
     - React-Core/Default
-    - React-cxxreact (= 0.61.4)
+    - React-cxxreact (= 0.63.2)
-    - React-jsi (= 0.61.4)
+    - React-jsi (= 0.63.2)
-    - React-jsiexecutor (= 0.61.4)
+    - React-jsiexecutor (= 0.63.2)
     - Yoga
-  - React-Core/RCTNetworkHeaders (0.61.4):
+  - React-Core/RCTNetworkHeaders (0.63.2):
-    - Folly (= 2018.10.22.00)
+    - Folly (= 2020.01.13.00)
     - glog
     - React-Core/Default
-    - React-cxxreact (= 0.61.4)
+    - React-cxxreact (= 0.63.2)
-    - React-jsi (= 0.61.4)
+    - React-jsi (= 0.63.2)
-    - React-jsiexecutor (= 0.61.4)
+    - React-jsiexecutor (= 0.63.2)
     - Yoga
-  - React-Core/RCTSettingsHeaders (0.61.4):
+  - React-Core/RCTSettingsHeaders (0.63.2):
-    - Folly (= 2018.10.22.00)
+    - Folly (= 2020.01.13.00)
     - glog
     - React-Core/Default
-    - React-cxxreact (= 0.61.4)
+    - React-cxxreact (= 0.63.2)
-    - React-jsi (= 0.61.4)
+    - React-jsi (= 0.63.2)
-    - React-jsiexecutor (= 0.61.4)
+    - React-jsiexecutor (= 0.63.2)
     - Yoga
-  - React-Core/RCTTextHeaders (0.61.4):
+  - React-Core/RCTTextHeaders (0.63.2):
-    - Folly (= 2018.10.22.00)
+    - Folly (= 2020.01.13.00)
     - glog
     - React-Core/Default
-    - React-cxxreact (= 0.61.4)
+    - React-cxxreact (= 0.63.2)
-    - React-jsi (= 0.61.4)
+    - React-jsi (= 0.63.2)
-    - React-jsiexecutor (= 0.61.4)
+    - React-jsiexecutor (= 0.63.2)
     - Yoga
-  - React-Core/RCTVibrationHeaders (0.61.4):
+  - React-Core/RCTVibrationHeaders (0.63.2):
-    - Folly (= 2018.10.22.00)
+    - Folly (= 2020.01.13.00)
     - glog
     - React-Core/Default
-    - React-cxxreact (= 0.61.4)
+    - React-cxxreact (= 0.63.2)
-    - React-jsi (= 0.61.4)
+    - React-jsi (= 0.63.2)
-    - React-jsiexecutor (= 0.61.4)
+    - React-jsiexecutor (= 0.63.2)
     - Yoga
-  - React-Core/RCTWebSocket (0.61.4):
+  - React-Core/RCTWebSocket (0.63.2):
-    - Folly (= 2018.10.22.00)
+    - Folly (= 2020.01.13.00)
     - glog
-    - React-Core/Default (= 0.61.4)
+    - React-Core/Default (= 0.63.2)
-    - React-cxxreact (= 0.61.4)
+    - React-cxxreact (= 0.63.2)
-    - React-jsi (= 0.61.4)
+    - React-jsi (= 0.63.2)
-    - React-jsiexecutor (= 0.61.4)
+    - React-jsiexecutor (= 0.63.2)
     - Yoga
-  - React-CoreModules (0.61.4):
+  - React-CoreModules (0.63.2):
-    - FBReactNativeSpec (= 0.61.4)
+    - FBReactNativeSpec (= 0.63.2)
-    - Folly (= 2018.10.22.00)
+    - Folly (= 2020.01.13.00)
-    - RCTTypeSafety (= 0.61.4)
+    - RCTTypeSafety (= 0.63.2)
-    - React-Core/CoreModulesHeaders (= 0.61.4)
+    - React-Core/CoreModulesHeaders (= 0.63.2)
-    - React-RCTImage (= 0.61.4)
+    - React-jsi (= 0.63.2)
-    - ReactCommon/turbomodule/core (= 0.61.4)
+    - React-RCTImage (= 0.63.2)
-  - React-cxxreact (0.61.4):
+    - ReactCommon/turbomodule/core (= 0.63.2)
+  - React-cxxreact (0.63.2):
     - boost-for-react-native (= 1.63.0)
     - DoubleConversion
-    - Folly (= 2018.10.22.00)
+    - Folly (= 2020.01.13.00)
     - glog
-    - React-jsinspector (= 0.61.4)
+    - React-callinvoker (= 0.63.2)
-  - React-jsi (0.61.4):
+    - React-jsinspector (= 0.63.2)
+  - React-jsi (0.63.2):
     - boost-for-react-native (= 1.63.0)
     - DoubleConversion
-    - Folly (= 2018.10.22.00)
+    - Folly (= 2020.01.13.00)
     - glog
-    - React-jsi/Default (= 0.61.4)
+    - React-jsi/Default (= 0.63.2)
-  - React-jsi/Default (0.61.4):
+  - React-jsi/Default (0.63.2):
     - boost-for-react-native (= 1.63.0)
     - DoubleConversion
-    - Folly (= 2018.10.22.00)
+    - Folly (= 2020.01.13.00)
     - glog
-  - React-jsiexecutor (0.61.4):
+  - React-jsiexecutor (0.63.2):
     - DoubleConversion
-    - Folly (= 2018.10.22.00)
+    - Folly (= 2020.01.13.00)
     - glog
-    - React-cxxreact (= 0.61.4)
+    - React-cxxreact (= 0.63.2)
-    - React-jsi (= 0.61.4)
+    - React-jsi (= 0.63.2)
-  - React-jsinspector (0.61.4)
+  - React-jsinspector (0.63.2)
-  - react-native-update (5.3.2):
+  - react-native-update (5.7.2):
     - React
-    - react-native-update/BSDiff (= 5.3.2)
+    - react-native-update/BSDiff (= 5.7.2)
-    - react-native-update/RCTPushy (= 5.3.2)
+    - react-native-update/RCTPushy (= 5.7.2)
     - SSZipArchive
-  - react-native-update/BSDiff (5.3.2):
+  - react-native-update/BSDiff (5.7.2):
     - React
     - SSZipArchive
-  - react-native-update/RCTPushy (5.3.2):
+  - react-native-update/RCTPushy (5.7.2):
     - React
     - SSZipArchive
-  - React-RCTActionSheet (0.61.4):
+  - React-RCTActionSheet (0.63.2):
-    - React-Core/RCTActionSheetHeaders (= 0.61.4)
+    - React-Core/RCTActionSheetHeaders (= 0.63.2)
-  - React-RCTAnimation (0.61.4):
+  - React-RCTAnimation (0.63.2):
-    - React-Core/RCTAnimationHeaders (= 0.61.4)
+    - FBReactNativeSpec (= 0.63.2)
-  - React-RCTBlob (0.61.4):
+    - Folly (= 2020.01.13.00)
-    - React-Core/RCTBlobHeaders (= 0.61.4)
+    - RCTTypeSafety (= 0.63.2)
-    - React-Core/RCTWebSocket (= 0.61.4)
+    - React-Core/RCTAnimationHeaders (= 0.63.2)
-    - React-jsi (= 0.61.4)
+    - React-jsi (= 0.63.2)
-    - React-RCTNetwork (= 0.61.4)
+    - ReactCommon/turbomodule/core (= 0.63.2)
-  - React-RCTImage (0.61.4):
+  - React-RCTBlob (0.63.2):
-    - React-Core/RCTImageHeaders (= 0.61.4)
+    - FBReactNativeSpec (= 0.63.2)
-    - React-RCTNetwork (= 0.61.4)
+    - Folly (= 2020.01.13.00)
-  - React-RCTLinking (0.61.4):
+    - React-Core/RCTBlobHeaders (= 0.63.2)
-    - React-Core/RCTLinkingHeaders (= 0.61.4)
+    - React-Core/RCTWebSocket (= 0.63.2)
-  - React-RCTNetwork (0.61.4):
+    - React-jsi (= 0.63.2)
-    - React-Core/RCTNetworkHeaders (= 0.61.4)
+    - React-RCTNetwork (= 0.63.2)
-  - React-RCTSettings (0.61.4):
+    - ReactCommon/turbomodule/core (= 0.63.2)
-    - React-Core/RCTSettingsHeaders (= 0.61.4)
+  - React-RCTImage (0.63.2):
-  - React-RCTText (0.61.4):
+    - FBReactNativeSpec (= 0.63.2)
-    - React-Core/RCTTextHeaders (= 0.61.4)
+    - Folly (= 2020.01.13.00)
-  - React-RCTVibration (0.61.4):
+    - RCTTypeSafety (= 0.63.2)
-    - React-Core/RCTVibrationHeaders (= 0.61.4)
+    - React-Core/RCTImageHeaders (= 0.63.2)
-  - ReactCommon/jscallinvoker (0.61.4):
+    - React-jsi (= 0.63.2)
+    - React-RCTNetwork (= 0.63.2)
+    - ReactCommon/turbomodule/core (= 0.63.2)
+  - React-RCTLinking (0.63.2):
+    - FBReactNativeSpec (= 0.63.2)
+    - React-Core/RCTLinkingHeaders (= 0.63.2)
+    - React-jsi (= 0.63.2)
+    - ReactCommon/turbomodule/core (= 0.63.2)
+  - React-RCTNetwork (0.63.2):
+    - FBReactNativeSpec (= 0.63.2)
+    - Folly (= 2020.01.13.00)
+    - RCTTypeSafety (= 0.63.2)
+    - React-Core/RCTNetworkHeaders (= 0.63.2)
+    - React-jsi (= 0.63.2)
+    - ReactCommon/turbomodule/core (= 0.63.2)
+  - React-RCTSettings (0.63.2):
+    - FBReactNativeSpec (= 0.63.2)
+    - Folly (= 2020.01.13.00)
+    - RCTTypeSafety (= 0.63.2)
+    - React-Core/RCTSettingsHeaders (= 0.63.2)
+    - React-jsi (= 0.63.2)
+    - ReactCommon/turbomodule/core (= 0.63.2)
+  - React-RCTText (0.63.2):
+    - React-Core/RCTTextHeaders (= 0.63.2)
+  - React-RCTVibration (0.63.2):
+    - FBReactNativeSpec (= 0.63.2)
+    - Folly (= 2020.01.13.00)
+    - React-Core/RCTVibrationHeaders (= 0.63.2)
+    - React-jsi (= 0.63.2)
+    - ReactCommon/turbomodule/core (= 0.63.2)
+  - ReactCommon/turbomodule/core (0.63.2):
     - DoubleConversion
-    - Folly (= 2018.10.22.00)
+    - Folly (= 2020.01.13.00)
     - glog
-    - React-cxxreact (= 0.61.4)
+    - React-callinvoker (= 0.63.2)
-  - ReactCommon/turbomodule/core (0.61.4):
+    - React-Core (= 0.63.2)
-    - DoubleConversion
+    - React-cxxreact (= 0.63.2)
-    - Folly (= 2018.10.22.00)
+    - React-jsi (= 0.63.2)
-    - glog
+  - SSZipArchive (2.2.3)
-    - React-Core (= 0.61.4)
-    - React-cxxreact (= 0.61.4)
-    - React-jsi (= 0.61.4)
-    - ReactCommon/jscallinvoker (= 0.61.4)
-  - SSZipArchive (2.2.2)
   - Yoga (1.14.0)
+  - YogaKit (1.18.1):
+    - Yoga (~> 1.14)
 
 DEPENDENCIES:
   - DoubleConversion (from `../node_modules/react-native/third-party-podspecs/DoubleConversion.podspec`)
   - FBLazyVector (from `../node_modules/react-native/Libraries/FBLazyVector`)
   - FBReactNativeSpec (from `../node_modules/react-native/Libraries/FBReactNativeSpec`)
+  - Flipper (= 0.54.0)
+  - Flipper-DoubleConversion (= 1.1.7)
+  - Flipper-Folly (~> 2.2)
+  - Flipper-Glog (= 0.3.6)
+  - Flipper-PeerTalk (~> 0.0.4)
+  - Flipper-RSocket (~> 1.1)
+  - FlipperKit (= 0.54.0)
+  - FlipperKit/Core (= 0.54.0)
+  - FlipperKit/CppBridge (= 0.54.0)
+  - FlipperKit/FBCxxFollyDynamicConvert (= 0.54.0)
+  - FlipperKit/FBDefines (= 0.54.0)
+  - FlipperKit/FKPortForwarding (= 0.54.0)
+  - FlipperKit/FlipperKitHighlightOverlay (= 0.54.0)
+  - FlipperKit/FlipperKitLayoutPlugin (= 0.54.0)
+  - FlipperKit/FlipperKitLayoutTextSearchable (= 0.54.0)
+  - FlipperKit/FlipperKitNetworkPlugin (= 0.54.0)
+  - FlipperKit/FlipperKitReactPlugin (= 0.54.0)
+  - FlipperKit/FlipperKitUserDefaultsPlugin (= 0.54.0)
+  - FlipperKit/SKIOSNetworkPlugin (= 0.54.0)
   - Folly (from `../node_modules/react-native/third-party-podspecs/Folly.podspec`)
   - glog (from `../node_modules/react-native/third-party-podspecs/glog.podspec`)
   - RCTRequired (from `../node_modules/react-native/Libraries/RCTRequired`)
   - RCTTypeSafety (from `../node_modules/react-native/Libraries/TypeSafety`)
   - React (from `../node_modules/react-native/`)
+  - React-callinvoker (from `../node_modules/react-native/ReactCommon/callinvoker`)
   - React-Core (from `../node_modules/react-native/`)
   - React-Core/DevSupport (from `../node_modules/react-native/`)
   - React-Core/RCTWebSocket (from `../node_modules/react-native/`)
@@ -258,14 +359,24 @@ DEPENDENCIES:
   - React-RCTSettings (from `../node_modules/react-native/Libraries/Settings`)
   - React-RCTText (from `../node_modules/react-native/Libraries/Text`)
   - React-RCTVibration (from `../node_modules/react-native/Libraries/Vibration`)
-  - ReactCommon/jscallinvoker (from `../node_modules/react-native/ReactCommon`)
   - ReactCommon/turbomodule/core (from `../node_modules/react-native/ReactCommon`)
   - Yoga (from `../node_modules/react-native/ReactCommon/yoga`)
 
 SPEC REPOS:
   trunk:
     - boost-for-react-native
+    - CocoaAsyncSocket
+    - CocoaLibEvent
+    - Flipper
+    - Flipper-DoubleConversion
+    - Flipper-Folly
+    - Flipper-Glog
+    - Flipper-PeerTalk
+    - Flipper-RSocket
+    - FlipperKit
+    - OpenSSL-Universal
     - SSZipArchive
+    - YogaKit
 
 EXTERNAL SOURCES:
   DoubleConversion:
@@ -284,6 +395,8 @@ EXTERNAL SOURCES:
     :path: "../node_modules/react-native/Libraries/TypeSafety"
   React:
     :path: "../node_modules/react-native/"
+  React-callinvoker:
+    :path: "../node_modules/react-native/ReactCommon/callinvoker"
   React-Core:
     :path: "../node_modules/react-native/"
   React-CoreModules:
@@ -323,34 +436,46 @@ EXTERNAL SOURCES:
 
 SPEC CHECKSUMS:
   boost-for-react-native: 39c7adb57c4e60d6c5479dd8623128eb5b3f0f2c
-  DoubleConversion: 5805e889d232975c086db112ece9ed034df7a0b2
+  CocoaAsyncSocket: 694058e7c0ed05a9e217d1b3c7ded962f4180845
-  FBLazyVector: feb35a6b7f7b50f367be07f34012f34a79282fa3
+  CocoaLibEvent: 2fab71b8bd46dd33ddb959f7928ec5909f838e3f
-  FBReactNativeSpec: 51477b84b1bf7ab6f9ef307c24e3dd675391be44
+  DoubleConversion: cde416483dac037923206447da6e1454df403714
-  Folly: 30e7936e1c45c08d884aa59369ed951a8e68cf51
+  FBLazyVector: 3ef4a7f62e7db01092f9d517d2ebc0d0677c4a37
-  glog: 1f3da668190260b06b429bb211bfbee5cd790c28
+  FBReactNativeSpec: dc7fa9088f0f2a998503a352b0554d69a4391c5a
-  RCTRequired: f3b3fb6f4723e8e52facb229d0c75fdc76773849
+  Flipper: be611d4b742d8c87fbae2ca5f44603a02539e365
-  RCTTypeSafety: 2ec60de6abb1db050b56ecc4b60188026078fd10
+  Flipper-DoubleConversion: 38631e41ef4f9b12861c67d17cb5518d06badc41
-  React: 10e0130b57e55a7cd8c3dee37c1261102ce295f4
+  Flipper-Folly: c12092ea368353b58e992843a990a3225d4533c3
-  React-Core: 636212410772d05f3a1eb79d965df2962ca1c70b
+  Flipper-Glog: 1dfd6abf1e922806c52ceb8701a3599a79a200a6
-  React-CoreModules: 6f70d5e41919289c582f88c9ad9923fe5c87400a
+  Flipper-PeerTalk: 116d8f857dc6ef55c7a5a75ea3ceaafe878aadc9
-  React-cxxreact: ddecbe9157ec1743f52ea17bf8d95debc0d6e846
+  Flipper-RSocket: 64e7431a55835eb953b0bf984ef3b90ae9fdddd7
-  React-jsi: ca921f4041505f9d5197139b2d09eeb020bb12e8
+  FlipperKit: ab353d41aea8aae2ea6daaf813e67496642f3d7d
-  React-jsiexecutor: 8dfb73b987afa9324e4009bdce62a18ce23d983c
+  Folly: b73c3869541e86821df3c387eb0af5f65addfab4
-  React-jsinspector: d15478d0a8ada19864aa4d1cc1c697b41b3fa92f
+  glog: 40a13f7840415b9a77023fbcae0f1e6f43192af3
-  react-native-update: 7d4980517ec8d84ffa7909bad33d7a917a8d7f2f
+  OpenSSL-Universal: 8b48cc0d10c1b2923617dfe5c178aa9ed2689355
-  React-RCTActionSheet: 7369b7c85f99b6299491333affd9f01f5a130c22
+  RCTRequired: f13f25e7b12f925f1f6a6a8c69d929a03c0129fe
-  React-RCTAnimation: d07be15b2bd1d06d89417eb0343f98ffd2b099a7
+  RCTTypeSafety: 44982c5c8e43ff4141eb519a8ddc88059acd1f3a
-  React-RCTBlob: 8e0b23d95c9baa98f6b0e127e07666aaafd96c34
+  React: e1c65dd41cb9db13b99f24608e47dd595f28ca9a
-  React-RCTImage: 443050d14a66e8c2332e9c055f45689d23e15cc7
+  React-callinvoker: 552a6a6bc8b3bb794cf108ad59e5a9e2e3b4fc98
-  React-RCTLinking: ce9a90ba155aec41be49e75ec721bbae2d48a47e
+  React-Core: 9d341e725dc9cd2f49e4c49ad1fc4e8776aa2639
-  React-RCTNetwork: 41fe54bacc67dd00e6e4c4d30dd98a13e4beabc8
+  React-CoreModules: 5335e168165da7f7083ce7147768d36d3e292318
-  React-RCTSettings: 45e3e0a6470310b2dab2ccc6d1d73121ba3ea936
+  React-cxxreact: d3261ec5f7d11743fbf21e263a34ea51d1f13ebc
-  React-RCTText: 21934e0a51d522abcd0a275407e80af45d6fd9ec
+  React-jsi: 54245e1d5f4b690dec614a73a3795964eeef13a8
-  React-RCTVibration: 0f76400ee3cec6edb9c125da49fed279340d145a
+  React-jsiexecutor: 8ca588cc921e70590820ce72b8789b02c67cce38
-  ReactCommon: a6a294e7028ed67b926d29551aa9394fd989c24c
+  React-jsinspector: b14e62ebe7a66e9231e9581279909f2fc3db6606
-  SSZipArchive: fa16b8cc4cdeceb698e5e5d9f67e9558532fbf23
+  react-native-update: 7602220eccf4ccac05bc90035a541300f2c0189a
-  Yoga: ba3d99dbee6c15ea6bbe3783d1f0cb1ffb79af0f
+  React-RCTActionSheet: 910163b6b09685a35c4ebbc52b66d1bfbbe39fc5
+  React-RCTAnimation: 9a883bbe1e9d2e158d4fb53765ed64c8dc2200c6
+  React-RCTBlob: 39cf0ece1927996c4466510e25d2105f67010e13
+  React-RCTImage: de355d738727b09ad3692f2a979affbd54b5f378
+  React-RCTLinking: 8122f221d395a63364b2c0078ce284214bd04575
+  React-RCTNetwork: 8f96c7b49ea6a0f28f98258f347b6ad218bc0830
+  React-RCTSettings: 8a49622aff9c1925f5455fa340b6fe4853d64ab6
+  React-RCTText: 1b6773e776e4b33f90468c20fe3b16ca3e224bb8
+  React-RCTVibration: 4d2e726957f4087449739b595f107c0d4b6c2d2d
+  ReactCommon: a0a1edbebcac5e91338371b72ffc66aa822792ce
+  SSZipArchive: 62d4947b08730e4cda640473b0066d209ff033c9
+  Yoga: 7740b94929bbacbddda59bf115b5317e9a161598
+  YogaKit: f782866e155069a2cca2517aafea43200b01fd5a
 
-PODFILE CHECKSUM: 244ba888c650d3945bf72a8d01516fb0f1b3b097
+PODFILE CHECKSUM: 449e295f5242b426c8459fd24a8812cc985916d0
 
-COCOAPODS: 1.8.4
+COCOAPODS: 1.9.3

Example/testHotUpdate/ios/dummy.swift

@@ -0,0 +1,9 @@
+//
+//  dummy.swift
+//  testHotUpdate
+//
+//  Created by Qingming, Sunny Luo on 9/1/20.
+//  Copyright © 2020 Facebook. All rights reserved.
+//
+
+import Foundation

Example/testHotUpdate/ios/testHotUpdate-Bridging-Header.h

@@ -0,0 +1,4 @@
+//
+//  Use this file to import your target's public headers that you would like to expose to Swift.
+//
+

Example/testHotUpdate/ios/testHotUpdate.xcodeproj/project.pbxproj

@@ -12,6 +12,7 @@
 		13B07FBF1A68108700A75B9A /* Images.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 13B07FB51A68108700A75B9A /* Images.xcassets */; };
 		13B07FC11A68108700A75B9A /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 13B07FB71A68108700A75B9A /* main.m */; };
 		7610A16EF1CB8A7644EAFA55 /* libPods-testHotUpdate.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 28C264AEBE1E206870F9D871 /* libPods-testHotUpdate.a */; };
+		F1CBCFD724FE1CF80019170D /* dummy.swift in Sources */ = {isa = PBXBuildFile; fileRef = F1CBCFD624FE1CF80019170D /* dummy.swift */; };
 /* End PBXBuildFile section */
 
 /* Begin PBXFileReference section */
@@ -37,6 +38,8 @@
 		ED1DB2CEADC1A82A43867C0E /* Pods-testHotUpdateTests.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-testHotUpdateTests.release.xcconfig"; path = "Target Support Files/Pods-testHotUpdateTests/Pods-testHotUpdateTests.release.xcconfig"; sourceTree = "<group>"; };
 		ED297162215061F000B7C4FE /* JavaScriptCore.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = JavaScriptCore.framework; path = System/Library/Frameworks/JavaScriptCore.framework; sourceTree = SDKROOT; };
 		ED2971642150620600B7C4FE /* JavaScriptCore.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = JavaScriptCore.framework; path = Platforms/AppleTVOS.platform/Developer/SDKs/AppleTVOS12.0.sdk/System/Library/Frameworks/JavaScriptCore.framework; sourceTree = DEVELOPER_DIR; };
+		F1CBCFD524FE1CF80019170D /* testHotUpdate-Bridging-Header.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "testHotUpdate-Bridging-Header.h"; sourceTree = "<group>"; };
+		F1CBCFD624FE1CF80019170D /* dummy.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = dummy.swift; sourceTree = "<group>"; };
 /* End PBXFileReference section */
 
 /* Begin PBXFrameworksBuildPhase section */
@@ -76,6 +79,8 @@
 				13B07FB61A68108700A75B9A /* Info.plist */,
 				13B07FB11A68108700A75B9A /* LaunchScreen.xib */,
 				13B07FB71A68108700A75B9A /* main.m */,
+				F1CBCFD624FE1CF80019170D /* dummy.swift */,
+				F1CBCFD524FE1CF80019170D /* testHotUpdate-Bridging-Header.h */,
 			);
 			name = testHotUpdate;
 			sourceTree = "<group>";
@@ -154,6 +159,12 @@
 			attributes = {
 				LastUpgradeCheck = 0940;
 				ORGANIZATIONNAME = Facebook;
+				TargetAttributes = {
+					13B07F861A680F5B00A75B9A = {
+						DevelopmentTeam = JD75Q9JJL2;
+						LastSwiftMigration = 1160;
+					};
+				};
 			};
 			buildConfigurationList = 83CBB9FA1A601CBA00E9B192 /* Build configuration list for PBXProject "testHotUpdate" */;
 			compatibilityVersion = "Xcode 3.2";
@@ -199,7 +210,7 @@
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
-			shellScript = "export NODE_BINARY=node\n../node_modules/react-native/scripts/react-native-xcode.sh";
+			shellScript = "export NODE_BINARY=node\n../node_modules/react-native/scripts/react-native-xcode.sh\n";
 		};
 		1CD78CE8A2E7B88FAE48FCEE /* [CP] Copy Pods Resources */ = {
 			isa = PBXShellScriptBuildPhase;
@@ -208,10 +219,12 @@
 			);
 			inputPaths = (
 				"${PODS_ROOT}/Target Support Files/Pods-testHotUpdate/Pods-testHotUpdate-resources.sh",
+				"${PODS_CONFIGURATION_BUILD_DIR}/React-Core/AccessibilityResources.bundle",
 				"${PODS_ROOT}/../../../../ios/pushy_build_time.txt",
 			);
 			name = "[CP] Copy Pods Resources";
 			outputPaths = (
+				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/AccessibilityResources.bundle",
 				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/pushy_build_time.txt",
 			);
 			runOnlyForDeploymentPostprocessing = 0;
@@ -268,6 +281,7 @@
 			buildActionMask = 2147483647;
 			files = (
 				13B07FBC1A68108700A75B9A /* AppDelegate.m in Sources */,
+				F1CBCFD724FE1CF80019170D /* dummy.swift in Sources */,
 				13B07FC11A68108700A75B9A /* main.m in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
@@ -292,8 +306,10 @@
 			baseConfigurationReference = 84EBA9C1A760F4136B306391 /* Pods-testHotUpdate.debug.xcconfig */;
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
+				CLANG_ENABLE_MODULES = YES;
 				CURRENT_PROJECT_VERSION = 1;
 				DEAD_CODE_STRIPPING = NO;
+				DEVELOPMENT_TEAM = JD75Q9JJL2;
 				INFOPLIST_FILE = testHotUpdate/Info.plist;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
 				OTHER_LDFLAGS = (
@@ -303,6 +319,9 @@
 				);
 				PRODUCT_BUNDLE_IDENTIFIER = "org.reactjs.native.example.$(PRODUCT_NAME:rfc1034identifier)";
 				PRODUCT_NAME = testHotUpdate;
+				SWIFT_OBJC_BRIDGING_HEADER = "testHotUpdate-Bridging-Header.h";
+				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
+				SWIFT_VERSION = 5.0;
 				VERSIONING_SYSTEM = "apple-generic";
 			};
 			name = Debug;
@@ -312,7 +331,9 @@
 			baseConfigurationReference = 1A3E77317B15A5C3816ACE3A /* Pods-testHotUpdate.release.xcconfig */;
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
+				CLANG_ENABLE_MODULES = YES;
 				CURRENT_PROJECT_VERSION = 1;
+				DEVELOPMENT_TEAM = JD75Q9JJL2;
 				INFOPLIST_FILE = testHotUpdate/Info.plist;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
 				OTHER_LDFLAGS = (
@@ -322,6 +343,8 @@
 				);
 				PRODUCT_BUNDLE_IDENTIFIER = "org.reactjs.native.example.$(PRODUCT_NAME:rfc1034identifier)";
 				PRODUCT_NAME = testHotUpdate;
+				SWIFT_OBJC_BRIDGING_HEADER = "testHotUpdate-Bridging-Header.h";
+				SWIFT_VERSION = 5.0;
 				VERSIONING_SYSTEM = "apple-generic";
 			};
 			name = Release;

Example/testHotUpdate/ios/testHotUpdate.xcodeproj/xcshareddata/xcschemes/testHotUpdate.xcscheme

@@ -55,6 +55,15 @@
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
       shouldUseLaunchSchemeArgsEnv = "YES">
+      <MacroExpansion>
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "13B07F861A680F5B00A75B9A"
+            BuildableName = "testHotUpdate.app"
+            BlueprintName = "testHotUpdate"
+            ReferencedContainer = "container:testHotUpdate.xcodeproj">
+         </BuildableReference>
+      </MacroExpansion>
       <Testables>
          <TestableReference
             skipped = "NO">
@@ -67,17 +76,6 @@
             </BuildableReference>
          </TestableReference>
       </Testables>
-      <MacroExpansion>
-         <BuildableReference
-            BuildableIdentifier = "primary"
-            BlueprintIdentifier = "13B07F861A680F5B00A75B9A"
-            BuildableName = "testHotUpdate.app"
-            BlueprintName = "testHotUpdate"
-            ReferencedContainer = "container:testHotUpdate.xcodeproj">
-         </BuildableReference>
-      </MacroExpansion>
-      <AdditionalOptions>
-      </AdditionalOptions>
    </TestAction>
    <LaunchAction
       buildConfiguration = "Debug"
@@ -99,8 +97,6 @@
             ReferencedContainer = "container:testHotUpdate.xcodeproj">
          </BuildableReference>
       </BuildableProductRunnable>
-      <AdditionalOptions>
-      </AdditionalOptions>
    </LaunchAction>
    <ProfileAction
       buildConfiguration = "Release"

Example/testHotUpdate/ios/testHotUpdate/AppDelegate.m

@@ -12,10 +12,32 @@
 #import <React/RCTRootView.h>
 #import "RCTPushy.h"
 
+#ifdef FB_SONARKIT_ENABLED
+#import <FlipperKit/FlipperClient.h>
+#import <FlipperKitLayoutPlugin/FlipperKitLayoutPlugin.h>
+#import <FlipperKitUserDefaultsPlugin/FKUserDefaultsPlugin.h>
+#import <FlipperKitNetworkPlugin/FlipperKitNetworkPlugin.h>
+#import <SKIOSNetworkPlugin/SKIOSNetworkAdapter.h>
+#import <FlipperKitReactPlugin/FlipperKitReactPlugin.h>
+static void InitializeFlipper(UIApplication *application) {
+  FlipperClient *client = [FlipperClient sharedClient];
+  SKDescriptorMapper *layoutDescriptorMapper = [[SKDescriptorMapper alloc] initWithDefaults];
+  [client addPlugin:[[FlipperKitLayoutPlugin alloc] initWithRootNode:application withDescriptorMapper:layoutDescriptorMapper]];
+  [client addPlugin:[[FKUserDefaultsPlugin alloc] initWithSuiteName:nil]];
+  [client addPlugin:[FlipperKitReactPlugin new]];
+  [client addPlugin:[[FlipperKitNetworkPlugin alloc] initWithNetworkAdapter:[SKIOSNetworkAdapter new]]];
+  [client start];
+}
+#endif
+
 @implementation AppDelegate
 
 - (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(NSDictionary *)launchOptions
 {
+  #ifdef FB_SONARKIT_ENABLED
+    InitializeFlipper(application);
+  #endif
+  
   RCTBridge *bridge = [[RCTBridge alloc] initWithDelegate:self launchOptions:launchOptions];
   RCTRootView *rootView = [[RCTRootView alloc] initWithBridge:bridge
                                                    moduleName:@"testHotUpdate"

Example/testHotUpdate/package.json

@@ -10,19 +10,19 @@
     "lint": "eslint ."
   },
   "dependencies": {
-    "react": "16.9.0",
+    "react": "16.13.1",
-    "react-native": "0.61.4",
+    "react-native": "0.63.2",
     "react-native-update": "link:../.."
   },
   "devDependencies": {
-    "@babel/core": "^7.6.2",
+    "@babel/core": "^7.8.4",
-    "@babel/runtime": "^7.6.2",
+    "@babel/runtime": "^7.8.4",
-    "@react-native-community/eslint-config": "^0.0.5",
+    "@react-native-community/eslint-config": "^1.1.0",
-    "babel-jest": "^24.9.0",
+    "babel-jest": "^25.1.0",
     "eslint": "^6.5.1",
-    "jest": "^24.9.0",
+    "jest": "^25.1.0",
-    "metro-react-native-babel-preset": "^0.56.0",
+    "metro-react-native-babel-preset": "^0.59.0",
-    "react-test-renderer": "16.9.0"
+    "react-test-renderer": "16.13.1"
   },
   "jest": {
     "preset": "react-native"

Example/testHotUpdate/src/index.js

@@ -8,6 +8,7 @@ import {
   TouchableOpacity,
   Linking,
   Image,
+  NativeModules,
 } from 'react-native';
 
 import {
@@ -26,6 +27,10 @@ import _updateConfig from '../update.json';
 const {appKey} = _updateConfig[Platform.OS];
 
 export default class App extends Component {
+  state = {
+    received: 0,
+    total: 0,
+  };
   componentDidMount() {
     if (isRolledBack) {
       Alert.alert('提示', '刚刚更新失败了,版本被回滚.');
@@ -50,23 +55,34 @@ export default class App extends Component {
       );
     }
   }
-  doUpdate = async info => {
+  doUpdate = async (info) => {
-    const hash = await downloadUpdate(info);
+    try {
-    Alert.alert('提示', '下载完毕,是否重启应用?', [
+      const hash = await downloadUpdate(info, {
-      {
+        onDownloadProgress: ({received, total}) => {
-        text: '是',
+          setState({
-        onPress: () => {
+            received,
-          switchVersion(hash);
+            total,
+          });
         },
-      },
+      });
-      {text: '否'},
+      Alert.alert('提示', '下载完毕,是否重启应用?', [
-      {
+        {
-        text: '下次启动时',
+          text: '是',
-        onPress: () => {
+          onPress: () => {
-          switchVersionLater(hash);
+            switchVersion(hash);
+          },
         },
-      },
+        {text: '否'},
-    ]);
+        {
+          text: '下次启动时',
+          onPress: () => {
+            switchVersionLater(hash);
+          },
+        },
+      ]);
+    } catch (err) {
+      Alert.alert('更新失败', err.message);
+    }
   };
 
   checkUpdate = async () => {
@@ -74,7 +90,7 @@ export default class App extends Component {
     try {
       info = await checkUpdate(appKey);
     } catch (err) {
-      console.warn(err);
+      Alert.alert('更新检查失败', err.message);
       return;
     }
     if (info.expired) {
@@ -111,16 +127,19 @@ export default class App extends Component {
         <Text style={styles.welcome}>欢迎使用热更新服务</Text>
         <Image
           resizeMode={'contain'}
-          source={require('./assets/shoucang.png')}
+          source={require('./assets/shezhi.png')}
           style={styles.image}
         />
         <Text style={styles.instructions}>
           这是版本一 {'\n'}
-          当前包版本号: {packageVersion}
+          当前原生包版本号: {packageVersion}
           {'\n'}
-          当前版本Hash: {currentVersion || '(空)'}
+          当前热更新版本Hash: {currentVersion || '(空)'}
           {'\n'}
         </Text>
+        <Text>
+          下载进度：{received} / {total}
+        </Text>
         <TouchableOpacity onPress={this.checkUpdate}>
           <Text style={styles.instructions}>点击这里检查更新</Text>
         </TouchableOpacity>

README.md

@@ -1,31 +1,10 @@
 # react-native-update [![npm version](https://badge.fury.io/js/react-native-update.svg)](http://badge.fury.io/js/react-native-update)
 
-本组件是面向 React Native 提供热更新功能的组件，建议结合[Update 服务](https://update.reactnative.cn/)使用。
+本组件是面向 React Native 提供热更新功能的组件，详情请访问我们的官方网站 <https://pushy.reactnative.cn>。
 
-注意，在 iOS 上使用热更新有被拒的可能。被拒之后可以按以下步骤单独屏蔽 iOS 端(`react-native-update`版本需 >= 5.3.2)：
+### 快速开始
 
-1. 如果 RN 版本>=0.60，在项目根目录下编辑或创建 react-native.config.js，添加如下内容
+请查看[文档](https://pushy.reactnative.cn/docs/getting-started.html)
-
-```js
-// react-native.config.js
-module.exports = {
-  dependencies: {
-    'react-native-update': {
-      platforms: {
-        ios: null, // 阻止ios模块自动链接
-      },
-    },
-  },
-};
-```
-
-2. 如果在原生代码端尚未配置，则跳过下面文档中的 ios 端的配置。如果已经配置，则按文档的步骤反向操作（添加的 ios 代码删去）。
-3. 如果是 0.60 以上版本或使用了 cocoapods，在 ios 目录中再次运行 pod install，确保 Podfile 和 Podfile.lock 中都没有'react-native-update'。如果 RN 版本<0.60，则运行`react-native unlink react-native-update`。
-4. 在 js 代码里调用 checkUpdate()方法前，判断 Platform.OS，如果是 ios 平台则直接 return 跳过。
-
-### 最近更新
-
-请查阅[最近更新文档](CHANGELOG.md)。
 
 ### 优势
 
@@ -35,26 +14,6 @@ module.exports = {
 4. meta 信息及开放 API，提供更高扩展性。
 5. 跨越多个版本进行更新时，只需要下载**一个更新包**，不需要逐版本依次更新。
 
-### 安装与快速入门
-
-请查阅
-
-- [文档-快速入门-准备工作](docs/guide.md)。
-
-- [文档-快速入门-添加热更新功能](docs/guide2.md)。
-
-- [文档-快速入门-发布版本](docs/guide3.md)。
-
-- [文档-常见问题与高级指南](docs/faq_advance.md)。
-
-### 命令行工具
-
-请查阅[文档-命令行工具](docs/cli.md)。
-
-### API 接口
-
-请查阅[文档-API 接口](docs/api.md)。
-
 ### 本地开发
 
 ```
@@ -70,4 +29,4 @@ $ yarn start
 
 本组件由[React Native 中文网](https://reactnative.cn/)独家发布，如有定制需求可以[联系我们](https://reactnative.cn/about.html#content)。
 
-关于此插件发现任何问题，可以前往[Issues](https://github.com/reactnativecn/react-native-pushy/issues)或者[中文社区](http://bbs.reactnative.cn/category/7)发帖提问。
+关于此插件发现任何问题，可以前往[Issues](https://github.com/reactnativecn/react-native-pushy/issues)发帖提问。

android/src/main/java/cn/reactnative/modules/update/DownloadTask.java

@@ -3,6 +3,8 @@ package cn.reactnative.modules.update;
 import android.content.Context;
 import android.os.AsyncTask;
 import android.util.Log;
+import com.facebook.react.bridge.Arguments;
+import com.facebook.react.bridge.WritableMap;
 
 import okhttp3.OkHttpClient;
 import okhttp3.Request;
@@ -31,14 +33,15 @@ import java.util.HashMap;
 import okio.BufferedSink;
 import okio.BufferedSource;
 import okio.Okio;
-
+import static cn.reactnative.modules.update.UpdateModule.sendEvent;
 /**
  * Created by tdzl2003 on 3/31/16.
  */
-class DownloadTask extends AsyncTask<DownloadTaskParams, Void, Void> {
+class DownloadTask extends AsyncTask<DownloadTaskParams, long[], Void> {
     final int DOWNLOAD_CHUNK_SIZE = 4096;
 
     Context context;
+    String hash;
 
     DownloadTask(Context context) {
         this.context = context;
@@ -67,7 +70,10 @@ class DownloadTask extends AsyncTask<DownloadTaskParams, Void, Void> {
         }
     }
 
-    private void downloadFile(String url, File writePath) throws IOException {
+    private void downloadFile(DownloadTaskParams param) throws IOException {
+        String url = param.url;
+        File writePath = param.zipFilePath;
+        this.hash = param.hash;
         OkHttpClient client = new OkHttpClient();
         Request request = new Request.Builder().url(url)
                 .build();
@@ -90,14 +96,17 @@ class DownloadTask extends AsyncTask<DownloadTaskParams, Void, Void> {
         }
 
         long bytesRead = 0;
-        long totalRead = 0;
+        long received = 0;
         while ((bytesRead = source.read(sink.buffer(), DOWNLOAD_CHUNK_SIZE)) != -1) {
-            totalRead += bytesRead;
+            received += bytesRead;
+            sink.emit();
             if (UpdateContext.DEBUG) {
-                Log.d("RNUpdate", "Progress " + totalRead + "/" + contentLength);
+                Log.d("RNUpdate", "Progress " + received + "/" + contentLength);
             }
+            
+            publishProgress(new long[]{received, contentLength});
         }
-        if (totalRead != contentLength) {
+        if (received != contentLength) {
             throw new Error("Unexpected eof while reading ppk");
         }
         sink.writeAll(source);
@@ -108,6 +117,17 @@ class DownloadTask extends AsyncTask<DownloadTaskParams, Void, Void> {
         }
     }
 
+    @Override
+    protected void onProgressUpdate(long[]... values) {
+        super.onProgressUpdate(values);
+        WritableMap params = Arguments.createMap();
+        params.putDouble("received", (values[0][0]));
+        params.putDouble("total", (values[0][1]));
+        params.putString("hashname", this.hash);
+        sendEvent("RCTPushyDownloadProgress", params);
+
+    }
+
     byte[] buffer = new byte[1024];
 
     private static native byte[] bsdiffPatch(byte[] origin, byte[] patch);
@@ -218,7 +238,7 @@ class DownloadTask extends AsyncTask<DownloadTaskParams, Void, Void> {
     }
 
     private void doDownload(DownloadTaskParams param) throws IOException {
-        downloadFile(param.url, param.zipFilePath);
+        downloadFile(param);
 
         ZipInputStream zis = new ZipInputStream(new BufferedInputStream(new FileInputStream(param.zipFilePath)));
         ZipEntry ze;
@@ -275,7 +295,7 @@ class DownloadTask extends AsyncTask<DownloadTaskParams, Void, Void> {
     }
 
     private void doPatchFromApk(DownloadTaskParams param) throws IOException, JSONException {
-        downloadFile(param.url, param.zipFilePath);
+        downloadFile(param);
 
         ZipInputStream zis = new ZipInputStream(new BufferedInputStream(new FileInputStream(param.zipFilePath)));
         ZipEntry ze;
@@ -351,7 +371,7 @@ class DownloadTask extends AsyncTask<DownloadTaskParams, Void, Void> {
     }
 
     private void doPatchFromPpk(DownloadTaskParams param) throws IOException, JSONException {
-        downloadFile(param.url, param.zipFilePath);
+        downloadFile(param);
 
         ZipInputStream zis = new ZipInputStream(new BufferedInputStream(new FileInputStream(param.zipFilePath)));
         ZipEntry ze;

android/src/main/java/cn/reactnative/modules/update/UpdateContext.java

@@ -4,6 +4,11 @@ import android.content.Context;
 import android.content.SharedPreferences;
 import android.content.pm.PackageInfo;
 import android.content.pm.PackageManager;
+import android.util.Log;
+import com.facebook.react.ReactInstanceManager;
+
+import java.util.HashMap;
+import java.util.Map;
 import java.util.concurrent.Executor;
 import java.util.concurrent.Executors;
 
@@ -19,6 +24,8 @@ public class UpdateContext {
     private Executor executor;
 
     public static boolean DEBUG = false;
+    private static ReactInstanceManager mReactInstanceManager;
+    private static boolean isUsingBundleUrl = false;
 
     public UpdateContext(Context context) {
         this.context = context;
@@ -63,6 +70,21 @@ public class UpdateContext {
         return context.getString(R.string.pushy_build_time);
     }
 
+    public String getUuid() {
+        return sp.getString("uuid", null);
+    }
+
+    public Map getBlockUpdate() {
+        return new HashMap<String, Object>() {{
+            put("until", sp.getInt("blockUntil", 0));
+            put("reason", sp.getString("blockReason", null));
+        }};
+    }
+
+    public boolean getIsUsingBundleUrl() {
+        return isUsingBundleUrl;
+    }
+
     public interface DownloadFileListener {
         void onDownloadCompleted();
         void onDownloadFailed(Throwable error);
@@ -106,8 +128,8 @@ public class UpdateContext {
     private SharedPreferences sp;
 
     public void switchVersion(String hashName) {
-        if (!new File(rootDir, hashName).exists()) {
+        if (!new File(rootDir, hashName+"/index.bundlejs").exists()) {
-            throw new Error("Hash name not found, must download first.");
+            throw new Error("Bundle version " + hashName + " not found.");
         }
         String lastVersion = getCurrentVersion();
         SharedPreferences.Editor editor = sp.edit();
@@ -121,6 +143,19 @@ public class UpdateContext {
         editor.apply();
     }
 
+    public void setUuid(String uuid) {
+        SharedPreferences.Editor editor = sp.edit();
+        editor.putString("uuid", uuid);
+        editor.apply();
+    }
+
+    public void setBlockUpdate(int until, String reason) {
+        SharedPreferences.Editor editor = sp.edit();
+        editor.putInt("blockUntil", until);
+        editor.putString("blockReason", reason);
+        editor.apply();
+    }
+
     public String getCurrentVersion() {
         return sp.getString("currentVersion", null);
     }
@@ -158,6 +193,15 @@ public class UpdateContext {
         this.clearUp();
     }
 
+
+    public static void setCustomInstanceManager(ReactInstanceManager instanceManager) {
+        mReactInstanceManager = instanceManager;
+    }
+
+    public ReactInstanceManager getCustomReactInstanceManager() {
+        return mReactInstanceManager;
+    }
+
     public static String getBundleUrl(Context context) {
         return new UpdateContext(context.getApplicationContext()).getBundleUrl();
     }
@@ -171,6 +215,7 @@ public class UpdateContext {
     }
 
     public String getBundleUrl(String defaultAssetsUrl) {
+        isUsingBundleUrl = true;
         String currentVersion = getCurrentVersion();
         if (currentVersion == null) {
             return defaultAssetsUrl;
@@ -182,10 +227,18 @@ public class UpdateContext {
                 currentVersion = this.rollBack();
             }
         }
-        if (currentVersion == null) {
+
-            return defaultAssetsUrl;
+        while (currentVersion != null) {
+            File bundleFile = new File(rootDir, currentVersion+"/index.bundlejs");
+            if (!bundleFile.exists()) {
+                Log.e("getBundleUrl", "Bundle version " + currentVersion + " not found.");
+                currentVersion = this.rollBack();
+                continue;
+            }
+            return bundleFile.toString();
         }
-        return (new File(rootDir, currentVersion+"/index.bundlejs").toString());
+
+        return defaultAssetsUrl;
     }
 
     private String rollBack() {

android/src/main/java/cn/reactnative/modules/update/UpdateModule.java

@@ -9,11 +9,14 @@ import com.facebook.react.ReactApplication;
 import com.facebook.react.ReactInstanceManager;
 import com.facebook.react.bridge.Promise;
 import com.facebook.react.bridge.ReactApplicationContext;
+import com.facebook.react.bridge.ReactContext;
 import com.facebook.react.bridge.ReactContextBaseJavaModule;
 import com.facebook.react.bridge.ReactMethod;
 import com.facebook.react.bridge.ReadableMap;
 import com.facebook.react.bridge.UiThreadUtil;
 import com.facebook.react.bridge.JSBundleLoader;
+import com.facebook.react.bridge.WritableMap;
+import com.facebook.react.modules.core.DeviceEventManagerModule;
 
 import java.lang.reflect.Field;
 import java.lang.reflect.Method;
@@ -25,10 +28,11 @@ import java.util.Map;
  */
 public class UpdateModule extends ReactContextBaseJavaModule{
     UpdateContext updateContext;
-
+    public static ReactApplicationContext mContext;
     public UpdateModule(ReactApplicationContext reactContext, UpdateContext updateContext) {
         super(reactContext);
         this.updateContext = updateContext;
+        mContext=reactContext;
     }
 
     public UpdateModule(ReactApplicationContext reactContext) {
@@ -42,6 +46,7 @@ public class UpdateModule extends ReactContextBaseJavaModule{
         constants.put("packageVersion", updateContext.getPackageVersion());
         constants.put("currentVersion", updateContext.getCurrentVersion());
         constants.put("buildTime", updateContext.getBuildTime());
+        constants.put("isUsingBundleUrl", updateContext.getIsUsingBundleUrl());
         boolean isFirstTime = updateContext.isFirstTime();
         constants.put("isFirstTime", isFirstTime);
         if (isFirstTime) {
@@ -52,6 +57,8 @@ public class UpdateModule extends ReactContextBaseJavaModule{
         if (isRolledBack) {
             updateContext.clearRollbackMark();
         }
+        constants.put("blockUpdate", updateContext.getBlockUpdate());
+        constants.put("uuid", updateContext.getUuid());
         return constants;
     }
 
@@ -119,21 +126,25 @@ public class UpdateModule extends ReactContextBaseJavaModule{
         UiThreadUtil.runOnUiThread(new Runnable() {
             @Override
             public void run() {
-                updateContext.switchVersion(hash);
                 try {
+                    updateContext.switchVersion(hash);
                     Activity activity = getCurrentActivity();
                     Application application = activity.getApplication();
-                    ReactInstanceManager instanceManager = ((ReactApplication) application).getReactNativeHost().getReactInstanceManager();
+                    ReactInstanceManager instanceManager = updateContext.getCustomReactInstanceManager();
+
+                    if (instanceManager == null) {
+                        instanceManager = ((ReactApplication) application).getReactNativeHost().getReactInstanceManager();
+                    }
 
                     try {
-                        Field jsBundleField = instanceManager.getClass().getDeclaredField("mJSBundleFile");
-                        jsBundleField.setAccessible(true);
-                        jsBundleField.set(instanceManager, UpdateContext.getBundleUrl(application));
-                    } catch (Throwable err) {
                         JSBundleLoader loader = JSBundleLoader.createFileLoader(UpdateContext.getBundleUrl(application));
                         Field loadField = instanceManager.getClass().getDeclaredField("mBundleLoader");
                         loadField.setAccessible(true);
                         loadField.set(instanceManager, loader);
+                    } catch (Throwable err) {
+                        Field jsBundleField = instanceManager.getClass().getDeclaredField("mJSBundleFile");
+                        jsBundleField.setAccessible(true);
+                        jsBundleField.set(instanceManager, UpdateContext.getBundleUrl(application));
                     }
 
                     try {
@@ -143,7 +154,7 @@ public class UpdateModule extends ReactContextBaseJavaModule{
                     }
 
                 } catch (Throwable err) {
-                    Log.e("pushy", "Failed to restart application", err);
+                    Log.e("pushy", "switchVersion failed", err);
                 }
             }
         });
@@ -156,7 +167,11 @@ public class UpdateModule extends ReactContextBaseJavaModule{
         UiThreadUtil.runOnUiThread(new Runnable() {
             @Override
             public void run() {
-                updateContext.switchVersion(hash);
+                try {
+                    updateContext.switchVersion(hash);
+                } catch (Throwable err) {
+                    Log.e("pushy", "switchVersionLater failed", err);
+                }
             }
         });
     }
@@ -170,4 +185,32 @@ public class UpdateModule extends ReactContextBaseJavaModule{
             }
         });
     }
+
+    @ReactMethod
+    public void setBlockUpdate(ReadableMap options) {
+        final int until = options.getInt("until");
+        final String reason = options.getString("reason");
+        UiThreadUtil.runOnUiThread(new Runnable() {
+            @Override
+            public void run() {
+                updateContext.setBlockUpdate(until, reason);
+            }
+        });
+    }
+
+    @ReactMethod
+    public void setUuid(final String uuid) {
+        UiThreadUtil.runOnUiThread(new Runnable() {
+            @Override
+            public void run() {
+                updateContext.setUuid(uuid);
+            }
+        });
+    }
+
+    /* 发送事件*/
+    public static void sendEvent(String eventName,  WritableMap params) {
+        ((ReactContext) mContext).getJSModule(DeviceEventManagerModule.RCTDeviceEventEmitter.class).emit(eventName,
+                params);
+    }
 }

docs/api.md

@@ -1,66 +0,0 @@
-# API
-
-### downloadRootDir
-
-下载的根目录。你可以使用react-native-fs等第三方组件检查其中的内容。
-
-### packageVersion
-
-当前应用包的版本名。
-
-### currentVersion
-
-当前版本的Hash号。
-
-### isFirstTime
-
-是否更新后的首次启动。当此项为真时，你需要在合适的时候调用`markSuccess()`以确保更新成功。否则应用下一次启动时将会回滚。
-
-### isRolledBack
-
-是否刚刚经历了一次回滚。
-
-### async function checkUpdate(appKey)
-
-检查更新，返回值有三种情形：
-
-1. `{expired: true}`：该应用包(原生部分)已过期，需要前往应用市场下载新的版本。
-```
-    {
-        expired: true,
-        downloadUrl: 'http://appstore/downloadUrl',
-    }
-```
-2. `{upToDate: true}`：当前已经更新到最新，无需进行更新。
-
-3. `{update: true}`：当前有新版本可以更新。info的`name`、`description`字段可
-以用于提示用户，而`metaInfo`字段则可以根据你的需求自定义其它属性(如是否静默更新、
-是否强制更新等等)。另外还有几个字段，包含了完整更新包或补丁包的下载地址，
-```
-    {
-        update: true,
-        name: '1.0.3-rc',
-        hash: 'hash',
-        description: '添加聊天功能\n修复商城页面BUG',
-        metaInfo: '{"silent":true}',
-        updateUrl: 'http://update-packages.reactnative.cn/hash',
-        pdiffUrl: 'http://update-packages.reactnative.cn/hash',
-        diffUrl: 'http://update-packages.reactnative.cn/hash',
-    }
-```
-
-### async function downloadUpdate(info)
-
-下载更新版本。info为checkUpdate函数的返回值，并且仅当`update:true`时实际进行下载。
-
-### function switchVersion(hash) 
-
-立即重启应用，并加载已经下载完毕的版本。
-
-### function switchVersionLater(hash)
-
-在下一次启动应用的时候加载已经下载完毕的版本。
-
-### function markSuccess()
-
-在isFirstTime为true时需在应用成功启动后调用此函数，

docs/cli.md

@@ -1,118 +0,0 @@
-# 命令行工具
-
-## 安装
-
-```
-$ npm install -g react-native-update-cli
-$ npm install --save react-native-update
-```
-
-## 使用
-
-#### pushy bundle
-
-生成资源包
-
-* platform: ios|android 对应的平台
-* entryFile: 入口脚本文件
-* intermediaDir: 临时文件输出目录
-* output: 最终ppk文件输出路径
-* dev: 是否打包开发版本
-* verbose: 是否展现打包过程的详细信息
-
-#### pushy diff <origin> <next>
-
-提供两个ppk文件，生成从origin到next版本的差异更新包。
-
-* output: diff文件输出路径
-
-#### pushy diffFromApk <apkFile> <next>
-
-提供一个apk文件和一个ppk文件，生成从apk文件到next版本的差异更新包。
-
-如果使用热更新开放平台，你不需要自己执行此命令。
-
-* output: diff文件输出路径
-
-#### pushy diffFromIpa <ipaFile> <next>
-
-提供一个ipa文件和一个ppk文件，生成从ipa文件到next版本的差异更新包。
-
-如果使用热更新开放平台，你不需要自己执行此命令。
-
-* output: diff文件输出路径
-
-#### pushy login [<email>] [<pwd>]
-
-登录热更新开放平台。你需要先登录才能使用下面的命令。
-
-#### pushy logout
-
-登出并清除本地的登录信息
-
-#### pushy me
-
-查看自己是否已经登录，以及昵称等信息。
-
-#### pushy createApp
-
-创建应用并立刻绑定到当前工程。这项操作也可以在网页管理端进行。
-
-- platform: ios|android 对应的平台
-- name: 应用名称
-- downloadUrl: 应用安装包的下载地址
-
-#### pushy deleteApp [appId]
-
-删除已有应用。所有已创建的应用包、热更新版本都会被同时删除。这项操作也可以在网页管理端进行。
-
-- platform: ios|android 对应的平台
-
-#### pushy apps
-
-查看当前已创建的全部应用。这项操作也可以在网页管理端进行。
-
-- platform: ios|android 对应的平台
-
-#### pushy selectApp [appId]
-
-绑定应用到当前工程。
-
-- platform: ios|android 对应的平台
-
-#### pushy uploadIpa <ipaFile>
-
-上传 ipa 文件到开放平台。
-
-#### pushy uploadApk <apkFile>
-
-上传 apk 文件到开放平台。
-
-#### pushy packages
-
-查看已经上传的包。这项操作也可以在网页管理端进行。
-
-- platform: ios|android 对应的平台
-
-#### pushy publish <ppkFile>
-
-发布新的更新版本。
-
-- platform: ios|android 对应的平台
-- name: 当前版本的名字(版本号)
-- description: 当前版本的描述信息，可以对用户进行展示
-- metaInfo: 当前版本的元信息，可以用来保存一些额外信息
-
-#### pushy versions
-
-分页列举可用的版本。这项操作也可以在网页管理端进行。
-
-- platform: ios|android 对应的平台
-
-#### pushy update
-
-为一个包版本绑定一个更新版本。这项操作也可以在网页管理端进行。
-
-- platform: ios|android 对应的平台
-- versionId: 要绑定的版本 ID
-- packageId: 要绑定的包 ID

docs/faq_advance.md

@@ -1,71 +0,0 @@
-## 常见问题
-
-#### 报错 NDK not configured.
-
-你需要下载并安装NDK，然后设置到环境变量`ANDROID_NDK_HOME`中。
-
-#### 报错 Execution failed for task ':react-native-update:compileReleaseNdk'
-参看 https://github.com/reactnativecn/react-native-pushy/issues/64#issuecomment-287967742
- 
-#### iOS报错 Unable to execute JS call: __fbBatchedBridge is undefined
-
-如果直接修改了jsCodeLocation，将不能在iOS模拟器上运行。可以使用真机测试。要在发布之前测试热更新功能，可以用adhoc方式发布测试包并进行测试。adhoc发布的包可以用于uploadIpa和生成差异包。
-
-#### XCode报错 "_BZ2_bzRead", referenced from 等
-
-在工程target的Build Phases->Link Binary with Libraries中加入libz.tbd、libbz2.1.0.tbd
-
-## 高级指南
-
-#### 过期的版本
-
-你可以删除掉过期很久的版本。在一段时间后，版本会被真正清理。
-
-如果有用户还处在已经被清理的版本上，当他发起更新的时候，将不能通过版本差异比对进行更新，即只能进行全量更新。
-
-#### CI的集成
-
-在开发环境中，每次bundle都会生成一个不同名字的ppk文件，这不利于持续集成(CI)系统的引入。
-
-要解决这个问题,你可以使用`--output`参数来指定输出ppk文件的名字和路径，便于进行自动发布。
-
-#### 版本测试与发布
-
-我们强烈建议您先发布一个测试包，再发布一个除了版本号以外均完全相同的发布包。
-在每次往发布包发起热更新之前，先往对应的测试包进行更新操作，基本测试通过之后，可以将发布包更新到完全相同的热更新版本之上。
-如果在测试包中发现了重大问题，你就可以先进行修复，再次更新测试通过后，再将发布包更新至修复后的版本。
-这样，可以最大程度的避免用户通过热更新获得一个有问题的版本。
-
-#### 元信息(Meta Info)的使用
-
-在发布热更新版本时，或者在网页端，你可以编辑版本的元信息。
-这是一段在检查更新时可以获得的字符串，你可以在其中按你所想的格式保存一些信息。
-
-举例来说，可能某个版本包含一些重要的更新内容，所以用户会得到一个不同样式的通知。如何使用元信息，完全取决于您的想象力！
-
-下面会列举一些实战中更有意义的元信息的使用。
-
-#### Hot-fix
-
-有时候我们不小心发布了一个有严重问题的版本，所以需要进行一个紧急的修复，
-此时我们可能希望之前已经更新到有问题版本的用户进行紧急甚至静默进行更新。
-
-这时候,我们可以在元信息中包含有问题的版本的列表，而在客户端检查更新时，将从元信息里取到的列表与当前版本(currentVersion)比对，
-如果匹配成功，我们就进行静默更新，否则则按照一般的更新流程提示用户。
-
-#### 这个热更新服务收费吗？
-
-目前我们的热更新服务完全免费，但限制每个账号不超过3个应用；每个应用不超过10个活跃的包和100个活跃的热更新版本；每个应用每个月不超过10000次下载。iOS和Android版本记做不同的应用。
-
-已经移除的应用、包版本、热更新版本不在统计之列，所以你可以移除测试时产生的和已过期版本来更有效的利用空间。
-
-我们会在将来推出付费的升级版本，针对用户量较大、版本迭代较快的用户提供扩容方案。如果您有急迫的需求，可以[联系我们](https://reactnative.cn/about.html#content)。
-
-#### 我是否可以搭建自己的热更新服务？
-
-你可以单独使用本组件的原生部分(不包括js模块)和命令行工具中的`bundle`、`diff`、`diffFromIpa`、`diffFromApk`四个功能。
-
-这些功能都不会使用我们的热更新服务，也无需注册或登录账号。但你可能要编写自己的js模块来与不同的热更新服务器通讯。
-
-如果您有兴趣使用我们的成果，搭建私有云服务，可以[联系我们](https://reactnative.cn/about.html#content)。
-

docs/guide.md

@@ -1,218 +0,0 @@
-# 快速入门-准备工作
-
-首先你应该有一个基于React Native开发的应用，我们把具有package.json的目录叫做你的"应用根目录"。
-
-如果你还没有初始化应用，请参阅[开始使用React Native](https://reactnative.cn/docs/getting-started.html#content)。
-
-所以我们也假设你已经拥有了开发React Native应用的一切环境，包括`Node.js`、`npm`、`XCode`、`Android SDK`等等。
-
-## 安装
-
-在你的项目根目录下运行以下命令：
-
-```bash
-npm i -g react-native-update-cli
-npm i react-native-update
-```  
-
-> 如果下载极慢或者显示网络失败，请设置使用淘宝镜像`npx nrm use taobao`
-
-如果你的RN版本 >= 0.60，请在iOS目录下执行:
-
-```bash
-pod install
-```
-
-如果你的RN版本 < 0.60，那么还需要[手动link](#一手动link)
-
-
-<details>
-<summary>
-如果你的RN版本比较老（< 0.46），请点击这里的注意事项
-</summary>
-
-如果你的RN版本比较老，请按下面表格尝试老一些的版本（但这些版本我们已不再维护，不能保证可以使用）：
-
-| React Native版本 | react-native-update版本 |
-| ---------------- | ----------------------- |
-| 0.26及以下       | 1.0.x                   |
-| 0.27 - 0.28      | 2.x                     |
-| 0.29 - 0.33      | 3.x                     |
-| 0.34 - 0.45      | 4.x                     |
-
-安装命令示例：
-```
-npm i react-native-update@4.x
-```
-
-如果RN的版本是0.45及以下，你还必须安装[Android NDK](http://androiddevtools.cn)，版本最好选用r10e，并设置环境变量`ANDROID_NDK_HOME`，指向你的NDK根目录(例如`/Users/tdzl2003/Downloads/android-ndk-r10e`)。
-</details>
-
-
-请记得一定要重新编译（react-native run-ios或run-android命令编译，或在Xcode/Android Studio中重新编译）。
-
-
-## 一、手动link
-
-如果RN版本 >= 0.60则可以跳过此步骤
-
-### iOS
-
-<details>
-<summary>RN < 0.60且使用CocoaPods（推荐）</summary>
-
-1. 在ios/Podfile中添加
-```
-pod 'react-native-update', path: '../node_modules/react-native-update'
-```
-2. 在项目的ios目录下运行`pod install`
-3. 重新编译
-   
-</details>
-
-<details>
-<summary>RN < 0.60且不使用CocoaPods</summary>
-
-1. 在XCode中的Project Navigator里,右键点击`Libraries` ➜ `Add Files to [你的工程名]`
-2. 进入`node_modules` ➜ `react-native-update` ➜ `ios 并选中 `RCTPushy.xcodeproj`
-3. 在XCode中的project navigator里,选中你的工程,在 `Build Phases` ➜ `Link Binary With Libraries` 中添加 `libRCTPushy.a`
-4. 继续在`Build Settings`里搜索`Header Search Path`，添加$(SRCROOT)/../node_modules/react-native-update/ios
-5. 重新编译
-
-</details>
-
-### Android
-
-
-<details>
-<summary>RN < 0.60</summary>
-1. 在`android/settings.gradle`中添加如下代码:
-  	```
-  	include ':react-native-update'
-  	project(':react-native-update').projectDir = new File(rootProject.projectDir, 	'../node_modules/react-native-update/android')
-  	```
-
-2. 在`android/app/build.gradle`的 dependencies 部分增加如下代码:
-  	```
-      implementation project(':react-native-update')
-    ```
-
-3. 打开`android/app/src/main/java/[...]/MainApplication.java`,
-  - 在文件开头增加 `import cn.reactnative.modules.update.UpdatePackage;`
-  - 在`getPackages()` 方法中增加 `new UpdatePackage()`(注意上一行可能要增加一个逗号)
-</details>
-
-## 二、配置Bundle URL
-
-注意此步骤无论任何版本，目前都需要手动配置。
-
-### iOS
-
-1. (RN >= 0.60或者使用CocoaPods集成此步可跳过)在工程target的Build Phases->Link Binary with Libraries中加入`libz.tbd`、`libbz2.1.0.tbd`
-
-2. 在你的AppDelegate.m文件中增加如下代码：
-
-```objective-c
-// ... 其它代码
-
-#import "RCTPushy.h"
-
-// 如果RN版本 >= 0.59，修改sourceURLForBridge
-- (NSURL *)sourceURLForBridge:(RCTBridge *)bridge
-{
-#if DEBUG
-  return [[RCTBundleURLProvider sharedSettings] jsBundleURLForBundleRoot:@"index" fallbackResource:nil];
-#else
-  // 非DEBUG情况下替换为热更新bundle
-  return [RCTPushy bundleURL];
-#endif
-}
-
-// 如果RN版本 < 0.59，修改didFinishLaunchingWithOptions
-- (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(NSDictionary *)launchOptions
-{
-#if DEBUG
-  // 原来的jsCodeLocation保留在这里
-  jsCodeLocation = ..........
-#else
-  // 非DEBUG情况下替换为热更新bundle
-  jsCodeLocation = [RCTPushy bundleURL];
-#endif
-  // ... 其它代码
-}
-
-```
-
-### Android
-
-在MainApplication中增加如下代码：
-
-```java
-// ... 其它代码
-
-// 请注意不要少了这句import
-import cn.reactnative.modules.update.UpdateContext;
-public class MainApplication extends Application implements ReactApplication {
-
-  private final ReactNativeHost mReactNativeHost = new ReactNativeHost(this) {
-    @Override
-    protected String getJSBundleFile() {
-        return UpdateContext.getBundleUrl(MainApplication.this);
-    }
-    // ... 其它代码
-  }
-}
-```
-
-## 三、登录与创建应用
-
-首先请在<https://update.reactnative.cn>注册帐号，然后在你的项目根目录下运行以下命令：
-
-```bash
-$ pushy login
-email: <输入你的注册邮箱>
-password: <输入你的密码>
-```
-
-这会在项目文件夹下创建一个`.update`文件，注意不要把这个文件上传到Git等CVS系统上。你可以在`.gitignore`末尾增加一行`.update`来忽略这个文件。
-
-登录之后可以创建应用。注意iOS平台和安卓平台需要分别创建：
-
-```bash
-$ pushy createApp --platform ios
-App Name: <输入应用名字>
-$ pushy createApp --platform android
-App Name: <输入应用名字>
-```
-
-> 两次输入的名字可以相同，这没有关系。
-
-如果你已经在网页端或者其它地方创建过应用，也可以直接选择应用：
-
-```bash
-$ pushy selectApp --platform ios
-1) 鱼多多(ios)
-2) 招财旺(ios)
-
-Total 2 ios apps
-Enter appId: <输入应用前面的编号>
-```
-
-选择或者创建过应用后，你将可以在文件夹下看到`update.json`文件，其内容类似如下形式：
-
-```bash
-{
-    "ios": {
-        "appId": 1,
-        "appKey": "<一串随机字符串>"
-    },
-    "android": {
-        "appId": 2,
-        "appKey": "<一串随机字符串>"
-    }
-}
-```
-
-你可以安全的把`update.json`上传到Git等CVS系统上，与你的团队共享这个文件，它不包含任何敏感信息。当然，他们在使用任何功能之前，都必须首先输入`pushy login`进行登录。
-
-至此应用的创建/选择就已经成功了。下一步，你需要给代码添加相应的功能，请参阅[添加热更新功能](guide2.md)

docs/guide2.md

@@ -1,177 +0,0 @@
-# 快速入门-添加热更新功能
-
-## 获取appKey
-
-检查更新时必须提供你的`appKey`，这个值保存在`update.json`中，并且根据平台不同而不同。你可以用如下的代码获取：
-
-```javascript
-import {
-  Platform,
-} from 'react-native';
-
-import _updateConfig from './update.json';
-const {appKey} = _updateConfig[Platform.OS];
-```
-
-如果你不使用pushy命令行，你也可以从网页端查看到两个应用appKey，并根据平台的不同来选择。
-
-## 检查更新、下载更新
-
-异步函数checkUpdate可以检查当前版本是否需要更新：
-
-```javascript
-const info = await checkUpdate(appKey)
-```
-
-返回的info有三种情况：
-
-1. `{expired: true}`：该应用包(原生部分)已过期，需要前往应用市场下载新的版本。
-
-2. `{upToDate: true}`：当前已经更新到最新，无需进行更新。
-
-3. `{update: true}`：当前有新版本可以更新。info的`name`、`description`字段可
-以用于提示用户，而`metaInfo`字段则可以根据你的需求自定义其它属性(如是否静默更新、
-是否强制更新等等)。另外还有几个字段，包含了完整更新包或补丁包的下载地址，
-react-native-update会首先尝试耗费流量更少的更新方式。将info对象传递给downloadUpdate作为参数即可。
-
-## 切换版本
-
-downloadUpdate的返回值是一个hash字符串，它是当前版本的唯一标识。
-
-你可以使用`switchVersion`函数立即切换版本(此时应用会立即重新加载)，或者选择调用
-`switchVersionLater`，让应用在下一次启动的时候再加载新的版本。
-
-## 首次启动、回滚
-
-在每次更新完毕后的首次启动时，`isFirstTime`常量会为`true`。
-你必须在应用退出前合适的任何时机，调用`markSuccess`，否则应用下一次启动的时候将会进行回滚操作。
-这一机制称作“反触发”，这样当你应用启动初期即遭遇问题的时候，也能在下一次启动时恢复运作。
-
-你可以通过`isFirstTime`来获知这是当前版本的首次启动，也可以通过`isRolledBack`来获知应用刚刚经历了一次回滚操作。
-你可以在此时给予用户合理的提示。
-
-## 完整的示例
-
-```javascript
-import React, {
-  Component,
-} from 'react';
-
-import {
-  AppRegistry,
-  StyleSheet,
-  Platform,
-  Text,
-  View,
-  Alert,
-  TouchableOpacity,
-  Linking,
-} from 'react-native';
-
-import {
-  isFirstTime,
-  isRolledBack,
-  packageVersion,
-  currentVersion,
-  checkUpdate,
-  downloadUpdate,
-  switchVersion,
-  switchVersionLater,
-  markSuccess,
-} from 'react-native-update';
-
-import _updateConfig from './update.json';
-const {appKey} = _updateConfig[Platform.OS];
-
-class MyProject extends Component {
-  componentDidMount(){
-    if (isFirstTime) {
-      Alert.alert('提示', '这是当前版本第一次启动,是否要模拟启动失败?失败将回滚到上一版本', [
-        {text: '是', onPress: ()=>{throw new Error('模拟启动失败,请重启应用')}},
-        {text: '否', onPress: ()=>{markSuccess()}},
-      ]);
-    } else if (isRolledBack) {
-      Alert.alert('提示', '刚刚更新失败了,版本被回滚.');
-    }
-  }
-  doUpdate = async (info) => {
-    try {
-      const hash = await downloadUpdate(info);
-      Alert.alert('提示', '下载完毕,是否重启应用?', [
-        {text: '是', onPress: ()=>{switchVersion(hash);}},
-        {text: '否',},
-        {text: '下次启动时', onPress: ()=>{switchVersionLater(hash);}},
-      ]);
-    } catch(err) {
-      Alert.alert('提示', '更新失败.');
-    }
-  };
-  checkUpdate = async () => {
-    if (__DEV__) {
-      // 开发模式不支持热更新，跳过检查
-      return;
-    }
-    let info;
-    try {
-      info = await checkUpdate(appKey);
-    } catch (err) {
-      console.warn(err);
-      return;
-    }
-    if (info.expired) {
-      Alert.alert('提示', '您的应用版本已更新,请前往应用商店下载新的版本', [
-        {text: '确定', onPress: ()=>{info.downloadUrl && Linking.openURL(info.downloadUrl)}},
-      ]);
-    } else if (info.upToDate) {
-      Alert.alert('提示', '您的应用版本已是最新.');
-    } else {
-      Alert.alert('提示', '检查到新的版本'+info.name+',是否下载?\n'+ info.description, [
-        {text: '是', onPress: ()=>{this.doUpdate(info)}},
-        {text: '否',},
-      ]);
-    }
-  };
-  render() {
-    return (
-      <View style={styles.container}>
-        <Text style={styles.welcome}>
-          欢迎使用热更新服务
-        </Text>
-        <Text style={styles.instructions}>
-          这是版本一 {'\n'}
-          当前包版本号: {packageVersion}{'\n'}
-          当前版本Hash: {currentVersion||'(空)'}{'\n'}
-        </Text>
-        <TouchableOpacity onPress={this.checkUpdate}>
-          <Text style={styles.instructions}>
-            点击这里检查更新
-          </Text>
-        </TouchableOpacity>
-      </View>
-    );
-  }
-}
-
-const styles = StyleSheet.create({
-  container: {
-    flex: 1,
-    justifyContent: 'center',
-    alignItems: 'center',
-    backgroundColor: '#F5FCFF',
-  },
-  welcome: {
-    fontSize: 20,
-    textAlign: 'center',
-    margin: 10,
-  },
-  instructions: {
-    textAlign: 'center',
-    color: '#333333',
-    marginBottom: 5,
-  },
-});
-
-AppRegistry.registerComponent('MyProject', () => MyProject);
-```
-
-现在，你的应用已经可以通过update服务检查版本并进行更新了。下一步，你可以开始尝试发布应用包和版本，请参阅[发布应用](guide3.md)

docs/guide3.md

@@ -1,80 +0,0 @@
-# 快速入门-发布应用
-
-现在你的应用已经具备了检测更新的功能，下面我们来尝试发布并更新它。
-
-> **注意**，从update上传发布版本到发布版本正式上线期间，不要修改任何脚本和资源，这会影响update
-获取本地代码，从而导致版本不能更新。如果在发布之前修改了脚本或资源，请在网页端删除之前上传的版本并重新上传。
-
-## 发布iOS应用
-
-首先参考[文档-在设备上运行](https://reactnative.cn/docs/running-on-device-ios.html#content)，
-确定你正在使用离线包。然后点击菜单。
-
-按照正常的发布流程打包`.ipa`文件(Xcode中运行设备选真机或Generic iOS Device，然后菜单中选择Product-Archive)，然后运行如下命令
-
-```bash
-$ pushy uploadIpa <your-package.ipa>
-```
-
-即可上传ipa以供后续版本比对之用。
-
-随后你可以选择往AppStore发布这个版本，也可以先通过Test flight等方法进行测试。
-
-## 发布安卓应用
-
-首先参考[文档-生成已签名的APK](https://reactnative.cn/docs/signed-apk-android.html#content)设置签名，
-然后在android文件夹下运行`./gradlew assembleRelease`或`./gradlew aR`，你就可以在`android/app/build/outputs/apk/release/app-release.apk`中找到你的应用包。
-
-然后运行如下命令
-
-```bash
-$ pushy uploadApk android/app/build/outputs/apk/release/app-release.apk
-```
-
-即可上传apk以供后续版本比对之用。
-
-随后你可以选择往应用市场发布这个版本，也可以先往设备上直接安装这个apk文件以进行测试。
-
-## 发布新的热更新版本
-
-你可以尝试修改一行代码(譬如将版本一修改为版本二)，然后生成新的热更新版本。
-
-```bash
-$ pushy bundle --platform <ios|android>
-Bundling with React Native version:  0.22.2
-<各种进度输出>
-Bundled saved to: build/output/android.1459850548545.ppk
-Would you like to publish it?(Y/N) 
-```
-
-如果想要立即发布，此时输入Y。当然，你也可以在将来使用`pushy publish --platform <ios|android> <ppkFile>`来发布版本。
-
-```
-  Uploading [========================================================] 100% 0.0s
-Enter version name: <输入版本名字，如1.0.0-rc>
-Enter description: <输入版本描述>
-Enter meta info: {"ok":1}
-Ok.
-Would you like to bind packages to this version?(Y/N)
-```
-
-此时版本已经提交到update服务，但用户暂时看不到此更新，你需要先将特定的包版本绑定到此热更新版本上。
-
-此时输入Y立即绑定，你也可以在将来使用`pushy update --platform <ios|android>`来使得对应包版本的用户更新。
-除此以外，你还可以在网页端操作，简单的将对应的包版本拖到此版本下即可。
-
-```
-Offset 0
-1) FvXnROJ1 1.0.1 (no package)
-2) FiWYm9lB 1.0 [1.0]
-Enter versionId or page Up/page Down/Begin(U/D/B) <输入序号,U/D翻页,B回到开始，序号就是上面列表中)前面的数字>
-
-1) 1.0(normal) - 3 FiWYm9lB (未命名)
-
-Total 1 packages.
-Enter packageId: <输入包版本序号，序号就是上面列表中)前面的数字>
-```
-
-版本绑定完毕后，客户端就应当可以检查到更新并进行更新了。
-
-恭喜你，至此为止，你已经完成了植入代码热更新的全部工作。接下来，你可以查阅[常见问题与高级指南](faq_advance.md)了解更多深入的知识，尤其是在实际项目中的运用技巧。

domains.json

@@ -0,0 +1 @@
+["update.react-native.cn", "update.reactnative.cn"]

endpoints.json

@@ -0,0 +1 @@
+["https://update.react-native.cn/api", "https://update.reactnative.cn/api"]

ios/RCTPushy/RCTPushy.h

@@ -6,13 +6,11 @@
 //  Copyright © 2016 erica. All rights reserved.
 //
 
-#if __has_include(<React/RCTBridge.h>)
 #import <React/RCTBridgeModule.h>
-#else
+#import <React/RCTEventEmitter.h>
-#import "RCTBridgeModule.h"
-#endif
 
-@interface RCTPushy : NSObject<RCTBridgeModule>
+
+@interface RCTPushy : RCTEventEmitter<RCTBridgeModule>
 
 + (NSURL *)bundleURL;
 

ios/RCTPushy/RCTPushy.m

@@ -10,23 +10,19 @@
 #import "RCTPushyDownloader.h"
 #import "RCTPushyManager.h"
 
-#if __has_include(<React/RCTBridge.h>)
+
-#import "React/RCTEventDispatcher.h"
 #import <React/RCTConvert.h>
 #import <React/RCTLog.h>
-#else
+#import <React/RCTReloadCommand.h>
-#import "RCTEventDispatcher.h"
-#import "RCTConvert.h"
-#import "RCTLog.h"
-#endif
 
-//
 static NSString *const keyPushyInfo = @"REACTNATIVECN_PUSHY_INFO_KEY";
 static NSString *const paramPackageVersion = @"packageVersion";
 static NSString *const paramLastVersion = @"lastVersion";
 static NSString *const paramCurrentVersion = @"currentVersion";
 static NSString *const paramIsFirstTime = @"isFirstTime";
 static NSString *const paramIsFirstLoadOk = @"isFirstLoadOK";
+static NSString *const keyBlockUpdate = @"REACTNATIVECN_PUSHY_BLOCKUPDATE";
+static NSString *const keyUuid = @"REACTNATIVECN_PUSHY_UUID";
 static NSString *const keyFirstLoadMarked = @"REACTNATIVECN_PUSHY_FIRSTLOADMARKED_KEY";
 static NSString *const keyRolledBackMarked = @"REACTNATIVECN_PUSHY_ROLLEDBACKMARKED_KEY";
 static NSString *const KeyPackageUpdatedMarked = @"REACTNATIVECN_PUSHY_ISPACKAGEUPDATEDMARKED_KEY";
@@ -63,6 +59,7 @@ static BOOL ignoreRollback = false;
 
 @implementation RCTPushy {
     RCTPushyManager *_fileManager;
+    bool hasListeners;
 }
 
 @synthesize bridge = _bridge;
@@ -93,10 +90,10 @@ RCT_EXPORT_MODULE(RCTPushy);
             BOOL isFirstTime = [pushyInfo[paramIsFirstTime] boolValue];
             BOOL isFirstLoadOK = [pushyInfo[paramIsFirstLoadOk] boolValue];
             
-            NSString *loadVersioin = curVersion;
+            NSString *loadVersion = curVersion;
-            BOOL needRollback = (!ignoreRollback && isFirstTime == NO && isFirstLoadOK == NO) || loadVersioin.length<=0;
+            BOOL needRollback = (!ignoreRollback && isFirstTime == NO && isFirstLoadOK == NO) || loadVersion.length<=0;
             if (needRollback) {
-                loadVersioin = lastVersion;
+                loadVersion = lastVersion;
                 
                 if (lastVersion.length) {
                     // roll back to last version
@@ -125,10 +122,10 @@ RCT_EXPORT_MODULE(RCTPushy);
                 [defaults synchronize];
             }
             
-            if (loadVersioin.length) {
+            if (loadVersion.length) {
                 NSString *downloadDir = [RCTPushy downloadDir];
                 
-                NSString *bundlePath = [[downloadDir stringByAppendingPathComponent:loadVersioin] stringByAppendingPathComponent:BUNDLE_FILE_NAME];
+                NSString *bundlePath = [[downloadDir stringByAppendingPathComponent:loadVersion] stringByAppendingPathComponent:BUNDLE_FILE_NAME];
                 if ([[NSFileManager defaultManager] fileExistsAtPath:bundlePath isDirectory:NULL]) {
                     NSURL *bundleURL = [NSURL fileURLWithPath:bundlePath];
                     return bundleURL;
@@ -155,6 +152,8 @@ RCT_EXPORT_MODULE(RCTPushy);
     ret[@"buildTime"] = [RCTPushy buildTime];
     ret[@"isRolledBack"] = [defaults objectForKey:keyRolledBackMarked];
     ret[@"isFirstTime"] = [defaults objectForKey:keyFirstLoadMarked];
+    ret[@"blockUpdate"] = [defaults objectForKey:keyBlockUpdate];
+    ret[@"uuid"] = [defaults objectForKey:keyUuid];
     NSDictionary *pushyInfo = [defaults dictionaryForKey:keyPushyInfo];
     ret[@"currentVersion"] = [pushyInfo objectForKey:paramCurrentVersion];
     
@@ -188,6 +187,23 @@ RCT_EXPORT_MODULE(RCTPushy);
     return self;
 }
 
+RCT_EXPORT_METHOD(setBlockUpdate:(NSDictionary *)options)
+{
+    // NSMutableDictionary *blockUpdateInfo = [NSMutableDictionary new];
+    // blockUpdateInfo[@"reason"] = options[@"reason"];
+    // blockUpdateInfo[@"until"] = options[@"until"];
+    NSUserDefaults *defaults = [NSUserDefaults standardUserDefaults];
+    [defaults setObject:options forKey:keyBlockUpdate];
+    [defaults synchronize];
+}
+
+RCT_EXPORT_METHOD(setUuid:(NSString *)uuid)
+{
+    NSUserDefaults *defaults = [NSUserDefaults standardUserDefaults];
+    [defaults setObject:uuid forKey:keyUuid];
+    [defaults synchronize];
+}
+
 RCT_EXPORT_METHOD(downloadUpdate:(NSDictionary *)options
                   resolver:(RCTPromiseResolveBlock)resolve
                   rejecter:(RCTPromiseRejectBlock)reject)
@@ -260,10 +276,12 @@ RCT_EXPORT_METHOD(reloadUpdate:(NSDictionary *)options)
         [self setNeedUpdate:options];
         
         // reload
-        dispatch_async(dispatch_get_main_queue(), ^{
+        RCTReloadCommandSetBundleURL([[self class] bundleURL]);
-            [_bridge setValue:[[self class] bundleURL] forKey:@"bundleURL"];
+        RCTTriggerReloadCommandListeners(@"pushy reload");
-            [_bridge reload];
+//        dispatch_async(dispatch_get_main_queue(), ^{
-        });
+//            [self.bridge setValue:[[self class] bundleURL] forKey:@"bundleURL"];
+//            [self.bridge reload];
+//        });
     }
 }
 
@@ -281,7 +299,27 @@ RCT_EXPORT_METHOD(markSuccess)
     [self clearInvalidFiles];
 }
 
+
+
 #pragma mark - private
+- (NSArray<NSString *> *)supportedEvents
+{
+  return @[EVENT_PROGRESS_DOWNLOAD, EVENT_PROGRESS_UNZIP];
+}
+
+// Will be called when this module's first listener is added.
+-(void)startObserving {
+    hasListeners = YES;
+    // Set up any upstream listeners or background tasks as necessary
+}
+
+// Will be called when this module's last listener is removed, or on dealloc.
+-(void)stopObserving {
+    hasListeners = NO;
+    // Remove upstream listeners, stop unnecessary background tasks
+}
+
+
 - (void)doPushy:(PushyType)type options:(NSDictionary *)options callback:(void (^)(NSError *error))callback
 {
     NSString *updateUrl = [RCTConvert NSString:options[@"updateUrl"]];
@@ -302,18 +340,19 @@ RCT_EXPORT_METHOD(markSuccess)
         callback([self errorWithMessage:ERROR_FILE_OPERATION]);
         return;
     }
-    
+
     NSString *zipFilePath = [dir stringByAppendingPathComponent:[NSString stringWithFormat:@"%@%@",hashName, [self zipExtension:type]]];
-    NSString *unzipDir = [dir stringByAppendingPathComponent:hashName];
+//    NSString *unzipDir = [dir stringByAppendingPathComponent:hashName];
 
     RCTLogInfo(@"RCTPushy -- download file %@", updateUrl);
     [RCTPushyDownloader download:updateUrl savePath:zipFilePath progressHandler:^(long long receivedBytes, long long totalBytes) {
-        [self.bridge.eventDispatcher sendAppEventWithName:EVENT_PROGRESS_DOWNLOAD
+        if (self->hasListeners) {
-                                                     body:@{
+            [self sendEventWithName:EVENT_PROGRESS_DOWNLOAD body:@{
-                                                            PARAM_PROGRESS_HASHNAME:hashName,
+                PARAM_PROGRESS_HASHNAME:hashName,
-                                                            PARAM_PROGRESS_RECEIVED:[NSNumber numberWithLongLong:receivedBytes],
+                PARAM_PROGRESS_RECEIVED:[NSNumber numberWithLongLong:receivedBytes],
-                                                            PARAM_PROGRESS_TOTAL:[NSNumber numberWithLongLong:totalBytes]
+                PARAM_PROGRESS_TOTAL:[NSNumber numberWithLongLong:totalBytes]
-                                                            }];
+            }];
+        }
     } completionHandler:^(NSString *path, NSError *error) {
         if (error) {
             callback(error);
@@ -321,16 +360,18 @@ RCT_EXPORT_METHOD(markSuccess)
         else {
             RCTLogInfo(@"RCTPushy -- unzip file %@", zipFilePath);
             NSString *unzipFilePath = [dir stringByAppendingPathComponent:hashName];
-            [_fileManager unzipFileAtPath:zipFilePath toDestination:unzipFilePath progressHandler:^(NSString *entry,long entryNumber, long total) {
+            [self->_fileManager unzipFileAtPath:zipFilePath toDestination:unzipFilePath progressHandler:^(NSString *entry,long entryNumber, long total) {
-                [self.bridge.eventDispatcher sendAppEventWithName:EVENT_PROGRESS_UNZIP
+                if (self->hasListeners) {
-                                                             body:@{
+                    [self sendEventWithName:EVENT_PROGRESS_UNZIP
-                                                                    PARAM_PROGRESS_HASHNAME:hashName,
+                                       body:@{
-                                                                    PARAM_PROGRESS_RECEIVED:[NSNumber numberWithLong:entryNumber],
+                                           PARAM_PROGRESS_HASHNAME:hashName,
-                                                                    PARAM_PROGRESS_TOTAL:[NSNumber numberWithLong:total]
+                                           PARAM_PROGRESS_RECEIVED:[NSNumber numberWithLong:entryNumber],
-                                                                    }];
+                                           PARAM_PROGRESS_TOTAL:[NSNumber numberWithLong:total]
+                                       }];
+                }
                 
             } completionHandler:^(NSString *path, BOOL succeeded, NSError *error) {
-                dispatch_async(_methodQueue, ^{
+                dispatch_async(self->_methodQueue, ^{
                     if (error) {
                         callback(error);
                     }
@@ -345,10 +386,10 @@ RCT_EXPORT_METHOD(markSuccess)
                                 break;
                             case PushyTypePatchFromPpk:
                             {
-                                NSString *lastVertionDir = [dir stringByAppendingPathComponent:originHashName];
+                                NSString *lastVersionDir = [dir stringByAppendingPathComponent:originHashName];
                                 
-                                NSString *sourceOrigin = lastVertionDir;
+                                NSString *sourceOrigin = lastVersionDir;
-                                NSString *bundleOrigin = [lastVertionDir stringByAppendingPathComponent:BUNDLE_FILE_NAME];
+                                NSString *bundleOrigin = [lastVersionDir stringByAppendingPathComponent:BUNDLE_FILE_NAME];
                                 [self patch:hashName fromBundle:bundleOrigin source:sourceOrigin callback:callback];
                             }
                                 break;
@@ -383,7 +424,7 @@ RCT_EXPORT_METHOD(markSuccess)
             NSDictionary *copies = json[@"copies"];
             NSDictionary *deletes = json[@"deletes"];
 
-            [_fileManager copyFiles:copies fromDir:sourceOrigin toDir:unzipDir deletes:deletes completionHandler:^(NSError *error) {
+            [self->_fileManager copyFiles:copies fromDir:sourceOrigin toDir:unzipDir deletes:deletes completionHandler:^(NSError *error) {
                 if (error) {
                     callback(error);
                 }
@@ -424,7 +465,7 @@ RCT_EXPORT_METHOD(markSuccess)
         case PushyTypeFullDownload:
             return @".ppk";
         case PushyTypePatchFromPackage:
-            return @".apk.patch";
+            return @".ipa.patch";
         case PushyTypePatchFromPpk:
             return @".ppk.patch";
         default:

ios/RCTPushy/RCTPushyManager.m

@@ -99,16 +99,9 @@ completionHandler:(void (^)(NSError *error))completionHandler
 
         // merge old files
         if (deletes!= nil) {
-            NSError *error = nil;
             NSString *srcDir = [fromDir stringByAppendingPathComponent:@"assets"];
             NSString *desDir = [toDir stringByAppendingPathComponent:@"assets"];
-            [self _mergeContentsOfPath:srcDir intoPath:desDir deletes:deletes error:&error];
+            [self _mergeContentsOfPath:srcDir intoPath:desDir deletes:deletes];
-            if (error) {
-                if (completionHandler) {
-                    completionHandler(error);
-                }
-                return;
-            }
         }
         
         // copy files
@@ -126,10 +119,11 @@ completionHandler:(void (^)(NSError *error))completionHandler
             NSError *error = nil;
             [fm copyItemAtPath:fromPath toPath:toPath error:&error];
             if (error) {
-                if (completionHandler) {
+                NSLog(@"Pushy copy error: %@", error.localizedDescription);
-                    completionHandler(error);
+                // if (completionHandler) {
-                }
+                //     completionHandler(error);
-                return;
+                // }
+                // return;
             }
         }
         if (completionHandler) {
@@ -150,7 +144,7 @@ completionHandler:(void (^)(NSError *error))completionHandler
     });
 }
 
-- (void)_mergeContentsOfPath:(NSString *)srcDir intoPath:(NSString *)dstDir deletes:(NSDictionary *)deletes error:(NSError**)err
+- (void)_mergeContentsOfPath:(NSString *)srcDir intoPath:(NSString *)dstDir deletes:(NSDictionary *)deletes
 {
     NSFileManager *fm = [NSFileManager defaultManager];
     NSDirectoryEnumerator *srcDirEnum = [fm enumeratorAtPath:srcDir];
@@ -159,7 +153,9 @@ completionHandler:(void (^)(NSError *error))completionHandler
         
         NSString *srcFullPath =  [srcDir stringByAppendingPathComponent:subPath];
         NSString *potentialDstPath = [dstDir stringByAppendingPathComponent:subPath];
-        
+
+        NSError *error = nil;
+
         BOOL inDeletes = NO;
         if (deletes) {
             NSString *path = [@"assets" stringByAppendingPathComponent:subPath];
@@ -171,18 +167,19 @@ completionHandler:(void (^)(NSError *error))completionHandler
             BOOL isDirectory = ([fm fileExistsAtPath:srcFullPath isDirectory:&isDirectory] && isDirectory);
             if (isDirectory) {
                 if (![fm fileExistsAtPath:potentialDstPath isDirectory:nil]) {
-                    [fm createDirectoryAtPath:potentialDstPath withIntermediateDirectories:YES attributes:nil error:err];
+                    [fm createDirectoryAtPath:potentialDstPath withIntermediateDirectories:YES attributes:nil error:&error];
-                    if (err && *err) {
+                    if (error) {
-                        return;
+                        NSLog(@"Pushy merge error: %@", error.localizedDescription);
+                        // return;
                     }
                 }
             }
             else {
-                
                 if (![fm fileExistsAtPath:potentialDstPath]) {
-                    [fm copyItemAtPath:srcFullPath toPath:potentialDstPath error:err];
+                    [fm copyItemAtPath:srcFullPath toPath:potentialDstPath error:&error];
-                    if (err && *err) {
+                    if (error) {
-                        return;
+                        NSLog(@"Pushy merge error: %@", error.localizedDescription);
+                        // return;
                     }
                 }
             }

ios/pushy_build_time.txt

@@ -0,0 +1 @@
+1574665292

lib/endpoint.js

@@ -0,0 +1,89 @@
+let currentEndpoint = 'https://update.react-native.cn/api';
+
+function ping(url, rejectImmediate) {
+  return new Promise((resolve, reject) => {
+    const xhr = new XMLHttpRequest();
+    xhr.onreadystatechange = (e) => {
+      if (xhr.readyState !== 4) {
+        return;
+      }
+      if (xhr.status === 200) {
+        resolve(url);
+      } else {
+        rejectImmediate ? reject() : setTimeout(reject, 5000);
+      }
+    };
+    xhr.open('HEAD', url);
+    xhr.send();
+    xhr.timeout = 5000;
+    xhr.ontimeout = reject;
+  });
+}
+
+function logger(...args) {
+  // console.warn('pushy', ...args);
+}
+
+let backupEndpoints = [];
+let backupEndpointsQueryUrl =
+  'https://cdn.jsdelivr.net/gh/reactnativecn/react-native-pushy@master/endpoints.json';
+
+export async function tryBackupEndpoints() {
+  if (!backupEndpoints.length && !backupEndpointsQueryUrl) {
+    return;
+  }
+  try {
+    await ping(getStatusUrl(), true);
+    logger('current endpoint ok');
+    return;
+  } catch (e) {
+    logger('current endpoint failed');
+  }
+  if (!backupEndpoints.length && backupEndpointsQueryUrl) {
+    try {
+      const resp = await fetch(backupEndpointsQueryUrl);
+      backupEndpoints = await resp.json();
+      logger('get remote endpoints:', backupEndpoints);
+    } catch (e) {
+      logger('get remote endpoints failed');
+      return;
+    }
+  }
+  await pickFatestAvailableEndpoint();
+}
+
+async function pickFatestAvailableEndpoint(endpoints = backupEndpoints) {
+  const fastestEndpoint = await Promise.race(
+    endpoints.map(pingAndReturnEndpoint),
+  );
+  if (typeof fastestEndpoint === 'string') {
+    logger(`pick endpoint: ${fastestEndpoint}`);
+    currentEndpoint = fastestEndpoint;
+  } else {
+    logger('all remote endpoints failed');
+  }
+}
+
+async function pingAndReturnEndpoint(endpoint = currentEndpoint) {
+  return ping(getStatusUrl(endpoint)).then(() => endpoint);
+}
+
+function getStatusUrl(endpoint = currentEndpoint) {
+  return `${endpoint}/status`;
+}
+
+export function getCheckUrl(APPKEY, endpoint = currentEndpoint) {
+  return `${endpoint}/checkUpdate/${APPKEY}`;
+}
+
+export function setCustomEndpoints({ main, backups, backupQueryUrl }) {
+  currentEndpoint = main;
+  backupEndpointsQueryUrl = null;
+  if (Array.isArray(backups) && backups.length > 0) {
+    backupEndpoints = backups;
+    pickFatestAvailableEndpoint();
+  }
+  if (typeof backupQueryUrl === 'string') {
+    backupEndpointsQueryUrl = backupQueryUrl;
+  }
+}

lib/index.d.ts

@@ -19,19 +19,49 @@ export interface UpdateAvailableResult {
   hash: string;
   description: string;
   metaInfo: string;
-  updateUrl: string;
   pdiffUrl: string;
-  diffUrl: string;
+  diffUrl?: string;
 }
 
-export type CheckResult = Partial<ExpiredResult & UpTodateResult & UpdateAvailableResult>;
+export type CheckResult =
+  | ExpiredResult
+  | UpTodateResult
+  | UpdateAvailableResult;
 
 export function checkUpdate(appkey: string): Promise<CheckResult>;
 
-export function downloadUpdate(options: UpdateAvailableResult): Promise<undefined | string>;
+export function downloadUpdate(
+  info: UpdateAvailableResult,
+  eventListeners?: {
+    onDownloadProgress?: (data: ProgressData) => void;
+    onUnzipProgress?: (data: ProgressData) => void;
+  },
+): Promise<undefined | string>;
 
 export function switchVersion(hash: string): void;
 
 export function switchVersionLater(hash: string): void;
 
 export function markSuccess(): void;
+
+/**
+ * @param {string} main - The main api endpoint
+ * @param {string[]} [backups] - The back up endpoints.
+ * @param {string} [backupQueryUrl] - An url that return a json file containing an array of endpoint.
+ *                                    like: ["https://backup.api/1", "https://backup.api/2"]
+ */
+export function setCustomEndpoints({
+  main,
+  backups,
+  backupQueryUrl,
+}: {
+  main: string;
+  backUps?: string[];
+  backupQueryUrl?: string;
+}): void;
+
+interface ProgressData {
+  hashname: string;
+  received: number;
+  total: number;
+}

lib/index.js

@@ -1,7 +1,21 @@
-import { NativeAppEventEmitter, NativeModules } from 'react-native';
+import {
-const Pushy = NativeModules.Pushy || {};
+  tryBackupEndpoints,
+  getCheckUrl,
+  setCustomEndpoints,
+} from './endpoint';
+import { NativeEventEmitter, NativeModules, Platform } from 'react-native';
+export { setCustomEndpoints };
+const {
+  version: v,
+} = require('react-native/Libraries/Core/ReactNativeVersion');
+const RNVersion = `${v.major}.${v.minor}.${v.patch}`;
+const uuidv4 = require('uuid/v4');
 
-const host = 'https://update.reactnative.cn/api';
+let Pushy = NativeModules.Pushy;
+
+if (!Pushy) {
+  throw new Error('react-native-update模块无法加载，请对照安装文档检查配置。');
+}
 
 export const downloadRootDir = Pushy.downloadRootDir;
 export const packageVersion = Pushy.packageVersion;
@@ -9,10 +23,31 @@ 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的配置',
+  );
+}
+
+const eventEmitter = new NativeEventEmitter(Pushy);
+
+if (!uuid) {
+  uuid = uuidv4();
+  Pushy.setUuid(uuid);
+}
+
+function logger(text) {
+  console.log(`Pushy: ${text}`);
+}
+
+logger('uuid: ' + uuid);
 
 /*
 Return json:
-Package was expired:
+Package expired:
 {
   expired: true,
   downloadUrl: 'http://appstore/downloadUrl',
@@ -28,7 +63,6 @@ There is available update:
   hash: 'hash',
   description: '添加聊天功能\n修复商城页面BUG',
   metaInfo: '{"silent":true}',
-  updateUrl: 'http://update-packages.reactnative.cn/hash',
   pdiffUrl: 'http://update-packages.reactnative.cn/hash',
   diffUrl: 'http://update-packages.reactnative.cn/hash',
 }
@@ -40,69 +74,127 @@ function assertRelease() {
   }
 }
 
-export async function checkUpdate(APPKEY) {
+export async function checkUpdate(APPKEY, isRetry) {
   assertRelease();
-  const resp = await fetch(`${host}/checkUpdate/${APPKEY}`, {
+  if (blockUpdate && blockUpdate.until > Date.now() / 1000) {
-    method: 'POST',
+    throw new Error(
-    headers: {
+      `热更新已暂停，原因：${blockUpdate.reason}。请在"${new Date(
-      Accept: 'application/json',
+        blockUpdate.until * 1000,
-      'Content-Type': 'application/json',
+      ).toLocaleString()}"之后重试。`,
-    },
+    );
-    body: JSON.stringify({
+  }
-      packageVersion,
+  if (typeof APPKEY !== 'string') {
-      hash: currentVersion,
+    throw new Error('未检查到合法的APPKEY，请查看update.json文件是否正确生成');
-      buildTime,
+  }
-    }),
+  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: {
+          pushy: require('../package.json').version,
+          rn: RNVersion,
+          os: Platform.OS + ' ' + Platform.Version,
+          uuid,
+        },
+      }),
+    });
+  } 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((await resp.json()).message);
+    throw new Error(result.message);
   }
 
-  return resp.json();
+  return result;
 }
 
-export async function downloadUpdate(options) {
+function checkOperation(op) {
+  if (!Array.isArray(op)) {
+    return;
+  }
+  op.forEach((action) => {
+    if (action.type === 'block') {
+      blockUpdate = {
+        reason: action.reason,
+        until: (Date.now() + action.duration) / 1000,
+      };
+      Pushy.setBlockUpdate(blockUpdate);
+    }
+  });
+}
+
+export async function downloadUpdate(options, eventListeners) {
   assertRelease();
   if (!options.update) {
     return;
   }
-
+  if (eventListeners) {
+    if (eventListeners.onDownloadProgress) {
+      const downloadCallback = eventListeners.onDownloadProgress;
+      eventEmitter.addListener('RCTPushyDownloadProgress', (progressData) => {
+        if (progressData.hash === options.hash) {
+          downloadCallback(progressData);
+        }
+      });
+    }
+    if (eventListeners.onUnzipProgress) {
+      const unzipCallback = eventListeners.onUnzipProgress;
+      eventEmitter.addListener('RCTPushyUnzipProgress', (progressData) => {
+        if (progressData.hash === options.hash) {
+          unzipCallback(progressData);
+        }
+      });
+    }
+  }
   if (options.diffUrl) {
+    logger('downloading diff');
     await Pushy.downloadPatchFromPpk({
       updateUrl: options.diffUrl,
       hashName: options.hash,
       originHashName: currentVersion,
     });
   } else if (options.pdiffUrl) {
+    logger('downloading pdiff');
     await Pushy.downloadPatchFromPackage({
       updateUrl: options.pdiffUrl,
       hashName: options.hash,
     });
-  } else {
-    await Pushy.downloadUpdate({
-      updateUrl: options.updateUrl,
-      hashName: options.hash,
-    });
   }
+  eventEmitter.removeAllListeners('RCTPushyDownloadProgress');
+  eventEmitter.removeAllListeners('RCTPushyUnzipProgress');
   return options.hash;
 }
 
 export function switchVersion(hash) {
   assertRelease();
+  logger('switchVersion');
   Pushy.reloadUpdate({ hashName: hash });
 }
 
 export function switchVersionLater(hash) {
   assertRelease();
+  logger('switchVersionLater');
   Pushy.setNeedUpdate({ hashName: hash });
 }
 
 export function markSuccess() {
   assertRelease();
+  logger('markSuccess');
   Pushy.markSuccess();
 }
-
-NativeAppEventEmitter.addListener('RCTPushyDownloadProgress', params => {});
-
-NativeAppEventEmitter.addListener('RCTPushyUnzipProgress', params => {});

local-cli/.babelrc

@@ -1,14 +0,0 @@
-{
-  "plugins": [
-    "syntax-object-rest-spread",
-    "syntax-async-functions",
-    "transform-es2015-arrow-functions",
-    "transform-async-to-generator",
-    "transform-es2015-modules-commonjs",
-    "transform-es2015-destructuring",
-    "transform-es2015-spread",
-    "transform-object-rest-spread",
-    "transform-es2015-parameters",
-    "transform-strict-mode"
-  ]
-}

local-cli/cli.json

@@ -1,162 +0,0 @@
-{
-  "useCommand": true,
-  "defaultCommand": "help",
-  "commands": {
-    "help": {
-    },
-
-    "login":{
-    },
-    "logout": {
-    },
-    "me": {
-    },
-
-    "createApp": {
-      "options": {
-        "name": {
-          "hasValue": true
-        },
-        "platform": {
-          "hasValue": true
-        }
-      }
-    },
-    "apps": {
-      "options": {
-        "platform": {
-          "hasValue": true
-        }
-      }
-    },
-    "deleteApp": {
-    },
-    "selectApp": {
-      "options": {
-        "platform": {
-          "hasValue": true
-        }
-      }
-    },
-
-    "uploadIpa": {
-    },
-    "uploadApk": {
-    },
-    "packages": {
-      "options": {
-        "platform": {
-          "hasValue": true
-        }
-      }
-    },
-
-    "publish": {
-      "options": {
-        "platform": {
-          "hasValue": true
-        },
-        "name": {
-          "hasValue": true
-        },
-        "description": {
-          "hasValue": true
-        },
-        "metaInfo": {
-          "hasValue": true
-        }
-      }
-    },
-    "versions": {
-      "options": {
-        "platform": {
-          "hasValue": true
-        }
-      }
-    },
-
-    "update": {
-      "options": {
-        "platform": {
-          "hasValue": true
-        },
-        "versionId": {
-          "hasValue": true
-        },
-        "packageId": {
-          "hasValue": true
-        }
-      }
-    },
-
-    "build": {
-      "description": "Bundle javascript and copy assets."
-    },
-    "bundle": {
-      "description": "Bundle javascript code only.",
-      "options": {
-        "dev": {
-          "default": "false",
-          "hasValue": true
-        },
-        "platform": {
-          "hasValue": true
-        },
-        "bundleName":{
-          "default": "index.bundlejs",
-          "hasValue": true
-        },
-        "entryFile": {
-          "default": "index.js",
-          "hasValue": true
-        },
-        "intermediaDir": {
-          "default": "build/intermedia/${platform}",
-          "hasValue": true
-        },
-        "output": {
-          "default": "build/output/${platform}.${time}.ppk",
-          "hasValue": true
-        },
-        "verbose": {
-
-        }
-      }
-    },
-    "release": {
-      "description": "Push builded file to server."
-    },
-    "diff": {
-      "description": "Create diff patch",
-      "options": {
-        "output": {
-          "default": "build/output/diff",
-          "hasValue": true
-        }
-      }
-    },
-    "diffFromApk": {
-      "description": "Create diff patch from a Android package(.apk)",
-      "options": {
-        "output": {
-          "default": "build/output/diff-${time}.apk-patch",
-          "hasValue": true
-        }
-      }
-    },
-    "diffFromIpa": {
-      "description": "Create diff patch from a iOS package(.ipa)",
-      "options": {
-        "output": {
-          "default": "build/output/diff-${time}.ipa-patch",
-          "hasValue": true
-        }
-      }
-    }
-  },
-  "globalOptions":{
-    "no-interactive": {
-      "default": false
-    }
-  }
-}

local-cli/index.js

@@ -1,4 +0,0 @@
-/**
- * Created by tdzl2003 on 2/22/16.
- */
-module.exports = require('./lib');

local-cli/src/api.js

@@ -1,132 +0,0 @@
-/**
- * Created by tdzl2003 on 2/13/16.
- */
-
-const fetch = require('isomorphic-fetch');
-let host = process.env.PUSHY_REGISTRY || 'https://update.reactnative.cn/api';
-const fs = require('fs-extra');
-import request from 'request';
-import ProgressBar from 'progress';
-
-let session = undefined;
-let savedSession = undefined;
-
-exports.loadSession = async function() {
-  if (fs.existsSync('.update')) {
-    try {
-      exports.replaceSession(JSON.parse(fs.readFileSync('.update', 'utf8')));
-      savedSession = session;
-    } catch (e) {
-      console.error('Failed to parse file `.update`. Try to remove it manually.');
-      throw e;
-    }
-  }
-};
-
-exports.getSession = function() {
-  return session;
-};
-
-exports.replaceSession = function(newSession) {
-  session = newSession;
-};
-
-exports.saveSession = function() {
-  // Only save on change.
-  if (session !== savedSession) {
-    const current = session;
-    const data = JSON.stringify(current, null, 4);
-    fs.writeFileSync('.update', data, 'utf8');
-    savedSession = current;
-  }
-};
-
-exports.closeSession = function() {
-  if (fs.existsSync('.update')) {
-    fs.unlinkSync('.update');
-    savedSession = undefined;
-  }
-  session = undefined;
-  host = process.env.PUSHY_REGISTRY || 'https://update.reactnative.cn';
-};
-
-async function query(url, options) {
-  const resp = await fetch(url, options);
-  const json = await resp.json();
-  if (resp.status !== 200) {
-    throw Object.assign(new Error(json.message || json.error), { status: resp.status });
-  }
-  return json;
-}
-
-function queryWithoutBody(method) {
-  return function(api) {
-    return query(host + api, {
-      method,
-      headers: {
-        'X-AccessToken': session ? session.token : '',
-      },
-    });
-  };
-}
-
-function queryWithBody(method) {
-  return function(api, body) {
-    return query(host + api, {
-      method,
-      headers: {
-        'Content-Type': 'application/json',
-        'X-AccessToken': session ? session.token : '',
-      },
-      body: JSON.stringify(body),
-    });
-  };
-}
-
-exports.get = queryWithoutBody('GET');
-exports.post = queryWithBody('POST');
-exports.put = queryWithBody('PUT');
-exports.doDelete = queryWithBody('DELETE');
-
-async function uploadFile(fn) {
-  const { url, fieldName, formData } = await exports.post('/upload', {});
-  let realUrl = url;
-
-  if (!/^https?\:\/\//.test(url)) {
-    realUrl = host + url;
-  }
-
-  const fileSize = fs.statSync(fn).size;
-
-  const bar = new ProgressBar('  Uploading [:bar] :percent :etas', {
-    complete: '=',
-    incomplete: ' ',
-    total: fileSize,
-  });
-
-  const info = await new Promise((resolve, reject) => {
-    formData.file = fs.createReadStream(fn);
-
-    formData.file.on('data', function(data) {
-      bar.tick(data.length);
-    });
-    request.post(
-      realUrl,
-      {
-        formData,
-      },
-      (err, resp, body) => {
-        if (err) {
-          return reject(err);
-        }
-        if (resp.statusCode > 299) {
-          return reject(Object.assign(new Error(body), { status: resp.statusCode }));
-        }
-        resolve(JSON.parse(body));
-      },
-    );
-  });
-  return info;
-}
-
-exports.uploadFile = uploadFile;

local-cli/src/app.js

@@ -1,110 +0,0 @@
-/**
- * Created by tdzl2003 on 2/13/16.
- */
-
-import {question} from './utils';
-import * as fs from 'fs-extra';
-
-const {
-  post,
-  get,
-  doDelete,
-} = require('./api');
-
-const validPlatforms = {
-  ios: 1,
-  android: 1,
-};
-
-export function checkPlatform(platform) {
-  if (!validPlatforms[platform]) {
-    throw new Error(`Invalid platform '${platform}'`);
-  }
-  return platform
-}
-
-export function getSelectedApp(platform) {
-  checkPlatform(platform);
-
-  if (!fs.existsSync('update.json')){
-    throw new Error(`App not selected. run 'pushy selectApp --platform ${platform}' first!`);
-  }
-  const updateInfo = JSON.parse(fs.readFileSync('update.json', 'utf8'));
-  if (!updateInfo[platform]) {
-    throw new Error(`App not selected. run 'pushy selectApp --platform ${platform}' first!`);
-  }
-  return updateInfo[platform];
-}
-
-export async function listApp(platform){
-  const {data} = await get('/app/list');
-  const list = platform?data.filter(v=>v.platform===platform):data;
-  for (const app of list) {
-    console.log(`${app.id}) ${app.name}(${app.platform})`);
-  }
-  if (platform) {
-    console.log(`\nTotal ${list.length} ${platform} apps`);
-  } else {
-    console.log(`\nTotal ${list.length} apps`);
-  }
-  return list;
-}
-
-export async function chooseApp(platform) {
-  const list = await listApp(platform);
-
-  while (true) {
-    const id = await question('Enter appId:');
-    const app = list.find(v=>v.id === (id|0));
-    if (app) {
-      return app;
-    }
-  }
-}
-
-export const commands = {
-  createApp: async function ({options}) {
-    const name = options.name || await question('App Name:');
-    const {downloadUrl} = options;
-    const platform = checkPlatform(options.platform || await question('Platform(ios/android):'));
-    const {id} = await post('/app/create', {name, platform});
-    console.log(`Created app ${id}`);
-    await this.selectApp({
-      args: [id],
-      options: {platform, downloadUrl},
-    });
-  },
-  deleteApp: async function ({args, options}) {
-    const {platform} = options;
-    const id = args[0] || chooseApp(platform);
-    if (!id) {
-      console.log('Canceled');
-    }
-    await doDelete(`/app/${id}`);
-    console.log('Ok.');
-  },
-  apps: async function ({options}){
-    const {platform} = options;
-    listApp(platform);
-  },
-  selectApp: async function({args, options}) {
-    const platform = checkPlatform(options.platform || await question('Platform(ios/android):'));
-    const id = args[0] || (await chooseApp(platform)).id;
-
-    let updateInfo = {};
-    if (fs.existsSync('update.json')) {
-      try {
-        updateInfo = JSON.parse(fs.readFileSync('update.json', 'utf8'));
-      } catch (e) {
-        console.error('Failed to parse file `update.json`. Try to remove it manually.');
-        throw e;
-      }
-    }
-    const {appKey} = await get(`/app/${id}`);
-    updateInfo[platform] = {
-      appId: id,
-      appKey,
-    };
-    fs.writeFileSync('update.json', JSON.stringify(updateInfo, null, 4), 'utf8');
-  },
-}

local-cli/src/bundle.js

@@ -1,506 +0,0 @@
-/**
- * Created by tdzl2003 on 2/22/16.
- */
-
-const path = require('path');
-import { getRNVersion, translateOptions } from './utils';
-import * as fs from 'fs-extra';
-import { ZipFile } from 'yazl';
-import { open as openZipFile } from 'yauzl';
-import { question } from './utils';
-import { checkPlatform } from './app';
-const { spawn, spawnSync, execSync } = require('child_process');
-const g2js = require('gradle-to-js/lib/parser');
-const os = require('os');
-
-var diff;
-try {
-  var bsdiff = require('node-bsdiff');
-  diff = typeof bsdiff != 'function' ? bsdiff.diff : bsdiff;
-} catch (e) {
-  diff = function() {
-    console.warn(
-      'This function needs "node-bsdiff". Please run "npm i node-bsdiff" from your project directory first!',
-    );
-    throw new Error('This function needs module "node-bsdiff". Please install it first.');
-  };
-}
-
-function exec(command) {
-  const commandResult = spawnSync(command, {
-    shell: true,
-    stdio: 'inherit',
-  });
-  if (commandResult.error) {
-    throw commandResult.error;
-  }
-}
-
-async function runReactNativeBundleCommand(
-  bundleName,
-  development,
-  entryFile,
-  outputFolder,
-  platform,
-  sourcemapOutput,
-  config,
-) {
-  let reactNativeBundleArgs = [];
-
-  let envArgs = process.env.PUSHY_ENV_ARGS;
-
-  if (envArgs) {
-    Array.prototype.push.apply(reactNativeBundleArgs, envArgs.trim().split(/\s+/));
-  }
-
-  fs.emptyDirSync(outputFolder);
-
-  Array.prototype.push.apply(reactNativeBundleArgs, [
-    path.join("node_modules", "react-native", "local-cli", "cli.js"), 
-    "bundle",
-    '--assets-dest',
-    outputFolder,
-    '--bundle-output',
-    path.join(outputFolder, bundleName),
-    '--dev',
-    development,
-    '--entry-file',
-    entryFile,
-    '--platform',
-    platform,
-  ]);
-
-  if (sourcemapOutput) {
-    reactNativeBundleArgs.push('--sourcemap-output', sourcemapOutput);
-  }
-
-  if (config) {
-    reactNativeBundleArgs.push('--config', config);
-  }
-
-  const reactNativeBundleProcess = spawn('node', reactNativeBundleArgs);
-  console.log(`Running bundle command: node ${reactNativeBundleArgs.join(' ')}`);
-
-  return new Promise((resolve, reject) => {
-    reactNativeBundleProcess.stdout.on('data', data => {
-      console.log(data.toString().trim());
-    });
-
-    reactNativeBundleProcess.stderr.on('data', data => {
-      console.error(data.toString().trim());
-    });
-
-    reactNativeBundleProcess.on('close', async exitCode => {
-      if (exitCode) {
-        reject(new Error(`"react-native bundle" command exited with code ${exitCode}.`));
-      } else {
-        if (platform === 'android') {
-          await compileHermesByteCode(bundleName, outputFolder);
-        }
-        resolve(null);
-      }
-    });
-  });
-}
-
-function getHermesOSBin() {
-  if (os.platform() === 'win32') return 'win64-bin';
-  if (os.platform() === 'darwin') return 'osx-bin';
-  if (os.platform() === 'linux') return 'linux64-bin';
-}
-
-async function compileHermesByteCode(bundleName, outputFolder) {
-  let enableHermes = false;
-  try {
-    const gradleConfig = await g2js.parseFile('android/app/build.gradle');
-    const projectConfig = gradleConfig['project.ext.react'];
-    for (const packagerConfig of projectConfig) {
-      if (packagerConfig.includes('enableHermes') && packagerConfig.includes('true')) {
-        enableHermes = true;
-        break;
-      }
-    }
-  } catch (e) {}
-  if (enableHermes) {
-    console.log(`Hermes enabled, now compiling to hermes bytecode:\n`);
-    const hermesPath = fs.existsSync('node_modules/hermes-engine')
-      ? 'node_modules/hermes-engine'
-      : 'node_modules/hermesvm';
-    execSync(
-      `${hermesPath}/${getHermesOSBin()}/hermes -emit-binary -out ${outputFolder}/${bundleName} ${outputFolder}/${bundleName} -O`,
-    );
-  }
-}
-
-async function pack(dir, output) {
-  console.log('Packing');
-  fs.ensureDirSync(path.dirname(output));
-  await new Promise((resolve, reject) => {
-    var zipfile = new ZipFile();
-
-    function addDirectory(root, rel) {
-      if (rel) {
-        zipfile.addEmptyDirectory(rel);
-      }
-      const childs = fs.readdirSync(root);
-      for (const name of childs) {
-        if (name === '.' || name === '..') {
-          continue;
-        }
-        const fullPath = path.join(root, name);
-        const stat = fs.statSync(fullPath);
-        if (stat.isFile()) {
-          //console.log('adding: ' + rel+name);
-          zipfile.addFile(fullPath, rel + name);
-        } else if (stat.isDirectory()) {
-          //console.log('adding: ' + rel+name+'/');
-          addDirectory(fullPath, rel + name + '/');
-        }
-      }
-    }
-
-    addDirectory(dir, '');
-
-    zipfile.outputStream.on('error', err => reject(err));
-    zipfile.outputStream.pipe(fs.createWriteStream(output)).on('close', function() {
-      resolve();
-    });
-    zipfile.end();
-  });
-  console.log('Bundled saved to: ' + output);
-}
-
-function readEntire(entry, zipFile) {
-  const buffers = [];
-  return new Promise((resolve, reject) => {
-    zipFile.openReadStream(entry, (err, stream) => {
-      stream.pipe({
-        write(chunk) {
-          buffers.push(chunk);
-        },
-        end() {
-          resolve(Buffer.concat(buffers));
-        },
-        prependListener() {},
-        on() {},
-        once() {},
-        emit() {},
-      });
-    });
-  });
-}
-
-function basename(fn) {
-  const m = /^(.+\/)[^\/]+\/?$/.exec(fn);
-  return m && m[1];
-}
-
-async function diffFromPPK(origin, next, output) {
-  fs.ensureDirSync(path.dirname(output));
-
-  const originEntries = {};
-  const originMap = {};
-
-  let originSource;
-
-  await enumZipEntries(origin, (entry, zipFile) => {
-    originEntries[entry.fileName] = entry;
-    if (!/\/$/.test(entry.fileName)) {
-      // isFile
-      originMap[entry.crc32] = entry.fileName;
-
-      if (entry.fileName === 'index.bundlejs') {
-        // This is source.
-        return readEntire(entry, zipFile).then(v => (originSource = v));
-      }
-    }
-  });
-
-  originSource = originSource || new Buffer(0);
-
-  const copies = {};
-
-  var zipfile = new ZipFile();
-
-  const writePromise = new Promise((resolve, reject) => {
-    zipfile.outputStream.on('error', err => {
-      throw err;
-    });
-    zipfile.outputStream.pipe(fs.createWriteStream(output)).on('close', function() {
-      resolve();
-    });
-  });
-
-  const addedEntry = {};
-
-  function addEntry(fn) {
-    //console.log(fn);
-    if (!fn || addedEntry[fn]) {
-      return;
-    }
-    const base = basename(fn);
-    if (base) {
-      addEntry(base);
-    }
-    zipfile.addEmptyDirectory(fn);
-  }
-
-  const newEntries = {};
-
-  await enumZipEntries(next, (entry, nextZipfile) => {
-    newEntries[entry.fileName] = entry;
-
-    if (/\/$/.test(entry.fileName)) {
-      // Directory
-      if (!originEntries[entry.fileName]) {
-        addEntry(entry.fileName);
-      }
-    } else if (entry.fileName === 'index.bundlejs') {
-      //console.log('Found bundle');
-      return readEntire(entry, nextZipfile).then(newSource => {
-        //console.log('Begin diff');
-        zipfile.addBuffer(diff(originSource, newSource), 'index.bundlejs.patch');
-        //console.log('End diff');
-      });
-    } else {
-      // If same file.
-      const originEntry = originEntries[entry.fileName];
-      if (originEntry && originEntry.crc32 === entry.crc32) {
-        // ignore
-        return;
-      }
-
-      // If moved from other place
-      if (originMap[entry.crc32]) {
-        const base = basename(entry.fileName);
-        if (!originEntries[base]) {
-          addEntry(base);
-        }
-        copies[entry.fileName] = originMap[entry.crc32];
-        return;
-      }
-
-      // New file.
-      addEntry(basename(entry.fileName));
-
-      return new Promise((resolve, reject) => {
-        nextZipfile.openReadStream(entry, function(err, readStream) {
-          if (err) {
-            return reject(err);
-          }
-          zipfile.addReadStream(readStream, entry.fileName);
-          readStream.on('end', () => {
-            //console.log('add finished');
-            resolve();
-          });
-        });
-      });
-    }
-  });
-
-  const deletes = {};
-
-  for (var k in originEntries) {
-    if (!newEntries[k]) {
-      console.log('Delete ' + k);
-      deletes[k] = 1;
-    }
-  }
-
-  //console.log({copies, deletes});
-  zipfile.addBuffer(new Buffer(JSON.stringify({ copies, deletes })), '__diff.json');
-  zipfile.end();
-  await writePromise;
-}
-
-async function diffFromPackage(origin, next, output, originBundleName, transformPackagePath = v => v) {
-  fs.ensureDirSync(path.dirname(output));
-
-  const originEntries = {};
-  const originMap = {};
-
-  let originSource;
-
-  await enumZipEntries(origin, (entry, zipFile) => {
-    if (!/\/$/.test(entry.fileName)) {
-      const fn = transformPackagePath(entry.fileName);
-      if (!fn) {
-        return;
-      }
-
-      //console.log(fn);
-      // isFile
-      originEntries[fn] = entry.crc32;
-      originMap[entry.crc32] = fn;
-
-      if (fn === originBundleName) {
-        // This is source.
-        return readEntire(entry, zipFile).then(v => (originSource = v));
-      }
-    }
-  });
-
-  originSource = originSource || new Buffer(0);
-
-  const copies = {};
-
-  var zipfile = new ZipFile();
-
-  const writePromise = new Promise((resolve, reject) => {
-    zipfile.outputStream.on('error', err => {
-      throw err;
-    });
-    zipfile.outputStream.pipe(fs.createWriteStream(output)).on('close', function() {
-      resolve();
-    });
-  });
-
-  await enumZipEntries(next, (entry, nextZipfile) => {
-    if (/\/$/.test(entry.fileName)) {
-      // Directory
-      zipfile.addEmptyDirectory(entry.fileName);
-    } else if (entry.fileName === 'index.bundlejs') {
-      //console.log('Found bundle');
-      return readEntire(entry, nextZipfile).then(newSource => {
-        //console.log('Begin diff');
-        zipfile.addBuffer(diff(originSource, newSource), 'index.bundlejs.patch');
-        //console.log('End diff');
-      });
-    } else {
-      // If same file.
-      if (originEntries[entry.fileName] === entry.crc32) {
-        copies[entry.fileName] = '';
-        return;
-      }
-      // If moved from other place
-      if (originMap[entry.crc32]) {
-        copies[entry.fileName] = originMap[entry.crc32];
-        return;
-      }
-
-      return new Promise((resolve, reject) => {
-        nextZipfile.openReadStream(entry, function(err, readStream) {
-          if (err) {
-            return reject(err);
-          }
-          zipfile.addReadStream(readStream, entry.fileName);
-          readStream.on('end', () => {
-            //console.log('add finished');
-            resolve();
-          });
-        });
-      });
-    }
-  });
-
-  zipfile.addBuffer(new Buffer(JSON.stringify({ copies })), '__diff.json');
-  zipfile.end();
-  await writePromise;
-}
-
-function enumZipEntries(zipFn, callback) {
-  return new Promise((resolve, reject) => {
-    openZipFile(zipFn, { lazyEntries: true }, (err, zipfile) => {
-      if (err) {
-        return reject(err);
-      }
-      zipfile.on('end', resolve);
-      zipfile.on('error', reject);
-      zipfile.on('entry', entry => {
-        const result = callback(entry, zipfile);
-        if (result && typeof result.then === 'function') {
-          result.then(() => zipfile.readEntry());
-        } else {
-          zipfile.readEntry();
-        }
-      });
-      zipfile.readEntry();
-    });
-  });
-}
-
-export const commands = {
-  bundle: async function({ options }) {
-    const platform = checkPlatform(options.platform || (await question('Platform(ios/android):')));
-
-    let { bundleName, entryFile, intermediaDir, output, dev, verbose } = translateOptions({
-      ...options,
-      platform,
-    });
-
-    // const sourcemapOutput = path.join(intermediaDir, bundleName + ".map");
-
-    const realOutput = output.replace(/\$\{time\}/g, '' + Date.now());
-
-    if (!platform) {
-      throw new Error('Platform must be specified.');
-    }
-
-    const { version, major, minor } = getRNVersion();
-
-    console.log('Bundling with React Native version: ', version);
-
-    await runReactNativeBundleCommand(bundleName, dev, entryFile, intermediaDir, platform);
-
-    await pack(path.resolve(intermediaDir), realOutput);
-
-    const v = await question('Would you like to publish it?(Y/N)');
-    if (v.toLowerCase() === 'y') {
-      await this.publish({
-        args: [realOutput],
-        options: {
-          platform,
-        },
-      });
-    }
-  },
-
-  async diff({ args, options }) {
-    const [origin, next] = args;
-    const { output } = options;
-
-    const realOutput = output.replace(/\$\{time\}/g, '' + Date.now());
-
-    if (!origin || !next) {
-      console.error('pushy diff <origin> <next>');
-      process.exit(1);
-    }
-
-    await diffFromPPK(origin, next, realOutput, 'index.bundlejs');
-    console.log(`${realOutput} generated.`);
-  },
-
-  async diffFromApk({ args, options }) {
-    const [origin, next] = args;
-    const { output } = options;
-
-    const realOutput = output.replace(/\$\{time\}/g, '' + Date.now());
-
-    if (!origin || !next) {
-      console.error('pushy diffFromApk <origin> <next>');
-      process.exit(1);
-    }
-
-    await diffFromPackage(origin, next, realOutput, 'assets/index.android.bundle');
-    console.log(`${realOutput} generated.`);
-  },
-
-  async diffFromIpa({ args, options }) {
-    const [origin, next] = args;
-    const { output } = options;
-
-    const realOutput = output.replace(/\$\{time\}/g, '' + Date.now());
-
-    if (!origin || !next) {
-      console.error('pushy diffFromIpa <origin> <next>');
-      process.exit(1);
-    }
-
-    await diffFromPackage(origin, next, realOutput, 'main.jsbundle', v => {
-      const m = /^Payload\/[^/]+\/(.+)$/.exec(v);
-      return m && m[1];
-    });
-
-    console.log(`${realOutput} generated.`);
-  },
-};

local-cli/src/index.js

@@ -1,39 +0,0 @@
-/**
- * Created by tdzl2003 on 2/13/16.
- */
-
-const {loadSession} = require('./api');
-
-function printUsage({args}) {
-  // const commandName = args[0];
-  // TODO: print usage of commandName, or print global usage.
-
-  console.log('Usage is under development now.')
-  console.log('Visit `https://github.com/reactnativecn/react-native-pushy` for early document.');
-  process.exit(1);
-}
-
-const commands = {
-  ...require('./user').commands,
-  ...require('./bundle').commands,
-  ...require('./app').commands,
-  ...require('./package').commands,
-  ...require('./versions').commands,
-  help: printUsage,
-};
-
-exports.run = function () {
-  const argv = require('cli-arguments').parse(require('../cli.json'));
-  global.NO_INTERACTIVE = argv.options['no-interactive'];
-
-  loadSession()
-    .then(()=>commands[argv.command](argv))
-    .catch(err=>{
-      if (err.status === 401) {
-        console.log('Not loggined.\nRun `pushy login` at your project directory to login.');
-        return;
-      }
-      console.error(err.stack);
-      process.exit(-1);
-    });
-};

local-cli/src/package.js

@@ -1,87 +0,0 @@
-/**
- * Created by tdzl2003 on 4/2/16.
- */
-
-const { get, post, uploadFile } = require('./api');
-import { question } from './utils';
-
-import { checkPlatform, getSelectedApp } from './app';
-
-import { getApkInfo, getIpaInfo } from './utils';
-const Table = require('tty-table');
-
-export async function listPackage(appId) {
-  const { data } = await get(`/app/${appId}/package/list?limit=1000`);
-
-  const header = [{ value: 'Package Id' }, { value: 'Version' }];
-  const rows = [];
-  for (const pkg of data) {
-    const { version } = pkg;
-    let versionInfo = '';
-    if (version) {
-      versionInfo = ` - ${version.id} ${version.hash.slice(0, 8)} ${version.name}`;
-    } else {
-      versionInfo = ' (newest)';
-    }
-
-    rows.push([pkg.id, `${pkg.name}(${pkg.status})${versionInfo}`]);
-  }
-
-  console.log(Table(header, rows).render());
-  console.log(`\nTotal ${data.length} package(s).`);
-  return data;
-}
-
-export async function choosePackage(appId) {
-  const list = await listPackage(appId);
-
-  while (true) {
-    const id = await question('Enter Package Id:');
-    const app = list.find(v => v.id === (id | 0));
-    if (app) {
-      return app;
-    }
-  }
-}
-
-export const commands = {
-  uploadIpa: async function({ args }) {
-    const fn = args[0];
-    if (!fn) {
-      throw new Error('Usage: pushy uploadIpa <ipaFile>');
-    }
-    const { versionName, buildTime } = await getIpaInfo(fn);
-    const { appId } = await getSelectedApp('ios');
-
-    const { hash } = await uploadFile(fn);
-
-    const { id } = await post(`/app/${appId}/package/create`, {
-      name: versionName,
-      hash,
-      buildTime,
-    });
-    console.log(`Ipa uploaded: ${id}`);
-  },
-  uploadApk: async function({ args }) {
-    const fn = args[0];
-    if (!fn) {
-      throw new Error('Usage: pushy uploadApk <apkFile>');
-    }
-    const { versionName, buildTime } = await getApkInfo(fn);
-    const { appId } = await getSelectedApp('android');
-
-    const { hash } = await uploadFile(fn);
-
-    const { id } = await post(`/app/${appId}/package/create`, {
-      name: versionName,
-      hash,
-      buildTime,
-    });
-    console.log(`Apk uploaded: ${id}`);
-  },
-  packages: async function({ options }) {
-    const platform = checkPlatform(options.platform || (await question('Platform(ios/android):')));
-    const { appId } = await getSelectedApp(platform);
-    await listPackage(appId);
-  },
-};

local-cli/src/user.js

@@ -1,43 +0,0 @@
-/**
- * Created by tdzl2003 on 2/13/16.
- */
-
-import {question} from './utils';
-const {
-  post,
-  get,
-  replaceSession,
-  saveSession,
-  closeSession,
-} = require('./api');
-const crypto = require('crypto');
-
-function md5(str) {
-  return crypto.createHash('md5').update(str).digest('hex');
-}
-
-exports.commands = {
-  login: async function ({args}){
-    const email = args[0] || await question('email:');
-    const pwd = args[1] || await question('password:', true);
-    const {token, info} = await post('/user/login', {
-      email,
-      pwd: md5(pwd),
-    });
-    replaceSession({token});
-    await saveSession();
-    console.log(`Welcome, ${info.name}.`);
-  },
-  logout: async function (){
-    await closeSession();
-    console.log('Logged out.');
-  },
-  me: async function (){
-    const me = await get('/user/me');
-    for (const k in me) {
-      if (k !== 'ok') {
-        console.log(`${k}: ${me[k]}`);
-      }
-    }
-  },
-}

local-cli/src/utils/index.js

@@ -1,81 +0,0 @@
-/**
- * Created by tdzl2003 on 2/13/16.
- */
-
-import * as path from 'path';
-import * as fs from 'fs-extra';
-const AppInfoParser = require('app-info-parser');
-
-var read = require('read');
-
-export function question(query, password) {
-  if (NO_INTERACTIVE) {
-    return Promise.resolve('');
-  }
-  return new Promise((resolve, reject) =>
-    read(
-      {
-        prompt: query,
-        silent: password,
-        replace: password ? '*' : undefined,
-      },
-      (err, result) => (err ? reject(err) : resolve(result)),
-    ),
-  );
-}
-
-export function translateOptions(options) {
-  const ret = {};
-  for (let key in options) {
-    const v = options[key];
-    if (typeof v === 'string') {
-      ret[key] = v.replace(/\$\{(\w+)\}/g, function(v, n) {
-        return options[n] || process.env[n] || v;
-      });
-    } else {
-      ret[key] = v;
-    }
-  }
-  return ret;
-}
-
-export function getRNVersion() {
-  const version = JSON.parse(fs.readFileSync(path.resolve('node_modules/react-native/package.json'))).version;
-
-  // We only care about major and minor version.
-  const match = /^(\d+)\.(\d+)\./.exec(version);
-  return {
-    version,
-    major: match[1] | 0,
-    minor: match[2] | 0,
-  };
-}
-
-export async function getApkInfo(fn) {
-  const appInfoParser = new AppInfoParser(fn);
-  const { versionName, application } = await appInfoParser.parse();
-  let buildTime = 0;
-  if (Array.isArray(application.metaData)) {
-    for (const meta of application.metaData) {
-      if (meta.name === 'pushy_build_time') {
-        buildTime = meta.value[0];
-      }
-    }
-  }
-  if (buildTime == 0) {
-    throw new Error('Can not get build time for this app.');
-  }
-  return { versionName, buildTime };
-}
-
-export async function getIpaInfo(fn) {
-  const appInfoParser = new AppInfoParser(fn);
-  const { CFBundleShortVersionString: versionName } = await appInfoParser.parse();
-  try {
-    const buildTimeTxtBuffer = await appInfoParser.parser.getEntry(/payload\/.+?\.app\/pushy_build_time.txt/);
-    const buildTime = buildTimeTxtBuffer.toString().replace('\n', '');
-    return { versionName, buildTime };
-  } catch (e) {
-    throw new Error('Can not get build time for this app.');
-  }
-}

local-cli/src/versions.js

@@ -1,111 +0,0 @@
-/**
- * Created by tdzl2003 on 4/2/16.
- */
-
-const {
-  get,
-  post,
-  put,
-  uploadFile,
-} = require('./api');
-import { question } from './utils';
-
-import { checkPlatform, getSelectedApp } from './app';
-import { choosePackage } from './package';
-
-async function showVersion(appId, offset) {
-  const { data, count } = await get(`/app/${appId}/version/list`);
-  console.log(`Offset ${offset}`);
-  for (const version of data) {
-    let packageInfo = version.packages.slice(0, 3).map(v=>v.name).join(', ');
-    const count = version.packages.length;
-    if (count > 3) {
-      packageInfo += `...and ${count-3} more`;
-    }
-    if (count === 0) {
-      packageInfo = `(no package)`;
-    } else {
-      packageInfo = `[${packageInfo}]`;
-    }
-    console.log(`${version.id}) ${version.hash.slice(0, 8)} ${version.name} ${packageInfo}`);
-  }
-  return data;
-}
-
-async function listVersions(appId) {
-  let offset = 0;
-  while (true) {
-    await showVersion(appId, offset);
-    const cmd = await question('page Up/page Down/Begin/Quit(U/D/B/Q)');
-    switch (cmd.toLowerCase()) {
-      case 'u': offset = Math.max(0, offset - 10); break;
-      case 'd': offset += 10; break;
-      case 'b': offset = 0; break;
-      case 'q': return;
-    }
-  }
-}
-
-async function chooseVersion(appId) {
-  let offset = 0;
-  while (true) {
-    const data = await showVersion(appId, offset);
-    const cmd = await question('Enter versionId or page Up/page Down/Begin(U/D/B)');
-    switch (cmd.toLowerCase()) {
-      case 'U': offset = Math.max(0, offset - 10); break;
-      case 'D': offset += 10; break;
-      case 'B': offset = 0; break;
-      default:
-      {
-        const v = data.find(v=>v.id === (cmd | 0));
-        if (v) {
-          return v;
-        }
-      }
-    }
-  }
-}
-
-export const commands = {
-  publish: async function({args, options}) {
-    const fn = args[0];
-    const {name, description, metaInfo } = options;
-
-    if (!fn) {
-      throw new Error('Usage: pushy publish <ppkFile> --platform ios|android');
-    }
-
-    const platform = checkPlatform(options.platform || await question('Platform(ios/android):'));
-    const { appId } = await getSelectedApp(platform);
-
-    const { hash } = await uploadFile(fn);
-
-    const { id } = await post(`/app/${appId}/version/create`, {
-      name: name || await question('Enter version name:') || '(未命名)',
-      hash,
-      description: description || await question('Enter description:'),
-      metaInfo: metaInfo || await question('Enter meta info:'),
-    });
-    console.log(`Version published: ${id}`);
-
-    const v = await question('Would you like to bind packages to this version?(Y/N)');
-    if (v.toLowerCase() === 'y') {
-      await this.update({args:[], options:{versionId: id, platform}});
-    }
-  },
-  versions: async function({options}) {
-    const platform = checkPlatform(options.platform || await question('Platform(ios/android):'));
-    const { appId } = await getSelectedApp(platform);
-    await listVersions(appId);
-  },
-  update: async function({args, options}) {
-    const platform = checkPlatform(options.platform || await question('Platform(ios/android):'));
-    const { appId } = await getSelectedApp(platform);
-    const versionId = options.versionId || (await chooseVersion(appId)).id;
-    const pkgId = options.packageId || (await choosePackage(appId)).id;
-    await put(`/app/${appId}/package/${pkgId}`, {
-      versionId,
-    });
-    console.log('Ok.');
-  }
-};

package.json

@@ -1,12 +1,11 @@
 {
   "name": "react-native-update",
-  "version": "5.5.0",
+  "version": "5.8.0-beta1",
   "description": "react-native hot update",
   "main": "lib/index.js",
   "scripts": {
     "test": "echo \"Error: no test specified\" && exit 1",
-    "build-lib": "$ANDROID_HOME/ndk-bundle/ndk-build NDK_PROJECT_PATH=android APP_BUILD_SCRIPT=android/jni/Android.mk NDK_LIBS_OUT=android/lib",
+    "build-lib": "$ANDROID_HOME/ndk-bundle/ndk-build NDK_PROJECT_PATH=android APP_BUILD_SCRIPT=android/jni/Android.mk NDK_LIBS_OUT=android/lib"
-    "prepare": "node_modules/.bin/babel local-cli/src --out-dir local-cli/lib"
   },
   "repository": {
     "type": "git",
@@ -28,30 +27,6 @@
   },
   "homepage": "https://github.com/reactnativecn/react-native-pushy#readme",
   "dependencies": {
-    "app-info-parser": "^0.3.5",
+    "uuid": "3"
-    "cli-arguments": "^0.2.1",
-    "fs-extra": "^8.1.0",
-    "gradle-to-js": "^2.0.0",
-    "isomorphic-fetch": "^2.2.1",
-    "progress": "^1.1.8",
-    "read": "^1.0.7",
-    "request": "^2.69.0",
-    "tty-table": "^2.7.0",
-    "yauzl": "2.4.1",
-    "yazl": "2.3.0"
-  },
-  "devDependencies": {
-    "babel-cli": "^6.5.1",
-    "babel-eslint": "^4.1.6",
-    "babel-plugin-syntax-async-functions": "^6.5.0",
-    "babel-plugin-syntax-object-rest-spread": "^6.5.0",
-    "babel-plugin-transform-async-to-generator": "^6.3.13",
-    "babel-plugin-transform-es2015-arrow-functions": "^6.5.2",
-    "babel-plugin-transform-es2015-destructuring": "^6.3.15",
-    "babel-plugin-transform-es2015-modules-commonjs": "^6.3.16",
-    "babel-plugin-transform-es2015-parameters": "^6.5.0",
-    "babel-plugin-transform-es2015-spread": "^6.5.2",
-    "babel-plugin-transform-object-rest-spread": "^6.5.0",
-    "babel-plugin-transform-strict-mode": "^6.5.2"
   }
 }

react-native-pushy-cli/.babelrc

@@ -1,6 +0,0 @@
-{
-  "plugins": [
-    "transform-es2015-modules-commonjs",
-    "transform-strict-mode"
-  ]
-}

react-native-pushy-cli/.npmignore

@@ -1,7 +0,0 @@
-/.idea
-/src
-/.babelrc
-/.npmignore
-/.eslintrc
-/.nvmrc
-/.travis.yml

react-native-pushy-cli/package.json

@@ -1,37 +0,0 @@
-{
-  "name": "react-native-update-cli",
-  "version": "0.1.0",
-  "description": "Command tools for javaScript updater with `pushy` service for react native apps.",
-  "main": "index.js",
-  "bin": {
-    "pushy": "lib/cli.js"
-  },
-  "scripts": {
-    "test": "echo \"Error: no test specified\" && exit 1",
-    "prepublish": "node_modules/.bin/babel src --out-dir lib"
-  },
-  "repository": {
-    "type": "git",
-    "url": "git+https://github.com/reactnativecn/react-native-pushy.git"
-  },
-  "keywords": [
-    "react-native",
-    "ios",
-    "android",
-    "update"
-  ],
-  "author": "reactnativecn",
-  "license": "BSD-3-Clause",
-  "bugs": {
-    "url": "https://github.com/reactnativecn/react-native-pushy/issues"
-  },
-  "dependencies": {
-    "fs-promise": "^0.4.1"
-  },
-  "homepage": "https://github.com/reactnativecn/react-native-pushy/tree/master/react-native-pushy-cli",
-  "devDependencies": {
-    "babel-cli": "^6.5.1",
-    "babel-plugin-transform-es2015-modules-commonjs": "^6.5.2",
-    "babel-plugin-transform-strict-mode": "^6.5.2"
-  }
-}

react-native-pushy-cli/src/cli.js

@@ -1,53 +0,0 @@
-#!/usr/bin/env node
-/**
- * Created by tdzl2003 on 2/13/16.
- */
-
-import * as path from 'path';
-import * as fs from 'fs-extra';
-
-const CLI_MODULE_PATH = function() {
-  return path.resolve(
-    process.cwd(),
-    'node_modules',
-    'react-native-update',
-    'local-cli'
-  );
-};
-
-const PACKAGE_JSON_PATH = function() {
-  return path.resolve(
-    process.cwd(),
-    'node_modules',
-    'react-native-update',
-    'package.json'
-  );
-};
-
-checkForVersionCommand();
-
-let cli;
-const cliPath = CLI_MODULE_PATH();
-if (fs.existsSync(cliPath)) {
-  cli = require(cliPath);
-}
-
-if (cli) {
-  cli.run();
-} else {
-  console.error('Are you at home directory of a react-native project?');
-  console.error('`pushy install` is under development, please run `npm install react-native-update` to install pushy manually.');
-  process.exit(1);
-}
-
-function checkForVersionCommand() {
-  if (process.argv.indexOf('-v') >= 0 || process.argv[2] === 'version') {
-    console.log('react-native-update-cli: ' + require('../package.json').version);
-    try {
-      console.log('react-native-update: ' + require(PACKAGE_JSON_PATH()).version);
-    } catch (e) {
-      console.log('react-native-update: n/a - not inside a React Native project directory')
-    }
-    process.exit();
-  }
-}

react-native-update.podspec

@@ -11,13 +11,14 @@ Pod::Spec.new do |s|
   s.authors      = package['author']
   s.homepage     = package['homepage']
 
+  s.cocoapods_version = '>= 1.6.0'
   s.platform = :ios, "8.0"
   s.source = { :git => 'https://github.com/reactnativecn/react-native-pushy.git', :tag => '#{s.version}' }
   s.libraries = 'bz2', 'z'
   s.vendored_libraries = 'RCTPushy/libRCTPushy.a'
   s.pod_target_xcconfig = { 'USER_HEADER_SEARCH_PATHS' => '"$(SRCROOT)/../node_modules/react-native-update/ios"' }
   s.resource = 'ios/pushy_build_time.txt'
-  s.script_phase = { :name => 'Generate build time', :script => '../../node_modules/react-native-update/scripts/generateiOSBuildTime.sh', :execution_position => :before_compile }
+  s.script_phase = { :name => 'Generate build time', :script => 'set -x;date +%s > ${PODS_ROOT}/../../node_modules/react-native-update/ios/pushy_build_time.txt', :execution_position => :before_compile }
 
   s.dependency 'React'
   s.dependency 'SSZipArchive'

scripts/generateiOSBuildTime.sh

@@ -1,5 +0,0 @@
-  
-#!/bin/bash
-set -x
-DEST="../../node_modules/react-native-update/ios"
-date +%s > "$DEST/pushy_build_time.txt"