@dimina-kit/devtools 0.3.2-dev.20260611060732 → 0.3.2-dev.20260611063505

package/README.md

@@ -55,10 +55,14 @@ launch({
     instance.registerSimulatorApi('login', (params) => myLogin(params))
 
     // 工具栏：整表替换，随 host 状态（如登录态）重算时再 set 一次
-    const refreshToolbar = () => instance.toolbar.set([
-      { id: 'deploy', label: '发布', handler: () => deploy() },
-      { id: 'preview', label: '预览', handler: () => preview() },
-    ])
+    const refreshToolbar = () => {
+      const currentUser = getCurrentUser()
+      instance.toolbar.set([
+        { id: 'account', label: '当前用户', kind: 'avatar', placement: 'leading', displayInitial: currentUser?.name, avatarUrl: currentUser?.avatar, handler: () => showAccount() },
+        { id: 'preview', label: '预览', placement: 'primary', handler: () => preview() },
+        { id: 'deploy', label: '发布', placement: 'trailing', handler: () => deploy() },
+      ])
+    }
     refreshToolbar()
 
     // 自定义 IPC：经 gated 的 IpcRegistry，不再裸 ipcMain.handle
@@ -68,6 +72,12 @@ launch({
     // const win = createDialogWindow(/* ... */)
     // instance.registerTrustedWindow(win)
   },
+  onBeforeOpenProject: async ({ projectPath, instance }) => {
+    const ok = await canOpenProject(projectPath)
+    return ok
+      ? { allow: true }
+      : { allow: false, reason: '当前账号没有项目权限' }
+  },
   onBeforeClose: ({ context }) => {
     // 窗口关闭前的自定义清理；session 关闭和 view 销毁由框架自动处理
   },
@@ -203,8 +213,9 @@ src/
 | `rendererDir`   | `string`                                    | 内置        | 自定义 renderer HTML 目录                         |
 | `icon`          | `string`                                    | —           | 窗口/任务栏图标路径（macOS 使用 app bundle 图标） |
 | `menuBuilder`   | `(mainWindow, menuContext: MenuContext) => void` | 内置菜单 | 自定义菜单构建器；`menuContext` 为收窄后的 `MenuContext`，不含 `registry`/`senderPolicy` 等内部管线 |
-| `onSetup`       | `(instance) => void`                        | —           | 窗口和 context 创建后的回调，用于注册 Contribution（见下文）|
-| `onBeforeClose` | `(instance) => void`                        | —           | 窗口关闭前的回调，session 关闭由框架自动处理      |
+| `onSetup`       | `(instance) => void \| Promise<void>`       | —           | 窗口和 context 创建后的回调，用于注册 Contribution（见下文）|
+| `onBeforeOpenProject` | `({ projectPath, instance }) => BeforeOpenProjectResult \| Promise<BeforeOpenProjectResult>` | — | 项目目录校验通过后、关闭当前 session 和编译新项目之前的宿主准入钩子 |
+| `onBeforeClose` | `(instance) => void \| Promise<void>`       | —           | 窗口关闭前的回调，session 关闭由框架自动处理      |
 | `window`        | `WorkbenchWindowConfig`                     | —           | 窗口尺寸覆盖                                      |
 | `updateChecker` | `UpdateChecker`                             | —           | 自定义更新检查器；提供后启用"检查更新"功能        |
 | `updateOptions` | `{ checkInterval?, initialDelay?, getCurrentVersion? }` | —  | 仅当 `updateChecker` 提供时生效，默认 1h / 5s     |
@@ -220,6 +231,8 @@ src/
 | `instance.ipc` | `IpcRegistry` 实例，`instance.ipc.handle(channel, fn)` 注册自定义 IPC；已绑定 `senderPolicy` 网关 |
 | `instance.registerTrustedWindow(win)` | 把 host 自有弹窗 `BrowserWindow` 加入受信 sender 集，否则其发起的 `instance.ipc` 调用会被网关拒绝。窗口关闭即移除 |
 
+`onSetup` 可以返回 Promise；`createWorkbenchApp().start()` 会等待 `onSetup` 解析完成后才继续后续启动流程，因此宿主在 `onSetup` 内注册的 simulator API 会早于 simulator `<webview>` 首次枚举自定义 API。
+
 ### 内置面板 ID
 
 `'wxml'` \| `'console'` \| `'appdata'` \| `'storage'`

package/dist/main/api.d.ts

@@ -14,5 +14,5 @@ export { IpcRegistry } from './utils/ipc-registry.js';
 export type { SenderPolicy } from './utils/ipc-registry.js';
 export { UpdateManager, createGitHubReleaseChecker } from './services/update/index.js';
 export type { UpdateManagerOptions, GitHubReleaseCheckerOptions, PickAssetContext, VersionScheme, } from './services/update/index.js';
-export type { WorkbenchConfig, WorkbenchAppConfig, CompilationAdapter, ProjectSession, ToolbarAction, BuiltinPanelId, BuiltinModuleId, UpdateChecker, UpdateInfo, } from '../shared/types.js';
+export type { BeforeOpenProjectHook, BeforeOpenProjectResult, WorkbenchConfig, WorkbenchAppConfig, CompilationAdapter, ProjectSession, ToolbarAction, ToolbarActionInput, ToolbarActionKind, ToolbarActionPlacement, BuiltinPanelId, BuiltinModuleId, UpdateChecker, UpdateInfo, } from '../shared/types.js';
 //# sourceMappingURL=api.d.ts.map

package/dist/main/app/app.js

@@ -356,6 +356,9 @@ export async function createDevtoolsRuntime(config = {}) {
         },
         dispose: () => disposeContext(context),
     };
+    if (config.onBeforeOpenProject) {
+        context.beforeOpenProject = (projectPath) => config.onBeforeOpenProject({ projectPath, instance });
+    }
     if (config.onSetup) {
         await config.onSetup(instance);
     }

package/dist/main/index.bundle.js

@@ -2762,15 +2762,21 @@ function createWorkspaceService(ctx) {
     },
     validateProjectDir: async (dirPath) => provider.validateProjectDir ? provider.validateProjectDir(dirPath) : null,
     async openProject(projectPath) {
-      clearSimulatorServicewechatReferer();
-      await disposeSession();
-      currentProjectPath = "";
-      lastClosedProjectPath = "";
       const dirError = provider.validateProjectDir ? await provider.validateProjectDir(projectPath) : null;
       if (dirError) {
         sendStatus("error", dirError);
         return { success: false, error: dirError };
       }
+      const gate = ctx.beforeOpenProject ? await ctx.beforeOpenProject(projectPath) : void 0;
+      if (gate && !gate.allow) {
+        const message = gate.userMessage ?? gate.reason;
+        sendStatus("error", message);
+        return { success: false, error: message };
+      }
+      clearSimulatorServicewechatReferer();
+      await disposeSession();
+      currentProjectPath = "";
+      lastClosedProjectPath = "";
       sendStatus("compiling", "\u6B63\u5728\u7F16\u8BD1...");
       const { compile } = loadWorkbenchSettings();
       let session4;
@@ -2792,7 +2798,7 @@ function createWorkspaceService(ctx) {
       bestEffort("updateLastOpened", () => {
         if (provider.updateLastOpened) provider.updateLastOpened(projectPath);
       });
-      bestEffort("sendStatus", () => sendStatus("ready", "\u7F16\u8BD1\u5B8C\u6210"));
+      bestEffort("sendStatus", () => sendStatus("ready", gate?.statusMessage ?? "\u7F16\u8BD1\u5B8C\u6210"));
       bestEffort("applyReferer", () => applyRefererFromSession(session4));
       return {
         success: true,
@@ -2894,6 +2900,18 @@ function createLocalProjectsProvider() {
 }
 
 // src/main/services/toolbar/toolbar-store.ts
+function toPublicAction(action) {
+  const projected = {
+    id: action.id,
+    label: action.label
+  };
+  if (action.kind) projected.kind = action.kind;
+  if (action.placement) projected.placement = action.placement;
+  if (action.icon) projected.icon = action.icon;
+  if (action.displayInitial) projected.displayInitial = action.displayInitial;
+  if (action.avatarUrl) projected.avatarUrl = action.avatarUrl;
+  return projected;
+}
 function createToolbarStore() {
   let actions = [];
   return {
@@ -2908,7 +2926,7 @@ function createToolbarStore() {
       actions = next.slice();
     },
     list() {
-      return actions.map(({ id, label }) => ({ id, label }));
+      return actions.map(toPublicAction);
     },
     getHandler(id) {
       return actions.find((a) => a.id === id)?.handler;
@@ -8897,6 +8915,9 @@ async function createDevtoolsRuntime(config = {}) {
     },
     dispose: () => disposeContext(context)
   };
+  if (config.onBeforeOpenProject) {
+    context.beforeOpenProject = (projectPath) => config.onBeforeOpenProject({ projectPath, instance });
+  }
   if (config.onSetup) {
     await config.onSetup(instance);
   }

package/dist/main/services/toolbar/toolbar-store.d.ts

@@ -4,8 +4,8 @@ import type { ToolbarAction, ToolbarActionInput } from '../../../shared/types.js
  *
  * The toolbar is modelled as "one table the host recomputes from its current
  * state": `set()` replaces the whole table atomically. The non-serialisable
- * `handler` is kept main-process side; `list()` projects to `{id,label}[]`
- * for the IPC boundary, and `getHandler()` resolves a handler by id.
+ * `handler` is kept main-process side; `list()` projects display metadata for
+ * the IPC boundary, and `getHandler()` resolves a handler by id.
  */
 export interface ToolbarStore {
     /**
@@ -14,7 +14,7 @@ export interface ToolbarStore {
      * a rejected batch leaves the previous table intact.
      */
     set(actions: ToolbarActionInput[]): void;
-    /** Project the current table to `{id,label}[]` — no `handler` leaks out. */
+    /** Project the current table to serialisable display metadata — no `handler` leaks out. */
     list(): ToolbarAction[];
     /** Resolve the handler stored under `id`, or `undefined` if unknown. */
     getHandler(id: string): (() => void | Promise<void>) | undefined;

package/dist/main/services/toolbar/toolbar-store.js

@@ -1,3 +1,20 @@
+function toPublicAction(action) {
+    const projected = {
+        id: action.id,
+        label: action.label,
+    };
+    if (action.kind)
+        projected.kind = action.kind;
+    if (action.placement)
+        projected.placement = action.placement;
+    if (action.icon)
+        projected.icon = action.icon;
+    if (action.displayInitial)
+        projected.displayInitial = action.displayInitial;
+    if (action.avatarUrl)
+        projected.avatarUrl = action.avatarUrl;
+    return projected;
+}
 export function createToolbarStore() {
     let actions = [];
     return {
@@ -13,7 +30,7 @@ export function createToolbarStore() {
             actions = next.slice();
         },
         list() {
-            return actions.map(({ id, label }) => ({ id, label }));
+            return actions.map(toPublicAction);
         },
         getHandler(id) {
             return actions.find((a) => a.id === id)?.handler;

package/dist/main/services/workbench-context.d.ts

@@ -15,7 +15,7 @@ import { type SimulatorApiRegistry } from './simulator/custom-apis.js';
 import { type ToolbarStore } from './toolbar/toolbar-store.js';
 import { sanitizeTemplates } from './projects/templates.js';
 import type { ProjectsProvider, ProjectTemplate } from './projects/types.js';
-import type { CustomCreateProjectDialogResult } from '../../shared/types.js';
+import type { BeforeOpenProjectResult, CustomCreateProjectDialogResult } from '../../shared/types.js';
 /**
  * Shared mutable state for the workbench application.
  * Passed to each IPC module so they can read/write shared state without closures.
@@ -72,6 +72,11 @@ export interface WorkbenchContext {
         parentWindow: BrowserWindow;
         templates: ProjectTemplate[];
     }) => Promise<CustomCreateProjectDialogResult>;
+    /**
+     * Optional host gate for opening projects. Runs after basic directory
+     * validation and before the current project session is closed.
+     */
+    beforeOpenProject?: (projectPath: string) => BeforeOpenProjectResult | Promise<BeforeOpenProjectResult>;
     /**
      * Trust predicate consulted by `IpcRegistry` for every incoming IPC.
      * Resolves the currently-trusted senders (main renderer + overlays)

package/dist/main/services/workspace/workspace-service.js

@@ -62,12 +62,6 @@ export function createWorkspaceService(ctx) {
             ? provider.validateProjectDir(dirPath)
             : null,
         async openProject(projectPath) {
-            clearSimulatorServicewechatReferer();
-            await disposeSession();
-            currentProjectPath = '';
-            // A fresh open starts a clean sandbox window — drop any previously
-            // recorded last-closed root so it can't accept writes after this point.
-            lastClosedProjectPath = '';
             // Reject obviously broken projects up front so we never spin up a
             // compile/server that the simulator will then fetch asset-by-asset.
             // Without this guard, deleted recent-list entries and typo'd CLI paths
@@ -82,6 +76,18 @@ export function createWorkspaceService(ctx) {
                 sendStatus('error', dirError);
                 return { success: false, error: dirError };
             }
+            const gate = ctx.beforeOpenProject ? await ctx.beforeOpenProject(projectPath) : undefined;
+            if (gate && !gate.allow) {
+                const message = gate.userMessage ?? gate.reason;
+                sendStatus('error', message);
+                return { success: false, error: message };
+            }
+            clearSimulatorServicewechatReferer();
+            await disposeSession();
+            currentProjectPath = '';
+            // A fresh open starts a clean sandbox window — drop any previously
+            // recorded last-closed root so it can't accept writes after this point.
+            lastClosedProjectPath = '';
             sendStatus('compiling', '正在编译...');
             const { compile } = loadWorkbenchSettings();
             let session;
@@ -105,7 +111,7 @@ export function createWorkspaceService(ctx) {
                 if (provider.updateLastOpened)
                     provider.updateLastOpened(projectPath);
             });
-            bestEffort('sendStatus', () => sendStatus('ready', '编译完成'));
+            bestEffort('sendStatus', () => sendStatus('ready', gate?.statusMessage ?? '编译完成'));
             bestEffort('applyReferer', () => applyRefererFromSession(session));
             return {
                 success: true,