Merge branch 'main' into sdlsdl

2 files changed, 45 insertions, 0 deletions

diff --git a/test/js/web/abort/abort.signal.ts b/test/js/web/abort/abort.signal.ts
new file mode 100644
index 000000000..da402f637
--- /dev/null
+++ b/test/js/web/abort/abort.signal.ts
@@ -0,0 +1,24 @@
+import type { Server } from "bun";
+
+const server = Bun.serve({
+  port: 0,
+  async fetch() {
+    const signal = AbortSignal.timeout(1);
+    return await fetch("https://bun.sh", { signal });
+  },
+});
+
+function hostname(server: Server) {
+  if (server.hostname.startsWith(":")) return `[${server.hostname}]`;
+  return server.hostname;
+}
+
+let url = `http://${hostname(server)}:${server.port}/`;
+
+const responses: Response[] = [];
+for (let i = 0; i < 10; i++) {
+  responses.push(await fetch(url));
+}
+server.stop(true);
+// we fail if any of the requests succeeded
+process.exit(responses.every(res => res.status === 500) ? 0 : 1);
diff --git a/test/js/web/abort/abort.test.ts b/test/js/web/abort/abort.test.ts
index 4895e0d13..ef0b07a18 100644
--- a/test/js/web/abort/abort.test.ts
+++ b/test/js/web/abort/abort.test.ts
@@ -18,4 +18,25 @@ describe("AbortSignal", () => {
 
     expect(stderr?.toString()).not.toContain("✗");
   });
+
+  test("AbortSignal.timeout(n) should not freeze the process", async () => {
+    const fileName = join(import.meta.dir, "abort.signal.ts");
+
+    const server = Bun.spawn({
+      cmd: [bunExe(), fileName],
+      env: bunEnv,
+      cwd: tmpdir(),
+    });
+
+    const exitCode = await Promise.race([
+      server.exited,
+      (async () => {
+        await Bun.sleep(5000);
+        server.kill();
+        return 2;
+      })(),
+    ]);
+
+    expect(exitCode).toBe(0);
+  });
 });