react-native 0.68.1 → 0.69.0-rc.1

package/ReactCommon/cxxreact/BUCK

@@ -14,7 +14,10 @@ rn_xplat_cxx_library(
     ),
     fbobjc_compiler_flags = get_apple_compiler_flags(),
     force_static = True,
-    labels = ["supermodule:xplat/default/public.react_native.infra"],
+    labels = [
+        "pfh:ReactNative_CommonInfrastructurePlaceholder",
+        "supermodule:xplat/default/public.react_native.infra",
+    ],
     visibility = [
         "PUBLIC",
     ],
@@ -35,7 +38,10 @@ rn_xplat_cxx_library(
     ),
     fbobjc_compiler_flags = get_apple_compiler_flags(),
     force_static = True,
-    labels = ["supermodule:xplat/default/public.react_native.infra"],
+    labels = [
+        "pfh:ReactNative_CommonInfrastructurePlaceholder",
+        "supermodule:xplat/default/public.react_native.infra",
+    ],
     visibility = [
         "PUBLIC",
     ],
@@ -55,7 +61,10 @@ rn_xplat_cxx_library(
         "-fno-omit-frame-pointer",
     ],
     fbobjc_compiler_flags = get_apple_compiler_flags(),
-    labels = ["supermodule:xplat/default/public.react_native.infra"],
+    labels = [
+        "pfh:ReactNative_CommonInfrastructurePlaceholder",
+        "supermodule:xplat/default/public.react_native.infra",
+    ],
     soname = "libxplat_react_module_samplemodule.$(ext)",
     visibility = [
         "PUBLIC",
@@ -113,7 +122,10 @@ rn_xplat_cxx_library(
     fbobjc_compiler_flags = get_apple_compiler_flags(),
     fbobjc_force_static = True,
     fbobjc_preprocessor_flags = get_preprocessor_flags_for_build_mode() + get_apple_inspector_flags(),
-    labels = ["supermodule:xplat/default/public.react_native.infra"],
+    labels = [
+        "pfh:ReactNative_CommonInfrastructurePlaceholder",
+        "supermodule:xplat/default/public.react_native.infra",
+    ],
     macosx_tests_override = [],
     platforms = (ANDROID, APPLE),
     preprocessor_flags = [

package/ReactCommon/cxxreact/CMakeLists.txt

@@ -0,0 +1,29 @@
+# Copyright (c) Meta Platforms, Inc. and affiliates.
+#
+# This source code is licensed under the MIT license found in the
+# LICENSE file in the root directory of this source tree.
+
+cmake_minimum_required(VERSION 3.13)
+set(CMAKE_VERBOSE_MAKEFILE on)
+
+add_compile_options(
+        -fexceptions
+        -frtti
+        -Wno-unused-lambda-capture
+        -DLOG_TAG=\"ReactNative\")
+
+file(GLOB reactnative_SRC CONFIGURE_DEPENDS *.cpp)
+add_library(reactnative STATIC ${reactnative_SRC})
+
+target_include_directories(reactnative PUBLIC ${REACT_COMMON_DIR})
+
+target_link_libraries(reactnative
+        boost
+        callinvoker
+        folly_runtime
+        glog
+        jsi
+        jsinspector
+        logger
+        reactperflogger
+        runtimeexecutor)

package/ReactCommon/cxxreact/Instance.cpp

@@ -26,7 +26,6 @@
 
 #include <condition_variable>
 #include <exception>
-#include <fstream>
 #include <memory>
 #include <mutex>
 #include <string>
@@ -109,40 +108,6 @@ void Instance::loadScriptFromString(
   }
 }
 
-bool Instance::isHBCBundle(const char *sourcePath) {
-  std::ifstream bundle_stream(sourcePath, std::ios_base::in);
-  BundleHeader header;
-
-  if (!bundle_stream ||
-      !bundle_stream.read(reinterpret_cast<char *>(&header), sizeof(header))) {
-    return false;
-  }
-
-  return parseTypeFromHeader(header) == ScriptTag::HBCBundle;
-}
-
-bool Instance::isIndexedRAMBundle(const char *sourcePath) {
-  std::ifstream bundle_stream(sourcePath, std::ios_base::in);
-  BundleHeader header;
-
-  if (!bundle_stream ||
-      !bundle_stream.read(reinterpret_cast<char *>(&header), sizeof(header))) {
-    return false;
-  }
-
-  return parseTypeFromHeader(header) == ScriptTag::RAMBundle;
-}
-
-bool Instance::isIndexedRAMBundle(std::unique_ptr<const JSBigString> *script) {
-  BundleHeader header;
-  strncpy(
-      reinterpret_cast<char *>(&header),
-      script->get()->c_str(),
-      sizeof(header));
-
-  return parseTypeFromHeader(header) == ScriptTag::RAMBundle;
-}
-
 void Instance::loadRAMBundleFromString(
     std::unique_ptr<const JSBigString> script,
     const std::string &sourceURL) {

package/ReactCommon/cxxreact/Instance.h

@@ -56,9 +56,6 @@ class RN_EXPORT Instance {
       std::unique_ptr<const JSBigString> string,
       std::string sourceURL,
       bool loadSynchronously);
-  static bool isHBCBundle(const char *sourcePath);
-  static bool isIndexedRAMBundle(const char *sourcePath);
-  static bool isIndexedRAMBundle(std::unique_ptr<const JSBigString> *string);
   void loadRAMBundleFromString(
       std::unique_ptr<const JSBigString> script,
       const std::string &sourceURL);

package/ReactCommon/cxxreact/JSBundleType.cpp

@@ -7,20 +7,21 @@
 
 #include "JSBundleType.h"
 
-#include <folly/Bits.h>
-
 namespace facebook {
 namespace react {
 
 static uint32_t constexpr RAMBundleMagicNumber = 0xFB0BD1E5;
-static uint32_t constexpr HBCBundleMagicNumber = 0xffe7c3c3;
+static uint32_t constexpr MetroHBCBundleMagicNumber = 0xFFE7C3C3;
+
+// "Hermes" in ancient Greek encoded in UTF-16BE and truncated to 8 bytes.
+static uint64_t constexpr HermesBCBundleMagicNumber = 0x1F1903C103BC1FC6;
 
 ScriptTag parseTypeFromHeader(const BundleHeader &header) {
-  switch (folly::Endian::little(header.magic)) {
+  switch (header.magic32.value) {
     case RAMBundleMagicNumber:
       return ScriptTag::RAMBundle;
-    case HBCBundleMagicNumber:
-      return ScriptTag::HBCBundle;
+    case MetroHBCBundleMagicNumber:
+      return ScriptTag::MetroHBCBundle;
     default:
       return ScriptTag::String;
   }
@@ -32,11 +33,15 @@ const char *stringForScriptTag(const ScriptTag &tag) {
       return "String";
     case ScriptTag::RAMBundle:
       return "RAM Bundle";
-    case ScriptTag::HBCBundle:
-      return "HBC Bundle";
+    case ScriptTag::MetroHBCBundle:
+      return "Metro Hermes Bytecode Bundle";
   }
   return "";
 }
 
+bool isHermesBytecodeBundle(const BundleHeader &header) {
+  return header.magic64 == HermesBCBundleMagicNumber;
+}
+
 } // namespace react
 } // namespace facebook

package/ReactCommon/cxxreact/JSBundleType.h

@@ -19,20 +19,18 @@ namespace facebook {
 namespace react {
 
 /*
- * ScriptTag
- *
  * Scripts given to the JS Executors to run could be in any of the following
  * formats. They are tagged so the executor knows how to run them.
+ * Hermes bytecode bundles (as encoded by hermesc, not metro) are not treated
+ * in a special way, they will be identified as ScriptTag::String.
  */
 enum struct ScriptTag {
   String = 0,
   RAMBundle,
-  HBCBundle,
+  MetroHBCBundle,
 };
 
 /**
- * BundleHeader
- *
  * RAM bundles and BC bundles begin with headers. For RAM bundles this is
  * 4 bytes, for BC bundles this is 12 bytes. This structure holds the first 12
  * bytes from a bundle in a way that gives access to that information.
@@ -43,27 +41,33 @@ struct FOLLY_PACK_ATTR BundleHeader {
     std::memset(this, 0, sizeof(BundleHeader));
   }
 
-  uint32_t magic;
-  uint32_t reserved_;
+  union {
+    struct {
+      uint32_t value;
+      uint32_t reserved_;
+    } magic32;
+    uint64_t magic64;
+  };
   uint32_t version;
 };
 FOLLY_PACK_POP
 
 /**
- * parseTypeFromHeader
- *
  * Takes the first 8 bytes of a bundle, and returns a tag describing the
  * bundle's format.
  */
 RN_EXPORT ScriptTag parseTypeFromHeader(const BundleHeader &header);
 
 /**
- * stringForScriptTag
- *
  * Convert an `ScriptTag` enum into a string, useful for emitting in errors
  * and diagnostic messages.
  */
 RN_EXPORT const char *stringForScriptTag(const ScriptTag &tag);
 
+/**
+ * Check whether a given bundle is hermesc-generated bytecode
+ */
+RN_EXPORT bool isHermesBytecodeBundle(const BundleHeader &header);
+
 } // namespace react
 } // namespace facebook

package/ReactCommon/cxxreact/ModuleRegistry.cpp

@@ -189,7 +189,7 @@ folly::Optional<ModuleConfig> ModuleRegistry::getConfig(
     // no constants or methods
     return folly::none;
   } else {
-    return ModuleConfig{index, config};
+    return ModuleConfig{index, std::move(config)};
   }
 }
 

package/ReactCommon/cxxreact/React-cxxreact.podspec

@@ -28,7 +28,7 @@ Pod::Spec.new do |s|
   s.homepage               = "https://reactnative.dev/"
   s.license                = package["license"]
   s.author                 = "Facebook, Inc. and its affiliates"
-  s.platforms              = { :ios => "11.0", :tvos => "11.0" }
+  s.platforms              = { :ios => "12.4", :tvos => "12.4" }
   s.source                 = source
   s.source_files           = "*.{cpp,h}"
   s.exclude_files          = "SampleCxxModule.*"

package/ReactCommon/cxxreact/ReactNativeVersion.h

@@ -16,9 +16,9 @@ namespace facebook::react {
 
 constexpr struct {
   int32_t Major = 0;
-  int32_t Minor = 68;
-  int32_t Patch = 1;
-  std::string_view Prerelease = "";
+  int32_t Minor = 69;
+  int32_t Patch = 0;
+  std::string_view Prerelease = "rc.1";
 } ReactNativeVersion;
 
 } // namespace facebook::react

package/ReactCommon/cxxreact/tests/BUCK

@@ -20,7 +20,7 @@ jni_instrumentation_test_lib(
     compiler_flags = [
         "-fexceptions",
         "-frtti",
-        "-std=c++14",
+        "-std=c++17",
     ],
     soname = "libxplat-bridge.so",
     visibility = [

package/ReactCommon/hermes/React-hermes.podspec

@@ -27,7 +27,7 @@ Pod::Spec.new do |s|
   s.homepage               = "https://reactnative.dev/"
   s.license                = package["license"]
   s.author                 = "Facebook, Inc. and its affiliates"
-  s.platforms              = { :osx => "10.14", :ios => "11.0" }
+  s.platforms              = { :osx => "10.14", :ios => "12.4" }
   s.source                 = source
   s.source_files           = "executor/*.{cpp,h}",
                              "inspector/*.{cpp,h}",

package/ReactCommon/hermes/executor/Android.mk

@@ -6,32 +6,36 @@
 LOCAL_PATH := $(call my-dir)
 REACT_NATIVE := $(LOCAL_PATH)/../../..
 
-include $(REACT_NATIVE)/ReactCommon/common.mk
-include $(CLEAR_VARS)
+ifeq ($(APP_OPTIM),debug)
+  include $(CLEAR_VARS)
 
-LOCAL_MODULE := hermes-executor-common-release
+  LOCAL_MODULE := hermes-executor-common-debug
+  LOCAL_CFLAGS := -DHERMES_ENABLE_DEBUGGER=1
 
-LOCAL_SRC_FILES := $(wildcard $(LOCAL_PATH)/*.cpp)
+  LOCAL_SRC_FILES := $(wildcard $(LOCAL_PATH)/*.cpp)
+  LOCAL_SRC_FILES := $(subst $(LOCAL_PATH)/,,$(LOCAL_SRC_FILES))
 
-LOCAL_C_INCLUDES := $(LOCAL_PATH) $(REACT_NATIVE)/ReactCommon/jsi $(call find-node-module,$(LOCAL_PATH),hermes-engine)/android/include
-LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH)
+  LOCAL_C_INCLUDES := $(LOCAL_PATH) $(REACT_NATIVE)/ReactCommon/jsi
+  LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH)
 
-LOCAL_STATIC_LIBRARIES := libjsireact
-LOCAL_SHARED_LIBRARIES := libhermes libjsi
+  LOCAL_STATIC_LIBRARIES := libjsireact libhermes-inspector
+  LOCAL_SHARED_LIBRARIES := libhermes libjsi
 
-include $(BUILD_STATIC_LIBRARY)
+  include $(BUILD_STATIC_LIBRARY)
+else
+  include $(CLEAR_VARS)
 
-include $(CLEAR_VARS)
+  LOCAL_MODULE := hermes-executor-common-release
 
-LOCAL_MODULE := hermes-executor-common-debug
-LOCAL_CFLAGS := -DHERMES_ENABLE_DEBUGGER=1
+  LOCAL_SRC_FILES := $(wildcard $(LOCAL_PATH)/*.cpp)
 
-LOCAL_SRC_FILES := $(wildcard $(LOCAL_PATH)/*.cpp)
+  LOCAL_C_INCLUDES := $(LOCAL_PATH) $(REACT_NATIVE)/ReactCommon/jsi
+  LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH)
+  LOCAL_SRC_FILES := $(wildcard $(LOCAL_PATH)/*.cpp)
+  LOCAL_SRC_FILES := $(subst $(LOCAL_PATH)/,,$(LOCAL_SRC_FILES))
 
-LOCAL_C_INCLUDES := $(LOCAL_PATH) $(REACT_NATIVE)/ReactCommon/jsi $(call find-node-module,$(LOCAL_PATH),hermes-engine)/android/include
-LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH)
+  LOCAL_STATIC_LIBRARIES := libjsireact
+  LOCAL_SHARED_LIBRARIES := libhermes libjsi
 
-LOCAL_STATIC_LIBRARIES := libjsireact libhermes-inspector
-LOCAL_SHARED_LIBRARIES := libhermes libjsi
-
-include $(BUILD_STATIC_LIBRARY)
+  include $(BUILD_STATIC_LIBRARY)
+endif

package/ReactCommon/hermes/executor/CMakeLists.txt

@@ -0,0 +1,29 @@
+# Copyright (c) Meta Platforms, Inc. and affiliates.
+#
+# This source code is licensed under the MIT license found in the
+# LICENSE file in the root directory of this source tree.
+
+cmake_minimum_required(VERSION 3.13)
+set(CMAKE_VERBOSE_MAKEFILE on)
+
+file(GLOB_RECURSE hermes_executor_SRC CONFIGURE_DEPENDS *.cpp)
+add_library(
+        hermes-executor-common
+        STATIC
+        ${hermes_executor_SRC}
+)
+target_include_directories(hermes-executor-common PUBLIC .)
+target_link_libraries(hermes-executor-common
+        jsireact
+        hermes-engine::libhermes
+        jsi
+        debug hermes-inspector
+)
+
+if(${CMAKE_BUILD_TYPE} MATCHES Debug)
+        target_compile_options(
+                hermes-executor-common
+                PRIVATE
+                -DHERMES_ENABLE_DEBUGGER=1
+        )
+endif()

package/ReactCommon/hermes/inspector/Android.mk

@@ -6,17 +6,17 @@
 LOCAL_PATH := $(call my-dir)
 REACT_NATIVE := $(LOCAL_PATH)/../../..
 
-include $(REACT_NATIVE)/ReactCommon/common.mk
 include $(CLEAR_VARS)
 
 LOCAL_MODULE := hermes-inspector
 
 LOCAL_SRC_FILES := $(wildcard $(LOCAL_PATH)/*.cpp $(LOCAL_PATH)/detail/*.cpp $(LOCAL_PATH)/chrome/*.cpp)
+LOCAL_SRC_FILES := $(subst $(LOCAL_PATH)/,,$(LOCAL_SRC_FILES))
 
 LOCAL_C_ROOT := $(LOCAL_PATH)/../..
 
 LOCAL_CFLAGS := -DHERMES_ENABLE_DEBUGGER=1 -DHERMES_INSPECTOR_FOLLY_KLUDGE=1
-LOCAL_C_INCLUDES := $(LOCAL_C_ROOT) $(REACT_NATIVE)/ReactCommon/jsi $(call find-node-module,$(LOCAL_PATH),hermes-engine)/android/include
+LOCAL_C_INCLUDES := $(LOCAL_C_ROOT) $(REACT_NATIVE)/ReactCommon/jsi
 LOCAL_EXPORT_C_INCLUDES := $(LOCAL_C_ROOT)
 
 LOCAL_CPP_FEATURES := exceptions
@@ -25,10 +25,12 @@ LOCAL_SHARED_LIBRARIES := \
   jsinspector \
   libfb \
   libfbjni \
-  libfolly_futures \
-  libfolly_json \
+  libfolly_runtime \
   libglog \
   libhermes \
   libjsi
 
+LOCAL_STATIC_LIBRARIES := \
+  libfolly_futures
+
 include $(BUILD_STATIC_LIBRARY)

package/ReactCommon/hermes/inspector/CMakeLists.txt

@@ -0,0 +1,32 @@
+# Copyright (c) Meta Platforms, Inc. and affiliates.
+#
+# This source code is licensed under the MIT license found in the
+# LICENSE file in the root directory of this source tree.
+
+cmake_minimum_required(VERSION 3.13)
+set(CMAKE_VERBOSE_MAKEFILE on)
+
+file(GLOB hermesinspector_SRC CONFIGURE_DEPENDS *.cpp detail/*.cpp chrome/*.cpp)
+
+add_library(hermes-inspector
+        STATIC
+        ${hermesinspector_SRC})
+
+target_compile_options(
+        hermes-inspector
+        PRIVATE
+        -DHERMES_ENABLE_DEBUGGER=1
+        -DHERMES_INSPECTOR_FOLLY_KLUDGE=1
+        -fexceptions
+)
+
+target_include_directories(hermes-inspector PUBLIC ${REACT_COMMON_DIR})
+target_link_libraries(hermes-inspector
+        jsinspector
+        fb
+        fbjni
+        folly_futures
+        folly_runtime
+        glog
+        hermes-engine::libhermes
+        jsi)

package/ReactCommon/hermes/inspector/Exceptions.h

@@ -47,6 +47,12 @@ class MultipleCommandsPendingException : public std::runtime_error {
             ": a step or resume is already pending") {}
 };
 
+class UserCallbackException : public std::runtime_error {
+ public:
+  UserCallbackException(const std::exception &e)
+      : std::runtime_error(std::string("callback exception: ") + e.what()) {}
+};
+
 } // namespace inspector
 } // namespace hermes
 } // namespace facebook

package/ReactCommon/hermes/inspector/Inspector.cpp

@@ -589,8 +589,11 @@ void Inspector::executeIfEnabledOnExecutor(
 
   state_->pushPendingFunc(
       [wrappedFunc = std::move(wrappedFunc), promise]() mutable {
-        wrappedFunc();
-        promise->setValue();
+        if (auto userCallbackException = runUserCallback(wrappedFunc)) {
+          promise->setException(*userCallbackException);
+        } else {
+          promise->setValue();
+        }
       });
 }
 

package/ReactCommon/hermes/inspector/Inspector.h

@@ -15,11 +15,13 @@
 #include <unordered_map>
 
 #include <folly/Executor.h>
+#include <folly/Optional.h>
 #include <folly/Unit.h>
 #include <folly/futures/Future.h>
 #include <hermes/DebuggerAPI.h>
 #include <hermes/hermes.h>
 #include <hermes/inspector/AsyncPauseState.h>
+#include <hermes/inspector/Exceptions.h>
 #include <hermes/inspector/RuntimeAdapter.h>
 
 namespace facebook {
@@ -363,6 +365,18 @@ class Inspector : public facebook::hermes::debugger::EventObserver,
   std::unique_ptr<folly::Executor> executor_;
 };
 
+/// Helper function that guards user code execution in a try-catch block.
+template <typename C, typename... A>
+folly::Optional<UserCallbackException> runUserCallback(C &cb, A &&...arg) {
+  try {
+    cb(std::forward<A>(arg)...);
+  } catch (const std::exception &e) {
+    return UserCallbackException(e);
+  }
+
+  return {};
+}
+
 } // namespace inspector
 } // namespace hermes
 } // namespace facebook

package/ReactCommon/hermes/inspector/InspectorState.cpp

@@ -249,10 +249,14 @@ std::pair<NextStatePtr, CommandPtr> InspectorState::Running::didPause(
   } else if (reason == debugger::PauseReason::EvalComplete) {
     assert(pendingEvalPromise_);
 
-    pendingEvalResultTransformer_(
-        inspector_.debugger_.getProgramState().getEvalResult());
-    pendingEvalPromise_->setValue(
-        inspector_.debugger_.getProgramState().getEvalResult());
+    if (auto userCallbackException = runUserCallback(
+            pendingEvalResultTransformer_,
+            inspector_.debugger_.getProgramState().getEvalResult())) {
+      pendingEvalPromise_->setException(*userCallbackException);
+    } else {
+      pendingEvalPromise_->setValue(
+          inspector_.debugger_.getProgramState().getEvalResult());
+    }
     pendingEvalPromise_.reset();
   } else if (
       reason == debugger::PauseReason::Breakpoint &&
@@ -364,10 +368,14 @@ std::pair<NextStatePtr, CommandPtr> InspectorState::Paused::didPause(
       break;
     case debugger::PauseReason::EvalComplete: {
       assert(pendingEvalPromise_);
-      pendingEvalResultTransformer_(
-          inspector_.debugger_.getProgramState().getEvalResult());
-      pendingEvalPromise_->setValue(
-          inspector_.debugger_.getProgramState().getEvalResult());
+      if (auto userCallbackException = runUserCallback(
+              pendingEvalResultTransformer_,
+              inspector_.debugger_.getProgramState().getEvalResult())) {
+        pendingEvalPromise_->setException(*userCallbackException);
+      } else {
+        pendingEvalPromise_->setValue(
+            inspector_.debugger_.getProgramState().getEvalResult());
+      }
       pendingEvalPromise_.reset();
     } break;
     case debugger::PauseReason::ScriptLoaded: