testdriverai 7.5.26 → 7.6.0-test.1

package/sdk.js

@@ -1402,7 +1402,7 @@ function normalizeRedrawOptions(opts) {
  * @typedef {'up' | 'down' | 'left' | 'right'} ScrollDirection
  * @typedef {'keyboard' | 'mouse'} ScrollMethod
  * @typedef {'ai' | 'turbo'} TextMatchMethod
- * @typedef {'js' | 'pwsh'} ExecLanguage
+ * @typedef {'sh' | 'pwsh'} ExecLanguage
  * @typedef {'\\t' | '\n' | '\r' | ' ' | '!' | '"' | '#' | '$' | '%' | '&' | "'" | '(' | ')' | '*' | '+' | ',' | '-' | '.' | '/' | '0' | '1' | '2' | '3' | '4' | '5' | '6' | '7' | '8' | '9' | ':' | ';' | '<' | '=' | '>' | '?' | '@' | '[' | '\\' | ']' | '^' | '_' | '`' | 'a' | 'b' | 'c' | 'd' | 'e' | 'f' | 'g' | 'h' | 'i' | 'j' | 'k' | 'l' | 'm' | 'n' | 'o' | 'p' | 'q' | 'r' | 's' | 't' | 'u' | 'v' | 'w' | 'x' | 'y' | 'z' | '{' | '|' | '}' | '~' | 'accept' | 'add' | 'alt' | 'altleft' | 'altright' | 'apps' | 'backspace' | 'browserback' | 'browserfavorites' | 'browserforward' | 'browserhome' | 'browserrefresh' | 'browsersearch' | 'browserstop' | 'capslock' | 'clear' | 'convert' | 'ctrl' | 'ctrlleft' | 'ctrlright' | 'decimal' | 'del' | 'delete' | 'divide' | 'down' | 'end' | 'enter' | 'esc' | 'escape' | 'execute' | 'f1' | 'f10' | 'f11' | 'f12' | 'f13' | 'f14' | 'f15' | 'f16' | 'f17' | 'f18' | 'f19' | 'f2' | 'f20' | 'f21' | 'f22' | 'f23' | 'f24' | 'f3' | 'f4' | 'f5' | 'f6' | 'f7' | 'f8' | 'f9' | 'final' | 'fn' | 'hanguel' | 'hangul' | 'hanja' | 'help' | 'home' | 'insert' | 'junja' | 'kana' | 'kanji' | 'launchapp1' | 'launchapp2' | 'launchmail' | 'launchmediaselect' | 'left' | 'modechange' | 'multiply' | 'nexttrack' | 'nonconvert' | 'num0' | 'num1' | 'num2' | 'num3' | 'num4' | 'num5' | 'num6' | 'num7' | 'num8' | 'num9' | 'numlock' | 'pagedown' | 'pageup' | 'pause' | 'pgdn' | 'pgup' | 'playpause' | 'prevtrack' | 'print' | 'printscreen' | 'prntscrn' | 'prtsc' | 'prtscr' | 'return' | 'right' | 'scrolllock' | 'select' | 'separator' | 'shift' | 'shiftleft' | 'shiftright' | 'sleep' | 'space' | 'stop' | 'subtract' | 'tab' | 'up' | 'volumedown' | 'volumemute' | 'volumeup' | 'win' | 'winleft' | 'winright' | 'yen' | 'command' | 'option' | 'optionleft' | 'optionright'} KeyboardKey
  */
 
@@ -1910,7 +1910,7 @@ class TestDriverSDK {
         // Add web log tracking with domain wildcard pattern, then start dashcam
         if (this.dashcamEnabled) {
           const domainPattern = this._getUrlDomainPattern(url);
-          // await this.dashcam.addWebLog(domainPattern, "Web Logs");
+          await this.dashcam.addWebLog(domainPattern, "Web Logs");
           
           // Start dashcam recording after logs are configured
           if (!(await this.dashcam.isRecording())) {
@@ -2477,7 +2477,7 @@ with zipfile.ZipFile(io.BytesIO(zip_data)) as zf:
           const pattern = this._provisionedChromeUrl
             ? this._getUrlDomainPattern(this._provisionedChromeUrl)
             : "**";
-          // await this.dashcam.addWebLog(pattern, "Web Logs");
+          await this.dashcam.addWebLog(pattern, "Web Logs");
         }
 
         // Start recording if not already recording
@@ -2864,6 +2864,9 @@ CAPTCHA_SOLVER_EOF`,
       sandboxId: this.instance?.instanceId,
     });
 
+    // Log environment info (non-blocking, skip on stable)
+    this._logEnvironmentInfo();
+
     return this.instance;
   }
 
@@ -2892,8 +2895,10 @@ CAPTCHA_SOLVER_EOF`,
 
     // Always close the sandbox WebSocket connection to clean up resources
     // This ensures we don't leave orphaned connections even if connect() failed
+    // Must be awaited so presence.leave() completes before we return —
+    // otherwise the concurrency counter on the API stays stale.
     if (this.sandbox && typeof this.sandbox.close === "function") {
-      this.sandbox.close();
+      await this.sandbox.close();
     }
 
     // Remove all event listeners on the emitter to release references
@@ -3801,6 +3806,46 @@ CAPTCHA_SOLVER_EOF`,
    * Set up logging for the SDK
    * @private
    */
+  /**
+   * Log environment info (version, API URL, git commit) after connect.
+   * Fires asynchronously so it never blocks the test.
+   * Suppressed when the API reports the "stable" channel.
+   * @private
+   */
+  _logEnvironmentInfo() {
+    const apiRoot = this.config?.TD_API_ROOT || 'unknown';
+    const sdkVersion = require('./package.json').version;
+    const http = apiRoot.startsWith('https') ? require('https') : require('http');
+
+    const url = apiRoot + '/api/entrance/version';
+    const req = http.get(url, { timeout: 5000 }, (res) => {
+      let data = '';
+      res.on('data', (chunk) => { data += chunk; });
+      res.on('end', () => {
+        try {
+          const info = JSON.parse(data);
+          if (info.channel === 'stable') return; // don't show on stable
+          const commit = info.commit || 'unknown';
+          const shortCommit = commit.substring(0, 7);
+          const commitUrl = commit !== 'unknown'
+            ? `https://github.com/testdriverai/mono/commit/${commit}`
+            : null;
+          const lines = [
+            '',
+            `  TestDriver SDK v${sdkVersion}`,
+            `  API: ${apiRoot} (${info.channel || 'unknown'} v${info.version || '?'})`,
+            commitUrl
+              ? `  Commit: ${shortCommit} → ${commitUrl}`
+              : `  Commit: ${shortCommit}`,
+            '',
+          ];
+          console.log(lines.join('\n'));
+        } catch (_) { /* ignore parse errors */ }
+      });
+    });
+    req.on('error', () => { /* ignore network errors */ });
+  }
+
   _setupLogging() {
     // Track the last fatal error message to throw on exit
     let lastFatalError = null;

package/vitest.config.mjs

@@ -1,5 +1,7 @@
 import TestDriver from "testdriverai/vitest";
 import { defineConfig } from "vitest/config";
+import { readFileSync, existsSync } from "fs";
+import { resolve } from "path";
 
 // Always include AWS setup - it will be a no-op unless TD_OS=windows
 // Note: dotenv is loaded automatically by the TestDriver SDK
@@ -8,19 +10,61 @@ const setupFiles = [
   "testdriverai/vitest/setup-aws"
 ];
 
+const sharedTestConfig = {
+  retry: 0,
+  testTimeout: 900000,
+  hookTimeout: 900000,
+  maxConcurrency: 100,
+  disableConsoleIntercept: false,
+  silent: false,
+  reporters: [
+    "verbose",
+    TestDriver()
+  ],
+  setupFiles,
+  include: ["examples/**/*.test.mjs"],
+};
+
+// ── Parse a simple KEY=VALUE .env file ──────────────────────────────
+function parseEnvFile(filePath) {
+  if (!existsSync(filePath)) return {};
+  const env = {};
+  for (const line of readFileSync(filePath, "utf-8").split("\n")) {
+    const trimmed = line.trim();
+    if (!trimmed || trimmed.startsWith("#")) continue;
+    const idx = trimmed.indexOf("=");
+    if (idx === -1) continue;
+    env[trimmed.slice(0, idx)] = trimmed.slice(idx + 1);
+  }
+  return env;
+}
+
+// ── Load base .env + per-environment overlay ────────────────────────
+const monoRoot = resolve(import.meta.dirname, "..");
+const baseEnv = parseEnvFile(resolve(monoRoot, ".env"));
+
+const environments = ["dev", "test", "canary", "stable"];
+
+function envForProject(envName) {
+  const overlay = parseEnvFile(resolve(monoRoot, "envs", `${envName}.env`));
+  return { ...baseEnv, ...overlay };
+}
+
+// ── If TD_ENV is set (e.g. from CLI), only run that environment ─────
+// Usage: TD_ENV=dev vitest run
+//        TD_ENV=canary vitest run examples/assert.test.mjs
+//        vitest run --project dev
+//        vitest run --project canary --project stable
 export default defineConfig({
   test: {
-    retry: 0,
-    testTimeout: 900000,
-    hookTimeout: 900000,
-    maxConcurrency: 100,
-    maxWorkers: 16,
-    disableConsoleIntercept: false,
-    silent: false,
-    reporters: [
-      "verbose",
-      TestDriver()
-    ],
-    setupFiles,
+    ...sharedTestConfig,
+    env: envForProject(process.env.TD_ENV || "dev"),
+    projects: environments.map((envName) => ({
+      extends: true,
+      test: {
+        name: envName,
+        env: envForProject(envName),
+      },
+    })),
   },
 });