Fix timeout

j3lte · Nov 21, 2023 · a008e75 · a008e75
1 parent 4489d8b
commit a008e75
Show file tree

Hide file tree

Showing 5 changed files with 76 additions and 41 deletions.
diff --git a/deno.lock b/deno.lock
diff --git a/dev_deps.ts b/dev_deps.ts
@@ -1,5 +1,8 @@
-export { assertEquals, assertRejects } from "https://deno.land/[email protected]/assert/mod.ts";
+export {
+  assertEquals,
+  assertRejects,
+  assertThrows,
+} from "https://deno.land/[email protected]/assert/mod.ts";
 export { emptyDir } from "https://deno.land/[email protected]/fs/mod.ts";
 export { MockFetch } from "https://deno.land/x/[email protected]/mod.ts";
 export { resolvesNext, stub } from "https://deno.land/[email protected]/testing/mock.ts";
-export { build } from "https://deno.land/x/[email protected]/mod.ts";
diff --git a/scripts/build-npm.ts b/scripts/build-npm.ts
@@ -1,4 +1,4 @@
-import { build, emptyDir } from "../dev_deps.ts";
+import { build, emptyDir } from "https://deno.land/x/[email protected]/mod.ts";
 
 const cleanupTypes = async (dir: string) => {
   for await (const dirEntry of Deno.readDir(dir)) {

diff --git a/src/lib/Pastebin.ts b/src/lib/Pastebin.ts
@@ -359,26 +359,13 @@ export abstract class AbstractPastebin {
     method: "GET" | "POST",
     params: Record<string, string> | IPasteAPIOptions = {},
   ): RequestInit {
-    const abortController = this.requestTimeout > 0 && AbortController
-      ? new AbortController()
-      : undefined;
-
-    if (abortController) {
-      const _timeoutId = setTimeout(() => {
-        if (abortController) {
-          abortController.abort();
-        }
-      }, this.requestTimeout);
-    }
-
     const init: RequestInit = {
       headers: new Headers({
         "User-Agent": "Pastebin-ts",
         "Cache-Control": "no-cache",
       }),
       method,
       cache: "no-cache",
-      signal: abortController ? abortController.signal : undefined,
     };
 
     if (method === "POST") {
@@ -395,54 +382,64 @@ export abstract class AbstractPastebin {
 
   async #handleResponse(
     res: Response,
-    resolve: (value: string | PromiseLike<string>) => void,
-    reject: (reason?: unknown) => void,
-  ): Promise<void> {
+  ): Promise<string> {
     if (res.status === 404) {
-      reject(new Error("Not found!"));
-      return;
+      return Promise.reject(new Error("Not found!"));
     }
     if (res.status === 403) {
-      reject(new Error("Forbidden! Is this paste private?"));
-      return;
+      return Promise.reject(new Error("Forbidden! Is this paste private?"));
     }
     if (!res.ok) {
-      reject(new Error(`Response not ok: ${res.status} : ${res.statusText}`));
-      return;
+      return Promise.reject(new Error(`Response not ok: ${res.status} : ${res.statusText}`));
     }
     let buffer: ArrayBuffer;
     try {
       buffer = await res.arrayBuffer();
     } catch (error) {
-      return reject(error);
+      return Promise.reject(error);
     }
     // parse Buffer as text
     const text = new TextDecoder().decode(buffer);
     if (text.includes("Bad API request")) {
-      reject(new Error("Bad API request"));
-      return;
+      return Promise.reject(new Error("Bad API request"));
     }
     if (text.includes("Post limit")) {
-      reject(new Error("Post limit reached"));
-      return;
+      return Promise.reject(new Error("Post limit reached"));
     }
-    resolve(text);
+    return text;
   }
 
-  #abstractRequest(
+  async #abstractRequest(
     method: "GET" | "POST",
     path: string,
     params?: Record<string, string> | IPasteAPIOptions,
   ): Promise<string> {
-    return new Promise<string>((resolve, reject) => {
-      const options = this.#getRequestOptions(method, params);
+    const init = this.#getRequestOptions(method, params);
+    let timeout: number | null = null;
 
-      this.fetch(path, options).then((res) => {
-        this.#handleResponse(res, resolve, reject);
-      }).catch((err) => {
-        reject(err);
-      });
-    });
+    if (this.requestTimeout > 0 && AbortController) {
+      const abortController = new AbortController();
+      init.signal = abortController.signal;
+
+      timeout = setTimeout(() => {
+        this.#debugger(">>>>> aborting request");
+        if (abortController) {
+          abortController.abort();
+        }
+        timeout = null;
+      }, this.requestTimeout);
+    }
+
+    try {
+      const res = await this.fetch(path, init);
+      if (timeout !== null) {
+        clearTimeout(timeout);
+      }
+      return this.#handleResponse(res);
+    } catch (error) {
+      console.log("error", error);
+      return Promise.reject(error);
+    }
   }
 
   #getRequest(path: string): Promise<string> {

diff --git a/test/Pastebin.test.ts b/test/Pastebin.test.ts
@@ -1,4 +1,11 @@
-import { assertEquals, assertRejects, MockFetch, resolvesNext, stub } from "../dev_deps.ts";
+import {
+  assertEquals,
+  assertRejects,
+  assertThrows,
+  MockFetch,
+  resolvesNext,
+  stub,
+} from "../dev_deps.ts";
 import { ExpirationTime, IPastebinOptions, Pastebin, PrivacyLevel } from "../mod.ts";
 
 // We're mocking Pastebin with a timeout of 0, so we don't introduce unwanted timeouts
@@ -20,6 +27,28 @@ Deno.test("Pastebin", async (t) => {
       method: "POST",
     }).response("12345678901234567890123456789012");
 
+  // // Not working yet
+  // await t.step("getPaste - timeout", async () => {
+  //   class DelayPastebin extends Pastebin {
+  //     requestTimeout = 500;
+  //   }
+
+  //   mf.intercept("https://pastebin.com/raw.php?i=test2").response("Hello World!").delay(1000);
+
+  //   assertRejects(
+  //     () => {
+  //       const pastebin = new DelayPastebin(defaultOptions);
+  //       return pastebin.getPaste("https://pastebin.com/test2").then((res) => {
+  //         console.log(res);
+  //       }).catch((err) => {
+  //         console.log(err);
+  //       });
+  //     },
+  //     Error,
+  //     "Request timed out",
+  //   );
+  // });
+
   await t.step("getPaste - anonymous (with debug)", async () => {
     const pastebin = new TestPastebin({
       debug: true,