@reddoorla/maintenance 0.54.2 → 0.54.4

package/dist/cli/commands/audit.js

@@ -1874,11 +1874,15 @@ async function browserAudit(ctx) {
     await runner.close?.();
   }
 }
+var FETCH_TIMEOUT_MS = 1e4;
 function defaultDiscoverDeps() {
   return {
     fetchText: async (url) => {
       try {
-        const res = await fetch(url, { redirect: "follow" });
+        const res = await fetch(url, {
+          redirect: "follow",
+          signal: AbortSignal.timeout(FETCH_TIMEOUT_MS)
+        });
         if (!res.ok) return null;
         return await res.text();
       } catch {
@@ -1979,9 +1983,17 @@ async function defaultBrowserRunner() {
       for (const url of urls) {
         let status;
         try {
-          let res = await fetch(url, { method: "HEAD", redirect: "follow" });
+          let res = await fetch(url, {
+            method: "HEAD",
+            redirect: "follow",
+            signal: AbortSignal.timeout(FETCH_TIMEOUT_MS)
+          });
           if (res.status === 405 || res.status === 501) {
-            res = await fetch(url, { method: "GET", redirect: "follow" });
+            res = await fetch(url, {
+              method: "GET",
+              redirect: "follow",
+              signal: AbortSignal.timeout(FETCH_TIMEOUT_MS)
+            });
           }
           status = res.status;
         } catch {
@@ -2092,6 +2104,20 @@ function fromJsonFile(path) {
 }
 
 // src/cli/fleet/resolve-sites.ts
+init_url();
+function sanitizeDynamicSites(sites) {
+  return sites.map((s) => {
+    if (s.deployedUrl !== void 0 && !isHttpUrl(s.deployedUrl)) {
+      console.warn(
+        `[inventory] dynamic inventory: ignoring deployedUrl that is not http(s) for ${s.name ?? s.path}: ${JSON.stringify(s.deployedUrl)}`
+      );
+      const copy = { ...s };
+      delete copy.deployedUrl;
+      return copy;
+    }
+    return s;
+  });
+}
 async function resolveSites(input) {
   if (input.site && input.fleet) {
     throw Object.assign(new Error("cannot combine a positional [site] with --fleet"), {
@@ -2108,24 +2134,22 @@ async function resolveSites(input) {
   if (input.fleet) {
     const fleetPath = resolve(input.cwd, input.fleet);
     const ext = extname(fleetPath).toLowerCase();
-    let provider;
     if (ext === ".json") {
-      provider = fromJsonFile(fleetPath);
-    } else if (ext === ".js" || ext === ".mjs" || ext === ".cjs") {
+      return fromJsonFile(fleetPath)();
+    }
+    if (ext === ".js" || ext === ".mjs" || ext === ".cjs") {
       const mod = await import(pathToFileURL(fleetPath).href);
       if (!mod.default || typeof mod.default !== "function") {
         throw Object.assign(new Error(`--fleet ${input.fleet}: default export is not a function`), {
           exitCode: 2
         });
       }
-      provider = mod.default;
-    } else {
-      throw Object.assign(
-        new Error(`--fleet ${input.fleet}: unsupported extension ${ext || "(none)"}`),
-        { exitCode: 2 }
-      );
+      return sanitizeDynamicSites(await mod.default());
     }
-    return provider();
+    throw Object.assign(
+      new Error(`--fleet ${input.fleet}: unsupported extension ${ext || "(none)"}`),
+      { exitCode: 2 }
+    );
   }
   return localPath(resolve(input.cwd, input.site ?? input.cwd))();
 }