beauticode-dsh 1.0.12 → 1.0.13

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "beauticode-dsh",
-  "version": "1.0.12",
+  "version": "1.0.13",
   "description": "Cordis plugin: image/video backgrounds for DeepSeek Harness web.",
   "type": "module",
   "main": "./index.mjs",

package/ui-host.mjs

@@ -15,6 +15,7 @@ const MAX_IMAGE_BYTES = 18 * 1024 * 1024;
 const MAX_VIDEO_BYTES = 800 * 1024 * 1024;
 const SELECTION_TTL_MS = 5 * 60 * 1000;
 const MAX_PENDING_SELECTIONS = 16;
+const PICKER_TIMEOUT_MS = 5 * 60 * 1000;
 const NATIVE_PICKER_UNAVAILABLE = "native_picker_unavailable";
 const NATIVE_PICKER_REQUIRED = "native_picker_required";
 const PICKER_REQUEST_ABORTED = "picker_request_aborted";
@@ -107,103 +108,150 @@ function suggestedThemeName(fileName, fallback) {
   return stem || fallback;
 }
 
-function pickWindowsMedia(kind, { signal } = {}) {
-  if (process.platform !== "win32") {
-    throw pickerUnavailable("当前系统不支持 Windows 原生文件选择器。");
-  }
+export function buildWindowsPickerScript(
+  kind,
+  { parentPid = process.pid, timeoutMs = PICKER_TIMEOUT_MS } = {},
+) {
   const filter =
     kind === "video"
       ? "MP4 Video (*.mp4)|*.mp4"
       : "Image Files (*.jpg;*.jpeg;*.png;*.webp;*.avif)|*.jpg;*.jpeg;*.png;*.webp;*.avif";
-  const script = [
+  const safeParentPid = Number.isSafeInteger(parentPid) && parentPid > 0
+    ? parentPid
+    : process.pid;
+  const safeTimeoutMs = Number.isFinite(timeoutMs) && timeoutMs > 0
+    ? Math.ceil(timeoutMs)
+    : PICKER_TIMEOUT_MS;
+  return [
     "$ErrorActionPreference = 'Stop'",
     "$OutputEncoding = New-Object System.Text.UTF8Encoding($false)",
     "[Console]::OutputEncoding = $OutputEncoding",
     "Add-Type -AssemblyName System.Windows.Forms",
+    "Add-Type -AssemblyName System.Drawing",
     "[System.Windows.Forms.Application]::EnableVisualStyles()",
+    "$owner = New-Object System.Windows.Forms.Form",
+    "$owner.Text = 'beautiCode 文件选择器'",
+    "$owner.FormBorderStyle = [System.Windows.Forms.FormBorderStyle]::FixedToolWindow",
+    "$owner.ShowInTaskbar = $false",
+    "$owner.StartPosition = [System.Windows.Forms.FormStartPosition]::CenterScreen",
+    "$owner.Size = [System.Drawing.Size]::new(1, 1)",
+    "$owner.Opacity = 0.01",
+    "$owner.TopMost = $true",
     "$dialog = New-Object System.Windows.Forms.OpenFileDialog",
     `$dialog.Filter = '${filter}'`,
     "$dialog.Multiselect = $false",
     "$dialog.CheckFileExists = $true",
+    "$dialog.RestoreDirectory = $true",
     "$dialog.Title = '选择 beautiCode 背景文件'",
-    "$result = $dialog.ShowDialog()",
-    "if ($result -eq [System.Windows.Forms.DialogResult]::OK) { [Console]::WriteLine($dialog.FileName) }",
-    "$dialog.Dispose()",
+    `$dshPid = ${safeParentPid}`,
+    `$deadlineUtc = [DateTime]::UtcNow.AddMilliseconds(${safeTimeoutMs})`,
+    "$watchdog = New-Object System.Windows.Forms.Timer",
+    "$watchdog.Interval = 500",
+    "$watchdog.Add_Tick({ if ([DateTime]::UtcNow -ge $deadlineUtc -or -not (Get-Process -Id $dshPid -ErrorAction SilentlyContinue)) { $watchdog.Stop(); [Environment]::Exit(0) } })",
+    "try { [void]$owner.Show(); [void]$owner.Hide(); [void]$owner.Show(); [void]$owner.Activate(); [void]$owner.BringToFront(); [System.Windows.Forms.Application]::DoEvents(); if (-not $owner.IsHandleCreated) { throw 'Picker owner window was not created.' }; $watchdog.Start(); $result = $dialog.ShowDialog($owner); if ($result -eq [System.Windows.Forms.DialogResult]::OK) { [Console]::WriteLine($dialog.FileName) } } finally { $watchdog.Stop(); $watchdog.Dispose(); $dialog.Dispose(); $owner.Close(); $owner.Dispose() }",
   ].join("; ");
-  return new Promise((resolve, reject) => {
-    const child = spawn(
-      "powershell.exe",
-      [
-        "-NoLogo",
-        "-NoProfile",
-        "-ExecutionPolicy",
-        "Bypass",
-        "-STA",
-        "-Command",
-        script,
-      ],
-      {
-        // Hide PowerShell's console while leaving the WinForms dialog visible.
-        windowsHide: true,
-        stdio: ["ignore", "pipe", "pipe"],
-      },
-    );
-    let stdout = "";
-    let stderr = "";
-    let aborted = false;
-    const onAbort = () => {
-      aborted = true;
-      clearTimeout(timer);
-      child.kill();
-      const error = new Error("文件选择请求已取消。");
-      error.code = PICKER_REQUEST_ABORTED;
-      reject(error);
-    };
-    const timer = setTimeout(() => {
-      signal?.removeEventListener("abort", onAbort);
-      child.kill();
-      reject(new Error("文件选择器超时。"));
-    }, 5 * 60 * 1000);
-    if (signal?.aborted) onAbort();
-    else signal?.addEventListener("abort", onAbort, { once: true });
-    child.stdout.setEncoding("utf8");
-    child.stderr.setEncoding("utf8");
-    child.stdout.on("data", (chunk) => { stdout += chunk; });
-    child.stderr.on("data", (chunk) => { stderr += chunk; });
-    child.once("error", (error) => {
-      clearTimeout(timer);
-      signal?.removeEventListener("abort", onAbort);
-      if (aborted) return;
-      reject(
-        error?.code === "ENOENT"
-          ? pickerUnavailable("找不到 Windows PowerShell，无法打开原生文件选择器。")
-          : error,
+}
+
+export function createWindowsMediaPicker({
+  platform = process.platform,
+  spawnProcess = spawn,
+  parentProcess = process,
+  parentPid = process.pid,
+  timeoutMs = PICKER_TIMEOUT_MS,
+} = {}) {
+  return function pickWindowsMedia(kind, { signal } = {}) {
+    if (platform !== "win32") {
+      throw pickerUnavailable("当前系统不支持 Windows 原生文件选择器。");
+    }
+    const script = buildWindowsPickerScript(kind, { parentPid, timeoutMs });
+    const encodedScript = Buffer.from(script, "utf16le").toString("base64");
+    return new Promise((resolve, reject) => {
+      const child = spawnProcess(
+        "powershell.exe",
+        [
+          "-NoLogo",
+          "-NoProfile",
+          "-ExecutionPolicy",
+          "Bypass",
+          "-STA",
+          "-EncodedCommand",
+          encodedScript,
+        ],
+        {
+          // Hide PowerShell's console while leaving the owned WinForms dialog visible.
+          windowsHide: true,
+          stdio: ["ignore", "pipe", "pipe"],
+        },
       );
+      let stdout = "";
+      let stderr = "";
+      let settled = false;
+      const cleanup = () => {
+        clearTimeout(timer);
+        signal?.removeEventListener("abort", onAbort);
+        parentProcess.removeListener("exit", onParentExit);
+      };
+      const settle = (callback, value, { terminate = false } = {}) => {
+        if (settled) return;
+        settled = true;
+        cleanup();
+        if (terminate && !child.killed) child.kill("SIGKILL");
+        callback(value);
+      };
+      const onAbort = () => {
+        const error = new Error("文件选择请求已取消。");
+        error.code = PICKER_REQUEST_ABORTED;
+        settle(reject, error, { terminate: true });
+      };
+      const timer = setTimeout(() => {
+        settle(reject, new Error("文件选择器超时。"), { terminate: true });
+      }, timeoutMs);
+      const onParentExit = () => {
+        if (!child.killed) child.kill("SIGKILL");
+      };
+      parentProcess.once("exit", onParentExit);
+      if (signal?.aborted) onAbort();
+      else signal?.addEventListener("abort", onAbort, { once: true });
+      child.stdout.setEncoding("utf8");
+      child.stderr.setEncoding("utf8");
+      child.stdout.on("data", (chunk) => { stdout += chunk; });
+      child.stderr.on("data", (chunk) => { stderr += chunk; });
+      child.once("error", (error) => {
+        settle(
+          reject,
+          error?.code === "ENOENT"
+            ? pickerUnavailable("找不到 Windows PowerShell，无法打开原生文件选择器。")
+            : error,
+        );
+      });
+      child.once("close", (code) => {
+        if (settled) return;
+        if (code !== 0) {
+          const message = stderr.trim() || `文件选择器退出异常（${code}）。`;
+          settle(
+            reject,
+            isPickerDependencyError(message) ? pickerUnavailable(message) : new Error(message),
+          );
+          return;
+        }
+        const selected = stdout.trim();
+        if (!selected) {
+          settle(resolve, { ok: true, cancelled: true });
+          return;
+        }
+        const name = path.basename(selected.replaceAll("\\", "/"));
+        const parsed = parseImportFilename(name);
+        if (!parsed.ok || parsed.kind !== kind) {
+          settle(reject, new Error(parsed.ok ? "选择的文件类型不匹配。" : parsed.error));
+          return;
+        }
+        settle(resolve, { ok: true, kind, path: path.resolve(selected), name });
+      });
     });
-    child.once("close", (code) => {
-      clearTimeout(timer);
-      signal?.removeEventListener("abort", onAbort);
-      if (aborted) return;
-      if (code !== 0) {
-        const message = stderr.trim() || `文件选择器退出异常（${code}）。`;
-        reject(isPickerDependencyError(message) ? pickerUnavailable(message) : new Error(message));
-        return;
-      }
-      const selected = stdout.trim();
-      if (!selected) {
-        resolve({ ok: true, cancelled: true });
-        return;
-      }
-      const name = path.basename(selected.replaceAll("\\", "/"));
-      const parsed = parseImportFilename(name);
-      if (!parsed.ok || parsed.kind !== kind) {
-        reject(new Error(parsed.ok ? "选择的文件类型不匹配。" : parsed.error));
-        return;
-      }
-      resolve({ ok: true, kind, path: path.resolve(selected), name });
-    });
-  });
+  };
 }
+
+const pickWindowsMedia = createWindowsMediaPicker();
 
 function limitBytes(maxBytes) {
   let size = 0;
@@ -277,6 +325,9 @@ export function createBeauticodeUi({
   const pendingSelections = new Map();
   let restoreStarted = false;
   let pickerBusy = false;
+  let activePickerAbort = null;
+  let activePickerResponse = null;
+  let disposed = false;
 
   function pruneSelections() {
     const timestamp = now();
@@ -336,6 +387,12 @@ export function createBeauticodeUi({
 
   return {
     dispose() {
+      disposed = true;
+      activePickerAbort?.abort();
+      activePickerResponse?.destroy();
+      activePickerAbort = null;
+      activePickerResponse = null;
+      pickerBusy = false;
       pendingSelections.clear();
       return stopInProcessSession(dataRoot);
     },
@@ -485,9 +542,15 @@ export function createBeauticodeUi({
         sendJson(res, 409, { ok: false, error: "文件选择器已经打开。" });
         return;
       }
+      if (disposed) {
+        sendJson(res, 503, { ok: false, error: "beautiCode UI 已停止。" });
+        return;
+      }
       pickerBusy = true;
       const pickerStartedAt = performance.now();
       const pickerAbort = new AbortController();
+      activePickerAbort = pickerAbort;
+      activePickerResponse = res;
       const onResponseClose = () => {
         if (!res.writableEnded) pickerAbort.abort();
       };
@@ -517,6 +580,8 @@ export function createBeauticodeUi({
         });
       } finally {
         res.off("close", onResponseClose);
+        if (activePickerAbort === pickerAbort) activePickerAbort = null;
+        if (activePickerResponse === res) activePickerResponse = null;
         pickerBusy = false;
       }
     },