refactor: cleanup

Author: maciejmakowski2003

apps/fabric-example/ios/Podfile.lock

@@ -2514,7 +2514,7 @@ EXTERNAL SOURCES:
 
 SPEC CHECKSUMS:
   FBLazyVector: e97c19a5a442429d1988f182a1940fb08df514da
-  hermes-engine: 471e81260adadffc041e40c5eea01333addabb53
+  hermes-engine: ca0c1d4fe0200e05fedd8d7c0c283b54cd461436
   RCTDeprecation: af44b104091a34482596cd9bd7e8d90c4e9b4bd7
   RCTRequired: bb77b070f75f53398ce43c0aaaa58337cebe2bf6
   RCTSwiftUI: afc0a0a635860da1040a0b894bfd529da06d7810
@@ -2523,7 +2523,7 @@ SPEC CHECKSUMS:
   React: 1ba7d364ade7d883a1ec055bfc3606f35fdee17b
   React-callinvoker: bc2a26f8d84fb01f003fc6de6c9337b64715f95b
   React-Core: 7840d3a80b43a95c5e80ef75146bd70925ebab0f
-  React-Core-prebuilt: 6586031f606ff8ab466cac9e8284053a91342881
+  React-Core-prebuilt: e44365cf4785c3aa56ababc9ab204fe8bc6b17d0
   React-CoreModules: 2eb010400b63b89e53a324ffb3c112e4c7c3ce42
   React-cxxreact: a558e92199d26f145afa9e62c4233cf8e7950efe
   React-debug: 755200a6e7f5e6e0a40ff8d215493d43cce285fc
@@ -2587,7 +2587,7 @@ SPEC CHECKSUMS:
   ReactAppDependencyProvider: e96e93b493d8d86eeaee3e590ba0be53f6abe46f
   ReactCodegen: f66521b131699d6af0790f10653933b3f1f79a6f
   ReactCommon: 07572bf9e687c8a52fbe4a3641e9e3a1a477c78e
-  ReactNativeDependencies: a5d71d95f2654107eb45e6ece04caba36beac2bd
+  ReactNativeDependencies: 3467a1fea6f7a524df13b30430bebcc254d9aee2
   RNAudioAPI: fa5c075d2fcdb1ad9a695754b38f07c8c3074396
   RNGestureHandler: 07de6f059e0ee5744ae9a56feb07ee345338cc31
   RNReanimated: d75c81956bf7531fe08ba4390149002ab8bdd127

packages/react-native-audio-api/common/cpp/audioapi/HostObjects/AudioParamHostObject.cpp

@@ -44,9 +44,7 @@ AudioParamHostObject::AudioParamHostObject(
 }
 
 AudioParamHostObject::~AudioParamHostObject() {
-  if (graph_ && bridgeNode_) {
-    // Remove outgoing edges (bridge → owner)
-    (void)graph_->removeAllEdges(bridgeNode_);
+  if (graph_ && bridgeNode_ != nullptr) {
     // Remove the bridge node itself
     (void)graph_->removeNode(bridgeNode_);
     bridgeNode_ = nullptr;

packages/react-native-audio-api/common/cpp/audioapi/core/AudioParam.h

@@ -66,9 +66,7 @@ class AudioParam {
   /// @note Audio Thread only
   void cancelAndHoldAtTime(double cancelTime);
 
-  template <
-      typename F,
-      typename = std::enable_if_t<std::is_invocable_r_v<void, std::decay_t<F>, BaseAudioContext &>>>
+  template <typename F>
   bool scheduleAudioEvent(F &&event) noexcept {
     if (std::shared_ptr<BaseAudioContext> context = context_.lock()) {
       return context->scheduleAudioEvent(std::forward<F>(event));
@@ -86,13 +84,6 @@ class AudioParam {
     return inputBuffer_;
   }
 
-  /// @brief Called when a BridgeNode connected to this param is being destroyed.
-  /// Clears the input buffer so the param no longer relies on stale bridge data.
-  /// @note Audio Thread only
-  void onBridgeDetached() {
-    inputBuffer_->zero();
-  }
-
   /// @note Audio Thread only
   std::shared_ptr<DSPAudioBuffer> processARateParam(int framesToProcess, double time);
 

packages/react-native-audio-api/common/cpp/audioapi/core/BaseAudioContext.h

@@ -50,7 +50,7 @@ class BaseAudioContext : public std::enable_shared_from_this<BaseAudioContext> {
   std::shared_ptr<utils::graph::Graph> getGraph() const;
   std::shared_ptr<IAudioEventHandlerRegistry> getAudioEventHandlerRegistry() const;
   const RuntimeRegistry &getRuntimeRegistry() const;
-  utils::DisposerImpl<utils::graph::Graph::kDisposerPayloadSize> *getDisposer() const;
+  utils::DisposerImpl<DISPOSER_PAYLOAD_SIZE> *getDisposer() const;
 
   /// @brief Assigns the audio destination node to the context.
   /// @param destination The audio destination node to be associated with the context.
@@ -92,7 +92,7 @@ class BaseAudioContext : public std::enable_shared_from_this<BaseAudioContext> {
   static constexpr size_t AUDIO_SCHEDULER_CAPACITY = 1024;
   CrossThreadEventScheduler<BaseAudioContext> audioEventScheduler_;
 
-  std::unique_ptr<utils::DisposerImpl<utils::graph::Graph::kDisposerPayloadSize>> disposer_;
+  std::unique_ptr<utils::DisposerImpl<DISPOSER_PAYLOAD_SIZE>> disposer_;
   std::shared_ptr<utils::graph::Graph> graph_;
 
   [[nodiscard]] virtual bool isDriverRunning() const = 0;

packages/react-native-audio-api/common/cpp/audioapi/core/effects/StereoPannerNode.h

@@ -18,8 +18,7 @@ class StereoPannerNode : public AudioNode {
       const StereoPannerOptions &options);
 
   [[nodiscard]] std::shared_ptr<AudioParam> getPanParam() const;
-
-  std::shared_ptr<DSPAudioBuffer> getOutputBuffer() const override;
+  [[nodiscard]] std::shared_ptr<DSPAudioBuffer> getOutputBuffer() const override;
 
  protected:
   void processNode(int framesToProcess) override;

packages/react-native-audio-api/common/cpp/audioapi/core/utils/Constants.h

@@ -36,6 +36,9 @@ inline constexpr size_t PROMISE_VENDOR_THREAD_POOL_WORKER_COUNT = 4;
 inline constexpr size_t PROMISE_VENDOR_THREAD_POOL_LOAD_BALANCER_QUEUE_SIZE = 32;
 inline constexpr size_t PROMISE_VENDOR_THREAD_POOL_WORKER_QUEUE_SIZE = 32;
 
+// Disposer payload size (= sizeof(std::vector<T>))
+inline constexpr size_t DISPOSER_PAYLOAD_SIZE = 24;
+
 // Cache line size
 #ifdef __cpp_lib_hardware_interference_size
 using std::hardware_constructive_interference_size;

packages/react-native-audio-api/common/cpp/audioapi/core/utils/graph/AudioGraph.hpp

@@ -1,5 +1,7 @@
 #pragma once
 
+#include <audioapi/core/utils/Constants.h>
+#include <audioapi/core/utils/Disposer.hpp>
 #include <audioapi/core/utils/graph/InputPool.hpp>
 #include <audioapi/core/utils/graph/NodeHandle.hpp>
 
@@ -223,8 +225,6 @@ inline void AudioGraph::process() {
     if (node.orphaned && InputPool::isEmpty(node.input_head) &&
         node.handle->audioNode->canBeDestructed()) {
       node.will_be_deleted = true;
-      // Call beforeDestruction while node is still valid (before move/compaction)
-      node.handle->audioNode->beforeDestruction();
     }
   }
 
@@ -242,8 +242,9 @@ inline void AudioGraph::process() {
   // Must happen BEFORE shifting nodes, because shifting invalidates source
   // positions that later nodes' inputs may still reference.
   for (std::uint32_t e = 0; e < n; e++) {
-    if (nodes[e].will_be_deleted)
+    if (nodes[e].will_be_deleted) {
       continue;
+    }
     for (auto &inp : pool_.mutableView(nodes[e].input_head)) {
       inp = static_cast<std::uint32_t>(nodes[inp].after_compaction_ind);
     }
@@ -252,8 +253,9 @@ inline void AudioGraph::process() {
   // ── Pass 2b: compact — shift kept nodes left ───────────────────────────
   std::uint32_t b = 0;
   for (std::uint32_t e = 0; e < n; e++) {
-    if (nodes[e].will_be_deleted)
+    if (nodes[e].will_be_deleted) {
       continue;
+    }
     if (b != e) {
       nodes[b] = std::move(nodes[e]);
       nodes[e].input_head = InputPool::kNull; // prevent double-free in truncation
@@ -283,13 +285,15 @@ inline void AudioGraph::process() {
 
 inline void AudioGraph::kahn_toposort() {
   const auto n = static_cast<std::uint32_t>(nodes.size());
-  if (n <= 1)
+  if (n <= 1) {
     return;
+  }
 
   // Phase 1: compute out-degree
   for (const auto &nd : nodes) {
-    for (std::uint32_t inp : pool_.view(nd.input_head))
+    for (std::uint32_t inp : pool_.view(nd.input_head)) {
       nodes[inp].topo_out_degree++;
+    }
   }
 
   // Phase 2: reverse Kahn BFS — sinks first, sources last in dequeue order.
@@ -306,8 +310,9 @@ inline void AudioGraph::kahn_toposort() {
   };
 
   for (std::uint32_t i = 0; i < n; i++) {
-    if (nodes[i].topo_out_degree == 0)
+    if (nodes[i].topo_out_degree == 0) {
       enq(i);
+    }
   }
 
   std::uint32_t write = n;
@@ -317,15 +322,17 @@ inline void AudioGraph::kahn_toposort() {
     nodes[idx].after_compaction_ind = static_cast<std::int32_t>(--write);
 
     for (std::uint32_t inp : pool_.view(nodes[idx].input_head)) {
-      if (--nodes[inp].topo_out_degree == 0)
+      if (--nodes[inp].topo_out_degree == 0) {
         enq(inp);
+      }
     }
   }
 
   // Phase 3: remap input indices to new positions (before nodes move)
   for (auto &nd : nodes) {
-    for (std::uint32_t &inp : pool_.mutableView(nd.input_head))
+    for (std::uint32_t &inp : pool_.mutableView(nd.input_head)) {
       inp = static_cast<std::uint32_t>(nodes[inp].after_compaction_ind);
+    }
   }
 
   // Phase 4: apply permutation in place via cycle sort
@@ -338,8 +345,9 @@ inline void AudioGraph::kahn_toposort() {
 
   // Phase 5: update handle indices & reset scratch
   for (std::uint32_t i = 0; i < n; i++) {
-    if (nodes[i].handle)
+    if (nodes[i].handle) {
       nodes[i].handle->index = i;
+    }
     nodes[i].after_compaction_ind = -1;
   }
 }

packages/react-native-audio-api/common/cpp/audioapi/core/utils/graph/BridgeNode.cpp

@@ -1,5 +1,6 @@
 #pragma once
 
+#include <audioapi/core/AudioParam.h>
 #include <audioapi/core/types/ChannelInterpretation.h>
 #include <audioapi/core/utils/graph/GraphObject.hpp>
 #include <audioapi/utils/AudioBuffer.hpp>
@@ -34,8 +35,6 @@ class BridgeNode final : public GraphObject {
  public:
   explicit BridgeNode(AudioParam *param) : param_(param) {}
 
-  void beforeDestruction() override;
-
   [[nodiscard]] bool isProcessable() const override {
     return true;
   }
@@ -55,7 +54,20 @@ class BridgeNode final : public GraphObject {
   }
 
  protected:
-  void processInputs(const std::vector<const DSPAudioBuffer *> &inputs, int numFrames) override;
+  void processInputs(const std::vector<const DSPAudioBuffer *> &inputs, int numFrames) override {
+    // Skip processing if param is null (e.g., in tests)
+    if (param_ == nullptr) {
+      return;
+    }
+
+    // Get AudioParam's input buffer and fill it with mixed inputs
+    auto inputBuffer = param_->getInputBuffer();
+    inputBuffer->zero();
+
+    for (const DSPAudioBuffer *input : inputs) {
+      inputBuffer->sum(*input, ChannelInterpretation::SPEAKERS);
+    }
+  }
 
  private:
   AudioParam *param_;

packages/react-native-audio-api/common/cpp/audioapi/core/utils/graph/BridgeNode.hpp

@@ -49,11 +49,11 @@ class Graph {
   using HNode = HostGraph::Node;
 
  public:
-  static constexpr size_t kDisposerPayloadSize = HostGraph::kDisposerPayloadSize;
   using ResultError = HostGraph::ResultError;
   using Res = Result<NoneType, ResultError>;
 
-  Graph(size_t eventQueueCapacity, Disposer<kDisposerPayloadSize> *disposer) : disposer_(disposer) {
+  Graph(size_t eventQueueCapacity, Disposer<audioapi::DISPOSER_PAYLOAD_SIZE> *disposer)
+      : disposer_(disposer) {
     using namespace audioapi::channels::spsc;
 
     auto [es, er] = channel<AGEvent, OverflowStrategy::WAIT_ON_FULL, WaitStrategy::BUSY_LOOP>(
@@ -64,7 +64,7 @@ class Graph {
 
   Graph(
       size_t eventQueueCapacity,
-      Disposer<kDisposerPayloadSize> *disposer,
+      Disposer<audioapi::DISPOSER_PAYLOAD_SIZE> *disposer,
       std::uint32_t initialNodeCapacity,
       std::uint32_t initialEdgeCapacity)
       : Graph(eventQueueCapacity, disposer) {
@@ -190,7 +190,7 @@ class Graph {
 
   // ── Disposer — destroys old pool buffers off the audio thread ───────────
 
-  Disposer<kDisposerPayloadSize> *disposer_;
+  Disposer<audioapi::DISPOSER_PAYLOAD_SIZE> *disposer_;
 
   // ── Main-thread tracking for pre-growth ─────────────────────────────────
 
@@ -209,13 +209,14 @@ class Graph {
     if (edges > poolCapacity_ / 2) {
       std::uint32_t newCap = std::max(static_cast<std::uint32_t>(edges * 2), std::uint32_t{64});
       auto buf = std::make_unique<InputPool::Slot[]>(newCap);
-      eventSender_.send([buf = std::move(buf), newCap](
-                            AudioGraph &graph, Disposer<kDisposerPayloadSize> &disposer) mutable {
-        auto *old = graph.pool().adoptBuffer(buf.release(), newCap);
-        if (old) {
-          disposer.dispose(OwnedSlotBuffer(old));
-        }
-      });
+      eventSender_.send(
+          [buf = std::move(buf), newCap](
+              AudioGraph &graph, Disposer<audioapi::DISPOSER_PAYLOAD_SIZE> &disposer) mutable {
+            auto *old = graph.pool().adoptBuffer(buf.release(), newCap);
+            if (old) {
+              disposer.dispose(OwnedSlotBuffer(old));
+            }
+          });
       poolCapacity_ = newCap;
     }
   }