chore: tweaks

Author: grabbou

example/server/createServer.ts

@@ -14,7 +14,8 @@ export function createServer(payload: string | Bun.BufferSource, port: number) {
       // Handle POST /upload
       if (req.method === 'POST' && req.url.endsWith('/upload')) {
         try {
-          console.log('req.body', req.body)
+          console.log('Waiting for body...')
+
           if (!req.body) {
             return new Response('No body provided', { status: 400 })
           }

package-lock.json

@@ -19,14 +19,15 @@
   ],
   "author": "Mike Grabowski <grabbou@gmail.com>",
   "peerDependencies": {
-    "react-native-nitro-modules": "^0.15.0",
-    "react-native": "^0.76.0"
+    "react-native": "^0.76.0",
+    "react-native-nitro-modules": "^0.15.0"
   },
   "dependencies": {
     "event-target-shim": "^6.0.2",
     "web-streams-polyfill": "^4.0.0"
   },
   "devDependencies": {
+    "@types/text-encoding": "^0.0.39",
     "nitro-codegen": "^0.15.0"
   },
   "keywords": [

packages/react-native-fast-io/package.json

@@ -23,13 +23,16 @@ export class Blob {
    * https://w3c.github.io/FileAPI/#attributes-blob
    */
   readonly type: string
+
+  protected _size: number
   get size(): number {
-    return calculateSize(this.parts)
+    return this._size
   }
 
   constructor(parts: Array<BlobPart> = [], options: BlobPropertyBag = {}) {
     this.parts = parts
     this.type = options?.type?.toLowerCase() || ''
+    this._size = calculateSize(parts)
   }
 
   /**
@@ -61,12 +64,8 @@ export class Blob {
       async start(controller) {
         try {
           for (const stream of streams) {
-            const reader = stream.getReader()
-            // eslint-disable-next-line no-constant-condition
-            while (true) {
-              const { done, value } = await reader.read()
-              if (done) break
-              controller.enqueue(value)
+            for await (const chunk of stream) {
+              controller.enqueue(chunk)
             }
           }
           controller.close()
@@ -81,6 +80,14 @@ export class Blob {
    * https://w3c.github.io/FileAPI/#arraybuffer-method-algo
    */
   async arrayBuffer(): Promise<ArrayBuffer> {
+    const view = await this.bytes()
+    return view.buffer
+  }
+
+  /**
+   * https://w3c.github.io/FileAPI/#bytes-method-algo
+   */
+  async bytes(): Promise<Uint8Array> {
     const result = new ArrayBuffer(this.size)
     const view = new Uint8Array(result)
 
@@ -90,22 +97,14 @@ export class Blob {
       offset += chunk.length
     }
 
-    return result
-  }
-
-  /**
-   * https://w3c.github.io/FileAPI/#bytes-method-algo
-   */
-  async bytes(): Promise<Uint8Array> {
-    const buffer = await this.arrayBuffer()
-    return new Uint8Array(buffer)
+    return view
   }
 
   /**
    * https://w3c.github.io/FileAPI/#text-method-algo
    */
   async text(): Promise<string> {
-    const buffer = await this.arrayBuffer()
+    const buffer = await this.bytes()
     return new TextDecoder().decode(buffer)
   }
 

packages/react-native-fast-io/src/w3c/blob.ts

@@ -1,6 +1,6 @@
 import { ReadableStream } from 'web-streams-polyfill'
 
-import { FileSystem, Metadata } from '../native/fs.nitro'
+import { FileSystem } from '../native/fs.nitro'
 import { Blob, BlobPart, BlobPropertyBag } from './blob'
 import { toReadableStream } from './streams'
 
@@ -35,11 +35,6 @@ class File extends Blob {
 class NativeFile extends File {
   nativeStream: ReadableStream<Uint8Array>
 
-  _size: number
-  override get size(): number {
-    return this._size
-  }
-
   constructor(path: string) {
     const inputStream = FileSystem.createInputStream(path)
     const metadata = FileSystem.getFileMetadata(path)

packages/react-native-fast-io/src/w3c/fs.ts

@@ -0,0 +1,16 @@
+/**
+ * TextEncoder is available in Hermes
+ */
+declare class TextEncoder {
+  constructor()
+  encode(input?: string): Uint8Array
+}
+
+/**
+ * TextDecoder is not available in Hermes yet. This must be polyfilled.
+ * https://github.com/facebook/hermes/issues/1403
+ */
+declare class TextDecoder {
+  constructor()
+  decode(input?: Uint8Array): string
+}

packages/react-native-fast-io/src/w3c/globals.d.ts

@@ -2,23 +2,23 @@ import { ReadableStream, WritableStream } from 'web-streams-polyfill'
 
 import { InputStream, OutputStream, PassThroughStream } from '../native/streams.nitro'
 
+const CHUNK_SIZE = 1024 * 64
+
 export const toReadableStream = (inputStream: InputStream) => {
   const stream = new ReadableStream<Uint8Array>({
-    async start() {
+    start() {
       inputStream.open()
     },
-
     pull(controller) {
-      const chunkSize = 1024 * 64
-      const buffer = new ArrayBuffer(chunkSize)
+      const buffer = new ArrayBuffer(CHUNK_SIZE)
 
       if (!inputStream.hasBytesAvailable()) {
         inputStream.close()
         controller.close()
         return
       }
 
-      const bytesRead = inputStream.read(buffer, chunkSize)
+      const bytesRead = inputStream.read(buffer, CHUNK_SIZE)
       if (bytesRead < 0) {
         inputStream.close()
         controller.error('Error reading from stream.')
@@ -29,7 +29,6 @@ export const toReadableStream = (inputStream: InputStream) => {
         controller.enqueue(new Uint8Array(buffer.slice(0, bytesRead)))
       }
     },
-
     cancel() {
       inputStream.close()
     },
@@ -43,22 +42,18 @@ export const toWritableStream = (outputStream: OutputStream) => {
     start() {
       outputStream.open()
     },
-
-    async write(chunk: ArrayBuffer) {
+    write(chunk: Uint8Array) {
       if (!outputStream.hasSpaceAvailable()) {
         throw new Error('No space available in output stream')
       }
-
-      const bytesWritten = outputStream.write(chunk, chunk.byteLength)
+      const bytesWritten = outputStream.write(chunk.buffer, chunk.byteLength)
       if (bytesWritten < 0) {
         throw new Error('Failed to write to output stream')
       }
     },
-
     close() {
       outputStream.close()
     },
-
     abort() {
       outputStream.close()
     },

packages/react-native-fast-io/src/w3c/streams.ts

@@ -2,7 +2,7 @@
   "extends": "../../tsconfig.json",
   "compilerOptions": {
     "paths": {
-      "event-target-shim": ["./node_modules/event-target-shim"]
+      "event-target-shim": ["./node_modules/event-target-shim"],
     }
   }
 }