@siteed/expo-audio-stream 1.2.5 → 1.3.1

package/publish.sh

@@ -11,27 +11,60 @@ echo "Starting publication process..."
 current_version=$(node -p "require('./package.json').version")
 echo "Current version: $current_version"
 
-# Ask user for version bump type
+# Function to check if version exists in CHANGELOG.md
+check_changelog_version() {
+    local version=$1
+    if ! grep -q "## \[$version\]" CHANGELOG.md; then
+        echo "Error: Version [$version] not found in CHANGELOG.md"
+        
+        # Find the last release tag
+        last_tag=$(git describe --tags --abbrev=0 2>/dev/null || echo "")
+        
+        if [ -n "$last_tag" ]; then
+            echo -e "\nCommits since last release ($last_tag):"
+            git log --pretty=format:"- %s (%h)" $last_tag..HEAD
+            echo -e "\nPlease add a changelog entry for version [$version] before publishing."
+        else
+            echo -e "\nNo previous tags found. Here are the recent commits:"
+            git log --pretty=format:"- %s (%h)" -n 10
+        fi
+        
+        return 1
+    fi
+    return 0
+}
+
+# Calculate potential versions
+potential_patch=$(node -e "const [major, minor, patch] = '${current_version}'.split('.'); console.log(\`\${major}.\${minor}.\${Number(patch) + 1}\`)")
+potential_minor=$(node -e "const [major, minor, patch] = '${current_version}'.split('.'); console.log(\`\${major}.\${Number(minor) + 1}.0\`)")
+potential_major=$(node -e "const [major, minor, patch] = '${current_version}'.split('.'); console.log(\`\${Number(major) + 1}.0.0\`)")
+
+# Ask user for version bump type with actual version numbers
+echo "Current version: $current_version"
 echo "Please select version bump type:"
-echo "1) patch (x.x.X)"
-echo "2) minor (x.X.0)"
-echo "3) major (X.0.0)"
+echo "1) patch ($potential_patch)"
+echo "2) minor ($potential_minor)"
+echo "3) major ($potential_major)"
 echo "4) manual"
 read -p "Enter choice (1-4): " choice
 
+# Store the target version before making any changes
 case $choice in
     1)
         yarn version patch
+        target_version=$potential_patch
         ;;
     2)
         yarn version minor
+        target_version=$potential_minor
         ;;
     3)
         yarn version major
+        target_version=$potential_major
         ;;
     4)
-        read -p "Enter new version (current: $current_version): " new_version
-        yarn version $new_version
+        read -p "Enter new version (current: $current_version): " target_version
+        yarn version $target_version
         ;;
     *)
         echo "Invalid choice. Exiting."
@@ -39,6 +72,13 @@ case $choice in
         ;;
 esac
 
+# Check changelog before proceeding
+if ! check_changelog_version "$target_version"; then
+    # Revert package.json changes
+    git checkout -- package.json
+    exit 1
+fi
+
 # Get new version after bump
 version=$(node -p "require('./package.json').version")
 echo "New version: $version"
@@ -54,11 +94,11 @@ sleep 2
 echo "Preparing and publishing package..."
 yarn clean && yarn prepare && yarn npm publish
 
-sleep 1
-# Publish playground app
-echo "Publishing playground app..."
-cd ../../apps/playground
-yarn deploy
+# sleep 1
+# # Publish playground app
+# echo "Publishing playground app..."
+# cd ../../apps/playground
+# yarn deploy
 
 # # Publish minimal app (assuming it has a similar deploy script)
 # echo "Publishing minimal app..."

package/src/AudioAnalysis/extractAudioAnalysis.ts

@@ -1,18 +1,16 @@
 // packages/expo-audio-stream/src/AudioAnalysis/extractAudioAnalysis.ts
+import { ConsoleLike } from '../ExpoAudioStream.types'
+import ExpoAudioStreamModule from '../ExpoAudioStreamModule'
+import { isWeb } from '../constants'
 import {
     AmplitudeAlgorithm,
     AudioAnalysis,
     AudioFeaturesOptions,
 } from './AudioAnalysis.types'
-import ExpoAudioStreamModule from '../ExpoAudioStreamModule'
-import { isWeb } from '../constants'
-import { getLogger } from '../logger'
 import { convertPCMToFloat32 } from '../utils/convertPCMToFloat32'
 import { getWavFileInfo, WavFileInfo } from '../utils/getWavFileInfo'
 import { InlineFeaturesExtractor } from '../workers/InlineFeaturesExtractor.web'
 
-const logger = getLogger('extractAudioAnalysis')
-
 export interface ExtractAudioAnalysisProps {
     fileUri?: string // should provide either fileUri or arrayBuffer
     wavMetadata?: WavFileInfo
@@ -28,6 +26,7 @@ export interface ExtractAudioAnalysisProps {
     pointsPerSecond?: number // Optional number of points per second. Use to reduce the number of points and compute the number of datapoints to return.
     features?: AudioFeaturesOptions
     featuresExtratorUrl?: string
+    logger?: ConsoleLike
 }
 
 export const extractAudioAnalysis = async ({
@@ -42,6 +41,7 @@ export const extractAudioAnalysis = async ({
     algorithm = 'rms',
     features,
     featuresExtratorUrl,
+    logger,
 }: ExtractAudioAnalysisProps): Promise<AudioAnalysis> => {
     if (isWeb) {
         if (!arrayBuffer && !fileUri) {
@@ -49,7 +49,7 @@ export const extractAudioAnalysis = async ({
         }
 
         if (!arrayBuffer) {
-            logger.log(`fetching fileUri`, fileUri)
+            logger?.log(`fetching fileUri`, fileUri)
             const response = await fetch(fileUri!)
 
             if (!response.ok) {
@@ -59,25 +59,25 @@ export const extractAudioAnalysis = async ({
             }
 
             arrayBuffer = await response.arrayBuffer()
-            logger.log(`fetched fileUri`, arrayBuffer.byteLength, arrayBuffer)
+            logger?.log(`fetched fileUri`, arrayBuffer.byteLength, arrayBuffer)
         }
 
         // Create a new copy of the ArrayBuffer to avoid detachment issues
         const bufferCopy = arrayBuffer.slice(0)
-        logger.log(
+        logger?.log(
             `extractAudioAnalysis skipWavHeader=${skipWavHeader} bitDepth=${bitDepth} len=${bufferCopy.byteLength}`,
             bufferCopy.slice(0, 100)
         )
 
         let actualBitDepth = bitDepth
         if (!actualBitDepth) {
-            logger.log(
+            logger?.log(
                 `extractAudioAnalysis bitDepth not provided -- getting wav file info`
             )
             const fileInfo = await getWavFileInfo(bufferCopy)
             actualBitDepth = fileInfo.bitDepth
         }
-        logger.log(`extractAudioAnalysis actualBitDepth=${actualBitDepth}`)
+        logger?.log(`extractAudioAnalysis actualBitDepth=${actualBitDepth}`)
 
         const {
             pcmValues: channelData,
@@ -88,7 +88,7 @@ export const extractAudioAnalysis = async ({
             bitDepth: actualBitDepth,
             skipWavHeader,
         })
-        logger.log(
+        logger?.log(
             `extractAudioAnalysis skipWaveHeader=${skipWavHeader} convertPCMToFloat32 length=${channelData.length} range: [ ${min} :: ${max} ]`
         )
 
@@ -129,7 +129,7 @@ export const extractAudioAnalysis = async ({
         if (!fileUri) {
             throw new Error('fileUri is required')
         }
-        logger.log(`extractAudioAnalysis`, {
+        logger?.log(`extractAudioAnalysis`, {
             fileUri,
             pointsPerSecond,
             algorithm,
@@ -141,7 +141,7 @@ export const extractAudioAnalysis = async ({
             algorithm,
             features,
         })
-        logger.log(`extractAudioAnalysis`, res)
+        logger?.log(`extractAudioAnalysis`, res)
         return res
     }
 }

package/src/AudioAnalysis/extractWaveform.ts

@@ -1,7 +1,5 @@
 import ExpoAudioStreamModule from '../ExpoAudioStreamModule'
-import { getLogger } from '../logger'
 
-const logger = getLogger('extractWaveform')
 export interface ExtractWaveformProps {
     fileUri: string
     numberOfSamples: number
@@ -20,6 +18,5 @@ export const extractWaveform = async ({
         offset,
         length,
     })
-    logger.log(`extractWaveform`, res)
     return res
 }

package/src/ExpoAudioStream.types.ts

@@ -27,6 +27,13 @@ export type EncodingType = 'pcm_32bit' | 'pcm_16bit' | 'pcm_8bit'
 export type SampleRate = 16000 | 44100 | 48000
 export type BitDepth = 8 | 16 | 32
 
+export type ConsoleLike = {
+    log: (message: string, ...args: unknown[]) => void
+    debug: (message: string, ...args: unknown[]) => void
+    warn: (message: string, ...args: unknown[]) => void
+    error: (message: string, ...args: unknown[]) => void
+}
+
 export interface Chunk {
     text: string
     timestamp: [number, number | null]

package/src/ExpoAudioStream.web.ts

@@ -1,17 +1,17 @@
 // src/ExpoAudioStreamModule.web.ts
-import { EventEmitter } from 'expo-modules-core'
+import { LegacyEventEmitter } from 'expo-modules-core'
 
 import { AudioAnalysis } from './AudioAnalysis/AudioAnalysis.types'
 import {
     AudioRecording,
     AudioStreamStatus,
     BitDepth,
+    ConsoleLike,
     RecordingConfig,
     StartRecordingResult,
 } from './ExpoAudioStream.types'
 import { WebRecorder } from './WebRecorder.web'
 import { AudioEventPayload } from './events'
-import { getLogger } from './logger'
 import { encodingToBitDepth } from './utils/encodingToBitDepth'
 import { WavHeaderOptions, writeWavHeader } from './utils/writeWavHeader'
 
@@ -23,13 +23,12 @@ export type EmitAudioEventFunction = (_: EmitAudioEventProps) => void
 export type EmitAudioAnalysisFunction = (_: AudioAnalysis) => void
 
 export interface ExpoAudioStreamWebProps {
+    logger?: ConsoleLike
     audioWorkletUrl: string
     featuresExtratorUrl: string
 }
 
-const logger = getLogger('ExpoAudioStreamWeb')
-
-export class ExpoAudioStreamWeb extends EventEmitter {
+export class ExpoAudioStreamWeb extends LegacyEventEmitter {
     customRecorder: WebRecorder | null
     audioChunks: ArrayBuffer[]
     isRecording: boolean
@@ -47,10 +46,12 @@ export class ExpoAudioStreamWeb extends EventEmitter {
     bitDepth: BitDepth // Bit depth of the audio
     audioWorkletUrl: string
     featuresExtratorUrl: string
+    logger?: ConsoleLike
 
     constructor({
         audioWorkletUrl,
         featuresExtratorUrl,
+        logger,
     }: ExpoAudioStreamWebProps) {
         const mockNativeModule = {
             addListener: () => {
@@ -62,6 +63,7 @@ export class ExpoAudioStreamWeb extends EventEmitter {
         }
         super(mockNativeModule) // Pass the mock native module to the parent class
 
+        this.logger = logger
         this.customRecorder = null
         this.audioChunks = []
         this.isRecording = false
@@ -123,7 +125,7 @@ export class ExpoAudioStreamWeb extends EventEmitter {
                 this.lastEmittedSize = this.currentSize
             },
             emitAudioAnalysisCallback: (audioAnalysisData: AudioAnalysis) => {
-                logger.log(`Emitted AudioAnalysis:`, audioAnalysisData)
+                this.logger?.log(`Emitted AudioAnalysis:`, audioAnalysisData)
                 this.emit('AudioAnalysis', audioAnalysisData)
             },
         })
@@ -181,7 +183,7 @@ export class ExpoAudioStreamWeb extends EventEmitter {
         const fullPcmBufferArray = await this.customRecorder.stop()
 
         // concat all audio chunks
-        logger.debug(`Stopped recording`, fullPcmBufferArray)
+        this.logger?.debug(`Stopped recording`, fullPcmBufferArray)
         this.isRecording = false
         this.isPaused = false
         this.currentDurationMs = Date.now() - this.recordingStartTime
@@ -193,7 +195,7 @@ export class ExpoAudioStreamWeb extends EventEmitter {
             numChannels: this.recordingConfig?.channels ?? 1,
             bitDepth: this.bitDepth,
         }
-        logger.debug(`Writing wav header`, wavConfig)
+        this.logger?.debug(`Writing wav header`, wavConfig)
         const wavBuffer = writeWavHeader(wavConfig).slice(0)
 
         // Create blob fileUri from audio chunks

package/src/ExpoAudioStreamModule.ts

@@ -19,10 +19,20 @@ if (Platform.OS === 'web') {
         return instance
     }
     ExpoAudioStreamModule.requestPermissionsAsync = async () => {
-        return { status: 'granted' }
+        return {
+            status: 'granted',
+            granted: true,
+            expires: 'never',
+            canAskAgain: true,
+        }
     }
     ExpoAudioStreamModule.getPermissionsAsync = async () => {
-        return { status: 'granted' }
+        return {
+            status: 'granted',
+            granted: true,
+            expires: 'never',
+            canAskAgain: true,
+        }
     }
 } else {
     ExpoAudioStreamModule = requireNativeModule('ExpoAudioStream')

package/src/WebRecorder.web.ts

@@ -1,13 +1,11 @@
 // src/WebRecorder.ts
-import { buffer } from 'stream/consumers'
 
 import { AudioAnalysis } from './AudioAnalysis/AudioAnalysis.types'
-import { RecordingConfig } from './ExpoAudioStream.types'
+import { ConsoleLike, RecordingConfig } from './ExpoAudioStream.types'
 import {
     EmitAudioAnalysisFunction,
     EmitAudioEventFunction,
 } from './ExpoAudioStream.web'
-import { getLogger } from './logger'
 import { convertPCMToFloat32 } from './utils/convertPCMToFloat32'
 import { encodingToBitDepth } from './utils/encodingToBitDepth'
 import { writeWavHeader } from './utils/writeWavHeader'
@@ -36,7 +34,6 @@ const DEFAULT_WEB_NUMBER_OF_CHANNELS = 1
 const DEFAULT_ALGORITHM = 'rms'
 
 const TAG = 'WebRecorder'
-const logger = getLogger(TAG)
 
 export class WebRecorder {
     private audioContext: AudioContext
@@ -55,6 +52,7 @@ export class WebRecorder {
     private audioBufferSize: number // Keep track of the buffer size
     private audioAnalysisData: AudioAnalysis // Keep updating the full audio analysis data with latest events
     private packetCount: number = 0
+    private logger?: ConsoleLike
 
     constructor({
         audioContext,
@@ -63,6 +61,7 @@ export class WebRecorder {
         audioWorkletUrl,
         emitAudioEventCallback,
         emitAudioAnalysisCallback,
+        logger,
     }: {
         audioContext: AudioContext
         source: MediaStreamAudioSourceNode
@@ -70,6 +69,7 @@ export class WebRecorder {
         audioWorkletUrl: string
         emitAudioEventCallback: EmitAudioEventFunction
         emitAudioAnalysisCallback: EmitAudioAnalysisFunction
+        logger?: ConsoleLike
     }) {
         this.audioContext = audioContext
         this.source = source
@@ -78,11 +78,12 @@ export class WebRecorder {
         this.emitAudioAnalysisCallback = emitAudioAnalysisCallback
         this.config = recordingConfig
         this.position = 0
+        this.logger = logger
 
         const audioContextFormat = this.checkAudioContextFormat({
             sampleRate: this.audioContext.sampleRate,
         })
-        logger.debug('Initialized WebRecorder with config:', {
+        this.logger?.debug('Initialized WebRecorder with config:', {
             sampleRate: audioContextFormat.sampleRate,
             bitDepth: audioContextFormat.bitDepth,
             numberOfChannels: audioContextFormat.numberOfChannels,
@@ -150,12 +151,12 @@ export class WebRecorder {
                 const pcmBufferFloat = event.data.recordedData
 
                 if (!pcmBufferFloat) {
-                    logger.warn('Received empty audio buffer', event)
+                    this.logger?.warn('Received empty audio buffer', event)
                     return
                 }
 
                 // Handle the audio blob (e.g., send it to the server or process it further)
-                logger.debug(
+                this.logger?.debug(
                     `Received audio blob from processor len:${pcmBufferFloat?.length}`,
                     event
                 )
@@ -220,7 +221,7 @@ export class WebRecorder {
                 )
             }
 
-            logger.debug(
+            this.logger?.debug(
                 `WebRecorder initialized -- recordSampleRate=${this.audioContext.sampleRate}`,
                 this.config
             )
@@ -281,7 +282,7 @@ export class WebRecorder {
             this.featureExtractorWorker.onerror = (error) => {
                 console.error(`[${TAG}] Default Inline worker failed`, error)
             }
-            logger.log('Inline worker initialized successfully')
+            this.logger?.log('Inline worker initialized successfully')
         } catch (error) {
             console.error(
                 `[${TAG}] Failed to initialize Inline Feature Extractor worker`,
@@ -317,8 +318,8 @@ export class WebRecorder {
                 }
             }
             // Handle the extracted features (e.g., emit an event or log them)
-            logger.debug('features event segmentResult', segmentResult)
-            logger.debug(
+            this.logger?.debug('features event segmentResult', segmentResult)
+            this.logger?.debug(
                 `features event audioAnalysisData duration=${this.audioAnalysisData.durationMs}`,
                 this.audioAnalysisData
             )
@@ -373,10 +374,10 @@ export class WebRecorder {
                                 (this.audioContext.sampleRate *
                                     (this.exportBitDepth /
                                         this.numberOfChannels))
-                            logger.debug(
+                            this.logger?.debug(
                                 `Received recorded data -- Duration: ${duration} vs ${rawPCMDataFull.byteLength / this.audioContext.sampleRate} seconds`
                             )
-                            logger.debug(
+                            this.logger?.debug(
                                 `recordedData.length=${rawPCMDataFull.byteLength} vs transmittedData.length=${this.audioBufferSize}`
                             )
 
@@ -448,7 +449,7 @@ export class WebRecorder {
             bufferSource.buffer = audioBuffer
             bufferSource.connect(this.audioContext.destination)
             bufferSource.start()
-            logger.debug('Playing recorded data', recordedData)
+            this.logger?.debug('Playing recorded data', recordedData)
         } catch (error) {
             console.error(`[${TAG}] Failed to play recorded data:`, error)
         }

package/src/events.ts

@@ -1,13 +1,11 @@
 // packages/expo-audio-stream/src/events.ts
 
-import { EventEmitter, type Subscription } from 'expo-modules-core'
+import { LegacyEventEmitter, type EventSubscription } from 'expo-modules-core'
 
 import { AudioAnalysis } from './AudioAnalysis/AudioAnalysis.types'
 import ExpoAudioStreamModule from './ExpoAudioStreamModule'
-import { getLogger } from './logger'
 
-const emitter = new EventEmitter(ExpoAudioStreamModule)
-const logger = getLogger('events')
+const emitter = new LegacyEventEmitter(ExpoAudioStreamModule)
 
 export interface AudioEventPayload {
     encoded?: string
@@ -23,8 +21,7 @@ export interface AudioEventPayload {
 
 export function addAudioEventListener(
     listener: (event: AudioEventPayload) => Promise<void>
-): Subscription {
-    logger.log('Adding listener for AudioData event')
+): EventSubscription {
     return emitter.addListener<AudioEventPayload>('AudioData', listener)
 }
 
@@ -33,7 +30,6 @@ export interface AudioAnalysisEvent extends AudioAnalysis {}
 
 export function addAudioAnalysisListener(
     listener: (event: AudioAnalysisEvent) => Promise<void>
-): Subscription {
-    logger.log('Adding listener for AudioAnalysis event')
+): EventSubscription {
     return emitter.addListener<AudioAnalysisEvent>('AudioAnalysis', listener)
 }