multporn-api-sdk 0.1.1 → 0.1.3

package/dist/index.js

@@ -5,7 +5,35 @@ var __export = (target, all) => {
 };
 
 // src/http.ts
-import { setTimeout as sleep } from "timers/promises";
+var sleep = (ms) => new Promise((resolve) => setTimeout(resolve, ms));
+function hasAbortController() {
+  return typeof AbortController !== "undefined";
+}
+async function fetchWithTimeout(url, init, timeoutMs) {
+  if (hasAbortController()) {
+    const ctrl = new AbortController();
+    const timer = setTimeout(() => {
+      try {
+        ctrl.abort();
+      } catch {
+      }
+    }, timeoutMs);
+    try {
+      const res = await fetch(url, { ...init, signal: ctrl.signal });
+      clearTimeout(timer);
+      return res;
+    } catch (e) {
+      clearTimeout(timer);
+      throw e;
+    }
+  }
+  return await Promise.race([
+    fetch(url, init),
+    new Promise(
+      (_, reject) => setTimeout(() => reject(new HttpError("Request timeout")), timeoutMs)
+    )
+  ]);
+}
 var defaultRetryPolicy = {
   retries: 2,
   factor: 2,
@@ -34,7 +62,7 @@ var HttpClient = class {
     this.headers = opts.headers ?? {};
     this.timeoutMs = opts.timeoutMs ?? 15e3;
     this.retry = { ...defaultRetryPolicy, ...opts.retry ?? {} };
-    this.userAgent = opts.userAgent ?? "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/118 Safari/537.36";
+    this.userAgent = opts.userAgent ?? "Mozilla/5.0 (Windows NT 10.0; Win32; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/118 Safari/537.36";
   }
   buildURL(pathOrUrl) {
     try {
@@ -45,19 +73,19 @@ var HttpClient = class {
   }
   async getHtml(pathOrUrl, attempt = 0) {
     const url = this.buildURL(pathOrUrl);
-    const ctrl = new AbortController();
-    const id = setTimeout(() => ctrl.abort(), this.timeoutMs);
     try {
-      const res = await fetch(url, {
-        method: "GET",
-        headers: {
-          "User-Agent": this.userAgent,
-          Accept: "text/html,application/xhtml+xml,application/xml;q=0.9,*/*;q=0.8",
-          ...this.headers
+      const res = await fetchWithTimeout(
+        url,
+        {
+          method: "GET",
+          headers: {
+            "User-Agent": this.userAgent,
+            Accept: "text/html,application/xhtml+xml,application/xml;q=0.9,*/*;q=0.8",
+            ...this.headers
+          }
         },
-        signal: ctrl.signal
-      });
-      clearTimeout(id);
+        this.timeoutMs
+      );
       if (!res.ok) {
         if (this.retry.retryOn(res.status) && attempt < this.retry.retries) {
           const delay = Math.min(
@@ -71,7 +99,6 @@ var HttpClient = class {
       }
       return await res.text();
     } catch (e) {
-      clearTimeout(id);
       if (attempt < this.retry.retries) {
         const delay = Math.min(
           this.retry.maxDelayMs,
@@ -80,25 +107,25 @@ var HttpClient = class {
         await sleep(delay);
         return this.getHtml(pathOrUrl, attempt + 1);
       }
-      if (e?.name == "AbortError") throw new HttpError("Request timeout");
+      if (e?.name === "AbortError") throw new HttpError("Request timeout");
       throw new HttpError(e?.message ?? "Network error");
     }
   }
   async getJson(pathOrUrl, attempt = 0) {
     const url = this.buildURL(pathOrUrl);
-    const ctrl = new AbortController();
-    const id = setTimeout(() => ctrl.abort(), this.timeoutMs);
     try {
-      const res = await fetch(url, {
-        method: "GET",
-        headers: {
-          "User-Agent": this.userAgent,
-          Accept: "application/json,text/plain;q=0.9,*/*;q=0.8",
-          ...this.headers
+      const res = await fetchWithTimeout(
+        url,
+        {
+          method: "GET",
+          headers: {
+            "User-Agent": this.userAgent,
+            Accept: "application/json,text/plain;q=0.9,*/*;q=0.8",
+            ...this.headers
+          }
         },
-        signal: ctrl.signal
-      });
-      clearTimeout(id);
+        this.timeoutMs
+      );
       if (!res.ok) {
         if (this.retry.retryOn(res.status) && attempt < this.retry.retries) {
           const delay = Math.min(
@@ -112,7 +139,6 @@ var HttpClient = class {
       }
       return await res.json();
     } catch (e) {
-      clearTimeout(id);
       if (attempt < this.retry.retries) {
         const delay = Math.min(
           this.retry.maxDelayMs,
@@ -121,14 +147,12 @@ var HttpClient = class {
         await sleep(delay);
         return this.getJson(pathOrUrl, attempt + 1);
       }
-      if (e?.name == "AbortError") throw new HttpError("Request timeout");
+      if (e?.name === "AbortError") throw new HttpError("Request timeout");
       throw new HttpError(e?.message ?? "Network error");
     }
   }
   async postForm(pathOrUrl, form, attempt = 0) {
     const url = this.buildURL(pathOrUrl);
-    const ctrl = new AbortController();
-    const id = setTimeout(() => ctrl.abort(), this.timeoutMs);
     const usp = new URLSearchParams();
     for (const [k, v] of Object.entries(form)) {
       if (Array.isArray(v)) {
@@ -139,19 +163,21 @@ var HttpClient = class {
     }
     const body = usp.toString();
     try {
-      const res = await fetch(url, {
-        method: "POST",
-        headers: {
-          "User-Agent": this.userAgent,
-          "Content-Type": "application/x-www-form-urlencoded; charset=UTF-8",
-          "X-Requested-With": "XMLHttpRequest",
-          Accept: "application/json, text/javascript, */*; q=0.01",
-          ...this.headers
+      const res = await fetchWithTimeout(
+        url,
+        {
+          method: "POST",
+          headers: {
+            "User-Agent": this.userAgent,
+            "Content-Type": "application/x-www-form-urlencoded; charset=UTF-8",
+            "X-Requested-With": "XMLHttpRequest",
+            Accept: "application/json, text/javascript, */*; q=0.01",
+            ...this.headers
+          },
+          body
         },
-        body,
-        signal: ctrl.signal
-      });
-      clearTimeout(id);
+        this.timeoutMs
+      );
       if (!res.ok) {
         if (this.retry.retryOn(res.status) && attempt < this.retry.retries) {
           const delay = Math.min(
@@ -174,7 +200,6 @@ var HttpClient = class {
         return text;
       }
     } catch (e) {
-      clearTimeout(id);
       if (attempt < this.retry.retries) {
         const delay = Math.min(
           this.retry.maxDelayMs,
@@ -183,7 +208,7 @@ var HttpClient = class {
         await sleep(delay);
         return this.postForm(pathOrUrl, form, attempt + 1);
       }
-      if (e?.name == "AbortError") throw new HttpError("Request timeout");
+      if (e?.name === "AbortError") throw new HttpError("Request timeout");
       throw new HttpError(e?.message ?? "Network error");
     }
   }