Use AbirtSignal.timeout() instead of promise.race()

oBusk · May 22, 2024 · 6dc4fc4 · 6dc4fc4
1 parent 15f8282
commit 6dc4fc4
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 32 deletions.
diff --git a/src/app/[...parts]/_page/BundlephobiaDiff.tsx b/src/app/[...parts]/_page/BundlephobiaDiff.tsx
@@ -1,5 +1,4 @@
 import bundlephobia from "^/lib/api/bundlephobia";
-import TIMED_OUT from "^/lib/api/TimedOut";
 import { Bundlephobia } from "^/lib/Services";
 import type SimplePackageSpec from "^/lib/SimplePackageSpec";
 import suspense from "^/lib/suspense";
@@ -29,11 +28,6 @@ const BundlephobiaDiffInner = async ({
         return null;
     }
 
-    if (result === TIMED_OUT) {
-        console.warn(`${name} timed out`, { specs });
-        return null;
-    }
-
     console.log(name, { specs, time });
 
     return (

diff --git a/src/app/[...parts]/_page/PackagephobiaDiff.tsx b/src/app/[...parts]/_page/PackagephobiaDiff.tsx
@@ -1,5 +1,4 @@
 import packagephobia from "^/lib/api/packagephobia";
-import TIMED_OUT from "^/lib/api/TimedOut";
 import { Packagephobia } from "^/lib/Services";
 import type SimplePackageSpec from "^/lib/SimplePackageSpec";
 import suspense from "^/lib/suspense";
@@ -26,11 +25,6 @@ const PackagephobiaDiffInner = async ({
         return null;
     }
 
-    if (result === TIMED_OUT) {
-        console.warn(`${name} timed out`, { specs });
-        return null;
-    }
-
     console.log(name, { specs, time });
 
     return (

diff --git a/src/lib/api/TimedOut.ts b/src/lib/api/TimedOut.ts
diff --git a/src/lib/api/bundlephobia/bundlephobia.ts b/src/lib/api/bundlephobia/bundlephobia.ts
@@ -1,6 +1,4 @@
 import npa from "npm-package-arg";
-import type TIMED_OUT from "../TimedOut";
-import { resultOrTimedOut } from "../TimedOut";
 import type BundlephobiaResponse from "./BundlephobiaResponse";
 import type BundlephobiaResults from "./BundlephobiaResults";
 
@@ -14,6 +12,9 @@ async function getPackage(spec: string): Promise<BundlephobiaResponse | null> {
     try {
         const response = await fetch(
             `https://bundlephobia.com/api/size?package=${spec}`,
+            {
+                signal: AbortSignal.timeout(7_500),
+            },
         );
 
         if (response.status !== 200) {
@@ -41,6 +42,6 @@ async function getPackages(
 export default async function bundlephobia([aSpec, bSpec]: [
     string,
     string,
-]): Promise<BundlephobiaResults | null | TIMED_OUT> {
-    return resultOrTimedOut(getPackages(aSpec, bSpec));
+]): Promise<BundlephobiaResults | null> {
+    return getPackages(aSpec, bSpec);
 }
diff --git a/src/lib/api/packagephobia/packagephobia.ts b/src/lib/api/packagephobia/packagephobia.ts
@@ -1,12 +1,13 @@
-import type TIMED_OUT from "../TimedOut";
-import { resultOrTimedOut } from "../TimedOut";
 import type PackagephobiaResponse from "./PackagephobiaResponse";
 import type PackagephobiaResults from "./PackagephobiaResult";
 
 async function getPackage(spec: string): Promise<PackagephobiaResponse | null> {
     try {
         const response = await fetch(
             `https://packagephobia.com/v2/api.json?p=${spec}`,
+            {
+                signal: AbortSignal.timeout(7_500),
+            },
         );
 
         if (response.status !== 200) {
@@ -35,6 +36,6 @@ async function getPackages(
 export default async function packagephobia([aSpec, bSpec]: [
     string,
     string,
-]): Promise<PackagephobiaResults | null | TIMED_OUT> {
-    return resultOrTimedOut(getPackages(aSpec, bSpec));
+]): Promise<PackagephobiaResults | null> {
+    return getPackages(aSpec, bSpec);
 }