fix(npm): bug

Airkro · Feb 28, 2024 · 3cd0b80 · 3cd0b80
1 parent 9bacc8e
commit 3cd0b80
Show file tree

Hide file tree

Showing 3 changed files with 27 additions and 6 deletions.
diff --git a/packages/npm/package.json b/packages/npm/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@bring-it/npm",
-  "version": "0.5.1",
+  "version": "0.5.2",
   "description": "Publish npm packages when needed",
   "license": "MIT",
   "author": {

diff --git a/packages/npm/src/lib/scan.mjs b/packages/npm/src/lib/scan.mjs
@@ -20,16 +20,37 @@ function readPkg(file) {
     .catch(() => false);
 }
 
+function Fetch(url, options) {
+  const controller = new AbortController();
+  const timeout = setTimeout(() => controller.abort('timeout'), 5000);
+
+  return fetch(url, {
+    ...options,
+    signal: controller.signal,
+  })
+    .then((response) => {
+      clearTimeout(timeout);
+
+      return response;
+    })
+    .catch((error) => {
+      clearTimeout(timeout);
+      throw error;
+    });
+}
+
 function getVersions(name, registry, token = '') {
-  return fetch(new URL(name, registry).href, {
+  return Fetch(new URL(name, registry).href, {
     headers: token ? { Authorization: `Bearer ${token}` } : undefined,
   })
     .then(async (response) => {
       if (!response.ok) {
         if (response.status === 401) {
-          const NPM_TOKEN = await readNpmToken();
+          const NPM_TOKEN = await readNpmToken(registry);
 
-          return getVersions(name, registry, NPM_TOKEN);
+          if (NPM_TOKEN) {
+            return getVersions(name, registry, NPM_TOKEN);
+          }
         }
 
         return [];

diff --git a/packages/npm/src/lib/token.mjs b/packages/npm/src/lib/token.mjs
@@ -18,9 +18,9 @@ export function readNpmToken(registry = 'https://registry.npmjs.org/') {
       ...localConfig.value,
     }))
     .then((data) => {
-      const domain = new URL(registry).host;
+      const { host, pathname } = new URL(registry);
 
-      return data[`//${domain}/:_authToken`];
+      return data[`//${host + pathname}:_authToken`];
     })
     .catch(() => {});
 }