@ruiapp/rapid-core 0.1.7 → 0.1.9

package/dist/plugins/auth/AuthPlugin.d.ts

@@ -1,9 +1,9 @@
 /**
  * Auth manager plugin
  */
-import { RpdApplicationConfig } from "~/types";
-import { IRpdServer, RapidPlugin, RpdConfigurationItemOptions, RpdServerPluginConfigurableTargetOptions, RpdServerPluginExtendingAbilities } from "~/core/server";
-import { RouteContext } from "~/core/routeContext";
+import { RpdApplicationConfig } from "../../types";
+import { IRpdServer, RapidPlugin, RpdConfigurationItemOptions, RpdServerPluginConfigurableTargetOptions, RpdServerPluginExtendingAbilities } from "../../core/server";
+import { RouteContext } from "../../core/routeContext";
 declare class AuthPlugin implements RapidPlugin {
     get code(): string;
     get description(): string;

package/dist/plugins/auth/actionHandlers/createSession.d.ts

@@ -1,5 +1,5 @@
-import { ActionHandlerContext } from "~/core/actionHandler";
-import { RapidPlugin } from "~/core/server";
+import { ActionHandlerContext } from "../../../core/actionHandler";
+import { RapidPlugin } from "../../../core/server";
 export interface UserAccessToken {
     sub: "userAccessToken";
     aud: string;

package/dist/plugins/auth/actionHandlers/deleteSession.d.ts

@@ -1,4 +1,4 @@
-import { ActionHandlerContext } from "~/core/actionHandler";
-import { RapidPlugin } from "~/core/server";
+import { ActionHandlerContext } from "../../../core/actionHandler";
+import { RapidPlugin } from "../../../core/server";
 export declare const code = "deleteSession";
 export declare function handler(plugin: RapidPlugin, ctx: ActionHandlerContext, options: any): Promise<void>;

package/dist/plugins/auth/actionHandlers/getMyProfile.d.ts

@@ -1,4 +1,4 @@
-import { ActionHandlerContext } from "~/core/actionHandler";
-import { RapidPlugin } from "~/core/server";
+import { ActionHandlerContext } from "../../../core/actionHandler";
+import { RapidPlugin } from "../../../core/server";
 export declare const code = "getMyProfile";
 export declare function handler(plugin: RapidPlugin, ctx: ActionHandlerContext, options: any): Promise<void>;

package/dist/plugins/auth/models/AccessToken.d.ts

@@ -1,3 +1,3 @@
-import { RpdDataModel } from "~/types";
+import { RpdDataModel } from "../../../types";
 declare const _default: RpdDataModel;
 export default _default;

package/dist/plugins/dataManage/DataManagePlugin.d.ts

@@ -3,8 +3,8 @@
  * This plugin provide:
  * - routes for manage data in database.
  */
-import { RpdApplicationConfig } from "~/types";
-import { RpdServerPluginExtendingAbilities, RpdServerPluginConfigurableTargetOptions, RpdConfigurationItemOptions, IRpdServer, RapidPlugin } from "~/core/server";
+import { RpdApplicationConfig } from "../../types";
+import { RpdServerPluginExtendingAbilities, RpdServerPluginConfigurableTargetOptions, RpdConfigurationItemOptions, IRpdServer, RapidPlugin } from "../../core/server";
 declare class DataManager implements RapidPlugin {
     get code(): string;
     get description(): string;

package/dist/plugins/dataManage/actionHandlers/addEntityRelations.d.ts

@@ -1,5 +1,5 @@
-import { RunEntityActionHandlerOptions } from "~/types";
-import { ActionHandlerContext } from "~/core/actionHandler";
-import { RapidPlugin } from "~/core/server";
+import { RunEntityActionHandlerOptions } from "../../../types";
+import { ActionHandlerContext } from "../../../core/actionHandler";
+import { RapidPlugin } from "../../../core/server";
 export declare const code = "addEntityRelations";
 export declare function handler(plugin: RapidPlugin, ctx: ActionHandlerContext, options: RunEntityActionHandlerOptions): Promise<void>;

package/dist/plugins/dataManage/actionHandlers/countCollectionEntities.d.ts

@@ -1,5 +1,5 @@
-import { RunEntityActionHandlerOptions } from "~/types";
-import { ActionHandlerContext } from "~/core/actionHandler";
-import { RapidPlugin } from "~/core/server";
+import { RunEntityActionHandlerOptions } from "../../../types";
+import { ActionHandlerContext } from "../../../core/actionHandler";
+import { RapidPlugin } from "../../../core/server";
 export declare const code = "countCollectionEntities";
 export declare function handler(plugin: RapidPlugin, ctx: ActionHandlerContext, options: RunEntityActionHandlerOptions): Promise<void>;

package/dist/plugins/dataManage/actionHandlers/createCollectionEntitiesBatch.d.ts

@@ -1,5 +1,5 @@
-import { RunEntityActionHandlerOptions } from "~/types";
-import { ActionHandlerContext } from "~/core/actionHandler";
-import { RapidPlugin } from "~/core/server";
+import { RunEntityActionHandlerOptions } from "../../../types";
+import { ActionHandlerContext } from "../../../core/actionHandler";
+import { RapidPlugin } from "../../../core/server";
 export declare const code = "createCollectionEntitiesBatch";
 export declare function handler(plugin: RapidPlugin, ctx: ActionHandlerContext, options: RunEntityActionHandlerOptions): Promise<void>;

package/dist/plugins/dataManage/actionHandlers/createCollectionEntity.d.ts

@@ -1,5 +1,5 @@
-import { RunEntityActionHandlerOptions } from "~/types";
-import { ActionHandlerContext } from "~/core/actionHandler";
-import { RapidPlugin } from "~/core/server";
+import { RunEntityActionHandlerOptions } from "../../../types";
+import { ActionHandlerContext } from "../../../core/actionHandler";
+import { RapidPlugin } from "../../../core/server";
 export declare const code = "createCollectionEntity";
 export declare function handler(plugin: RapidPlugin, ctx: ActionHandlerContext, options: RunEntityActionHandlerOptions): Promise<void>;

package/dist/plugins/dataManage/actionHandlers/deleteCollectionEntityById.d.ts

@@ -1,5 +1,5 @@
-import { RunEntityActionHandlerOptions } from "~/types";
-import { ActionHandlerContext } from "~/core/actionHandler";
-import { RapidPlugin } from "~/core/server";
+import { RunEntityActionHandlerOptions } from "../../../types";
+import { ActionHandlerContext } from "../../../core/actionHandler";
+import { RapidPlugin } from "../../../core/server";
 export declare const code = "deleteCollectionEntityById";
 export declare function handler(plugin: RapidPlugin, ctx: ActionHandlerContext, options: RunEntityActionHandlerOptions): Promise<void>;

package/dist/plugins/dataManage/actionHandlers/findCollectionEntities.d.ts

@@ -1,5 +1,5 @@
-import { RunEntityActionHandlerOptions } from "~/types";
-import { ActionHandlerContext } from "~/core/actionHandler";
-import { RapidPlugin } from "~/core/server";
+import { RunEntityActionHandlerOptions } from "../../../types";
+import { ActionHandlerContext } from "../../../core/actionHandler";
+import { RapidPlugin } from "../../../core/server";
 export declare const code = "findCollectionEntities";
 export declare function handler(plugin: RapidPlugin, ctx: ActionHandlerContext, options: RunEntityActionHandlerOptions): Promise<void>;

package/dist/plugins/dataManage/actionHandlers/findCollectionEntityById.d.ts

@@ -1,5 +1,5 @@
-import { RunEntityActionHandlerOptions } from "~/types";
-import { ActionHandlerContext } from "~/core/actionHandler";
-import { RapidPlugin } from "~/core/server";
+import { RunEntityActionHandlerOptions } from "../../../types";
+import { ActionHandlerContext } from "../../../core/actionHandler";
+import { RapidPlugin } from "../../../core/server";
 export declare const code = "findCollectionEntityById";
 export declare function handler(plugin: RapidPlugin, ctx: ActionHandlerContext, options: RunEntityActionHandlerOptions): Promise<void>;

package/dist/plugins/dataManage/actionHandlers/queryDatabase.d.ts

@@ -1,5 +1,5 @@
-import { RunQueryDatabaseHandlerOptions } from "~/types";
-import { ActionHandlerContext } from "~/core/actionHandler";
-import { RapidPlugin } from "~/core/server";
+import { RunQueryDatabaseHandlerOptions } from "../../../types";
+import { ActionHandlerContext } from "../../../core/actionHandler";
+import { RapidPlugin } from "../../../core/server";
 export declare const code = "queryDatabase";
 export declare function handler(plugin: RapidPlugin, ctx: ActionHandlerContext, options: RunQueryDatabaseHandlerOptions): Promise<void>;

package/dist/plugins/dataManage/actionHandlers/removeEntityRelations.d.ts

@@ -1,5 +1,5 @@
-import { RunEntityActionHandlerOptions } from "~/types";
-import { ActionHandlerContext } from "~/core/actionHandler";
-import { RapidPlugin } from "~/core/server";
+import { RunEntityActionHandlerOptions } from "../../../types";
+import { ActionHandlerContext } from "../../../core/actionHandler";
+import { RapidPlugin } from "../../../core/server";
 export declare const code = "removeEntityRelations";
 export declare function handler(plugin: RapidPlugin, ctx: ActionHandlerContext, options: RunEntityActionHandlerOptions): Promise<void>;

package/dist/plugins/dataManage/actionHandlers/updateCollectionEntityById.d.ts

@@ -1,5 +1,5 @@
-import { RunEntityActionHandlerOptions } from "~/types";
-import { ActionHandlerContext } from "~/core/actionHandler";
-import { RapidPlugin } from "~/core/server";
+import { RunEntityActionHandlerOptions } from "../../../types";
+import { ActionHandlerContext } from "../../../core/actionHandler";
+import { RapidPlugin } from "../../../core/server";
 export declare const code = "updateCollectionEntityById";
 export declare function handler(plugin: RapidPlugin, ctx: ActionHandlerContext, options: RunEntityActionHandlerOptions): Promise<void>;

package/dist/plugins/fileManage/FileManagePlugin.d.ts

@@ -1,8 +1,8 @@
 /**
  * File manager plugin
  */
-import { RpdApplicationConfig } from "~/types";
-import { IRpdServer, RapidPlugin, RpdConfigurationItemOptions, RpdServerPluginConfigurableTargetOptions, RpdServerPluginExtendingAbilities } from "~/core/server";
+import { RpdApplicationConfig } from "../../types";
+import { IRpdServer, RapidPlugin, RpdConfigurationItemOptions, RpdServerPluginConfigurableTargetOptions, RpdServerPluginExtendingAbilities } from "../../core/server";
 declare class FileManager implements RapidPlugin {
     get code(): string;
     get description(): string;

package/dist/plugins/fileManage/actionHandlers/downloadDocument.d.ts

@@ -1,4 +1,4 @@
-import { ActionHandlerContext } from "~/core/actionHandler";
-import { RapidPlugin } from "~/core/server";
+import { ActionHandlerContext } from "../../../core/actionHandler";
+import { RapidPlugin } from "../../../core/server";
 export declare const code = "downloadDocument";
 export declare function handler(plugin: RapidPlugin, ctx: ActionHandlerContext, options: any): Promise<void>;

package/dist/plugins/fileManage/actionHandlers/downloadFile.d.ts

@@ -1,4 +1,4 @@
-import { ActionHandlerContext } from "~/core/actionHandler";
-import { RapidPlugin } from "~/core/server";
+import { ActionHandlerContext } from "../../../core/actionHandler";
+import { RapidPlugin } from "../../../core/server";
 export declare const code = "downloadFile";
 export declare function handler(plugin: RapidPlugin, ctx: ActionHandlerContext, options: any): Promise<void>;

package/dist/plugins/fileManage/actionHandlers/uploadFile.d.ts

@@ -1,4 +1,4 @@
-import { ActionHandlerContext } from "~/core/actionHandler";
-import { RapidPlugin } from "~/core/server";
+import { ActionHandlerContext } from "../../../core/actionHandler";
+import { RapidPlugin } from "../../../core/server";
 export declare const code = "uploadFile";
 export declare function handler(plugin: RapidPlugin, ctx: ActionHandlerContext, options: any): Promise<void>;

package/dist/plugins/metaManage/MetaManagePlugin.d.ts

@@ -1,8 +1,8 @@
 /**
  * Meta manager plugin
  */
-import { RpdApplicationConfig } from "~/types";
-import { IRpdServer, RapidPlugin, RpdConfigurationItemOptions, RpdServerPluginConfigurableTargetOptions, RpdServerPluginExtendingAbilities } from "~/core/server";
+import { RpdApplicationConfig } from "../../types";
+import { IRpdServer, RapidPlugin, RpdConfigurationItemOptions, RpdServerPluginConfigurableTargetOptions, RpdServerPluginExtendingAbilities } from "../../core/server";
 declare class MetaManager implements RapidPlugin {
     get code(): string;
     get description(): string;

package/dist/plugins/metaManage/actionHandlers/getMetaModelDetail.d.ts

@@ -1,4 +1,4 @@
-import { ActionHandlerContext } from "~/core/actionHandler";
-import { RapidPlugin } from "~/core/server";
+import { ActionHandlerContext } from "../../../core/actionHandler";
+import { RapidPlugin } from "../../../core/server";
 export declare const code = "getMetaModelDetail";
 export declare function handler(plugin: RapidPlugin, ctx: ActionHandlerContext, options: any): Promise<void>;

package/dist/plugins/metaManage/actionHandlers/listMetaModels.d.ts

@@ -1,4 +1,4 @@
-import { ActionHandlerContext } from "~/core/actionHandler";
-import { RapidPlugin } from "~/core/server";
+import { ActionHandlerContext } from "../../../core/actionHandler";
+import { RapidPlugin } from "../../../core/server";
 export declare const code = "listMetaModels";
 export declare function handler(plugin: RapidPlugin, ctx: ActionHandlerContext, options: any): Promise<void>;

package/dist/plugins/metaManage/actionHandlers/listMetaRoutes.d.ts

@@ -1,4 +1,4 @@
-import { ActionHandlerContext } from "~/core/actionHandler";
-import { RapidPlugin } from "~/core/server";
+import { ActionHandlerContext } from "../../../core/actionHandler";
+import { RapidPlugin } from "../../../core/server";
 export declare const code = "listMetaRoutes";
 export declare function handler(plugin: RapidPlugin, ctx: ActionHandlerContext, options: any): Promise<void>;

package/dist/plugins/routeManage/RouteManagePlugin.d.ts

@@ -1,8 +1,8 @@
 /**
  * Route manager plugin
  */
-import { RpdApplicationConfig } from "~/types";
-import { RpdServerPluginExtendingAbilities, RpdServerPluginConfigurableTargetOptions, RpdConfigurationItemOptions, IRpdServer, RapidPlugin } from "~/core/server";
+import { RpdApplicationConfig } from "../../types";
+import { RpdServerPluginExtendingAbilities, RpdServerPluginConfigurableTargetOptions, RpdConfigurationItemOptions, IRpdServer, RapidPlugin } from "../../core/server";
 declare class RouteManager implements RapidPlugin {
     get code(): string;
     get description(): string;

package/dist/plugins/routeManage/actionHandlers/httpProxy.d.ts

@@ -1,5 +1,5 @@
-import { RunProxyHandlerOptions } from "~/types";
-import { ActionHandlerContext } from "~/core/actionHandler";
-import { RapidPlugin } from "~/core/server";
+import { RunProxyHandlerOptions } from "../../../types";
+import { ActionHandlerContext } from "../../../core/actionHandler";
+import { RapidPlugin } from "../../../core/server";
 export declare const code = "httpProxy";
 export declare function handler(plugin: RapidPlugin, ctx: ActionHandlerContext, options: RunProxyHandlerOptions): Promise<void>;

package/dist/plugins/webhooks/WebhooksPlugin.d.ts

@@ -1,8 +1,8 @@
 /**
  * Webhooks plugin
  */
-import { RpdApplicationConfig, RpdEntityCreateEventPayload, RpdEntityDeleteEventPayload, RpdEntityUpdateEventPayload, RpdServerEventTypes } from "~/types";
-import { RpdServerPluginExtendingAbilities, RpdServerPluginConfigurableTargetOptions, RpdConfigurationItemOptions, IRpdServer, RapidPlugin } from "~/core/server";
+import { RpdApplicationConfig, RpdEntityCreateEventPayload, RpdEntityDeleteEventPayload, RpdEntityUpdateEventPayload, RpdServerEventTypes } from "../../types";
+import { RpdServerPluginExtendingAbilities, RpdServerPluginConfigurableTargetOptions, RpdConfigurationItemOptions, IRpdServer, RapidPlugin } from "../../core/server";
 export interface Webhook {
     name: string;
     url: string;

package/dist/proxy/mod.d.ts

@@ -1,5 +1,5 @@
 import { ProxyContext, ProxyOptions } from "./types";
-import { RouteContext } from "~/core/routeContext";
+import { RouteContext } from "../core/routeContext";
 export declare function doProxy(sourceRouterCtx: RouteContext, options: ProxyOptions): Promise<void>;
 export declare function createProxyContext(sourceRouterCtx: RouteContext, options: ProxyOptions): {
     sourceContext: {

package/dist/proxy/types.d.ts

@@ -1,6 +1,6 @@
-import { RapidRequest } from "~/core/request";
+import { RapidRequest } from "../core/request";
 import { RunProxyHandlerOptions } from "../types";
-import { RapidResponse } from "~/core/response";
+import { RapidResponse } from "../core/response";
 export interface ProxyContext {
     sourceContext: ProxySourceContext;
     targetContext: ProxyTargetContext;

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.7",
+  "version": "0.1.9",
   "description": "",
   "main": "dist/index.js",
   "keywords": [],
@@ -12,8 +12,8 @@
     "@types/node": "^20.11.16",
     "rimraf": "^3.0.2",
     "rollup": "^2.79.1",
-    "rollup-plugin-tsconfig-paths": "^1.5.2",
     "rollup-plugin-typescript2": "^0.34.1",
+    "tsc-alias": "^1.8.8",
     "typescript": "^4.8.4"
   },
   "dependencies": {

package/rollup.config.js

@@ -1,5 +1,22 @@
+import { exec } from "child_process";
 import typescript from 'rollup-plugin-typescript2';
-// import tsConfigPaths from "rollup-plugin-tsconfig-paths"
+
+const tscAlias = () => {
+    return {
+        name: "tsAlias",
+        writeBundle: () => {
+            return new Promise((resolve, reject) => {
+                exec("tsc-alias", function callback(error, stdout, stderr) {
+                    if (stderr || error) {
+                        reject(stderr || error);
+                    } else {
+                        resolve(stdout);
+                    }
+                });
+            });
+        },
+    };
+};
 
 export default {
     input: ["src/index.ts"],
@@ -13,7 +30,7 @@ export default {
     ],
     plugins: [
         typescript(),
-        // tsConfigPaths(),
+        tscAlias(),
     ],
     external: [
     ]

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);
+    }
   }
 }