Merge pull request #478 from software-mansion/fix-with-audio-api-plugin

Fix with audio api plugin

Author: michalsek

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

@@ -17,11 +17,10 @@ AudioParam::AudioParam(
       minValue_(minValue),
       maxValue_(maxValue),
       context_(context),
-      audioBus_(
-          std::make_shared<AudioBus>(
-              RENDER_QUANTUM_SIZE,
-              1,
-              context->getSampleRate())) {
+      audioBus_(std::make_shared<AudioBus>(
+          RENDER_QUANTUM_SIZE,
+          1,
+          context->getSampleRate())) {
   startTime_ = 0;
   endTime_ = 0;
   startValue_ = value_;

packages/react-native-audio-api/ios/audioapi/ios/AudioAPIModule.mm

@@ -85,9 +85,8 @@ - (void)invalidate
   return [self.audioSessionManager getDevicePreferredSampleRate];
 }
 
-RCT_EXPORT_METHOD(
-    setAudioSessionActivity : (BOOL)enabled resolve : (RCTPromiseResolveBlock)resolve reject : (RCTPromiseRejectBlock)
-        reject)
+RCT_EXPORT_METHOD(setAudioSessionActivity : (BOOL)enabled resolve : (RCTPromiseResolveBlock)
+                      resolve reject : (RCTPromiseRejectBlock)reject)
 {
   if ([self.audioSessionManager setActive:enabled]) {
     resolve(@"true");
@@ -127,16 +126,15 @@ - (void)invalidate
   [self.notificationManager observeVolumeChanges:(BOOL)enabled];
 }
 
-RCT_EXPORT_METHOD(
-    requestRecordingPermissions : (nonnull RCTPromiseResolveBlock)resolve reject : (nonnull RCTPromiseRejectBlock)
-        reject)
+RCT_EXPORT_METHOD(requestRecordingPermissions : (nonnull RCTPromiseResolveBlock)
+                      resolve reject : (nonnull RCTPromiseRejectBlock)reject)
 {
   NSString *res = [self.audioSessionManager requestRecordingPermissions];
   resolve(res);
 }
 
-RCT_EXPORT_METHOD(
-    checkRecordingPermissions : (nonnull RCTPromiseResolveBlock)resolve reject : (nonnull RCTPromiseRejectBlock)reject)
+RCT_EXPORT_METHOD(checkRecordingPermissions : (nonnull RCTPromiseResolveBlock)
+                      resolve reject : (nonnull RCTPromiseRejectBlock)reject)
 {
   NSString *res = [self.audioSessionManager checkRecordingPermissions];
   resolve(res);

packages/react-native-audio-api/package.json

@@ -90,6 +90,7 @@
     "@commitlint/config-conventional": "^17.0.2",
     "@evilmartians/lefthook": "^1.5.0",
     "@expo/config-plugins": "^9.0.0",
+    "@expo/config-types": "^53.0.4",
     "@react-native/babel-preset": "0.77.1",
     "@react-native/eslint-config": "^0.77.1",
     "@react-native/metro-config": "0.77.1",

packages/react-native-audio-api/src/plugin/withAudioAPI.ts

@@ -5,9 +5,28 @@ import {
   withInfoPlist,
   withAndroidManifest,
 } from '@expo/config-plugins';
-
 const pkg = require('react-native-audio-api/package.json');
 
+interface Options {
+  iosBackgroundMode: boolean;
+  androidForegroundService: boolean;
+  androidFSPermissions: string[];
+  androidFSTypes: string[];
+}
+
+const withDefaultOptions = (options: Partial<Options>): Options => {
+  return {
+    iosBackgroundMode: true,
+    androidForegroundService: true,
+    androidFSPermissions: [
+      'android.permission.FOREGROUND_SERVICE',
+      'android.permission.WAKE_LOCK',
+    ],
+    androidFSTypes: ['mediaPlayback'],
+    ...options,
+  };
+};
+
 const withBackgroundAudio: ConfigPlugin = (config) => {
   return withInfoPlist(config, (iosConfig) => {
     iosConfig.modResults.UIBackgroundModes = [
@@ -20,18 +39,20 @@ const withBackgroundAudio: ConfigPlugin = (config) => {
   });
 };
 
-const withAndroidPermissions: ConfigPlugin<{
-  androidFSPermissions: string[];
-}> = (config, { androidFSPermissions }) => {
+const withAndroidPermissions: ConfigPlugin<Options> = (
+  config,
+  { androidFSPermissions }: Options
+) => {
   return AndroidConfig.Permissions.withPermissions(
     config,
     androidFSPermissions
   );
 };
 
-const withForegroundService: ConfigPlugin<{
-  androidFSTypes: string[];
-}> = (config, { androidFSTypes }) => {
+const withForegroundService: ConfigPlugin<Options> = (
+  config,
+  { androidFSTypes }: Options
+) => {
   return withAndroidManifest(config, (mod) => {
     const manifest = mod.modResults;
     const mainApplication =
@@ -59,30 +80,16 @@ const withForegroundService: ConfigPlugin<{
   });
 };
 
-const withAudioAPI: ConfigPlugin<{
-  iosBackgroundMode?: boolean;
-  androidForegroundService?: boolean;
-  androidFSPermissions?: string[];
-  androidFSTypes?: string[];
-}> = (
-  config,
-  {
-    iosBackgroundMode = true,
-    androidForegroundService = true,
-    androidFSPermissions = [],
-    androidFSTypes = [],
-  } = {}
-) => {
-  if (iosBackgroundMode) {
+const withAudioAPI: ConfigPlugin<Options> = (config, optionsIn) => {
+  const options = withDefaultOptions(optionsIn ?? {});
+
+  if (options.iosBackgroundMode) {
     config = withBackgroundAudio(config);
   }
-  if (androidForegroundService) {
-    config = withAndroidPermissions(config, {
-      androidFSPermissions,
-    });
-    config = withForegroundService(config, {
-      androidFSTypes,
-    });
+
+  if (options.androidForegroundService) {
+    config = withAndroidPermissions(config, options);
+    config = withForegroundService(config, options);
   }
 
   return config;

yarn.lock

@@ -1993,6 +1993,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@expo/config-types@npm:^53.0.4":
+  version: 53.0.4
+  resolution: "@expo/config-types@npm:53.0.4"
+  checksum: 10/536395517b132db489e3a046061f70065f4139bfff39116d129861c69b0d789e8089cca9f4a48b9ffc44991b9f12ae1cd03cc0707a9c4c0e3319c8a4c2b9fc8b
+  languageName: node
+  linkType: hard
+
 "@expo/json-file@npm:~9.1.1":
   version: 9.1.1
   resolution: "@expo/json-file@npm:9.1.1"
@@ -10779,6 +10786,7 @@ __metadata:
     "@commitlint/config-conventional": "npm:^17.0.2"
     "@evilmartians/lefthook": "npm:^1.5.0"
     "@expo/config-plugins": "npm:^9.0.0"
+    "@expo/config-types": "npm:^53.0.4"
     "@react-native/babel-preset": "npm:0.77.1"
     "@react-native/eslint-config": "npm:^0.77.1"
     "@react-native/metro-config": "npm:0.77.1"