@forgeax/interface 0.6.0 → 0.7.0

package/dist/package/node/lib/native-menu-bridge.js

@@ -19,13 +19,14 @@
  */
 import { isTauri } from './platform/runtime.js';
 import { warmRecentGames } from './recent-games.js';
-import { onMenuChange, serializeMenusForNative, snapshotAllMenus, } from './menu-registry.js';
+import { subscribeLocale } from '../i18n/index.js';
+import { projectApplicationMenus, serializeApplicationMenusForNative } from './application-menu-projection.js';
 // ─── Menu id → command lookup (原生点击回吐用) ─────────────────────────────
 /** 展平所有菜单项 (含 children),建 id → def 的索引,供 menu:invoke 回吐时 O(1)
  *  查表。不缓存:每次点击都 fresh 一遍,让 when/enabled 变化立刻生效;菜单量级
  *  几十项,遍历开销可忽略。 */
-function findMenuItemById(id) {
-    const all = snapshotAllMenus();
+function findMenuItemById(id, menus) {
+    const all = projectApplicationMenus(menus.snapshot());
     for (const menuId of Object.keys(all)) {
         const found = findInList(all[menuId], id);
         if (found)
@@ -35,6 +36,8 @@ function findMenuItemById(id) {
 }
 function findInList(list, id) {
     for (const item of list) {
+        if ((item.when && !item.when()) || (item.enabled && !item.enabled()))
+            continue;
         if (item.id === id)
             return item;
         // Recurse into static children AND dynamic ones — a native click on a
@@ -67,85 +70,122 @@ export function fxTrace(line) {
     console.debug('[fx-trace]', line);
     traceSink?.(line);
 }
-/** 模块内简称。 */
-const trace = fxTrace;
-// ─── Push (registry → native) ─────────────────────────────────────────────
-/** 把当前注册表快照推给 Rust。失败时 warn 但不抛 —— 菜单更新失败不该让 boot
- *  炸掉;下次 onMenuChange 会重试。 */
-async function pushMenusToNative(invoke, translate) {
-    // Warm the recent-games cache so 打开最近's dynamicChildren serialize with a
-    // current list. Web warms on File-dropdown open; native has no such hook, so
-    // we warm here before every rebuild. Failures leave the last cache intact.
-    trace('push: warmRecentGames…');
-    await warmRecentGames();
-    trace('push: warmRecentGames done, serializing…');
-    const raw = serializeMenusForNative(translate);
-    // 补顶层 title —— 与 MenuBar.tsx 的 `t('menubar.${menu}')` 保持一致。
-    const payload = raw.map((m) => ({
-        ...m,
-        title: translate(`menubar.${m.menu}`),
-    }));
-    const fileIds = raw.find((m) => m.menu === 'file')?.items.map((i) => i.id) ?? [];
-    trace(`push: serialized menus=${payload.length} file.items=[${fileIds.join(',')}]`);
-    try {
-        await invoke('set_app_menu', { payload });
-        trace('push: set_app_menu resolved');
-    }
-    catch (err) {
-        trace(`push: set_app_menu REJECTED ${err?.message ?? String(err)}`);
-        console.warn('[native-menu-bridge] set_app_menu failed:', err?.message ?? err);
-    }
-}
-// ─── Init (唯一对外入口) ────────────────────────────────────────────────
-/** 幂等标记:StrictMode 双 invoke / boot 双路径都可能重入 init,原生只该被安装一次。
- *  一旦装上:后续调用直接返回。 */
-let installed = false;
-/** Public entry —— App.tsx 在 boot 完成后调用一次。返回 Promise 让调用方能
- *  await (不必须);浏览器形态立刻 resolve()。 */
-export async function initNativeMenuBridge(opts) {
-    if (!isTauri())
-        return; // web 形态 no-op
-    if (installed)
-        return;
-    installed = true;
-    const { translate } = opts;
-    // 懒加载 Tauri API —— 与 runtime.ts 的其它加载器同风格,避免把 chunk 塞进 web bundle。
-    const [{ invoke }, eventMod] = await Promise.all([
-        import('@tauri-apps/api/core'),
-        import('@tauri-apps/api/event'),
-    ]);
-    traceSink = (line) => { void invoke('fx_trace', { line }).catch(() => { }); };
-    trace('init: tauri api loaded, starting first push…');
-    // 1. 原生点击回吐 —— Rust 侧 on_menu_event emit 'menu:invoke' { id },
-    //    我们查注册表拿到 commandId + args,派发到 command bus。
-    //    先注册监听器再做首次 push:首次 push 会预热 listGames,若接口卡住,
-    //    旧菜单仍能响应点击,不会出现"菜单显示但点击无反应"的窗口。
-    await eventMod.listen('menu:invoke', (ev) => {
-        const id = ev.payload?.id;
-        trace(`recv: menu:invoke id=${String(id)}`);
-        if (!id)
-            return;
-        const def = findMenuItemById(id);
-        if (!def) {
-            // 原生菜单栏比 web 快照晚一拍时可能出现;下次 push 会对齐。
-            trace(`recv: id=${id} NOT FOUND in registry — dropped`);
-            console.warn('[native-menu-bridge] menu:invoke for unknown id:', id);
-            return;
+/** One mounted shell owns all native subscriptions, including asynchronous setup. */
+export function installNativeMenuBridge(opts, deps) {
+    let disposed = false;
+    const cleanups = [];
+    const report = (error) => {
+        try {
+            deps.reportError(error);
         }
-        if (!def.commandId) {
-            trace(`recv: id=${id} has no commandId (placeholder) — dropped`);
-            return; // 纯文本占位项,无命令。
+        catch { /* Reporting must not prevent cleanup. */ }
+    };
+    const safely = (cleanup) => {
+        try {
+            cleanup();
         }
-        trace(`dispatch: id=${id} → command '${def.commandId}' args=${JSON.stringify(def.args ?? null)}`);
-        void Promise.resolve(opts.execute(def.commandId, def.args)).then((r) => trace(`dispatch: '${def.commandId}' resolved ${JSON.stringify(r ?? null)}`), (e) => trace(`dispatch: '${def.commandId}' REJECTED ${e?.message ?? String(e)}`));
-    });
-    trace('init: menu:invoke listener registered — bridge live before first push');
-    // 2. 注册表变动 —— 后续 register/unregister/when 切换都会触发 rebuild。
-    //    在 change 时直接 fire-and-forget push;失败已在 pushMenusToNative 内吞。
-    onMenuChange(() => {
-        void pushMenusToNative(invoke, translate);
+        catch (error) {
+            report(error);
+        }
+    };
+    const retain = (cleanup) => {
+        if (disposed)
+            safely(cleanup);
+        else
+            cleanups.push(cleanup);
+    };
+    const dispose = () => {
+        if (disposed)
+            return;
+        disposed = true;
+        for (const cleanup of cleanups.splice(0).reverse())
+            safely(cleanup);
+    };
+    void (async () => {
+        const transport = await deps.loadTransport();
+        if (disposed)
+            return;
+        const sink = (line) => {
+            if (!disposed)
+                void transport.invoke('fx_trace', { line }).catch(() => { });
+        };
+        traceSink = sink;
+        retain(() => { if (traceSink === sink)
+            traceSink = null; });
+        // Subscribe before warming so existing native items remain responsive.
+        const off = await transport.listen(id => {
+            if (disposed || !id)
+                return;
+            try {
+                const item = findMenuItemById(id, opts.menus);
+                if (!item?.commandId)
+                    return;
+                void Promise.resolve(opts.execute(item.commandId, item.args)).catch(report);
+            }
+            catch (error) {
+                report(error);
+            }
+        });
+        retain(off);
+        if (disposed)
+            return;
+        // Serialize pushes: a slower old update must not overwrite a newer locale
+        // or host snapshot. Events arriving during warming are read in that push.
+        let dirty = false;
+        let running = false;
+        const refresh = () => {
+            if (disposed)
+                return;
+            dirty = true;
+            if (running)
+                return;
+            running = true;
+            void (async () => {
+                try {
+                    while (!disposed && dirty) {
+                        dirty = false;
+                        try {
+                            await deps.warmRecentGames();
+                            if (disposed)
+                                return;
+                            dirty = false;
+                            const payload = serializeApplicationMenusForNative(opts.menus.snapshot())
+                                .map(menu => ({ ...menu, title: opts.translate(`menubar.${menu.menu}`) }));
+                            await transport.invoke('set_app_menu', { payload });
+                        }
+                        catch (error) {
+                            report(error);
+                        }
+                    }
+                }
+                finally {
+                    running = false;
+                }
+            })();
+        };
+        retain(opts.menus.subscribe(refresh));
+        retain(deps.subscribeLocale(refresh));
+        refresh();
+    })().catch(error => { report(error); dispose(); });
+    return dispose;
+}
+/** Browser shells install nothing. React effect cleanup also fences late imports. */
+export function initNativeMenuBridge(opts) {
+    if (!isTauri())
+        return () => { };
+    return installNativeMenuBridge(opts, {
+        async loadTransport() {
+            const [core, events] = await Promise.all([
+                import('@tauri-apps/api/core'),
+                import('@tauri-apps/api/event'),
+            ]);
+            return {
+                invoke: (command, args) => core.invoke(command, args),
+                listen: listener => events.listen('menu:invoke', event => listener(event.payload?.id)),
+            };
+        },
+        warmRecentGames,
+        subscribeLocale: listener => subscribeLocale(listener),
+        reportError: error => console.warn('[native-menu-bridge]', error),
     });
-    // 3. 首次推送 —— 让原生菜单栏与当前注册表对齐。
-    await pushMenusToNative(invoke, translate);
-    trace('init: first push returned');
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@forgeax/interface",
-  "version": "0.6.0",
+  "version": "0.7.0",
   "type": "module",
   "description": "ForgeaX product interface shell and application composition boundary.",
   "license": "Apache-2.0",
@@ -92,7 +92,7 @@
     "lint:dep": "depcruise -c .dependency-cruiser.cjs src"
   },
   "dependencies": {
-    "@forgeax/app-shell": "0.87.1",
+    "@forgeax/app-shell": "0.88.0",
     "@forgeax/extension-host": "0.3.2",
     "@forgeax/extension-platform": "0.5.0",
     "@forgeax/toolkit": "0.1.2",

package/dist/package/browser/lib/repair-builtin-menus.d.ts

@@ -1,6 +0,0 @@
-/** Re-register built-in menus when the module-level registry was cleared
- *  (React StrictMode dispose race, Vite HMR module swap) but shell chrome
- *  is still mounted. Idempotent — no-op when File menu already populated. */
-export declare function repairBuiltinMenusIfEmpty(): void;
-/** Test-only: tear down ad-hoc repair registration. */
-export declare function __resetBuiltinMenuRepairForTest(): void;

package/dist/package/browser/lib/repair-builtin-menus.js

@@ -1,18 +0,0 @@
-import { builtinMenusExtension } from '../core/extensions/builtin-menus';
-import { snapshotMenu } from './menu-registry';
-let adhocCleanup;
-/** Re-register built-in menus when the module-level registry was cleared
- *  (React StrictMode dispose race, Vite HMR module swap) but shell chrome
- *  is still mounted. Idempotent — no-op when File menu already populated. */
-export function repairBuiltinMenusIfEmpty() {
-    if (snapshotMenu('file').length > 0)
-        return;
-    adhocCleanup?.();
-    const result = builtinMenusExtension.setup?.({});
-    adhocCleanup = typeof result === 'function' ? result : undefined;
-}
-/** Test-only: tear down ad-hoc repair registration. */
-export function __resetBuiltinMenuRepairForTest() {
-    adhocCleanup?.();
-    adhocCleanup = undefined;
-}

package/dist/package/node/lib/repair-builtin-menus.js

@@ -1,18 +0,0 @@
-import { builtinMenusExtension } from '../core/extensions/builtin-menus.js';
-import { snapshotMenu } from './menu-registry.js';
-let adhocCleanup;
-/** Re-register built-in menus when the module-level registry was cleared
- *  (React StrictMode dispose race, Vite HMR module swap) but shell chrome
- *  is still mounted. Idempotent — no-op when File menu already populated. */
-export function repairBuiltinMenusIfEmpty() {
-    if (snapshotMenu('file').length > 0)
-        return;
-    adhocCleanup?.();
-    const result = builtinMenusExtension.setup?.({});
-    adhocCleanup = typeof result === 'function' ? result : undefined;
-}
-/** Test-only: tear down ad-hoc repair registration. */
-export function __resetBuiltinMenuRepairForTest() {
-    adhocCleanup?.();
-    adhocCleanup = undefined;
-}