diff --git a/packages/react-native-fast-io/android/src/main/java/com/margelo/nitro/fastio/HybridInputStream.kt b/packages/react-native-fast-io/android/src/main/java/com/margelo/nitro/fastio/HybridInputStream.kt index f3fcc38..32567f0 100644 --- a/packages/react-native-fast-io/android/src/main/java/com/margelo/nitro/fastio/HybridInputStream.kt +++ b/packages/react-native-fast-io/android/src/main/java/com/margelo/nitro/fastio/HybridInputStream.kt @@ -4,33 +4,29 @@ import com.margelo.nitro.core.ArrayBuffer import com.margelo.nitro.core.Promise import java.io.InputStream -class HybridInputStream(private val stream: InputStream) : HybridInputStreamSpec() { +class HybridInputStream(public val stream: InputStream) : HybridInputStreamSpec() { override fun read(): Promise { - return Promise().apply { - try { - val bytes = ByteArray(HybridStreamFactory.BUFFER_SIZE) - val bytesRead = stream.read(bytes, 0, bytes.size) - - when { - bytesRead == -1 -> { - // End of stream - resolve(ArrayBuffer.allocate(0)) - } - bytesRead > 0 -> { - val arrayBuffer = ArrayBuffer.allocate(bytesRead) - - val destBuffer = arrayBuffer.getBuffer(false) - destBuffer.put(bytes, 0, bytesRead) - - resolve(arrayBuffer) - } - else -> { - // Error case - reject(Error("Unexpected error reading stream")) - } + return Promise.async { + val bytes = ByteArray(HybridStreamFactory.BUFFER_SIZE) + val bytesRead = stream.read(bytes, 0, bytes.size) + + when { + bytesRead == -1 -> { + // End of stream + ArrayBuffer.allocate(0) + } + bytesRead > 0 -> { + val arrayBuffer = ArrayBuffer.allocate(bytesRead) + + val destBuffer = arrayBuffer.getBuffer(false) + destBuffer.put(bytes, 0, bytesRead) + + arrayBuffer + } + else -> { + // Error case + throw Error("Unexpected error reading stream") } - } catch (e: Exception) { - reject(Error(e.message)) } } } diff --git a/packages/react-native-fast-io/android/src/main/java/com/margelo/nitro/fastio/HybridOutputStream.kt b/packages/react-native-fast-io/android/src/main/java/com/margelo/nitro/fastio/HybridOutputStream.kt index 35e150a..b0c9a85 100644 --- a/packages/react-native-fast-io/android/src/main/java/com/margelo/nitro/fastio/HybridOutputStream.kt +++ b/packages/react-native-fast-io/android/src/main/java/com/margelo/nitro/fastio/HybridOutputStream.kt @@ -11,13 +11,8 @@ class HybridOutputStream(private val stream: OutputStream) : HybridOutputStreamS val bytes = ByteArray(buffer.size) byteBuffer.get(bytes) - return Promise().apply { - try { - stream.write(bytes) - resolve(Unit) - } catch (e: Exception) { - reject(Error(e.message)) - } + return Promise.async { + stream.write(bytes) } } diff --git a/packages/react-native-fast-io/src/w3c/streams.ts b/packages/react-native-fast-io/src/w3c/streams.ts index 807c45c..ed1be27 100644 --- a/packages/react-native-fast-io/src/w3c/streams.ts +++ b/packages/react-native-fast-io/src/w3c/streams.ts @@ -59,18 +59,12 @@ export class CompressionStream implements globalThis.CompressionStream { const { readable, writable } = new TransformStream({ transform(chunk, controller) { - try { - const compressedData = compressor.compress(chunk.buffer) - controller.enqueue(new Uint8Array(compressedData)) - } catch (error) { - console.error(error) - } + const compressedData = compressor.compress(chunk.buffer) + controller.enqueue(new Uint8Array(compressedData)) }, flush(controller) { - console.log('flushing') const finalData = compressor.finalize() if (finalData.byteLength > 0) { - console.log(finalData.byteLength) controller.enqueue(new Uint8Array(finalData)) } },