@ohos-ports/slides-grab 1.5.0-beta.2 → 1.5.0-beta.4

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ohos-ports/slides-grab",
-  "version": "1.5.0-beta.2",
+  "version": "1.5.0-beta.4",
   "description": "Agent-first presentation framework — plan, design, and visually edit HTML slides with Claude Code or Codex, then export to PDF or experimental/unstable PPTX/Figma formats. HarmonyOS adaptation: Playwright connects to system Haitai browser (Chromium M132) via CDP bridge.",
   "license": "MIT",
   "author": "vkehfdl1",
@@ -77,12 +77,12 @@
     "pptxgenjs": "^3.12.0",
     "react": "^19.2.4",
     "react-dom": "^19.2.4",
-    "sharp": "npm:@ohos-ports/sharp@0.34.5-beta.2",
+    "sharp": "npm:@ohos-ports/sharp@0.34.5-beta.5",
     "tldraw": "^4.4.1"
   },
   "optionalDependencies": {
     "@ohos-ports/img-sharp-openharmony-arm64": "0.34.5-beta.0",
-    "@ohos-ports/img-sharp-libvips-openharmony-arm64": "1.2.4-beta.0"
+    "@ohos-ports/img-sharp-libvips-openharmony-arm64": "1.2.4-beta.1"
   },
   "devDependencies": {
     "@types/node": "^25.5.0",

package/scripts/html2pdf.js

@@ -11,6 +11,7 @@ import sharp from 'sharp';
 import { ensureSlidesPassValidation } from './validate-slides.js';
 
 const require = createRequire(import.meta.url);
+const { launchBrowserViaCdp, loadPageUrl } = require('../src/ohos-browser-bridge.cjs');
 const {
   getResolutionChoices,
   getResolutionSize,
@@ -667,7 +668,7 @@ export async function renderSlideToPdf(page, slideFile, slidesDir, options = {})
   const slideMode = normalizeSlideMode(options.slideMode ?? DEFAULT_SLIDE_MODE, { optionName: '--slide-mode' });
   const captureResolution = mode === 'capture' ? normalizeResolutionPreset(options.resolution ?? '') : '';
 
-  await page.goto(slideUrl, { waitUntil: 'load' });
+  await loadPageUrl(page, slideUrl, { waitUntil: 'load' });
   await waitForSlideRenderReady(page, options);
 
   const slideFrame = await detectSlideFrame(page, slideMode);
@@ -773,7 +774,9 @@ async function main() {
     throw new Error(`No slide-*.html files found in: ${slidesDir}`);
   }
 
-  const browser = await chromium.launch({ headless: true });
+  const browser = process.platform === 'openharmony'
+    ? await launchBrowserViaCdp()
+    : await chromium.launch({ headless: true });
   const page = await browser.newPage(buildPageOptions(options.mode, options.resolution, options.slideMode));
   const diagnostics = createSlideDiagnostics();
   diagnostics.attach(page);

package/scripts/html2png.js

@@ -9,6 +9,7 @@ import { chromium } from 'playwright';
 import { ensureSlidesPassValidation } from './validate-slides.js';
 
 const require = createRequire(import.meta.url);
+const { launchBrowserViaCdp, loadPageUrl } = require('../src/ohos-browser-bridge.cjs');
 const {
   getResolutionChoices,
   getResolutionSize,
@@ -159,7 +160,7 @@ async function discoverSlideFiles(slidesDir) {
 
 async function renderSlideToPng(page, slidesDir, slideFile, outputPath) {
   const url = pathToFileURL(join(slidesDir, slideFile)).href;
-  await page.goto(url, { waitUntil: 'load' });
+  await loadPageUrl(page, url, { waitUntil: 'load' });
   await page.evaluate(async () => {
     if (document.fonts?.ready) {
       await document.fonts.ready;
@@ -217,7 +218,9 @@ async function main() {
     `Rendering ${slideFiles.length} slide(s) at ${outputSize.width}x${outputSize.height} (${options.slideMode})\n`,
   );
 
-  const browser = await chromium.launch({ headless: true });
+  const browser = process.platform === 'openharmony'
+    ? await launchBrowserViaCdp()
+    : await chromium.launch({ headless: true });
   try {
     const context = await browser.newContext({
       viewport: { width: framePx.width, height: framePx.height },

package/scripts/validate-slides.js

@@ -22,6 +22,7 @@ import {
 } from '../src/validation/core.js';
 
 const require = createRequire(import.meta.url);
+const { launchBrowserViaCdp } = require('../src/ohos-browser-bridge.cjs');
 const { DEFAULT_SLIDE_MODE } = require('../src/slide-mode.cjs');
 
 export {
@@ -170,7 +171,9 @@ export async function validateSlides(slidesDir, { mode = DEFAULT_SLIDE_MODE, sel
     throw new Error(`No slide-*.html files found in: ${slidesDir}`);
   }
 
-  const browser = await chromium.launch({ headless: true });
+  const browser = process.platform === 'openharmony'
+    ? await launchBrowserViaCdp()
+    : await chromium.launch({ headless: true });
   const context = await browser.newContext({ viewport: { width: 1920, height: 1080 } });
   const page = await context.newPage();
 

package/src/ohos-browser-bridge.cjs

@@ -11,7 +11,6 @@
  *   4. chromium.connectOverCDP(wsEndpoint)
  */
 
-const { execFileSync } = require('child_process');
 const http = require('http');
 
 // ─── Browser registry ────────────────────────────────────────────────────
@@ -72,6 +71,8 @@ const DISABLED_FEATURES = [
 const OHOS_AA_PATH = '/system/bin/cli_tool/executable/ohos-aa';
 const OHOS_BM_PATH = '/system/bin/cli_tool/executable/ohos-bm';
 
+const { execFileSync, execSync } = require('child_process');
+
 function execOhosAa(args, timeout = 30000) {
   return execFileSync(OHOS_AA_PATH, args, { timeout, encoding: 'utf-8', stdio: ['pipe', 'pipe', 'pipe'] }).trim();
 }
@@ -80,6 +81,66 @@ function execOhosBm(args, timeout = 30000) {
   return execFileSync(OHOS_BM_PATH, args, { timeout, encoding: 'utf-8', stdio: ['pipe', 'pipe', 'pipe'] }).trim();
 }
 
+// ─── Process management ─────────────────────────────────────────────────
+/**
+ * Kill a browser process by bundle name.
+ * ohos-aa force-stop can silently fail (returns status=failed without error).
+ * This function tries force-stop first, then falls back to killall.
+ */
+function killBrowserProcess(pkg) {
+  // 1. Try ohos-aa force-stop
+  try {
+    const result = execOhosAa(['force-stop', '--bundlename', pkg]);
+    let parsed;
+    try { parsed = JSON.parse(result); } catch { parsed = null; }
+    if (parsed && parsed.status === 'success') return; // force-stop worked
+  } catch {}
+
+  // 2. Check if process is still alive
+  let stillAlive = false;
+  try {
+    const out = execSync(`ps -ef 2>/dev/null | grep "${pkg}" | grep -v grep`, {
+      encoding: 'utf-8', timeout: 5000, stdio: ['pipe', 'pipe', 'ignore']
+    });
+    stillAlive = out.trim().length > 0;
+  } catch {
+    // grep returns non-zero when no match — process is dead
+    stillAlive = false;
+  }
+
+  if (!stillAlive) return; // process already gone
+
+  // 3. Fallback: killall
+  try {
+    execSync(`killall ${pkg} 2>/dev/null`, { encoding: 'utf-8', timeout: 5000, stdio: ['pipe', 'pipe', 'ignore'] });
+  } catch {}
+
+  // 3b. Fallback: kill -9 by PID
+  try {
+    const out = execSync(`ps -ef 2>/dev/null | grep "${pkg}" | grep -v grep | awk '{print $2}'`, {
+      encoding: 'utf-8', timeout: 5000, stdio: ['pipe', 'pipe', 'ignore']
+    });
+    const pids = out.trim().split('\n').filter(Boolean);
+    for (const pid of pids) {
+      try { execSync(`kill -9 ${pid} 2>/dev/null`, { encoding: 'utf-8', timeout: 3000, stdio: ['pipe', 'pipe', 'ignore'] }); } catch {}
+    }
+  } catch {}
+
+  // 4. Wait for process to die (poll up to 5s)
+  const deadline = Date.now() + 5000;
+  while (Date.now() < deadline) {
+    try {
+      const out = execSync(`ps -ef 2>/dev/null | grep "${pkg}" | grep -v grep`, {
+        encoding: 'utf-8', timeout: 3000, stdio: ['pipe', 'pipe', 'ignore']
+      });
+      if (out.trim().length === 0) return; // dead
+    } catch {
+      return; // grep no match = dead
+    }
+    execSync('sleep 0.5', { timeout: 2000 });
+  }
+}
+
 // ─── CDP ────────────────────────────────────────────────────────────────
 function buildCmdArgs(port, options = {}) {
   const args = [
@@ -151,8 +212,8 @@ async function launchBrowserViaCdp(options = {}) {
     }
 
     // 2. Stop stale browser process
-    try { execOhosAa(['force-stop', '--bundlename', pkg]); } catch {}
-    await new Promise(r => setTimeout(r, 2000));
+    killBrowserProcess(pkg);
+    await new Promise(r => setTimeout(r, 1000));
 
     // 3. Launch browser with CDP port
     const cmdArgs = buildCmdArgs(port, options);
@@ -174,7 +235,7 @@ async function launchBrowserViaCdp(options = {}) {
 
     // Real cleanup on process exit
     process.on('exit', () => {
-      try { execOhosAa(['force-stop', '--bundlename', pkg]); } catch {}
+      try { killBrowserProcess(pkg); } catch {}
     });
 
     return browser;