@ohos-ports/floss 5.0.1-beta.6 → 5.0.1-beta.7

package/lib/browser-runner.js

@@ -68,6 +68,71 @@ function execOhosBm(args, timeout) {
     return execCmd(OHOS_BM_PATH, args, timeout);
 }
 
+// ─── Browser process cleanup ─────────────────────────────────────────
+
+var killedPids = new Set();
+
+function getBrowserPids() {
+    try {
+        var { execFileSync } = require("child_process");
+        var output = execFileSync("ps", ["-A", "-o", "pid,name"], {
+            timeout: 5000,
+            encoding: "utf-8",
+        }).trim();
+        var pids = [];
+        var lines = output.split("\n");
+        for (var i = 0; i < lines.length; i++) {
+            var line = lines[i].trim();
+            if (line.indexOf("htbrowser") !== -1 || line.indexOf(BROWSER_PKG) !== -1) {
+                var parts = line.split(/\s+/);
+                var pid = parseInt(parts[0], 10);
+                if (!isNaN(pid) && pid > 0) {
+                    pids.push(pid);
+                }
+            }
+        }
+        return pids;
+    } catch (e) {
+        return [];
+    }
+}
+
+function isProcessAlive(pid) {
+    try {
+        process.kill(pid, 0);
+        return true;
+    } catch (e) {
+        return false;
+    }
+}
+
+async function forceKillBrowserProcesses() {
+    for (var attempt = 0; attempt < 3; attempt++) {
+        var pids = getBrowserPids();
+        if (pids.length === 0) break;
+
+        var anyKilled = false;
+        for (var i = 0; i < pids.length; i++) {
+            var pid = pids[i];
+            if (killedPids.has(pid)) continue;
+            if (isProcessAlive(pid)) {
+                try {
+                    process.kill(pid, "SIGKILL");
+                    killedPids.add(pid);
+                    anyKilled = true;
+                } catch (e) {
+                    killedPids.add(pid);
+                }
+            } else {
+                killedPids.add(pid);
+            }
+        }
+
+        if (!anyKilled) break;
+        await sleep(500);
+    }
+}
+
 // ─── Browser launch / close ───────────────────────────────────────────
 
 function buildLaunchArgs() {
@@ -99,6 +164,8 @@ async function launchBrowser() {
     // 2. Kill existing browser process
     try { execOhosAa(["force-stop", "--bundlename", BROWSER_PKG], 10000); } catch {}
     await sleep(1000);
+    // Poll for surviving processes and SIGKILL stragglers
+    await forceKillBrowserProcesses();
 
     // 3. Start browser with CDP enabled
     var cmdArgs = buildLaunchArgs();
@@ -116,6 +183,7 @@ async function launchBrowser() {
 
 async function closeBrowser() {
     try { execOhosAa(["force-stop", "--bundlename", BROWSER_PKG], 10000); } catch {}
+    await forceKillBrowserProcesses();
 }
 
 // ─── CDP endpoint discovery ──────────────────────────────────────────

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ohos-ports/floss",
-  "version": "5.0.1-beta.6",
+  "version": "5.0.1-beta.7",
   "description": "Unit-testing for those hard to reach places",
   "bin": "./lib/floss.js",
   "main": "./lib/index.js",