@ruiapp/rapid-core 0.1.20 → 0.1.21

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

@@ -10,18 +10,9 @@ declare class AuthPlugin implements RapidPlugin {
     get extendingAbilities(): RpdServerPluginExtendingAbilities[];
     get configurableTargets(): RpdServerPluginConfigurableTargetOptions[];
     get configurations(): RpdConfigurationItemOptions[];
-    initPlugin(server: IRpdServer): Promise<any>;
-    registerMiddlewares(server: IRpdServer): Promise<any>;
     registerActionHandlers(server: IRpdServer): Promise<any>;
-    registerEventHandlers(server: IRpdServer): Promise<any>;
-    registerMessageHandlers(server: IRpdServer): Promise<any>;
-    registerTaskProcessors(server: IRpdServer): Promise<any>;
-    onLoadingApplication(server: IRpdServer, applicationConfig: RpdApplicationConfig): Promise<any>;
     configureModels(server: IRpdServer, applicationConfig: RpdApplicationConfig): Promise<any>;
-    configureModelProperties(server: IRpdServer, applicationConfig: RpdApplicationConfig): Promise<any>;
     configureRoutes(server: IRpdServer, applicationConfig: RpdApplicationConfig): Promise<any>;
-    onApplicationLoaded(server: IRpdServer, applicationConfig: RpdApplicationConfig): Promise<any>;
-    onApplicationReady(server: IRpdServer, applicationConfig: RpdApplicationConfig): Promise<any>;
     onPrepareRouteContext(server: IRpdServer, routeContext: RouteContext): Promise<void>;
 }
 export default AuthPlugin;

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

@@ -11,17 +11,7 @@ declare class DataManager implements RapidPlugin {
     get extendingAbilities(): RpdServerPluginExtendingAbilities[];
     get configurableTargets(): RpdServerPluginConfigurableTargetOptions[];
     get configurations(): RpdConfigurationItemOptions[];
-    initPlugin(server: IRpdServer): Promise<any>;
-    registerMiddlewares(server: IRpdServer): Promise<any>;
     registerActionHandlers(server: IRpdServer): Promise<any>;
-    registerEventHandlers(server: IRpdServer): Promise<any>;
-    registerMessageHandlers(server: IRpdServer): Promise<any>;
-    registerTaskProcessors(server: IRpdServer): Promise<any>;
-    onLoadingApplication(server: IRpdServer, applicationConfig: RpdApplicationConfig): Promise<any>;
-    configureModels(server: IRpdServer, applicationConfig: RpdApplicationConfig): Promise<any>;
-    configureModelProperties(server: IRpdServer, applicationConfig: RpdApplicationConfig): Promise<any>;
     configureRoutes(server: IRpdServer, applicationConfig: RpdApplicationConfig): Promise<any>;
-    onApplicationLoaded(server: IRpdServer, applicationConfig: RpdApplicationConfig): Promise<any>;
-    onApplicationReady(server: IRpdServer, applicationConfig: RpdApplicationConfig): Promise<any>;
 }
 export default DataManager;

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

@@ -9,17 +9,9 @@ declare class MetaManager implements RapidPlugin {
     get extendingAbilities(): RpdServerPluginExtendingAbilities[];
     get configurableTargets(): RpdServerPluginConfigurableTargetOptions[];
     get configurations(): RpdConfigurationItemOptions[];
-    initPlugin(server: IRpdServer): Promise<any>;
-    registerMiddlewares(server: IRpdServer): Promise<any>;
     registerActionHandlers(server: IRpdServer): Promise<any>;
     registerEventHandlers(server: IRpdServer): Promise<any>;
-    registerMessageHandlers(server: IRpdServer): Promise<any>;
-    registerTaskProcessors(server: IRpdServer): Promise<any>;
-    onLoadingApplication(server: IRpdServer, applicationConfig: RpdApplicationConfig): Promise<any>;
     configureModels(server: IRpdServer, applicationConfig: RpdApplicationConfig): Promise<any>;
-    configureModelProperties(server: IRpdServer, applicationConfig: RpdApplicationConfig): Promise<any>;
-    configureRoutes(server: IRpdServer, applicationConfig: RpdApplicationConfig): Promise<any>;
     onApplicationLoaded(server: IRpdServer, applicationConfig: RpdApplicationConfig): Promise<any>;
-    onApplicationReady(server: IRpdServer, applicationConfig: RpdApplicationConfig): Promise<any>;
 }
 export default MetaManager;

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

@@ -9,17 +9,8 @@ declare class RouteManager implements RapidPlugin {
     get extendingAbilities(): RpdServerPluginExtendingAbilities[];
     get configurableTargets(): RpdServerPluginConfigurableTargetOptions[];
     get configurations(): RpdConfigurationItemOptions[];
-    initPlugin(server: IRpdServer): Promise<any>;
-    registerMiddlewares(server: IRpdServer): Promise<any>;
     registerActionHandlers(server: IRpdServer): Promise<any>;
     registerEventHandlers(server: IRpdServer): Promise<any>;
-    registerMessageHandlers(server: IRpdServer): Promise<any>;
-    registerTaskProcessors(server: IRpdServer): Promise<any>;
-    onLoadingApplication(server: IRpdServer, applicationConfig: RpdApplicationConfig): Promise<any>;
-    configureModels(server: IRpdServer, applicationConfig: RpdApplicationConfig): Promise<any>;
-    configureModelProperties(server: IRpdServer, applicationConfig: RpdApplicationConfig): Promise<any>;
     configureRoutes(server: IRpdServer, applicationConfig: RpdApplicationConfig): Promise<any>;
-    onApplicationLoaded(server: IRpdServer, applicationConfig: RpdApplicationConfig): Promise<any>;
-    onApplicationReady(server: IRpdServer, applicationConfig: RpdApplicationConfig): Promise<any>;
 }
 export default RouteManager;

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

@@ -21,13 +21,7 @@ declare class WebhooksPlugin implements RapidPlugin {
     get extendingAbilities(): RpdServerPluginExtendingAbilities[];
     get configurableTargets(): RpdServerPluginConfigurableTargetOptions[];
     get configurations(): RpdConfigurationItemOptions[];
-    initPlugin(server: IRpdServer): Promise<any>;
-    registerMiddlewares(server: IRpdServer): Promise<any>;
-    registerActionHandlers(server: IRpdServer): Promise<any>;
     registerEventHandlers(server: IRpdServer): Promise<any>;
-    registerMessageHandlers(server: IRpdServer): Promise<any>;
-    registerTaskProcessors(server: IRpdServer): Promise<any>;
-    onLoadingApplication(server: IRpdServer, applicationConfig: RpdApplicationConfig): Promise<any>;
     configureModels(server: IRpdServer, applicationConfig: RpdApplicationConfig): Promise<any>;
     configureModelProperties(server: IRpdServer, applicationConfig: RpdApplicationConfig): Promise<any>;
     configureRoutes(server: IRpdServer, applicationConfig: RpdApplicationConfig): Promise<any>;

package/dist/server.d.ts

@@ -3,7 +3,9 @@ import { ActionHandler, ActionHandlerContext, IPluginActionHandler } from "./cor
 import { IRpdServer, RapidPlugin } from "./core/server";
 import { Next } from "./core/routeContext";
 import EntityManager from "./dataAccess/entityManager";
+import { Logger } from "./facilities/log/LogFacility";
 export interface InitServerOptions {
+    logger: Logger;
     databaseAccessor: IDatabaseAccessor;
     databaseConfig: IDatabaseConfig;
     serverConfig: RapidServerConfig;
@@ -16,6 +18,7 @@ export declare class RapidServer implements IRpdServer {
     config: RapidServerConfig;
     databaseConfig: IDatabaseConfig;
     constructor(options: InitServerOptions);
+    getLogger(): Logger;
     getApplicationConfig(): RpdApplicationConfig;
     appendApplicationConfig(config: Partial<RpdApplicationConfig>): void;
     appendModelProperties(modelSingularCode: string, properties: RpdDataModelProperty[]): void;
@@ -32,6 +35,6 @@ export declare class RapidServer implements IRpdServer {
     queryDatabaseObject(sql: string, params?: unknown[] | Record<string, unknown>): Promise<any[]>;
     tryQueryDatabaseObject(sql: string, params?: unknown[] | Record<string, unknown>): Promise<any[]>;
     get middlewares(): any[];
-    handleRequest(request: Request, next: Next): Promise<Response>;
+    handleRequest(request: Request, next: Next): any;
     beforeRunRouteActions(handlerContext: ActionHandlerContext): Promise<void>;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ruiapp/rapid-core",
-  "version": "0.1.20",
+  "version": "0.1.21",
   "description": "",
   "main": "dist/index.js",
   "keywords": [],
@@ -23,6 +23,9 @@
     "qs": "^6.11.0",
     "uuid": "^9.0.1"
   },
+  "peerDependencies": {
+    "winston": "^3.11.0"
+  },
   "scripts": {
     "build": "rimraf dist && rollup --config",
     "dev": "rollup --config",

package/src/core/actionHandler.ts

@@ -1,8 +1,10 @@
 import { RpdApplicationConfig } from "~/types";
 import { IRpdServer, RapidPlugin } from "./server";
 import { Next, RouteContext } from "./routeContext";
+import { Logger } from "~/facilities/log/LogFacility";
 
 export interface ActionHandlerContext {
+  logger: Logger;
   routerContext: RouteContext;
   next: Next;
   server: IRpdServer;

package/src/core/request.ts

@@ -1,6 +1,8 @@
 import qs from "qs";
 import { parseFormDataBody } from "./http/formDataParser";
 import { getCookies } from "~/deno-std/http/cookie";
+import { IRpdServer } from "./server";
+import { Logger } from "~/facilities/log/LogFacility";
 
 export const GlobalRequest = global.Request;
 
@@ -10,6 +12,7 @@ export interface RapidRequestBody {
 }
 
 export class RapidRequest {
+  #logger: Logger;
   #raw: Request;
   #bodyParsed: boolean;
   #body: RapidRequestBody;
@@ -18,7 +21,8 @@ export class RapidRequest {
   method: string;
   url: URL;
 
-  constructor(req: Request) {
+  constructor(server: IRpdServer, req: Request) {
+    this.#logger = server.getLogger();
     this.#raw = req;
     this.method = req.method;
     this.url = new URL(req.url);
@@ -27,7 +31,7 @@ export class RapidRequest {
 
   async parseBody(): Promise<void> {
     if (this.#bodyParsed) {
-      console.warn("Request body has been parsed. 'parseBody()' method should not be called more than once.");
+      this.#logger.warn("Request body has been parsed. 'parseBody()' method should not be called more than once.");
       return;
     }
 

package/src/core/routeContext.ts

@@ -2,10 +2,13 @@ import { isArray, isObject } from "lodash";
 import { RapidRequest } from "./request";
 import { RapidResponse } from "./response";
 import { HttpStatus, ResponseData } from "./http-types";
+import { IRpdServer } from "./server";
+import { Logger } from "~/facilities/log/LogFacility";
 
 export type Next = () => Promise<void>;
 
 export class RouteContext {
+  #logger: Logger;
   readonly request: RapidRequest;
   readonly response: RapidResponse;
   readonly state: Record<string, any>;
@@ -14,7 +17,8 @@ export class RouteContext {
   params: Record<string, string>;
   routeConfig: any;
 
-  constructor(request: RapidRequest) {
+  constructor(server: IRpdServer, request: RapidRequest) {
+    this.#logger = server.getLogger();
     this.request = request;
     this.state = {};
     this.response = new RapidResponse();

package/src/core/routesBuilder.ts

@@ -11,6 +11,7 @@ export async function buildRoutes(
   server: IRpdServer,
   applicationConfig: RpdApplicationConfig,
 ) {
+  const logger = server.getLogger();
   const router = new Router();
 
   let baseUrl = server.config.baseUrl;
@@ -55,10 +56,14 @@ export async function buildRoutes(
 
         // Normalize input value
 
-        console.debug(`${requestMethod} ${request.url.toString()}`);
-        console.debug(`input: ${JSON.stringify(input)}`);
+        logger.debug("Processing rapid request.", {
+          method: requestMethod,
+          url: request.url.toString(),
+          input
+        });
 
         let handlerContext: ActionHandlerContext = {
+          logger,
           routerContext,
           next,
           server,

package/src/core/server.ts

@@ -2,11 +2,13 @@ import { GetDataAccessorOptions, GetModelOptions, IDatabaseConfig, IQueryBuilder
 import { IPluginActionHandler, ActionHandler, ActionHandlerContext } from "./actionHandler";
 import { Next, RouteContext } from "./routeContext";
 import EntityManager from "~/dataAccess/entityManager";
+import { Logger } from "~/facilities/log/LogFacility";
 
 export interface IRpdServer {
   config: RapidServerConfig;
   databaseConfig: IDatabaseConfig;
   queryBuilder: IQueryBuilder;
+  getLogger(): Logger;
   queryDatabaseObject: (
     sql: string,
     params?: unknown[] | Record<string, unknown>,

package/src/dataAccess/dataAccessor.ts

@@ -9,6 +9,8 @@ import {
 } from "~/types";
 import QueryBuilder from "~/queryBuilder/queryBuilder";
 import { first, set } from "lodash";
+import { IRpdServer } from "~/core/server";
+import { Logger } from "~/facilities/log/LogFacility";
 
 export interface IDataAccessorOptions {
   model: RpdDataModel;
@@ -16,11 +18,13 @@ export interface IDataAccessorOptions {
 }
 
 export default class DataAccessor<T = any> implements IRpdDataAccessor<T> {
+  #logger: Logger;
   #model: RpdDataModel;
   #queryBuilder: QueryBuilder;
   #databaseAccessor: IDatabaseAccessor;
 
-  constructor(databaseAccessor: IDatabaseAccessor, options: IDataAccessorOptions) {
+  constructor(server: IRpdServer, databaseAccessor: IDatabaseAccessor, options: IDataAccessorOptions) {
+    this.#logger = server.getLogger();
     this.#databaseAccessor = databaseAccessor;
     this.#queryBuilder = options.queryBuilder;
     this.#model = options.model;
@@ -56,7 +60,7 @@ export default class DataAccessor<T = any> implements IRpdDataAccessor<T> {
   }
 
   async find(options: FindEntityOptions): Promise<T[]> {
-    console.debug(`DataAccessor '${this.#model.singularCode}' find with options:`, options);
+    this.#logger.debug(`Finding '${this.#model.singularCode}' entity.`, { options });
     const query = this.#queryBuilder.select(this.#model, options);
     return await this.#databaseAccessor.queryDatabaseObject(query.command, query.params);
   }

package/src/facilities/log/LogFacility.ts

@@ -0,0 +1,36 @@
+import winston from "winston";
+
+export interface Logger {
+  log: winston.LogMethod;
+  /**
+   * The service/app is going to stop or become unusable now. An operator should definitely look into this immediately.
+   */
+  emerg: winston.LeveledLogMethod;
+  /**
+   * Fatal for a particular service, but the app continues servicing other requests. An operator should look at this immediately.
+   */
+  crit: winston.LeveledLogMethod;
+  /**
+   * Fatal for a particular request, but the service/app continues servicing other requests. An operator should look at this soon(ish).
+   */
+  error: winston.LeveledLogMethod;
+  /**
+   * A note on something that should probably be looked at by an operator eventually.
+   */
+  warn: winston.LeveledLogMethod;
+  /**
+   * Detail on regular operation.
+   */
+  info: winston.LeveledLogMethod;
+  /**
+   * Anything else, i.e. too verbose to be included in "info" level.
+   */
+  debug: winston.LeveledLogMethod;
+  /**
+   * Logging from external libraries used by your app or very detailed application logging.
+   */
+  verbose: winston.LeveledLogMethod;
+
+  child(options: Object): Logger;
+}
+

package/src/helpers/runCollectionEntityActionHandler.ts

@@ -14,15 +14,11 @@ export default async function runCollectionEntityActionHandler(
   code: string,
   handleEntityAction: EntityActionHandler,
 ) {
-  const { server, input } = ctx;
-  const { defaultInput, fixedInput } = options;
-
-  console.debug(`Running ${code} handler...`);
+  const { logger, server, input } = ctx;
 
-  console.debug(`defaultInput: ${JSON.stringify(defaultInput)}`);
+  const { defaultInput, fixedInput } = options;
   const mergedInput = mergeInput(defaultInput, input, fixedInput);
-  console.debug(`fixedInput: ${JSON.stringify(fixedInput)}`);
-  console.debug(`mergedInput: ${JSON.stringify(mergedInput)}`);
+  logger.debug(`Running ${code} handler...`, { defaultInput, fixedInput, mergedInput });
 
   const entityManager = server.getEntityManager(options.singularCode);
   const result = handleEntityAction(entityManager, mergedInput);

package/src/plugins/auth/AuthPlugin.ts

@@ -35,48 +35,20 @@ class AuthPlugin implements RapidPlugin {
     return [];
   }
 
-  async initPlugin(server: IRpdServer): Promise<any> {
-  }
-
-  async registerMiddlewares(server: IRpdServer): Promise<any> {
-  }
-
   async registerActionHandlers(server: IRpdServer): Promise<any> {
     for (const actionHandler of pluginActionHandlers) {
       server.registerActionHandler(this, actionHandler);
     }
   }
 
-  async registerEventHandlers(server: IRpdServer): Promise<any> {
-  }
-
-  async registerMessageHandlers(server: IRpdServer): Promise<any> {
-  }
-
-  async registerTaskProcessors(server: IRpdServer): Promise<any> {
-  }
-
-  async onLoadingApplication(server: IRpdServer, applicationConfig: RpdApplicationConfig): Promise<any> {
-  }
-
   async configureModels(server: IRpdServer, applicationConfig: RpdApplicationConfig): Promise<any> {
     server.appendApplicationConfig({ models: pluginModels });
   }
 
-  async configureModelProperties(server: IRpdServer, applicationConfig: RpdApplicationConfig): Promise<any> {
-  }
-
   async configureRoutes(server: IRpdServer, applicationConfig: RpdApplicationConfig): Promise<any> {
     server.appendApplicationConfig({ routes: pluginRoutes });
   }
 
-  async onApplicationLoaded(server: IRpdServer, applicationConfig: RpdApplicationConfig): Promise<any> {
-    console.log("authManager.onApplicationLoaded");
-  }
-
-  async onApplicationReady(server: IRpdServer, applicationConfig: RpdApplicationConfig): Promise<any> {
-  }
-
   async onPrepareRouteContext(server: IRpdServer, routeContext: RouteContext) {
     const request = routeContext.request;
     let token: string;
@@ -100,8 +72,9 @@ class AuthPlugin implements RapidPlugin {
       const tokenPayload = verifyJwt(token, secretKey);
       routeContext.state.userId = tokenPayload.aud as string;
       routeContext.state.userLogin = tokenPayload.act as string;
-    } catch (err) {
-      console.warn(err);
+    } catch (error) {
+      const logger = server.getLogger();
+      logger.debug("Verify JWT failed.", { error });
     }
   }
 }

package/src/plugins/dataManage/DataManagePlugin.ts

@@ -107,12 +107,6 @@ class DataManager implements RapidPlugin {
     return [];
   }
 
-  async initPlugin(server: IRpdServer): Promise<any> {
-  }
-
-  async registerMiddlewares(server: IRpdServer): Promise<any> {
-  }
-
   async registerActionHandlers(server: IRpdServer): Promise<any> {
     server.registerActionHandler(this, findCollectionEntities);
     server.registerActionHandler(this, findCollectionEntityById);
@@ -126,24 +120,6 @@ class DataManager implements RapidPlugin {
     server.registerActionHandler(this, queryDatabase);
   }
 
-  async registerEventHandlers(server: IRpdServer): Promise<any> {
-  }
-
-  async registerMessageHandlers(server: IRpdServer): Promise<any> {
-  }
-
-  async registerTaskProcessors(server: IRpdServer): Promise<any> {
-  }
-
-  async onLoadingApplication(server: IRpdServer, applicationConfig: RpdApplicationConfig): Promise<any> {
-  }
-
-  async configureModels(server: IRpdServer, applicationConfig: RpdApplicationConfig): Promise<any> {
-  }
-
-  async configureModelProperties(server: IRpdServer, applicationConfig: RpdApplicationConfig): Promise<any> {
-  }
-
   async configureRoutes(server: IRpdServer, applicationConfig: RpdApplicationConfig): Promise<any> {
     const { models } = applicationConfig;
     const routes: RpdRoute[] = [];
@@ -174,13 +150,6 @@ class DataManager implements RapidPlugin {
   
     server.appendApplicationConfig({ routes });
   }
-
-  async onApplicationLoaded(server: IRpdServer, applicationConfig: RpdApplicationConfig): Promise<any> {
-    console.log("[dataManager.onApplicationLoaded]");
-  }
-
-  async onApplicationReady(server: IRpdServer, applicationConfig: RpdApplicationConfig): Promise<any> {
-  }
 }
 
 export default DataManager;

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

@@ -10,15 +10,11 @@ export async function handler(
   ctx: ActionHandlerContext,
   options: RunEntityActionHandlerOptions,
 ) {
-  const { server, input } = ctx;
-  const { defaultInput, fixedInput } = options;
-
-  console.debug(`Running ${code} handler...`);
+  const { logger, server, input } = ctx;
 
-  console.debug(`defaultInput: ${JSON.stringify(defaultInput)}`);
+  const { defaultInput, fixedInput } = options;
   const mergedInput = mergeInput(defaultInput, input, fixedInput);
-  console.debug(`fixedInput: ${JSON.stringify(fixedInput)}`);
-  console.debug(`mergedInput: ${JSON.stringify(mergedInput)}`);
+  logger.debug(`Running ${code} handler...`, { defaultInput, fixedInput, mergedInput });
 
   const entityManager = server.getEntityManager(options.singularCode);
   await entityManager.addRelations(mergedInput, plugin);

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

@@ -11,23 +11,19 @@ export async function handler(
   ctx: ActionHandlerContext,
   options: RunEntityActionHandlerOptions,
 ) {
-  const { server, input } = ctx;
-  const { defaultInput, fixedInput } = options;
+  const { logger, server, input } = ctx;
 
-  console.debug(`Running ${code} handler...`);
+  const { defaultInput, fixedInput } = options;
+  logger.debug(`Running ${code} handler...`, { defaultInput, fixedInput, input });
 
   const { entities } = input;
   if (!isArray(entities)) {
     throw new Error("input.entities should be an array.");
   }
 
-  console.debug(`defaultInput: ${JSON.stringify(defaultInput)}`);
-  console.debug(`fixedInput: ${JSON.stringify(fixedInput)}`);
-
   const output: any[] = [];
   for(const entity of entities) {
     const mergedEntity = mergeInput(defaultInput?.entity || {}, entity, fixedInput?.entity);
-    console.debug(`mergedEntity: ${JSON.stringify(mergedEntity)}`);
 
     const userId = ctx.routerContext.state?.userId;
     if (userId) {

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

@@ -10,15 +10,11 @@ export async function handler(
   ctx: ActionHandlerContext,
   options: RunEntityActionHandlerOptions,
 ) {
-  const { server, input } = ctx;
-  const { defaultInput, fixedInput } = options;
-
-  console.debug(`Running ${code} handler...`);
+  const { logger, server, input } = ctx;
 
-  console.debug(`defaultInput: ${JSON.stringify(defaultInput)}`);
+  const { defaultInput, fixedInput } = options;
   const mergedInput = mergeInput(defaultInput, input, fixedInput);
-  console.debug(`fixedInput: ${JSON.stringify(fixedInput)}`);
-  console.debug(`mergedInput: ${JSON.stringify(mergedInput)}`);
+  logger.debug(`Running ${code} handler...`, { defaultInput, fixedInput, mergedInput });
 
   const userId = ctx.routerContext.state?.userId;
   if (userId) {

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

@@ -9,8 +9,8 @@ export async function handler(
   ctx: ActionHandlerContext,
   options: RunEntityActionHandlerOptions,
 ) {
-  console.debug(`Running ${code} handler...`);
-  const { server, input } = ctx;
+  const { logger, server, input } = ctx;
+  logger.debug(`Running ${code} handler...`);
 
   const entityManager = server.getEntityManager(options.singularCode);
   await entityManager.deleteById(input.id, plugin);

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

@@ -9,8 +9,8 @@ export async function handler(
   ctx: ActionHandlerContext,
   options: RunEntityActionHandlerOptions,
 ) {
-  console.debug(`Running ${code} handler...`);
-  const { server, input } = ctx;
+  const { logger, server, input } = ctx;
+  logger.debug(`Running ${code} handler...`, { input });
   const { id } = input;
 
   const entityManager = server.getEntityManager(options.singularCode);

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

@@ -11,15 +11,11 @@ export async function handler(
   ctx: ActionHandlerContext,
   options: RunQueryDatabaseHandlerOptions,
 ) {
-  const { server, input } = ctx;
-  const { sql, querySingle, defaultInput, fixedInput } = options;
-
-  console.debug(`Running ${code} handler...`);
+  const { logger, server, input } = ctx;
 
-  console.debug(`defaultInput: ${JSON.stringify(defaultInput)}`);
+  const { sql, querySingle, defaultInput, fixedInput } = options;
   const mergedInput = mergeInput(defaultInput, input, fixedInput);
-  console.debug(`fixedInput: ${JSON.stringify(fixedInput)}`);
-  console.debug(`mergedInput: ${JSON.stringify(mergedInput)}`);
+  logger.debug(`Running ${code} handler...`, { defaultInput, fixedInput, mergedInput });
 
   const result = await server.queryDatabaseObject(sql, mergedInput);
   if (querySingle) {

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

@@ -10,15 +10,11 @@ export async function handler(
   ctx: ActionHandlerContext,
   options: RunEntityActionHandlerOptions,
 ) {
-  const { server, input } = ctx;
+  const { logger, server, input } = ctx;
   const { defaultInput, fixedInput } = options;
 
-  console.debug(`Running ${code} handler...`);
-
-  console.debug(`defaultInput: ${JSON.stringify(defaultInput)}`);
   const mergedInput = mergeInput(defaultInput, input, fixedInput);
-  console.debug(`fixedInput: ${JSON.stringify(fixedInput)}`);
-  console.debug(`mergedInput: ${JSON.stringify(mergedInput)}`);
+  logger.debug(`Running ${code} handler...`, { defaultInput, fixedInput, mergedInput });
 
   const entityManager = server.getEntityManager(options.singularCode);
   await entityManager.removeRelations(mergedInput, plugin);

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

@@ -10,18 +10,13 @@ export async function handler(
   ctx: ActionHandlerContext,
   options: RunEntityActionHandlerOptions,
 ) {
-  const { server, input } = ctx;
-  const { defaultInput, fixedInput } = options;
-
-  console.debug(`Running ${code} handler...`);
+  const { logger, server, input } = ctx;
 
-  console.debug(`defaultInput: ${JSON.stringify(defaultInput)}`);
+  const { defaultInput, fixedInput } = options;
   const mergedInput = mergeInput(defaultInput, input, fixedInput);
-  console.debug(`fixedInput: ${JSON.stringify(fixedInput)}`);
-  console.debug(`mergedInput: ${JSON.stringify(mergedInput)}`);
+  logger.debug(`Running ${code} handler...`, { defaultInput, fixedInput, mergedInput });
 
   const entityManager = server.getEntityManager(options.singularCode);
-
   const output = await entityManager.updateEntityById({ id: mergedInput.id, entityToSave: mergedInput }, plugin);
   ctx.output = output;
 }

package/src/plugins/entityAccessControl/EntityAccessControlPlugin.ts

@@ -43,6 +43,9 @@ class EntityAccessControlPlugin implements RapidPlugin {
   }
 
   async configureRoutes(server: IRpdServer, applicationConfig: RpdApplicationConfig): Promise<any> {
+    const logger = server.getLogger();
+    logger.info("Configuring entity access checking policies...")
+
     const model = find(applicationConfig.models, (item) => item.singularCode === "model");
     if (!model) {
       return;