+1

.gitignore

reviewed

··· 125 125 bskyweb/static/media/*.jpg 126 126 bskyweb/static/media/*.png 127 127 bskyweb/static/media/*.svg 128 128 + bskyweb/static/media/*.cjs

+2 -1

package.json

reviewed

··· 296 296 "**/expo-device": "7.1.4", 297 297 "**/multiformats": "9.9.0", 298 298 "unicode-segmenter": "0.14.5", 299 299 - "@types/estree": "1.0.6" 299 299 + "@types/estree": "1.0.6", 300 300 + "zod": "3.23.8" 300 301 }, 301 302 "jest": { 302 303 "preset": "jest-expo/ios",

-44

patches/expo-modules-core+3.0.28.patch

reviewed

··· 1 1 - diff --git a/node_modules/expo-modules-core/android/src/main/java/expo/modules/kotlin/activityresult/AppContextActivityResultLauncher.kt b/node_modules/expo-modules-core/android/src/main/java/expo/modules/kotlin/activityresult/AppContextActivityResultLauncher.kt 2 2 - index d300fc2..0890878 100644 3 3 - --- a/node_modules/expo-modules-core/android/src/main/java/expo/modules/kotlin/activityresult/AppContextActivityResultLauncher.kt 4 4 - +++ b/node_modules/expo-modules-core/android/src/main/java/expo/modules/kotlin/activityresult/AppContextActivityResultLauncher.kt 5 5 - @@ -3,8 +3,8 @@ package expo.modules.kotlin.activityresult 6 6 - import androidx.activity.result.ActivityResultCallback 7 7 - import androidx.activity.result.contract.ActivityResultContract 8 8 - import java.io.Serializable 9 9 - +import kotlinx.coroutines.suspendCancellableCoroutine 10 10 - import kotlin.coroutines.resume 11 11 - -import kotlin.coroutines.suspendCoroutine 12 12 - 13 13 - /** 14 14 - * A launcher for a previously-[AppContextActivityResultCaller.registerForActivityResult] prepared call 15 15 - @@ -22,8 +22,12 @@ abstract class AppContextActivityResultLauncher<I : Serializable, O> { 16 16 - */ 17 17 - abstract fun launch(input: I, callback: ActivityResultCallback<O>) 18 18 - 19 19 - - suspend fun launch(input: I): O = suspendCoroutine { continuation -> 20 20 - - launch(input) { output -> continuation.resume(output) } 21 21 - + suspend fun launch(input: I): O = suspendCancellableCoroutine { continuation -> 22 22 - + launch(input) { output -> 23 23 - + if (continuation.isActive) { 24 24 - + continuation.resume(output) 25 25 - + } 26 26 - + } 27 27 - } 28 28 - 29 29 - abstract val contract: AppContextActivityResultContract<I, O> 30 30 - diff --git a/node_modules/expo-modules-core/android/src/main/java/expo/modules/kotlin/devtools/ExpoNetworkInspectOkHttpInterceptors.kt b/node_modules/expo-modules-core/android/src/main/java/expo/modules/kotlin/devtools/ExpoNetworkInspectOkHttpInterceptors.kt 31 31 - index 47c4d15..afe138d 100644 32 32 - --- a/node_modules/expo-modules-core/android/src/main/java/expo/modules/kotlin/devtools/ExpoNetworkInspectOkHttpInterceptors.kt 33 33 - +++ b/node_modules/expo-modules-core/android/src/main/java/expo/modules/kotlin/devtools/ExpoNetworkInspectOkHttpInterceptors.kt 34 34 - @@ -125,6 +125,10 @@ internal fun peekResponseBody( 35 35 - } 36 36 - 37 37 - internal fun shouldParseBody(response: Response): Boolean { 38 38 - + if (response.request.url.encodedPath == "/bitdrift_public.protobuf.client.v1.ApiService/Mux") { 39 39 - + return false 40 40 - + } 41 41 - + 42 42 - // Check for Content-Type 43 43 - val skipContentTypes = listOf( 44 44 - "text/event-stream", // Server Sent Events

-516

patches/react-native-compressor+1.13.0.patch

reviewed

··· 1 1 - diff --git a/node_modules/react-native-compressor/android/build.gradle b/node_modules/react-native-compressor/android/build.gradle 2 2 - index 5071139..84bee34 100644 3 3 - --- a/node_modules/react-native-compressor/android/build.gradle 4 4 - +++ b/node_modules/react-native-compressor/android/build.gradle 5 5 - @@ -115,7 +115,6 @@ dependencies { 6 6 - implementation "org.jetbrains.kotlinx:kotlinx-coroutines-core:1.6.4" 7 7 - implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:1.6.4" 8 8 - implementation 'org.mp4parser:isoparser:1.9.56' 9 9 - - implementation 'com.github.banketree:AndroidLame-kotlin:v0.0.1' 10 10 - implementation 'javazoom:jlayer:1.0.1' 11 11 - } 12 12 - 13 13 - diff --git a/node_modules/react-native-compressor/android/src/main/java/com/reactnativecompressor/Audio/AudioCompressor.kt b/node_modules/react-native-compressor/android/src/main/java/com/reactnativecompressor/Audio/AudioCompressor.kt 14 14 - deleted file mode 100644 15 15 - index 9292d3e..0000000 16 16 - --- a/node_modules/react-native-compressor/android/src/main/java/com/reactnativecompressor/Audio/AudioCompressor.kt 17 17 - +++ /dev/null 18 18 - @@ -1,264 +0,0 @@ 19 19 - -package com.reactnativecompressor.Audio 20 20 - - 21 21 - - 22 22 - -import android.annotation.SuppressLint 23 23 - -import com.facebook.react.bridge.Promise 24 24 - -import com.facebook.react.bridge.ReactApplicationContext 25 25 - -import com.facebook.react.bridge.ReadableMap 26 26 - -import com.naman14.androidlame.LameBuilder 27 27 - -import com.naman14.androidlame.WaveReader 28 28 - -import com.reactnativecompressor.Utils.MediaCache 29 29 - -import com.reactnativecompressor.Utils.Utils 30 30 - -import com.reactnativecompressor.Utils.Utils.addLog 31 31 - -import javazoom.jl.converter.Converter 32 32 - -import javazoom.jl.decoder.JavaLayerException 33 33 - -import java.io.BufferedOutputStream 34 34 - -import java.io.File 35 35 - -import java.io.FileNotFoundException 36 36 - -import java.io.FileOutputStream 37 37 - -import java.io.IOException 38 38 - - 39 39 - -class AudioCompressor { 40 40 - - companion object { 41 41 - - val TAG="AudioMain" 42 42 - - private const val OUTPUT_STREAM_BUFFER = 8192 43 43 - - 44 44 - - var outputStream: BufferedOutputStream? = null 45 45 - - var waveReader: WaveReader? = null 46 46 - - @JvmStatic 47 47 - - fun CompressAudio( 48 48 - - fileUrl: String, 49 49 - - optionMap: ReadableMap, 50 50 - - context: ReactApplicationContext, 51 51 - - promise: Promise, 52 52 - - ) { 53 53 - - val realPath = Utils.getRealPath(fileUrl, context) 54 54 - - var _fileUrl=realPath 55 55 - - val filePathWithoutFileUri = realPath!!.replace("file://", "") 56 56 - - try { 57 57 - - var wavPath=filePathWithoutFileUri; 58 58 - - var isNonWav:Boolean=false 59 59 - - if (fileUrl.endsWith(".mp4", ignoreCase = true)) 60 60 - - { 61 61 - - addLog("mp4 file found") 62 62 - - val mp3Path= Utils.generateCacheFilePath("mp3", context) 63 63 - - AudioExtractor().genVideoUsingMuxer(fileUrl, mp3Path, -1, -1, true, false) 64 64 - - _fileUrl=Utils.slashifyFilePath(mp3Path) 65 65 - - wavPath= Utils.generateCacheFilePath("wav", context) 66 66 - - try { 67 67 - - val converter = Converter() 68 68 - - converter.convert(mp3Path, wavPath) 69 69 - - } catch (e: JavaLayerException) { 70 70 - - addLog("JavaLayerException error"+e.localizedMessage) 71 71 - - e.printStackTrace(); 72 72 - - } 73 73 - - isNonWav=true 74 74 - - } 75 75 - - else if (!fileUrl.endsWith(".wav", ignoreCase = true)) 76 76 - - { 77 77 - - addLog("non wav file found") 78 78 - - wavPath= Utils.generateCacheFilePath("wav", context) 79 79 - - try { 80 80 - - val converter = Converter() 81 81 - - converter.convert(filePathWithoutFileUri, wavPath) 82 82 - - } catch (e: JavaLayerException) { 83 83 - - addLog("JavaLayerException error"+e.localizedMessage) 84 84 - - e.printStackTrace(); 85 85 - - } 86 86 - - isNonWav=true 87 87 - - } 88 88 - - 89 89 - - 90 90 - - autoCompressHelper(wavPath,filePathWithoutFileUri, optionMap,context) { mp3Path, finished -> 91 91 - - if (finished) { 92 92 - - val returnableFilePath:String="file://$mp3Path" 93 93 - - addLog("finished: " + returnableFilePath) 94 94 - - MediaCache.removeCompletedImagePath(fileUrl) 95 95 - - if(isNonWav) 96 96 - - { 97 97 - - File(wavPath).delete() 98 98 - - } 99 99 - - promise.resolve(returnableFilePath) 100 100 - - } else { 101 101 - - addLog("error: "+mp3Path) 102 102 - - promise.resolve(_fileUrl) 103 103 - - } 104 104 - - } 105 105 - - } catch (e: Exception) { 106 106 - - promise.resolve(_fileUrl) 107 107 - - } 108 108 - - } 109 109 - - 110 110 - - @SuppressLint("WrongConstant") 111 111 - - private fun autoCompressHelper( 112 112 - - fileUrl: String, 113 113 - - actualFileUrl: String, 114 114 - - optionMap: ReadableMap, 115 115 - - context: ReactApplicationContext, 116 116 - - completeCallback: (String, Boolean) -> Unit 117 117 - - ) { 118 118 - - 119 119 - - val options = AudioHelper.fromMap(optionMap) 120 120 - - val quality = options.quality 121 121 - - 122 122 - - var isCompletedCallbackTriggered:Boolean=false 123 123 - - try { 124 124 - - var mp3Path = Utils.generateCacheFilePath("mp3", context) 125 125 - - val input = File(fileUrl) 126 126 - - val output = File(mp3Path) 127 127 - - 128 128 - - val CHUNK_SIZE = 8192 129 129 - - addLog("Initialising wav reader") 130 130 - - 131 131 - - waveReader = WaveReader(input) 132 132 - - 133 133 - - try { 134 134 - - waveReader!!.openWave() 135 135 - - } catch (e: IOException) { 136 136 - - e.printStackTrace() 137 137 - - } 138 138 - - 139 139 - - addLog("Intitialising encoder") 140 140 - - 141 141 - - 142 142 - - // for bitrate 143 143 - - var audioBitrate:Int 144 144 - - if(options.bitrate != -1) 145 145 - - { 146 146 - - audioBitrate= options.bitrate/1000 147 147 - - } 148 148 - - else 149 149 - - { 150 150 - - audioBitrate=AudioHelper.getDestinationBitrateByQuality(actualFileUrl, quality!!) 151 151 - - Utils.addLog("dest bitrate: $audioBitrate") 152 152 - - } 153 153 - - 154 154 - - var androidLame = LameBuilder(); 155 155 - - androidLame.setOutBitrate(audioBitrate) 156 156 - - 157 157 - - // for channels 158 158 - - var audioChannels:Int 159 159 - - if(options.channels != -1){ 160 160 - - audioChannels= options.channels!! 161 161 - - } 162 162 - - else 163 163 - - { 164 164 - - audioChannels=waveReader!!.channels 165 165 - - } 166 166 - - androidLame.setOutChannels(audioChannels) 167 167 - - 168 168 - - // for sample rate 169 169 - - androidLame.setInSampleRate(waveReader!!.sampleRate) 170 170 - - var audioSampleRate:Int 171 171 - - if(options.samplerate != -1){ 172 172 - - audioSampleRate= options.samplerate!! 173 173 - - } 174 174 - - else 175 175 - - { 176 176 - - audioSampleRate=waveReader!!.sampleRate 177 177 - - } 178 178 - - androidLame.setOutSampleRate(audioSampleRate) 179 179 - - val androidLameBuild=androidLame.build() 180 180 - - 181 181 - - try { 182 182 - - outputStream = BufferedOutputStream(FileOutputStream(output), OUTPUT_STREAM_BUFFER) 183 183 - - } catch (e: FileNotFoundException) { 184 184 - - e.printStackTrace() 185 185 - - } 186 186 - - 187 187 - - var bytesRead = 0 188 188 - - 189 189 - - val buffer_l = ShortArray(CHUNK_SIZE) 190 190 - - val buffer_r = ShortArray(CHUNK_SIZE) 191 191 - - val mp3Buf = ByteArray(CHUNK_SIZE) 192 192 - - 193 193 - - val channels = waveReader!!.channels 194 194 - - 195 195 - - addLog("started encoding") 196 196 - - while (true) { 197 197 - - try { 198 198 - - if (channels == 2) { 199 199 - - 200 200 - - bytesRead = waveReader!!.read(buffer_l, buffer_r, CHUNK_SIZE) 201 201 - - addLog("bytes read=$bytesRead") 202 202 - - 203 203 - - if (bytesRead > 0) { 204 204 - - 205 205 - - var bytesEncoded = 0 206 206 - - bytesEncoded = androidLameBuild.encode(buffer_l, buffer_r, bytesRead, mp3Buf) 207 207 - - addLog("bytes encoded=$bytesEncoded") 208 208 - - 209 209 - - if (bytesEncoded > 0) { 210 210 - - try { 211 211 - - addLog("writing mp3 buffer to outputstream with $bytesEncoded bytes") 212 212 - - outputStream!!.write(mp3Buf, 0, bytesEncoded) 213 213 - - } catch (e: IOException) { 214 214 - - e.printStackTrace() 215 215 - - } 216 216 - - 217 217 - - } 218 218 - - 219 219 - - } else 220 220 - - break 221 221 - - } else { 222 222 - - 223 223 - - bytesRead = waveReader!!.read(buffer_l, CHUNK_SIZE) 224 224 - - addLog("bytes read=$bytesRead") 225 225 - - 226 226 - - if (bytesRead > 0) { 227 227 - - var bytesEncoded = 0 228 228 - - 229 229 - - bytesEncoded = androidLameBuild.encode(buffer_l, buffer_l, bytesRead, mp3Buf) 230 230 - - addLog("bytes encoded=$bytesEncoded") 231 231 - - 232 232 - - if (bytesEncoded > 0) { 233 233 - - try { 234 234 - - addLog("writing mp3 buffer to outputstream with $bytesEncoded bytes") 235 235 - - outputStream!!.write(mp3Buf, 0, bytesEncoded) 236 236 - - } catch (e: IOException) { 237 237 - - e.printStackTrace() 238 238 - - } 239 239 - - 240 240 - - } 241 241 - - 242 242 - - } else 243 243 - - break 244 244 - - } 245 245 - - 246 246 - - 247 247 - - } catch (e: IOException) { 248 248 - - e.printStackTrace() 249 249 - - } 250 250 - - 251 251 - - } 252 252 - - 253 253 - - addLog("flushing final mp3buffer") 254 254 - - val outputMp3buf = androidLameBuild.flush(mp3Buf) 255 255 - - addLog("flushed $outputMp3buf bytes") 256 256 - - if (outputMp3buf > 0) { 257 257 - - try { 258 258 - - addLog("writing final mp3buffer to outputstream") 259 259 - - outputStream!!.write(mp3Buf, 0, outputMp3buf) 260 260 - - addLog("closing output stream") 261 261 - - outputStream!!.close() 262 262 - - completeCallback(output.absolutePath, true) 263 263 - - isCompletedCallbackTriggered=true 264 264 - - } catch (e: IOException) { 265 265 - - completeCallback(e.localizedMessage, false) 266 266 - - e.printStackTrace() 267 267 - - } 268 268 - - } 269 269 - - 270 270 - - } catch (e: IOException) { 271 271 - - completeCallback(e.localizedMessage, false) 272 272 - - } 273 273 - - if(!isCompletedCallbackTriggered) 274 274 - - { 275 275 - - completeCallback("something went wrong", false) 276 276 - - } 277 277 - - } 278 278 - - 279 279 - - 280 280 - - 281 281 - - } 282 282 - -} 283 283 - diff --git a/node_modules/react-native-compressor/android/src/main/java/com/reactnativecompressor/Audio/AudioExtractor.kt b/node_modules/react-native-compressor/android/src/main/java/com/reactnativecompressor/Audio/AudioExtractor.kt 284 284 - deleted file mode 100644 285 285 - index c655182..0000000 286 286 - --- a/node_modules/react-native-compressor/android/src/main/java/com/reactnativecompressor/Audio/AudioExtractor.kt 287 287 - +++ /dev/null 288 288 - @@ -1,112 +0,0 @@ 289 289 - -package com.reactnativecompressor.Audio 290 290 - - 291 291 - -import android.annotation.SuppressLint 292 292 - -import android.media.MediaCodec 293 293 - -import android.media.MediaExtractor 294 294 - -import android.media.MediaFormat 295 295 - -import android.media.MediaMetadataRetriever 296 296 - -import android.media.MediaMuxer 297 297 - -import android.util.Log 298 298 - -import java.io.IOException 299 299 - -import java.nio.ByteBuffer 300 300 - - 301 301 - - 302 302 - -class AudioExtractor { 303 303 - - /** 304 304 - - * @param srcPath the path of source video file. 305 305 - - * @param dstPath the path of destination video file. 306 306 - - * @param startMs starting time in milliseconds for trimming. Set to 307 307 - - * negative if starting from beginning. 308 308 - - * @param endMs end time for trimming in milliseconds. Set to negative if 309 309 - - * no trimming at the end. 310 310 - - * @param useAudio true if keep the audio track from the source. 311 311 - - * @param useVideo true if keep the video track from the source. 312 312 - - * @throws IOException 313 313 - - */ 314 314 - - @SuppressLint("NewApi", "WrongConstant") 315 315 - - @Throws(IOException::class) 316 316 - - fun genVideoUsingMuxer(srcPath: String?, dstPath: String?, startMs: Int, endMs: Int, useAudio: Boolean, useVideo: Boolean) { 317 317 - - // Set up MediaExtractor to read from the source. 318 318 - - val extractor = MediaExtractor() 319 319 - - extractor.setDataSource(srcPath!!) 320 320 - - val trackCount = extractor.trackCount 321 321 - - // Set up MediaMuxer for the destination. 322 322 - - val muxer: MediaMuxer 323 323 - - muxer = MediaMuxer(dstPath!!, MediaMuxer.OutputFormat.MUXER_OUTPUT_MPEG_4) 324 324 - - // Set up the tracks and retrieve the max buffer size for selected 325 325 - - // tracks. 326 326 - - val indexMap = HashMap<Int, Int>(trackCount) 327 327 - - var bufferSize = -1 328 328 - - for (i in 0 until trackCount) { 329 329 - - val format = extractor.getTrackFormat(i) 330 330 - - val mime = format.getString(MediaFormat.KEY_MIME) 331 331 - - var selectCurrentTrack = false 332 332 - - if (mime!!.startsWith("audio/") && useAudio) { 333 333 - - selectCurrentTrack = true 334 334 - - } else if (mime.startsWith("video/") && useVideo) { 335 335 - - selectCurrentTrack = true 336 336 - - } 337 337 - - if (selectCurrentTrack) { 338 338 - - extractor.selectTrack(i) 339 339 - - val dstIndex = muxer.addTrack(format) 340 340 - - indexMap[i] = dstIndex 341 341 - - if (format.containsKey(MediaFormat.KEY_MAX_INPUT_SIZE)) { 342 342 - - val newSize = format.getInteger(MediaFormat.KEY_MAX_INPUT_SIZE) 343 343 - - bufferSize = if (newSize > bufferSize) newSize else bufferSize 344 344 - - } 345 345 - - } 346 346 - - } 347 347 - - if (bufferSize < 0) { 348 348 - - bufferSize = DEFAULT_BUFFER_SIZE 349 349 - - } 350 350 - - // Set up the orientation and starting time for extractor. 351 351 - - val retrieverSrc = MediaMetadataRetriever() 352 352 - - retrieverSrc.setDataSource(srcPath) 353 353 - - val degreesString = retrieverSrc.extractMetadata(MediaMetadataRetriever.METADATA_KEY_VIDEO_ROTATION) 354 354 - - if (degreesString != null) { 355 355 - - val degrees = degreesString.toInt() 356 356 - - if (degrees >= 0) { 357 357 - - muxer.setOrientationHint(degrees) 358 358 - - } 359 359 - - } 360 360 - - if (startMs > 0) { 361 361 - - extractor.seekTo((startMs * 1000).toLong(), MediaExtractor.SEEK_TO_CLOSEST_SYNC) 362 362 - - } 363 363 - - // Copy the samples from MediaExtractor to MediaMuxer. We will loop 364 364 - - // for copying each sample and stop when we get to the end of the source 365 365 - - // file or exceed the end time of the trimming. 366 366 - - val offset = 0 367 367 - - var trackIndex = -1 368 368 - - val dstBuf = ByteBuffer.allocate(bufferSize) 369 369 - - val bufferInfo = MediaCodec.BufferInfo() 370 370 - - muxer.start() 371 371 - - while (true) { 372 372 - - bufferInfo.offset = offset 373 373 - - bufferInfo.size = extractor.readSampleData(dstBuf, offset) 374 374 - - if (bufferInfo.size < 0) { 375 375 - - Log.d(TAG, "Saw input EOS.") 376 376 - - bufferInfo.size = 0 377 377 - - break 378 378 - - } else { 379 379 - - bufferInfo.presentationTimeUs = extractor.sampleTime 380 380 - - if (endMs > 0 && bufferInfo.presentationTimeUs > endMs * 1000) { 381 381 - - Log.d(TAG, "The current sample is over the trim end time.") 382 382 - - break 383 383 - - } else { 384 384 - - bufferInfo.flags = extractor.sampleFlags 385 385 - - trackIndex = extractor.sampleTrackIndex 386 386 - - muxer.writeSampleData(indexMap[trackIndex]!!, dstBuf, bufferInfo) 387 387 - - extractor.advance() 388 388 - - } 389 389 - - } 390 390 - - } 391 391 - - muxer.stop() 392 392 - - muxer.release() 393 393 - - return 394 394 - - } 395 395 - - 396 396 - - companion object { 397 397 - - private const val DEFAULT_BUFFER_SIZE = 1 * 1024 * 1024 398 398 - - private const val TAG = "AudioExtractorDecoder" 399 399 - - } 400 400 - -} 401 401 - diff --git a/node_modules/react-native-compressor/android/src/main/java/com/reactnativecompressor/Audio/AudioHelper.kt b/node_modules/react-native-compressor/android/src/main/java/com/reactnativecompressor/Audio/AudioHelper.kt 402 402 - deleted file mode 100644 403 403 - index 42040b4..0000000 404 404 - --- a/node_modules/react-native-compressor/android/src/main/java/com/reactnativecompressor/Audio/AudioHelper.kt 405 405 - +++ /dev/null 406 406 - @@ -1,72 +0,0 @@ 407 407 - -package com.reactnativecompressor.Audio 408 408 - - 409 409 - -import android.media.MediaExtractor 410 410 - -import android.media.MediaFormat 411 411 - -import com.facebook.react.bridge.ReadableMap 412 412 - -import com.reactnativecompressor.Utils.Utils 413 413 - -import java.io.File 414 414 - -import java.io.IOException 415 415 - - 416 416 - - 417 417 - -class AudioHelper { 418 418 - - 419 419 - - var quality: String? = "medium" 420 420 - - var bitrate: Int = -1 421 421 - - var samplerate: Int = -1 422 422 - - var channels: Int = -1 423 423 - - var progressDivider: Int? = 0 424 424 - - 425 425 - - companion object { 426 426 - - fun fromMap(map: ReadableMap): AudioHelper { 427 427 - - val options = AudioHelper() 428 428 - - val iterator = map.keySetIterator() 429 429 - - while (iterator.hasNextKey()) { 430 430 - - val key = iterator.nextKey() 431 431 - - when (key) { 432 432 - - "quality" -> options.quality = map.getString(key) 433 433 - - "bitrate" -> { 434 434 - - val bitrate = map.getInt(key) 435 435 - - options.bitrate = if (bitrate > 320000 || bitrate < 64000) 64000 else bitrate 436 436 - - } 437 437 - - "samplerate" -> options.samplerate = map.getInt(key) 438 438 - - "channels" -> options.channels = map.getInt(key) 439 439 - - } 440 440 - - } 441 441 - - return options 442 442 - - } 443 443 - - 444 444 - - 445 445 - - fun getAudioBitrate(path: String): Int { 446 446 - - val file = File(path) 447 447 - - val fileSize = file.length() * 8 // size in bits 448 448 - - 449 449 - - val mex = MediaExtractor() 450 450 - - try { 451 451 - - mex.setDataSource(path) 452 452 - - } catch (e: IOException) { 453 453 - - e.printStackTrace() 454 454 - - } 455 455 - - 456 456 - - val mf = mex.getTrackFormat(0) 457 457 - - val durationUs = mf.getLong(MediaFormat.KEY_DURATION) 458 458 - - val durationSec = durationUs / 1_000_000.0 // convert duration to seconds 459 459 - - 460 460 - - return (fileSize / durationSec).toInt()/1000 // bitrate in bits per second 461 461 - - } 462 462 - - fun getDestinationBitrateByQuality(path: String, quality: String): Int { 463 463 - - val originalBitrate = getAudioBitrate(path) 464 464 - - var destinationBitrate = originalBitrate 465 465 - - Utils.addLog("source bitrate: $originalBitrate") 466 466 - - 467 467 - - when (quality.lowercase()) { 468 468 - - "low" -> destinationBitrate = maxOf(64, (originalBitrate * 0.3).toInt()) 469 469 - - "medium" -> destinationBitrate = (originalBitrate * 0.5).toInt() 470 470 - - "high" -> destinationBitrate = minOf(320, (originalBitrate * 0.7).toInt()) 471 471 - - else -> Utils.addLog("Invalid quality level. Please enter 'low', 'medium', or 'high'.") 472 472 - - } 473 473 - - 474 474 - - return destinationBitrate 475 475 - - } 476 476 - - 477 477 - - } 478 478 - -} 479 479 - diff --git a/node_modules/react-native-compressor/android/src/main/java/com/reactnativecompressor/Audio/AudioMain.kt b/node_modules/react-native-compressor/android/src/main/java/com/reactnativecompressor/Audio/AudioMain.kt 480 480 - index 446d4fb..f021909 100644 481 481 - --- a/node_modules/react-native-compressor/android/src/main/java/com/reactnativecompressor/Audio/AudioMain.kt 482 482 - +++ b/node_modules/react-native-compressor/android/src/main/java/com/reactnativecompressor/Audio/AudioMain.kt 483 483 - @@ -11,7 +11,9 @@ class AudioMain(private val reactContext: ReactApplicationContext) { 484 484 - promise: Promise) { 485 485 - try { 486 486 - 487 487 - - AudioCompressor.CompressAudio(fileUrl,optionMap,reactContext,promise) 488 488 - + // Skip compression on Android to avoid libandroidlame dependency 489 489 - + // Return the original file URL without compression 490 490 - + promise.resolve(fileUrl) 491 491 - } catch (ex: Exception) { 492 492 - promise.reject(ex) 493 493 - } 494 494 - diff --git a/node_modules/react-native-compressor/android/src/main/java/com/reactnativecompressor/Utils/Utils.kt b/node_modules/react-native-compressor/android/src/main/java/com/reactnativecompressor/Utils/Utils.kt 495 495 - index c14b727..1198908 100644 496 496 - --- a/node_modules/react-native-compressor/android/src/main/java/com/reactnativecompressor/Utils/Utils.kt 497 497 - +++ b/node_modules/react-native-compressor/android/src/main/java/com/reactnativecompressor/Utils/Utils.kt 498 498 - @@ -7,7 +7,6 @@ import android.provider.OpenableColumns 499 499 - import android.util.Log 500 500 - import com.facebook.react.bridge.Promise 501 501 - import com.facebook.react.bridge.ReactApplicationContext 502 502 - -import com.reactnativecompressor.Audio.AudioCompressor 503 503 - import com.reactnativecompressor.Video.VideoCompressor.CompressionListener 504 504 - import com.reactnativecompressor.Video.VideoCompressor.VideoCompressorClass 505 505 - import java.io.FileNotFoundException 506 506 - @@ -152,10 +151,6 @@ object Utils { 507 507 - } 508 508 - } 509 509 - 510 510 - - fun addLog(log: String) { 511 511 - - Log.d(AudioCompressor.TAG, log) 512 512 - - } 513 513 - - 514 514 - val exifAttributes = arrayOf( 515 515 - "FNumber", 516 516 - "ApertureValue",

-22

patches/sonner-native+0.21.0.patch

reviewed

··· 1 1 - diff --git a/node_modules/sonner-native/lib/commonjs/toast.js b/node_modules/sonner-native/lib/commonjs/toast.js 2 2 - index 121816a..0c3c7bd 100644 3 3 - --- a/node_modules/sonner-native/lib/commonjs/toast.js 4 4 - +++ b/node_modules/sonner-native/lib/commonjs/toast.js 5 5 - @@ -264,7 +264,7 @@ const Toast = exports.Toast = /*#__PURE__*/React.forwardRef(({ 6 6 - ...toastSwipeHandlerProps, 7 7 - children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_reactNativeReanimated.default.View, { 8 8 - entering: entering, 9 9 - - exiting: exiting, 10 10 - + exiting: _reactNative.Platform.OS === 'android' ? undefined : exiting, 11 11 - children: jsx 12 12 - }) 13 13 - }); 14 14 - @@ -274,7 +274,7 @@ const Toast = exports.Toast = /*#__PURE__*/React.forwardRef(({ 15 15 - children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_reactNativeReanimated.default.View, { 16 16 - style: [unstyled ? undefined : elevationStyle, defaultStyles.toast, toastStyleCtx, styles?.toast, style, wiggleAnimationStyle], 17 17 - entering: entering, 18 18 - - exiting: exiting, 19 19 - + exiting: _reactNative.Platform.OS === 'android' ? undefined : exiting, 20 20 - children: /*#__PURE__*/(0, _jsxRuntime.jsxs)(_reactNative.View, { 21 21 - style: [defaultStyles.toastContent, toastContentStyleCtx, styles?.toastContent], 22 22 - children: [promiseOptions || variant === 'loading' ? 'loading' in icons ? icons.loading : /*#__PURE__*/(0, _jsxRuntime.jsx)(_reactNative.ActivityIndicator, {}) : icon ? /*#__PURE__*/(0, _jsxRuntime.jsx)(_reactNative.View, {

+2 -7

yarn.lock

reviewed

··· 17615 17615 resolved "https://registry.yarnpkg.com/zod-validation-error/-/zod-validation-error-4.0.2.tgz#bc605eba49ce0fcd598c127fee1c236be3f22918" 17616 17616 integrity sha512-Q6/nZLe6jxuU80qb/4uJ4t5v2VEZ44lzQjPDhYJNztRQ4wyWc6VF3D3Kb/fAuPetZQnhS3hnajCf9CsWesghLQ== 17617 17617 17618 17618 - zod@3.23.8: 17618 17618 + zod@3.23.8, zod@^3.14.2, zod@^3.22.4, zod@^3.23.8, "zod@^3.25.0 || ^4.0.0": 17619 17619 version "3.23.8" 17620 17620 resolved "https://registry.yarnpkg.com/zod/-/zod-3.23.8.tgz#e37b957b5d52079769fb8097099b592f0ef4067d" 17621 17621 integrity sha512-XBx9AXhXktjUqnepgTiE5flcKIYWi/rme0Eaj+5Y0lftuGBq+jyRu/md4WnuxqgP1ubdpNCsYEYPxrzVHD8d6g== 17622 17622 17623 17623 - zod@^3.14.2, zod@^3.20.2, zod@^3.22.4, zod@^3.23.8: 17623 17623 + zod@^3.20.2: 17624 17624 version "3.25.76" 17625 17625 resolved "https://registry.yarnpkg.com/zod/-/zod-3.25.76.tgz#26841c3f6fd22a6a2760e7ccb719179768471e34" 17626 17626 integrity sha512-gzUt/qt81nXsFGKIFcC3YnfEAx5NkunCfnDlvuBSSFS02bcXu4Lmea0AFIUwbLWxWPx3d9p8S5QoaujKcNQxcQ== 17627 17627 - 17628 17628 - "zod@^3.25.0 || ^4.0.0": 17629 17629 - version "4.3.6" 17630 17630 - resolved "https://registry.yarnpkg.com/zod/-/zod-4.3.6.tgz#89c56e0aa7d2b05107d894412227087885ab112a" 17631 17631 - integrity sha512-rftlrkhHZOcjDwkGlnUtZZkvaPHCsDATp4pGpuOOMDaTdDDXF91wuVDJoWoPsKX/3YPQ5fHuF3STjcYyKr+Qhg==