fix: remove Blob usage

aws · Jul 15, 2020 · 9c1fcb2 · 9c1fcb2
1 parent 5323a81
commit 9c1fcb2
Show file tree

Hide file tree

Showing 2 changed files with 27 additions and 7 deletions.
diff --git a/packages/fetch-http-handler/src/stream-collector.ts b/packages/fetch-http-handler/src/stream-collector.ts
@@ -2,13 +2,17 @@ import { StreamCollector } from "@aws-sdk/types";
 import { fromBase64 } from "@aws-sdk/util-base64-browser";
 
 //reference: https://snack.expo.io/r1JCSWRGU
-export const streamCollector: StreamCollector = (stream: Blob | ReadableStream): Promise<Uint8Array> => {
-  if (stream instanceof Blob) {
-    return collectBlob(stream);
-  }
+export const streamCollector: StreamCollector =
+  // `Blob` does not exist on Cloudflare Workers.
+  typeof Blob === "undefined"
+    ? collectStream
+    : (stream: Blob | ReadableStream): Promise<Uint8Array> => {
+        if (stream instanceof Blob) {
+          return collectBlob(stream);
+        }
 
-  return collectStream(stream);
-};
+        return collectStream(stream);
+      };
 
 async function collectBlob(blob: Blob): Promise<Uint8Array> {
   const base64 = await readToBase64(blob);

diff --git a/packages/util-body-length-browser/src/index.ts b/packages/util-body-length-browser/src/index.ts
@@ -1,6 +1,22 @@
 export function calculateBodyLength(body: any): number | undefined {
   if (typeof body === "string") {
-    return new Blob([body]).size;
+    let len = body.length;
+
+    // Source: https://github.com/DylanPiercey/byte-length
+    for (let i = len; i--; ) {
+      const code = body.charCodeAt(i);
+      if (0xdc00 <= code && code <= 0xdfff) {
+        i--;
+      }
+
+      if (0x7f < code && code <= 0x7ff) {
+        len++;
+      } else if (0x7ff < code && code <= 0xffff) {
+        len += 2;
+      }
+    }
+
+    return len;
   } else if (typeof body.byteLength === "number") {
     // handles Uint8Array, ArrayBuffer, Buffer, and ArrayBufferView
     return body.byteLength;