Simplify

denoland · Jun 6, 2024 · fe6d357 · fe6d357
1 parent 8ee1d99
commit fe6d357
Showing 1 changed file with 10 additions and 27 deletions.
diff --git a/packages/shim-deno/src/deno/internal/Conn.ts b/packages/shim-deno/src/deno/internal/Conn.ts
@@ -43,35 +43,18 @@ export class Conn extends FsFile implements Deno.Conn {
   }
 
   async read(p: Uint8Array): Promise<number | null> {
-    let wait = false;
-    while (true) {
-      if (wait) {
-        try {
-          await once(this.#socket, "readable", {
-            signal: AbortSignal.timeout(5),
-          });
-        } catch (error) {
-          if (
-            !(error != null && typeof error === "object" && "name" in error &&
-              error.name == "AbortError")
-          ) {
-            throw error;
-          }
-        }
-        wait = false;
-      }
-      try {
-        return await super.read(p);
-      } catch (error) {
-        if (
-          !(error != null && typeof error === "object" && "code" in error &&
-            error.code == "EAGAIN")
-        ) {
-          throw error;
-        }
-        wait = true;
+    try {
+      return await super.read(p);
+    } catch (error) {
+      if (
+        !(error instanceof Error && "code" in error &&
+          error.code == "EAGAIN")
+      ) {
+        throw error;
       }
     }
+    await once(this.#socket, "readable");
+    return await super.read(p);
   }
 }