bun-app-window 0.6.2 → 0.8.0

package/src/shell/resolve.ts

@@ -14,15 +14,7 @@
  */
 
 import { createHash } from "node:crypto";
-import {
-  existsSync,
-  mkdirSync,
-  readdirSync,
-  renameSync,
-  rmSync,
-  statSync,
-  writeFileSync,
-} from "node:fs";
+import { existsSync, mkdirSync, readdirSync, renameSync, rmSync, statSync, writeFileSync } from "node:fs";
 import { homedir } from "node:os";
 import { basename, dirname, join, resolve } from "node:path";
 
@@ -48,176 +40,165 @@ const INSTALLED = /[\\/]node_modules[\\/]/i.test(PKG_ROOT);
 
 /** 是否运行在 `bun build --compile` 产物内 */
 export function isPackedRuntime(): boolean {
-  return (
-    /^[A-Za-z]:[\\/]~BUN[\\/]/i.test(import.meta.dir) ||
-    import.meta.dir.startsWith("/$bunfs/")
-  );
+    return /^[A-Za-z]:[\\/]~BUN[\\/]/i.test(import.meta.dir) || import.meta.dir.startsWith("/$bunfs/");
 }
 
 function sha256Hex(buf: Uint8Array): string {
-  return createHash("sha256").update(buf).digest("hex");
+    return createHash("sha256").update(buf).digest("hex");
 }
 
 function runtimeDir(appName: string): string {
-  const base =
-    process.env.LOCALAPPDATA && process.env.LOCALAPPDATA.length > 0
-      ? process.env.LOCALAPPDATA
-      : join(homedir(), "AppData", "Local");
-  return join(base, appName, "runtime");
+    const base =
+        process.env.LOCALAPPDATA && process.env.LOCALAPPDATA.length > 0
+            ? process.env.LOCALAPPDATA
+            : join(homedir(), "AppData", "Local");
+    return join(base, appName, "runtime");
 }
 
 function fromPath(path: string, source: NativeLibInfo["source"]): NativeLibInfo {
-  return {
-    path,
-    source,
-    version: PKG_VERSION,
-    sha256: "",
-    bytes: statSync(path).size,
-    reused: false,
-    pruned: [],
-  };
+    return {
+        path,
+        source,
+        version: PKG_VERSION,
+        sha256: "",
+        bytes: statSync(path).size,
+        reused: false,
+        pruned: [],
+    };
 }
 
 /** 写入目标目录；同名同大小视为可复用，写入走临时文件 + rename 保证原子性 */
-function materialize(
-  dir: string,
-  bytes: Uint8Array,
-  sha256: string,
-): { path: string; reused: boolean } {
-  mkdirSync(dir, { recursive: true });
+function materialize(dir: string, bytes: Uint8Array, sha256: string): { path: string; reused: boolean } {
+    mkdirSync(dir, { recursive: true });
+
+    const finalName = `libshell-${sha256.slice(0, 16)}.dll`;
+    const finalPath = join(dir, finalName);
+
+    if (existsSync(finalPath)) {
+        try {
+            if (statSync(finalPath).size === bytes.length) {
+                return { path: finalPath, reused: true };
+            }
+        } catch {
+            // 读不到就重写
+        }
+    }
 
-  const finalName = `libshell-${sha256.slice(0, 16)}.dll`;
-  const finalPath = join(dir, finalName);
+    const tmpPath = join(dir, `.tmp-${process.pid}-${Date.now().toString(36)}.dll`);
+    writeFileSync(tmpPath, bytes);
 
-  if (existsSync(finalPath)) {
     try {
-      if (statSync(finalPath).size === bytes.length) {
-        return { path: finalPath, reused: true };
-      }
-    } catch {
-      // 读不到就重写
+        renameSync(tmpPath, finalPath);
+    } catch (err) {
+        // Windows 上目标已存在时 rename 会失败：另一个实例可能刚好抢先写入
+        rmSync(tmpPath, { force: true });
+        if (!existsSync(finalPath)) throw err;
     }
-  }
-
-  const tmpPath = join(dir, `.tmp-${process.pid}-${Date.now().toString(36)}.dll`);
-  writeFileSync(tmpPath, bytes);
-
-  try {
-    renameSync(tmpPath, finalPath);
-  } catch (err) {
-    // Windows 上目标已存在时 rename 会失败：另一个实例可能刚好抢先写入
-    rmSync(tmpPath, { force: true });
-    if (!existsSync(finalPath)) throw err;
-  }
 
-  return { path: finalPath, reused: false };
+    return { path: finalPath, reused: false };
 }
 
 /** 删掉与当前哈希不符的旧副本；正被其它实例占用的删除失败则忽略 */
 function pruneOldVersions(dir: string, keepName: string): string[] {
-  const pruned: string[] = [];
-  let entries: string[];
-  try {
-    entries = readdirSync(dir);
-  } catch {
-    return pruned;
-  }
-
-  for (const name of entries) {
-    if (!DLL_PATTERN.test(name)) continue;
-    if (name === keepName) continue;
+    const pruned: string[] = [];
+    let entries: string[];
     try {
-      rmSync(join(dir, name), { force: true });
-      pruned.push(name);
+        entries = readdirSync(dir);
     } catch {
-      // 正被其它实例加载，跳过
+        return pruned;
+    }
+
+    for (const name of entries) {
+        if (!DLL_PATTERN.test(name)) continue;
+        if (name === keepName) continue;
+        try {
+            rmSync(join(dir, name), { force: true });
+            pruned.push(name);
+        } catch {
+            // 正被其它实例加载，跳过
+        }
     }
-  }
-  return pruned;
+    return pruned;
 }
 
 /** 从 Bun.embeddedFiles 找内嵌 DLL；没有则返回 null */
 async function readBunEmbedded(): Promise<Uint8Array | null> {
-  const files = (Bun as unknown as { embeddedFiles?: ReadonlyArray<Blob & { name: string }> })
-    .embeddedFiles;
-  if (!files || files.length === 0) return null;
-
-  const hit = files.find((f) => DLL_PATTERN.test(f.name));
-  if (!hit) return null;
-
-  const buf = new Uint8Array(await hit.arrayBuffer());
-  if (buf.length < 2 || buf[0] !== 0x4d || buf[1] !== 0x5a) {
-    throw new Error(`embedded native library is not a PE file (${hit.name})`);
-  }
-  return buf;
+    const files = (Bun as unknown as { embeddedFiles?: ReadonlyArray<Blob & { name: string }> }).embeddedFiles;
+    if (!files || files.length === 0) return null;
+
+    const hit = files.find((f) => DLL_PATTERN.test(f.name));
+    if (!hit) return null;
+
+    const buf = new Uint8Array(await hit.arrayBuffer());
+    if (buf.length < 2 || buf[0] !== 0x4d || buf[1] !== 0x5a) {
+        throw new Error(`embedded native library is not a PE file (${hit.name})`);
+    }
+    return buf;
 }
 
 export type ResolveOptions = {
-  nativeLibPath?: string;
-  appName?: string;
-  embedded?: () => Promise<Uint8Array | null>;
+    nativeLibPath?: string;
+    appName?: string;
+    embedded?: () => Promise<Uint8Array | null>;
 };
 
 export async function resolveNativeLib(opts: ResolveOptions = {}): Promise<NativeLibInfo> {
-  const appName = opts.appName ?? "BunAppWindow";
-
-  // 1. 显式指定
-  if (opts.nativeLibPath) {
-    if (!existsSync(opts.nativeLibPath)) {
-      throw new Error(`nativeLibPath does not exist: ${opts.nativeLibPath}`);
+    const appName = opts.appName ?? "BunAppWindow";
+
+    // 1. 显式指定
+    if (opts.nativeLibPath) {
+        if (!existsSync(opts.nativeLibPath)) {
+            throw new Error(`nativeLibPath does not exist: ${opts.nativeLibPath}`);
+        }
+        return fromPath(opts.nativeLibPath, "explicit");
     }
-    return fromPath(opts.nativeLibPath, "explicit");
-  }
-
-  if (isPackedRuntime()) {
-    // 2. 内嵌字节 → 释放到用户目录
-    const bytes = opts.embedded ? await opts.embedded() : await readBunEmbedded();
-    if (bytes) {
-      const sha256 = sha256Hex(bytes);
-      try {
-        const { path, reused } = materialize(runtimeDir(appName), bytes, sha256);
-        return {
-          path,
-          source: "embedded",
-          version: PKG_VERSION,
-          sha256,
-          bytes: bytes.length,
-          reused,
-          pruned: pruneOldVersions(dirname(path), basename(path)),
-        };
-      } catch {
-        // %LOCALAPPDATA% 不可写（受限环境）：继续尝试同级文件
-      }
+
+    if (isPackedRuntime()) {
+        // 2. 内嵌字节 → 释放到用户目录
+        const bytes = opts.embedded ? await opts.embedded() : await readBunEmbedded();
+        if (bytes) {
+            const sha256 = sha256Hex(bytes);
+            try {
+                const { path, reused } = materialize(runtimeDir(appName), bytes, sha256);
+                return {
+                    path,
+                    source: "embedded",
+                    version: PKG_VERSION,
+                    sha256,
+                    bytes: bytes.length,
+                    reused,
+                    pruned: pruneOldVersions(dirname(path), basename(path)),
+                };
+            } catch {
+                // %LOCALAPPDATA% 不可写（受限环境）：继续尝试同级文件
+            }
+        }
+
+        // 3. 可执行文件同级
+        for (const candidate of [
+            join(dirname(process.execPath), "libshell.dll"),
+            join(dirname(process.execPath), "dist", "libshell.dll"),
+        ]) {
+            if (existsSync(candidate)) return fromPath(candidate, "package");
+        }
+
+        throw new Error(
+            "cannot locate libshell.dll in a compiled executable. " +
+                "Either place libshell.dll next to the executable, or import " +
+                "`bun-app-window/embedded` so it gets bundled. " +
+                `Searched: ${dirname(process.execPath)}`,
+        );
     }
 
-    // 3. 可执行文件同级
-    for (const candidate of [
-      join(dirname(process.execPath), "libshell.dll"),
-      join(dirname(process.execPath), "dist", "libshell.dll"),
-    ]) {
-      if (existsSync(candidate)) return fromPath(candidate, "package");
+    // 4. 开发态 / 包安装态：包根下的 .build/ 再 dist/
+    const source: NativeLibInfo["source"] = INSTALLED ? "package" : "dev";
+    for (const candidate of [join(PKG_ROOT, ".build", "libshell.dll"), join(PKG_ROOT, "dist", "libshell.dll")]) {
+        if (existsSync(candidate)) return fromPath(candidate, source);
     }
 
     throw new Error(
-      "cannot locate libshell.dll in a compiled executable. " +
-        "Either place libshell.dll next to the executable, or import " +
-        "`bun-app-window/embedded` so it gets bundled. " +
-        `Searched: ${dirname(process.execPath)}`,
+        "libshell.dll not found. Build the native layer first: " +
+            "`bun run native/build.ts`. " +
+            `Searched under ${PKG_ROOT}`,
     );
-  }
-
-  // 4. 开发态 / 包安装态：包根下的 .build/ 再 dist/
-  const source: NativeLibInfo["source"] = INSTALLED ? "package" : "dev";
-  for (const candidate of [
-    join(PKG_ROOT, ".build", "libshell.dll"),
-    join(PKG_ROOT, "dist", "libshell.dll"),
-  ]) {
-    if (existsSync(candidate)) return fromPath(candidate, source);
-  }
-
-  throw new Error(
-    "libshell.dll not found. Build the native layer first: " +
-      "`bun run native/build.ts`. " +
-      `Searched under ${PKG_ROOT}`,
-  );
 }

package/src/shell/state.ts

@@ -84,14 +84,7 @@ export function parseBounds(text: string): WindowPlacement | null {
     if (nums.some((n) => !Number.isFinite(n))) {
         return null;
     }
-    const [x, y, width, height, maximized, dpi] = nums as [
-        number,
-        number,
-        number,
-        number,
-        number,
-        number,
-    ];
+    const [x, y, width, height, maximized, dpi] = nums as [number, number, number, number, number, number];
     // 尺寸为 0 或负数说明窗口还没建好（原生在无窗口时返回 0 长度文本，这里再兜一层）
     if (width <= 0 || height <= 0 || dpi <= 0) {
         return null;
@@ -217,15 +210,9 @@ export type PlacementStoreOptions = {
  * 首次 `attach` 会立刻抓一次快照并写盘——程序若在用户操作前崩溃，也还有
  * 初始位置可恢复。
  */
-export function attachPlacementStore(
-    shell: Shell,
-    file: string,
-    opts: PlacementStoreOptions = {},
-): PlacementStore {
+export function attachPlacementStore(shell: Shell, file: string, opts: PlacementStoreOptions = {}): PlacementStore {
     const debounceMs = Math.max(0, opts.debounceMs ?? DEFAULTS.debounceMs);
-    const pump =
-        opts.events ??
-        attachEventPump(shell, { intervalMs: Math.max(1, opts.pumpMs ?? DEFAULTS.pumpMs) });
+    const pump = opts.events ?? attachEventPump(shell, { intervalMs: Math.max(1, opts.pumpMs ?? DEFAULTS.pumpMs) });
     const ownsPump = opts.events === undefined;
 
     let last: WindowPlacement | null = null;
@@ -277,9 +264,11 @@ export function attachPlacementStore(
             return;
         }
         // 串行化写入：并发 rename 同一目标会互相踩
-        pending = pending.then(() => savePlacement(file, now)).catch(() => {
-            // 写盘失败不该打断应用；下一次变化会重试
-        });
+        pending = pending
+            .then(() => savePlacement(file, now))
+            .catch(() => {
+                // 写盘失败不该打断应用；下一次变化会重试
+            });
     };
 
     const scheduleWrite = (): void => {

package/src/shell/types.ts

@@ -171,14 +171,14 @@ export const BROWSER_UI_ALL =
  * `Shell.beginResize()` 在 TS 层查表转换，本常量成为真正的入参契约。
  */
 export const RESIZE_EDGE = {
-  LEFT: 10,
-  RIGHT: 11,
-  TOP: 12,
-  TOPLEFT: 13,
-  TOPRIGHT: 14,
-  BOTTOM: 15,
-  BOTTOMLEFT: 16,
-  BOTTOMRIGHT: 17,
+    LEFT: 10,
+    RIGHT: 11,
+    TOP: 12,
+    TOPLEFT: 13,
+    TOPRIGHT: 14,
+    BOTTOM: 15,
+    BOTTOMLEFT: 16,
+    BOTTOMRIGHT: 17,
 } as const;
 
 export type ResizeEdge = (typeof RESIZE_EDGE)[keyof typeof RESIZE_EDGE];
@@ -201,14 +201,14 @@ export type ResizeEdge = (typeof RESIZE_EDGE)[keyof typeof RESIZE_EDGE];
  * 时需要它，而那种时候手写映射必然抄错。
  */
 export const RESIZE_INDEX: Readonly<Record<number, number>> = {
-  [RESIZE_EDGE.LEFT]: 0,
-  [RESIZE_EDGE.RIGHT]: 1,
-  [RESIZE_EDGE.TOP]: 2,
-  [RESIZE_EDGE.BOTTOM]: 3,
-  [RESIZE_EDGE.TOPLEFT]: 4,
-  [RESIZE_EDGE.TOPRIGHT]: 5,
-  [RESIZE_EDGE.BOTTOMLEFT]: 6,
-  [RESIZE_EDGE.BOTTOMRIGHT]: 7,
+    [RESIZE_EDGE.LEFT]: 0,
+    [RESIZE_EDGE.RIGHT]: 1,
+    [RESIZE_EDGE.TOP]: 2,
+    [RESIZE_EDGE.BOTTOM]: 3,
+    [RESIZE_EDGE.TOPLEFT]: 4,
+    [RESIZE_EDGE.TOPRIGHT]: 5,
+    [RESIZE_EDGE.BOTTOMLEFT]: 6,
+    [RESIZE_EDGE.BOTTOMRIGHT]: 7,
 };
 
 /**
@@ -218,7 +218,7 @@ export const RESIZE_INDEX: Readonly<Record<number, number>> = {
  * `rc=-1`，与「窗口已销毁」是同一个外部表现，调用方按 `rc` 处理即可。
  */
 export function resizeIndex(edge: number): number {
-  return RESIZE_INDEX[edge] ?? -1;
+    return RESIZE_INDEX[edge] ?? -1;
 }
 
 /**
@@ -230,9 +230,7 @@ export function resizeIndex(edge: number): number {
  *
  * 过去消费者只能自己抄一份（抄了 14 个数，没有任何门禁能发现它与 C++ 漂移）。
  */
-export const ZOOM_LADDER = [
-  0.25, 0.33, 0.5, 0.67, 0.8, 0.9, 1.0, 1.1, 1.25, 1.5, 1.75, 2.0, 2.5, 3.0,
-] as const;
+export const ZOOM_LADDER = [0.25, 0.33, 0.5, 0.67, 0.8, 0.9, 1.0, 1.1, 1.25, 1.5, 1.75, 2.0, 2.5, 3.0] as const;
 
 /** 缩放倍率的上下限（`ZOOM_LADDER` 的首尾两项） */
 export const ZOOM_MIN = ZOOM_LADDER[0];
@@ -275,74 +273,74 @@ export const STATE_MINIMIZED = 2;
 export const STATE_FOCUSED = 4;
 
 export type WindowState = {
-  raw: number;
-  maximized: boolean;
-  minimized: boolean;
-  focused: boolean;
-  /** 系统当前是否深色（原生侧读 AppsUseLightTheme，并随 WM_SETTINGCHANGE 刷新） */
-  dark: boolean;
+    raw: number;
+    maximized: boolean;
+    minimized: boolean;
+    focused: boolean;
+    /** 系统当前是否深色（原生侧读 AppsUseLightTheme，并随 WM_SETTINGCHANGE 刷新） */
+    dark: boolean;
 };
 
 /** 原生库的解析结果 */
 export type NativeLibInfo = {
-  path: string;
-  /**
-   * explicit  — 调用方显式指定
-   * dev       — 本仓开发态（build/ 或 dist/）
-   * package   — 包内 dist/ 或可执行文件同级
-   * embedded  — 从编译产物内嵌字节释放
-   * fallback-tmp — 受限环境下退回 Bun 默认释放
-   */
-  source: "explicit" | "dev" | "package" | "embedded" | "fallback-tmp";
-  /**
-   * `bun-app-window` 自身的版本号（取自包内 `package.json`，不是 DLL 的 PE 版本）。
-   *
-   * 加它的理由：消费者要在界面上显示「连上的确实是这个版本」时，过去只能
-   * `import libPkg from "bun-app-window/package.json"` 再拼字符串——那是一条
-   * 额外的子路径依赖，且 `package.json` 在 `files` 白名单里所以要跟着发布面走。
-   * 现在顺手带出来，页面侧直接读 `shell.libInfo.version`。
-   */
-  version: string;
-  sha256: string;
-  bytes: number;
-  reused: boolean;
-  pruned: string[];
+    path: string;
+    /**
+     * explicit  — 调用方显式指定
+     * dev       — 本仓开发态（build/ 或 dist/）
+     * package   — 包内 dist/ 或可执行文件同级
+     * embedded  — 从编译产物内嵌字节释放
+     * fallback-tmp — 受限环境下退回 Bun 默认释放
+     */
+    source: "explicit" | "dev" | "package" | "embedded" | "fallback-tmp";
+    /**
+     * `bun-app-window` 自身的版本号（取自包内 `package.json`，不是 DLL 的 PE 版本）。
+     *
+     * 加它的理由：消费者要在界面上显示「连上的确实是这个版本」时，过去只能
+     * `import libPkg from "bun-app-window/package.json"` 再拼字符串——那是一条
+     * 额外的子路径依赖，且 `package.json` 在 `files` 白名单里所以要跟着发布面走。
+     * 现在顺手带出来，页面侧直接读 `shell.libInfo.version`。
+     */
+    version: string;
+    sha256: string;
+    bytes: number;
+    reused: boolean;
+    pruned: string[];
 };
 
 export type ShellOptions = {
-  /** 要加载的 URL（通常是本地回环地址） */
-  url: string;
-  title?: string;
-  width?: number;
-  height?: number;
-  /** FLAG_* 位组合 */
-  flags?: number;
-  /** 启动后立即设置的最小尺寸（逻辑像素） */
-  minWidth?: number;
-  minHeight?: number;
-  /**
-   * 原生库路径。给定时跳过所有自动解析。
-   * 用于测试或多副本部署。
-   */
-  nativeLibPath?: string;
-  /**
-   * 运行时数据目录名（`%LOCALAPPDATA%\<appName>\runtime`）。
-   * 同一机器上多个应用共用一个包时应各自指定，避免互相清理 DLL 副本。
-   */
-  appName?: string;
-  /**
-   * 关闭哪些浏览器行为，取 `BROWSER_UI_*` 的按位或。缺省 0（保持 WebView2 默认）。
-   *
-   * 桌面应用一般传 `BROWSER_UI_ALL`：关掉右键 Edge 菜单、`Ctrl+P`/`Ctrl+F`/`Ctrl+S`、
-   * 左下角状态栏、触控板滑动导航与表单自动填充。关掉默认右键菜单后若要右键有反应，
-   * 用 `showContextMenu()` 弹原生菜单。
-   */
-  browserUi?: number;
-  /**
-   * 编译产物内嵌字节的提供者。
-   * 使用 `bun build --compile` 时传入 `embeddedDll`（见 `bun-app-window/embedded`）。
-   */
-  embedded?: () => Promise<Uint8Array | null>;
+    /** 要加载的 URL（通常是本地回环地址） */
+    url: string;
+    title?: string;
+    width?: number;
+    height?: number;
+    /** FLAG_* 位组合 */
+    flags?: number;
+    /** 启动后立即设置的最小尺寸（逻辑像素） */
+    minWidth?: number;
+    minHeight?: number;
+    /**
+     * 原生库路径。给定时跳过所有自动解析。
+     * 用于测试或多副本部署。
+     */
+    nativeLibPath?: string;
+    /**
+     * 运行时数据目录名（`%LOCALAPPDATA%\<appName>\runtime`）。
+     * 同一机器上多个应用共用一个包时应各自指定，避免互相清理 DLL 副本。
+     */
+    appName?: string;
+    /**
+     * 关闭哪些浏览器行为，取 `BROWSER_UI_*` 的按位或。缺省 0（保持 WebView2 默认）。
+     *
+     * 桌面应用一般传 `BROWSER_UI_ALL`：关掉右键 Edge 菜单、`Ctrl+P`/`Ctrl+F`/`Ctrl+S`、
+     * 左下角状态栏、触控板滑动导航与表单自动填充。关掉默认右键菜单后若要右键有反应，
+     * 用 `showContextMenu()` 弹原生菜单。
+     */
+    browserUi?: number;
+    /**
+     * 编译产物内嵌字节的提供者。
+     * 使用 `bun build --compile` 时传入 `embeddedDll`（见 `bun-app-window/embedded`）。
+     */
+    embedded?: () => Promise<Uint8Array | null>;
 };
 
 export type StartResult = { rc: number; error: string };

package/src/ui/titlebar.ts

@@ -479,8 +479,7 @@ export function mountTitleBar(opts: TitleBarOptions): TitleBarHandle {
     if (!nativeCaptions) {
         for (const action of ["minimize", "maximize", "close"] as const) {
             const btn = doc.createElement("button");
-            btn.className =
-                action === "close" ? "ws-titlebar__btn ws-titlebar__btn--close" : "ws-titlebar__btn";
+            btn.className = action === "close" ? "ws-titlebar__btn ws-titlebar__btn--close" : "ws-titlebar__btn";
             btn.setAttribute("type", "button");
             btn.setAttribute("data-act", action);
             btn.textContent = glyphFor(icons, action, opts.maximized === true);