improve(api): increase highWaterMark for tunnel stream

sdnts · Oct 7, 2023 · 82f332f · 82f332f
1 parent 46e5253
commit 82f332f
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 5 deletions.
diff --git a/packages/api/src/tunnel.ts b/packages/api/src/tunnel.ts
@@ -7,6 +7,15 @@ export class Tunnel implements DurableObject {
   constructor(private state: DurableObjectState) {}
 
   async fetch(request: Request): Promise<Response> {
+    try {
+      return this.handler(request);
+    } catch (e) {
+      console.error({ error: (e as Error).message }, "Uncaught error");
+      return error(500, "Internal error");
+    }
+  }
+
+  async handler(request: Request): Promise<Response> {
     const url = new URL(request.url);
 
     const tunnelId = this.state.id.toString();
@@ -108,7 +117,7 @@ export class Tunnel implements DurableObject {
           // isn't trivial, and I'd rather have _something_ working.
           // Returning a Promise here is how we signal to the ReadableStream to
           // only have one running `pull` at a time.
-          return new Promise((resolve, reject) => {
+          return new Promise<void>((resolve, reject) => {
             const listeners = new AbortController();
 
             uploader.addEventListener(
@@ -119,6 +128,7 @@ export class Tunnel implements DurableObject {
                   "Blob transfer complete"
                 );
                 controller.close();
+
                 listeners.abort();
                 return resolve();
               },
@@ -137,7 +147,6 @@ export class Tunnel implements DurableObject {
 
                 console.debug("Enqueueing", e.data.byteLength);
                 controller.enqueue(new Uint8Array(e.data));
-                console.debug("Enqueued", e.data.byteLength);
 
                 listeners.abort();
                 return resolve();
@@ -146,8 +155,15 @@ export class Tunnel implements DurableObject {
             );
 
             // Request a chunk
-            console.debug("Requesting chunk");
             uploader.send("");
+          }).catch((e) => {
+            console.error(
+              { error: (e as Error).message },
+              "Pull Promise rejection"
+            );
+
+            controller.error(1001);
+            return Promise.reject(1001);
           });
         },
         cancel(reason) {
@@ -158,7 +174,7 @@ export class Tunnel implements DurableObject {
       {
         // Queue upto 10 chunks in memory if the downloader is
         // being slow. This roughly translates to 10MiB
-        highWaterMark: 1,
+        highWaterMark: 10,
         size: (chunk) => chunk.byteLength,
       }
     );
@@ -183,7 +199,7 @@ export class Tunnel implements DurableObject {
         "Content-Type": type,
         // Technically always incorrect because of gzip, but Chromium treats this
         // as a hint to show a real progress bar for this download
-        "Content-Length": size,
+        // "Content-Length": size,
         "Content-Disposition": `attachment; filename=\"${filename}\"`,
         "Content-Encoding": "gzip",
       },

diff --git a/packages/ui/src/components/TunnelPage.tsx b/packages/ui/src/components/TunnelPage.tsx
@@ -25,6 +25,7 @@ export const TunnelPage = () => {
     console.log("Files dropped", files);
     // TODO: Should I create a thread per upload?
     files.map((f) => tunnel().then((tunnelId) => upload(tunnelId, f)));
+    fileInput.current!.files = null;
   };
 
   useEffect(() => {