@wix/evalforge-evaluator 0.189.0 → 0.191.0

package/build/index.mjs

@@ -7081,7 +7081,10 @@ function createApiClient(serverUrl, options = "") {
     },
     async provisionScenarioSite(projectId2, evalRunId2, scenarioId) {
       const res = await httpClient.request(provisionScenarioSite({ projectId: projectId2, evalRunId: evalRunId2, scenarioId })).catch(
-        (err) => rethrowWithRequestId(err, `provision a site for scenario ${scenarioId}`)
+        (err) => rethrowWithRequestId(
+          err,
+          `provision a site for scenario ${scenarioId}`
+        )
       );
       const site = res.data.site;
       if (!site) {
@@ -7516,12 +7519,71 @@ async function installDependencies(workDir, onProgress, options = {}) {
 }
 
 // src/run-scenario/environment.ts
-async function fetchAndWriteTemplateFiles(template, workDir) {
+async function withTimeout(promise, ms, label) {
+  let timer;
+  const timeout = new Promise((_, reject) => {
+    timer = setTimeout(
+      () => reject(new Error(`${label} did not complete within ${ms}ms`)),
+      ms
+    );
+  });
+  try {
+    return await Promise.race([promise, timeout]);
+  } finally {
+    clearTimeout(timer);
+  }
+}
+async function probeGitHubAccess(source, onProgress) {
+  const token = process.env.GITHUB_TOKEN;
+  const url = `https://api.github.com/repos/${source.owner}/${source.repo}`;
+  const controller = new AbortController();
+  const timer = setTimeout(() => controller.abort(), 5e3);
+  const startedAt = Date.now();
+  try {
+    const res = await fetch(url, {
+      headers: {
+        "User-Agent": "EvalForge-Evaluator",
+        ...token ? { Authorization: `Bearer ${token}` } : {}
+      },
+      signal: controller.signal
+    });
+    onProgress(
+      `[diag] github reachable: HTTP ${res.status} for repos/${source.owner}/${source.repo} in ${Date.now() - startedAt}ms (token: ${token ? "present" : "MISSING"})`
+    );
+  } catch (err) {
+    onProgress(
+      `[diag] github UNREACHABLE after ${Date.now() - startedAt}ms: ${err instanceof Error ? err.message : String(err)} (token: ${token ? "present" : "MISSING"})`
+    );
+  } finally {
+    clearTimeout(timer);
+  }
+}
+async function fetchAndWriteTemplateFiles(template, workDir, onProgress) {
   let sourceFiles = [];
   if (template.source) {
-    sourceFiles = await fetchGitHubFolder(template.source, {
-      userAgent: "EvalForge-Evaluator"
-    });
+    const { owner, repo, path: srcPath, ref } = template.source;
+    onProgress(
+      `[diag] template.source = ${owner}/${repo}/${srcPath ?? ""}@${ref ?? "default"}`
+    );
+    await probeGitHubAccess(template.source, onProgress);
+    const startedAt = Date.now();
+    try {
+      sourceFiles = await withTimeout(
+        fetchGitHubFolder(template.source, {
+          userAgent: "EvalForge-Evaluator"
+        }),
+        6e4,
+        "template source fetch"
+      );
+      onProgress(
+        `[diag] fetched ${sourceFiles.length} template file(s) in ${Date.now() - startedAt}ms`
+      );
+    } catch (err) {
+      onProgress(
+        `[diag] template source fetch FAILED after ${Date.now() - startedAt}ms: ${err instanceof Error ? err.message : String(err)}`
+      );
+      throw err;
+    }
   } else if (template.sourceFiles?.length) {
     sourceFiles = template.sourceFiles;
   } else {
@@ -7530,11 +7592,36 @@ async function fetchAndWriteTemplateFiles(template, workDir) {
     );
   }
   await writeFilesToDirectory(workDir, sourceFiles);
+  const extraFiles = template.extraFiles ?? [];
+  onProgress(`[diag] resolving ${extraFiles.length} extra file(s)`);
   await Promise.all(
-    (template.extraFiles ?? []).map(async (ef) => {
-      const content = ef.gitSource ? await fetchGitHubFile(ef.gitSource, {
-        userAgent: "EvalForge-Evaluator"
-      }) : ef.content ?? "";
+    extraFiles.map(async (ef) => {
+      let content;
+      if (ef.gitSource) {
+        const { owner, repo, path: gitPath, ref } = ef.gitSource;
+        const startedAt = Date.now();
+        onProgress(
+          `[diag] extra fetch start: ${ef.path} <- ${owner}/${repo}/${gitPath ?? ""}@${ref ?? "default"}`
+        );
+        try {
+          content = await withTimeout(
+            fetchGitHubFile(ef.gitSource, { userAgent: "EvalForge-Evaluator" }),
+            3e4,
+            `extra file fetch (${ef.path})`
+          );
+          onProgress(
+            `[diag] extra fetch done: ${ef.path} (${content.length} bytes) in ${Date.now() - startedAt}ms`
+          );
+        } catch (err) {
+          onProgress(
+            `[diag] extra fetch FAILED: ${ef.path} after ${Date.now() - startedAt}ms: ${err instanceof Error ? err.message : String(err)}`
+          );
+          throw err;
+        }
+      } else {
+        content = ef.content ?? "";
+        onProgress(`[diag] extra inline: ${ef.path} (${content.length} bytes)`);
+      }
       const dest = path2.resolve(workDir, ef.path);
       if (!dest.startsWith(workDir + sep2)) {
         throw new Error(
@@ -7545,6 +7632,7 @@ async function fetchAndWriteTemplateFiles(template, workDir) {
       await writeFile2(dest, content, "utf8");
     })
   );
+  onProgress("[diag] all extra files written");
 }
 function writeWixEnvFile(workDir) {
   const configPath = path2.join(workDir, "wix.config.json");
@@ -7582,7 +7670,7 @@ async function prepareWorkingDirectory(config, evalRunId2, targetId, scenarioId,
     }
     mkdirSync2(workDir2, { recursive: true });
     onProgress("Fetching template files...");
-    await fetchAndWriteTemplateFiles(template, workDir2);
+    await fetchAndWriteTemplateFiles(template, workDir2, onProgress);
     console.log(`Template files written to ${workDir2}`);
     writeWixEnvFile(workDir2);
     await installDependencies(workDir2, onProgress, {