ohos-playwright 0.2.13 → 0.3.0

package/dist/fixture.mjs

@@ -1,9 +1,10 @@
 import { readFileSync } from 'node:fs';
 import { test as base, chromium } from '@playwright/test';
 import { INFO_PATH } from "./info-path.mjs";
-function readEndpoint() {
-    return JSON.parse(readFileSync(INFO_PATH, 'utf8')).endpoint;
+function readInfo() {
+    return JSON.parse(readFileSync(INFO_PATH, 'utf8'));
 }
+function readEndpoint() { return readInfo().endpoint; }
 export const test = base.extend({
     browser: [
         async ({}, use) => {
@@ -46,7 +47,14 @@ export const test = base.extend({
         const pages = context.pages();
         if (pages.length === 0)
             throw new Error('No pages in ArkWeb CDP context. Open a tab first.');
-        const page = pages.find((p) => p.url().startsWith('http://localhost')) ?? pages[0];
+        const info = readInfo();
+        // If globalSetup opened a fresh tab for the test, use it — this avoids
+        // disturbing user tabs that were open when the test suite started.
+        // The new tab is identified by its launchUrl (default: about:blank); if
+        // multiple tabs match, pick the last one (most recently opened).
+        const page = info.openedNewTab
+            ? ([...pages].reverse().find((p) => p.url() === (info.launchUrl ?? 'about:blank')) ?? pages[pages.length - 1])
+            : (pages.find((p) => p.url().startsWith('http://localhost')) ?? pages[0]);
         const ctxEmit = context.emit.bind(context);
         // Patch baseURL
         const baseURL = testInfo.project.use.baseURL;
@@ -134,6 +142,14 @@ export const test = base.extend({
         finally {
             clearInterval(popupPoller);
             page.evaluate = savedEvaluate;
+            // Close the tab we opened so the user's browser is left clean.
+            // page.close() sends Target.closeTarget via CDP; non-fatal if it fails.
+            if (info.openedNewTab) {
+                try {
+                    await page.close();
+                }
+                catch { }
+            }
         }
     },
     emulateDevice: async ({ page }, use) => {

package/dist/info-path.d.mts

@@ -4,4 +4,6 @@ export interface CdpInfo {
     pid: number;
     socket: string;
     endpoint: string;
+    openedNewTab: boolean;
+    launchUrl: string;
 }

package/dist/setup.d.mts

@@ -5,6 +5,7 @@ interface RetryOptions {
 }
 export declare function retry<T>(fn: () => T | Promise<T>, { max, interval, label }?: RetryOptions): Promise<T>;
 export declare function findBrowserPid(): number | null;
+export declare function countCdpPages(listJson: string): number;
 export declare function hasDeviceConnected(): boolean;
 export declare function discoverDevices(): string[];
 export declare function tryLocalDevice(): boolean;

package/dist/setup.mjs

@@ -115,9 +115,9 @@ function setupForward(port, socketName) {
     catch { }
     hdc(['fport', 'tcp:' + port, 'localabstract:' + socketName]);
 }
-function probeCdp(port) {
+function cdpGet(port, path) {
     return new Promise((res) => {
-        const req = http.get(`http://127.0.0.1:${port}/json/version`, (r) => {
+        const req = http.get(`http://127.0.0.1:${port}${path}`, (r) => {
             let b = '';
             r.on('data', (c) => (b += c));
             r.on('end', () => res({ ok: r.statusCode === 200, body: b }));
@@ -126,6 +126,16 @@ function probeCdp(port) {
         req.setTimeout(2000, () => { req.destroy(); res({ ok: false, err: 'TIMEOUT' }); });
     });
 }
+function probeCdp(port) { return cdpGet(port, '/json/version'); }
+export function countCdpPages(listJson) {
+    try {
+        const targets = JSON.parse(listJson);
+        return targets.filter((t) => t.type === 'page').length;
+    }
+    catch {
+        return 0;
+    }
+}
 const IP_PORT_RE = /^(\d{1,3}\.){3}\d{1,3}:\d+$/;
 function listTargets() { return hdc(['list', 'targets']); }
 export function hasDeviceConnected() {
@@ -282,6 +292,7 @@ export default async function globalSetup() {
     console.log(`[ohos-playwright] locating ${BUNDLE}...`);
     // Batch ps + /proc/net/unix into a single hdc call.
     let pid = findBrowserPid();
+    const browserWasRunning = !!pid;
     if (!pid) {
         console.log('[ohos-playwright] browser not running, launching...');
         launchBrowser();
@@ -307,7 +318,23 @@ export default async function globalSetup() {
         throw new Error(`CDP response is not valid JSON (body preview: ${probe.body?.slice(0, 300) ?? '(empty)'})`);
     }
     console.log(`[ohos-playwright] CDP ready: ${info.Browser}`);
+    // If browser was already running with user tabs, open a fresh tab so tests
+    // don't disturb the user's browsing session.
+    let openedNewTab = false;
+    if (browserWasRunning) {
+        const listBefore = await cdpGet(port, '/json/list');
+        const countBefore = countCdpPages(listBefore.body ?? '[]');
+        if (countBefore > 0) {
+            launchBrowser();
+            console.log(`[ohos-playwright] opened new tab (${countBefore} existing page(s))`);
+            await retry(async () => {
+                const r = await cdpGet(port, '/json/list');
+                return countCdpPages(r.body ?? '[]') > countBefore ? true : null;
+            }, { max: 10, interval: 500, label: 'new tab did not appear in CDP' });
+            openedNewTab = true;
+        }
+    }
     mkdirSync(dirname(INFO_PATH), { recursive: true });
-    writeFileSync(INFO_PATH, JSON.stringify({ port, pid, socket, endpoint: `http://127.0.0.1:${port}` }, null, 2));
+    writeFileSync(INFO_PATH, JSON.stringify({ port, pid, socket, endpoint: `http://127.0.0.1:${port}`, openedNewTab, launchUrl: LAUNCH_URL }, null, 2));
     console.log(`[ohos-playwright] wrote ${INFO_PATH}`);
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ohos-playwright",
-  "version": "0.2.13",
+  "version": "0.3.0",
   "description": "Playwright adapter for OpenHarmony / ArkWeb via hdc + CDP",
   "license": "MIT",
   "author": "social4hyq",