refactor: better approach

Author: maciejmakowski2003

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

@@ -19,12 +19,6 @@ AudioNodeHostObject::AudioNodeHostObject(const std::shared_ptr<AudioNode> &node)
       JSI_EXPORT_FUNCTION(AudioNodeHostObject, disconnect));
 }
 
-// Explicitly define destructor here, as they to exist in order to act as a
-// "key function" for the audio classes - this allow for RTTI to work
-// properly across dynamic library boundaries (i.e. dynamic_cast that is used by
-// isHostObject method), android specific issue
-AudioNodeHostObject::~AudioNodeHostObject() = default;
-
 JSI_PROPERTY_GETTER_IMPL(AudioNodeHostObject, numberOfInputs) {
   return {node_->getNumberOfInputs()};
 }

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

@@ -14,7 +14,6 @@ class AudioNode;
 class AudioNodeHostObject : public JsiHostObject {
  public:
   explicit AudioNodeHostObject(const std::shared_ptr<AudioNode> &node);
-  ~AudioNodeHostObject() override;
 
   JSI_PROPERTY_GETTER_DECL(numberOfInputs);
   JSI_PROPERTY_GETTER_DECL(numberOfOutputs);

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

@@ -62,12 +62,6 @@ BaseAudioContextHostObject::BaseAudioContextHostObject(
       JSI_EXPORT_FUNCTION(BaseAudioContextHostObject, createWaveShaper));
 }
 
-// Explicitly define destructors here, as they to exist in order to act as a
-// "key function" for the audio classes - this allow for RTTI to work
-// properly across dynamic library boundaries (i.e. dynamic_cast that is used by
-// isHostObject method), android specific issue
-BaseAudioContextHostObject::~BaseAudioContextHostObject() = default;
-
 JSI_PROPERTY_GETTER_IMPL(BaseAudioContextHostObject, destination) {
   auto destination = std::make_shared<AudioDestinationNodeHostObject>(context_->getDestination());
   return jsi::Object::createFromHostObject(runtime, destination);

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

@@ -21,8 +21,6 @@ class BaseAudioContextHostObject : public JsiHostObject {
       jsi::Runtime *runtime,
       const std::shared_ptr<react::CallInvoker> &callInvoker);
 
-  ~BaseAudioContextHostObject() override;
-
   JSI_PROPERTY_GETTER_DECL(destination);
   JSI_PROPERTY_GETTER_DECL(state);
   JSI_PROPERTY_GETTER_DECL(sampleRate);

packages/react-native-audio-api/common/cpp/audioapi/jsi/JsiHostObject.cpp

@@ -5,16 +5,8 @@
 #include <utility>
 #include <vector>
 
-//  set this value to 1 in order to debug the construction/destruction
-#define JSI_DEBUG_ALLOCATIONS 0
-
 namespace audioapi {
 
-#if JSI_DEBUG_ALLOCATIONS
-int objCounter = 0;
-std::vector<JsiHostObject *> objects;
-#endif
-
 JsiHostObject::JsiHostObject() {
   getters_ = std::make_unique<
       std::unordered_map<std::string, jsi::Value (JsiHostObject::*)(jsi::Runtime &)>>();
@@ -25,52 +17,24 @@ JsiHostObject::JsiHostObject() {
   setters_ = std::make_unique<std::unordered_map<
       std::string,
       void (JsiHostObject::*)(jsi::Runtime &, const jsi::Value &)>>();
-
-#if JSI_DEBUG_ALLOCATIONS
-  objects.push_back(this);
-  objCounter++;
-#endif
 }
 
 JsiHostObject::JsiHostObject(JsiHostObject &&other) noexcept
     : getters_(std::move(other.getters_)),
       functions_(std::move(other.functions_)),
-      setters_(std::move(other.setters_)) {
-#if JSI_DEBUG_ALLOCATIONS
-  auto it = std::find(objects.begin(), objects.end(), &other);
-  if (it != objects.end()) {
-    objects.erase(it);
-  }
-  objects.push_back(this);
-#endif
-}
+      setters_(std::move(other.setters_)) {}
 
 JsiHostObject &JsiHostObject::operator=(JsiHostObject &&other) noexcept {
   if (this != &other) {
     getters_ = std::move(other.getters_);
     functions_ = std::move(other.functions_);
     setters_ = std::move(other.setters_);
-
-#if JSI_DEBUG_ALLOCATIONS
-    auto it = std::find(objects.begin(), objects.end(), &other);
-    if (it != objects.end()) {
-      objects.erase(it);
-    }
-    objects.push_back(this);
-#endif
   }
+
   return *this;
 }
 
-JsiHostObject::~JsiHostObject() {
-#if JSI_DEBUG_ALLOCATIONS
-  auto it = std::find(objects.begin(), objects.end(), this);
-  if (it != objects.end()) {
-    objects.erase(it);
-    objCounter--;
-  }
-#endif
-}
+JsiHostObject::~JsiHostObject() = default;
 
 std::vector<jsi::PropNameID> JsiHostObject::getPropertyNames(jsi::Runtime &rt) {
   std::vector<jsi::PropNameID> propertyNames;

packages/react-native-audio-api/common/cpp/audioapi/jsi/JsiHostObject.h

@@ -48,6 +48,11 @@ class JsiHostObject : public jsi::HostObject {
   JsiHostObject &operator=(const JsiHostObject &) = delete;
   JsiHostObject(JsiHostObject &&) noexcept;
   JsiHostObject &operator=(JsiHostObject &&other) noexcept;
+
+  // Explicitly define destructor here, as they to exist in order to act as a
+  // "key function" for the audio classes - this allow for RTTI to work
+  // properly across dynamic library boundaries (i.e. dynamic_cast that is used by
+  // isHostObject method), android specific issue
   ~JsiHostObject() override;
 
   std::vector<jsi::PropNameID> getPropertyNames(jsi::Runtime &rt) override;