From 5ac87cc877b8dafd1a7dd5628d1eed095ddbe072 Mon Sep 17 00:00:00 2001
From: Hubert Gancarczyk <hubert.gancarczyk@swmansion.com>
Date: Tue, 16 Jul 2024 15:38:41 +0200
Subject: [PATCH] style: move installation process, fix indents

---
 example/src/App.tsx          | 54 +++++++++++++++---------------------
 ios/AudioContextModule.mm    | 20 +++++++------
 ios/PlatformOscillator.mm    | 24 ++++++++--------
 src/AudioContext.ts          |  6 +---
 src/Oscillator/Oscillator.ts | 37 ------------------------
 src/Oscillator/index.ts      |  1 +
 src/Oscillator/types.ts      |  6 ----
 src/index.ts                 |  6 +++-
 src/modules/global.d.ts      |  8 ++++++
 src/utils/install.ts         | 34 +++++++++++++++++------
 10 files changed, 86 insertions(+), 110 deletions(-)
 delete mode 100644 src/Oscillator/Oscillator.ts
 create mode 100644 src/Oscillator/index.ts
 create mode 100644 src/modules/global.d.ts

diff --git a/example/src/App.tsx b/example/src/App.tsx
index fb5f2389..7149d672 100644
--- a/example/src/App.tsx
+++ b/example/src/App.tsx
@@ -1,56 +1,46 @@
-import React, { useCallback, useRef, useState } from 'react';
-import { StyleSheet, View, Button, TextInput } from 'react-native';
+import React, { useCallback, useEffect, useRef, useState } from 'react';
+import { StyleSheet, View, Button, TextInput, Text } from 'react-native';
 import { AudioContext, type OscillatorNode } from 'react-native-audio-context';
 
+const BASE_FREQUENCY = 440;
+
 const App: React.FC = () => {
-  const [frequency, setFrequency] = useState('440');
+  const [frequency, setFrequency] = useState(BASE_FREQUENCY);
   const osc = useRef<OscillatorNode | null>(null);
+  const osc2 = useRef<OscillatorNode | null>(null);
 
-  const start = useCallback(() => {
+  useEffect(() => {
     if (!osc.current) {
       const context = new AudioContext();
       osc.current = context.createOscillator(+frequency);
+      osc2.current = context.createOscillator(+frequency);
     }
-
-    osc.current.start();
-  }, [frequency]);
-
-  const stop = useCallback(() => {
-    if (!osc.current) {
-      return;
-    }
-
-    osc.current.stop();
+    // eslint-disable-next-line react-hooks/exhaustive-deps
   }, []);
 
-  const changeFrequency = useCallback(() => {
-    if (!osc.current) {
-      return;
+  useEffect(() => {
+    if (osc.current) {
+      osc.current.frequency = frequency;
     }
-
-    osc.current.frequency = parseFloat(frequency);
   }, [frequency]);
 
-  const getFrequency = useCallback(() => {
-    if (!osc.current) {
-      return;
-    }
-
-    console.log(osc.current.frequency);
+  const start = useCallback(() => {
+    osc.current?.start();
+  }, []);
 
-    return osc.current.frequency;
+  const stop = useCallback(() => {
+    osc.current?.stop();
   }, []);
 
   return (
     <View style={styles.container}>
-      <Button title="Start1" onPress={start} />
-      <Button title="Stop1" onPress={stop} />
+      <Button title="Start" onPress={start} />
+      <Button title="Stop" onPress={stop} />
       <TextInput
-        value={frequency}
-        onChangeText={(text) => setFrequency(text)}
+        value={frequency.toString()}
+        onChangeText={(text) => setFrequency(+text)}
       />
-      <Button title="Change frequency" onPress={changeFrequency} />
-      <Button title="Get current frequency" onPress={getFrequency} />
+      <Text>Current frequency: {frequency}</Text>
     </View>
   );
 };
diff --git a/ios/AudioContextModule.mm b/ios/AudioContextModule.mm
index 0aea56ca..a5027f81 100644
--- a/ios/AudioContextModule.mm
+++ b/ios/AudioContextModule.mm
@@ -27,6 +27,16 @@ @implementation AudioContextModule
     }
     auto& runtime = *jsiRuntime;
 
+    auto createOscillator = [](jsi::Runtime& runtime, const jsi::Value& thisVal, const jsi::Value* args, size_t count) -> jsi::Value {
+        const float frequency = static_cast<float>(args[0].asNumber());
+
+        auto cppOscillatorHostObjectPtr = std::make_shared<audiocontext::OscillatorHostObject>(frequency);
+
+        const auto& jsiOscillatorHostObject = jsi::Object::createFromHostObject(runtime, cppOscillatorHostObjectPtr);
+
+        return jsi::Value(runtime, jsiOscillatorHostObject);
+    };
+
     runtime.global().setProperty(
         runtime,
         jsi::String::createFromUtf8(runtime, "createOscillator"),
@@ -34,15 +44,7 @@ @implementation AudioContextModule
             runtime,
             jsi::PropNameID::forUtf8(runtime, "createOscillator"),
             0,
-            [](jsi::Runtime& runtime, const jsi::Value& thisVal, const jsi::Value* args, size_t count) -> jsi::Value {
-                const float frequency = static_cast<float>(args[0].asNumber());
-
-                auto cppOscillatorHostObjectPtr = std::make_shared<audiocontext::OscillatorHostObject>(frequency);
-
-                const auto& jsiOscillatorHostObject = jsi::Object::createFromHostObject(runtime, cppOscillatorHostObjectPtr);
-
-                return jsi::Value(runtime, jsiOscillatorHostObject);
-            }
+            createOscillator
         )
     );
 
diff --git a/ios/PlatformOscillator.mm b/ios/PlatformOscillator.mm
index 22eb1887..685ad634 100644
--- a/ios/PlatformOscillator.mm
+++ b/ios/PlatformOscillator.mm
@@ -3,20 +3,20 @@
 
 namespace audiocontext {
 
-PlatformOscillator::PlatformOscillator(const float frequency) {
-	iosOscillator_ = [[IOSOscillator alloc] init:frequency];
-}
+	PlatformOscillator::PlatformOscillator(const float frequency) {
+		iosOscillator_ = [[IOSOscillator alloc] init:frequency];
+	}
 
-void PlatformOscillator::start() const {
-	[iosOscillator_ start];
-}
+	void PlatformOscillator::start() const {
+		[iosOscillator_ start];
+	}
 
-void PlatformOscillator::stop() const {
-	[iosOscillator_ stop];
-}
+	void PlatformOscillator::stop() const {
+		[iosOscillator_ stop];
+	}
 
-void PlatformOscillator::changeFrequency(const float frequency) const {
-    [iosOscillator_ changeFrequency:frequency];
-}
+	void PlatformOscillator::changeFrequency(const float frequency) const {
+			[iosOscillator_ changeFrequency:frequency];
+	}
 
 } // namespace audiocontext
diff --git a/src/AudioContext.ts b/src/AudioContext.ts
index d0917216..a59ec6d7 100644
--- a/src/AudioContext.ts
+++ b/src/AudioContext.ts
@@ -1,9 +1,5 @@
-import Oscillator from './Oscillator/Oscillator';
-
 export class AudioContext {
-  constructor() {}
-
   public createOscillator(frequency: number) {
-    return Oscillator(frequency);
+    return global.createOscillator(frequency);
   }
 }
diff --git a/src/Oscillator/Oscillator.ts b/src/Oscillator/Oscillator.ts
deleted file mode 100644
index f8a2cc06..00000000
--- a/src/Oscillator/Oscillator.ts
+++ /dev/null
@@ -1,37 +0,0 @@
-import type { OscillatorNode } from './types';
-import {
-  getAudioContextModule,
-  installModule,
-  verifyExpoGo,
-  verifyOnDevice,
-} from '../utils/install';
-
-function verifyInstallation() {
-  if (global.createOscillator == null)
-    throw new Error(
-      'Failed to install react-native-audio-context, the native initializer function does not exist. Are you trying to use Oscillator from different JS Runtimes?'
-    );
-}
-
-function createOscillator(): (frequency: number) => OscillatorNode {
-  if (global.createOscillator) {
-    return global.createOscillator;
-  }
-
-  verifyExpoGo();
-
-  const AudioContextModule = getAudioContextModule();
-
-  verifyOnDevice(AudioContextModule);
-  installModule(AudioContextModule);
-  verifyInstallation();
-
-  if (global.createOscillator == null) {
-    throw new Error('Failed to initialize createOscillator.');
-  }
-
-  return global.createOscillator;
-}
-
-// Call the creator and export what it returns
-export default createOscillator();
diff --git a/src/Oscillator/index.ts b/src/Oscillator/index.ts
new file mode 100644
index 00000000..fcb073fe
--- /dev/null
+++ b/src/Oscillator/index.ts
@@ -0,0 +1 @@
+export * from './types';
diff --git a/src/Oscillator/types.ts b/src/Oscillator/types.ts
index 525da6d9..3034fcb0 100644
--- a/src/Oscillator/types.ts
+++ b/src/Oscillator/types.ts
@@ -3,9 +3,3 @@ export interface OscillatorNode {
   stop(): void;
   frequency: number;
 }
-
-// global func declaration for JSI functions
-declare global {
-  function nativeCallSyncHook(): unknown;
-  var createOscillator: (frequency: number) => OscillatorNode;
-}
diff --git a/src/index.ts b/src/index.ts
index 7106788b..65c98e6d 100644
--- a/src/index.ts
+++ b/src/index.ts
@@ -1,2 +1,6 @@
-export * from './Oscillator/types';
+import { installACModule } from './utils/install';
+
+installACModule();
+
+export * from './Oscillator';
 export * from './AudioContext';
diff --git a/src/modules/global.d.ts b/src/modules/global.d.ts
new file mode 100644
index 00000000..2c68df2b
--- /dev/null
+++ b/src/modules/global.d.ts
@@ -0,0 +1,8 @@
+import type { IGainNode } from '../Gain';
+import type { OscillatorNode } from '../Oscillator';
+
+export declare global {
+  function nativeCallSyncHook(): unknown;
+  var createOscillator: (frequency: number) => OscillatorNode;
+  var createGain: (gain: number) => IGainNode;
+}
diff --git a/src/utils/install.ts b/src/utils/install.ts
index febdfc53..ecfd685a 100644
--- a/src/utils/install.ts
+++ b/src/utils/install.ts
@@ -1,10 +1,20 @@
 import { NativeModules, Platform } from 'react-native';
 
-export function getAudioContextModule() {
+export function installACModule() {
+  verifyExpoGo();
+
+  const AudioContextModule = getAudioContextModule();
+
+  verifyOnDevice(AudioContextModule);
+  installModule(AudioContextModule);
+  verifyInstallation();
+}
+
+function getAudioContextModule() {
   const AudioContextModule = NativeModules.AudioContext;
   if (AudioContextModule == null) {
     let message =
-      'Failed to install react-native-audio-context: The native `Oscillator` Module could not be found.';
+      'Failed to install react-native-audio-context: The native `AudioContext` Module could not be found.';
     message +=
       '\n* Make sure react-native-audio-context is correctly autolinked (run `npx react-native config` to verify)';
     if (Platform.OS === 'ios' || Platform.OS === 'macos') {
@@ -19,7 +29,7 @@ export function getAudioContextModule() {
   return AudioContextModule;
 }
 
-export function verifyExpoGo() {
+function verifyExpoGo() {
   const ExpoConstants =
     NativeModules.NativeUnimoduleProxy?.modulesConstants?.ExponentConstants;
   if (ExpoConstants != null) {
@@ -33,18 +43,26 @@ export function verifyExpoGo() {
   }
 }
 
-export function verifyOnDevice(Module: any) {
+function verifyOnDevice(Module: any) {
   if (global.nativeCallSyncHook == null || Module.install == null) {
     throw new Error(
-      'Failed to install react-native-audio-context: React Native is not running on-device. Oscillator can only be used when synchronous method invocations (JSI) are possible. If you are using a remote debugger (e.g. Chrome), switch to an on-device debugger (e.g. Flipper) instead.'
+      'Failed to install react-native-audio-context: React Native is not running on-device. Audio Context can only be used when synchronous method invocations (JSI) are possible. If you are using a remote debugger (e.g. Chrome), switch to an on-device debugger (e.g. Flipper) instead.'
     );
   }
 }
 
-export function installModule(Module: any) {
+function installModule(Module: any) {
   const result = Module.install();
-  if (result !== true)
+  if (result !== true) {
+    throw new Error(
+      `Failed to install react-native-audio-context: The native Audio Context Module could not be installed! Looks like something went wrong when installing JSI bindings: ${result}`
+    );
+  }
+}
+
+function verifyInstallation() {
+  if (global.createOscillator == null)
     throw new Error(
-      `Failed to install react-native-audio-context: The native Oscillator Module could not be installed! Looks like something went wrong when installing JSI bindings: ${result}`
+      'Failed to install react-native-audio-context, the native initializer private does not exist. Are you trying to use Audio Context from different JS Runtimes?'
     );
 }