cabloy 5.1.103 → 5.1.105

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

@@ -53,9 +53,9 @@ export class BeanPassport extends BeanBase {
     return !!user && !!user.activated;
   }
 
-  public async isAdmin(): Promise<boolean> {
+  public async isSystemAdmin(): Promise<boolean> {
     const passport = this.current;
-    return await this.passportAdapter.isAdmin(passport);
+    return await this.passportAdapter.isSystemAdmin(passport);
   }
 
   public async setCurrent(passport: IPassport | undefined) {

package/vona/src/suite-vendor/a-vona/modules/a-user/src/lib/passport.ts

@@ -15,22 +15,25 @@ function RoleName(options?: Partial<IGuardOptionsRoleName>): ClassDecorator & Me
   return Aspect.guard('a-user:roleName', options);
 }
 
-function Admin(
+function SystemAdmin(
   options?: Partial<Omit<IGuardOptionsRoleName, 'name'>>,
 ): ClassDecorator & MethodDecorator {
-  return Aspect.guard('a-user:roleName', Object.assign({}, options, { name: 'admin' as const }));
+  return Aspect.guard(
+    'a-user:roleName',
+    Object.assign({}, options, { name: 'systemAdmin' as const }),
+  );
 }
 
 export interface IDecoratorGroupPassport {
   public: typeof Public;
   activated: typeof Activated;
   roleName: typeof RoleName;
-  admin: typeof Admin;
+  systemAdmin: typeof SystemAdmin;
 }
 
 export const Passport: IDecoratorGroupPassport = {
   public: Public,
   activated: Activated,
   roleName: RoleName,
-  admin: Admin,
+  systemAdmin: SystemAdmin,
 } as unknown as IDecoratorGroupPassport;

package/vona/src/suite-vendor/a-vona/modules/a-user/src/types/passport.ts

@@ -11,7 +11,7 @@ export interface IPassport {
 }
 
 export interface IPassportAdapter {
-  isAdmin(passport: IPassport | undefined): Promise<boolean>;
+  isSystemAdmin(passport: IPassport | undefined): Promise<boolean>;
   setCurrent(passport: IPassport | undefined): Promise<IPassport | undefined>;
   serialize(passport: IPassport): Promise<IPayloadData>;
   deserialize(payloadData: IPayloadData): Promise<IPassport | undefined>;

package/vona/src/suite-vendor/a-vona/modules/a-user/src/types/role.ts

@@ -1,7 +1,8 @@
 import type { TableIdentity } from 'table-identity';
 
 export interface IRoleNameRecord {
-  admin: never;
+  registeredUser: never;
+  systemAdmin: never;
 }
 
 export interface IRoleIdRecord {}
@@ -9,6 +10,7 @@ export interface IRoleIdRecord {}
 export interface IRole {
   id: TableIdentity;
   name: string;
+  siteIds: string[];
 }
 
 export interface IRoleAdapter {

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

@@ -1,6 +1,6 @@
 {
   "name": "vona-suite-a-vona",
-  "version": "5.1.66",
+  "version": "5.1.67",
   "gitHead": "a79189b882c17af5911573896a781bbb0046d37d",
   "description": "",
   "author": "",

package/zova/env/.env.cabloyBasicAdmin

@@ -1,3 +1,5 @@
+SITE_ID = admin
+
 APP_PUBLIC_PATH = admin
 
 STYLE_DEFAULT_THEME = home-theme:orange

package/zova/env/.env.cabloyBasicWeb

@@ -1,3 +1,5 @@
+SITE_ID = web
+
 ROUTER_PAGE_HOME = /:locale
 
 LAYOUT_COMPONENT_DEFAULT = home-layoutweb:layoutWeb

package/zova/packages-utils/zova-jsx/package.json

@@ -1,6 +1,6 @@
 {
   "name": "zova-jsx",
-  "version": "1.1.77",
+  "version": "1.1.78",
   "gitHead": "2c5c19284bab738e492856189acb6fad74b8a7b7",
   "description": "Zova JSX",
   "keywords": [
@@ -50,7 +50,7 @@
     "@cabloy/word-utils": "^2.1.14",
     "typestyle": "^2.4.0",
     "vue": "^3.5.38",
-    "zova-core": "^5.1.77"
+    "zova-core": "^5.1.78"
   },
   "devDependencies": {
     "clean-package": "^2.2.0",

package/zova/packages-zova/zova/package.json

@@ -1,6 +1,6 @@
 {
   "name": "zova",
-  "version": "5.1.133",
+  "version": "5.1.135",
   "gitHead": "2c5c19284bab738e492856189acb6fad74b8a7b7",
   "description": "A vue3 framework with ioc",
   "keywords": [
@@ -45,8 +45,8 @@
     "postpack": "clean-package restore"
   },
   "dependencies": {
-    "zova-core": "^5.1.77",
-    "zova-suite-a-zova": "^5.1.132"
+    "zova-core": "^5.1.78",
+    "zova-suite-a-zova": "^5.1.134"
   },
   "devDependencies": {
     "clean-package": "^2.2.0",

package/zova/packages-zova/zova-core/package.json

@@ -1,6 +1,6 @@
 {
   "name": "zova-core",
-  "version": "5.1.77",
+  "version": "5.1.78",
   "gitHead": "2c5c19284bab738e492856189acb6fad74b8a7b7",
   "description": "A vue3 framework with ioc",
   "keywords": [

package/zova/packages-zova/zova-core/src/core/sys/sys.ts

@@ -132,6 +132,9 @@ export class ZovaSys {
   private _prepareEnv(env: NodeJS.ProcessEnv, envRuntime?: Partial<ZovaConfigEnv>): ZovaConfigEnv {
     const env2 = this._prepareEnv_Runtime(env, envRuntime);
     const env3 = this._prepareEnv_Client(env2 as any);
+    if (!env3.SITE_ID?.trim()) {
+      throw new Error(`Should specify SITE_ID for Zova flavor: ${env3.META_FLAVOR}`);
+    }
     return env3;
   }
 

package/zova/packages-zova/zova-core/src/types/utils/env.ts

@@ -6,6 +6,7 @@ export interface ZovaConfigEnv {
   META_FLAVOR: ZovaMetaFlavor;
   META_MODE: ZovaMetaMode;
   META_APP_MODE: ZovaMetaAppMode;
+  SITE_ID: string;
   APP_NAME: string | undefined;
   APP_TITLE: string | undefined;
   APP_DESCRIPTION: string | undefined;

package/zova/src/suite/a-home/modules/home-api/src/api/homeUserPassport.ts

@@ -76,6 +76,17 @@ export type ApiApiHomeUserPassportmigrateRequestQuery =
 export type ApiApiHomeUserPassportmigrateResponseBody =
   paths[ApiApiHomeUserPassportmigratePath][ApiApiHomeUserPassportmigrateMethod]['responses']['200']['content']['application/json']['data'];
 
+/** HomeUserPassport_refreshAuthToken */
+export const ApiApiHomeUserPassportrefreshAuthTokenPath =
+  '/api/home/user/passport/refreshAuthToken';
+export type ApiApiHomeUserPassportrefreshAuthTokenPath = '/api/home/user/passport/refreshAuthToken';
+export type ApiApiHomeUserPassportrefreshAuthTokenMethod = 'post';
+export type ApiApiHomeUserPassportrefreshAuthTokenRequestBody = {
+  refreshToken: string;
+};
+export type ApiApiHomeUserPassportrefreshAuthTokenResponseBody =
+  paths[ApiApiHomeUserPassportrefreshAuthTokenPath][ApiApiHomeUserPassportrefreshAuthTokenMethod]['responses']['200']['content']['application/json']['data'];
+
 /** HomeUserPassport_createPassportJwtFromOauthCode */
 export const ApiApiHomeUserPassportcreatePassportJwtFromOauthCodePath =
   '/api/home/user/passport/createPassportJwtFromOauthCode';
@@ -88,17 +99,6 @@ export type ApiApiHomeUserPassportcreatePassportJwtFromOauthCodeRequestBody = {
 export type ApiApiHomeUserPassportcreatePassportJwtFromOauthCodeResponseBody =
   paths[ApiApiHomeUserPassportcreatePassportJwtFromOauthCodePath][ApiApiHomeUserPassportcreatePassportJwtFromOauthCodeMethod]['responses']['200']['content']['application/json']['data'];
 
-/** HomeUserPassport_refreshAuthToken */
-export const ApiApiHomeUserPassportrefreshAuthTokenPath =
-  '/api/home/user/passport/refreshAuthToken';
-export type ApiApiHomeUserPassportrefreshAuthTokenPath = '/api/home/user/passport/refreshAuthToken';
-export type ApiApiHomeUserPassportrefreshAuthTokenMethod = 'post';
-export type ApiApiHomeUserPassportrefreshAuthTokenRequestBody = {
-  refreshToken: string;
-};
-export type ApiApiHomeUserPassportrefreshAuthTokenResponseBody =
-  paths[ApiApiHomeUserPassportrefreshAuthTokenPath][ApiApiHomeUserPassportrefreshAuthTokenMethod]['responses']['200']['content']['application/json']['data'];
-
 /** HomeUserPassport_createTempAuthToken */
 export const ApiApiHomeUserPassportcreateTempAuthTokenPath =
   '/api/home/user/passport/createTempAuthToken';
@@ -179,23 +179,23 @@ export class ApiHomeUserPassport extends BeanApiBase {
     );
   }
 
-  createPassportJwtFromOauthCode(
-    body: ApiApiHomeUserPassportcreatePassportJwtFromOauthCodeRequestBody,
+  refreshAuthToken(
+    body: ApiApiHomeUserPassportrefreshAuthTokenRequestBody,
     options?: IApiActionOptions,
   ) {
-    return this.$fetch.post<any, ApiApiHomeUserPassportcreatePassportJwtFromOauthCodeResponseBody>(
-      ApiApiHomeUserPassportcreatePassportJwtFromOauthCodePath,
+    return this.$fetch.post<any, ApiApiHomeUserPassportrefreshAuthTokenResponseBody>(
+      ApiApiHomeUserPassportrefreshAuthTokenPath,
       body,
       this.$configPrepare(OpenApiBaseURL(this.sys), options),
     );
   }
 
-  refreshAuthToken(
-    body: ApiApiHomeUserPassportrefreshAuthTokenRequestBody,
+  createPassportJwtFromOauthCode(
+    body: ApiApiHomeUserPassportcreatePassportJwtFromOauthCodeRequestBody,
     options?: IApiActionOptions,
   ) {
-    return this.$fetch.post<any, ApiApiHomeUserPassportrefreshAuthTokenResponseBody>(
-      ApiApiHomeUserPassportrefreshAuthTokenPath,
+    return this.$fetch.post<any, ApiApiHomeUserPassportcreatePassportJwtFromOauthCodeResponseBody>(
+      ApiApiHomeUserPassportcreatePassportJwtFromOauthCodePath,
       body,
       this.$configPrepare(OpenApiBaseURL(this.sys), options),
     );

package/zova/src/suite/a-home/modules/home-api/src/api/openapi/types.ts

@@ -256,7 +256,7 @@ export interface paths {
     patch?: never;
     trace?: never;
   };
-  '/api/home/user/passport/createPassportJwtFromOauthCode': {
+  '/api/home/user/passport/refreshAuthToken': {
     parameters: {
       query?: never;
       header?: never;
@@ -265,14 +265,14 @@ export interface paths {
     };
     get?: never;
     put?: never;
-    post: operations['HomeUserPassport_createPassportJwtFromOauthCode'];
+    post: operations['HomeUserPassport_refreshAuthToken'];
     delete?: never;
     options?: never;
     head?: never;
     patch?: never;
     trace?: never;
   };
-  '/api/home/user/passport/refreshAuthToken': {
+  '/api/home/user/passport/createPassportJwtFromOauthCode': {
     parameters: {
       query?: never;
       header?: never;
@@ -281,7 +281,7 @@ export interface paths {
     };
     get?: never;
     put?: never;
-    post: operations['HomeUserPassport_refreshAuthToken'];
+    post: operations['HomeUserPassport_createPassportJwtFromOauthCode'];
     delete?: never;
     options?: never;
     head?: never;
@@ -1531,6 +1531,7 @@ export interface components {
       id: number | string;
       /** @description Role Name */
       name: string;
+      siteIds: string[];
     };
     'home-user.dto.passportJwt': {
       passport: components['schemas']['home-user.dto.passport'];
@@ -3373,7 +3374,7 @@ export interface operations {
     };
     authToken: true;
   };
-  HomeUserPassport_createPassportJwtFromOauthCode: {
+  HomeUserPassport_refreshAuthToken: {
     parameters: {
       query?: never;
       header?: never;
@@ -3383,7 +3384,7 @@ export interface operations {
     requestBody: {
       content: {
         'application/json': {
-          code: string;
+          refreshToken: string;
         };
       };
     };
@@ -3396,13 +3397,13 @@ export interface operations {
           'application/json': {
             code: string;
             message: string;
-            data: components['schemas']['home-user.dto.passportJwt'];
+            data: components['schemas']['a-jwt.dto.jwtToken'];
           };
         };
       };
     };
   };
-  HomeUserPassport_refreshAuthToken: {
+  HomeUserPassport_createPassportJwtFromOauthCode: {
     parameters: {
       query?: never;
       header?: never;
@@ -3412,7 +3413,7 @@ export interface operations {
     requestBody: {
       content: {
         'application/json': {
-          refreshToken: string;
+          code: string;
         };
       };
     };
@@ -3425,7 +3426,7 @@ export interface operations {
           'application/json': {
             code: string;
             message: string;
-            data: components['schemas']['a-jwt.dto.jwtToken'];
+            data: components['schemas']['home-user.dto.passportJwt'];
           };
         };
       };

package/zova/src/suite/a-home/modules/home-api/src/apiSchema/homeUserPassport.ts

@@ -11,8 +11,8 @@ import {
   ApiApiHomeUserPassportloginOauthPath,
   ApiApiHomeUserPassportassociatePath,
   ApiApiHomeUserPassportmigratePath,
-  ApiApiHomeUserPassportcreatePassportJwtFromOauthCodePath,
   ApiApiHomeUserPassportrefreshAuthTokenPath,
+  ApiApiHomeUserPassportcreatePassportJwtFromOauthCodePath,
   ApiApiHomeUserPassportcreateTempAuthTokenPath,
 } from '../api/homeUserPassport.js';
 
@@ -46,6 +46,10 @@ export class ApiSchemaHomeUserPassport extends BeanBase {
     return this.$sdk.createApiSchemas(ApiApiHomeUserPassportmigratePath, 'get', options);
   }
 
+  refreshAuthToken(options?: IApiSchemaOptions) {
+    return this.$sdk.createApiSchemas(ApiApiHomeUserPassportrefreshAuthTokenPath, 'post', options);
+  }
+
   createPassportJwtFromOauthCode(options?: IApiSchemaOptions) {
     return this.$sdk.createApiSchemas(
       ApiApiHomeUserPassportcreatePassportJwtFromOauthCodePath,
@@ -54,10 +58,6 @@ export class ApiSchemaHomeUserPassport extends BeanBase {
     );
   }
 
-  refreshAuthToken(options?: IApiSchemaOptions) {
-    return this.$sdk.createApiSchemas(ApiApiHomeUserPassportrefreshAuthTokenPath, 'post', options);
-  }
-
   createTempAuthToken(options?: IApiSchemaOptions) {
     return this.$sdk.createApiSchemas(
       ApiApiHomeUserPassportcreateTempAuthTokenPath,

package/zova/src/suite/a-home/modules/home-base/src/.metadata/page/errorAccessDenied.ts

@@ -0,0 +1,9 @@
+import { createZovaComponentPage } from 'zova';
+
+import { ControllerPageErrorAccessDenied } from '../../page/errorAccessDenied/controller.jsx';
+
+export const ZPageErrorAccessDenied = createZovaComponentPage(
+  ControllerPageErrorAccessDenied,
+  undefined,
+  undefined,
+);

package/zova/src/suite/a-home/modules/home-base/src/page/errorAccessDenied/controller.tsx

@@ -0,0 +1,40 @@
+import { classes } from 'typestyle';
+import { BeanControllerPageBase } from 'zova';
+import { Controller } from 'zova-module-a-bean';
+
+@Controller()
+export class ControllerPageErrorAccessDenied extends BeanControllerPageBase {
+  cTitle: string;
+  cDescription: string;
+
+  protected async __init__() {
+    this.cTitle = this.$style({
+      fontSize: '30vh',
+    });
+    this.cDescription = classes(
+      'text-3xl',
+      this.$style({
+        opacity: '0.4',
+      }),
+    );
+  }
+
+  protected render() {
+    return (
+      <div class="text-center">
+        <div>
+          <div class={this.cTitle}>403</div>
+          <div class={this.cDescription}>Access denied.</div>
+          <button
+            class="btn btn-primary"
+            onClick={() => {
+              this.app.$gotoHome();
+            }}
+          >
+            Go Home
+          </button>
+        </div>
+      </div>
+    );
+  }
+}

package/zova/src/suite/a-home/modules/home-base/src/routes.ts

@@ -1,6 +1,7 @@
 import type { IModuleRoute } from 'zova-module-a-router';
 
 import { ZPageAuthCallback } from './.metadata/page/authCallback.js';
+import { ZPageErrorAccessDenied } from './.metadata/page/errorAccessDenied.js';
 import { ZPageErrorExpired } from './.metadata/page/errorExpired.js';
 import { ZPageErrorNotFound } from './.metadata/page/errorNotFound.js';
 
@@ -14,6 +15,14 @@ export const routes: IModuleRoute[] = [
       requiresAuth: false,
     },
   },
+  {
+    path: 'errorAccessDenied',
+    component: ZPageErrorAccessDenied,
+    meta: {
+      layout: 'empty',
+      requiresAuth: false,
+    },
+  },
   {
     path: 'errorNotFound',
     component: ZPageErrorNotFound,

package/zova/src/suite/a-home/modules/home-base/src/service/routerGuards.ts

@@ -14,11 +14,9 @@ export class ServiceRouterGuards extends BeanRouterGuardsBase {
 
   protected onRouterGuards(router: BeanRouter) {
     router.beforeEach(async to => {
-      if (
-        !this.sys.config.ssr.cookieDisabledOnServer &&
-        to.meta.requiresAuth !== false &&
-        !this.$passport.isAuthenticated
-      ) {
+      if (to.meta.requiresAuth === false) return;
+      if (this.sys.config.ssr.cookieDisabledOnServer) return;
+      if (!this.$passport.isAuthenticated) {
         const [_res, err] = await catchError(() => {
           return this.$passport.ensurePassport();
         });
@@ -26,14 +24,25 @@ export class ServiceRouterGuards extends BeanRouterGuardsBase {
           this.$errorHandler(err, 'onRouterGuards');
           return false;
         }
-        if (!this.$passport.isAuthenticated) {
-          try {
-            this.app.$gotoLogin(to.fullPath);
-          } catch (err: any) {
-            this.$errorHandler(err);
-          }
-          return false;
+      }
+      if (!this.$passport.isAuthenticated) {
+        try {
+          this.app.$gotoLogin(to.fullPath);
+        } catch (err: any) {
+          this.$errorHandler(err);
+        }
+        return false;
+      }
+      const siteId = this.sys.env.SITE_ID;
+      const siteAdmitted =
+        !!siteId && !!this.$passport.roles?.some(role => role.siteIds.includes(siteId));
+      if (!siteAdmitted) {
+        try {
+          this.app.$gotoAccessDenied();
+        } catch (err: any) {
+          this.$errorHandler(err);
         }
+        return false;
       }
     });
     router.beforeResolve(async to => {

package/zova/src/suite/a-home/modules/home-passport/src/model/passport.ts

@@ -28,7 +28,9 @@ export class ModelPassport extends BeanModelBase {
   expireTime?: number;
   schemaLogin?: SchemaObject;
 
-  protected async __init__() {
+  protected async __init__() {}
+
+  async appInitialize() {
     this.schemaLogin = this.$computed(() => {
       return this.apiSchemasLogin.requestBody;
     });
@@ -167,6 +169,10 @@ export class ModelPassport extends BeanModelBase {
     return this.passport?.roles;
   }
 
+  get isSystemAdmin() {
+    return !!this.passport?.roles.some(item => item.name === 'systemAdmin');
+  }
+
   async getJwtInfo(): Promise<IJwtInfo | undefined> {
     if (!this.accessToken) return undefined;
     return {

package/zova/src/suite/a-home/modules/home-passport/src/monkey.ts

@@ -1,11 +1,20 @@
 import type { IModule } from '@cabloy/module-info';
-import type { BeanBase, BeanContainer, IMonkeyBeanInit, IMonkeyModule } from 'zova';
+import type {
+  BeanBase,
+  BeanContainer,
+  IMonkeyAppInitialize,
+  IMonkeyBeanInit,
+  IMonkeyModule,
+} from 'zova';
 
 import { BeanSimple } from 'zova';
 
 import type { ModelPassport } from './model/passport.js';
 
-export class Monkey extends BeanSimple implements IMonkeyModule, IMonkeyBeanInit {
+export class Monkey
+  extends BeanSimple
+  implements IMonkeyAppInitialize, IMonkeyModule, IMonkeyBeanInit
+{
   private _moduleSelf: IModule;
   private $$modelPassport: ModelPassport;
 
@@ -14,13 +23,18 @@ export class Monkey extends BeanSimple implements IMonkeyModule, IMonkeyBeanInit
     this._moduleSelf = moduleSelf;
   }
 
-  async getModelPassport() {
+  private async getModelPassport() {
     if (!this.$$modelPassport) {
       this.$$modelPassport = await this.bean._getBean('home-passport.model.passport', true);
     }
     return this.$$modelPassport;
   }
 
+  async appInitialize() {
+    const modelPassport = await this.getModelPassport();
+    await modelPassport.appInitialize();
+  }
+
   async moduleLoading(_module: IModule) {}
   async moduleLoaded(module: IModule) {
     // self

package/zova/src/suite-vendor/a-zova/modules/a-model/package.json

@@ -1,6 +1,6 @@
 {
   "name": "zova-module-a-model",
-  "version": "5.1.32",
+  "version": "5.1.33",
   "gitHead": "09d901d17140a80ee0764211b441cda72fd94663",
   "description": "core",
   "keywords": [

package/zova/src/suite-vendor/a-zova/modules/a-model/src/bean/bean.model/bean.model.useState.ts

@@ -28,11 +28,11 @@ export class BeanModelUseState extends BeanModelUseQuery {
   private [SymbolUseQueries]: Record<string, unknown> = {};
   private [SymbolUseComputeds]: Record<string, unknown> = {};
 
-  async $loadStateDb<T>(dbData: T): Promise<T> {
-    return await dbData;
+  async $ensureStateLocalAsync<T>(state: T): Promise<T> {
+    return await state;
   }
 
-  $useStateDb<
+  $useStateLocalAsync<
     TQueryFnData = unknown,
     TError = DefaultError,
     TData = TQueryFnData,
@@ -41,7 +41,7 @@ export class BeanModelUseState extends BeanModelUseQuery {
     options: UndefinedInitialQueryOptions<TQueryFnData, TError, TData, TQueryKey>,
     queryClient?: QueryClient,
   ): TData;
-  $useStateDb<
+  $useStateLocalAsync<
     TQueryFnData = unknown,
     TError = DefaultError,
     TData = TQueryFnData,
@@ -50,7 +50,7 @@ export class BeanModelUseState extends BeanModelUseQuery {
     options: DefinedInitialQueryOptions<TQueryFnData, TError, TData, TQueryKey>,
     queryClient?: QueryClient,
   ): TData;
-  $useStateDb<
+  $useStateLocalAsync<
     TQueryFnData = unknown,
     TError = DefaultError,
     TData = TQueryFnData,
@@ -59,7 +59,7 @@ export class BeanModelUseState extends BeanModelUseQuery {
     options: UseQueryOptions<TQueryFnData, TError, TData, TQueryFnData, TQueryKey>,
     queryClient?: QueryClient,
   ): TData;
-  $useStateDb(options, queryClient) {
+  $useStateLocalAsync(options, queryClient) {
     options = deepExtend(
       {
         meta: {

package/zova/src/suite-vendor/a-zova/modules/a-model/src/bean/bean.model/bean.model.useStateGeneral.ts

@@ -23,7 +23,7 @@ export class BeanModelUseStateGeneral extends BeanModelUseState {
     TData = TQueryFnData,
     TQueryKey extends QueryKey = QueryKey,
   >(
-    stateType: 'db' | 'local' | 'cookie' | 'mem',
+    stateType: 'localAsync' | 'local' | 'cookie' | 'mem',
     options: UndefinedInitialQueryOptions<TQueryFnData, TError, TData, TQueryKey>,
     queryClient?: QueryClient,
   ): TData;
@@ -33,7 +33,7 @@ export class BeanModelUseStateGeneral extends BeanModelUseState {
     TData = TQueryFnData,
     TQueryKey extends QueryKey = QueryKey,
   >(
-    stateType: 'db' | 'local' | 'cookie' | 'mem',
+    stateType: 'localAsync' | 'local' | 'cookie' | 'mem',
     options: DefinedInitialQueryOptions<TQueryFnData, TError, TData, TQueryKey>,
     queryClient?: QueryClient,
   ): TData;
@@ -43,7 +43,7 @@ export class BeanModelUseStateGeneral extends BeanModelUseState {
     TData = TQueryFnData,
     TQueryKey extends QueryKey = QueryKey,
   >(
-    stateType: 'db' | 'local' | 'cookie' | 'mem',
+    stateType: 'localAsync' | 'local' | 'cookie' | 'mem',
     options: UseQueryOptions<TQueryFnData, TError, TData, TQueryFnData, TQueryKey>,
     queryClient?: QueryClient,
   ): TData;
@@ -79,8 +79,8 @@ export class BeanModelUseStateGeneral extends BeanModelUseState {
   ): UnwrapNestedRefs<UseQueryReturnType<TData, TError>>;
   $useState(stateType: StateType, options, queryClient) {
     switch (stateType) {
-      case 'db':
-        return this.$useStateDb(options, queryClient);
+      case 'localAsync':
+        return this.$useStateLocalAsync(options, queryClient);
       case 'local':
         return this.$useStateLocal(options, queryClient);
       case 'cookie':

package/zova/src/suite-vendor/a-zova/modules/a-model/src/monkey.ts

@@ -1,5 +1,11 @@
 import type { IModule } from '@cabloy/module-info';
-import type { BeanBase, BeanContainer, IMonkeyAppInitialize, IMonkeyBeanInit } from 'zova';
+import type {
+  BeanBase,
+  BeanContainer,
+  IMonkeyAppInitialize,
+  IMonkeyBeanInit,
+  IMonkeyModule,
+} from 'zova';
 
 import { useQueryClient } from '@tanstack/vue-query';
 import { markRaw } from 'vue';
@@ -7,7 +13,10 @@ import { BeanSimple } from 'zova';
 
 import { ServiceStorage } from './service/storage.js';
 
-export class Monkey extends BeanSimple implements IMonkeyAppInitialize, IMonkeyBeanInit {
+export class Monkey
+  extends BeanSimple
+  implements IMonkeyAppInitialize, IMonkeyModule, IMonkeyBeanInit
+{
   private _moduleSelf: IModule;
   private _storage: ServiceStorage;