blobToBuffer util

Author: dinwwwh

packages/client/src/adapters/websocket/link-client.ts

@@ -1,6 +1,7 @@
 import type { StandardLazyResponse, StandardRequest } from '@orpc/standard-server'
 import type { ClientContext, ClientOptions } from '../../types'
 import type { StandardLinkClient } from '../standard'
+import { blobToBuffer } from '@orpc/shared'
 import { ClientPeer } from '@orpc/standard-server-peer'
 
 export interface experimental_LinkWebsocketClientOptions {
@@ -29,7 +30,7 @@ export class experimental_LinkWebsocketClient<T extends ClientContext> implement
 
     options.websocket.addEventListener('message', async (event) => {
       const message = event.data instanceof Blob
-        ? await event.data.bytes()
+        ? await blobToBuffer(event.data)
         : event.data
 
       this.peer.message(message)

packages/server/src/adapters/websocket/handler.ts

@@ -4,7 +4,7 @@ import type { StandardHandler } from '../standard'
 import type {
   experimental_HandleStandardServerPeerMessageOptions as HandleStandardServerPeerMessageOptions,
 } from '../standard-peer'
-import { resolveMaybeOptionalOptions } from '@orpc/shared'
+import { blobToBuffer, resolveMaybeOptionalOptions } from '@orpc/shared'
 import { ServerPeer } from '@orpc/standard-server-peer'
 import {
   experimental_handleStandardServerPeerMessage as handleStandardServerPeerMessage,
@@ -57,7 +57,7 @@ export class experimental_WebsocketHandler<T extends Context> {
     }
 
     const message = data instanceof Blob
-      ? await data.bytes()
+      ? await blobToBuffer(data)
       : data
 
     await handleStandardServerPeerMessage(

packages/server/src/adapters/ws/handler.ts

@@ -5,7 +5,7 @@ import type { StandardHandler } from '../standard'
 import type {
   experimental_HandleStandardServerPeerMessageOptions as HandleStandardServerPeerMessageOptions,
 } from '../standard-peer'
-import { resolveMaybeOptionalOptions } from '@orpc/shared'
+import { blobToBuffer, resolveMaybeOptionalOptions } from '@orpc/shared'
 import { ServerPeer } from '@orpc/standard-server-peer'
 import {
   experimental_handleStandardServerPeerMessage as handleStandardServerPeerMessage,
@@ -25,7 +25,7 @@ export class experimental_WsHandler<T extends Context> {
 
     ws.addEventListener('message', async (event) => {
       const message = Array.isArray(event.data)
-        ? await (new Blob(event.data)).bytes()
+        ? await blobToBuffer(new Blob(event.data))
         : event.data
 
       await handleStandardServerPeerMessage(

packages/shared/src/blob.test.ts

@@ -0,0 +1,10 @@
+import { blobToBuffer } from './blob'
+
+it('blobToBuffer', async () => {
+  const blob = new Blob(['test'], { type: 'text/plain' })
+
+  expect(new TextDecoder().decode(await blobToBuffer(blob))).toBe('test')
+  expect(new TextDecoder().decode(await blobToBuffer(new Proxy(blob, {
+    has: (target, prop) => Reflect.has(target, prop) && prop !== 'bytes',
+  })))).toBe('test')
+})

packages/shared/src/blob.ts

@@ -0,0 +1,12 @@
+/**
+ * Converts a Blob to a buffer (ArrayBuffer or Uint8Array).
+ *
+ * Prefers the newer `.bytes` method when available as it more efficient but not widely supported yet.
+ */
+export function blobToBuffer(blob: Blob): Promise<ArrayBuffer | Uint8Array> {
+  if ('bytes' in blob) {
+    return blob.bytes()
+  }
+
+  return (blob as Blob).arrayBuffer()
+}

packages/shared/src/index.ts

@@ -1,5 +1,6 @@
 export * from './args'
 export * from './array'
+export * from './blob'
 export * from './chain'
 export * from './event-publisher'
 export * from './function'

packages/standard-server-aws-lambda/src/body.test.ts

@@ -118,7 +118,7 @@ describe.each([true, false])('toStandardBody: base64=%s', (isBase64Encoded) => {
     const res = new Response(form)
 
     const standardBody: any = await toStandardBody({
-      body: Buffer.from(await res.bytes()).toString('base64'),
+      body: Buffer.from(await res.arrayBuffer()).toString('base64'),
       headers: {
         'content-type': res.headers.get('content-type')!,
       },

packages/standard-server-peer/src/codec.ts

@@ -1,6 +1,6 @@
 import type { EventMeta, StandardBody, StandardHeaders, StandardRequest, StandardResponse } from '@orpc/standard-server'
 import type { EncodedMessage } from './types'
-import { isAsyncIteratorObject, stringifyJSON } from '@orpc/shared'
+import { blobToBuffer, isAsyncIteratorObject, stringifyJSON } from '@orpc/shared'
 import { flattenHeader, generateContentDisposition, getFilenameFromContentDisposition } from '@orpc/standard-server'
 
 export enum MessageType {
@@ -307,11 +307,11 @@ async function encodeRawMessage(data: object, blob?: Blob): Promise<EncodedMessa
     return json
   }
 
-  return new Blob([
+  return blobToBuffer(new Blob([
     new TextEncoder().encode(json),
     new Uint8Array([JSON_AND_BINARY_DELIMITER]),
     blob,
-  ]).bytes()
+  ]))
 }
 
 async function decodeRawMessage(raw: EncodedMessage): Promise<{ json: any, buffer?: Uint8Array }> {