@ruiapp/rapid-core 0.10.9 → 0.10.10

package/dist/index.js

@@ -8084,8 +8084,9 @@ class LicenseService {
         this.#systemSettingItemManager = server.getEntityManager("system_setting_item");
     }
     async loadLicense() {
+        const routeContext = new RouteContext(this.#server, null);
         const settingService = this.#server.getService("settingService");
-        const licenseSettings = await settingService.getSystemSettingValues("license");
+        const licenseSettings = await settingService.getSystemSettingValues(routeContext, "license");
         const { deployId, cert: certText } = licenseSettings;
         if (!deployId || !certText) {
             this.#server.getLogger().warn("License was not loaded properly.");
@@ -8109,8 +8110,9 @@ class LicenseService {
         return extractCertLicense(this.#encryptionKey, deployId, cert);
     }
     async updateLicense(certText) {
+        const routeContext = new RouteContext(this.#server, null);
         const settingService = this.#server.getService("settingService");
-        const deployId = await settingService.getSystemSettingValue("license", "deployId");
+        const deployId = await settingService.getSystemSettingValue(routeContext, "license", "deployId");
         let license;
         try {
             license = this.parseLicense(deployId, certText);
@@ -8119,7 +8121,7 @@ class LicenseService {
             this.#server.getLogger().error("Parse license failed.", error);
             throw new Error("Parse license failed.");
         }
-        await settingService.setSystemSettingValue("license", "cert", certText);
+        await settingService.setSystemSettingValue(routeContext, "license", "cert", certText);
         this.#license = license;
         return license;
     }
@@ -8473,13 +8475,14 @@ class ServerOperationPlugin {
     async configureRoutes(server, applicationConfig) {
         const routes = [];
         for (const operation of this.#operations) {
+            const path = operation.path || `/app/${operation.code}`;
             routes.push({
                 namespace: "app",
                 name: `app.operations.${operation.code}`,
                 code: `app.operations.${operation.code}`,
                 type: "RESTful",
                 method: operation.method,
-                endpoint: `/app/${operation.code}`,
+                endpoint: path,
                 actions: [
                     {
                         code: "runServerOperation",
@@ -8500,8 +8503,8 @@ class ServerOperationPlugin {
 
 const code$4 = "getUserSettingValues";
 async function handler$4(plugin, ctx, options) {
-    const { server, routerContext } = ctx;
-    const userId = routerContext.state.userId;
+    const { server, routerContext: routeContext } = ctx;
+    const userId = routeContext.state.userId;
     if (!userId) {
         ctx.status = 401;
         ctx.output = {
@@ -8519,7 +8522,7 @@ async function handler$4(plugin, ctx, options) {
         throw new Error(`Group code is required when getting system setting values.`);
     }
     const settingService = server.getService("settingService");
-    const settingValues = await settingService.getUserSettingValues(userId, input.groupCode);
+    const settingValues = await settingService.getUserSettingValues(routeContext, userId, input.groupCode);
     ctx.output = settingValues;
 }
 
@@ -8531,7 +8534,7 @@ var getUserSettingValues$1 = /*#__PURE__*/Object.freeze({
 
 const code$3 = "getSystemSettingValues";
 async function handler$3(plugin, ctx, options) {
-    const { server, routerContext } = ctx;
+    const { server, routerContext: routeContext } = ctx;
     const input = ctx.input;
     if (options?.groupCode) {
         input.groupCode = options.groupCode;
@@ -8540,7 +8543,7 @@ async function handler$3(plugin, ctx, options) {
         throw new Error(`Group code is required when getting system setting values.`);
     }
     const settingService = server.getService("settingService");
-    const settingValues = await settingService.getSystemSettingValues(input.groupCode);
+    const settingValues = await settingService.getSystemSettingValues(routeContext, input.groupCode);
     ctx.output = settingValues;
 }
 
@@ -8552,7 +8555,7 @@ var getSystemSettingValues$1 = /*#__PURE__*/Object.freeze({
 
 const code$2 = "setSystemSettingValues";
 async function handler$2(plugin, ctx, options) {
-    const { server, routerContext } = ctx;
+    const { server, routerContext: routeContext } = ctx;
     const input = ctx.input;
     if (options?.groupCode) {
         input.groupCode = options.groupCode;
@@ -8561,7 +8564,7 @@ async function handler$2(plugin, ctx, options) {
         throw new Error(`Group code is required when setting system setting values.`);
     }
     const settingService = server.getService("settingService");
-    await settingService.setSystemSettingValues(input.groupCode, input.values);
+    await settingService.setSystemSettingValues(routeContext, input.groupCode, input.values);
     ctx.output = {};
 }
 
@@ -8986,8 +8989,9 @@ class SettingService {
         this.#userSettingItemManager = server.getEntityManager("user_setting_item");
     }
     //#region System Setting
-    async getSystemSettingItems(groupCode) {
+    async getSystemSettingItems(routeContext, groupCode) {
         return await this.#systemSettingItemManager.findEntities({
+            routeContext,
             filters: [
                 {
                     operator: "eq",
@@ -8997,15 +9001,16 @@ class SettingService {
             ],
         });
     }
-    async getSystemSettingValues(groupCode) {
-        const settingItems = await this.getSystemSettingItems(groupCode);
+    async getSystemSettingValues(routeContext, groupCode) {
+        const settingItems = await this.getSystemSettingItems(routeContext, groupCode);
         return settingItems.reduce((settingValues, settingItem) => {
             settingValues[settingItem.itemCode] = settingItem.value;
             return settingValues;
         }, {});
     }
-    async getSystemSettingValue(groupCode, itemCode) {
+    async getSystemSettingValue(routeContext, groupCode, itemCode) {
         const settingItem = await this.#systemSettingItemManager.findEntity({
+            routeContext,
             filters: [
                 {
                     operator: "eq",
@@ -9021,8 +9026,9 @@ class SettingService {
         });
         return settingItem ? settingItem.value : null;
     }
-    async setSystemSettingValue(groupCode, itemCode, value) {
+    async setSystemSettingValue(routeContext, groupCode, itemCode, value) {
         const settingItem = await this.#systemSettingItemManager.findEntity({
+            routeContext,
             filters: [
                 {
                     operator: "eq",
@@ -9039,6 +9045,7 @@ class SettingService {
         if (settingItem) {
             if (settingItem.value !== value) {
                 await this.#systemSettingItemManager.updateEntityById({
+                    routeContext,
                     id: settingItem.id,
                     entityToSave: {
                         value,
@@ -9048,6 +9055,7 @@ class SettingService {
         }
         else {
             await this.#systemSettingItemManager.createEntity({
+                routeContext,
                 entity: {
                     groupCode,
                     itemCode,
@@ -9056,16 +9064,17 @@ class SettingService {
             });
         }
     }
-    async setSystemSettingValues(groupCode, settingValues) {
+    async setSystemSettingValues(routeContext, groupCode, settingValues) {
         for (const itemCode in settingValues) {
             const value = settingValues[itemCode];
-            await this.setSystemSettingValue(groupCode, itemCode, value);
+            await this.setSystemSettingValue(routeContext, groupCode, itemCode, value);
         }
     }
     //#endregion
     //#region User Setting
-    async getUserSettingItems(ownerId, groupCode) {
+    async getUserSettingItems(routeContext, ownerId, groupCode) {
         return await this.#userSettingItemManager.findEntities({
+            routeContext,
             filters: [
                 {
                     operator: "eq",
@@ -9080,15 +9089,16 @@ class SettingService {
             ],
         });
     }
-    async getUserSettingValues(ownerId, groupCode) {
-        const settingItems = await this.getUserSettingItems(ownerId, groupCode);
+    async getUserSettingValues(routeContext, ownerId, groupCode) {
+        const settingItems = await this.getUserSettingItems(routeContext, ownerId, groupCode);
         return settingItems.reduce((settingValues, settingItem) => {
             settingValues[settingItem.itemCode] = settingItem.value;
             return settingValues;
         }, {});
     }
-    async getUserSettingValue(ownerId, groupCode, itemCode) {
+    async getUserSettingValue(routeContext, ownerId, groupCode, itemCode) {
         const settingItem = await this.#systemSettingItemManager.findEntity({
+            routeContext,
             filters: [
                 {
                     operator: "eq",
@@ -9109,8 +9119,9 @@ class SettingService {
         });
         return settingItem ? settingItem.value : null;
     }
-    async setUserSettingValue(ownerId, groupCode, itemCode, value) {
+    async setUserSettingValue(routeContext, ownerId, groupCode, itemCode, value) {
         const settingItem = await this.#userSettingItemManager.findEntity({
+            routeContext,
             filters: [
                 {
                     operator: "eq",
@@ -9148,10 +9159,10 @@ class SettingService {
             });
         }
     }
-    async setUserSettingValues(ownerId, groupCode, settingValues) {
+    async setUserSettingValues(routeContext, ownerId, groupCode, settingValues) {
         for (const itemCode in settingValues) {
             const value = settingValues[itemCode];
-            await this.setUserSettingValue(ownerId, groupCode, itemCode, value);
+            await this.setUserSettingValue(routeContext, ownerId, groupCode, itemCode, value);
         }
     }
 }

package/dist/plugins/serverOperation/ServerOperationPluginTypes.d.ts

@@ -5,6 +5,10 @@ export interface ServerOperation {
     code: string;
     description?: string;
     method: RpdHttpMethod;
+    /**
+     * 接口路径，默认值为 `/app/{code}`
+     */
+    path?: string;
     permissionCheck?: PermissionCheckPolicy;
     /**
      * 是否在事务中执行

package/dist/plugins/setting/SettingService.d.ts

@@ -1,5 +1,6 @@
 import { IRpdServer } from "../../core/server";
 import { SystemSettingItem, UserSettingItem } from "./SettingPluginTypes";
+import { RouteContext } from "../../core/routeContext";
 export interface GetSystemSettingValuesInput {
     groupCode: string;
 }
@@ -13,14 +14,14 @@ export interface GetUserSettingValuesInput {
 export default class SettingService {
     #private;
     constructor(server: IRpdServer);
-    getSystemSettingItems(groupCode: string): Promise<SystemSettingItem[]>;
-    getSystemSettingValues(groupCode: string): Promise<Record<string, any>>;
-    getSystemSettingValue(groupCode: string, itemCode: string): Promise<any>;
-    setSystemSettingValue(groupCode: string, itemCode: string, value: any): Promise<void>;
-    setSystemSettingValues(groupCode: string, settingValues: Record<string, any>): Promise<void>;
-    getUserSettingItems(ownerId: number, groupCode: string): Promise<UserSettingItem[]>;
-    getUserSettingValues(ownerId: number, groupCode: string): Promise<Record<string, any>>;
-    getUserSettingValue(ownerId: number, groupCode: string, itemCode: string): Promise<any>;
-    setUserSettingValue(ownerId: number, groupCode: string, itemCode: string, value: any): Promise<void>;
-    setUserSettingValues(ownerId: number, groupCode: string, settingValues: Record<string, any>): Promise<void>;
+    getSystemSettingItems(routeContext: RouteContext, groupCode: string): Promise<SystemSettingItem[]>;
+    getSystemSettingValues(routeContext: RouteContext, groupCode: string): Promise<Record<string, any>>;
+    getSystemSettingValue(routeContext: RouteContext, groupCode: string, itemCode: string): Promise<any>;
+    setSystemSettingValue(routeContext: RouteContext, groupCode: string, itemCode: string, value: any): Promise<void>;
+    setSystemSettingValues(routeContext: RouteContext, groupCode: string, settingValues: Record<string, any>): Promise<void>;
+    getUserSettingItems(routeContext: RouteContext, ownerId: number, groupCode: string): Promise<UserSettingItem[]>;
+    getUserSettingValues(routeContext: RouteContext, ownerId: number, groupCode: string): Promise<Record<string, any>>;
+    getUserSettingValue(routeContext: RouteContext, ownerId: number, groupCode: string, itemCode: string): Promise<any>;
+    setUserSettingValue(routeContext: RouteContext, ownerId: number, groupCode: string, itemCode: string, value: any): Promise<void>;
+    setUserSettingValues(routeContext: RouteContext, ownerId: number, groupCode: string, settingValues: Record<string, any>): Promise<void>;
 }

package/package.json

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

package/src/plugins/license/LicenseService.ts

@@ -7,6 +7,7 @@ import { extractCertLicense } from "./helpers/certHelper";
 import dayjs from "dayjs";
 import { get, isString } from "lodash";
 import { isNullOrUndefinedOrEmpty } from "~/utilities/typeUtility";
+import { RouteContext } from "~/core/routeContext";
 
 export interface GetSystemSettingValuesInput {
   groupCode: string;
@@ -35,8 +36,10 @@ export default class LicenseService {
   }
 
   async loadLicense(): Promise<void> {
+    const routeContext = new RouteContext(this.#server, null);
+
     const settingService = this.#server.getService<SettingService>("settingService");
-    const licenseSettings = await settingService.getSystemSettingValues("license");
+    const licenseSettings = await settingService.getSystemSettingValues(routeContext, "license");
     const { deployId, cert: certText } = licenseSettings as LicenseSettings;
 
     if (!deployId || !certText) {
@@ -64,8 +67,9 @@ export default class LicenseService {
   }
 
   async updateLicense(certText: string) {
+    const routeContext = new RouteContext(this.#server, null);
     const settingService = this.#server.getService<SettingService>("settingService");
-    const deployId: string = await settingService.getSystemSettingValue("license", "deployId");
+    const deployId: string = await settingService.getSystemSettingValue(routeContext, "license", "deployId");
 
     let license: RpdLicense;
     try {
@@ -75,7 +79,7 @@ export default class LicenseService {
       throw new Error("Parse license failed.");
     }
 
-    await settingService.setSystemSettingValue("license", "cert", certText);
+    await settingService.setSystemSettingValue(routeContext, "license", "cert", certText);
     this.#license = license;
     return license;
   }

package/src/plugins/serverOperation/ServerOperationPlugin.ts

@@ -62,13 +62,14 @@ class ServerOperationPlugin implements RapidPlugin {
   async configureRoutes(server: IRpdServer, applicationConfig: RpdApplicationConfig): Promise<any> {
     const routes: RpdRoute[] = [];
     for (const operation of this.#operations) {
+      const path = operation.path || `/app/${operation.code}`;
       routes.push({
         namespace: "app",
         name: `app.operations.${operation.code}`,
         code: `app.operations.${operation.code}`,
         type: "RESTful",
         method: operation.method,
-        endpoint: `/app/${operation.code}`,
+        endpoint: path,
         actions: [
           {
             code: "runServerOperation",

package/src/plugins/serverOperation/ServerOperationPluginTypes.ts

@@ -6,6 +6,11 @@ export interface ServerOperation {
   code: string;
   description?: string;
   method: RpdHttpMethod;
+
+  /**
+   * 接口路径，默认值为 `/app/{code}`
+   */
+  path?: string;
   permissionCheck?: PermissionCheckPolicy;
 
   /**

package/src/plugins/setting/SettingService.ts

@@ -1,6 +1,7 @@
 import { IRpdServer } from "~/core/server";
 import EntityManager from "~/dataAccess/entityManager";
 import { SystemSettingItem, UserSettingItem } from "./SettingPluginTypes";
+import { RouteContext } from "~/core/routeContext";
 
 export interface GetSystemSettingValuesInput {
   groupCode: string;
@@ -28,8 +29,9 @@ export default class SettingService {
   }
 
   //#region System Setting
-  async getSystemSettingItems(groupCode: string): Promise<SystemSettingItem[]> {
+  async getSystemSettingItems(routeContext: RouteContext, groupCode: string): Promise<SystemSettingItem[]> {
     return await this.#systemSettingItemManager.findEntities({
+      routeContext,
       filters: [
         {
           operator: "eq",
@@ -40,8 +42,8 @@ export default class SettingService {
     });
   }
 
-  async getSystemSettingValues(groupCode: string): Promise<Record<string, any>> {
-    const settingItems = await this.getSystemSettingItems(groupCode);
+  async getSystemSettingValues(routeContext: RouteContext, groupCode: string): Promise<Record<string, any>> {
+    const settingItems = await this.getSystemSettingItems(routeContext, groupCode);
 
     return settingItems.reduce<Record<string, any>>((settingValues, settingItem) => {
       settingValues[settingItem.itemCode] = settingItem.value;
@@ -49,8 +51,9 @@ export default class SettingService {
     }, {});
   }
 
-  async getSystemSettingValue(groupCode: string, itemCode: string): Promise<any> {
+  async getSystemSettingValue(routeContext: RouteContext, groupCode: string, itemCode: string): Promise<any> {
     const settingItem = await this.#systemSettingItemManager.findEntity({
+      routeContext,
       filters: [
         {
           operator: "eq",
@@ -68,8 +71,9 @@ export default class SettingService {
     return settingItem ? settingItem.value : null;
   }
 
-  async setSystemSettingValue(groupCode: string, itemCode: string, value: any) {
+  async setSystemSettingValue(routeContext: RouteContext, groupCode: string, itemCode: string, value: any) {
     const settingItem = await this.#systemSettingItemManager.findEntity({
+      routeContext,
       filters: [
         {
           operator: "eq",
@@ -87,6 +91,7 @@ export default class SettingService {
     if (settingItem) {
       if (settingItem.value !== value) {
         await this.#systemSettingItemManager.updateEntityById({
+          routeContext,
           id: settingItem.id,
           entityToSave: {
             value,
@@ -95,6 +100,7 @@ export default class SettingService {
       }
     } else {
       await this.#systemSettingItemManager.createEntity({
+        routeContext,
         entity: {
           groupCode,
           itemCode,
@@ -104,17 +110,18 @@ export default class SettingService {
     }
   }
 
-  async setSystemSettingValues(groupCode: string, settingValues: Record<string, any>) {
+  async setSystemSettingValues(routeContext: RouteContext, groupCode: string, settingValues: Record<string, any>) {
     for (const itemCode in settingValues) {
       const value = settingValues[itemCode];
-      await this.setSystemSettingValue(groupCode, itemCode, value);
+      await this.setSystemSettingValue(routeContext, groupCode, itemCode, value);
     }
   }
   //#endregion
 
   //#region User Setting
-  async getUserSettingItems(ownerId: number, groupCode: string): Promise<UserSettingItem[]> {
+  async getUserSettingItems(routeContext: RouteContext, ownerId: number, groupCode: string): Promise<UserSettingItem[]> {
     return await this.#userSettingItemManager.findEntities({
+      routeContext,
       filters: [
         {
           operator: "eq",
@@ -130,8 +137,8 @@ export default class SettingService {
     });
   }
 
-  async getUserSettingValues(ownerId: number, groupCode: string): Promise<Record<string, any>> {
-    const settingItems = await this.getUserSettingItems(ownerId, groupCode);
+  async getUserSettingValues(routeContext: RouteContext, ownerId: number, groupCode: string): Promise<Record<string, any>> {
+    const settingItems = await this.getUserSettingItems(routeContext, ownerId, groupCode);
 
     return settingItems.reduce<Record<string, any>>((settingValues, settingItem) => {
       settingValues[settingItem.itemCode] = settingItem.value;
@@ -139,8 +146,9 @@ export default class SettingService {
     }, {});
   }
 
-  async getUserSettingValue(ownerId: number, groupCode: string, itemCode: string): Promise<any> {
+  async getUserSettingValue(routeContext: RouteContext, ownerId: number, groupCode: string, itemCode: string): Promise<any> {
     const settingItem = await this.#systemSettingItemManager.findEntity({
+      routeContext,
       filters: [
         {
           operator: "eq",
@@ -163,8 +171,9 @@ export default class SettingService {
     return settingItem ? settingItem.value : null;
   }
 
-  async setUserSettingValue(ownerId: number, groupCode: string, itemCode: string, value: any) {
+  async setUserSettingValue(routeContext: RouteContext, ownerId: number, groupCode: string, itemCode: string, value: any) {
     const settingItem = await this.#userSettingItemManager.findEntity({
+      routeContext,
       filters: [
         {
           operator: "eq",
@@ -203,10 +212,10 @@ export default class SettingService {
     }
   }
 
-  async setUserSettingValues(ownerId: number, groupCode: string, settingValues: Record<string, any>) {
+  async setUserSettingValues(routeContext: RouteContext, ownerId: number, groupCode: string, settingValues: Record<string, any>) {
     for (const itemCode in settingValues) {
       const value = settingValues[itemCode];
-      await this.setUserSettingValue(ownerId, groupCode, itemCode, value);
+      await this.setUserSettingValue(routeContext, ownerId, groupCode, itemCode, value);
     }
   }
   //#endregion

package/src/plugins/setting/actionHandlers/getSystemSettingValues.ts

@@ -9,8 +9,8 @@ export interface GetSystemSettingValuesOptions {
 export const code = "getSystemSettingValues";
 
 export async function handler(plugin: RapidPlugin, ctx: ActionHandlerContext, options: GetSystemSettingValuesOptions) {
-  const { server, routerContext } = ctx;
-  const { response } = routerContext;
+  const { server, routerContext: routeContext } = ctx;
+  const { response } = routeContext;
 
   const input: GetSystemSettingValuesInput = ctx.input;
 
@@ -24,7 +24,7 @@ export async function handler(plugin: RapidPlugin, ctx: ActionHandlerContext, op
 
   const settingService = server.getService<SettingService>("settingService");
 
-  const settingValues = await settingService.getSystemSettingValues(input.groupCode);
+  const settingValues = await settingService.getSystemSettingValues(routeContext, input.groupCode);
 
   ctx.output = settingValues;
 }

package/src/plugins/setting/actionHandlers/getUserSettingValues.ts

@@ -9,8 +9,8 @@ export interface GetUserSettingValuesOptions {
 export const code = "getUserSettingValues";
 
 export async function handler(plugin: RapidPlugin, ctx: ActionHandlerContext, options: GetUserSettingValuesOptions) {
-  const { server, routerContext } = ctx;
-  const userId = routerContext.state.userId;
+  const { server, routerContext: routeContext } = ctx;
+  const userId = routeContext.state.userId;
   if (!userId) {
     ctx.status = 401;
     ctx.output = {
@@ -32,7 +32,7 @@ export async function handler(plugin: RapidPlugin, ctx: ActionHandlerContext, op
   }
 
   const settingService = server.getService<SettingService>("settingService");
-  const settingValues = await settingService.getUserSettingValues(userId, input.groupCode);
+  const settingValues = await settingService.getUserSettingValues(routeContext, userId, input.groupCode);
 
   ctx.output = settingValues;
 }

package/src/plugins/setting/actionHandlers/setSystemSettingValues.ts

@@ -9,8 +9,8 @@ export interface SetSystemSettingValuesOptions {
 export const code = "setSystemSettingValues";
 
 export async function handler(plugin: RapidPlugin, ctx: ActionHandlerContext, options: SetSystemSettingValuesOptions) {
-  const { server, routerContext } = ctx;
-  const { response } = routerContext;
+  const { server, routerContext: routeContext } = ctx;
+  const { response } = routeContext;
 
   const input: SetSystemSettingValuesInput = ctx.input;
 
@@ -24,7 +24,7 @@ export async function handler(plugin: RapidPlugin, ctx: ActionHandlerContext, op
 
   const settingService = server.getService<SettingService>("settingService");
 
-  await settingService.setSystemSettingValues(input.groupCode, input.values);
+  await settingService.setSystemSettingValues(routeContext, input.groupCode, input.values);
 
   ctx.output = {};
 }