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

package/android/build.gradle

@@ -9,6 +9,19 @@ def isNewArchitectureEnabled() {
     return project.hasProperty("newArchEnabled") && project.newArchEnabled == "true"
 }
 
+def supportsNamespace() {
+  def parsed = com.android.Version.ANDROID_GRADLE_PLUGIN_VERSION.tokenize('.')
+  def major = parsed[0].toInteger()
+  def minor = parsed[1].toInteger()
+
+  // Namespace support was added in 7.3.0
+  if (major == 7 && minor >= 3) {
+    return true
+  }
+
+  return major >= 8
+}
+
 apply plugin: 'com.android.library'
 if (isNewArchitectureEnabled()) {
     apply plugin: 'com.facebook.react'
@@ -16,6 +29,16 @@ if (isNewArchitectureEnabled()) {
 
 
 android {
+
+    if (supportsNamespace()) {
+        namespace "cn.reactnative.modules.update"
+
+        sourceSets {
+            main {
+                manifest.srcFile "src/main/AndroidManifestNew.xml"
+            }
+        }
+    }
     compileSdkVersion safeExtGet('compileSdkVersion', 28)
     buildToolsVersion safeExtGet('buildToolsVersion', '28.0.3')
 

package/android/src/main/AndroidManifest.xml

@@ -1,4 +1,3 @@
-<?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="cn.reactnative.modules.update">
     <application>

package/android/src/main/AndroidManifestNew.xml

@@ -0,0 +1,14 @@
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
+    <application>
+        <meta-data android:name="pushy_build_time" android:value="@string/pushy_build_time" />
+        <provider
+            android:name=".PushyFileProvider"
+            android:authorities="${applicationId}.pushy.fileprovider"
+            android:exported="false"
+            android:grantUriPermissions="true">
+            <meta-data
+            android:name="android.support.FILE_PROVIDER_PATHS"
+            android:resource="@xml/pushy_file_paths" />
+        </provider>
+    </application>
+</manifest>

package/android/src/newarch/cn/reactnative/modules/update/UpdateModule.java

@@ -57,7 +57,7 @@ public class UpdateModule extends NativeUpdateSpec {
 
     @Override
     public void downloadFullUpdate(ReadableMap options, final Promise promise) {
-    UpdateModuleImpl.downloadFullUpdate(this.updateContext,options,promise);
+        UpdateModuleImpl.downloadFullUpdate(this.updateContext,options,promise);
     }
 
     @Override

package/package.json

@@ -1,8 +1,8 @@
 {
   "name": "react-native-update",
-  "version": "9.1.5",
+  "version": "10.0.0-beta.0",
   "description": "react-native hot update",
-  "main": "lib/index.ts",
+  "main": "src/index.ts",
   "scripts": {
     "prepublish": "yarn submodule",
     "submodule": "git submodule update --init --recursive",
@@ -39,6 +39,7 @@
     "url": "https://github.com/reactnativecn/react-native-pushy/issues"
   },
   "peerDependencies": {
+    "react": ">=16.8.0",
     "react-native": ">=0.57.0"
   },
   "homepage": "https://github.com/reactnativecn/react-native-pushy#readme",
@@ -55,17 +56,21 @@
     ]
   },
   "devDependencies": {
+    "@react-native/eslint-config": "^0.73.2",
     "@types/fs-extra": "^9.0.13",
     "@types/jest": "^29.2.1",
     "@types/node": "^20.8.9",
-    "@types/react": "^18.2.33",
+    "@types/react": "^18.2.46",
     "detox": "^20.5.0",
+    "eslint": "^8.56.0",
     "firebase-tools": "^11.24.1",
     "fs-extra": "^9.1.0",
     "jest": "^29.2.1",
     "pod-install": "^0.1.37",
-    "react-native": "^0.72.6",
+    "prettier": "^2",
+    "react": "18.2.0",
+    "react-native": "0.73",
     "ts-jest": "^29.0.3",
-    "typescript": "^5.2.2"
+    "typescript": "^5.3.3"
   }
 }

package/react-native-update.podspec

@@ -1,5 +1,7 @@
 require 'json'
 
+new_arch_enabled = ENV['RCT_NEW_ARCH_ENABLED'] == '1'
+
 package = JSON.parse(File.read(File.join(__dir__, 'package.json')))
 
 Pod::Spec.new do |s|
@@ -40,5 +42,25 @@ Pod::Spec.new do |s|
                        'android/jni/lzma/C/Lzma2Dec.{h,c}']
     ss.private_header_files = 'ios/RCTPushy/HDiffPatch/**/*.h'
   end
-  install_modules_dependencies(s)
+  
+  if defined?(install_modules_dependencies()) != nil
+    install_modules_dependencies(s);
+  else
+    if new_arch_enabled
+      folly_compiler_flags = '-DFOLLY_NO_CONFIG -DFOLLY_MOBILE=1 -DFOLLY_USE_LIBCPP=1 -Wno-comma -Wno-shorten-64-to-32'
+
+      s.compiler_flags = folly_compiler_flags + " -DRCT_NEW_ARCH_ENABLED=1"
+
+      s.pod_target_xcconfig = {
+          "HEADER_SEARCH_PATHS" => "\"$(PODS_ROOT)/boost\"",
+          "CLANG_CXX_LANGUAGE_STANDARD" => "c++17"
+      }
+
+      s.dependency "React-Codegen"
+      s.dependency "RCT-Folly"
+      s.dependency "RCTRequired"
+      s.dependency "RCTTypeSafety"
+      s.dependency "ReactCommon/turbomodule/core"
+    end
+  end
 end

package/src/client.tsx

@@ -0,0 +1,316 @@
+import { CheckResult, PushyOptions, ProgressData } from './type';
+import { assertRelease, log } from './utils';
+import {
+  EmitterSubscription,
+  PermissionsAndroid,
+  Platform,
+} from 'react-native';
+import {
+  PushyModule,
+  buildTime,
+  cInfo,
+  pushyNativeEventEmitter,
+  currentVersion,
+  packageVersion,
+  report,
+  rolledBackVersion,
+  setLocalHashInfo,
+} from './core';
+
+const defaultServer = {
+  main: 'https://update.react-native.cn/api',
+  backups: ['https://update.reactnative.cn/api'],
+  queryUrl:
+    'https://raw.githubusercontent.com/reactnativecn/react-native-pushy/master/endpoints.json',
+};
+
+const empty = {};
+export class Pushy {
+  options: PushyOptions = {
+    appKey: '',
+    server: defaultServer,
+    autoMarkSuccess: true,
+    useAlert: true,
+  };
+
+  lastChecking: number;
+  lastResult: CheckResult;
+
+  progressHandlers: Record<string, EmitterSubscription> = {};
+  downloadedHash: string;
+
+  marked = false;
+  applyingUpdate = false;
+  version = cInfo.pushy;
+
+  constructor(options: PushyOptions) {
+    if (!options.appKey) {
+      throw new Error('appKey is required');
+    }
+    this.setOptions(options);
+  }
+
+  setOptions = (options: Partial<PushyOptions>) => {
+    for (const [key, value] of Object.entries(options)) {
+      if (value !== undefined) {
+        this.options[key] = value;
+      }
+    }
+  };
+
+  getCheckUrl = (endpoint: string = this.options.server!.main) => {
+    return `${endpoint}/checkUpdate/${this.options.appKey}`;
+  };
+  assertHash = (hash: string) => {
+    if (!this.downloadedHash) {
+      return;
+    }
+    if (hash !== this.downloadedHash) {
+      log(`use downloaded hash ${this.downloadedHash} first`);
+      return;
+    }
+    return true;
+  };
+  markSuccess = () => {
+    assertRelease();
+    if (this.marked) {
+      return;
+    }
+    this.marked = true;
+    PushyModule.markSuccess();
+    report({ type: 'markSuccess' });
+  };
+  switchVersion = (hash: string) => {
+    assertRelease();
+    if (this.assertHash(hash) && !this.applyingUpdate) {
+      log('switchVersion: ' + hash);
+      this.applyingUpdate = true;
+      PushyModule.reloadUpdate({ hash });
+    }
+  };
+
+  switchVersionLater = (hash: string) => {
+    assertRelease();
+    if (this.assertHash(hash)) {
+      log('switchVersionLater: ' + hash);
+      PushyModule.setNeedUpdate({ hash });
+    }
+  };
+  checkUpdate = async () => {
+    assertRelease();
+    const now = Date.now();
+    if (
+      this.lastResult &&
+      this.lastChecking &&
+      now - this.lastChecking < 1000 * 5
+    ) {
+      return this.lastResult;
+    }
+    this.lastChecking = now;
+    report({ type: 'checking' });
+    const fetchPayload = {
+      method: 'POST',
+      headers: {
+        Accept: 'application/json',
+        'Content-Type': 'application/json',
+      },
+      body: JSON.stringify({
+        packageVersion,
+        hash: currentVersion,
+        buildTime,
+        cInfo,
+      }),
+    };
+    let resp;
+    try {
+      resp = await fetch(this.getCheckUrl(), fetchPayload);
+    } catch (e) {
+      report({
+        type: 'errorChecking',
+        message: 'Can not connect to update server. Trying backup endpoints.',
+      });
+      const backupEndpoints = await this.getBackupEndpoints();
+      if (backupEndpoints) {
+        try {
+          resp = await Promise.race(
+            backupEndpoints.map((endpoint) =>
+              fetch(this.getCheckUrl(endpoint), fetchPayload),
+            ),
+          );
+        } catch {}
+      }
+    }
+    if (!resp) {
+      report({
+        type: 'errorChecking',
+        message: 'Can not connect to update server. Please check your network.',
+      });
+      return this.lastResult || empty;
+    }
+    const result: CheckResult = await resp.json();
+
+    this.lastResult = result;
+
+    if (resp.status !== 200) {
+      report({
+        type: 'errorChecking',
+        //@ts-ignore
+        message: result.message,
+      });
+    }
+
+    return result;
+  };
+  getBackupEndpoints = async () => {
+    const { server } = this.options;
+    if (!server) {
+      return [];
+    }
+    if (server.queryUrl) {
+      try {
+        const resp = await fetch(server.queryUrl);
+        const remoteEndpoints = await resp.json();
+        log('fetch endpoints:', remoteEndpoints);
+        if (Array.isArray(remoteEndpoints)) {
+          server.backups = Array.from(
+            new Set([...(server.backups || []), ...remoteEndpoints]),
+          );
+        }
+      } catch (e) {
+        log('failed to fetch endpoints from: ', server.queryUrl);
+      }
+    }
+    return server.backups;
+  };
+  downloadUpdate = async (
+    info: CheckResult,
+    onDownloadProgress?: (data: ProgressData) => void,
+  ) => {
+    assertRelease();
+    if (!('update' in info)) {
+      return;
+    }
+    const { hash, diffUrl, pdiffUrl, updateUrl, name, description, metaInfo } =
+      info;
+    if (rolledBackVersion === hash) {
+      log(`rolledback hash ${rolledBackVersion}, ignored`);
+      return;
+    }
+    if (this.downloadedHash === hash) {
+      log(`duplicated downloaded hash ${this.downloadedHash}, ignored`);
+      return this.downloadedHash;
+    }
+    if (this.progressHandlers[hash]) {
+      return;
+    }
+    if (onDownloadProgress) {
+      this.progressHandlers[hash] = pushyNativeEventEmitter.addListener(
+        'RCTPushyDownloadProgress',
+        (progressData) => {
+          if (progressData.hash === hash) {
+            onDownloadProgress(progressData);
+          }
+        },
+      );
+    }
+    let succeeded = false;
+    report({ type: 'downloading' });
+    if (diffUrl) {
+      log('downloading diff');
+      try {
+        await PushyModule.downloadPatchFromPpk({
+          updateUrl: diffUrl,
+          hash,
+          originHash: currentVersion,
+        });
+        succeeded = true;
+      } catch (e) {
+        log(`diff error: ${e.message}, try pdiff`);
+      }
+    }
+    if (!succeeded && pdiffUrl) {
+      log('downloading pdiff');
+      try {
+        await PushyModule.downloadPatchFromPackage({
+          updateUrl: pdiffUrl,
+          hash,
+        });
+        succeeded = true;
+      } catch (e) {
+        log(`pdiff error: ${e.message}, try full patch`);
+      }
+    }
+    if (!succeeded && updateUrl) {
+      log('downloading full patch');
+      try {
+        await PushyModule.downloadFullUpdate({
+          updateUrl: updateUrl,
+          hash,
+        });
+        succeeded = true;
+      } catch (e) {
+        log(`full patch error: ${e.message}`);
+      }
+    }
+    if (this.progressHandlers[hash]) {
+      this.progressHandlers[hash].remove();
+      delete this.progressHandlers[hash];
+    }
+    if (!succeeded) {
+      return report({
+        type: 'errorUpdate',
+        data: { newVersion: hash },
+      });
+    }
+    setLocalHashInfo(hash, {
+      name,
+      description,
+      metaInfo,
+    });
+    this.downloadedHash = hash;
+    return hash;
+  };
+  downloadAndInstallApk = async (
+    url: string,
+    onDownloadProgress?: (data: ProgressData) => void,
+  ) => {
+    if (Platform.OS !== 'android') {
+      return;
+    }
+    report({ type: 'downloadingApk' });
+    if (Platform.Version <= 23) {
+      try {
+        const granted = await PermissionsAndroid.request(
+          PermissionsAndroid.PERMISSIONS.WRITE_EXTERNAL_STORAGE,
+        );
+        if (granted !== PermissionsAndroid.RESULTS.GRANTED) {
+          return report({ type: 'rejectStoragePermission' });
+        }
+      } catch (err) {
+        return report({ type: 'errorStoragePermission' });
+      }
+    }
+    const progressKey = 'downloadingApk';
+    if (onDownloadProgress) {
+      this.progressHandlers[progressKey] = pushyNativeEventEmitter.addListener(
+        'RCTPushyDownloadProgress',
+        (progressData: ProgressData) => {
+          if (progressData.hash === progressKey) {
+            onDownloadProgress(progressData);
+          }
+        },
+      );
+    }
+    await PushyModule.downloadAndInstallApk({
+      url,
+      target: 'update.apk',
+      hash: progressKey,
+    }).catch(() => {
+      report({ type: 'errowDownloadAndInstallApk' });
+    });
+    if (this.progressHandlers[progressKey]) {
+      this.progressHandlers[progressKey].remove();
+      delete this.progressHandlers[progressKey];
+    }
+  };
+}

package/src/context.ts

@@ -0,0 +1,30 @@
+import { createContext, useContext } from 'react';
+import { CheckResult, ProgressData } from './type';
+import { Pushy } from './client';
+
+const empty = {};
+const noop = () => {};
+
+export const defaultContext = {
+  checkUpdate: () => Promise.resolve(empty),
+  switchVersion: noop,
+  switchVersionLater: noop,
+  markSuccess: noop,
+  dismissError: noop,
+  downloadUpdate: noop,
+};
+
+export const PushyContext = createContext<{
+  checkUpdate: () => void;
+  switchVersion: () => void;
+  switchVersionLater: () => void;
+  progress?: ProgressData;
+  markSuccess: () => void;
+  updateInfo?: CheckResult;
+  lastError?: Error;
+  dismissError: () => void;
+  client?: Pushy;
+  downloadUpdate: () => void;
+}>(defaultContext);
+
+export const usePushy = () => useContext(PushyContext);

package/src/core.ts

@@ -0,0 +1,106 @@
+import { NativeEventEmitter, NativeModules, Platform } from 'react-native';
+import { EventType, UpdateEventsLogger } from './type';
+import { log } from './utils';
+const {
+  version: v,
+} = require('react-native/Libraries/Core/ReactNativeVersion');
+const RNVersion = `${v.major}.${v.minor}.${v.patch}`;
+const isTurboModuleEnabled = global.__turboModuleProxy != null;
+
+export const PushyModule = isTurboModuleEnabled
+  ? require('./turboModuleSpec').default
+  : NativeModules.Pushy;
+
+if (!PushyModule) {
+  throw new Error('react-native-update模块无法加载，请对照安装文档检查配置。');
+}
+
+const PushyConstants = isTurboModuleEnabled
+  ? PushyModule.getConstants()
+  : PushyModule;
+
+export const downloadRootDir = PushyConstants.downloadRootDir;
+export const packageVersion = PushyConstants.packageVersion;
+export const currentVersion = PushyConstants.currentVersion;
+export const isFirstTime = PushyConstants.isFirstTime;
+export const rolledBackVersion = PushyConstants.rolledBackVersion;
+export const isRolledBack = typeof rolledBackVersion === 'string';
+
+export const buildTime = PushyConstants.buildTime;
+let uuid = PushyConstants.uuid;
+
+if (Platform.OS === 'android' && !PushyConstants.isUsingBundleUrl) {
+  throw new Error(
+    'react-native-update模块无法加载，请对照文档检查Bundle URL的配置',
+  );
+}
+
+export function setLocalHashInfo(hash: string, info: Record<string, any>) {
+  PushyModule.setLocalHashInfo(hash, JSON.stringify(info));
+}
+
+async function getLocalHashInfo(hash: string) {
+  return JSON.parse(await PushyModule.getLocalHashInfo(hash));
+}
+
+export async function getCurrentVersionInfo(): Promise<{
+  name?: string;
+  description?: string;
+  metaInfo?: string;
+}> {
+  return currentVersion ? (await getLocalHashInfo(currentVersion)) || {} : {};
+}
+
+export const pushyNativeEventEmitter = new NativeEventEmitter(PushyModule);
+
+if (!uuid) {
+  uuid = require('nanoid/non-secure').nanoid();
+  PushyModule.setUuid(uuid);
+}
+
+const noop = () => {};
+let reporter: UpdateEventsLogger = noop;
+
+export function onPushyEvents(customReporter: UpdateEventsLogger) {
+  reporter = customReporter;
+  if (isRolledBack) {
+    report({
+      type: 'rollback',
+      data: {
+        rolledBackVersion,
+      },
+    });
+  }
+}
+
+export function report({
+  type,
+  message = '',
+  data = {},
+}: {
+  type: EventType;
+  message?: string;
+  data?: Record<string, string | number>;
+}) {
+  log(type + ' ' + message);
+  reporter({
+    type,
+    data: {
+      currentVersion,
+      cInfo,
+      packageVersion,
+      buildTime,
+      message,
+      ...data,
+    },
+  });
+}
+
+log('uuid: ' + uuid);
+
+export const cInfo = {
+  pushy: require('../package.json').version,
+  rn: RNVersion,
+  os: Platform.OS + ' ' + Platform.Version,
+  uuid,
+};

package/src/index.ts

@@ -0,0 +1,3 @@
+export { Pushy } from './client';
+export { PushyContext, usePushy } from './context';
+export { PushyProvider } from './provider';

package/src/index.web.js

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