expo-updates 29.1.0-canary-20251013-623c5a6 → 29.1.0-canary-20251023-4c86f95

package/DEVELOPMENT.md

@@ -9,6 +9,7 @@ While it's possible to develop expo-updates in the context of Expo Go, it's usua
 There are a few ways to hook up your local copy of expo-updates to your test app. If you're not importing anything from expo-updates in your JS, you may be able to use `yarn link`, which is the most straightforward solution.
 
 Unfortunately, Metro doesn't support symlinks (at the time of this writing) so if you do need to use the Updates JS module methods in your app, `yarn link` will not suffice. A couple of suggestions are:
+
 - in package.json, replace the expo-updates dependency with: `"expo-updates": "file:/path/to/expo/expo/packages/expo-updates"`. You'll need to run `yarn --force` each time you make changes to your expo-updates source to make yarn copy them into node_modules.
 - if you don't want to wait for yarn to run each time, you can just manually copy expo-updates into node_modules each time you make a change.
 
@@ -63,9 +64,18 @@ sed -i '' 's/SKIP_BUNDLING/FORCE_BUNDLING/g;' ios/<project name>.xcodeproj/proje
 
 Now you can make a debug build of your app which behaves as if it were a release build (but without an embedded update).
 
+# BSPatch and BZip2
+
+expo-updates includes support for applying binary patches to assets.
+We use a modified version of the FreeBSD version of [BSPatch](https://github.com/freebsd/freebsd-src/blob/main/usr.bin/bsdiff/bspatch/bspatch.c)
+https://github.com/freebsd/freebsd-src/blob/b202176dc76d862f886778439b96dd1243d8b999/usr.bin/bsdiff/bspatch/bspatch.c. We make these modifications to make it safe to use in the mobile environment without crashing the user app.
+
+BSPatch relies on [BZip2](https://www.sourceware.org/bzip2/downloads.html). On iOS, we link against the system BZip2 library. On Android, we include a copy of the BZip2 source code in our repo and build it as part of the native code build. We only include the parts of BZip2 that handle decompression. When updating, download the bzip2 source code and replace the necessary files in `packages/expo-updates/android/src/main/cpp/third-party/bzip2`.
+
 ## Troubleshooting
 
 If expo-updates is not loading an update you expect it to, check that:
+
 - the creation time of the update you're trying to load is newer than the embedded bundle, or you've configured expo-updates to [ignore the embedded bundle](#ignore-embedded-update).
 - the SDK or runtime version configured in Expo.plist or AndroidManifest.xml matches the one in the manifest you're trying to load.
 

package/android/CMakeLists.txt

@@ -0,0 +1,53 @@
+cmake_minimum_required(VERSION 3.4.1)
+
+project(expo-updates)
+
+set(CMAKE_VERBOSE_MAKEFILE ON)
+set(CMAKE_CXX_STANDARD 20)
+set(PACKAGE_NAME "expo-updates")
+set(BUILD_DIR ${CMAKE_SOURCE_DIR}/build)
+
+set(SRC_DIR "${CMAKE_SOURCE_DIR}/src/main/cpp")
+set(BSDIFF_SRC_DIR "${CMAKE_SOURCE_DIR}/../vendor/bspatch")
+set(BZIP2_SRC_DIR "${SRC_DIR}/third-party/bzip2")
+
+file(GLOB SOURCES "${SRC_DIR}/*.cpp")
+file(GLOB BSDIFF_SOURCES "${BSDIFF_SRC_DIR}/*.c")
+file(GLOB BZIP2_SOURCES "${BZIP2_SRC_DIR}/*.c")
+
+add_library(
+  ${PACKAGE_NAME}
+  SHARED
+  ${SOURCES}
+  ${BSDIFF_SOURCES}
+)
+
+add_library(
+  bzip2
+  STATIC
+  ${BZIP2_SOURCES}
+)
+
+target_include_directories(
+  bzip2
+  PUBLIC
+  "${BZIP2_SRC_DIR}"
+)
+
+target_include_directories(
+  ${PACKAGE_NAME}
+  PRIVATE
+  ${SRC_DIR}
+  "${BSDIFF_SRC_DIR}"
+)
+
+find_library(LOG_LIB log)
+find_package(fbjni REQUIRED CONFIG)
+
+target_link_libraries(
+  ${PACKAGE_NAME}
+  ${LOG_LIB}
+  bzip2
+  fbjni::fbjni
+  android
+)

package/android/build.gradle

@@ -42,7 +42,7 @@ expoModule {
 }
 
 group = 'host.exp.exponent'
-version = '29.1.0-canary-20251013-623c5a6'
+version = '29.1.0-canary-20251023-4c86f95'
 
 // Utility method to derive boolean values from the environment or from Java properties,
 // and return them as strings to be used in BuildConfig fields
@@ -83,12 +83,13 @@ def useDevClient = findProject(":expo-dev-client") != null
 android {
   buildFeatures {
     buildConfig true
+    prefab true
   }
 
   namespace "expo.modules.updates"
   defaultConfig {
     versionCode 31
-    versionName '29.1.0-canary-20251013-623c5a6'
+    versionName '29.1.0-canary-20251023-4c86f95'
     consumerProguardFiles("proguard-rules.pro")
     testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
 
@@ -97,6 +98,18 @@ android {
     buildConfigField("boolean", "EX_UPDATES_ANDROID_DELAY_LOAD_APP", exUpdatesAndroidDelayLoadApp)
     buildConfigField("boolean", "EX_UPDATES_COPY_EMBEDDED_ASSETS", exUpdatesCopyEmbeddedAssets)
     buildConfigField("boolean", "USE_DEV_CLIENT", useDevClient.toString())
+
+    externalNativeBuild {
+      cmake {
+        arguments "-DANDROID_STL=c++_shared",
+          "-DANDROID_SUPPORT_FLEXIBLE_PAGE_SIZES=ON"
+      }
+    }
+  }
+  externalNativeBuild {
+    cmake {
+      path "CMakeLists.txt"
+    }
   }
   testOptions {
     unitTests.includeAndroidResources = true
@@ -109,6 +122,12 @@ android {
       resources.excludes.add("META-INF/LICENSE-notice.md")
     }
   }
+  packagingOptions {
+    excludes += [
+      "**/libc++_shared.so",
+      "**/libfbjni.so",
+    ]
+  }
   sourceSets {
     main.assets.srcDirs += files("$projectDir/src/main/certificates".toString())
     androidTest.assets.srcDirs += files("$projectDir/src/androidTest/schemas".toString())
@@ -142,12 +161,15 @@ dependencies {
   implementation("com.squareup.okhttp3:okhttp-brotli:4.9.2")
   implementation("org.bouncycastle:bcutil-jdk15to18:1.81")
 
+  compileOnly 'com.facebook.fbjni:fbjni:0.3.0'
+
   testImplementation 'junit:junit:4.13.2'
   testImplementation 'androidx.test:core:1.7.0'
   testImplementation 'com.google.truth:truth:1.4.5'
   testImplementation "io.mockk:mockk:$mockk_version"
   testImplementation "org.jetbrains.kotlin:kotlin-test-junit:${kotlinVersion}"
   testImplementation 'org.jetbrains.kotlinx:kotlinx-coroutines-test:1.10.2'
+  testImplementation "com.squareup.okhttp3:mockwebserver:4.9.2"
   testImplementation 'org.robolectric:robolectric:4.16'
 
   androidTestImplementation 'com.squareup.okio:okio:2.9.0'

package/android/src/main/cpp/BSPatch.h

@@ -0,0 +1,23 @@
+// Copyright 2015-present 650 Industries. All rights reserved.
+
+#pragma once
+
+#include <fbjni/fbjni.h>
+
+namespace jni = facebook::jni;
+
+namespace expo {
+
+class BSPatch : public jni::JavaClass<BSPatch> {
+public:
+  static constexpr auto kJavaDescriptor = "Lexpo/modules/updates/BSPatch;";
+
+  static void registerNatives();
+
+  static jint applyPatch(jni::alias_ref<jni::JClass>,
+    jni::alias_ref<jni::JString> oldFilePath,
+    jni::alias_ref<jni::JString> newFilePath,
+    jni::alias_ref<jni::JString> patchFilePath);
+};
+
+}

package/android/src/main/cpp/BSPatchModule.cpp

@@ -0,0 +1,36 @@
+// Copyright 2015-present 650 Industries. All rights reserved.
+
+#include "BSPatch.h"
+#include <array>
+
+namespace jni = facebook::jni;
+
+extern "C" int bspatch_main(int argc, char *argv[]);
+
+namespace expo {
+
+void BSPatch::registerNatives() {
+  javaClassStatic()->registerNatives({
+    makeNativeMethod("applyPatch", BSPatch::applyPatch),
+  });
+}
+
+jint BSPatch::applyPatch(jni::alias_ref<jni::JClass>,
+  jni::alias_ref<jni::JString> oldFilePath,
+  jni::alias_ref<jni::JString> newFilePath,
+  jni::alias_ref<jni::JString> patchFilePath) {
+  std::string oldFile = oldFilePath->toStdString();
+  std::string newFile = newFilePath->toStdString();
+  std::string patchFile = patchFilePath->toStdString();
+
+  std::array<char *, 4> argv = {
+    const_cast<char *>("bspatch"),
+    const_cast<char *>(oldFile.c_str()),
+    const_cast<char *>(newFile.c_str()),
+    const_cast<char *>(patchFile.c_str()),
+  };
+
+  return bspatch_main(static_cast<int>(argv.size()), argv.data());
+}
+
+}

package/android/src/main/cpp/ExpoUpdatesMain.cpp

@@ -0,0 +1,11 @@
+// Copyright 2015-present 650 Industries. All rights reserved.
+
+#include <fbjni/fbjni.h>
+
+#include "BSPatch.h"
+
+JNIEXPORT jint JNICALL JNI_OnLoad(JavaVM *vm, void *) {
+  return facebook::jni::initialize(vm, [] {
+    expo::BSPatch::registerNatives();
+  });
+}

package/android/src/main/cpp/third-party/bzip2/LICENSE

@@ -0,0 +1,42 @@
+
+--------------------------------------------------------------------------
+
+This program, "bzip2", the associated library "libbzip2", and all
+documentation, are copyright (C) 1996-2019 Julian R Seward.  All
+rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions
+are met:
+
+1. Redistributions of source code must retain the above copyright
+   notice, this list of conditions and the following disclaimer.
+
+2. The origin of this software must not be misrepresented; you must 
+   not claim that you wrote the original software.  If you use this 
+   software in a product, an acknowledgment in the product 
+   documentation would be appreciated but is not required.
+
+3. Altered source versions must be plainly marked as such, and must
+   not be misrepresented as being the original software.
+
+4. The name of the author may not be used to endorse or promote 
+   products derived from this software without specific prior written 
+   permission.
+
+THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS
+OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY
+DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE
+GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+Julian Seward, jseward@acm.org
+bzip2/libbzip2 version 1.0.8 of 13 July 2019
+
+--------------------------------------------------------------------------