ohos-playwright 0.5.0 → 0.5.2

package/README.md

@@ -56,7 +56,7 @@ The following Playwright APIs have been validated on ArkWeb / HarmonyOS 6.1 (Chr
 | File upload | `page.setInputFiles()` — fires `change`, file content readable |
 | Cookies | `context.addCookies()`, `context.cookies()`, `context.clearCookies()` |
 | Dialog | `page.on('dialog')`, `dialog.accept()`, `dialog.dismiss()`, `dialog.message()`, `dialog.type()` |
-| Popup | `context.waitForEvent('page')` + `window.open()` — stub Page with `url()`, `waitForLoadState()`, `close()` |
+| Popup | `context.waitForEvent('page')` + `window.open()` — real Page with full API. Requires `PW_CHROMIUM_ATTACH_TO_OTHER=1`. Falls back to idle-tab proxy or minimal stub when Target.createTarget is unavailable. |
 | Page events | `page.on('pageerror')`, `page.on('console')`, `page.on('download')` |
 | Script / style injection | `page.addScriptTag({ content \| path \| type:'module' })`, `page.addStyleTag({ content })` |
 | Init script | `page.addInitScript()` — function or string, persists across `goto()` navigations |

package/dist/fixture.d.mts

@@ -27,6 +27,7 @@ export interface StorageState {
 export type PageCleanup = (opts?: {
     navigateTo?: string;
 }) => Promise<void>;
+export declare function createPopupPage(context: BrowserContext, seedPage: Page, popupUrl: string): Promise<Page | null>;
 export declare function installPageWrappers(page: Page, context: BrowserContext, baseURL: string | undefined): Promise<PageCleanup>;
 export declare const test: import("@playwright/test").TestType<import("@playwright/test").PlaywrightTestArgs & import("@playwright/test").PlaywrightTestOptions & {
     emulateDevice: (descriptor: DeviceDescriptor) => Promise<void>;

package/dist/fixture.mjs

@@ -16,6 +16,64 @@ function readInfo() {
     return JSON.parse(readFileSync(INFO_PATH, 'utf8'));
 }
 function readEndpoint() { return readInfo().endpoint; }
+// Create a real Page in the default context via Target.createTarget.
+// Returns the new page (already navigated to popupUrl) on success, or null
+// to let the caller fall back to idle-tab proxy or stub.
+//
+// Precondition: PW_CHROMIUM_ATTACH_TO_OTHER=1 must be set, otherwise the new
+// target created by ArkWeb will be type:'other' and Playwright won't pick
+// it up into ctx.pages().
+export async function createPopupPage(context, seedPage, popupUrl) {
+    let session = null;
+    try {
+        session = await context.newCDPSession(seedPage);
+        const r = await Promise.race([
+            session
+                .send('Target.createTarget', { url: 'about:blank' }),
+            new Promise((_, rej) => setTimeout(() => rej(new Error('createTarget timeout')), 3000)),
+        ]);
+        if (!r.targetId)
+            return null;
+        // Poll ctx.pages() until Playwright picks up the new target (max 2s).
+        const pagesBefore = context.pages().length;
+        const deadline = Date.now() + 2000;
+        while (Date.now() < deadline) {
+            if (context.pages().length > pagesBefore)
+                break;
+            await new Promise((r) => setTimeout(r, 50));
+        }
+        const allPages = context.pages();
+        if (allPages.length <= pagesBefore)
+            return null;
+        // Pick the newly-added page (any page not equal to seedPage, preferring
+        // about:blank which is the createTarget's initial URL).
+        const newPage = allPages.find((p) => p !== seedPage && p.url() === 'about:blank') ??
+            allPages.find((p) => p !== seedPage);
+        if (!newPage)
+            return null;
+        // Navigate to the popup URL (skip for about:blank which is already loaded).
+        // On navigation failure, close the tab and return null — otherwise a
+        // half-loaded popup tab (url stuck at about:blank) gets mistaken for the
+        // launchUrl tab by the next test's fixture-page selector.
+        if (popupUrl && popupUrl !== 'about:blank') {
+            try {
+                await newPage.goto(popupUrl, { timeout: 5000 });
+            }
+            catch {
+                await newPage.close().catch(() => { });
+                return null;
+            }
+        }
+        return newPage;
+    }
+    catch {
+        return null;
+    }
+    finally {
+        if (session)
+            await session.detach().catch(() => { });
+    }
+}
 export async function installPageWrappers(page, context, baseURL) {
     const ctxEmit = context.emit.bind(context);
     // connectOverCDP reuses an existing tab — Playwright has no record of its
@@ -38,10 +96,17 @@ export async function installPageWrappers(page, context, baseURL) {
     finally {
         await session.detach();
     }
-    // Override goBack: Page.navigateToHistoryEntry hangs in ArkWeb (never resolves).
-    // ArkWeb also does not emit Page.frameNavigated for history navigation, so waitForURL
-    // never fires. Poll Page.getNavigationHistory.currentIndex instead.
-    ;
+    // Override goto: connectOverCDP creates the server-side context with no baseURL in
+    // its _options, so Playwright's internal Frame.goto cannot resolve relative paths —
+    // CDP rejects them as invalid. Resolve here before delegating to the real goto.
+    const savedGoto = page['goto'];
+    const origGoto = page.goto.bind(page);
+    page.goto = async (url, options) => {
+        if (baseURL && url && !url.includes('://') && !url.startsWith('about:') && !url.startsWith('data:')) {
+            url = new URL(url, baseURL).toString();
+        }
+        return origGoto(url, options);
+    };
     page.goBack = async (options) => {
         const timeout = options?.timeout ?? 30000;
         const s = await page.context().newCDPSession(page);
@@ -136,14 +201,39 @@ export async function installPageWrappers(page, context, baseURL) {
                 return q;
             });
             for (const { url } of pending ?? []) {
-                // context.newPage() calls Target.createTarget which hangs in ArkWeb.
-                // Emit a minimal stub — satisfies waitForLoadState / url / close.
-                const stub = {
-                    waitForLoadState: async () => { },
-                    url: () => url,
-                    close: async () => { },
-                };
-                ctxEmit('page', stub);
+                // 1) Target.createTarget（首选）
+                let emitted = null;
+                try {
+                    emitted = await createPopupPage(context, page, url || 'about:blank');
+                }
+                catch { }
+                // 2) Fallback A：默认 context 闲置 about:blank tab
+                if (!emitted) {
+                    const idle = context
+                        .pages()
+                        .find((p) => p !== page && p.url() === 'about:blank');
+                    if (idle) {
+                        try {
+                            if (url && url !== 'about:blank') {
+                                await idle.goto(url, { timeout: 5000 });
+                            }
+                            emitted = idle;
+                        }
+                        catch { }
+                    }
+                }
+                // 3) Fallback B：退回原 stub（保持兼容）
+                if (!emitted) {
+                    const stub = {
+                        waitForLoadState: async () => { },
+                        url: () => url,
+                        close: async () => { },
+                    };
+                    ctxEmit('page', stub);
+                }
+                else {
+                    ctxEmit('page', emitted);
+                }
             }
         }
         catch { }
@@ -165,6 +255,7 @@ export async function installPageWrappers(page, context, baseURL) {
         clearInterval(popupPoller);
         page.evaluate = savedEvaluate;
         page.locator = savedLocator;
+        page.goto = savedGoto;
         if (opts?.navigateTo) {
             // Reset the shared tab to a neutral state — page.close() would terminate
             // the ArkWeb DevTools socket so we navigate instead.

package/package.json

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