@ruiapp/rapid-core 0.9.2 → 0.9.4

package/dist/core/pluginManager.d.ts

@@ -1,4 +1,4 @@
-import { CreateEntityOptions, RpdApplicationConfig, RpdDataModel, UpdateEntityByIdOptions } from "../types";
+import { CreateEntityOptions, RpdApplicationConfig, RpdDataModel, RpdRouteActionConfig, UpdateEntityByIdOptions } from "../types";
 import { IRpdServer, RapidPlugin } from "./server";
 import { RouteContext } from "./routeContext";
 import { ActionHandlerContext } from "./actionHandler";
@@ -38,6 +38,8 @@ declare class PluginManager {
     onPrepareRouteContext(routeContext: RouteContext): Promise<void>;
     /** 在接收到HTTP请求，执行 actions 前调用。 */
     beforeRunRouteActions(handlerContext: ActionHandlerContext): Promise<void>;
+    /** 在执行 action hanlder 前调用。 */
+    beforeRunActionHandler(handlerContext: ActionHandlerContext, actionConfig: RpdRouteActionConfig): Promise<void>;
     /** 在创建实体前调用。 */
     beforeCreateEntity(model: RpdDataModel, options: CreateEntityOptions): Promise<void>;
     /** 在更新实体前调用。 */

package/dist/core/routeContext.d.ts

@@ -2,7 +2,7 @@ import { RapidRequest } from "./request";
 import { RapidResponse } from "./response";
 import { HttpStatus } from "./http-types";
 import { IRpdServer } from "./server";
-import { IDatabaseAccessor, IDatabaseClient } from "../types";
+import { IDatabaseAccessor, IDatabaseClient, RpdRoute } from "../types";
 export type Next = () => Promise<void>;
 export type TransactionState = "uninited" | "inited" | "started";
 export declare class RouteContext {
@@ -14,7 +14,7 @@ export declare class RouteContext {
     method: string;
     path: string;
     params: Record<string, string>;
-    routeConfig: any;
+    routeConfig: RpdRoute;
     static newSystemOperationContext(server: IRpdServer): RouteContext;
     constructor(server: IRpdServer, request?: RapidRequest);
     clone(): RouteContext;

package/dist/core/server.d.ts

@@ -1,4 +1,4 @@
-import { CreateEntityOptions, EmitServerEventOptions, EntityWatcherType, GetDataAccessorOptions, GetModelOptions, IDatabaseAccessor, IDatabaseClient, IDatabaseConfig, IQueryBuilder, IRpdDataAccessor, RapidServerConfig, RpdApplicationConfig, RpdDataModel, RpdDataModelProperty, RpdServerEventTypes, UpdateEntityByIdOptions } from "../types";
+import { CreateEntityOptions, EmitServerEventOptions, EntityWatcherType, GetDataAccessorOptions, GetModelOptions, IDatabaseAccessor, IDatabaseClient, IDatabaseConfig, IQueryBuilder, IRpdDataAccessor, RapidServerConfig, RpdApplicationConfig, RpdDataModel, RpdDataModelProperty, RpdRouteActionConfig, RpdServerEventTypes, UpdateEntityByIdOptions } from "../types";
 import { IPluginActionHandler, ActionHandler, ActionHandlerContext } from "./actionHandler";
 import { Next, RouteContext } from "./routeContext";
 import EntityManager from "../dataAccess/entityManager";
@@ -32,6 +32,7 @@ export interface IRpdServer {
     emitEvent<TEventName extends keyof RpdServerEventTypes>(event: EmitServerEventOptions<TEventName>): void;
     handleRequest(request: RapidRequest, next: Next): Promise<Response>;
     beforeRunRouteActions(handlerContext: ActionHandlerContext): Promise<void>;
+    beforeRunActionHandler(handlerContext: ActionHandlerContext, actionConfig: RpdRouteActionConfig): Promise<void>;
     beforeCreateEntity(model: RpdDataModel, options: CreateEntityOptions): Promise<void>;
     beforeUpdateEntity(model: RpdDataModel, options: UpdateEntityByIdOptions, currentEntity: any): Promise<void>;
     registerCronJob(job: CronJobConfiguration): void;
@@ -108,6 +109,8 @@ export interface RapidPlugin {
     onPrepareRouteContext?: (server: IRpdServer, routeContext: RouteContext) => Promise<any>;
     /** 在接收到HTTP请求，执行 actions 前调用。 */
     beforeRunRouteActions?: (server: IRpdServer, handlerContext: ActionHandlerContext) => Promise<any>;
+    /** 在执行 action hanlder 前调用。 */
+    beforeRunActionHandler?: (server: IRpdServer, handlerContext: ActionHandlerContext, actionConfig: RpdRouteActionConfig) => Promise<any>;
     /** 在创建实体前调用。 */
     beforeCreateEntity?: (server: IRpdServer, model: RpdDataModel, options: CreateEntityOptions) => Promise<any>;
     /** 在更新实体前调用。 */

package/dist/index.d.ts

@@ -15,8 +15,12 @@ export * from "./utilities/accessControlUtility";
 export * from "./utilities/entityUtility";
 export * from "./utilities/jwtUtility";
 export * from "./utilities/timeUtility";
-export * from "./helpers/entityHelpers";
+export * from "./utilities/passwordUtility";
+export * from "./helpers/entityHelper";
 export * from "./helpers/licenseHelper";
+export * as entityHelper from "./helpers/entityHelper";
+export * as licenseHelper from "./helpers/licenseHelper";
+export * as metaHelper from "./helpers/metaHelper";
 export * from "./deno-std/http/cookie";
 export { mapDbRowToEntity } from "./dataAccess/entityMapper";
 export * as bootstrapApplicationConfig from "./bootstrapApplicationConfig";

package/dist/index.js

@@ -9,7 +9,7 @@ var qs = require('qs');
 var dayjs = require('dayjs');
 var jsonwebtoken = require('jsonwebtoken');
 var crypto = require('crypto');
-var bcrypt = require('bcrypt');
+var bcrypt = require('bcryptjs');
 var path = require('path');
 var fs = require('fs');
 var uuid = require('uuid');
@@ -928,6 +928,14 @@ class PluginManager {
             }
         }
     }
+    /** 在执行 action hanlder 前调用。 */
+    async beforeRunActionHandler(handlerContext, actionConfig) {
+        for (const plugin of this.#plugins) {
+            if (plugin.beforeRunActionHandler) {
+                await plugin.beforeRunActionHandler(this.#server, handlerContext, actionConfig);
+            }
+        }
+    }
     /** 在创建实体前调用。 */
     async beforeCreateEntity(model, options) {
         for (const plugin of this.#plugins) {
@@ -1030,6 +1038,7 @@ async function buildRoutes(server, applicationConfig) {
                 if (!handler) {
                     throw new Error("Unknown handler: " + actionCode);
                 }
+                await server.beforeRunActionHandler(handlerContext, actionConfig);
                 const result = handler(handlerContext, actionConfig.config);
                 if (result instanceof Promise) {
                     await result;
@@ -2079,6 +2088,20 @@ function getEntityPropertyByFieldName(server, model, fieldName) {
     return property;
 }
 
+var metaHelper = /*#__PURE__*/Object.freeze({
+  __proto__: null,
+  isRelationProperty: isRelationProperty,
+  isOneRelationProperty: isOneRelationProperty,
+  isManyRelationProperty: isManyRelationProperty,
+  getEntityProperties: getEntityProperties,
+  getEntityPropertiesIncludingBase: getEntityPropertiesIncludingBase,
+  getEntityPropertyByCode: getEntityPropertyByCode,
+  getEntityProperty: getEntityProperty,
+  getEntityOwnPropertyByCode: getEntityOwnPropertyByCode,
+  getEntityOwnProperty: getEntityOwnProperty,
+  getEntityPropertyByFieldName: getEntityPropertyByFieldName
+});
+
 function getNowString() {
     return dayjs__default["default"]().format("YYYY-MM-DD HH:mm:ss.SSS");
 }
@@ -2279,6 +2302,11 @@ function detectChangedFieldsOfEntity(server, model, before, after) {
     return null;
 }
 
+var entityHelper = /*#__PURE__*/Object.freeze({
+  __proto__: null,
+  detectChangedFieldsOfEntity: detectChangedFieldsOfEntity
+});
+
 async function validateEntity(server, model, entity) {
     for (const propCode in entity) {
         let prop = getEntityPropertyByCode(server, model, propCode);
@@ -4301,6 +4329,9 @@ class RapidServer {
     async beforeRunRouteActions(handlerContext) {
         await this.#pluginManager.beforeRunRouteActions(handlerContext);
     }
+    async beforeRunActionHandler(handlerContext, actionConfig) {
+        await this.#pluginManager.beforeRunActionHandler(handlerContext, actionConfig);
+    }
     async beforeCreateEntity(model, options) {
         await this.#pluginManager.beforeCreateEntity(model, options);
     }
@@ -5015,6 +5046,30 @@ async function generateJwtSecretKey() {
     return encode(exportedKey);
 }
 
+/**
+ * Generates password hash.
+ * @param password
+ * @param salt
+ * @returns
+ */
+async function generatePasswordHash(password, salt) {
+    if (!salt) {
+        salt = 10;
+    }
+    const passwordHash = await bcrypt__default["default"].hash(password, salt);
+    return passwordHash;
+}
+/**
+ * Validates the password against the hash.
+ * @param password
+ * @param passwordHash
+ * @returns
+ */
+async function validatePassword(password, passwordHash) {
+    const isMatch = await bcrypt__default["default"].compare(password, passwordHash);
+    return isMatch;
+}
+
 function validateLicense(server) {
     const licenseService = server.getService("licenseService");
     const license = licenseService.getLicense();
@@ -5039,6 +5094,12 @@ function tryValidateLicense(logger, server) {
     return false;
 }
 
+var licenseHelper = /*#__PURE__*/Object.freeze({
+  __proto__: null,
+  validateLicense: validateLicense,
+  tryValidateLicense: tryValidateLicense
+});
+
 const values = new Map();
 async function set(key, value, options) {
     let expireAt = -1;
@@ -6010,66 +6071,66 @@ var queryDatabase = /*#__PURE__*/Object.freeze({
  * This plugin provide:
  * - routes for manage data in database.
  */
-const routeConfigs = [
+const entityOperationConfigs = [
     {
-        code: "createBatch",
-        method: "POST",
-        endpoint: "/operations/create_batch",
-        handlerCode: "createCollectionEntitiesBatch",
+        operationCode: "createBatch",
+        httpMethod: "POST",
+        requestEndpoint: "/operations/create_batch",
+        actionHandlerCode: "createCollectionEntitiesBatch",
     },
     {
-        code: "find",
-        method: "POST",
-        endpoint: "/operations/find",
-        handlerCode: "findCollectionEntities",
+        operationCode: "find",
+        httpMethod: "POST",
+        requestEndpoint: "/operations/find",
+        actionHandlerCode: "findCollectionEntities",
     },
     {
-        code: "count",
-        method: "POST",
-        endpoint: "/operations/count",
-        handlerCode: "countCollectionEntities",
+        operationCode: "count",
+        httpMethod: "POST",
+        requestEndpoint: "/operations/count",
+        actionHandlerCode: "countCollectionEntities",
     },
     {
-        code: "delete",
-        method: "POST",
-        endpoint: "/operations/delete",
-        handlerCode: "deleteCollectionEntities",
+        operationCode: "delete",
+        httpMethod: "POST",
+        requestEndpoint: "/operations/delete",
+        actionHandlerCode: "deleteCollectionEntities",
     },
     {
-        code: "addRelations",
-        method: "POST",
-        endpoint: "/operations/add_relations",
-        handlerCode: "addEntityRelations",
+        operationCode: "addRelations",
+        httpMethod: "POST",
+        requestEndpoint: "/operations/add_relations",
+        actionHandlerCode: "addEntityRelations",
     },
     {
-        code: "removeRelations",
-        method: "POST",
-        endpoint: "/operations/remove_relations",
-        handlerCode: "removeEntityRelations",
+        operationCode: "removeRelations",
+        httpMethod: "POST",
+        requestEndpoint: "/operations/remove_relations",
+        actionHandlerCode: "removeEntityRelations",
     },
     {
-        code: "getById",
-        method: "GET",
-        endpoint: "/:id",
-        handlerCode: "findCollectionEntityById",
+        operationCode: "getById",
+        httpMethod: "GET",
+        requestEndpoint: "/:id",
+        actionHandlerCode: "findCollectionEntityById",
     },
     {
-        code: "create",
-        method: "POST",
-        endpoint: "",
-        handlerCode: "createCollectionEntity",
+        operationCode: "create",
+        httpMethod: "POST",
+        requestEndpoint: "",
+        actionHandlerCode: "createCollectionEntity",
     },
     {
-        code: "updateById",
-        method: "PATCH",
-        endpoint: "/:id",
-        handlerCode: "updateCollectionEntityById",
+        operationCode: "updateById",
+        httpMethod: "PATCH",
+        requestEndpoint: "/:id",
+        actionHandlerCode: "updateCollectionEntityById",
     },
     {
-        code: "deleteById",
-        method: "DELETE",
-        endpoint: "/:id",
-        handlerCode: "deleteCollectionEntityById",
+        operationCode: "deleteById",
+        httpMethod: "DELETE",
+        requestEndpoint: "/:id",
+        actionHandlerCode: "deleteCollectionEntityById",
     },
 ];
 class DataManager {
@@ -6106,17 +6167,17 @@ class DataManager {
         const routes = [];
         models.forEach((model) => {
             const { namespace, singularCode, pluralCode } = model;
-            routeConfigs.forEach((routeConfig) => {
+            entityOperationConfigs.forEach((entityOperationConfig) => {
                 routes.push({
                     namespace,
-                    name: `${namespace}.${singularCode}.${routeConfig.code}`,
-                    code: `${namespace}.${singularCode}.${routeConfig.code}`,
+                    name: `${namespace}.${singularCode}.${entityOperationConfig.operationCode}`,
+                    code: `${namespace}.${singularCode}.${entityOperationConfig.operationCode}`,
                     type: "RESTful",
-                    method: routeConfig.method,
-                    endpoint: `/${namespace}/${pluralCode}${routeConfig.endpoint}`,
+                    method: entityOperationConfig.httpMethod,
+                    endpoint: `/${namespace}/${pluralCode}${entityOperationConfig.requestEndpoint}`,
                     actions: [
                         {
-                            code: routeConfig.handlerCode,
+                            code: entityOperationConfig.actionHandlerCode,
                             config: {
                                 namespace,
                                 singularCode,
@@ -6892,12 +6953,11 @@ async function handler$e(plugin, ctx, options) {
     if (!user) {
         throw new Error("User not found.");
     }
-    const isMatch = await bcrypt__default["default"].compare(oldPassword, user.password);
+    const isMatch = await validatePassword(oldPassword, user.password);
     if (!isMatch) {
         throw new Error("旧密码错误。");
     }
-    const saltRounds = 10;
-    const passwordHash = await bcrypt__default["default"].hash(newPassword, saltRounds);
+    const passwordHash = await generatePasswordHash(newPassword);
     await userDataAccessor.updateById(user.id, {
         password: passwordHash,
     }, routeContext?.getDbTransactionClient());
@@ -6939,7 +6999,7 @@ async function handler$d(plugin, ctx, options) {
     if (user.state !== "enabled") {
         throw new Error("用户已被禁用，不允许登录。");
     }
-    const isMatch = await bcrypt__default["default"].compare(password, user.password);
+    const isMatch = await validatePassword(password, user.password);
     if (!isMatch) {
         throw new Error("用户名或密码错误。");
     }
@@ -7040,8 +7100,7 @@ async function handler$a(plugin, ctx, options) {
     if (!user) {
         throw new Error("User not found.");
     }
-    const saltRounds = 10;
-    const passwordHash = await bcrypt__default["default"].hash(password, saltRounds);
+    const passwordHash = await generatePasswordHash(password);
     await userDataAccessor.updateById(user.id, {
         password: passwordHash,
     }, routeContext?.getDbTransactionClient());
@@ -9568,8 +9627,10 @@ exports.createJwt = createJwt;
 exports.decodeJwt = decodeJwt;
 exports.deleteCookie = deleteCookie;
 exports.detectChangedFieldsOfEntity = detectChangedFieldsOfEntity;
+exports.entityHelper = entityHelper;
 exports.formatDateTimeWithTimezone = formatDateTimeWithTimezone;
 exports.generateJwtSecretKey = generateJwtSecretKey;
+exports.generatePasswordHash = generatePasswordHash;
 exports.getCookies = getCookies;
 exports.getDateString = getDateString;
 exports.getEntityRelationTargetId = getEntityRelationTargetId;
@@ -9577,8 +9638,11 @@ exports.getNowString = getNowString;
 exports.getNowStringWithTimezone = getNowStringWithTimezone;
 exports.getSetCookies = getSetCookies;
 exports.isAccessAllowed = isAccessAllowed;
+exports.licenseHelper = licenseHelper;
 exports.mapDbRowToEntity = mapDbRowToEntity;
+exports.metaHelper = metaHelper;
 exports.setCookie = setCookie;
 exports.tryValidateLicense = tryValidateLicense;
 exports.validateLicense = validateLicense;
+exports.validatePassword = validatePassword;
 exports.verifyJwt = verifyJwt;

package/dist/server.d.ts

@@ -1,4 +1,4 @@
-import { GetDataAccessorOptions, GetModelOptions, IDatabaseAccessor, IDatabaseConfig, IQueryBuilder, IRpdDataAccessor, RpdApplicationConfig, RpdDataModel, RpdServerEventTypes, RapidServerConfig, RpdDataModelProperty, CreateEntityOptions, UpdateEntityByIdOptions, EntityWatcherType, EmitServerEventOptions, IDatabaseClient } from "./types";
+import { GetDataAccessorOptions, GetModelOptions, IDatabaseAccessor, IDatabaseConfig, IQueryBuilder, IRpdDataAccessor, RpdApplicationConfig, RpdDataModel, RpdServerEventTypes, RapidServerConfig, RpdDataModelProperty, CreateEntityOptions, UpdateEntityByIdOptions, EntityWatcherType, EmitServerEventOptions, IDatabaseClient, RpdRouteActionConfig } from "./types";
 import { ActionHandler, ActionHandlerContext, IPluginActionHandler } from "./core/actionHandler";
 import { IRpdServer, RapidPlugin } from "./core/server";
 import { Next } from "./core/routeContext";
@@ -58,6 +58,7 @@ export declare class RapidServer implements IRpdServer {
     get middlewares(): any[];
     handleRequest(rapidRequest: RapidRequest, next: Next): Promise<Response>;
     beforeRunRouteActions(handlerContext: ActionHandlerContext): Promise<void>;
+    beforeRunActionHandler(handlerContext: ActionHandlerContext, actionConfig: RpdRouteActionConfig): Promise<void>;
     beforeCreateEntity(model: RpdDataModel, options: CreateEntityOptions): Promise<void>;
     beforeUpdateEntity(model: RpdDataModel, options: UpdateEntityByIdOptions, currentEntity: any): Promise<void>;
 }

package/dist/utilities/passwordUtility.d.ts

@@ -0,0 +1,14 @@
+/**
+ * Generates password hash.
+ * @param password
+ * @param salt
+ * @returns
+ */
+export declare function generatePasswordHash(password: string, salt?: number | string): Promise<string>;
+/**
+ * Validates the password against the hash.
+ * @param password
+ * @param passwordHash
+ * @returns
+ */
+export declare function validatePassword(password: string, passwordHash: string): Promise<boolean>;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ruiapp/rapid-core",
-  "version": "0.9.2",
+  "version": "0.9.4",
   "description": "",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -19,7 +19,7 @@
     "typescript": "^4.8.4"
   },
   "dependencies": {
-    "bcrypt": "^5.1.1",
+    "bcryptjs": "^3.0.2",
     "cron": "^3.1.7",
     "dayjs": "^1.11.7",
     "jsonwebtoken": "^9.0.2",

package/src/core/pluginManager.ts

@@ -1,4 +1,4 @@
-import { CreateEntityOptions, RpdApplicationConfig, RpdDataModel, UpdateEntityByIdOptions } from "~/types";
+import { CreateEntityOptions, RpdApplicationConfig, RpdDataModel, RpdRouteActionConfig, UpdateEntityByIdOptions } from "~/types";
 import { IRpdServer, RapidPlugin } from "./server";
 import { RouteContext } from "./routeContext";
 import { ActionHandlerContext } from "./actionHandler";
@@ -162,6 +162,15 @@ class PluginManager {
     }
   }
 
+  /** 在执行 action hanlder 前调用。 */
+  async beforeRunActionHandler(handlerContext: ActionHandlerContext, actionConfig: RpdRouteActionConfig) {
+    for (const plugin of this.#plugins) {
+      if (plugin.beforeRunActionHandler) {
+        await plugin.beforeRunActionHandler(this.#server, handlerContext, actionConfig);
+      }
+    }
+  }
+
   /** 在创建实体前调用。 */
   async beforeCreateEntity(model: RpdDataModel, options: CreateEntityOptions) {
     for (const plugin of this.#plugins) {

package/src/core/routeContext.ts

@@ -2,7 +2,7 @@ import { RapidRequest } from "./request";
 import { RapidResponse } from "./response";
 import { HttpStatus } from "./http-types";
 import { IRpdServer } from "./server";
-import { IDatabaseAccessor, IDatabaseClient } from "~/types";
+import { IDatabaseAccessor, IDatabaseClient, RpdRoute } from "~/types";
 
 export type Next = () => Promise<void>;
 
@@ -18,7 +18,7 @@ export class RouteContext {
   method: string;
   path: string;
   params: Record<string, string>;
-  routeConfig: any;
+  routeConfig: RpdRoute;
   #server: IRpdServer;
   #dbTransactionClient: IDatabaseClient | undefined;
   #dbTransactionState: TransactionState;

package/src/core/routesBuilder.ts

@@ -74,6 +74,8 @@ export async function buildRoutes(server: IRpdServer, applicationConfig: RpdAppl
           throw new Error("Unknown handler: " + actionCode);
         }
 
+        await server.beforeRunActionHandler(handlerContext, actionConfig);
+
         const result = handler(handlerContext, actionConfig.config);
         if (result instanceof Promise) {
           await result;

package/src/core/server.ts

@@ -13,6 +13,7 @@ import {
   RpdApplicationConfig,
   RpdDataModel,
   RpdDataModelProperty,
+  RpdRouteActionConfig,
   RpdServerEventTypes,
   UpdateEntityByIdOptions,
 } from "~/types";
@@ -53,6 +54,7 @@ export interface IRpdServer {
   emitEvent<TEventName extends keyof RpdServerEventTypes>(event: EmitServerEventOptions<TEventName>): void;
   handleRequest(request: RapidRequest, next: Next): Promise<Response>;
   beforeRunRouteActions(handlerContext: ActionHandlerContext): Promise<void>;
+  beforeRunActionHandler(handlerContext: ActionHandlerContext, actionConfig: RpdRouteActionConfig): Promise<void>;
   beforeCreateEntity(model: RpdDataModel, options: CreateEntityOptions): Promise<void>;
   beforeUpdateEntity(model: RpdDataModel, options: UpdateEntityByIdOptions, currentEntity: any): Promise<void>;
 
@@ -145,6 +147,8 @@ export interface RapidPlugin {
   onPrepareRouteContext?: (server: IRpdServer, routeContext: RouteContext) => Promise<any>;
   /** 在接收到HTTP请求，执行 actions 前调用。 */
   beforeRunRouteActions?: (server: IRpdServer, handlerContext: ActionHandlerContext) => Promise<any>;
+  /** 在执行 action hanlder 前调用。 */
+  beforeRunActionHandler?: (server: IRpdServer, handlerContext: ActionHandlerContext, actionConfig: RpdRouteActionConfig) => Promise<any>;
   /** 在创建实体前调用。 */
   beforeCreateEntity?: (server: IRpdServer, model: RpdDataModel, options: CreateEntityOptions) => Promise<any>;
   /** 在更新实体前调用。 */

package/src/dataAccess/entityManager.ts

@@ -23,7 +23,7 @@ import { isNullOrUndefined } from "~/utilities/typeUtility";
 import { mapDbRowToEntity, mapEntityToDbRow } from "./entityMapper";
 import { mapPropertyNameToColumnName } from "./propertyMapper";
 import { IRpdServer, RapidPlugin } from "~/core/server";
-import { detectChangedFieldsOfEntity } from "~/helpers/entityHelpers";
+import { detectChangedFieldsOfEntity } from "~/helpers/entityHelper";
 import {
   cloneDeep,
   concat,

package/src/index.ts

@@ -22,9 +22,13 @@ export * from "./utilities/accessControlUtility";
 export * from "./utilities/entityUtility";
 export * from "./utilities/jwtUtility";
 export * from "./utilities/timeUtility";
+export * from "./utilities/passwordUtility";
 
-export * from "./helpers/entityHelpers";
+export * from "./helpers/entityHelper";
 export * from "./helpers/licenseHelper";
+export * as entityHelper from "./helpers/entityHelper";
+export * as licenseHelper from "./helpers/licenseHelper";
+export * as metaHelper from "./helpers/metaHelper";
 
 export * from "./deno-std/http/cookie";
 

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

@@ -1,7 +1,6 @@
-import bcrypt from "bcrypt";
 import { ActionHandlerContext } from "~/core/actionHandler";
-import { RapidPlugin } from "~/core/server";
 import AuthPlugin from "../AuthPlugin";
+import { generatePasswordHash, validatePassword } from "~/utilities/passwordUtility";
 
 export const code = "changePassword";
 
@@ -43,13 +42,12 @@ export async function handler(plugin: AuthPlugin, ctx: ActionHandlerContext, opt
     throw new Error("User not found.");
   }
 
-  const isMatch = await bcrypt.compare(oldPassword, user.password);
+  const isMatch = await validatePassword(oldPassword, user.password);
   if (!isMatch) {
     throw new Error("旧密码错误。");
   }
 
-  const saltRounds = 10;
-  const passwordHash = await bcrypt.hash(newPassword, saltRounds);
+  const passwordHash = await generatePasswordHash(newPassword);
 
   await userDataAccessor.updateById(
     user.id,

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

@@ -1,10 +1,9 @@
-import bcrypt from "bcrypt";
 import { setCookie } from "~/deno-std/http/cookie";
 import { ActionHandlerContext } from "~/core/actionHandler";
-import { RapidPlugin } from "~/core/server";
 import AuthService from "../services/AuthService";
 import { validateLicense } from "~/helpers/licenseHelper";
 import AuthPlugin from "../AuthPlugin";
+import { validatePassword } from "~/utilities/passwordUtility";
 
 export const code = "createSession";
 
@@ -45,7 +44,7 @@ export async function handler(plugin: AuthPlugin, ctx: ActionHandlerContext, opt
     throw new Error("用户已被禁用，不允许登录。");
   }
 
-  const isMatch = await bcrypt.compare(password, user.password);
+  const isMatch = await validatePassword(password, user.password);
   if (!isMatch) {
     throw new Error("用户名或密码错误。");
   }

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

@@ -1,7 +1,6 @@
-import bcrypt from "bcrypt";
 import { ActionHandlerContext } from "~/core/actionHandler";
-import { RapidPlugin } from "~/core/server";
 import AuthPlugin from "../AuthPlugin";
+import { generatePasswordHash } from "~/utilities/passwordUtility";
 
 export const code = "resetPassword";
 
@@ -32,8 +31,7 @@ export async function handler(plugin: AuthPlugin, ctx: ActionHandlerContext, opt
     throw new Error("User not found.");
   }
 
-  const saltRounds = 10;
-  const passwordHash = await bcrypt.hash(password, saltRounds);
+  const passwordHash = await generatePasswordHash(password);
 
   await userDataAccessor.updateById(
     user.id,

package/src/plugins/dataManage/DataManagePlugin.ts

@@ -25,71 +25,71 @@ import {
   RapidPlugin,
 } from "~/core/server";
 
-const routeConfigs: {
-  code: string;
-  method: RpdHttpMethod;
-  endpoint: string;
-  handlerCode: string;
+const entityOperationConfigs: {
+  operationCode: string;
+  httpMethod: RpdHttpMethod;
+  requestEndpoint: string;
+  actionHandlerCode: string;
 }[] = [
   {
-    code: "createBatch",
-    method: "POST",
-    endpoint: "/operations/create_batch",
-    handlerCode: "createCollectionEntitiesBatch",
+    operationCode: "createBatch",
+    httpMethod: "POST",
+    requestEndpoint: "/operations/create_batch",
+    actionHandlerCode: "createCollectionEntitiesBatch",
   },
   {
-    code: "find",
-    method: "POST",
-    endpoint: "/operations/find",
-    handlerCode: "findCollectionEntities",
+    operationCode: "find",
+    httpMethod: "POST",
+    requestEndpoint: "/operations/find",
+    actionHandlerCode: "findCollectionEntities",
   },
   {
-    code: "count",
-    method: "POST",
-    endpoint: "/operations/count",
-    handlerCode: "countCollectionEntities",
+    operationCode: "count",
+    httpMethod: "POST",
+    requestEndpoint: "/operations/count",
+    actionHandlerCode: "countCollectionEntities",
   },
   {
-    code: "delete",
-    method: "POST",
-    endpoint: "/operations/delete",
-    handlerCode: "deleteCollectionEntities",
+    operationCode: "delete",
+    httpMethod: "POST",
+    requestEndpoint: "/operations/delete",
+    actionHandlerCode: "deleteCollectionEntities",
   },
   {
-    code: "addRelations",
-    method: "POST",
-    endpoint: "/operations/add_relations",
-    handlerCode: "addEntityRelations",
+    operationCode: "addRelations",
+    httpMethod: "POST",
+    requestEndpoint: "/operations/add_relations",
+    actionHandlerCode: "addEntityRelations",
   },
   {
-    code: "removeRelations",
-    method: "POST",
-    endpoint: "/operations/remove_relations",
-    handlerCode: "removeEntityRelations",
+    operationCode: "removeRelations",
+    httpMethod: "POST",
+    requestEndpoint: "/operations/remove_relations",
+    actionHandlerCode: "removeEntityRelations",
   },
   {
-    code: "getById",
-    method: "GET",
-    endpoint: "/:id",
-    handlerCode: "findCollectionEntityById",
+    operationCode: "getById",
+    httpMethod: "GET",
+    requestEndpoint: "/:id",
+    actionHandlerCode: "findCollectionEntityById",
   },
   {
-    code: "create",
-    method: "POST",
-    endpoint: "",
-    handlerCode: "createCollectionEntity",
+    operationCode: "create",
+    httpMethod: "POST",
+    requestEndpoint: "",
+    actionHandlerCode: "createCollectionEntity",
   },
   {
-    code: "updateById",
-    method: "PATCH",
-    endpoint: "/:id",
-    handlerCode: "updateCollectionEntityById",
+    operationCode: "updateById",
+    httpMethod: "PATCH",
+    requestEndpoint: "/:id",
+    actionHandlerCode: "updateCollectionEntityById",
   },
   {
-    code: "deleteById",
-    method: "DELETE",
-    endpoint: "/:id",
-    handlerCode: "deleteCollectionEntityById",
+    operationCode: "deleteById",
+    httpMethod: "DELETE",
+    requestEndpoint: "/:id",
+    actionHandlerCode: "deleteCollectionEntityById",
   },
 ];
 
@@ -135,17 +135,17 @@ class DataManager implements RapidPlugin {
     models.forEach((model) => {
       const { namespace, singularCode, pluralCode } = model;
 
-      routeConfigs.forEach((routeConfig) => {
+      entityOperationConfigs.forEach((entityOperationConfig) => {
         routes.push({
           namespace,
-          name: `${namespace}.${singularCode}.${routeConfig.code}`,
-          code: `${namespace}.${singularCode}.${routeConfig.code}`,
+          name: `${namespace}.${singularCode}.${entityOperationConfig.operationCode}`,
+          code: `${namespace}.${singularCode}.${entityOperationConfig.operationCode}`,
           type: "RESTful",
-          method: routeConfig.method,
-          endpoint: `/${namespace}/${pluralCode}${routeConfig.endpoint}`,
+          method: entityOperationConfig.httpMethod,
+          endpoint: `/${namespace}/${pluralCode}${entityOperationConfig.requestEndpoint}`,
           actions: [
             {
-              code: routeConfig.handlerCode,
+              code: entityOperationConfig.actionHandlerCode,
               config: {
                 namespace,
                 singularCode,

package/src/server.ts

@@ -18,6 +18,7 @@ import {
   RpdEntityCreateEventPayload,
   EmitServerEventOptions,
   IDatabaseClient,
+  RpdRouteActionConfig,
 } from "./types";
 
 import QueryBuilder from "./queryBuilder/queryBuilder";
@@ -475,6 +476,10 @@ export class RapidServer implements IRpdServer {
     await this.#pluginManager.beforeRunRouteActions(handlerContext);
   }
 
+  async beforeRunActionHandler(handlerContext: ActionHandlerContext, actionConfig: RpdRouteActionConfig) {
+    await this.#pluginManager.beforeRunActionHandler(handlerContext, actionConfig);
+  }
+
   async beforeCreateEntity(model: RpdDataModel, options: CreateEntityOptions) {
     await this.#pluginManager.beforeCreateEntity(model, options);
   }

package/src/utilities/passwordUtility.ts

@@ -0,0 +1,26 @@
+import bcrypt from "bcryptjs";
+
+/**
+ * Generates password hash.
+ * @param password
+ * @param salt
+ * @returns
+ */
+export async function generatePasswordHash(password: string, salt?: number | string): Promise<string> {
+  if (!salt) {
+    salt = 10;
+  }
+  const passwordHash = await bcrypt.hash(password, salt);
+  return passwordHash;
+}
+
+/**
+ * Validates the password against the hash.
+ * @param password
+ * @param passwordHash
+ * @returns
+ */
+export async function validatePassword(password: string, passwordHash: string): Promise<boolean> {
+  const isMatch = await bcrypt.compare(password, passwordHash);
+  return isMatch;
+}