react-native-audio-concat 0.2.3 → 0.4.0

package/android/src/main/java/com/audioconcat/AudioConcatPackage.kt

@@ -0,0 +1,33 @@
+package com.audioconcat
+
+import com.facebook.react.BaseReactPackage
+import com.facebook.react.bridge.NativeModule
+import com.facebook.react.bridge.ReactApplicationContext
+import com.facebook.react.module.model.ReactModuleInfo
+import com.facebook.react.module.model.ReactModuleInfoProvider
+import java.util.HashMap
+
+class AudioConcatPackage : BaseReactPackage() {
+  override fun getModule(name: String, reactContext: ReactApplicationContext): NativeModule? {
+    return if (name == AudioConcatModule.NAME) {
+      AudioConcatModule(reactContext)
+    } else {
+      null
+    }
+  }
+
+  override fun getReactModuleInfoProvider(): ReactModuleInfoProvider {
+    return ReactModuleInfoProvider {
+      val moduleInfos: MutableMap<String, ReactModuleInfo> = HashMap()
+      moduleInfos[AudioConcatModule.NAME] = ReactModuleInfo(
+        AudioConcatModule.NAME,
+        AudioConcatModule.NAME,
+        false,  // canOverrideExistingModule
+        false,  // needsEagerInit
+        false,  // isCxxModule
+        true // isTurboModule
+      )
+      moduleInfos
+    }
+  }
+}

package/ios/AudioConcat.h

@@ -0,0 +1,5 @@
+#import <AudioConcatSpec/AudioConcatSpec.h>
+
+@interface AudioConcat : NSObject <NativeAudioConcatSpec>
+
+@end

package/ios/AudioConcat.mm

@@ -0,0 +1,104 @@
+#import "AudioConcat.h"
+#import <AVFoundation/AVFoundation.h>
+
+@implementation AudioConcat
+
+- (void)concatAudioFiles:(NSArray *)data
+              outputPath:(NSString *)outputPath
+                 resolve:(RCTPromiseResolveBlock)resolve
+                  reject:(RCTPromiseRejectBlock)reject
+{
+    dispatch_async(dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_DEFAULT, 0), ^{
+        @try {
+            AVMutableComposition *composition = [AVMutableComposition composition];
+            AVMutableCompositionTrack *audioTrack = [composition addMutableTrackWithMediaType:AVMediaTypeAudio
+                                                                              preferredTrackID:kCMPersistentTrackID_Invalid];
+
+            CMTime currentTime = kCMTimeZero;
+
+            for (NSDictionary *item in data) {
+                if (item[@"filePath"]) {
+                    // Add audio file
+                    NSString *filePath = item[@"filePath"];
+                    NSURL *fileURL = [NSURL fileURLWithPath:filePath];
+
+                    AVURLAsset *asset = [AVURLAsset URLAssetWithURL:fileURL options:nil];
+                    NSArray *tracks = [asset tracksWithMediaType:AVMediaTypeAudio];
+
+                    if (tracks.count == 0) {
+                        reject(@"ERR_NO_AUDIO_TRACK", [NSString stringWithFormat:@"No audio track found in file: %@", filePath], nil);
+                        return;
+                    }
+
+                    AVAssetTrack *track = tracks[0];
+                    CMTimeRange timeRange = CMTimeRangeMake(kCMTimeZero, asset.duration);
+
+                    NSError *error = nil;
+                    [audioTrack insertTimeRange:timeRange
+                                        ofTrack:track
+                                         atTime:currentTime
+                                          error:&error];
+
+                    if (error) {
+                        reject(@"ERR_INSERT_TRACK", error.localizedDescription, error);
+                        return;
+                    }
+
+                    currentTime = CMTimeAdd(currentTime, asset.duration);
+
+                } else if (item[@"durationMs"]) {
+                    // Add silence period
+                    NSNumber *durationMs = item[@"durationMs"];
+                    double durationSeconds = [durationMs doubleValue] / 1000.0;
+                    CMTime silenceDuration = CMTimeMakeWithSeconds(durationSeconds, 600);
+
+                    currentTime = CMTimeAdd(currentTime, silenceDuration);
+                }
+            }
+
+            // Export the composition
+            NSURL *outputURL = [NSURL fileURLWithPath:outputPath];
+
+            // Remove existing file if it exists
+            [[NSFileManager defaultManager] removeItemAtURL:outputURL error:nil];
+
+            AVAssetExportSession *exportSession = [[AVAssetExportSession alloc] initWithAsset:composition
+                                                                                    presetName:AVAssetExportPresetAppleM4A];
+            exportSession.outputURL = outputURL;
+            exportSession.outputFileType = AVFileTypeAppleM4A;
+
+            [exportSession exportAsynchronouslyWithCompletionHandler:^{
+                switch (exportSession.status) {
+                    case AVAssetExportSessionStatusCompleted:
+                        resolve(outputPath);
+                        break;
+                    case AVAssetExportSessionStatusFailed:
+                        reject(@"ERR_EXPORT_FAILED", exportSession.error.localizedDescription, exportSession.error);
+                        break;
+                    case AVAssetExportSessionStatusCancelled:
+                        reject(@"ERR_EXPORT_CANCELLED", @"Export was cancelled", nil);
+                        break;
+                    default:
+                        reject(@"ERR_EXPORT_UNKNOWN", @"Unknown export error", nil);
+                        break;
+                }
+            }];
+
+        } @catch (NSException *exception) {
+            reject(@"ERR_EXCEPTION", exception.reason, nil);
+        }
+    });
+}
+
+- (std::shared_ptr<facebook::react::TurboModule>)getTurboModule:
+    (const facebook::react::ObjCTurboModule::InitParams &)params
+{
+    return std::make_shared<facebook::react::NativeAudioConcatSpecJSI>(params);
+}
+
++ (NSString *)moduleName
+{
+  return @"AudioConcat";
+}
+
+@end

package/lib/module/NativeAudioConcat.js

@@ -0,0 +1,5 @@
+"use strict";
+
+import { TurboModuleRegistry } from 'react-native';
+export default TurboModuleRegistry.getEnforcing('AudioConcat');
+//# sourceMappingURL=NativeAudioConcat.js.map

package/lib/module/NativeAudioConcat.js.map

@@ -0,0 +1 @@
+{"version":3,"names":["TurboModuleRegistry","getEnforcing"],"sourceRoot":"../../src","sources":["NativeAudioConcat.ts"],"mappings":";;AAAA,SAASA,mBAAmB,QAA0B,cAAc;AAWpE,eAAeA,mBAAmB,CAACC,YAAY,CAAO,aAAa,CAAC","ignoreList":[]}

package/lib/module/index.js

@@ -1,33 +1,7 @@
 "use strict";
 
-import { NitroModules } from 'react-native-nitro-modules';
-const AudioConcatHybridObject = NitroModules.createHybridObject('AudioConcat');
-
-/**
- * Concat audio files and silence periods into a single output file.
- *
- * @param data - Array of audio files and silence periods to merge.
- *               Each item can be either:
- *               - `{ filePath: string }` for an audio file
- *               - `{ durationMs: number }` for a silence period
- * @param outputPath - Absolute path where the merged audio file will be saved (M4A format)
- * @returns Promise that resolves with the output file path
- *
- * @example
- * ```typescript
- * const data = [
- *   { filePath: '/path/to/audio1.m4a' },
- *   { durationMs: 500 },  // 500ms silence
- *   { filePath: '/path/to/audio2.m4a' },
- *   { durationMs: 1000 }, // 1 second silence
- *   { filePath: '/path/to/audio3.m4a' }
- * ];
- * const output = '/path/to/merged.m4a';
- * const result = await concatAudioFiles(data, output);
- * console.log('concat file:', result);
- * ```
- */
+import AudioConcat from "./NativeAudioConcat.js";
 export function concatAudioFiles(data, outputPath) {
-  return AudioConcatHybridObject.concatAudioFiles(data, outputPath);
+  return AudioConcat.concatAudioFiles(data, outputPath);
 }
 //# sourceMappingURL=index.js.map

package/lib/module/index.js.map

@@ -1 +1 @@
-{"version":3,"names":["NitroModules","AudioConcatHybridObject","createHybridObject","concatAudioFiles","data","outputPath"],"sourceRoot":"../../src","sources":["index.tsx"],"mappings":";;AAAA,SAASA,YAAY,QAAQ,4BAA4B;AAGzD,MAAMC,uBAAuB,GAC3BD,YAAY,CAACE,kBAAkB,CAAc,aAAa,CAAC;;AAE7D;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,OAAO,SAASC,gBAAgBA,CAC9BC,IAA0B,EAC1BC,UAAkB,EACD;EACjB,OAAOJ,uBAAuB,CAACE,gBAAgB,CAACC,IAAI,EAAEC,UAAU,CAAC;AACnE","ignoreList":[]}
+{"version":3,"names":["AudioConcat","concatAudioFiles","data","outputPath"],"sourceRoot":"../../src","sources":["index.tsx"],"mappings":";;AAAA,OAAOA,WAAW,MAAM,wBAAqB;AAI7C,OAAO,SAASC,gBAAgBA,CAC9BC,IAA0D,EAC1DC,UAAkB,EACD;EACjB,OAAOH,WAAW,CAACC,gBAAgB,CAACC,IAAI,EAAEC,UAAU,CAAC;AACvD","ignoreList":[]}

package/lib/typescript/src/NativeAudioConcat.d.ts

@@ -0,0 +1,12 @@
+import { type TurboModule } from 'react-native';
+export type AudioDataOrSilence = {
+    filePath: string;
+} | {
+    durationMs: number;
+};
+export interface Spec extends TurboModule {
+    concatAudioFiles(data: AudioDataOrSilence[], outputPath: string): Promise<string>;
+}
+declare const _default: Spec;
+export default _default;
+//# sourceMappingURL=NativeAudioConcat.d.ts.map

package/lib/typescript/src/NativeAudioConcat.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"NativeAudioConcat.d.ts","sourceRoot":"","sources":["../../../src/NativeAudioConcat.ts"],"names":[],"mappings":"AAAA,OAAO,EAAuB,KAAK,WAAW,EAAE,MAAM,cAAc,CAAC;AAErE,MAAM,MAAM,kBAAkB,GAAG;IAAE,QAAQ,EAAE,MAAM,CAAA;CAAE,GAAG;IAAE,UAAU,EAAE,MAAM,CAAA;CAAE,CAAC;AAE/E,MAAM,WAAW,IAAK,SAAQ,WAAW;IACvC,gBAAgB,CACd,IAAI,EAAE,kBAAkB,EAAE,EAC1B,UAAU,EAAE,MAAM,GACjB,OAAO,CAAC,MAAM,CAAC,CAAC;CACpB;;AAED,wBAAqE"}

package/lib/typescript/src/index.d.ts

@@ -1,28 +1,7 @@
-import type { AudioDataOrSilence } from './AudioConcat.nitro';
-/**
- * Concat audio files and silence periods into a single output file.
- *
- * @param data - Array of audio files and silence periods to merge.
- *               Each item can be either:
- *               - `{ filePath: string }` for an audio file
- *               - `{ durationMs: number }` for a silence period
- * @param outputPath - Absolute path where the merged audio file will be saved (M4A format)
- * @returns Promise that resolves with the output file path
- *
- * @example
- * ```typescript
- * const data = [
- *   { filePath: '/path/to/audio1.m4a' },
- *   { durationMs: 500 },  // 500ms silence
- *   { filePath: '/path/to/audio2.m4a' },
- *   { durationMs: 1000 }, // 1 second silence
- *   { filePath: '/path/to/audio3.m4a' }
- * ];
- * const output = '/path/to/merged.m4a';
- * const result = await concatAudioFiles(data, output);
- * console.log('concat file:', result);
- * ```
- */
-export declare function concatAudioFiles(data: AudioDataOrSilence[], outputPath: string): Promise<string>;
-export type { AudioDataOrSilence } from './AudioConcat.nitro';
+export type { AudioDataOrSilence } from './NativeAudioConcat';
+export declare function concatAudioFiles(data: Array<{
+    filePath: string;
+} | {
+    durationMs: number;
+}>, outputPath: string): Promise<string>;
 //# sourceMappingURL=index.d.ts.map

package/lib/typescript/src/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/index.tsx"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAe,kBAAkB,EAAE,MAAM,qBAAqB,CAAC;AAK3E;;;;;;;;;;;;;;;;;;;;;;;GAuBG;AACH,wBAAgB,gBAAgB,CAC9B,IAAI,EAAE,kBAAkB,EAAE,EAC1B,UAAU,EAAE,MAAM,GACjB,OAAO,CAAC,MAAM,CAAC,CAEjB;AAED,YAAY,EAAE,kBAAkB,EAAE,MAAM,qBAAqB,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/index.tsx"],"names":[],"mappings":"AAEA,YAAY,EAAE,kBAAkB,EAAE,MAAM,qBAAqB,CAAC;AAE9D,wBAAgB,gBAAgB,CAC9B,IAAI,EAAE,KAAK,CAAC;IAAE,QAAQ,EAAE,MAAM,CAAA;CAAE,GAAG;IAAE,UAAU,EAAE,MAAM,CAAA;CAAE,CAAC,EAC1D,UAAU,EAAE,MAAM,GACjB,OAAO,CAAC,MAAM,CAAC,CAEjB"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native-audio-concat",
-  "version": "0.2.3",
+  "version": "0.4.0",
   "description": "audio-concat for react-native",
   "main": "./lib/module/index.js",
   "types": "./lib/typescript/src/index.d.ts",
@@ -18,8 +18,6 @@
     "android",
     "ios",
     "cpp",
-    "nitrogen",
-    "nitro.json",
     "*.podspec",
     "react-native.config.js",
     "!ios/build",
@@ -40,8 +38,7 @@
     "lint": "eslint \"**/*.{js,ts,tsx}\"",
     "clean": "del-cli android/build example/android/build example/android/app/build example/ios/build lib",
     "prepare": "bob build",
-    "release": "release-it --only-version",
-    "nitrogen": "nitrogen"
+    "release": "release-it --only-version"
   },
   "keywords": [
     "react-native",
@@ -67,6 +64,7 @@
     "@eslint/eslintrc": "^3.3.1",
     "@eslint/js": "^9.35.0",
     "@evilmartians/lefthook": "^1.12.3",
+    "@react-native-community/cli": "20.0.1",
     "@react-native/babel-preset": "0.81.1",
     "@react-native/eslint-config": "^0.81.1",
     "@release-it/conventional-changelog": "^10.0.1",
@@ -78,20 +76,17 @@
     "eslint-config-prettier": "^10.1.8",
     "eslint-plugin-prettier": "^5.5.4",
     "jest": "^29.7.0",
-    "nitrogen": "^0.29.8",
     "prettier": "^3.6.2",
     "react": "19.1.0",
     "react-native": "0.81.1",
     "react-native-builder-bob": "^0.40.13",
-    "react-native-nitro-modules": "^0.29.8",
     "release-it": "^19.0.4",
     "turbo": "^2.5.6",
     "typescript": "^5.9.2"
   },
   "peerDependencies": {
     "react": "*",
-    "react-native": "*",
-    "react-native-nitro-modules": "^0.29.8"
+    "react-native": "*"
   },
   "workspaces": [
     "example"
@@ -139,13 +134,6 @@
     "source": "src",
     "output": "lib",
     "targets": [
-      [
-        "custom",
-        {
-          "script": "nitrogen",
-          "clean": "nitrogen/"
-        }
-      ],
       [
         "module",
         {
@@ -160,9 +148,17 @@
       ]
     ]
   },
+  "codegenConfig": {
+    "name": "AudioConcatSpec",
+    "type": "modules",
+    "jsSrcsDir": "src",
+    "android": {
+      "javaPackageName": "com.audioconcat"
+    }
+  },
   "create-react-native-library": {
-    "languages": "kotlin-swift",
-    "type": "nitro-module",
+    "languages": "kotlin-objc",
+    "type": "turbo-module",
     "version": "0.54.5"
   }
 }

package/src/NativeAudioConcat.ts

@@ -0,0 +1,12 @@
+import { TurboModuleRegistry, type TurboModule } from 'react-native';
+
+export type AudioDataOrSilence = { filePath: string } | { durationMs: number };
+
+export interface Spec extends TurboModule {
+  concatAudioFiles(
+    data: AudioDataOrSilence[],
+    outputPath: string
+  ): Promise<string>;
+}
+
+export default TurboModuleRegistry.getEnforcing<Spec>('AudioConcat');

package/src/index.tsx

@@ -1,38 +1,10 @@
-import { NitroModules } from 'react-native-nitro-modules';
-import type { AudioConcat, AudioDataOrSilence } from './AudioConcat.nitro';
+import AudioConcat from './NativeAudioConcat';
 
-const AudioConcatHybridObject =
-  NitroModules.createHybridObject<AudioConcat>('AudioConcat');
+export type { AudioDataOrSilence } from './NativeAudioConcat';
 
-/**
- * Concat audio files and silence periods into a single output file.
- *
- * @param data - Array of audio files and silence periods to merge.
- *               Each item can be either:
- *               - `{ filePath: string }` for an audio file
- *               - `{ durationMs: number }` for a silence period
- * @param outputPath - Absolute path where the merged audio file will be saved (M4A format)
- * @returns Promise that resolves with the output file path
- *
- * @example
- * ```typescript
- * const data = [
- *   { filePath: '/path/to/audio1.m4a' },
- *   { durationMs: 500 },  // 500ms silence
- *   { filePath: '/path/to/audio2.m4a' },
- *   { durationMs: 1000 }, // 1 second silence
- *   { filePath: '/path/to/audio3.m4a' }
- * ];
- * const output = '/path/to/merged.m4a';
- * const result = await concatAudioFiles(data, output);
- * console.log('concat file:', result);
- * ```
- */
 export function concatAudioFiles(
-  data: AudioDataOrSilence[],
+  data: Array<{ filePath: string } | { durationMs: number }>,
   outputPath: string
 ): Promise<string> {
-  return AudioConcatHybridObject.concatAudioFiles(data, outputPath);
+  return AudioConcat.concatAudioFiles(data, outputPath);
 }
-
-export type { AudioDataOrSilence } from './AudioConcat.nitro';

package/android/CMakeLists.txt

@@ -1,24 +0,0 @@
-project(audioconcat)
-cmake_minimum_required(VERSION 3.9.0)
-
-set(PACKAGE_NAME audioconcat)
-set(CMAKE_VERBOSE_MAKEFILE ON)
-set(CMAKE_CXX_STANDARD 20)
-
-# Define C++ library and add all sources
-add_library(${PACKAGE_NAME} SHARED src/main/cpp/cpp-adapter.cpp)
-
-# Add Nitrogen specs :)
-include(${CMAKE_SOURCE_DIR}/../nitrogen/generated/android/audioconcat+autolinking.cmake)
-
-# Set up local includes
-include_directories("src/main/cpp" "../cpp")
-
-find_library(LOG_LIB log)
-
-# Link all libraries together
-target_link_libraries(
-        ${PACKAGE_NAME}
-        ${LOG_LIB}
-        android # <-- Android core
-)

package/android/src/main/cpp/cpp-adapter.cpp

@@ -1,6 +0,0 @@
-#include <jni.h>
-#include "audioconcatOnLoad.hpp"
-
-JNIEXPORT jint JNICALL JNI_OnLoad(JavaVM* vm, void*) {
-  return margelo::nitro::audioconcat::initialize(vm);
-}