@smoothdeploy/playwright 1.63.0-beta-1791031101000 → 1.63.0-beta-1794047129000

package/lib/index.js

@@ -273,7 +273,7 @@ const playwrightFixtures = {
   clientCertificates: [({ contextOptions }, use) => use(contextOptions.clientCertificates), { option: true, box: true }],
   timezoneId: [({ contextOptions }, use) => use(contextOptions.timezoneId), { option: true, box: true }],
   userAgent: [({ contextOptions }, use) => use(contextOptions.userAgent), { option: true, box: true }],
-  viewport: [({ contextOptions }, use) => use(contextOptions.viewport === void 0 ? null : contextOptions.viewport), { option: true, box: true }],
+  viewport: [({ contextOptions }, use) => use(contextOptions.viewport === void 0 ? { width: 1280, height: 720 } : contextOptions.viewport), { option: true, box: true }],
   actionTimeout: [0, { option: true, box: true }],
   navigationTimeout: [0, { option: true, box: true }],
   baseURL: [async ({}, use) => {
@@ -382,6 +382,7 @@ const playwrightFixtures = {
   _contextFactory: [async ({
     browser,
     video,
+    resultScreenshots,
     _reuseContext,
     _combinedContextOptions
     /** mitigate dep-via-auto lack of traceability */
@@ -404,7 +405,8 @@ const playwrightFixtures = {
       const videoOptions = captureVideo ? {
         recordVideo: {
           dir: tracing().artifactsDir(),
-          size: typeof video === "string" ? void 0 : video.size,
+          // Video locks the shared screencast size, so default it to the viewport to keep result screenshots at full resolution.
+          size: (typeof video === "string" ? void 0 : video.size) ?? (resultScreenshots ? options?.viewport ?? _combinedContextOptions.viewport ?? void 0 : void 0),
           showActions: show?.actions
         }
       } : {};
@@ -752,6 +754,7 @@ class ArtifactsRecorder {
   }
   async didFinishTest() {
     await this.didFinishTestFunction();
+    await Promise.all(_pendingResultScreenshots.splice(0));
     const leftoverContexts = this._playwright._allContexts();
     const leftoverApiRequests = Array.from(this._playwright.request._contexts);
     await Promise.all(leftoverContexts.map(async (context2) => {
@@ -814,6 +817,34 @@ class ArtifactsRecorder {
   }
 }
 let _capturingResultScreenshot = false;
+const _pendingResultScreenshots = [];
+const _screencastFrames = /* @__PURE__ */ new WeakMap();
+async function latestScreencastFrame(page, size, after) {
+  let state = _screencastFrames.get(page);
+  if (!state) {
+    const s = { timestamp: 0 };
+    state = s;
+    _screencastFrames.set(page, s);
+    await page._wrapApiCall(() => page.screencast.start({
+      size: size ?? void 0,
+      quality: 90,
+      onFrame: (frame) => {
+        s.data = frame.data;
+        s.timestamp = frame.timestamp;
+        s.onFrame?.();
+      }
+    }), { internal: true });
+  }
+  const start = Date.now();
+  const deadline = () => start + (state.data ? 100 : 2e3);
+  while ((!state.data || state.timestamp < after) && Date.now() < deadline()) {
+    await new Promise((resolve) => {
+      state.onFrame = resolve;
+      setTimeout(resolve, deadline() - Date.now());
+    });
+  }
+  return state.data;
+}
 async function captureResultScreenshot(channel, data, testInfo) {
   if (_capturingResultScreenshot)
     return;
@@ -840,25 +871,23 @@ async function captureResultScreenshot(channel, data, testInfo) {
     const cssViewport = await page._wrapApiCall(async () => {
       return await frame.evaluate(() => ({ width: window.innerWidth, height: window.innerHeight }));
     }, { internal: true }).catch(() => null);
-    const pngBuffer = await page._wrapApiCall(async () => {
-      return await page.screenshot({
-        type: "png",
-        animations: "disabled",
-        timeout: 5e3,
-        style: "x-pw-glass { display: none !important; }"
-      });
-    }, { internal: true });
-    const { full, cropped } = import_coreBundle.server.compositeHighlight(pngBuffer, box, cssViewport);
+    const jpeg = await latestScreencastFrame(page, cssViewport, Date.now());
+    if (!jpeg)
+      return;
     const safeTestId = testInfo.testId.replace(/[^a-zA-Z0-9_-]/g, "-");
     const safeStepId = (data.stepId ?? "unknown").replace(/[^a-zA-Z0-9_-]/g, "-");
     const screenshotDir = import_path.default.join(process.cwd(), ".smoothdeploy-output", "screenshots", safeTestId);
-    import_fs.default.mkdirSync(screenshotDir, { recursive: true });
-    const fullPng = new import_utilsBundle.PNG({ width: full.width, height: full.height });
-    fullPng.data = full.data;
-    import_fs.default.writeFileSync(import_path.default.join(screenshotDir, `${safeStepId}-page.png`), import_utilsBundle.PNG.sync.write(fullPng));
-    const croppedPng = new import_utilsBundle.PNG({ width: cropped.width, height: cropped.height });
-    croppedPng.data = cropped.data;
-    import_fs.default.writeFileSync(import_path.default.join(screenshotDir, `${safeStepId}-element.png`), import_utilsBundle.PNG.sync.write(croppedPng));
+    _pendingResultScreenshots.push(new Promise((resolve) => setImmediate(resolve)).then(async () => {
+      const { full, cropped } = import_coreBundle.server.compositeHighlight(jpeg, box, cssViewport);
+      await import_fs.default.promises.mkdir(screenshotDir, { recursive: true });
+      const encode = (image) => {
+        const png = new import_utilsBundle.PNG({ width: image.width, height: image.height });
+        png.data = image.data;
+        return import_utilsBundle.PNG.sync.write(png);
+      };
+      await import_fs.default.promises.writeFile(import_path.default.join(screenshotDir, `${safeStepId}-page.png`), encode(full));
+      await import_fs.default.promises.writeFile(import_path.default.join(screenshotDir, `${safeStepId}-element.png`), encode(cropped));
+    }).catch((e) => debugLogger.log("error", `failed to write result screenshot: ${e}`)));
   } catch {
   } finally {
     _capturingResultScreenshot = false;

package/lib/runner/index.js

@@ -5308,7 +5308,7 @@ var SmoothDeployReporter = class {
     this._retries = /* @__PURE__ */ new WeakMap();
     this._rootCursors = /* @__PURE__ */ new Map();
     this._testSteps = /* @__PURE__ */ new Map();
-    this._testIdMap = /* @__PURE__ */ new Map();
+    this._projectNames = [];
     this._stepIdMap = /* @__PURE__ */ new Map();
   }
   version() {
@@ -5319,6 +5319,7 @@ var SmoothDeployReporter = class {
   }
   onConfigure(config2) {
     this._configDir = config2.configFile ? path13.dirname(config2.configFile) : config2.rootDir;
+    this._projectNames = config2.projects.map((p) => p.name);
     const manifestPath = path13.join(this._configDir, ".smoothdeploy-manifest.json");
     if (fs10.existsSync(manifestPath))
       this._manifest = JSON.parse(fs10.readFileSync(manifestPath, "utf-8"));
@@ -5340,13 +5341,14 @@ var SmoothDeployReporter = class {
     return void 0;
   }
   _resolveManifestTest(test) {
+    const projectName = test.parent.project()?.name ?? "";
     const manifestTest = this._findManifestTest(test);
     if (!manifestTest)
-      return { manifestTest: { id: test.id, title: test.title, steps: [] }, paramIndex: 0, passthrough: true };
-    const single = manifestTest.manifestTest.steps.length === 1 ? manifestTest.manifestTest.steps[0] : void 0;
+      return { manifestTest: { id: test.id, title: test.title, steps: [] }, projectName, passthrough: true };
+    const single = manifestTest.steps.length === 1 ? manifestTest.steps[0] : void 0;
     if (single && single.action === "script")
-      return { ...manifestTest, passthrough: true, passthroughRootId: single.id };
-    return { ...manifestTest, passthrough: false };
+      return { manifestTest, projectName, passthrough: true, passthroughRootId: single.id };
+    return { manifestTest, projectName, passthrough: false };
   }
   _findManifestTest(test) {
     if (!this._manifest)
@@ -5367,29 +5369,17 @@ var SmoothDeployReporter = class {
       currentSuites = suite.suites;
       currentTests = suite.tests;
     }
-    const exactMatch = currentTests.find((t2) => t2.title === test.title);
-    if (exactMatch)
-      return { manifestTest: exactMatch, paramIndex: 0 };
-    for (const mt of currentTests) {
-      if (!mt.params || mt.params < 1 || !test.title.startsWith(mt.title))
-        continue;
-      const suffix = test.title.slice(mt.title.length);
-      const idx = parseInt(suffix, 10);
-      if (String(idx) === suffix && idx >= 0 && idx < mt.params)
-        return { manifestTest: mt, paramIndex: idx };
-    }
-    return null;
+    return currentTests.find((t2) => t2.title === test.title) ?? null;
   }
   onTestBegin(test, result) {
     const resolved = this._resolveManifestTest(test);
     this._resolvedTests.set(test.id, resolved);
-    this._testIdMap.set(safeId(test.id), safeId(resolved.manifestTest.id));
     this._rootCursors.set(test.id, 0);
     this._testSteps.set(test.id, []);
     this._emit({
       event: "testBegin",
       testId: resolved.manifestTest.id,
-      paramIndex: resolved.paramIndex,
+      projectName: resolved.projectName,
       testTitle: test.title,
       timestamp: Date.now()
     });
@@ -5397,7 +5387,7 @@ var SmoothDeployReporter = class {
       this._emit({
         event: "stepBegin",
         testId: resolved.manifestTest.id,
-        paramIndex: resolved.paramIndex,
+        projectName: resolved.projectName,
         id: resolved.passthroughRootId,
         action: "script",
         title: test.title,
@@ -5414,7 +5404,7 @@ var SmoothDeployReporter = class {
       this._emit({
         event: "stepEnd",
         testId: resolved.manifestTest.id,
-        paramIndex: resolved.paramIndex,
+        projectName: resolved.projectName,
         id: resolved.passthroughRootId,
         action: "script",
         title: test.title,
@@ -5426,7 +5416,7 @@ var SmoothDeployReporter = class {
     this._emit({
       event: "testEnd",
       testId: resolved.manifestTest.id,
-      paramIndex: resolved.paramIndex,
+      projectName: resolved.projectName,
       testTitle: test.title,
       status: result.status,
       duration: result.duration,
@@ -5521,7 +5511,7 @@ var SmoothDeployReporter = class {
     this._emit({
       event: "stepBegin",
       testId: resolved.manifestTest.id,
-      paramIndex: resolved.paramIndex,
+      projectName: resolved.projectName,
       id: manifestStep.id,
       action: manifestStep.action,
       title: step.title,
@@ -5530,7 +5520,7 @@ var SmoothDeployReporter = class {
     }, step);
   }
   _screenshotsFor(test, step) {
-    const hasScreenshot = step.category === "pw:api" && !NO_SCREENSHOT_PREFIXES.some((prefix) => step.title.startsWith(prefix));
+    const hasScreenshot = (step.category === "pw:api" || step.category === "expect") && !NO_SCREENSHOT_PREFIXES.some((prefix) => step.title.startsWith(prefix));
     if (!hasScreenshot)
       return null;
     const safeStepId = safeId(step._stepId ?? step.title);
@@ -5578,7 +5568,7 @@ var SmoothDeployReporter = class {
     this._emit({
       event: "stepEnd",
       testId: resolved.manifestTest.id,
-      paramIndex: resolved.paramIndex,
+      projectName: resolved.projectName,
       id: matched.manifest.id,
       action: matched.manifest.action,
       title: step.title,
@@ -5591,8 +5581,9 @@ var SmoothDeployReporter = class {
   onEnd(result) {
     const outputDir = path13.join(process.cwd(), ".smoothdeploy-output");
     const screenshotsDir = path13.join(outputDir, "screenshots");
-    for (const [safePwTestId] of this._testIdMap) {
-      const testDir = path13.join(screenshotsDir, safePwTestId);
+    const screenshotDirs = this._screenshotDirs();
+    for (const testId of screenshotDirs.keys()) {
+      const testDir = path13.join(screenshotsDir, safeId(testId));
       if (!fs10.existsSync(testDir))
         continue;
       for (const [safePwStepId, safeManifestStepId] of this._stepIdMap) {
@@ -5603,22 +5594,26 @@ var SmoothDeployReporter = class {
         }
       }
     }
-    for (const [safePwTestId, safeManifestTestId] of this._testIdMap) {
-      const src = path13.join(screenshotsDir, safePwTestId);
-      const dst = path13.join(screenshotsDir, safeManifestTestId);
+    const byDepth = [...screenshotDirs].sort(([, a], [, b]) => a.split("/").length - b.split("/").length);
+    for (const [testId, dir] of byDepth) {
+      const src = path13.join(screenshotsDir, safeId(testId));
+      const dst = path13.join(screenshotsDir, dir);
       if (src !== dst && fs10.existsSync(src)) {
         if (fs10.existsSync(dst))
           fs10.rmSync(dst, { recursive: true });
+        fs10.mkdirSync(path13.dirname(dst), { recursive: true });
         fs10.renameSync(src, dst);
       }
     }
-    const remapScreenshotPaths = (steps) => {
+    const remapScreenshotPaths = (steps, testId, dir) => {
       for (const step of steps) {
         if (step.screenshots) {
-          step.screenshots.page = this._remapPath(step.screenshots.page);
-          step.screenshots.element = this._remapPath(step.screenshots.element);
+          step.screenshots.page = this._remapPath(step.screenshots.page, testId, dir);
+          step.screenshots.element = this._remapPath(step.screenshots.element, testId, dir);
+          if (!fs10.existsSync(path13.join(process.cwd(), step.screenshots.page)))
+            step.screenshots = null;
         }
-        remapScreenshotPaths(step.children);
+        remapScreenshotPaths(step.children, testId, dir);
       }
     };
     const manifest = {};
@@ -5626,23 +5621,36 @@ var SmoothDeployReporter = class {
       const resolved = this._resolvedTests.get(testId);
       if (!resolved)
         continue;
-      remapScreenshotPaths(steps);
-      const safeManifestTestId = safeId(resolved.manifestTest.id);
-      const failurePath = path13.join(screenshotsDir, safeManifestTestId, "failure.png");
-      const failureScreenshot = fs10.existsSync(failurePath) ? `.smoothdeploy-output/screenshots/${safeManifestTestId}/failure.png` : null;
+      const dir = screenshotDirs.get(testId);
+      remapScreenshotPaths(steps, testId, dir);
+      const failureScreenshot = fs10.existsSync(path13.join(screenshotsDir, dir, "failure.png")) ? `.smoothdeploy-output/screenshots/${dir}/failure.png` : null;
       const key = resolved.manifestTest.id;
       if (!manifest[key])
         manifest[key] = [];
-      manifest[key].push({ paramIndex: resolved.paramIndex, steps, failureScreenshot });
+      manifest[key].push({ projectName: resolved.projectName, steps, failureScreenshot });
     }
     fs10.mkdirSync(outputDir, { recursive: true });
     fs10.writeFileSync(path13.join(outputDir, "manifest.json"), JSON.stringify(manifest, null, 2));
     this._emit({ event: "runEnd", status: result.status, timestamp: Date.now() });
   }
-  _remapPath(screenshotPath) {
-    let result = screenshotPath;
-    for (const [safePwTestId, safeManifestTestId] of this._testIdMap)
-      result = result.replace(`/${safePwTestId}/`, `/${safeManifestTestId}/`);
+  // The first configured project keeps screenshots/<testId>/, which the console builds remote-run URLs from; other projects get a subfolder.
+  _screenshotDirs() {
+    const primary = /* @__PURE__ */ new Map();
+    for (const [testId, resolved] of this._resolvedTests) {
+      const rank = this._projectNames.indexOf(resolved.projectName);
+      const current = primary.get(resolved.manifestTest.id);
+      if (!current || rank < current.rank)
+        primary.set(resolved.manifestTest.id, { testId, rank });
+    }
+    const dirs = /* @__PURE__ */ new Map();
+    for (const [testId, resolved] of this._resolvedTests) {
+      const base = safeId(resolved.manifestTest.id);
+      dirs.set(testId, primary.get(resolved.manifestTest.id).testId === testId ? base : `${base}/${safeId(resolved.projectName) || "default"}`);
+    }
+    return dirs;
+  }
+  _remapPath(screenshotPath, testId, dir) {
+    let result = screenshotPath.replace(`/${safeId(testId)}/`, `/${dir}/`);
     for (const [safePwStepId, safeManifestStepId] of this._stepIdMap)
       result = result.replace(`/${safePwStepId}-`, `/${safeManifestStepId}-`);
     return result;

package/lib/runner/index.js.txt

@@ -1,5 +1,5 @@
 # packages/playwright/lib/runner/index.js
-# total: 324.8 KB
+# total: 325.4 KB
 
 ## Inlined (49)
    1.3 KB  packages/playwright/src/isomorphic/events.ts
@@ -27,7 +27,7 @@
    3.0 KB  packages/playwright/src/reporters/multiplexer.ts
    8.9 KB  packages/playwright/src/reporters/perfetto.ts
    2.1 KB  packages/playwright/src/reporters/reporterV2.ts
-  13.3 KB  packages/playwright/src/reporters/smoothdeploy.ts
+  13.9 KB  packages/playwright/src/reporters/smoothdeploy.ts
    3.1 KB  packages/playwright/src/reporters/smoothdeployMatch.ts
    8.8 KB  packages/playwright/src/reporters/teleEmitter.ts
   20.6 KB  packages/playwright/src/runner/dispatcher.ts

package/package.json

@@ -1,12 +1,12 @@
 {
   "name": "@smoothdeploy/playwright",
-  "version": "1.63.0-beta-1791031101000",
+  "version": "1.63.0-beta-1794047129000",
   "description": "A high-level API to automate web browsers",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/microsoft/playwright.git"
   },
-  "homepage": "https://playwright.dev",
+  "homepage": "https://smoothdeploy.com",
   "engines": {
     "node": ">=20"
   },
@@ -50,6 +50,6 @@
   },
   "license": "Apache-2.0",
   "dependencies": {
-    "playwright-core": "npm:@smoothdeploy/playwright-core@1.63.0-beta-1791031101000"
+    "playwright-core": "npm:@smoothdeploy/playwright-core@1.63.0-beta-1794047129000"
   }
 }