cabloy 5.1.103 → 5.1.105

package/vona/src/suite/a-home/modules/home-user/src/bean/eventListener.activate.ts

@@ -17,10 +17,11 @@ export class EventListenerActivate
     next: NextEvent<TypeEventData, TypeEventResult>,
   ): Promise<TypeEventResult> {
     const user = data as IUser;
-    if (user.name === 'admin' && !this.scope.config.disableRoleAdmin) {
-      // role: admin
-      const roleAdmin = await this.scope.model.role.get({ name: 'admin' });
-      await this.bean.role.addUserId(roleAdmin!.id, user.id);
+    const roleRegisteredUser = await this.scope.model.role.get({ name: 'registeredUser' });
+    await this.bean.role.addUserId(roleRegisteredUser!.id, user.id);
+    if (user.name === 'admin' && !this.scope.config.disableBootstrapSystemAdmin) {
+      const roleSystemAdmin = await this.scope.model.role.get({ name: 'systemAdmin' });
+      await this.bean.role.addUserId(roleSystemAdmin!.id, user.id);
     }
     // next
     return next();

package/vona/src/suite/a-home/modules/home-user/src/bean/meta.version.ts

@@ -18,6 +18,7 @@ export class MetaVersion extends BeanBase implements IMetaVersionUpdate, IMetaVe
         table.comment(entityRole.$comment.$table);
         table.basicFields();
         table.string(entityRole.name, 255).comment(entityRole.$comment.name);
+        table.json(entityRole.siteIds).comment(entityRole.$comment.siteIds);
       });
       // homeUser
       const entityUser = this.scope.entity.user;
@@ -47,12 +48,15 @@ export class MetaVersion extends BeanBase implements IMetaVersionUpdate, IMetaVe
 
   async init(options: IMetaVersionInitOptions) {
     if (options.version === 1) {
-      // role: admin
-      if (!this.scope.config.disableRoleAdmin) {
-        await this.scope.model.role.insert({
-          name: 'admin',
-        });
-      }
+      // roles
+      await this.scope.model.role.insert({
+        name: 'registeredUser',
+        siteIds: ['web'],
+      });
+      await this.scope.model.role.insert({
+        name: 'systemAdmin',
+        siteIds: ['web', 'admin'],
+      });
       // user: admin
       if (!this.scope.config.disableUserAdmin) {
         await this.bean.auth.authenticate('auth-simple:simple', {

package/vona/src/suite/a-home/modules/home-user/src/config/config.ts

@@ -5,7 +5,7 @@ export function config(_app: VonaApplication) {
     passwordDefault: {
       admin: '123456',
     },
-    disableRoleAdmin: false,
+    disableBootstrapSystemAdmin: false,
     disableUserAdmin: false,
   };
 }

package/vona/src/suite/a-home/modules/home-user/src/controller/passport.ts

@@ -111,6 +111,13 @@ export class ControllerPassport extends BeanBase {
     return this._combineDtoPassportJwt(jwt);
   }
 
+  @Web.post('refreshAuthToken')
+  @Passport.public()
+  @Api.body(v.object(DtoJwtToken))
+  async refreshAuthToken(@Arg.body('refreshToken') refreshToken: string): Promise<DtoJwtToken> {
+    return await this.bean.passport.refreshAuthToken(refreshToken);
+  }
+
   @Web.post('createPassportJwtFromOauthCode')
   @Passport.public()
   @Api.body(v.object(DtoPassportJwt))
@@ -119,13 +126,6 @@ export class ControllerPassport extends BeanBase {
     return this._combineDtoPassportJwt(jwt);
   }
 
-  @Web.post('refreshAuthToken')
-  @Passport.public()
-  @Api.body(v.object(DtoJwtToken))
-  async refreshAuthToken(@Arg.body('refreshToken') refreshToken: string): Promise<DtoJwtToken> {
-    return await this.bean.passport.refreshAuthToken(refreshToken);
-  }
-
   @Web.post('createTempAuthToken')
   @Api.body(z.string())
   async createTempAuthToken(@Arg.query('path', v.optional()) path?: string): Promise<string> {

package/vona/src/suite/a-home/modules/home-user/src/entity/role.ts

@@ -3,6 +3,7 @@ import type { IRole } from 'vona-module-a-user';
 
 import { Api, v } from 'vona-module-a-openapiutils';
 import { Entity, EntityBase } from 'vona-module-a-orm';
+import z from 'zod';
 
 import { $locale } from '../.metadata/locales.ts';
 
@@ -12,4 +13,7 @@ export interface IEntityOptionsRole extends IDecoratorEntityOptions {}
 export class EntityRole extends EntityBase implements IRole {
   @Api.field(v.title($locale('RoleName')))
   name: string;
+
+  @Api.field(v.array(z.string()))
+  siteIds: string[];
 }

package/vona/src/suite/a-home/modules/home-user/src/service/passportAdapter.ts

@@ -7,9 +7,9 @@ import type { IPayloadDataOfPassport } from '../types/jwt.ts';
 
 @Service()
 export class ServicePassportAdapter extends BeanBase implements IPassportAdapter {
-  async isAdmin(passport: IPassport | undefined): Promise<boolean> {
+  async isSystemAdmin(passport: IPassport | undefined): Promise<boolean> {
     if (!passport) return false;
-    if (passport.roles?.some(role => role.name === 'admin')) return true;
+    if (passport.roles?.some(role => role.name === 'systemAdmin')) return true;
     return false;
   }
 

package/vona/src/suite/a-home/modules/home-user/src/service/roleAdapter.ts

@@ -20,10 +20,10 @@ export class ServiceRoleAdapter extends BeanBase implements IRoleAdapter {
   }
 
   async addUserId(id: TableIdentity, userId: TableIdentity): Promise<TableIdentity> {
-    const res = await this.scope.model.roleUser.insert({
-      userId,
-      roleId: id,
-    });
-    return res.id;
+    let roleUser = await this.scope.model.roleUser.get({ userId, roleId: id });
+    if (!roleUser) {
+      roleUser = await this.scope.model.roleUser.insert({ userId, roleId: id });
+    }
+    return roleUser.id;
   }
 }

package/vona/src/suite/a-training/modules/training-record/src/bean/ssrMenu.record.ts

@@ -22,6 +22,7 @@ export interface ISsrMenuOptionsRecord extends IDecoratorSsrMenuOptions<ISsrSite
         },
       },
       group: 'basic-siteadmin:management',
+      roles: ['systemAdmin'],
     },
   },
   site: ['basic-siteadmin:admin'],

package/vona/src/suite/a-training/modules/training-student/src/bean/ssrMenu.student.ts

@@ -22,6 +22,7 @@ export interface ISsrMenuOptionsStudent extends IDecoratorSsrMenuOptions<ISsrSit
         },
       },
       group: 'basic-siteadmin:management',
+      roles: ['systemAdmin'],
     },
   },
   site: ['basic-siteadmin:admin'],

package/vona/src/suite/cabloy-basic/modules/basic-siteadmin/src/bean/ssrMenu.home.ts

@@ -16,6 +16,7 @@ export interface ISsrMenuOptionsHome extends IDecoratorSsrMenuOptions<ISsrSiteOp
     order: $order(1, 'core'),
     icon: '::home',
     link: '/',
+    roles: ['systemAdmin'],
   },
   site: ['basic-siteadmin:admin'],
 })

package/vona/src/suite/cabloy-basic/modules/basic-siteadmin/src/bean/ssrSite.admin.ts

@@ -4,6 +4,10 @@ import type { IIconRecord, IPagePathRecord } from 'zova-rest-cabloy-basic-admin'
 import { BeanSsrSiteBase, SsrSite } from 'vona-module-a-ssr';
 
 declare module 'vona-module-a-ssr' {
+  export interface ISsrSiteIdRecord {
+    admin: never;
+  }
+
   export interface ISsrSitePublicPathRecord {
     admin: never;
   }
@@ -20,10 +24,10 @@ export interface ISsrSiteOptionsAdmin extends IDecoratorSsrSiteOptions<
 > {}
 
 @SsrSite<ISsrSiteOptionsAdmin>({
+  siteId: 'admin',
   publicPath: 'admin',
   bundlePath: 'ssr-cabloyBasicAdmin-5.0.0',
   diagnostics: {
-    siteName: 'admin',
     buildCommand: 'npm run build:zova:admin',
   },
 })

package/vona/src/suite/cabloy-basic/modules/basic-siteweb/src/bean/ssrSite.web.ts

@@ -4,6 +4,10 @@ import type { IIconRecord, IPagePathRecord } from 'zova-rest-cabloy-basic-web';
 import { BeanSsrSiteBase, SsrSite } from 'vona-module-a-ssr';
 
 declare module 'vona-module-a-ssr' {
+  export interface ISsrSiteIdRecord {
+    web: never;
+  }
+
   export interface ISsrSitePublicPathRecord {
     '': never;
   }
@@ -20,10 +24,10 @@ export interface ISsrSiteOptionsWeb extends IDecoratorSsrSiteOptions<
 > {}
 
 @SsrSite<ISsrSiteOptionsWeb>({
+  siteId: 'web',
   publicPath: '',
   bundlePath: 'ssr-cabloyBasicWeb-5.0.0',
   diagnostics: {
-    siteName: 'web',
     buildCommand: 'npm run build:zova:web',
   },
 })

package/vona/src/suite-vendor/a-auth/modules/a-auth/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vona-module-a-auth",
-  "version": "5.1.19",
+  "version": "5.1.20",
   "gitHead": "a79189b882c17af5911573896a781bbb0046d37d",
   "description": "",
   "keywords": [

package/vona/src/suite-vendor/a-auth/modules/a-auth/src/service/auth.ts

@@ -60,7 +60,7 @@ export class ServiceAuth extends BeanBase {
     state?: IAuthenticateStrategyState,
   ): Promise<IPassport> {
     // event: issuePassport
-    return await this.scope.event.issuePassport.emit(
+    const passport = await this.scope.event.issuePassport.emit(
       { profileUser, entityAuthProvider, clientOptions, state },
       async ({ profileUser, entityAuthProvider, clientOptions, state }) => {
         return await this._issuePassportInner(
@@ -71,6 +71,10 @@ export class ServiceAuth extends BeanBase {
         );
       },
     );
+    if (passport.user) {
+      passport.roles = await this.bean.role.findAllByUserId(passport.user.id);
+    }
+    return passport;
   }
 
   private async _issuePassportInner(

package/vona/src/suite-vendor/a-auth/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vona-suite-a-auth",
-  "version": "5.1.21",
+  "version": "5.1.22",
   "gitHead": "a79189b882c17af5911573896a781bbb0046d37d",
   "description": "",
   "author": "",

package/vona/src/suite-vendor/a-cabloy/modules/a-ssr/cli/ssrSite/boilerplate/{{sceneName}}.{{beanName}}.ts_

@@ -4,6 +4,10 @@ import type { IIconRecord, IPagePathRecord } from '<%=argv.ssrSiteRestNpm%>';
 import { BeanSsrSiteBase, SsrSite } from 'vona-module-a-ssr';
 
 declare module 'vona-module-a-ssr' {
+  export interface ISsrSiteIdRecord {
+    some: never;
+  }
+
   export interface ISsrSitePublicPathRecord {
     some: never;
   }
@@ -16,10 +20,8 @@ export interface ISsrSiteOptions<%=argv.beanNameCapitalize%>PagesData {}
 export interface ISsrSiteOptions<%=argv.beanNameCapitalize%> extends IDecoratorSsrSiteOptions<ISsrSiteOptions<%=argv.beanNameCapitalize%>Pages, ISsrSiteOptions<%=argv.beanNameCapitalize%>PagesData, IIconRecord> {}
 
 @SsrSite<ISsrSiteOptions<%=argv.beanNameCapitalize%>>({
+  siteId: 'some',
   publicPath: 'some',
   bundlePath: 'front-bundle-path',
-  diagnostics: {
-    siteName: 'some',
-  },
 })
 export class SsrSite<%=argv.beanNameCapitalize%> extends BeanSsrSiteBase<ISsrSiteOptions<%=argv.beanNameCapitalize%>> {}

package/vona/src/suite-vendor/a-cabloy/modules/a-ssr/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vona-module-a-ssr",
-  "version": "5.1.24",
+  "version": "5.1.25",
   "gitHead": "a79189b882c17af5911573896a781bbb0046d37d",
   "description": "",
   "keywords": [

package/vona/src/suite-vendor/a-cabloy/modules/a-ssr/src/bean/event.retrieveMenusSite.ts

@@ -3,14 +3,14 @@ import type { ILocaleRecord } from 'vona';
 import { BeanEventBase, Event } from 'vona-module-a-event';
 
 import type { BeanSsrSiteBase } from '../lib/beanSsrSiteBase.ts';
-import type { TypeEventRetrieveMenusResult } from './event.retrieveMenus.ts';
+import type { ISsrMenusPrepared } from '../types/ssrMenu.ts';
 
 export interface TypeEventRetrieveMenusSiteData {
   ssrSite: BeanSsrSiteBase;
   locale: keyof ILocaleRecord;
 }
 
-export type TypeEventRetrieveMenusSiteResult = TypeEventRetrieveMenusResult;
+export type TypeEventRetrieveMenusSiteResult = ISsrMenusPrepared;
 
 @Event()
 export class EventRetrieveMenusSite extends BeanEventBase<

package/vona/src/suite-vendor/a-cabloy/modules/a-ssr/src/lib/beanSsrSiteBase.ts

@@ -1,7 +1,7 @@
 import type { ZovaMetaMode } from '@cabloy/module-info';
 import type { IParamsAndQuery } from '@cabloy/utils';
 import type { ILocaleRecord } from 'vona';
-import type { IMenuGroup, IMenuItem } from 'vona-module-a-menu';
+import type { IMenuGroup } from 'vona-module-a-menu';
 import type { IOnionSlice } from 'vona-module-a-onion';
 import type { TypeEventResolvePathData, TypeEventResolvePathResult } from 'vona-module-a-static';
 
@@ -16,7 +16,12 @@ import { BeanBase, cast, deepExtend, SymbolModuleName } from 'vona';
 import { checkErrorJwtExpiredAndThrow } from 'vona-module-a-jwt';
 
 import type { TypeEventRetrieveMenusResult } from '../bean/event.retrieveMenus.ts';
-import type { IDecoratorSsrMenuOptions, ISsrMenuRecord } from '../types/ssrMenu.ts';
+import type { TypeEventRetrieveMenusSiteResult } from '../bean/event.retrieveMenusSite.ts';
+import type {
+  IDecoratorSsrMenuOptions,
+  ISsrMenuItemPrepared,
+  ISsrMenuRecord,
+} from '../types/ssrMenu.ts';
 import type { ISsrMenuGroupRecord } from '../types/ssrMenuGroup.ts';
 import type {
   IDecoratorSsrSiteOptions,
@@ -139,7 +144,15 @@ export class BeanSsrSiteBase<
   }
 
   async retrieveMenus(): Promise<TypeEventRetrieveMenusResult | undefined> {
-    return await this._getMenusCache(this.ctx.locale);
+    const menusPrepared = await this._getMenusCache(this.ctx.locale);
+    if (!menusPrepared) return;
+    const menus = menusPrepared.menus
+      ?.filter(menu => !menu.roles?.length || this.bean.passport.checkRoleName(menu.roles))
+      .map(menu => {
+        const { roles: _roles, ...menuPublic } = menu;
+        return menuPublic;
+      });
+    return { menus, groups: menusPrepared.groups };
   }
 
   public get siteOptions() {
@@ -168,6 +181,14 @@ export class BeanSsrSiteBase<
         },
         this.$scope.ssr.config.site.default,
         onionOptions,
+        {
+          envServer: {
+            SITE_ID: onionOptions.siteId,
+          },
+          envClient: {
+            SITE_ID: onionOptions.siteId,
+          },
+        },
       );
     }
     return this._siteOptions;
@@ -253,9 +274,11 @@ export class BeanSsrSiteBase<
     };
   }
 
-  private async _getMenusCache(locale: keyof ILocaleRecord): Promise<TypeEventRetrieveMenusResult> {
+  private async _getMenusCache(
+    locale: keyof ILocaleRecord,
+  ): Promise<TypeEventRetrieveMenusSiteResult | undefined> {
     if (!this.app.meta[SymbolCacheMenus]) this.app.meta[SymbolCacheMenus] = {};
-    const cacheMenus: Record<keyof ILocaleRecord, TypeEventRetrieveMenusResult> =
+    const cacheMenus: Record<keyof ILocaleRecord, TypeEventRetrieveMenusSiteResult> =
       this.app.meta[SymbolCacheMenus];
     const beanFullName = this.$beanFullName;
     const instanceName = this.ctx.instanceName;
@@ -268,7 +291,9 @@ export class BeanSsrSiteBase<
     return cacheMenus[beanFullName][cacheKey];
   }
 
-  private async _prepareMenus(locale: keyof ILocaleRecord): Promise<TypeEventRetrieveMenusResult> {
+  private async _prepareMenus(
+    locale: keyof ILocaleRecord,
+  ): Promise<TypeEventRetrieveMenusSiteResult | undefined> {
     return await this.$scope.ssr.event.retrieveMenusSite.emit(
       { ssrSite: this, locale },
       async () => {
@@ -287,7 +312,7 @@ export class BeanSsrSiteBase<
   private _prepareMenusOrGroups<T extends keyof ISsrMenuRecord>(
     locale: keyof ILocaleRecord,
     ssrMenus: IOnionSlice<ISsrMenuRecord, T, unknown>[],
-  ): IMenuItem[];
+  ): ISsrMenuItemPrepared[];
   private _prepareMenusOrGroups<T extends keyof ISsrMenuGroupRecord>(
     locale: keyof ILocaleRecord,
     ssrMenus: IOnionSlice<ISsrMenuGroupRecord, T, unknown>[],
@@ -298,7 +323,7 @@ export class BeanSsrSiteBase<
   ) {
     const siteOnionName = this.$onionName;
     // menus
-    const menus: IMenuItem<keyof SsrSiteOptions['pages']>[] = [];
+    const menus: ISsrMenuItemPrepared[] = [];
     for (const ssrMenu of ssrMenus) {
       const siteMenuOptions = ssrMenu.beanOptions
         .options as IDecoratorSsrMenuOptions<IDecoratorSsrSiteOptions>;

package/vona/src/suite-vendor/a-cabloy/modules/a-ssr/src/service/ssr.ts

@@ -16,22 +16,52 @@ export class ServiceSsr extends BeanBase {
     if (!this.app.meta[SymbolCacheSites]) this.app.meta[SymbolCacheSites] = {};
     if (!this.app.meta[SymbolCacheSites][cacheKey]) {
       // check sites
-      this.app.meta[SymbolCacheSites][cacheKey] = this.bean.onion.ssrSite
-        .getOnionsEnabled(this.ctx.instanceName!)
-        .toReversed()
-        .sort((site1, site2) => {
-          const siteOptions1 = site1.beanOptions.options as IDecoratorSsrSiteOptions;
-          const siteOptions2 = site2.beanOptions.options as IDecoratorSsrSiteOptions;
-          const publicPath1 = `/${siteOptions1.publicPath}`;
-          const publicPath2 = `/${siteOptions2.publicPath}`;
-          return publicPath1 === publicPath2
-            ? 0
-            : publicPath1.startsWith(publicPath2)
-              ? -1
-              : publicPath2.startsWith(publicPath1)
-                ? 1
-                : 0;
-        });
+      const sites = this.bean.onion.ssrSite.getOnionsEnabled(this.ctx.instanceName!).toReversed();
+      const siteIds = new Map<string, string>();
+      const publicPaths = new Map<string, string>();
+      for (const site of sites) {
+        const siteOptions = site.beanOptions.options as IDecoratorSsrSiteOptions;
+        const beanFullName = site.beanOptions.beanFullName;
+        const siteId = siteOptions.siteId;
+        if (typeof siteId !== 'string' || !siteId.trim()) {
+          throw new Error(
+            `Should specify non-empty siteId for SSR site: ${beanFullName} (${cacheKey})`,
+          );
+        }
+        const siteIdDuplicate = siteIds.get(siteId);
+        if (siteIdDuplicate) {
+          throw new Error(
+            `Duplicate SSR siteId "${siteId}" for ${siteIdDuplicate} and ${beanFullName} (${cacheKey})`,
+          );
+        }
+        siteIds.set(siteId, beanFullName);
+        const publicPath = siteOptions.publicPath;
+        if (typeof publicPath !== 'string') {
+          throw new TypeError(
+            `Should specify publicPath for SSR site: ${beanFullName} (${cacheKey})`,
+          );
+        }
+        const publicPathDuplicate = publicPaths.get(publicPath);
+        if (publicPathDuplicate) {
+          throw new Error(
+            `Duplicate SSR publicPath "${publicPath}" for ${publicPathDuplicate} and ${beanFullName} (${cacheKey})`,
+          );
+        }
+        publicPaths.set(publicPath, beanFullName);
+      }
+      this.app.meta[SymbolCacheSites][cacheKey] = sites.sort((site1, site2) => {
+        const siteOptions1 = site1.beanOptions.options as IDecoratorSsrSiteOptions;
+        const siteOptions2 = site2.beanOptions.options as IDecoratorSsrSiteOptions;
+        const publicPath1 = `/${siteOptions1.publicPath}`;
+        const publicPath2 = `/${siteOptions2.publicPath}`;
+        return publicPath1 === publicPath2
+          ? 0
+          : publicPath1.startsWith(publicPath2)
+            ? -1
+            : publicPath2.startsWith(publicPath1)
+              ? 1
+              : 0;
+      });
     }
     return this.app.meta[SymbolCacheSites][cacheKey];
   }

package/vona/src/suite-vendor/a-cabloy/modules/a-ssr/src/service/ssrHandler.ts

@@ -68,10 +68,8 @@ export class ServiceSsrHandler extends BeanBase {
   }
 
   private _createMissingBundleMessage() {
-    const diagnostics = this._siteOptions.diagnostics;
-    const siteName = diagnostics?.siteName ?? String(this._siteOptions.publicPath || 'unknown');
-    const buildCommand = diagnostics?.buildCommand;
+    const buildCommand = this._siteOptions.diagnostics?.buildCommand;
     const commandHint = buildCommand ? ` Run "${buildCommand}" at the repository root.` : '';
-    return `Missing SSR bundle for site ${siteName}: ${this._siteAssetDir}.${commandHint}`;
+    return `Missing SSR bundle for site ${this._siteOptions.siteId}: ${this._siteAssetDir}.${commandHint}`;
   }
 }

package/vona/src/suite-vendor/a-cabloy/modules/a-ssr/src/types/env.ts

@@ -4,6 +4,7 @@ export interface ZovaConfigEnv {
   META_FLAVOR: ZovaMetaFlavor;
   META_MODE: ZovaMetaMode;
   META_APP_MODE: ZovaMetaAppMode;
+  SITE_ID: string;
   APP_ROUTER_MODE: 'hash' | 'history' | 'abstract' | undefined;
   APP_ROUTER_BASE: string | undefined;
   APP_PUBLIC_PATH: string | undefined;

package/vona/src/suite-vendor/a-cabloy/modules/a-ssr/src/types/ssrMenu.ts

@@ -1,6 +1,7 @@
 import type { ILocaleRecord, OmitNever } from 'vona';
-import type { IMenuItem } from 'vona-module-a-menu';
+import type { IMenuGroup, IMenuItem } from 'vona-module-a-menu';
 import type { IOnionOptionsEnable, ServiceOnion } from 'vona-module-a-onion';
+import type { IRoleNameRecord } from 'vona-module-a-user';
 
 import type { ISsrMenuGroupRecord } from './ssrMenuGroup.ts';
 import type { IDecoratorSsrSiteOptions, ISsrSiteRecord } from './ssrSite.ts';
@@ -12,6 +13,14 @@ export interface ISsrMenuItem<Pages extends {} = {}, Icons extends {} = {}> exte
   'name' | 'group'
 > {
   group?: keyof ISsrMenuGroupRecord | (keyof ISsrMenuGroupRecord)[];
+  roles?: (keyof IRoleNameRecord)[];
+}
+
+export type ISsrMenuItemPrepared = IMenuItem<any, any> & Pick<ISsrMenuItem<any, any>, 'roles'>;
+
+export interface ISsrMenusPrepared {
+  menus?: ISsrMenuItemPrepared[];
+  groups?: IMenuGroup[];
 }
 
 // should not set default generic = IDecoratorSsrSiteOptions

package/vona/src/suite-vendor/a-cabloy/modules/a-ssr/src/types/ssrSite.ts

@@ -46,12 +46,13 @@ export interface SSRContextState {
   pageData?: unknown;
 }
 
+export interface ISsrSiteIdRecord {}
+
 export interface ISsrSitePublicPathRecord {}
 
 export interface ISsrSiteRecord {}
 
 export interface ISsrSiteDiagnosticsOptions {
-  siteName?: string;
   buildCommand?: string;
 }
 
@@ -68,6 +69,7 @@ export interface IDecoratorSsrSiteOptions<
   extends
     IOnionOptionsEnable,
     IOnionOptionsMatch<TypeOnionOptionsMatchRule<keyof IInstanceRecord>> {
+  siteId: keyof ISsrSiteIdRecord;
   publicPath: keyof ISsrSitePublicPathRecord;
   bundlePath: string;
   diagnostics?: ISsrSiteDiagnosticsOptions;

package/vona/src/suite-vendor/a-cabloy/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vona-suite-a-cabloy",
-  "version": "5.1.39",
+  "version": "5.1.40",
   "gitHead": "a79189b882c17af5911573896a781bbb0046d37d",
   "description": "",
   "author": "",

package/vona/src/suite-vendor/a-vona/modules/a-permission/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vona-module-a-permission",
-  "version": "5.1.14",
+  "version": "5.1.15",
   "gitHead": "a79189b882c17af5911573896a781bbb0046d37d",
   "description": "",
   "keywords": [

package/vona/src/suite-vendor/a-vona/modules/a-permission/src/.metadata/index.ts

@@ -27,6 +27,7 @@ declare module 'vona' {
 }
 /** bean: end */
 /** event: begin */
+export * from '../bean/event.retrievePermissionAction.ts';
 export * from '../bean/event.retrievePermissions.ts';
 
 import 'vona';
@@ -36,6 +37,17 @@ declare module 'vona' {
 }
 declare module 'vona-module-a-permission' {
   
+        export interface EventRetrievePermissionAction {
+          /** @internal */
+          get scope(): ScopeModuleAPermission;
+        }
+
+          export interface EventRetrievePermissionAction {
+            get $beanFullName(): 'a-permission.event.retrievePermissionAction';
+            get $onionName(): 'a-permission:retrievePermissionAction';
+            
+          }
+
         export interface EventRetrievePermissions {
           /** @internal */
           get scope(): ScopeModuleAPermission;
@@ -49,17 +61,21 @@ declare module 'vona-module-a-permission' {
 }
 /** event: end */
 /** event: begin */
+import type { EventRetrievePermissionAction } from '../bean/event.retrievePermissionAction.ts';
 import type { EventRetrievePermissions } from '../bean/event.retrievePermissions.ts';
 export interface IModuleEvent {
-  'retrievePermissions': EventRetrievePermissions;
+  'retrievePermissionAction': EventRetrievePermissionAction;
+'retrievePermissions': EventRetrievePermissions;
 }
 /** event: end */
 /** event: begin */
+import type { TypeEventRetrievePermissionActionData, TypeEventRetrievePermissionActionResult } from '../bean/event.retrievePermissionAction.ts';
 import type { TypeEventRetrievePermissionsData, TypeEventRetrievePermissionsResult } from '../bean/event.retrievePermissions.ts';
 import type { EventOn } from 'vona-module-a-event'; 
 declare module 'vona-module-a-event' {
   export interface IEventRecord {
-    'a-permission:retrievePermissions': EventOn<TypeEventRetrievePermissionsData, TypeEventRetrievePermissionsResult>;
+    'a-permission:retrievePermissionAction': EventOn<TypeEventRetrievePermissionActionData, TypeEventRetrievePermissionActionResult>;
+'a-permission:retrievePermissions': EventOn<TypeEventRetrievePermissionsData, TypeEventRetrievePermissionsResult>;
   }
 }
 /** event: end */

package/vona/src/suite-vendor/a-vona/modules/a-permission/src/bean/bean.permission.ts

@@ -88,7 +88,12 @@ export class BeanPermission extends BeanBase {
     const route = this._getControllerActionRoute(resource, actionKey);
     if (!route?.route?.meta) return false;
     if (!this._matchPassportMeta(route.route.meta)) return false;
-    return await this.retrievePermissionActionByRoles(resource, actionKey);
+    return await this.scope.event.retrievePermissionAction.emit(
+      { resource, actionKey },
+      async () => {
+        return await this.retrievePermissionActionByRoles(resource, actionKey);
+      },
+    );
   }
 
   @Caching.get({

package/vona/src/suite-vendor/a-vona/modules/a-permission/src/bean/event.retrievePermissionAction.ts

@@ -0,0 +1,16 @@
+import type { IResourceRecord } from 'vona-module-a-openapi';
+
+import { BeanEventBase, Event } from 'vona-module-a-event';
+
+export interface TypeEventRetrievePermissionActionData {
+  resource: keyof IResourceRecord;
+  actionKey: string;
+}
+
+export type TypeEventRetrievePermissionActionResult = boolean;
+
+@Event()
+export class EventRetrievePermissionAction extends BeanEventBase<
+  TypeEventRetrievePermissionActionData,
+  TypeEventRetrievePermissionActionResult
+> {}

package/vona/src/suite-vendor/a-vona/modules/a-user/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vona-module-a-user",
-  "version": "5.1.18",
+  "version": "5.1.19",
   "gitHead": "a79189b882c17af5911573896a781bbb0046d37d",
   "description": "",
   "keywords": [