ohos-playwright 0.2.7 → 0.2.8

package/dist/fixture.mjs

@@ -12,20 +12,9 @@ export const test = base.extend({
         },
         { scope: 'worker' },
     ],
-    context: async ({ browser }, use, testInfo) => {
-        const ctx = browser.contexts()[0];
-        const baseURL = testInfo.project.use.baseURL;
-        if (baseURL) {
-            try {
-                const opts = ctx._options;
-                if (opts && typeof opts === 'object')
-                    opts.baseURL = baseURL;
-            }
-            catch (e) {
-                console.warn(`[ohos-playwright] Failed to inject baseURL: ${e instanceof Error ? e.message : e}`);
-            }
-        }
-        await use(ctx);
+    context: async ({ browser }, use) => {
+        // baseURL 通过 page fixture 重写 page.goto 实现；不再触碰 BrowserContext 私有字段 _options。
+        await use(browser.contexts()[0]);
     },
     page: async ({ context }, use, testInfo) => {
         const pages = context.pages();

package/dist/setup.d.mts

@@ -8,6 +8,7 @@ export declare function findBrowserPid(): number | null;
 export declare function hasDeviceConnected(): boolean;
 export declare function discoverDevices(): string[];
 export declare function tryLocalDevice(): boolean;
+export declare function ensureHdcKey(): boolean;
 export declare function ensureDeviceConnected(): Promise<void>;
 export default function globalSetup(): Promise<void>;
 export {};

package/dist/setup.mjs

@@ -1,8 +1,11 @@
 import { execFileSync } from 'node:child_process';
-import { writeFileSync, mkdirSync } from 'node:fs';
+import { writeFileSync, mkdirSync, existsSync, copyFileSync } from 'node:fs';
+import { isAbsolute, join } from 'node:path';
 import { createServer } from 'node:net';
 import { dirname } from 'node:path';
 import { createInterface } from 'node:readline';
+import { homedir } from 'node:os';
+import { generateKeyPairSync } from 'node:crypto';
 import http from 'node:http';
 import { INFO_PATH } from "./info-path.mjs";
 const HDC = process.env.OHOS_PW_HDC ?? '/data/service/hnp/bin/hdc';
@@ -18,6 +21,15 @@ if (!SAFE_BUNDLE_RE.test(BUNDLE) || BUNDLE.length > 256) {
 if (!SAFE_URL_RE.test(LAUNCH_URL) || LAUNCH_URL.length > 2048) {
     throw new Error(`[ohos-playwright] OHOS_PW_LAUNCH_URL "${LAUNCH_URL}" 不是合法的 URL`);
 }
+if (!isAbsolute(HDC) || !existsSync(HDC)) {
+    throw new Error(`[ohos-playwright] OHOS_PW_HDC "${HDC}" 不是有效的可执行文件路径（需绝对路径且文件存在）`);
+}
+// HarmonyOS host 提示：系统自带 hdc 与本机设备 hdcd 协议匹配；
+// 其他 hdc（如 OHOS SDK 3.x）连本机设备会握手失败。
+const SYSTEM_HDC_ON_HARMONY = '/data/service/hnp/bin/hdc';
+if (existsSync(SYSTEM_HDC_ON_HARMONY) && HDC !== SYSTEM_HDC_ON_HARMONY) {
+    console.warn(`[ohos-playwright] 注意：当前 OHOS_PW_HDC="${HDC}"，但系统自带 ${SYSTEM_HDC_ON_HARMONY} 才能与本机 HarmonyOS 设备通信；如握手失败请改用系统 hdc。`);
+}
 const HDC_OPTS = { encoding: 'utf8', stdio: ['ignore', 'pipe', 'pipe'] };
 function hdc(args, opts) {
     return String(execFileSync(HDC, args, { ...HDC_OPTS, ...opts })).trim();
@@ -126,9 +138,11 @@ export function discoverDevices() {
     }
     return out.split('\n').map(s => s.trim()).filter(s => IP_PORT_RE.test(s));
 }
+// 已连接时 hdc tconn 返回 "Target is connected, repeat operation"，也视作成功。
 function tconn(addr) {
     try {
-        return hdc(['tconn', addr], { timeout: 10000 }).includes('Connect OK');
+        const out = hdc(['tconn', addr], { timeout: 10000 });
+        return out.includes('Connect OK') || out.includes('repeat operation');
     }
     catch {
         return false;
@@ -166,9 +180,70 @@ export function tryLocalDevice() {
     catch { }
     return false;
 }
+// HarmonyOS host 自愈：缺 hdc key 时自动生成 RSA-3072，并重启本机 hdc server。
+// 仅在 host 看似 HarmonyOS 时触发（/data/service/hnp/bin/hdc 存在）；最多 1 次。
+const HARMONY_HDC_PATH = '/data/service/hnp/bin/hdc';
+const HARMONY_KEY_DIR = join(homedir(), '.harmony');
+let selfHealAttempted = false;
+function isHarmonyHost() { return existsSync(HARMONY_HDC_PATH); }
+export function ensureHdcKey() {
+    const priv = join(HARMONY_KEY_DIR, 'hdckey');
+    const pub = join(HARMONY_KEY_DIR, 'hdckey.pub');
+    if (existsSync(priv) && existsSync(pub))
+        return false;
+    mkdirSync(HARMONY_KEY_DIR, { recursive: true });
+    for (const f of [priv, pub]) {
+        if (existsSync(f)) {
+            try {
+                copyFileSync(f, f + '.bak');
+            }
+            catch { }
+        }
+    }
+    const { privateKey, publicKey } = generateKeyPairSync('rsa', {
+        modulusLength: 3072,
+        privateKeyEncoding: { type: 'pkcs1', format: 'pem' },
+        publicKeyEncoding: { type: 'spki', format: 'pem' },
+    });
+    writeFileSync(priv, privateKey, { mode: 0o600 });
+    writeFileSync(pub, publicKey, { mode: 0o644 });
+    console.warn(`[ohos-playwright] generated RSA-3072 hdc key at ${priv} (设备首次连接需 UI 授权)`);
+    return true;
+}
+async function restartHdcServer() {
+    try {
+        hdc(['kill']);
+    }
+    catch { }
+    await sleep(500);
+    try {
+        hdc(['start']);
+    }
+    catch (e) {
+        console.warn(`[ohos-playwright] hdc start failed: ${e instanceof Error ? e.message : e}`);
+    }
+}
+async function selfHealHdc() {
+    if (selfHealAttempted)
+        return;
+    selfHealAttempted = true;
+    if (process.env.OHOS_PW_AUTO_HEAL === '0')
+        return;
+    if (!isHarmonyHost())
+        return;
+    console.log('[ohos-playwright] self-heal: 检查 hdc key 与重启本机 hdc server...');
+    const keyChanged = ensureHdcKey();
+    await restartHdcServer();
+    await sleep(keyChanged ? 1500 : 500);
+}
 export async function ensureDeviceConnected() {
     if (process.env.OHOS_PW_AUTO_CONNECT === '0')
         return;
+    if (hasDeviceConnected())
+        return;
+    if (tryLocalDevice())
+        return;
+    await selfHealHdc();
     if (hasDeviceConnected())
         return;
     if (tryLocalDevice())

package/package.json

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