1 files changed, 30 insertions, 29 deletions

diff --git a/ext/http/00_serve.js b/ext/http/00_serve.js
index fbd2014a7..05e0bb5c3 100644
--- a/ext/http/00_serve.js
+++ b/ext/http/00_serve.js
@@ -117,11 +117,11 @@ function upgradeHttpRaw(req, conn) {
 
 function addTrailers(resp, headerList) {
   const inner = toInnerResponse(resp);
-  op_http_set_response_trailers(inner.slabId, headerList);
+  op_http_set_response_trailers(inner.external, headerList);
 }
 
 class InnerRequest {
-  #slabId;
+  #external;
   #context;
   #methodAndUri;
   #streamRid;
@@ -129,14 +129,14 @@ class InnerRequest {
   #upgraded;
   #urlValue;
 
-  constructor(slabId, context) {
-    this.#slabId = slabId;
+  constructor(external, context) {
+    this.#external = external;
     this.#context = context;
     this.#upgraded = false;
   }
 
   close() {
-    this.#slabId = undefined;
+    this.#external = null;
   }
 
   get [_upgraded]() {
@@ -147,7 +147,7 @@ class InnerRequest {
     if (this.#upgraded) {
       throw new Deno.errors.Http("already upgraded");
     }
-    if (this.#slabId === undefined) {
+    if (this.#external === null) {
       throw new Deno.errors.Http("already closed");
     }
 
@@ -159,7 +159,7 @@ class InnerRequest {
 
     // upgradeHttpRaw is sync
     if (upgradeType == "upgradeHttpRaw") {
-      const slabId = this.#slabId;
+      const external = this.#external;
       const underlyingConn = originalArgs[0];
 
       this.url();
@@ -168,7 +168,7 @@ class InnerRequest {
 
       this.#upgraded = () => {};
 
-      const upgradeRid = op_http_upgrade_raw(slabId);
+      const upgradeRid = op_http_upgrade_raw(external);
 
       const conn = new TcpConn(
         upgradeRid,
@@ -184,7 +184,7 @@ class InnerRequest {
       const response = originalArgs[0];
       const ws = originalArgs[1];
 
-      const slabId = this.#slabId;
+      const external = this.#external;
 
       this.url();
       this.headerList;
@@ -194,15 +194,16 @@ class InnerRequest {
       this.#upgraded = () => {
         goAhead.resolve();
       };
+      const wsPromise = op_http_upgrade_websocket_next(
+        external,
+        response.headerList,
+      );
 
       // Start the upgrade in the background.
       (async () => {
         try {
           // Returns the upgraded websocket connection
-          const wsRid = await op_http_upgrade_websocket_next(
-            slabId,
-            response.headerList,
-          );
+          const wsRid = await wsPromise;
 
           // We have to wait for the go-ahead signal
           await goAhead;
@@ -236,12 +237,12 @@ class InnerRequest {
     }
 
     if (this.#methodAndUri === undefined) {
-      if (this.#slabId === undefined) {
+      if (this.#external === null) {
         throw new TypeError("request closed");
       }
       // TODO(mmastrac): This is quite slow as we're serializing a large number of values. We may want to consider
       // splitting this up into multiple ops.
-      this.#methodAndUri = op_http_get_request_method_and_url(this.#slabId);
+      this.#methodAndUri = op_http_get_request_method_and_url(this.#external);
     }
 
     const path = this.#methodAndUri[2];
@@ -281,10 +282,10 @@ class InnerRequest {
       };
     }
     if (this.#methodAndUri === undefined) {
-      if (this.#slabId === undefined) {
+      if (this.#external === null) {
         throw new TypeError("request closed");
       }
-      this.#methodAndUri = op_http_get_request_method_and_url(this.#slabId);
+      this.#methodAndUri = op_http_get_request_method_and_url(this.#external);
     }
     return {
       transport: "tcp",
@@ -295,16 +296,16 @@ class InnerRequest {
 
   get method() {
     if (this.#methodAndUri === undefined) {
-      if (this.#slabId === undefined) {
+      if (this.#external === null) {
         throw new TypeError("request closed");
       }
-      this.#methodAndUri = op_http_get_request_method_and_url(this.#slabId);
+      this.#methodAndUri = op_http_get_request_method_and_url(this.#external);
     }
     return this.#methodAndUri[0];
   }
 
   get body() {
-    if (this.#slabId === undefined) {
+    if (this.#external === null) {
       throw new TypeError("request closed");
     }
     if (this.#body !== undefined) {
@@ -316,25 +317,25 @@ class InnerRequest {
       this.#body = null;
       return null;
     }
-    this.#streamRid = op_http_read_request_body(this.#slabId);
+    this.#streamRid = op_http_read_request_body(this.#external);
     this.#body = new InnerBody(readableStreamForRid(this.#streamRid, false));
     return this.#body;
   }
 
   get headerList() {
-    if (this.#slabId === undefined) {
+    if (this.#external === null) {
       throw new TypeError("request closed");
     }
     const headers = [];
-    const reqHeaders = op_http_get_request_headers(this.#slabId);
+    const reqHeaders = op_http_get_request_headers(this.#external);
     for (let i = 0; i < reqHeaders.length; i += 2) {
       ArrayPrototypePush(headers, [reqHeaders[i], reqHeaders[i + 1]]);
     }
     return headers;
   }
 
-  get slabId() {
-    return this.#slabId;
+  get external() {
+    return this.#external;
   }
 }
 
@@ -483,8 +484,8 @@ function mapToCallback(context, callback, onError) {
     // Did everything shut down while we were waiting?
     if (context.closed) {
       // We're shutting down, so this status shouldn't make it back to the client but "Service Unavailable" seems appropriate
-      op_http_set_promise_complete(req, 503);
       innerRequest?.close();
+      op_http_set_promise_complete(req, 503);
       return;
     }
 
@@ -498,8 +499,8 @@ function mapToCallback(context, callback, onError) {
       }
     }
 
-    fastSyncResponseOrStream(req, inner.body, status);
     innerRequest?.close();
+    fastSyncResponseOrStream(req, inner.body, status);
   };
 }
 
@@ -659,7 +660,7 @@ function serveHttpOn(context, callback) {
       try {
         // Attempt to pull as many requests out of the queue as possible before awaiting. This API is
         // a synchronous, non-blocking API that returns u32::MAX if anything goes wrong.
-        while ((req = op_http_try_wait(rid)) !== -1) {
+        while ((req = op_http_try_wait(rid)) !== null) {
           PromisePrototypeCatch(callback(req), promiseErrorHandler);
         }
         currentPromise = op_http_wait(rid);
@@ -677,7 +678,7 @@ function serveHttpOn(context, callback) {
         }
         throw new Deno.errors.Http(error);
       }
-      if (req === -1) {
+      if (req === null) {
         break;
       }
       PromisePrototypeCatch(callback(req), promiseErrorHandler);