@siteed/expo-audio-studio 2.9.0 → 2.10.0

package/src/ExpoAudioStream.web.ts

@@ -285,13 +285,15 @@ export class ExpoAudioStreamWeb extends LegacyEventEmitter {
             bitDepth: this.bitDepth,
             channels: recordingConfig.channels ?? 1,
             sampleRate: recordingConfig.sampleRate ?? 44100,
-            compression: recordingConfig.compression
+            compression: recordingConfig.output?.compressed?.enabled
                 ? {
-                      ...recordingConfig.compression,
-                      bitrate: recordingConfig.compression?.bitrate ?? 128000,
+                      ...recordingConfig.output.compressed,
+                      bitrate:
+                          recordingConfig.output.compressed.bitrate ?? 128000,
                       size: 0,
                       mimeType: 'audio/webm',
-                      format: recordingConfig.compression?.format ?? 'opus',
+                      format:
+                          recordingConfig.output.compressed.format ?? 'opus',
                       compressedFileUri: '',
                   }
                 : undefined,
@@ -459,56 +461,56 @@ export class ExpoAudioStreamWeb extends LegacyEventEmitter {
             let fileUri = `${this.streamUuid}.${this.extension}`
             let mimeType = `audio/${this.extension}`
 
-            // Handle both compressed and uncompressed blobs according to configuration
-            const compressionEnabled =
-                this.recordingConfig?.compression?.enabled ?? false
+            // Handle both compressed and uncompressed blobs according to new output configuration
+            const primaryEnabled =
+                this.recordingConfig?.output?.primary?.enabled ?? true
+            const compressedEnabled =
+                this.recordingConfig?.output?.compressed?.enabled ?? false
 
-            // Process compressed blob if available
-            if (compressedBlob) {
+            // Process compressed blob if available and enabled
+            if (compressedBlob && compressedEnabled) {
                 const compressedUri = URL.createObjectURL(compressedBlob)
                 const compressedInfo = {
                     compressedFileUri: compressedUri,
                     size: compressedBlob.size,
                     mimeType: 'audio/webm',
-                    format: 'opus',
+                    format:
+                        this.recordingConfig?.output?.compressed?.format ??
+                        'opus',
                     bitrate:
-                        this.recordingConfig?.compression?.bitrate ?? 128000,
+                        this.recordingConfig?.output?.compressed?.bitrate ??
+                        128000,
                 }
 
-                // If compression is enabled, use compressed blob as primary format
-                if (compressionEnabled) {
+                // Store compression info
+                compression = compressedInfo
+
+                // If primary is disabled, use compressed as main file
+                if (!primaryEnabled) {
                     this.logger?.debug(
-                        'Using compressed audio as primary output'
+                        'Using compressed audio as primary output (primary disabled)'
                     )
                     fileUri = compressedUri
                     mimeType = 'audio/webm'
-
-                    // Store compression info
-                    compression = compressedInfo
-                } else {
-                    // Compression was enabled during recording but not set as primary
-                    // Store as alternate format
-                    compression = compressedInfo
                 }
             }
 
-            // Process uncompressed WAV if available
-            if (uncompressedBlob) {
+            // Process uncompressed WAV if available and primary is enabled
+            if (uncompressedBlob && primaryEnabled) {
                 const wavUri = URL.createObjectURL(uncompressedBlob)
-
-                // If compression is disabled or no compressed blob is available,
-                // use WAV as primary format
-                if (!compressionEnabled || !compressedBlob) {
-                    this.logger?.debug(
-                        'Using uncompressed WAV as primary output'
-                    )
-                    fileUri = wavUri
-                    mimeType = 'audio/wav'
-                }
+                fileUri = wavUri
+                mimeType = 'audio/wav'
+            } else if (!primaryEnabled && !compressedEnabled) {
+                // No outputs enabled - streaming only mode
+                this.logger?.debug('No outputs enabled - streaming only mode')
+                fileUri = ''
+                mimeType = 'audio/wav'
             }
 
             // Use the stored streamUuid for the final filename
-            const filename = `${this.streamUuid}.${this.extension}`
+            const filename = fileUri
+                ? `${this.streamUuid}.${this.extension}`
+                : 'stream-only'
             const result: AudioRecording = {
                 fileUri,
                 filename,
@@ -517,7 +519,7 @@ export class ExpoAudioStreamWeb extends LegacyEventEmitter {
                 channels: this.recordingConfig?.channels ?? 1,
                 sampleRate: this.recordingConfig?.sampleRate ?? 44100,
                 durationMs: this.currentDurationMs,
-                size: this.currentSize,
+                size: primaryEnabled ? this.currentSize : 0,
                 mimeType,
                 compression,
             }
@@ -630,13 +632,16 @@ export class ExpoAudioStreamWeb extends LegacyEventEmitter {
             interval: this.currentInterval,
             intervalAnalysis: this.currentIntervalAnalysis,
             mimeType: `audio/${this.extension}`,
-            compression: this.recordingConfig?.compression?.enabled
+            compression: this.recordingConfig?.output?.compressed?.enabled
                 ? {
                       size: this.totalCompressedSize,
                       mimeType: 'audio/webm',
-                      format: this.recordingConfig.compression.format ?? 'opus',
+                      format:
+                          this.recordingConfig.output.compressed.format ??
+                          'opus',
                       bitrate:
-                          this.recordingConfig.compression.bitrate ?? 128000,
+                          this.recordingConfig.output.compressed.bitrate ??
+                          128000,
                       compressedFileUri: `${this.streamUuid}.webm`,
                   }
                 : undefined,

package/src/WebRecorder.web.ts

@@ -154,7 +154,7 @@ export class WebRecorder {
         }
 
         // Initialize compressed recording if enabled
-        if (recordingConfig.compression?.enabled) {
+        if (recordingConfig.output?.compressed?.enabled) {
             this.initializeCompressedRecorder()
         }
 
@@ -234,9 +234,9 @@ export class WebRecorder {
                     )
                     const samples = chunk.length // Number of samples in this chunk
 
-                    // Only store PCM data if web.storeUncompressedAudio is not explicitly false
+                    // Only store PCM data if primary output is enabled
                     const shouldStoreUncompressed =
-                        this.config.web?.storeUncompressedAudio !== false
+                        this.config.output?.primary?.enabled ?? true
 
                     // Store PCM chunks when needed - this is for the final WAV file
                     if (shouldStoreUncompressed) {
@@ -275,9 +275,12 @@ export class WebRecorder {
                               size: this.pendingCompressedChunk.size,
                               totalSize: this.compressedSize,
                               mimeType: 'audio/webm',
-                              format: 'opus',
+                              format:
+                                  this.config.output?.compressed?.format ??
+                                  'opus',
                               bitrate:
-                                  this.config.compression?.bitrate ?? 128000,
+                                  this.config.output?.compressed?.bitrate ??
+                                  128000,
                           }
                         : undefined
 
@@ -312,11 +315,11 @@ export class WebRecorder {
                 interval,
                 position: this.position,
                 deviceId: this.config.deviceId ?? 'default',
-                compression: this.config.compression
+                compression: this.config.output?.compressed
                     ? {
-                          enabled: this.config.compression.enabled,
-                          format: this.config.compression.format,
-                          bitrate: this.config.compression.bitrate,
+                          enabled: this.config.output.compressed.enabled,
+                          format: this.config.output.compressed.format,
+                          bitrate: this.config.output.compressed.bitrate,
                       }
                     : 'disabled',
             })
@@ -843,7 +846,7 @@ export class WebRecorder {
                 {
                     mimeType,
                     audioBitsPerSecond:
-                        this.config.compression?.bitrate ?? 128000,
+                        this.config.output?.compressed?.bitrate ?? 128000,
                 }
             )
 

package/android/src/main/test/java/net/siteed/audiostream/AudioProcessorTest.kt

@@ -1,56 +0,0 @@
-package net.siteed.audiostream
-
-import org.junit.Test
-import org.junit.Assert.*
-
-class AudioProcessorTest {
-
-    private val sampleRate = 44100
-    private val channels = 1
-    private val encoding = "pcm_16bit"
-    private val pointsPerSecond = 1000
-    private val algorithm = "rms"
-    private val features = mapOf("rms" to true, "zcr" to true)
-
-    private val recordingConfig = RecordingConfig(
-        sampleRate = sampleRate,
-        channels = channels,
-        encoding = encoding,
-        interval = 1000,
-        enableProcessing = true,
-        pointsPerSecond = pointsPerSecond,
-        algorithm = algorithm,
-        features = features
-    )
-
-    private val audioProcessor = AudioProcessor()
-
-    @Test
-    fun testProcessAudioData() {
-        val data = generateSineWave(440.0, sampleRate, 2.0)
-
-        val result = audioProcessor.processAudioData(data, recordingConfig)
-
-        assertNotNull(result)
-        assertEquals(pointsPerSecond, result.pointsPerSecond)
-        assertEquals((data.size / sampleRate) * 1000, result.durationMs.toInt())
-        assertEquals(16, result.bitDepth)
-        assertEquals(channels, result.numberOfChannels)
-        assertEquals(sampleRate, result.sampleRate.toInt())
-    }
-
-    // Helper function to generate a sine wave
-    private fun generateSineWave(frequency: Double, sampleRate: Int, durationSeconds: Double): ByteArray {
-        val numSamples = (sampleRate * durationSeconds).toInt()
-        val output = ByteArray(numSamples * 2) // 16-bit PCM
-
-        for (i in 0 until numSamples) {
-            val time = i / sampleRate.toDouble()
-            val amplitude = (Math.sin(2.0 * Math.PI * frequency * time) * 32767).toInt()
-            output[i * 2] = (amplitude and 0xff).toByte()
-            output[i * 2 + 1] = ((amplitude shr 8) and 0xff).toByte()
-        }
-
-        return output
-    }
-}

package/ios/siteedexpoaudiostudio.xcodeproj/project.xcworkspace/contents.xcworkspacedata

@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Workspace
-   version = "1.0">
-   <FileRef
-      location = "self:">
-   </FileRef>
-</Workspace>

package/ios/siteedexpoaudiostudio.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist

@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>IDEDidComputeMac32BitWarning</key>
-	<true/>
-</dict>
-</plist>