@testsmith/api-spector 0.0.5 → 0.0.8

package/out/main/runner.js

@@ -3,7 +3,7 @@
 const promises = require("fs/promises");
 const path = require("path");
 const undici = require("undici");
-const scriptRunner = require("./chunks/script-runner-CmdLWmKN.js");
+const requestHandler = require("./chunks/request-handler-C1b53aHR.js");
 require("crypto");
 require("vm");
 require("dayjs");
@@ -150,7 +150,7 @@ async function loadEnvironments(workspace, dir) {
   }
   return envs;
 }
-async function executeRequest(req, collectionVars, envVars, globals, verbose) {
+async function executeRequest(req, collectionVars, envVars, globals, verbose, tls) {
   const base = {
     requestId: req.id,
     name: req.name,
@@ -164,7 +164,7 @@ async function executeRequest(req, collectionVars, envVars, globals, verbose) {
   let updatedGlobals = { ...globals };
   let preScriptError;
   if (req.preRequestScript?.trim()) {
-    const r = await scriptRunner.runScript(req.preRequestScript, {
+    const r = await requestHandler.runScript(req.preRequestScript, {
       envVars: { ...envVars },
       collectionVars: { ...collectionVars },
       globals: { ...globals },
@@ -175,41 +175,41 @@ async function executeRequest(req, collectionVars, envVars, globals, verbose) {
     updatedEnvVars = r.updatedEnvVars;
     updatedCollectionVars = r.updatedCollectionVars;
     updatedGlobals = r.updatedGlobals;
-    scriptRunner.patchGlobals(r.updatedGlobals);
-    await scriptRunner.persistGlobals();
+    requestHandler.patchGlobals(r.updatedGlobals);
+    await requestHandler.persistGlobals();
     if (verbose && r.consoleOutput.length) r.consoleOutput.forEach((l) => console.log(color(`    [pre] ${l}`, C.gray)));
     if (r.error) console.error(color(`    [pre-script error] ${r.error}`, C.red));
   }
-  const vars = scriptRunner.mergeVars(updatedEnvVars, updatedCollectionVars, updatedGlobals, localVars);
-  const resolvedUrl = scriptRunner.buildUrl(req.url, req.params, vars);
+  const vars = requestHandler.mergeVars(updatedEnvVars, updatedCollectionVars, updatedGlobals, localVars);
+  const resolvedUrl = requestHandler.buildUrl(req.url, req.params, vars);
   base.resolvedUrl = resolvedUrl;
   const start = Date.now();
   try {
     const authH = {};
     if (req.auth.type === "bearer") {
       let token = req.auth.token ?? "";
-      if (!token && req.auth.tokenSecretRef) token = await scriptRunner.getSecret(req.auth.tokenSecretRef) ?? "";
-      if (token) authH["Authorization"] = `Bearer ${scriptRunner.interpolate(token, vars)}`;
+      if (!token && req.auth.tokenSecretRef) token = await requestHandler.getSecret(req.auth.tokenSecretRef) ?? "";
+      if (token) authH["Authorization"] = `Bearer ${requestHandler.interpolate(token, vars)}`;
     }
     const headers = new undici.Headers();
     for (const h of req.headers) {
-      if (h.enabled && h.key) headers.set(scriptRunner.interpolate(h.key, vars), scriptRunner.interpolate(h.value, vars));
+      if (h.enabled && h.key) headers.set(requestHandler.interpolate(h.key, vars), requestHandler.interpolate(h.value, vars));
     }
     for (const [k, v] of Object.entries(authH)) headers.set(k, v);
     let body;
     if (req.body.mode === "json" && req.body.json) {
-      body = scriptRunner.interpolate(req.body.json, vars);
+      body = requestHandler.interpolate(req.body.json, vars);
       if (!headers.has("content-type")) headers.set("Content-Type", "application/json");
     } else if (req.body.mode === "raw" && req.body.raw) {
-      body = scriptRunner.interpolate(req.body.raw, vars);
+      body = requestHandler.interpolate(req.body.raw, vars);
       if (!headers.has("content-type")) headers.set("Content-Type", req.body.rawContentType ?? "text/plain");
     } else if (req.body.mode === "graphql" && req.body.graphql) {
       const gql = req.body.graphql;
-      const gqlBody = { query: scriptRunner.interpolate(gql.query, vars) };
+      const gqlBody = { query: requestHandler.interpolate(gql.query, vars) };
       const rawVars = gql.variables?.trim();
       if (rawVars) {
         try {
-          gqlBody.variables = JSON.parse(scriptRunner.interpolate(rawVars, vars));
+          gqlBody.variables = JSON.parse(requestHandler.interpolate(rawVars, vars));
         } catch {
         }
       }
@@ -217,10 +217,12 @@ async function executeRequest(req, collectionVars, envVars, globals, verbose) {
       body = JSON.stringify(gqlBody);
       if (!headers.has("content-type")) headers.set("Content-Type", "application/json");
     }
+    const dispatcher = await requestHandler.buildDispatcher(void 0, tls);
     const fetchResp = await undici.fetch(resolvedUrl, {
       method: req.method,
       headers,
-      body: ["GET", "HEAD"].includes(req.method) ? void 0 : body
+      body: ["GET", "HEAD"].includes(req.method) ? void 0 : body,
+      ...dispatcher ? { dispatcher } : {}
     });
     const responseBody = await fetchResp.text();
     const durationMs = Date.now() - start;
@@ -240,7 +242,7 @@ async function executeRequest(req, collectionVars, envVars, globals, verbose) {
     let consoleOutput = [];
     let postScriptError;
     if (req.postRequestScript?.trim()) {
-      const r = await scriptRunner.runScript(req.postRequestScript, {
+      const r = await requestHandler.runScript(req.postRequestScript, {
         envVars: updatedEnvVars,
         collectionVars: updatedCollectionVars,
         globals: updatedGlobals,
@@ -250,8 +252,8 @@ async function executeRequest(req, collectionVars, envVars, globals, verbose) {
       testResults = r.testResults;
       consoleOutput = r.consoleOutput;
       postScriptError = r.error;
-      scriptRunner.patchGlobals(r.updatedGlobals);
-      await scriptRunner.persistGlobals();
+      requestHandler.patchGlobals(r.updatedGlobals);
+      await requestHandler.persistGlobals();
       if (verbose && r.consoleOutput.length) r.consoleOutput.forEach((l) => console.log(color(`    [post] ${l}`, C.gray)));
     }
     const allPassed = testResults.every((t) => t.passed);
@@ -311,7 +313,7 @@ async function main() {
     console.error(color(`Error: could not read workspace file: ${wsPath}`, C.red));
     process.exit(1);
   }
-  await scriptRunner.loadGlobals(wsDir);
+  await requestHandler.loadGlobals(wsDir);
   const collections = await loadCollections(workspace, wsDir);
   const environments = await loadEnvironments(workspace, wsDir);
   const env = envName ? environments.find((e) => e.name.toLowerCase() === envName.toLowerCase()) ?? null : null;
@@ -334,12 +336,14 @@ async function main() {
     const items = collectTagged(col.rootFolder, col.requests, col.collectionVariables ?? {}, filterTags);
     if (items.length === 0) continue;
     if (!firstColName) firstColName = col.name;
-    const envVars = await scriptRunner.buildEnvVars(env);
-    const globals = scriptRunner.getGlobals();
+    const envVars = await requestHandler.buildEnvVars(env);
+    const globals = requestHandler.getGlobals();
     console.log(color(`  ┌ ${col.name}`, C.bold, C.white));
+    const workspaceTls = workspace.settings?.tls;
+    const effectiveTls = col.tls ? { ...workspaceTls, ...col.tls } : workspaceTls;
     let bailed = false;
     for (const item of items) {
-      const result = await executeRequest(item.request, item.collectionVars, envVars, globals, verbose);
+      const result = await executeRequest(item.request, item.collectionVars, envVars, globals, verbose, effectiveTls);
       printResult(result, verbose);
       allResults.push(result);
       summary.total++;