react-native-tvos 0.83.2-0 → 0.84.0-0

package/ReactAndroid/src/main/jni/react/jni/ReactInstanceManagerInspectorTarget.cpp

@@ -1,175 +0,0 @@
-/*
- * 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.
- */
-
-#include "ReactInstanceManagerInspectorTarget.h"
-#include "SafeReleaseJniRef.h"
-
-#include <fbjni/NativeRunnable.h>
-#include <jsinspector-modern/InspectorFlags.h>
-
-#include <optional>
-
-using namespace facebook::jni;
-using namespace facebook::react::jsinspector_modern;
-
-namespace facebook::react {
-
-void ReactInstanceManagerInspectorTarget::TargetDelegate::onReload() const {
-  auto method = javaClassStatic()->getMethod<void()>("onReload");
-  method(self());
-}
-
-void ReactInstanceManagerInspectorTarget::TargetDelegate::
-    onSetPausedInDebuggerMessage(
-        const OverlaySetPausedInDebuggerMessageRequest& request) const {
-  auto method = javaClassStatic()->getMethod<void(local_ref<JString>)>(
-      "onSetPausedInDebuggerMessage");
-  method(self(), request.message ? make_jstring(*request.message) : nullptr);
-}
-
-jni::local_ref<jni::JMap<jstring, jstring>>
-ReactInstanceManagerInspectorTarget::TargetDelegate::getMetadata() const {
-  auto method = javaClassStatic()
-                    ->getMethod<jni::local_ref<jni::JMap<jstring, jstring>>()>(
-                        "getMetadata");
-  return method(self());
-}
-
-void ReactInstanceManagerInspectorTarget::TargetDelegate::loadNetworkResource(
-    const std::string& url,
-    jni::local_ref<InspectorNetworkRequestListener::javaobject> listener)
-    const {
-  auto method =
-      javaClassStatic()
-          ->getMethod<void(
-              jni::local_ref<JString>,
-              jni::local_ref<InspectorNetworkRequestListener::javaobject>)>(
-              "loadNetworkResource");
-  return method(self(), make_jstring(url), listener);
-}
-
-ReactInstanceManagerInspectorTarget::ReactInstanceManagerInspectorTarget(
-    jni::alias_ref<ReactInstanceManagerInspectorTarget::jhybridobject> /*jobj*/,
-    jni::alias_ref<JExecutor::javaobject> javaExecutor,
-    jni::alias_ref<ReactInstanceManagerInspectorTarget::TargetDelegate>
-        delegate)
-    : delegate_(make_global(delegate)),
-      inspectorExecutor_([javaExecutor =
-                              // Use a SafeReleaseJniRef because this lambda may
-                              // be copied to arbitrary threads.
-                          SafeReleaseJniRef(make_global(javaExecutor))](
-                             auto callback) mutable {
-        auto jrunnable = JNativeRunnable::newObjectCxxArgs(std::move(callback));
-        javaExecutor->execute(jrunnable);
-      }) {
-  auto& inspectorFlags = InspectorFlags::getInstance();
-
-  if (inspectorFlags.getFuseboxEnabled()) {
-    inspectorTarget_ = HostTarget::create(*this, inspectorExecutor_);
-
-    inspectorPageId_ = getInspectorInstance().addPage(
-        "React Native Bridge",
-        /* vm */ "",
-        [inspectorTarget =
-             inspectorTarget_](std::unique_ptr<IRemoteConnection> remote)
-            -> std::unique_ptr<ILocalConnection> {
-          return inspectorTarget->connect(std::move(remote));
-        },
-        {.nativePageReloads = true, .prefersFuseboxFrontend = true});
-  }
-}
-
-ReactInstanceManagerInspectorTarget::~ReactInstanceManagerInspectorTarget() {
-  if (inspectorPageId_.has_value()) {
-    // Remove the page (terminating all sessions) and destroy the target, both
-    // on the inspector queue.
-    inspectorExecutor_([inspectorPageId = *inspectorPageId_,
-                        inspectorTarget = std::move(inspectorTarget_)]() {
-      getInspectorInstance().removePage(inspectorPageId);
-      (void)inspectorTarget;
-    });
-  }
-}
-
-jni::local_ref<ReactInstanceManagerInspectorTarget::jhybriddata>
-ReactInstanceManagerInspectorTarget::initHybrid(
-    jni::alias_ref<jhybridobject> jobj,
-    jni::alias_ref<JExecutor::javaobject> javaExecutor,
-    jni::alias_ref<
-        ReactInstanceManagerInspectorTarget::TargetDelegate::javaobject>
-        delegate) {
-  return makeCxxInstance(jobj, javaExecutor, delegate);
-}
-
-void ReactInstanceManagerInspectorTarget::sendDebuggerResumeCommand() {
-  if (inspectorTarget_) {
-    inspectorTarget_->sendCommand(HostCommand::DebuggerResume);
-  } else {
-    jni::throwNewJavaException(
-        "java/lang/IllegalStateException",
-        "Cannot send command while the Fusebox backend is not enabled");
-  }
-}
-
-void ReactInstanceManagerInspectorTarget::registerNatives() {
-  registerHybrid({
-      makeNativeMethod(
-          "initHybrid", ReactInstanceManagerInspectorTarget::initHybrid),
-      makeNativeMethod(
-          "sendDebuggerResumeCommand",
-          ReactInstanceManagerInspectorTarget::sendDebuggerResumeCommand),
-  });
-}
-
-jsinspector_modern::HostTargetMetadata
-ReactInstanceManagerInspectorTarget::getMetadata() {
-  auto getMethod = jni::JMap<jstring, jstring>::javaClassLocal()
-                       ->getMethod<jobject(jobject)>("get");
-  auto metadata = delegate_->getMetadata();
-
-  auto getStringOptional = [&](const std::string& key) {
-    auto result = getMethod(metadata, make_jstring(key).get());
-    return result ? std::optional<std::string>(result->toString())
-                  : std::nullopt;
-  };
-
-  return {
-      .appDisplayName = getStringOptional("appDisplayName"),
-      .appIdentifier = getStringOptional("appIdentifier"),
-      .deviceName = getStringOptional("deviceName"),
-      .integrationName = "Android Bridge (ReactInstanceManagerInspectorTarget)",
-      .platform = getStringOptional("platform"),
-      .reactNativeVersion = getStringOptional("reactNativeVersion"),
-  };
-}
-
-void ReactInstanceManagerInspectorTarget::onReload(
-    const PageReloadRequest& /*request*/) {
-  delegate_->onReload();
-}
-
-void ReactInstanceManagerInspectorTarget::onSetPausedInDebuggerMessage(
-    const OverlaySetPausedInDebuggerMessageRequest& request) {
-  delegate_->onSetPausedInDebuggerMessage(request);
-}
-
-void ReactInstanceManagerInspectorTarget::loadNetworkResource(
-    const jsinspector_modern::LoadNetworkResourceRequest& params,
-    jsinspector_modern::ScopedExecutor<
-        jsinspector_modern::NetworkRequestListener> executor) {
-  // Construct InspectorNetworkRequestListener (hybrid class) from the C++ side
-  // (holding the ScopedExecutor), pass to the delegate.
-  auto listener = InspectorNetworkRequestListener::newObjectCxxArgs(executor);
-
-  delegate_->loadNetworkResource(params.url, listener);
-}
-
-HostTarget* ReactInstanceManagerInspectorTarget::getInspectorTarget() {
-  return inspectorTarget_.get();
-}
-
-} // namespace facebook::react

package/ReactAndroid/src/main/jni/react/jni/ReactInstanceManagerInspectorTarget.h

@@ -1,75 +0,0 @@
-/*
- * 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.
- */
-
-#pragma once
-
-#include <fbjni/fbjni.h>
-#include <jsinspector-modern/HostTarget.h>
-#include <jsinspector-modern/NetworkIOAgent.h>
-#include <jsinspector-modern/ScopedExecutor.h>
-#include <react/jni/InspectorNetworkRequestListener.h>
-#include <react/jni/JExecutor.h>
-
-namespace facebook::react {
-
-class ReactInstanceManagerInspectorTarget : public jni::HybridClass<ReactInstanceManagerInspectorTarget>,
-                                            public jsinspector_modern::HostTargetDelegate {
- private:
-  struct TargetDelegate : public facebook::jni::JavaClass<TargetDelegate> {
-    static constexpr auto kJavaDescriptor =
-        "Lcom/facebook/react/bridge/ReactInstanceManagerInspectorTarget$TargetDelegate;";
-
-    jni::local_ref<jni::JMap<jstring, jstring>> getMetadata() const;
-    void onReload() const;
-    void onSetPausedInDebuggerMessage(const OverlaySetPausedInDebuggerMessageRequest &request) const;
-    void loadNetworkResource(
-        const std::string &url,
-        jni::local_ref<InspectorNetworkRequestListener::javaobject> listener) const;
-  };
-
- public:
-  static constexpr auto kJavaDescriptor = "Lcom/facebook/react/bridge/ReactInstanceManagerInspectorTarget;";
-
-  ReactInstanceManagerInspectorTarget(const ReactInstanceManagerInspectorTarget &) = delete;
-  ReactInstanceManagerInspectorTarget &operator=(const ReactInstanceManagerInspectorTarget &) = delete;
-
-  ~ReactInstanceManagerInspectorTarget() override;
-
-  static jni::local_ref<jhybriddata> initHybrid(
-      jni::alias_ref<jhybridobject> jobj,
-      jni::alias_ref<JExecutor::javaobject> javaExecutor,
-      jni::alias_ref<ReactInstanceManagerInspectorTarget::TargetDelegate::javaobject> delegate);
-
-  void sendDebuggerResumeCommand();
-
-  static void registerNatives();
-
-  jsinspector_modern::HostTarget *getInspectorTarget();
-
-  // HostTargetDelegate methods
-  jsinspector_modern::HostTargetMetadata getMetadata() override;
-  void onReload(const PageReloadRequest &request) override;
-  void onSetPausedInDebuggerMessage(const OverlaySetPausedInDebuggerMessageRequest & /*request*/) override;
-  void loadNetworkResource(
-      const jsinspector_modern::LoadNetworkResourceRequest &params,
-      jsinspector_modern::ScopedExecutor<jsinspector_modern::NetworkRequestListener> executor) override;
-
- private:
-  friend HybridBase;
-
-  ReactInstanceManagerInspectorTarget(
-      jni::alias_ref<ReactInstanceManagerInspectorTarget::jhybridobject> jobj,
-      jni::alias_ref<JExecutor::javaobject> javaExecutor,
-      jni::alias_ref<ReactInstanceManagerInspectorTarget::TargetDelegate> delegate);
-
-  jni::global_ref<ReactInstanceManagerInspectorTarget::TargetDelegate> delegate_;
-  jsinspector_modern::VoidExecutor inspectorExecutor_;
-  std::shared_ptr<jsinspector_modern::HostTarget> inspectorTarget_;
-  std::optional<int> inspectorPageId_;
-};
-
-} // namespace facebook::react

package/ReactCommon/jsinspector-modern/tracing/TraceRecordingStateSerializer.cpp

@@ -1,68 +0,0 @@
-/*
- * 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.
- */
-
-#include "TraceRecordingStateSerializer.h"
-#include "RuntimeSamplingProfileTraceEventSerializer.h"
-#include "TraceEventSerializer.h"
-
-namespace facebook::react::jsinspector_modern::tracing {
-
-namespace {
-
-folly::dynamic generateNewChunk(uint16_t chunkSize) {
-  folly::dynamic chunk = folly::dynamic::array();
-  chunk.reserve(chunkSize);
-
-  return chunk;
-}
-
-} // namespace
-
-/* static */ void TraceRecordingStateSerializer::emitAsDataCollectedChunks(
-    TraceRecordingState&& recording,
-    const std::function<void(folly::dynamic&&)>& chunkCallback,
-    uint16_t performanceTraceEventsChunkSize,
-    uint16_t profileTraceEventsChunkSize) {
-  auto instancesProfiles = std::move(recording.instanceTracingProfiles);
-  IdGenerator profileIdGenerator;
-
-  for (auto& instanceProfile : instancesProfiles) {
-    emitPerformanceTraceEvents(
-        std::move(instanceProfile.performanceTraceEvents),
-        chunkCallback,
-        performanceTraceEventsChunkSize);
-  }
-
-  RuntimeSamplingProfileTraceEventSerializer::serializeAndDispatch(
-      std::move(recording.runtimeSamplingProfiles),
-      profileIdGenerator,
-      recording.startTime,
-      chunkCallback,
-      profileTraceEventsChunkSize);
-}
-
-/* static */ void TraceRecordingStateSerializer::emitPerformanceTraceEvents(
-    std::vector<TraceEvent>&& events,
-    const std::function<void(folly::dynamic&&)>& chunkCallback,
-    uint16_t chunkSize) {
-  folly::dynamic chunk = generateNewChunk(chunkSize);
-
-  for (auto& event : events) {
-    if (chunk.size() == chunkSize) {
-      chunkCallback(std::move(chunk));
-      chunk = generateNewChunk(chunkSize);
-    }
-
-    chunk.push_back(TraceEventSerializer::serialize(std::move(event)));
-  }
-
-  if (!chunk.empty()) {
-    chunkCallback(std::move(chunk));
-  }
-}
-
-} // namespace facebook::react::jsinspector_modern::tracing

package/ReactCommon/jsinspector-modern/tracing/TracingState.h

@@ -1,24 +0,0 @@
-/*
- * 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.
- */
-
-#pragma once
-
-#include <cstdint>
-
-namespace facebook::react::jsinspector_modern::tracing {
-
-// Keep in sync with `TracingState.kt`
-enum class TracingState : int32_t {
-  // There is no active trace
-  Disabled = 0,
-  // Trace is currently running in background mode
-  EnabledInBackgroundMode = 1,
-  // Trace is currently running in CDP mode
-  EnabledInCDPMode = 2,
-};
-
-} // namespace facebook::react::jsinspector_modern::tracing

package/ReactCommon/react/nativemodule/core/ReactCommon/TurboCxxModule.cpp

@@ -1,212 +0,0 @@
-/*
- * 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.
- */
-
-#include "TurboCxxModule.h"
-
-#include <vector>
-
-#include <ReactCommon/TurboModuleUtils.h>
-#include <glog/logging.h>
-#include <jsi/JSIDynamic.h>
-
-using namespace facebook;
-using namespace facebook::xplat::module;
-
-namespace facebook::react {
-
-namespace {
-CxxModule::Callback makeTurboCxxModuleCallback(
-    std::weak_ptr<CallbackWrapper> weakWrapper) {
-  return [weakWrapper, wrapperWasCalled = false](
-             const std::vector<folly::dynamic>& args) mutable {
-    if (wrapperWasCalled) {
-      LOG(FATAL) << "callback arg cannot be called more than once";
-    }
-
-    auto strongWrapper = weakWrapper.lock();
-    if (!strongWrapper) {
-      return;
-    }
-
-    strongWrapper->jsInvoker().invokeAsync(
-        [weakWrapper, args](jsi::Runtime& rt) {
-          auto strongWrapper2 = weakWrapper.lock();
-          if (!strongWrapper2) {
-            return;
-          }
-
-          std::vector<jsi::Value> innerArgs;
-          innerArgs.reserve(args.size());
-          for (auto& a : args) {
-            innerArgs.push_back(jsi::valueFromDynamic(rt, a));
-          }
-          strongWrapper2->callback().call(
-              rt, (const jsi::Value*)innerArgs.data(), innerArgs.size());
-
-          strongWrapper2->destroy();
-        });
-
-    wrapperWasCalled = true;
-  };
-}
-} // namespace
-
-TurboCxxModule::TurboCxxModule(
-    std::unique_ptr<CxxModule> cxxModule,
-    std::shared_ptr<CallInvoker> jsInvoker)
-    : TurboModule(cxxModule->getName(), std::move(jsInvoker)),
-      cxxMethods_(cxxModule->getMethods()),
-      cxxModule_(std::move(cxxModule)) {}
-
-jsi::Value TurboCxxModule::create(
-    jsi::Runtime& runtime,
-    const jsi::PropNameID& propName) {
-  std::string propNameUtf8 = propName.utf8(runtime);
-
-  if (propNameUtf8 == "getConstants") {
-    // This is special cased because `getConstants()` is already a part of
-    // CxxModule.
-    return jsi::Function::createFromHostFunction(
-        runtime,
-        propName,
-        0,
-        [this](
-            jsi::Runtime& rt,
-            const jsi::Value& /*thisVal*/,
-            const jsi::Value* /*args*/,
-            size_t /*count*/) {
-          jsi::Object result(rt);
-          auto constants = cxxModule_->getConstants();
-          for (auto& pair : constants) {
-            result.setProperty(
-                rt, pair.first.c_str(), jsi::valueFromDynamic(rt, pair.second));
-          }
-          return result;
-        });
-  } else {
-    for (auto& method : cxxMethods_) {
-      if (method.name == propNameUtf8) {
-        return jsi::Function::createFromHostFunction(
-            runtime,
-            propName,
-            0,
-            [this, propNameUtf8](
-                jsi::Runtime& rt,
-                const jsi::Value& /*thisVal*/,
-                const jsi::Value* args,
-                size_t count) {
-              return invokeMethod(rt, propNameUtf8, args, count);
-            });
-      }
-    }
-  }
-
-  return jsi::Value::undefined();
-}
-
-std::vector<jsi::PropNameID> TurboCxxModule::getPropertyNames(
-    jsi::Runtime& runtime) {
-  std::vector<jsi::PropNameID> result;
-  result.reserve(cxxMethods_.size() + 1);
-  result.push_back(jsi::PropNameID::forUtf8(runtime, "getConstants"));
-  for (auto& cxxMethod : cxxMethods_) {
-    result.push_back(jsi::PropNameID::forUtf8(runtime, cxxMethod.name));
-  }
-  return result;
-}
-
-jsi::Value TurboCxxModule::invokeMethod(
-    jsi::Runtime& runtime,
-    const std::string& methodName,
-    const jsi::Value* args,
-    size_t count) {
-  auto it = cxxMethods_.begin();
-  for (; it != cxxMethods_.end(); it++) {
-    auto method = *it;
-    if (method.name == methodName) {
-      break;
-    }
-  }
-
-  if (it == cxxMethods_.end()) {
-    throw std::runtime_error(
-        "Function '" + methodName + "' cannot be found on cxxmodule: " + name_);
-  }
-
-  auto method = *it;
-
-  if (method.syncFunc) {
-    auto innerArgs = folly::dynamic::array();
-    for (size_t i = 0; i < count; i++) {
-      innerArgs.push_back(jsi::dynamicFromValue(runtime, args[i]));
-    }
-    return jsi::valueFromDynamic(
-        runtime, method.syncFunc(std::move(innerArgs)));
-  } else if (method.func && !method.isPromise) {
-    // Async method.
-    CxxModule::Callback first;
-    CxxModule::Callback second;
-
-    if (count < method.callbacks) {
-      throw std::invalid_argument(
-          "Expected " + std::to_string(method.callbacks) +
-          " callbacks, but only " + std::to_string(count) +
-          " parameters provided");
-    }
-
-    if (method.callbacks == 1) {
-      auto wrapper = CallbackWrapper::createWeak(
-          args[count - 1].getObject(runtime).getFunction(runtime),
-          runtime,
-          jsInvoker_);
-      first = makeTurboCxxModuleCallback(wrapper);
-    } else if (method.callbacks == 2) {
-      auto wrapper1 = CallbackWrapper::createWeak(
-          args[count - 2].getObject(runtime).getFunction(runtime),
-          runtime,
-          jsInvoker_);
-      auto wrapper2 = CallbackWrapper::createWeak(
-          args[count - 1].getObject(runtime).getFunction(runtime),
-          runtime,
-          jsInvoker_);
-      first = makeTurboCxxModuleCallback(wrapper1);
-      second = makeTurboCxxModuleCallback(wrapper2);
-    }
-
-    auto innerArgs = folly::dynamic::array();
-    for (size_t i = 0; i < count - method.callbacks; i++) {
-      innerArgs.push_back(jsi::dynamicFromValue(runtime, args[i]));
-    }
-
-    method.func(std::move(innerArgs), first, second);
-  } else if (method.isPromise) {
-    return createPromiseAsJSIValue(
-        runtime,
-        [method, args, count, this](
-            jsi::Runtime& rt, std::shared_ptr<Promise> promise) {
-          auto resolveWrapper = CallbackWrapper::createWeak(
-              promise->resolve_.getFunction(rt), rt, jsInvoker_);
-          auto rejectWrapper = CallbackWrapper::createWeak(
-              promise->reject_.getFunction(rt), rt, jsInvoker_);
-          CxxModule::Callback resolve =
-              makeTurboCxxModuleCallback(resolveWrapper);
-          CxxModule::Callback reject =
-              makeTurboCxxModuleCallback(rejectWrapper);
-
-          auto innerArgs = folly::dynamic::array();
-          for (size_t i = 0; i < count; i++) {
-            innerArgs.push_back(jsi::dynamicFromValue(rt, args[i]));
-          }
-
-          method.func(std::move(innerArgs), resolve, reject);
-        });
-  }
-
-  return jsi::Value::undefined();
-}
-
-} // namespace facebook::react

package/ReactCommon/react/nativemodule/core/ReactCommon/TurboCxxModule.h

@@ -1,40 +0,0 @@
-/*
- * 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.
- */
-
-#pragma once
-
-#include <memory>
-#include <vector>
-
-#include <cxxreact/CxxModule.h>
-
-#include "TurboModule.h"
-
-namespace facebook::react {
-
-/**
- * A helper class to convert the legacy CxxModule instance to a TurboModule
- * instance. This should be used only for migration purpose (to TurboModule),
- * since it's not very performant due to a lot of back-and-forth value
- * conversions between folly::dynamic and jsi::Value.
- */
-class JSI_EXPORT TurboCxxModule : public TurboModule {
- public:
-  TurboCxxModule(std::unique_ptr<facebook::xplat::module::CxxModule> cxxModule, std::shared_ptr<CallInvoker> jsInvoker);
-
-  facebook::jsi::Value create(facebook::jsi::Runtime &runtime, const facebook::jsi::PropNameID &propName) override;
-
-  std::vector<facebook::jsi::PropNameID> getPropertyNames(facebook::jsi::Runtime &runtime) override;
-
-  jsi::Value invokeMethod(jsi::Runtime &runtime, const std::string &methodName, const jsi::Value *args, size_t count);
-
- private:
-  std::vector<facebook::xplat::module::CxxModule::Method> cxxMethods_;
-  std::unique_ptr<facebook::xplat::module::CxxModule> cxxModule_;
-};
-
-} // namespace facebook::react