@ruiapp/rapid-core 0.1.8 → 0.1.9

package/dist/server.d.ts

@@ -2,6 +2,7 @@ import { GetDataAccessorOptions, GetModelOptions, IDatabaseAccessor, IDatabaseCo
 import { ActionHandler, IPluginActionHandler } from "./core/actionHandler";
 import { IRpdServer, RapidPlugin } from "./core/server";
 import { Next } from "./core/routeContext";
+import EntityManager from "./dataAccess/entityManager";
 export interface InitServerOptions {
     databaseAccessor: IDatabaseAccessor;
     databaseConfig: IDatabaseConfig;
@@ -22,6 +23,7 @@ export declare class RapidServer implements IRpdServer {
     registerMiddleware(middleware: any): void;
     getDataAccessor<T = any>(options: GetDataAccessorOptions): IRpdDataAccessor<T>;
     getModel(options: GetModelOptions): RpdDataModel | undefined;
+    getEntityManager(singularCode: string): EntityManager;
     registerEventHandler<K extends keyof RpdServerEventTypes>(eventName: K, listener: (...args: RpdServerEventTypes[K]) => void): this;
     emitEvent<K extends keyof RpdServerEventTypes>(eventName: K, sender: RapidPlugin, payload: RpdServerEventTypes[K][1]): Promise<void>;
     start(): Promise<void>;

package/dist/types.d.ts

@@ -309,6 +309,9 @@ export interface FindEntityOrderByOptions {
 export interface CountEntityOptions {
     filters?: EntityFilterOptions[];
 }
+export interface CountEntityResult {
+    count: number;
+}
 export interface CreateEntityOptions {
     entity: any;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ruiapp/rapid-core",
-  "version": "0.1.8",
+  "version": "0.1.9",
   "description": "",
   "main": "dist/index.js",
   "keywords": [],

package/src/core/pluginManager.ts

@@ -71,84 +71,77 @@ class PluginManager {
 
   /** 在加载应用前调用。 */
   async onLoadingApplication(
-    server: IRpdServer,
     applicationConfig: RpdApplicationConfig,
   ) {
     for (const plugin of this.#plugins) {
       if (plugin.onLoadingApplication) {
-        await plugin.onLoadingApplication(server, applicationConfig);
+        await plugin.onLoadingApplication(this.#server, applicationConfig);
       }
     }
   }
 
   /** 配置数据模型 */
   async configureModels(
-    server: IRpdServer,
     applicationConfig: RpdApplicationConfig,
   ) {
     for (const plugin of this.#plugins) {
       if (plugin.configureModels) {
-        await plugin.configureModels(server, applicationConfig);
+        await plugin.configureModels(this.#server, applicationConfig);
       }
     }
   }
 
   /** 配置模型属性 */
   async configureModelProperties(
-    server: IRpdServer,
     applicationConfig: RpdApplicationConfig,
   ) {
     for (const plugin of this.#plugins) {
       if (plugin.configureModelProperties) {
-        await plugin.configureModelProperties(server, applicationConfig);
+        await plugin.configureModelProperties(this.#server, applicationConfig);
       }
     }
   }
 
   /** 配置路由 */
   async configureRoutes(
-    server: IRpdServer,
     applicationConfig: RpdApplicationConfig,
   ) {
     for (const plugin of this.#plugins) {
       if (plugin.configureRoutes) {
-        await plugin.configureRoutes(server, applicationConfig);
+        await plugin.configureRoutes(this.#server, applicationConfig);
       }
     }
   }
 
   /** 在应用配置加载完成后调用。此时插件可以进行一些数据的初始化工作。 */
   async onApplicationLoaded(
-    server: IRpdServer,
     applicationConfig: RpdApplicationConfig,
   ) {
     for (const plugin of this.#plugins) {
       if (plugin.onApplicationLoaded) {
-        await plugin.onApplicationLoaded(server, applicationConfig);
+        await plugin.onApplicationLoaded(this.#server, applicationConfig);
       }
     }
   }
 
   /** 在应用准备完成后调用。此时服务器已经可以处理网络请求。 */
   async onApplicationReady(
-    server: IRpdServer,
     applicationConfig: RpdApplicationConfig,
   ) {
     for (const plugin of this.#plugins) {
       if (plugin.onApplicationReady) {
-        await plugin.onApplicationReady(server, applicationConfig);
+        await plugin.onApplicationReady(this.#server, applicationConfig);
       }
     }
   }
 
   /** 在接收到HTTP请求，准备路由上下文时调用。 */
   async onPrepareRouteContext(
-    server: IRpdServer,
     routeContext: RouteContext,
   ) {
     for (const plugin of this.#plugins) {
       if (plugin.onPrepareRouteContext) {
-        await plugin.onPrepareRouteContext(server, routeContext);
+        await plugin.onPrepareRouteContext(this.#server, routeContext);
       }
     }
   }

package/src/core/server.ts

@@ -1,6 +1,7 @@
 import { GetDataAccessorOptions, GetModelOptions, IDatabaseConfig, IQueryBuilder, IRpdDataAccessor, RapidServerConfig, RpdApplicationConfig, RpdDataModel, RpdServerEventTypes } from "~/types";
 import { IPluginActionHandler, ActionHandler } from "./actionHandler";
 import { Next, RouteContext } from "./routeContext";
+import EntityManager from "~/dataAccess/entityManager";
 
 export interface IRpdServer {
   config: RapidServerConfig;
@@ -23,6 +24,7 @@ export interface IRpdServer {
   getDataAccessor<T = any>(
     options: GetDataAccessorOptions,
   ): IRpdDataAccessor<T>;
+  getEntityManager<TEntity = any>(singularCode: string): EntityManager<TEntity>;
   getApplicationConfig(): RpdApplicationConfig;
   appendApplicationConfig(config: Partial<RpdApplicationConfig>);
   getModel(options: GetModelOptions): RpdDataModel | undefined;

package/src/dataAccess/entityManager.ts

@@ -1,5 +1,7 @@
 import * as _ from "lodash";
 import {
+  CountEntityOptions,
+  CountEntityResult,
   CreateEntityOptions,
   EntityFilterOperators,
   EntityFilterOptions,
@@ -29,7 +31,7 @@ function convertToDataAccessOrderBy(model: RpdDataModel, orderByList?: FindEntit
   })
 }
 
-export async function findEntities(
+async function findEntities(
   server: IRpdServer,
   dataAccessor: IRpdDataAccessor,
   options: FindEntityOptions,
@@ -159,7 +161,7 @@ export async function findEntities(
   return entities.map(item => mapDbRowToEntity(model, item));
 }
 
-export async function findEntity(
+async function findEntity(
   server: IRpdServer,
   dataAccessor: IRpdDataAccessor,
   options: FindEntityOptions,
@@ -396,7 +398,7 @@ function findOneRelatedEntitiesViaIdPropertyCode(
   return dataAccessor.find(findEntityOptions);
 }
 
-export async function createEntity(
+async function createEntity(
   server: IRpdServer,
   dataAccessor: IRpdDataAccessor,
   options: CreateEntityOptions,
@@ -527,8 +529,7 @@ export async function createEntity(
   return newEntity;
 }
 
-
-export async function updateEntityById(
+async function updateEntityById(
   server: IRpdServer,
   dataAccessor: IRpdDataAccessor,
   options: UpdateEntityByIdOptions,
@@ -648,4 +649,54 @@ export async function updateEntityById(
   }
 
   return updatedEntity;
-}
+}
+
+export default class EntityManager<TEntity=any> {
+  #server: IRpdServer;
+  #dataAccessor: IRpdDataAccessor;
+
+  constructor(server: IRpdServer, dataAccessor: IRpdDataAccessor) {
+    this.#server = server;
+    this.#dataAccessor = dataAccessor;
+  }
+
+  async findEntities(options: FindEntityOptions): Promise<TEntity[]> {
+    return await findEntities(this.#server, this.#dataAccessor, options);
+  }
+
+  async findEntity(options: FindEntityOptions): Promise<TEntity | null> {
+    return await findEntity(this.#server, this.#dataAccessor, options);
+  }
+
+  async findById(id: any): Promise<TEntity | null> {
+    return await this.findEntity({
+      filters: [
+        {
+          operator: "eq",
+          field: "id",
+          value: id,
+        }
+      ]
+    });
+  }
+
+  async createEntity(options: CreateEntityOptions): Promise<TEntity> {
+    return await createEntity(this.#server, this.#dataAccessor, options);
+  }
+
+  async updateEntityById(options: UpdateEntityByIdOptions): Promise<TEntity> {
+    return await updateEntityById(this.#server, this.#dataAccessor, options);
+  }
+
+  async count(options: CountEntityOptions): Promise<CountEntityResult> {
+    return await this.#dataAccessor.count(options);
+  }
+
+  async deleteById(id: any): Promise<void> {
+    return await this.#dataAccessor.deleteById(id);
+  }
+
+  getModel(): RpdDataModel {
+    return this.#dataAccessor.getModel();
+  }
+}

package/src/helpers/runCollectionEntityActionHandler.ts

@@ -2,9 +2,10 @@ import * as _ from "lodash";
 import { IRpdDataAccessor, RunEntityActionHandlerOptions } from "~/types";
 import { mergeInput } from "./inputHelper";
 import { ActionHandlerContext } from "~/core/actionHandler";
+import EntityManager from "~/dataAccess/entityManager";
 
-type DataAccessHandler = (
-  dataAccessor: IRpdDataAccessor,
+type EntityActionHandler = (
+  entityManager: EntityManager,
   input: any,
 ) => Promise<any>;
 
@@ -12,7 +13,7 @@ export default async function runCollectionEntityActionHandler(
   ctx: ActionHandlerContext,
   options: RunEntityActionHandlerOptions,
   code: string,
-  handleDataAccess: DataAccessHandler,
+  handleEntityAction: EntityActionHandler,
 ) {
   const { server, input } = ctx;
   const { defaultInput, fixedInput } = options;
@@ -24,8 +25,8 @@ export default async function runCollectionEntityActionHandler(
   console.debug(`fixedInput: ${JSON.stringify(fixedInput)}`);
   console.debug(`mergedInput: ${JSON.stringify(mergedInput)}`);
 
-  const dataAccessor = server.getDataAccessor(options);
-  const result = handleDataAccess(dataAccessor, mergedInput);
+  const entityManager = server.getEntityManager(options.singularCode);
+  const result = handleEntityAction(entityManager, mergedInput);
   if (result instanceof Promise) {
     ctx.output = await result;
   } else {

package/src/plugins/auth/AuthPlugin.ts

@@ -96,9 +96,13 @@ class AuthPlugin implements RapidPlugin {
       token = request.cookies[server.config.sessionCookieName];
     }
 
-    const tokenPayload = verifyJwt(token, server.config.jwtKey);
-    routeContext.state.userId = tokenPayload.aud as string;
-    routeContext.state.userLogin = tokenPayload.act as string;
+    try {
+      const tokenPayload = verifyJwt(token, server.config.jwtKey);
+      routeContext.state.userId = tokenPayload.aud as string;
+      routeContext.state.userLogin = tokenPayload.act as string;
+    } catch (err) {
+      console.warn(err);
+    }
   }
 }
 

package/src/plugins/auth/actionHandlers/getMyProfile.ts

@@ -1,4 +1,3 @@
-import { findEntity } from "~/dataAccess/entityManager";
 import { ActionHandlerContext } from "~/core/actionHandler";
 import { RapidPlugin } from "~/core/server";
 
@@ -22,11 +21,8 @@ export async function handler(
     return;
   }
 
-  const userDataAccessor = server.getDataAccessor({
-    singularCode: "oc_user",
-  });
-
-  const user = await findEntity(server, userDataAccessor, {
+  const entityManager = server.getEntityManager("oc_user");
+  const user = await entityManager.findEntity({
     filters: [
       {
         operator: "eq",

package/src/plugins/dataManage/actionHandlers/countCollectionEntities.ts

@@ -15,9 +15,9 @@ export async function handler(
     ctx,
     options,
     code,
-    (dataAccessor, input) => {
+    (entityManager, input) => {
       input.filters = removeFiltersWithNullValue(input.filters);
-      return dataAccessor.count(input);
+      return entityManager.count(input);
     },
   );
 }

package/src/plugins/dataManage/actionHandlers/createCollectionEntitiesBatch.ts

@@ -1,6 +1,5 @@
 import { RunEntityActionHandlerOptions } from "~/types";
 import { mergeInput } from "~/helpers/inputHelper";
-import { createEntity } from "~/dataAccess/entityManager";
 import { isArray } from "lodash";
 import { ActionHandlerContext } from "~/core/actionHandler";
 import { RapidPlugin } from "~/core/server";
@@ -35,8 +34,8 @@ export async function handler(
       mergedEntity.createdBy = userId;
     }
 
-    const dataAccessor = server.getDataAccessor(options);
-    const newEntity = await createEntity(server, dataAccessor, {
+    const entityManager = server.getEntityManager(options.singularCode);
+    const newEntity = await entityManager.createEntity({
       entity: mergedEntity,
     });
 

package/src/plugins/dataManage/actionHandlers/createCollectionEntity.ts

@@ -1,6 +1,5 @@
 import { RunEntityActionHandlerOptions } from "~/types";
 import { mergeInput } from "~/helpers/inputHelper";
-import { createEntity } from "~/dataAccess/entityManager";
 import { ActionHandlerContext } from "~/core/actionHandler";
 import { RapidPlugin } from "~/core/server";
 
@@ -26,8 +25,8 @@ export async function handler(
     input.createdBy = userId;
   }
 
-  const dataAccessor = server.getDataAccessor(options);
-  const output = await createEntity(server, dataAccessor, {
+  const entityManager = server.getEntityManager(options.singularCode);
+  const output = await entityManager.createEntity({
     entity: input,
   });
   ctx.output = output;

package/src/plugins/dataManage/actionHandlers/deleteCollectionEntityById.ts

@@ -13,17 +13,17 @@ export async function handler(
   console.debug(`Running ${code} handler...`);
   const { server, input } = ctx;
 
-  const dataAccessor = server.getDataAccessor(options);
+  const entityManager = server.getEntityManager(options.singularCode);
   const id = input.id;
-  const row = await dataAccessor.findById(id);
+  const row = await entityManager.findById(id);
   if (!row) {
     ctx.status = 200;
     return;
   }
 
-  await dataAccessor.deleteById(id);
+  await entityManager.deleteById(id);
 
-  const entity = mapDbRowToEntity(dataAccessor.getModel(), row);
+  const entity = mapDbRowToEntity(entityManager.getModel(), row);
 
   server.emitEvent(
     "entity.delete",

package/src/plugins/dataManage/actionHandlers/findCollectionEntities.ts

@@ -1,7 +1,6 @@
 import * as _ from "lodash";
 import { FindEntityOptions, RunEntityActionHandlerOptions } from "~/types";
 import runCollectionEntityActionHandler from "~/helpers/runCollectionEntityActionHandler";
-import { findEntities } from "~/dataAccess/entityManager";
 import { removeFiltersWithNullValue } from "~/dataAccess/filterHelper";
 import { ActionHandlerContext } from "~/core/actionHandler";
 import { RapidPlugin } from "~/core/server";
@@ -17,9 +16,9 @@ export async function handler(
     ctx,
     options,
     code,
-    async (dataAccessor, input: FindEntityOptions) => {
+    async (entityManager, input: FindEntityOptions) => {
       input.filters = removeFiltersWithNullValue(input.filters);
-      const entities = await findEntities(ctx.server, dataAccessor, input);
+      const entities = await entityManager.findEntities(input);
       const result: {
         list: any;
         total?: any;
@@ -27,7 +26,7 @@ export async function handler(
 
       if (input.pagination && !input.pagination.withoutTotal) {
         // TOOD: impl count entities by using entity manager, because DataAccessor does not support 'exists' and 'notExists' filter.
-        const countResult = await dataAccessor.count(input);
+        const countResult = await entityManager.count(input);
         result.total = countResult.count;
       }
       return result;

package/src/plugins/dataManage/actionHandlers/findCollectionEntityById.ts

@@ -1,5 +1,4 @@
 import { RunEntityActionHandlerOptions } from "~/types";
-import { findEntity } from "~/dataAccess/entityManager";
 import { ActionHandlerContext } from "~/core/actionHandler";
 import { RapidPlugin } from "~/core/server";
 
@@ -14,18 +13,10 @@ export async function handler(
   const { server, input } = ctx;
   const { id } = input;
 
-  const dataAccessor = server.getDataAccessor(options);
-  const user = await findEntity(ctx.server, dataAccessor, {
-    filters: [
-      {
-        operator: "eq",
-        field: "id",
-        value: id,
-      }
-    ],
-  });
-  if (!user) {
+  const entityManager = server.getEntityManager(options.singularCode);
+  const entity = await entityManager.findById(id);
+  if (!entity) {
     throw new Error(`${options.namespace}.${options.singularCode} with id "${id}" was not found.`);
   }
-  ctx.output = user;
+  ctx.output = entity;
 }

package/src/plugins/dataManage/actionHandlers/updateCollectionEntityById.ts

@@ -1,7 +1,6 @@
 import { RunEntityActionHandlerOptions } from "~/types";
 import { getEntityPartChanges } from "~/helpers/entityHelpers";
 import { mergeInput } from "~/helpers/inputHelper";
-import { updateEntityById } from "~/dataAccess/entityManager";
 import { mapDbRowToEntity } from "~/dataAccess/entityMapper";
 import { ActionHandlerContext } from "~/core/actionHandler";
 import { RapidPlugin } from "~/core/server";
@@ -23,21 +22,21 @@ export async function handler(
   console.debug(`fixedInput: ${JSON.stringify(fixedInput)}`);
   console.debug(`mergedInput: ${JSON.stringify(mergedInput)}`);
 
-  const dataAccessor = server.getDataAccessor(options);
+  const entityManager = server.getEntityManager(options.singularCode);
   const id = mergedInput.id;
-  const row = await dataAccessor.findById(id);
+  const row = await entityManager.findById(id);
   if (!row) {
     throw new Error(`${options.namespace}.${options.singularCode}  with id "${id}" was not found.`);
   }
 
-  const entity = mapDbRowToEntity(dataAccessor.getModel(), row);
+  const entity = mapDbRowToEntity(entityManager.getModel(), row);
   const changes = getEntityPartChanges(entity, mergedInput);
   if (!changes) {
     ctx.output = entity;
     return;
   }
 
-  const output = await updateEntityById(server, dataAccessor, { id, entity, changes });
+  const output = await entityManager.updateEntityById({ id, entity, changes });
   ctx.output = output;
 
   server.emitEvent(

package/src/plugins/metaManage/MetaManagePlugin.ts

@@ -3,7 +3,6 @@
  */
 
 import * as _ from "lodash";
-import { findEntities } from "~/dataAccess/entityManager";
 import {
   IQueryBuilder,
   QuoteTableOptions,
@@ -206,13 +205,10 @@ function listCollections(
   server: IRpdServer,
   applicationConfig: RpdApplicationConfig,
 ) {
-  const dataAccessor = server.getDataAccessor({
-    namespace: "meta",
-    singularCode: "model",
-  });
-  const model = dataAccessor.getModel();
+  const entityManager = server.getEntityManager("model");
+  const model = entityManager.getModel();
 
-  return findEntities(server, dataAccessor, {
+  return entityManager.findEntities({
     properties: model.properties.map((item) => item.code),
   });
 }

package/src/plugins/routeManage/RouteManagePlugin.ts

@@ -6,7 +6,6 @@ import {
   RpdApplicationConfig,
 } from "~/types";
 import { RpdServerPluginExtendingAbilities, RpdServerPluginConfigurableTargetOptions, RpdConfigurationItemOptions, IRpdServer, RapidPlugin } from "~/core/server";
-import { findEntities } from "../../dataAccess/entityManager";
 import * as httpProxy from "./actionHandlers/httpProxy";
 
 
@@ -65,12 +64,8 @@ class RouteManager implements RapidPlugin {
 
   async configureRoutes(server: IRpdServer, applicationConfig: RpdApplicationConfig): Promise<any> {
     try {
-      const dataAccessor = server.getDataAccessor({
-        namespace: "meta",
-        singularCode: "route",
-      });
-    
-      const routes = await findEntities(server, dataAccessor, {
+      const entityManager = server.getEntityManager("route");
+      const routes = await entityManager.findEntities({
         orderBy: [
           { field: "endpoint" },
         ],

package/src/plugins/webhooks/WebhooksPlugin.ts

@@ -12,7 +12,6 @@ import {
 } from "~/types";
 import { RpdServerPluginExtendingAbilities, RpdServerPluginConfigurableTargetOptions, RpdConfigurationItemOptions, IRpdServer, RapidPlugin } from "~/core/server";
 import { fetchWithTimeout } from "~/utilities/httpUtility";
-import { findEntities } from "~/dataAccess/entityManager";
 import pluginConfig from "./pluginConfig";
 
 
@@ -31,12 +30,8 @@ export interface Webhook {
 function listWebhooks(
   server: IRpdServer,
 ) {
-  const dataAccessor = server.getDataAccessor({
-    namespace: "sys",
-    singularCode: "webhook",
-  });
-
-  return findEntities(server, dataAccessor, {
+  const entityManager = server.getEntityManager("webhook");
+  return entityManager.findEntities({
     filters: [
       {
         field: "enabled",

package/src/server.ts

@@ -22,6 +22,7 @@ import { buildRoutes } from "./core/routesBuilder";
 import { Next, RouteContext } from "./core/routeContext";
 import { RapidRequest } from "./core/request";
 import bootstrapApplicationConfig from "./bootstrapApplicationConfig";
+import EntityManager from "./dataAccess/entityManager";
 
 export interface InitServerOptions {
   databaseAccessor: IDatabaseAccessor;
@@ -40,6 +41,8 @@ export class RapidServer implements IRpdServer {
   #applicationConfig: RpdApplicationConfig;
   #actionHandlersMapByCode: Map<string, ActionHandler>;
   #databaseAccessor: IDatabaseAccessor;
+  #cachedDataAccessors: Map<string, DataAccessor>;
+  #cachedEntityManager: Map<string, EntityManager>;
   queryBuilder: IQueryBuilder;
   config: RapidServerConfig;
   databaseConfig: IDatabaseConfig;
@@ -54,6 +57,8 @@ export class RapidServer implements IRpdServer {
     this.#applicationConfig = {} as RpdApplicationConfig;
     this.#actionHandlersMapByCode = new Map();
     this.#databaseAccessor = options.databaseAccessor;
+    this.#cachedDataAccessors = new Map();
+    this.#cachedEntityManager = new Map();
 
     this.queryBuilder = new QueryBuilder({
       dbDefaultSchema: options.databaseConfig.dbDefaultSchema,
@@ -123,16 +128,22 @@ export class RapidServer implements IRpdServer {
     options: GetDataAccessorOptions,
   ): IRpdDataAccessor<T> {
     const { namespace, singularCode } = options;
-    // TODO: Should reuse the and DataAccessor instance
+
+    let dataAccessor = this.#cachedDataAccessors.get(singularCode);
+    if (dataAccessor) {
+      return dataAccessor;
+    }
+
     const model = this.getModel(options);
     if (!model) {
       throw new Error(`Data model ${namespace}.${singularCode} not found.`);
     }
 
-    const dataAccessor = new DataAccessor<T>(this.#databaseAccessor, {
+    dataAccessor = new DataAccessor<T>(this.#databaseAccessor, {
       model,
       queryBuilder: this.queryBuilder as QueryBuilder,
     });
+    this.#cachedDataAccessors.set(singularCode, dataAccessor);
     return dataAccessor;
   }
 
@@ -144,6 +155,18 @@ export class RapidServer implements IRpdServer {
     return this.#applicationConfig?.models.find((e) => e.singularCode === options.singularCode);
   }
 
+  getEntityManager<TEntity = any>(singularCode: string): EntityManager<TEntity> {
+    let entityManager = this.#cachedEntityManager.get(singularCode);
+    if (entityManager) {
+      return entityManager;
+    }
+
+    const dataAccessor = this.getDataAccessor({ singularCode });
+    entityManager = new EntityManager(this, dataAccessor);
+    this.#cachedEntityManager.set(singularCode, entityManager);
+    return entityManager;
+  }
+
   registerEventHandler<K extends keyof RpdServerEventTypes>(
     eventName: K,
     listener: (...args: RpdServerEventTypes[K]) => void,
@@ -186,7 +209,7 @@ export class RapidServer implements IRpdServer {
     await this.configureApplication();
 
     console.log(`Application ready.`);
-    await pluginManager.onApplicationReady(this, this.#applicationConfig);
+    await pluginManager.onApplicationReady(this.#applicationConfig);
   }
 
   async configureApplication() {
@@ -196,14 +219,14 @@ export class RapidServer implements IRpdServer {
     ) as RpdApplicationConfig;
 
     const pluginManager = this.#pluginManager;
-    await pluginManager.onLoadingApplication(this, this.#applicationConfig);
-    await pluginManager.configureModels(this, this.#applicationConfig);
-    await pluginManager.configureModelProperties(this, this.#applicationConfig);
-    await pluginManager.configureRoutes(this, this.#applicationConfig);
+    await pluginManager.onLoadingApplication(this.#applicationConfig);
+    await pluginManager.configureModels(this.#applicationConfig);
+    await pluginManager.configureModelProperties(this.#applicationConfig);
+    await pluginManager.configureRoutes(this.#applicationConfig);
 
     // TODO: check application configuration.
 
-    await pluginManager.onApplicationLoaded(this, this.#applicationConfig);
+    await pluginManager.onApplicationLoaded(this.#applicationConfig);
 
     this.#buildedRoutes = await buildRoutes(this, this.#applicationConfig);
   }
@@ -230,6 +253,7 @@ export class RapidServer implements IRpdServer {
     const rapidRequest = new RapidRequest(request);
     await rapidRequest.parseBody();
     const routeContext = new RouteContext(rapidRequest);
+    this.#pluginManager.onPrepareRouteContext(routeContext);
 
     await this.#buildedRoutes(routeContext, next);
     return routeContext.response.getResponse();

package/src/types.ts

@@ -416,6 +416,10 @@ export interface CountEntityOptions {
   filters?: EntityFilterOptions[];
 }
 
+export interface CountEntityResult {
+  count: number;
+}
+
 export interface CreateEntityOptions {
   entity: any;
 }