@ruiapp/rapid-core 0.7.0 → 0.7.2

package/dist/helpers/licenseHelper.d.ts

@@ -0,0 +1,3 @@
+import { IRpdServer } from "../core/server";
+import { Logger } from "../facilities/log/LogFacility";
+export declare function validateLicense(logger: Logger, server: IRpdServer): void;

package/dist/index.js

@@ -4585,12 +4585,17 @@ class RapidServer {
             await this.#buildedRoutes(routeContext, next);
         }
         catch (ex) {
-            this.#logger.error("handle request error:", ex);
-            response.json({
-                error: {
-                    message: ex.message || ex,
-                },
-            }, 500);
+            let error;
+            if (lodash.isString(ex)) {
+                error = {
+                    message: ex,
+                };
+            }
+            else {
+                error = { name: ex.name, message: ex.message, stack: ex.stack };
+            }
+            this.#logger.error("handle request error.", { error });
+            response.json({ error }, 500);
         }
         if (!response.status && !response.body) {
             response.json({
@@ -6647,20 +6652,28 @@ var changePassword$1 = /*#__PURE__*/Object.freeze({
   handler: handler$e
 });
 
-const code$d = "createSession";
-async function handler$d(plugin, ctx, options) {
-    const { server, input, routerContext: routeContext } = ctx;
-    const { response } = routeContext;
-    const { account, password } = input;
+function validateLicense(logger, server) {
     const licenseService = server.getService("licenseService");
     const license = licenseService.getLicense();
     if (!license) {
-        throw new Error(`登录失败，无法获取系统授权信息。`);
+        const errorMessage = `无法获取系统授权信息。`;
+        logger.error(errorMessage);
+        throw new Error(errorMessage);
     }
     if (licenseService.isExpired()) {
         const expireDate = lodash.get(license.authority, "expireDate");
-        throw new Error(`登录失败，系统授权已于${expireDate}过期。`);
+        const errorMessage = `您的系统授权已于${expireDate}过期。`;
+        logger.error(errorMessage);
+        throw new Error(errorMessage);
     }
+}
+
+const code$d = "createSession";
+async function handler$d(plugin, ctx, options) {
+    const { server, input, routerContext: routeContext, logger } = ctx;
+    const { response } = routeContext;
+    const { account, password } = input;
+    validateLicense(logger, server);
     const userDataAccessor = server.getDataAccessor({
         singularCode: "oc_user",
     });
@@ -8503,6 +8516,7 @@ class CronJobPlugin {
     async executeJob(server, job) {
         const logger = server.getLogger();
         try {
+            validateLicense(logger, server);
             let handlerContext = {
                 logger,
                 routerContext: null,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ruiapp/rapid-core",
-  "version": "0.7.0",
+  "version": "0.7.2",
   "description": "",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",

package/src/helpers/licenseHelper.ts

@@ -0,0 +1,20 @@
+import { get } from "lodash";
+import { IRpdServer } from "~/core/server";
+import { Logger } from "~/facilities/log/LogFacility";
+import LicenseService from "~/plugins/license/LicenseService";
+
+export function validateLicense(logger: Logger, server: IRpdServer) {
+  const licenseService = server.getService<LicenseService>("licenseService");
+  const license = licenseService.getLicense();
+  if (!license) {
+    const errorMessage = `无法获取系统授权信息。`;
+    logger.error(errorMessage);
+    throw new Error(errorMessage);
+  }
+  if (licenseService.isExpired()) {
+    const expireDate = get(license.authority, "expireDate");
+    const errorMessage = `您的系统授权已于${expireDate}过期。`;
+    logger.error(errorMessage);
+    throw new Error(errorMessage);
+  }
+}

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

@@ -2,26 +2,17 @@ import bcrypt from "bcrypt";
 import { setCookie } from "~/deno-std/http/cookie";
 import { ActionHandlerContext } from "~/core/actionHandler";
 import { RapidPlugin } from "~/core/server";
-import LicenseService from "~/plugins/license/LicenseService";
-import { get } from "lodash";
 import AuthService from "../services/AuthService";
+import { validateLicense } from "~/helpers/licenseHelper";
 
 export const code = "createSession";
 
 export async function handler(plugin: RapidPlugin, ctx: ActionHandlerContext, options: any) {
-  const { server, input, routerContext: routeContext } = ctx;
+  const { server, input, routerContext: routeContext, logger } = ctx;
   const { response } = routeContext;
   const { account, password } = input;
 
-  const licenseService = server.getService<LicenseService>("licenseService");
-  const license = licenseService.getLicense();
-  if (!license) {
-    throw new Error(`登录失败，无法获取系统授权信息。`);
-  }
-  if (licenseService.isExpired()) {
-    const expireDate = get(license.authority, "expireDate");
-    throw new Error(`登录失败，系统授权已于${expireDate}过期。`);
-  }
+  validateLicense(logger, server);
 
   const userDataAccessor = server.getDataAccessor({
     singularCode: "oc_user",

package/src/plugins/cronJob/CronJobPlugin.ts

@@ -12,6 +12,7 @@ import {
 } from "~/core/server";
 import { ActionHandlerContext } from "~/core/actionHandler";
 import { find } from "lodash";
+import { validateLicense } from "~/helpers/licenseHelper";
 
 class CronJobPlugin implements RapidPlugin {
   #server: IRpdServer;
@@ -90,6 +91,8 @@ class CronJobPlugin implements RapidPlugin {
   async executeJob(server: IRpdServer, job: CronJobConfiguration) {
     const logger = server.getLogger();
     try {
+      validateLicense(logger, server);
+
       let handlerContext: ActionHandlerContext = {
         logger,
         routerContext: null,

package/src/server.ts

@@ -30,7 +30,7 @@ import { Next, RouteContext } from "./core/routeContext";
 import { RapidRequest } from "./core/request";
 import bootstrapApplicationConfig from "./bootstrapApplicationConfig";
 import EntityManager from "./dataAccess/entityManager";
-import { bind, cloneDeep, find, forEach, merge, omit } from "lodash";
+import { bind, cloneDeep, find, forEach, isString, merge, omit } from "lodash";
 import { Logger } from "./facilities/log/LogFacility";
 import { FacilityFactory } from "./core/facility";
 import { CronJobConfiguration } from "./types/cron-job-types";
@@ -443,15 +443,16 @@ export class RapidServer implements IRpdServer {
       await this.#pluginManager.onPrepareRouteContext(routeContext);
       await this.#buildedRoutes(routeContext, next);
     } catch (ex) {
-      this.#logger.error("handle request error:", ex);
-      response.json(
-        {
-          error: {
-            message: ex.message || ex,
-          },
-        },
-        500,
-      );
+      let error: any;
+      if (isString(ex)) {
+        error = {
+          message: ex,
+        };
+      } else {
+        error = { name: ex.name, message: ex.message, stack: ex.stack };
+      }
+      this.#logger.error("handle request error.", { error });
+      response.json({ error }, 500);
     }
 
     if (!response.status && !response.body) {