@ruiapp/rapid-core 0.0.2 → 0.1.1

package/dist/core/request.d.ts

@@ -3,13 +3,17 @@ export declare const GlobalRequest: {
     prototype: Request;
 };
 export interface RapidRequestBody {
-    type: string;
+    type: "form-data" | "json" | "form";
     value: any;
 }
 export declare class RapidRequest {
+    #private;
     method: string;
     url: URL;
+    headers: Headers;
     hasBody: boolean;
-    constructor(init: RequestInit);
-    body(): RapidRequestBody;
+    constructor(req: Request);
+    parseBody(): Promise<void>;
+    get rawRequest(): Request;
+    get body(): RapidRequestBody;
 }

package/dist/core/server.d.ts

@@ -12,6 +12,7 @@ export interface IRpdServer {
     getHttpHandlerByCode(code: string): HttpRequestHandler | undefined;
     getDataAccessor<T = any>(options: GetDataAccessorOptions): IRpdDataAccessor<T>;
     getApplicationConfig(): RpdApplicationConfig;
+    appendApplicationConfig(config: Partial<RpdApplicationConfig>): any;
     getModel(options: GetModelOptions): RpdDataModel | undefined;
     registerEventHandler<K extends keyof RpdServerEventTypes>(eventName: K, listener: (...args: RpdServerEventTypes[K]) => void): this;
     emitEvent<K extends keyof RpdServerEventTypes>(eventName: K, sender: IPluginInstance, payload: RpdServerEventTypes[K][1]): void;

package/dist/dataAccess/dataAccessor.d.ts

@@ -1,4 +1,4 @@
-import { CountEntityOptions, FindEntityOptions, IRpdDataAccessor, RpdDataModel } from "~/types";
+import { CountEntityOptions, FindEntityOptions, IRpdDataAccessor, RpdDataModel, IDatabaseAccessor } from "~/types";
 import QueryBuilder from "~/queryBuilder/queryBuilder";
 export interface IDataAccessorOptions {
     model: RpdDataModel;
@@ -6,7 +6,7 @@ export interface IDataAccessorOptions {
 }
 export default class DataAccessor<T = any> implements IRpdDataAccessor<T> {
     #private;
-    constructor(options: IDataAccessorOptions);
+    constructor(databaseAccessor: IDatabaseAccessor, options: IDataAccessorOptions);
     getModel(): RpdDataModel;
     create(entity: Partial<T>): Promise<T>;
     updateById(id: any, entity: Partial<T>): Promise<{

package/dist/index.js

@@ -41,7 +41,8 @@ class DataAccessor {
     #model;
     #queryBuilder;
     #databaseAccessor;
-    constructor(options) {
+    constructor(databaseAccessor, options) {
+        this.#databaseAccessor = databaseAccessor;
         this.#queryBuilder = options.queryBuilder;
         this.#model = options.model;
     }
@@ -153,6 +154,7 @@ class QueryBuilder {
     }
     select(model, options) {
         const ctx = {
+            builder: this,
             params: [],
         };
         let { properties, filters, orderBy, pagination } = options;
@@ -191,6 +193,7 @@ class QueryBuilder {
     }
     count(model, options) {
         const ctx = {
+            builder: this,
             params: [],
         };
         let { filters } = options;
@@ -208,6 +211,7 @@ class QueryBuilder {
     insert(model, options) {
         const params = [];
         const ctx = {
+            builder: this,
             params,
         };
         const { entity } = options;
@@ -242,6 +246,7 @@ class QueryBuilder {
     update(model, options) {
         const params = [];
         const ctx = {
+            builder: this,
             params,
         };
         let { entity, filters } = options;
@@ -279,6 +284,7 @@ class QueryBuilder {
     delete(model, options) {
         const params = [];
         const ctx = {
+            builder: this,
             params,
         };
         let { filters } = options;
@@ -353,7 +359,7 @@ function buildLogicalFilterQuery(level, ctx, filter) {
     return command;
 }
 function buildUnaryFilterQuery(ctx, filter) {
-    let command = this.quoteObject(filter.field);
+    let command = ctx.builder.quoteObject(filter.field);
     if (filter.operator === "null") {
         command += " IS NULL";
     }
@@ -363,7 +369,7 @@ function buildUnaryFilterQuery(ctx, filter) {
     return command;
 }
 function buildInFilterQuery(ctx, filter) {
-    let command = this.quoteObject(filter.field);
+    let command = ctx.builder.quoteObject(filter.field);
     if (filter.operator === "in") {
         command += " = ";
     }
@@ -375,49 +381,49 @@ function buildInFilterQuery(ctx, filter) {
     return command;
 }
 function buildContainsFilterQuery(ctx, filter) {
-    let command = this.quoteObject(filter.field);
+    let command = ctx.builder.quoteObject(filter.field);
     command += " LIKE ";
     ctx.params.push(`%${filter.value}%`);
     command += "$" + ctx.params.length;
     return command;
 }
 function buildNotContainsFilterQuery(ctx, filter) {
-    let command = this.quoteObject(filter.field);
+    let command = ctx.builder.quoteObject(filter.field);
     command += " NOT LIKE ";
     ctx.params.push(`%${filter.value}%`);
     command += "$" + ctx.params.length;
     return command;
 }
 function buildStartsWithFilterQuery(ctx, filter) {
-    let command = this.quoteObject(filter.field);
+    let command = ctx.builder.quoteObject(filter.field);
     command += " LIKE ";
     ctx.params.push(`${filter.value}%`);
     command += "$" + ctx.params.length;
     return command;
 }
 function buildNotStartsWithFilterQuery(ctx, filter) {
-    let command = this.quoteObject(filter.field);
+    let command = ctx.builder.quoteObject(filter.field);
     command += " NOT LIKE ";
     ctx.params.push(`${filter.value}%`);
     command += "$" + ctx.params.length;
     return command;
 }
 function buildEndsWithFilterQuery(ctx, filter) {
-    let command = this.quoteObject(filter.field);
+    let command = ctx.builder.quoteObject(filter.field);
     command += " LIKE ";
     ctx.params.push(`%${filter.value}`);
     command += "$" + ctx.params.length;
     return command;
 }
 function buildNotEndsWithFilterQuery(ctx, filter) {
-    let command = this.quoteObject(filter.field);
+    let command = ctx.builder.quoteObject(filter.field);
     command += " NOT LIKE ";
     ctx.params.push(`%${filter.value}`);
     command += "$" + ctx.params.length;
     return command;
 }
 function buildRelationalFilterQuery(ctx, filter) {
-    let command = this.quoteObject(filter.field);
+    let command = ctx.builder.quoteObject(filter.field);
     command += relationalOperatorsMap.get(filter.operator);
     ctx.params.push(filter.value);
     command += "$" + ctx.params.length;
@@ -1124,10 +1130,10 @@ async function handleEntityDeleteEvent(server, sender, payload) {
 async function configureModels$3(server, applicationConfig) {
     try {
         const models = await listCollections(server, applicationConfig);
-        applicationConfig.models.push(...models);
+        server.appendApplicationConfig({ models });
     }
     catch (ex) {
-        console.warn("Failed to loading existing meta of models.", ex.message);
+        console.warn("Failed to loading existing meta of models.", ex);
     }
 }
 function listCollections(server, applicationConfig) {
@@ -1808,7 +1814,7 @@ const routeConfigs = [
     },
     {
         code: "updateById",
-        method: "post",
+        method: "patch",
         endpoint: "/:id",
         handlerCode: "updateCollectionEntityById",
     },
@@ -1836,7 +1842,8 @@ async function registerHttpHandlers$3(server) {
     server.registerHttpHandler(_plugin$3, queryDatabase);
 }
 async function configureRoutes$3(server, applicationConfig) {
-    const { routes, models } = applicationConfig;
+    const { models } = applicationConfig;
+    const routes = [];
     models.forEach((model) => {
         const { namespace, singularCode, pluralCode } = model;
         routeConfigs.forEach((routeConfig) => {
@@ -1846,7 +1853,7 @@ async function configureRoutes$3(server, applicationConfig) {
                 code: `${namespace}.${singularCode}.${routeConfig.code}`,
                 type: "RESTful",
                 method: routeConfig.method,
-                endpoint: `/api/${namespace}/${pluralCode}${routeConfig.endpoint}`,
+                endpoint: `/${namespace}/${pluralCode}${routeConfig.endpoint}`,
                 handlers: [
                     {
                         code: routeConfig.handlerCode,
@@ -1859,6 +1866,7 @@ async function configureRoutes$3(server, applicationConfig) {
             });
         });
     });
+    server.appendApplicationConfig({ routes });
 }
 async function onApplicationLoaded$4(server, application) {
     console.log("[dataManager.onApplicationLoaded]");
@@ -1953,11 +1961,21 @@ var listMetaRoutes = /*#__PURE__*/Object.freeze({
 
 async function buildRoutes(server, applicationConfig) {
     const router = new Router__default["default"]();
+    let baseUrl = server.config.baseUrl;
+    if (baseUrl) {
+        if (baseUrl.endsWith('/')) {
+            baseUrl = baseUrl.substring(0, baseUrl.length - 1);
+        }
+    }
+    else {
+        baseUrl = "";
+    }
     applicationConfig.routes.forEach((routeConfig) => {
         if (routeConfig.type !== "RESTful") {
             return;
         }
-        router[routeConfig.method](routeConfig.endpoint, async (routerContext, next) => {
+        const routePath = baseUrl + routeConfig.endpoint;
+        router[routeConfig.method](routePath, async (routerContext, next) => {
             const { request, params } = routerContext;
             let search = request.url.search;
             if (search && search.startsWith("?")) {
@@ -1967,17 +1985,19 @@ async function buildRoutes(server, applicationConfig) {
             const input = Object.assign({}, params, query);
             const requestMethod = request.method;
             if ((requestMethod === "POST" || requestMethod === "PUT" ||
-                requestMethod === "PATCH") && request.hasBody) {
-                const body = request.body();
-                if (body.type === "form-data") {
-                    const formDataReader = body.value;
-                    const formDataBody = await formDataReader.read({ maxFileSize: 1073741824 /* 1GB */ });
-                    Object.assign(input, {
-                        formData: formDataBody
-                    });
-                }
-                else {
-                    Object.assign(input, await body.value);
+                requestMethod === "PATCH")) {
+                const body = request.body;
+                if (body) {
+                    if (body.type === "form-data") {
+                        const formDataReader = body.value;
+                        const formDataBody = await formDataReader.read({ maxFileSize: 1073741824 /* 1GB */ });
+                        Object.assign(input, {
+                            formData: formDataBody
+                        });
+                    }
+                    else {
+                        Object.assign(input, body.value);
+                    }
                 }
             }
             // Normalize input value
@@ -2170,9 +2190,9 @@ async function initPlugin$1(plugin, server) {
     _plugin$1 = plugin;
 }
 async function configureModels$2(server, applicationConfig) {
-    for (const model of pluginConfig.models) {
-        applicationConfig.models.push(model);
-    }
+    server.appendApplicationConfig({
+        models: pluginConfig.models,
+    });
 }
 async function registerEventHandlers$2(server) {
     const events = [
@@ -2631,7 +2651,7 @@ var getMyProfile = {
     code: "",
     type: "RESTful",
     method: "get",
-    endpoint: "/api/me",
+    endpoint: "/me",
     handlers: [
         {
             code: "getMyProfile",
@@ -2645,7 +2665,7 @@ var signin = {
     code: "",
     type: "RESTful",
     method: "post",
-    endpoint: "/api/signin",
+    endpoint: "/signin",
     handlers: [
         {
             code: "createSession",
@@ -2659,7 +2679,7 @@ var signout = {
     code: "",
     type: "RESTful",
     method: "get",
-    endpoint: "/api/signout",
+    endpoint: "/signout",
     handlers: [
         {
             code: "deleteSession",
@@ -2693,10 +2713,10 @@ async function registerHttpHandlers$1(server) {
 async function registerEventHandlers$1(server) {
 }
 async function configureModels$1(server, applicationConfig) {
-    applicationConfig.models.push(...pluginModels);
+    server.appendApplicationConfig({ models: pluginModels });
 }
 async function configureRoutes$1(server, applicationConfig) {
-    applicationConfig.routes.push(...pluginRoutes);
+    server.appendApplicationConfig({ routes: pluginRoutes });
 }
 async function onApplicationLoaded$1(server, applicationConfig) {
     console.log("authManager.onApplicationLoaded");
@@ -2863,8 +2883,8 @@ class RapidResponse {
     headers;
     constructor(body, init) {
         this.body = body;
-        this.headers = new Headers(init.headers);
-        this.status = init.status;
+        this.headers = new Headers(init?.headers);
+        this.status = init?.status;
     }
     json(obj, status, headers) {
         const body = JSON.stringify(obj);
@@ -2904,7 +2924,11 @@ class RouteContext {
         this.request = request;
         this.state = {};
         this.response = new RapidResponse();
+        // `method` and `path` are used by `koa-tree-router` to match route
+        this.method = request.method;
+        this.path = request.url.pathname;
     }
+    // `koa-tree-router` uses this method to set headers
     set(headerName, headerValue) {
         this.response.headers.set(headerName, headerValue);
     }
@@ -2918,133 +2942,59 @@ class RouteContext {
 
 const GlobalRequest = global.Request;
 class RapidRequest {
+    #raw;
+    #bodyParsed;
+    #body;
     method;
     url;
+    headers;
     hasBody;
-    constructor(init) {
-    }
-    body() {
-        return {
-            type: "",
-            value: {}
-        };
-    }
-}
-
-class RapidServer {
-    #eventManager;
-    #middlewares;
-    #bootstrapApplicationConfig;
-    #applicationConfig;
-    #httpHandlersMapByCode;
-    #databaseAccessor;
-    queryBuilder;
-    config;
-    databaseConfig;
-    #buildedRoutes;
-    constructor(options) {
-        this.#eventManager = new EventManager();
-        this.#middlewares = [];
-        this.#bootstrapApplicationConfig = options.applicationConfig;
-        this.#applicationConfig = {};
-        this.#httpHandlersMapByCode = new Map();
-        this.#databaseAccessor = options.databaseAccessor;
-        this.queryBuilder = new QueryBuilder({
-            dbDefaultSchema: options.databaseConfig.dbDefaultSchema,
-        });
-        this.databaseConfig = options.databaseConfig;
-        this.config = options.serverConfig;
-    }
-    getApplicationConfig() {
-        return this.#applicationConfig;
-    }
-    registerHttpHandler(plugin, options) {
-        const handler = ___namespace.bind(options.handler, null, plugin);
-        this.#httpHandlersMapByCode.set(options.code, handler);
-    }
-    getHttpHandlerByCode(code) {
-        return this.#httpHandlersMapByCode.get(code);
-    }
-    registerMiddleware(middleware) {
-        this.#middlewares.push(middleware);
-    }
-    getDataAccessor(options) {
-        const { namespace, singularCode } = options;
-        // TODO: Should reuse the and DataAccessor instance
-        const model = this.getModel(options);
-        if (!model) {
-            throw new Error(`Data model ${namespace}.${singularCode} not found.`);
+    constructor(req) {
+        this.#raw = req;
+        this.method = req.method;
+        this.url = new URL(req.url);
+        this.headers = req.headers;
+    }
+    async parseBody() {
+        if (this.#bodyParsed) {
+            console.warn("Request body has been parsed. 'parseBody()' method should not be called more than once.");
+            return;
         }
-        const dataAccessor = new DataAccessor({
-            model,
-            queryBuilder: this.queryBuilder,
-        });
-        return dataAccessor;
-    }
-    getModel(options) {
-        if (options.namespace) {
-            return this.#applicationConfig?.models.find((e) => e.namespace === options.namespace && e.singularCode === options.singularCode);
+        const requestMethod = this.method;
+        if (requestMethod === "POST" || requestMethod === "PUT" || requestMethod === "PATCH") {
+            const req = this.#raw;
+            const contentType = this.headers.get("Content-Type");
+            if (contentType.includes("json")) {
+                this.#body = {
+                    type: "json",
+                    value: await req.json(),
+                };
+            }
+            else if (contentType.startsWith("application/x-www-form-urlencoded")) {
+                const bodyText = await req.text();
+                this.#body = {
+                    type: "form",
+                    value: qs__default["default"].parse(bodyText),
+                };
+            }
+            else if (contentType.startsWith("multipart/form-data")) {
+                this.#body = {
+                    type: "form-data",
+                    value: await req.formData(),
+                };
+            }
         }
-        return this.#applicationConfig?.models.find((e) => e.singularCode === options.singularCode);
+        this.#body = null;
+        this.#bodyParsed = true;
     }
-    registerEventHandler(eventName, listener) {
-        this.#eventManager.on(eventName, listener);
-        return this;
+    get rawRequest() {
+        return this.#raw;
     }
-    async emitEvent(eventName, sender, payload) {
-        console.log(`Emit event "${eventName}"`, payload);
-        await this.#eventManager.emit(eventName, sender, payload);
-        // TODO: should move this logic into metaManager
-        // if (
-        //   (eventName === "entity.create" || eventName === "entity.update" ||
-        //     eventName === "entity.delete") &&
-        //   payload.namespace === "meta"
-        // ) {
-        //   await this.configureApplication();
-        // }
-    }
-    async start() {
-        console.log("Starting rapid server...");
-        await loadPlugins();
-        await initPlugins(this);
-        await registerMiddlewares(this);
-        await registerHttpHandlers(this);
-        await registerEventHandlers(this);
-        await registerMessageHandlers(this);
-        await registerTaskProcessors(this);
-        await this.configureApplication();
-        console.log(`Application ready.`);
-        await onApplicationReady(this, this.#applicationConfig);
-    }
-    async configureApplication() {
-        this.#applicationConfig = ___namespace.merge({}, this.#bootstrapApplicationConfig);
-        await onLoadingApplication(this, this.#applicationConfig);
-        await configureModels(this, this.#applicationConfig);
-        await configureModelProperties(this, this.#applicationConfig);
-        await configureRoutes(this, this.#applicationConfig);
-        // TODO: check application configuration.
-        await onApplicationLoaded(this, this.#applicationConfig);
-        this.#buildedRoutes = await buildRoutes(this, this.#applicationConfig);
-    }
-    async queryDatabaseObject(sql, params) {
-        return await this.#databaseAccessor.queryDatabaseObject(sql, params);
-    }
-    async tryQueryDatabaseObject(sql, params) {
-        try {
-            return await this.queryDatabaseObject(sql, params);
-        }
-        catch (err) {
-            console.error(err.message);
+    get body() {
+        if (!this.#bodyParsed) {
+            throw new Error("Request body not parsed, you should call 'parseBody()' method before getting the body.");
         }
-        return [];
-    }
-    get middlewares() {
-        return this.#middlewares;
-    }
-    async handleRequest(request, next) {
-        const routeContext = new RouteContext(new RapidRequest(request));
-        await this.#buildedRoutes(routeContext, next);
-        return routeContext.response.getResponse();
+        return this.#body;
     }
 }
 
@@ -3535,7 +3485,7 @@ var bootstrapApplicationConfig = {
             code: "meta.model.list",
             type: "RESTful",
             method: "get",
-            endpoint: "/meta/models",
+            endpoint: "/_meta/models",
             handlers: [
                 {
                     code: "listMetaModels",
@@ -3548,7 +3498,7 @@ var bootstrapApplicationConfig = {
             code: "meta.model.getDetail",
             type: "RESTful",
             method: "get",
-            endpoint: "/meta/models/:namespace/:singularCode",
+            endpoint: "/_meta/models/:namespace/:singularCode",
             handlers: [
                 {
                     code: "getMetaModelDetail",
@@ -3561,7 +3511,7 @@ var bootstrapApplicationConfig = {
             code: "meta.route.list",
             type: "RESTful",
             method: "get",
-            endpoint: "/meta/routes",
+            endpoint: "/_meta/routes",
             handlers: [
                 {
                     code: "listMetaRoutes",
@@ -3576,6 +3526,162 @@ var bootstrapApplicationConfig$1 = /*#__PURE__*/Object.freeze({
   'default': bootstrapApplicationConfig
 });
 
+class RapidServer {
+    #eventManager;
+    #middlewares;
+    #bootstrapApplicationConfig;
+    #applicationConfig;
+    #httpHandlersMapByCode;
+    #databaseAccessor;
+    queryBuilder;
+    config;
+    databaseConfig;
+    #buildedRoutes;
+    constructor(options) {
+        this.#eventManager = new EventManager();
+        this.#middlewares = [];
+        this.#bootstrapApplicationConfig = options.applicationConfig || bootstrapApplicationConfig;
+        this.#applicationConfig = {};
+        this.#httpHandlersMapByCode = new Map();
+        this.#databaseAccessor = options.databaseAccessor;
+        this.queryBuilder = new QueryBuilder({
+            dbDefaultSchema: options.databaseConfig.dbDefaultSchema,
+        });
+        this.databaseConfig = options.databaseConfig;
+        this.config = options.serverConfig;
+    }
+    getApplicationConfig() {
+        return this.#applicationConfig;
+    }
+    appendApplicationConfig(config) {
+        const { models, routes } = config;
+        if (models) {
+            for (const model of models) {
+                const originalModel = ___namespace.find(this.#applicationConfig.models, (item) => item.singularCode == model.singularCode);
+                if (originalModel) {
+                    originalModel.name = model.name;
+                    const originalProperties = originalModel.properties;
+                    for (const property of model.properties) {
+                        const originalProperty = ___namespace.find(originalProperties, (item) => item.code == property.code);
+                        if (originalProperty) {
+                            originalProperty.name = property.name;
+                        }
+                        else {
+                            originalProperties.push(property);
+                        }
+                    }
+                }
+                else {
+                    this.#applicationConfig.models.push(model);
+                }
+            }
+        }
+        if (routes) {
+            for (const route of routes) {
+                const originalRoute = ___namespace.find(this.#applicationConfig.routes, (item) => item.code == route.code);
+                if (originalRoute) {
+                    originalRoute.name = route.name;
+                    originalRoute.handlers = route.handlers;
+                }
+                else {
+                    this.#applicationConfig.routes.push(route);
+                }
+            }
+        }
+    }
+    registerHttpHandler(plugin, options) {
+        const handler = ___namespace.bind(options.handler, null, plugin);
+        this.#httpHandlersMapByCode.set(options.code, handler);
+    }
+    getHttpHandlerByCode(code) {
+        return this.#httpHandlersMapByCode.get(code);
+    }
+    registerMiddleware(middleware) {
+        this.#middlewares.push(middleware);
+    }
+    getDataAccessor(options) {
+        const { namespace, singularCode } = options;
+        // TODO: Should reuse the and DataAccessor instance
+        const model = this.getModel(options);
+        if (!model) {
+            throw new Error(`Data model ${namespace}.${singularCode} not found.`);
+        }
+        const dataAccessor = new DataAccessor(this.#databaseAccessor, {
+            model,
+            queryBuilder: this.queryBuilder,
+        });
+        return dataAccessor;
+    }
+    getModel(options) {
+        if (options.namespace) {
+            return this.#applicationConfig?.models.find((e) => e.namespace === options.namespace && e.singularCode === options.singularCode);
+        }
+        return this.#applicationConfig?.models.find((e) => e.singularCode === options.singularCode);
+    }
+    registerEventHandler(eventName, listener) {
+        this.#eventManager.on(eventName, listener);
+        return this;
+    }
+    async emitEvent(eventName, sender, payload) {
+        console.log(`Emit event "${eventName}"`, payload);
+        await this.#eventManager.emit(eventName, sender, payload);
+        // TODO: should move this logic into metaManager
+        // if (
+        //   (eventName === "entity.create" || eventName === "entity.update" ||
+        //     eventName === "entity.delete") &&
+        //   payload.namespace === "meta"
+        // ) {
+        //   await this.configureApplication();
+        // }
+    }
+    async start() {
+        console.log("Starting rapid server...");
+        await loadPlugins();
+        await initPlugins(this);
+        await registerMiddlewares(this);
+        await registerHttpHandlers(this);
+        await registerEventHandlers(this);
+        await registerMessageHandlers(this);
+        await registerTaskProcessors(this);
+        await this.configureApplication();
+        console.log(`Application ready.`);
+        await onApplicationReady(this, this.#applicationConfig);
+    }
+    async configureApplication() {
+        this.#applicationConfig = ___namespace.merge({}, this.#bootstrapApplicationConfig);
+        await onLoadingApplication(this, this.#applicationConfig);
+        await configureModels(this, this.#applicationConfig);
+        await configureModelProperties(this, this.#applicationConfig);
+        await configureRoutes(this, this.#applicationConfig);
+        // TODO: check application configuration.
+        await onApplicationLoaded(this, this.#applicationConfig);
+        this.#buildedRoutes = await buildRoutes(this, this.#applicationConfig);
+    }
+    async queryDatabaseObject(sql, params) {
+        return await this.#databaseAccessor.queryDatabaseObject(sql, params);
+    }
+    async tryQueryDatabaseObject(sql, params) {
+        try {
+            return await this.queryDatabaseObject(sql, params);
+        }
+        catch (err) {
+            console.error(err.message);
+        }
+        return [];
+    }
+    get middlewares() {
+        return this.#middlewares;
+    }
+    async handleRequest(request, next) {
+        const rapidRequest = new RapidRequest(request);
+        await rapidRequest.parseBody();
+        const routeContext = new RouteContext(rapidRequest);
+        console.log('routeContext', routeContext);
+        await this.#buildedRoutes(routeContext, next);
+        return routeContext.response.getResponse();
+    }
+}
+
 fixBigIntJSONSerialize();
 
 exports.GlobalRequest = GlobalRequest;

package/dist/queryBuilder/queryBuilder.d.ts

@@ -1,5 +1,6 @@
 import { CountEntityOptions, DeleteEntityOptions, EntityFilterOptions, FindEntityOptions, CreateEntityOptions, RpdDataModel, UpdateEntityOptions, QuoteTableOptions } from "../types";
 export interface BuildQueryContext {
+    builder: QueryBuilder;
     params: any[];
 }
 export interface InitQueryBuilderOptions {

package/dist/server.d.ts

@@ -6,7 +6,7 @@ export interface InitServerOptions {
     databaseAccessor: IDatabaseAccessor;
     databaseConfig: IDatabaseConfig;
     serverConfig: RapidServerConfig;
-    applicationConfig: RpdApplicationConfig;
+    applicationConfig?: RpdApplicationConfig;
 }
 export declare class RapidServer implements IRpdServer {
     #private;
@@ -15,6 +15,7 @@ export declare class RapidServer implements IRpdServer {
     databaseConfig: IDatabaseConfig;
     constructor(options: InitServerOptions);
     getApplicationConfig(): RpdApplicationConfig;
+    appendApplicationConfig(config: Partial<RpdApplicationConfig>): void;
     registerHttpHandler(plugin: IPluginInstance, options: IPluginHttpHandler): void;
     getHttpHandlerByCode(code: string): HttpRequestHandler;
     registerMiddleware(middleware: any): void;

package/dist/types.d.ts

@@ -1,4 +1,5 @@
 export type RapidServerConfig = {
+    baseUrl?: string;
     sessionCookieName: string;
     jwtKey: string;
     localFileStoragePath: string;
@@ -246,7 +247,7 @@ export interface RpdRoute {
     endpoint: string;
     handlers: RpdHttpHandler[];
 }
-export type RpdHttpMethod = "get" | "post" | "put" | "delete";
+export type RpdHttpMethod = "get" | "post" | "put" | "delete" | "patch";
 export interface RpdHttpHandler {
     code: string;
     config: any;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ruiapp/rapid-core",
-  "version": "0.0.2",
+  "version": "0.1.1",
   "description": "",
   "main": "dist/index.js",
   "keywords": [],

package/src/bootstrapApplicationConfig.ts

@@ -487,7 +487,7 @@ export default {
       code: "meta.model.list",
       type: "RESTful",
       method: "get",
-      endpoint: "/meta/models",
+      endpoint: "/_meta/models",
       handlers: [
         {
           code: "listMetaModels",
@@ -500,7 +500,7 @@ export default {
       code: "meta.model.getDetail",
       type: "RESTful",
       method: "get",
-      endpoint: "/meta/models/:namespace/:singularCode",
+      endpoint: "/_meta/models/:namespace/:singularCode",
       handlers: [
         {
           code: "getMetaModelDetail",
@@ -513,7 +513,7 @@ export default {
       code: "meta.route.list",
       type: "RESTful",
       method: "get",
-      endpoint: "/meta/routes",
+      endpoint: "/_meta/routes",
       handlers: [
         {
           code: "listMetaRoutes",

package/src/core/request.ts

@@ -1,23 +1,68 @@
-export const GlobalRequest = global.Request;
+import qs from "qs";
 
+export const GlobalRequest = global.Request;
 
 export interface RapidRequestBody {
-  type: string;
+  type: "form-data" | "json" | "form";
   value: any;
 }
 
 export class RapidRequest {
+  #raw: Request;
+  #bodyParsed: boolean;
+  #body: RapidRequestBody;
   method: string;
   url: URL;
+  headers: Headers;
   hasBody: boolean;
 
-  constructor(init: RequestInit) {
+  constructor(req: Request) {
+    this.#raw = req;
+    this.method = req.method;
+    this.url = new URL(req.url);
+    this.headers = req.headers;
+  }
+
+  async parseBody(): Promise<void> {
+    if (this.#bodyParsed) {
+      console.warn("Request body has been parsed. 'parseBody()' method should not be called more than once.");
+      return;
+    }
+
+    const requestMethod = this.method;
+    if (requestMethod === "POST" || requestMethod === "PUT" || requestMethod === "PATCH") {
+      const req = this.#raw;
+      const contentType = this.headers.get("Content-Type");
+      if (contentType.includes("json")) {
+        this.#body = {
+          type: "json",
+          value: await req.json(),
+        };
+      } else if (contentType.startsWith("application/x-www-form-urlencoded")) {
+        const bodyText = await req.text();
+        this.#body = {
+          type: "form",
+          value: qs.parse(bodyText),
+        }
+      } else if (contentType.startsWith("multipart/form-data")) {
+        this.#body = {
+          type: "form-data",
+          value: await req.formData(),
+        }
+      }
+    }
+    this.#body = null;
+    this.#bodyParsed = true;
+  }
+
+  get rawRequest(): Request {
+    return this.#raw;
   }
 
-  body(): RapidRequestBody {
-    return {
-      type: "",
-      value: {}
+  get body(): RapidRequestBody {
+    if (!this.#bodyParsed) {
+      throw new Error("Request body not parsed, you should call 'parseBody()' method before getting the body.")
     }
+    return this.#body;
   }
 }

package/src/core/response.ts

@@ -40,8 +40,8 @@ export class RapidResponse {
 
   constructor(body?: BodyInit, init?: ResponseInit) {
     this.body = body;
-    this.headers = new Headers(init.headers);
-    this.status = init.status;
+    this.headers = new Headers(init?.headers);
+    this.status = init?.status;
   }
 
   json(

package/src/core/routeContext.ts

@@ -18,8 +18,13 @@ export class RouteContext {
     this.request = request;
     this.state = {};
     this.response = new RapidResponse();
+
+    // `method` and `path` are used by `koa-tree-router` to match route
+    this.method = request.method;
+    this.path = request.url.pathname;
   }
 
+  // `koa-tree-router` uses this method to set headers
   set(headerName: string, headerValue: string) {
     this.response.headers.set(headerName, headerValue);
   }

package/src/core/routesBuilder.ts

@@ -12,13 +12,24 @@ export async function buildRoutes(
 ) {
   const router = new Router();
 
+  let baseUrl = server.config.baseUrl;
+  if (baseUrl) {
+    if (baseUrl.endsWith('/')) {
+      baseUrl = baseUrl.substring(0, baseUrl.length - 1);
+    }
+  } else {
+    baseUrl = "";
+  }
+
   applicationConfig.routes.forEach((routeConfig) => {
     if (routeConfig.type !== "RESTful") {
       return;
     }
 
+    const routePath = baseUrl + routeConfig.endpoint;
+
     (router as any)[routeConfig.method](
-      routeConfig.endpoint,
+      routePath,
       async (routerContext: RouteContext, next: Next) => {
         const { request, params } = routerContext;
 
@@ -32,17 +43,19 @@ export async function buildRoutes(
         const requestMethod = request.method;
         if (
           (requestMethod === "POST" || requestMethod === "PUT" ||
-            requestMethod === "PATCH") && request.hasBody
+            requestMethod === "PATCH")
         ) {
-          const body = request.body();
-          if (body.type === "form-data") {
-            const formDataReader = body.value;
-            const formDataBody = await formDataReader.read({ maxFileSize: 1073741824 /* 1GB */});
-            Object.assign(input, {
-              formData: formDataBody
-            });
-          } else {
-            Object.assign(input, await body.value);
+          const body = request.body;
+          if (body) {
+            if (body.type === "form-data") {
+              const formDataReader = body.value;
+              const formDataBody = await formDataReader.read({ maxFileSize: 1073741824 /* 1GB */});
+              Object.assign(input, {
+                formData: formDataBody
+              });
+            } else {
+              Object.assign(input, body.value);
+            }
           }
         }
 

package/src/core/server.ts

@@ -24,6 +24,7 @@ export interface IRpdServer {
     options: GetDataAccessorOptions,
   ): IRpdDataAccessor<T>;
   getApplicationConfig(): RpdApplicationConfig;
+  appendApplicationConfig(config: Partial<RpdApplicationConfig>);
   getModel(options: GetModelOptions): RpdDataModel | undefined;
   registerEventHandler<K extends keyof RpdServerEventTypes>(
     eventName: K,

package/src/dataAccess/dataAccessor.ts

@@ -20,7 +20,8 @@ export default class DataAccessor<T = any> implements IRpdDataAccessor<T> {
   #queryBuilder: QueryBuilder;
   #databaseAccessor: IDatabaseAccessor;
 
-  constructor(options: IDataAccessorOptions) {
+  constructor(databaseAccessor: IDatabaseAccessor, options: IDataAccessorOptions) {
+    this.#databaseAccessor = databaseAccessor;
     this.#queryBuilder = options.queryBuilder;
     this.#model = options.model;
   }

package/src/plugins/authManager/mod.ts

@@ -38,14 +38,14 @@ export async function configureModels(
   server: IRpdServer,
   applicationConfig: RpdApplicationConfig,
 ) {
-  applicationConfig.models.push(...pluginModels);
+  server.appendApplicationConfig({ models: pluginModels });
 }
 
 export async function configureRoutes(
   server: IRpdServer,
   applicationConfig: RpdApplicationConfig,
 ) {
-  applicationConfig.routes.push(...pluginRoutes);
+  server.appendApplicationConfig({ routes: pluginRoutes });
 }
 
 export async function onApplicationLoaded(

package/src/plugins/authManager/routes/getMyProfile.ts

@@ -6,7 +6,7 @@ export default {
   code: "",
   type: "RESTful",
   method: "get",
-  endpoint: "/api/me",
+  endpoint: "/me",
   handlers: [
     {
       code: "getMyProfile",

package/src/plugins/authManager/routes/signin.ts

@@ -6,7 +6,7 @@ export default {
   code: "",
   type: "RESTful",
   method: "post",
-  endpoint: "/api/signin",
+  endpoint: "/signin",
   handlers: [
     {
       code: "createSession",

package/src/plugins/authManager/routes/signout.ts

@@ -6,7 +6,7 @@ export default {
   code: "",
   type: "RESTful",
   method: "get",
-  endpoint: "/api/signout",
+  endpoint: "/signout",
   handlers: [
     {
       code: "deleteSession",

package/src/plugins/dataManager/mod.ts

@@ -9,6 +9,7 @@ import {
   IPluginInstance,
   RpdApplicationConfig,
   RpdHttpMethod,
+  RpdRoute,
   RunEntityHttpHandlerOptions,
 } from "~/types";
 
@@ -80,7 +81,7 @@ const routeConfigs: {
   },
   {
     code: "updateById",
-    method: "post",
+    method: "patch",
     endpoint: "/:id",
     handlerCode: "updateCollectionEntityById",
   },
@@ -115,7 +116,8 @@ export async function configureRoutes(
   server: IRpdServer,
   applicationConfig: RpdApplicationConfig,
 ) {
-  const { routes, models } = applicationConfig;
+  const { models } = applicationConfig;
+  const routes: RpdRoute[] = [];
 
   models.forEach((model) => {
     const { namespace, singularCode, pluralCode } = model;
@@ -127,7 +129,7 @@ export async function configureRoutes(
         code: `${namespace}.${singularCode}.${routeConfig.code}`,
         type: "RESTful",
         method: routeConfig.method,
-        endpoint: `/api/${namespace}/${pluralCode}${routeConfig.endpoint}`,
+        endpoint: `/${namespace}/${pluralCode}${routeConfig.endpoint}`,
         handlers: [
           {
             code: routeConfig.handlerCode,
@@ -140,6 +142,8 @@ export async function configureRoutes(
       });
     });
   });
+
+  server.appendApplicationConfig({ routes });
 }
 
 export async function onApplicationLoaded(

package/src/plugins/metaManager/mod.ts

@@ -155,10 +155,10 @@ export async function configureModels(
   applicationConfig: RpdApplicationConfig,
 ) {
   try {
-    const models = await listCollections(server, applicationConfig);
-    applicationConfig.models.push(...models);
+    const models: RpdDataModel[] = await listCollections(server, applicationConfig);
+    server.appendApplicationConfig({ models });
   } catch (ex) {
-    console.warn("Failed to loading existing meta of models.", ex.message);
+    console.warn("Failed to loading existing meta of models.", ex);
   }
 }
 

package/src/plugins/webhooks/mod.ts

@@ -44,9 +44,9 @@ export async function configureModels(
   server: IRpdServer,
   applicationConfig: RpdApplicationConfig,
 ) {
-  for (const model of pluginConfig.models) {
-    applicationConfig.models.push(model);
-  }
+  server.appendApplicationConfig({
+    models: pluginConfig.models,
+  });
 }
 
 export async function registerEventHandlers(server: IRpdServer) {

package/src/queryBuilder/queryBuilder.ts

@@ -32,6 +32,7 @@ const relationalOperatorsMap = new Map<EntityFilterRelationalOperators, string>(
 
 
 export interface BuildQueryContext {
+  builder: QueryBuilder;
   params: any[];
 }
 
@@ -63,6 +64,7 @@ export default class QueryBuilder {
 
   select(model: RpdDataModel, options: FindEntityOptions) {
     const ctx: BuildQueryContext = {
+      builder: this,
       params: [],
     };
     let { properties, filters, orderBy, pagination } = options;
@@ -107,6 +109,7 @@ export default class QueryBuilder {
 
   count(model: RpdDataModel, options: CountEntityOptions) {
     const ctx: BuildQueryContext = {
+      builder: this,
       params: [],
     };
     let { filters } = options;
@@ -128,6 +131,7 @@ export default class QueryBuilder {
   insert(model: RpdDataModel, options: CreateEntityOptions) {
     const params: any[] = [];
     const ctx: BuildQueryContext = {
+      builder: this,
       params,
     };
     const { entity } = options;
@@ -171,6 +175,7 @@ export default class QueryBuilder {
   update(model: RpdDataModel, options: UpdateEntityOptions) {
     const params: any[] = [];
     const ctx: BuildQueryContext = {
+      builder: this,
       params,
     };
     let { entity, filters } = options;
@@ -218,6 +223,7 @@ export default class QueryBuilder {
   delete(model: RpdDataModel, options: DeleteEntityOptions) {
     const params: any[] = [];
     const ctx: BuildQueryContext = {
+      builder: this,
       params,
     };
     let { filters } = options;
@@ -305,7 +311,7 @@ function buildUnaryFilterQuery(
   ctx: BuildQueryContext,
   filter: FindEntityUnaryFilterOptions,
 ) {
-  let command = this.quoteObject(filter.field);
+  let command = ctx.builder.quoteObject(filter.field);
   if (filter.operator === "null") {
     command += " IS NULL";
   } else {
@@ -318,7 +324,7 @@ function buildInFilterQuery(
   ctx: BuildQueryContext,
   filter: FindEntitySetFilterOptions,
 ) {
-  let command = this.quoteObject(filter.field);
+  let command = ctx.builder.quoteObject(filter.field);
 
   if (filter.operator === "in") {
     command += " = ";
@@ -335,7 +341,7 @@ function buildContainsFilterQuery(
   ctx: BuildQueryContext,
   filter: FindEntityRelationalFilterOptions,
 ) {
-  let command = this.quoteObject(filter.field);
+  let command = ctx.builder.quoteObject(filter.field);
 
   command += " LIKE ";
   ctx.params.push(`%${filter.value}%`);
@@ -348,7 +354,7 @@ function buildNotContainsFilterQuery(
   ctx: BuildQueryContext,
   filter: FindEntityRelationalFilterOptions,
 ) {
-  let command = this.quoteObject(filter.field);
+  let command = ctx.builder.quoteObject(filter.field);
 
   command += " NOT LIKE ";
   ctx.params.push(`%${filter.value}%`);
@@ -361,7 +367,7 @@ function buildStartsWithFilterQuery(
   ctx: BuildQueryContext,
   filter: FindEntityRelationalFilterOptions,
 ) {
-  let command = this.quoteObject(filter.field);
+  let command = ctx.builder.quoteObject(filter.field);
 
   command += " LIKE ";
   ctx.params.push(`${filter.value}%`);
@@ -374,7 +380,7 @@ function buildNotStartsWithFilterQuery(
   ctx: BuildQueryContext,
   filter: FindEntityRelationalFilterOptions,
 ) {
-  let command = this.quoteObject(filter.field);
+  let command = ctx.builder.quoteObject(filter.field);
 
   command += " NOT LIKE ";
   ctx.params.push(`${filter.value}%`);
@@ -387,7 +393,7 @@ function buildEndsWithFilterQuery(
   ctx: BuildQueryContext,
   filter: FindEntityRelationalFilterOptions,
 ) {
-  let command = this.quoteObject(filter.field);
+  let command = ctx.builder.quoteObject(filter.field);
 
   command += " LIKE ";
   ctx.params.push(`%${filter.value}`);
@@ -400,7 +406,7 @@ function buildNotEndsWithFilterQuery(
   ctx: BuildQueryContext,
   filter: FindEntityRelationalFilterOptions,
 ) {
-  let command = this.quoteObject(filter.field);
+  let command = ctx.builder.quoteObject(filter.field);
 
   command += " NOT LIKE ";
   ctx.params.push(`%${filter.value}`);
@@ -413,7 +419,7 @@ function buildRelationalFilterQuery(
   ctx: BuildQueryContext,
   filter: FindEntityRelationalFilterOptions,
 ) {
-  let command = this.quoteObject(filter.field);
+  let command = ctx.builder.quoteObject(filter.field);
 
   command += relationalOperatorsMap.get(filter.operator);
 

package/src/server.ts

@@ -63,6 +63,41 @@ export class RapidServer implements IRpdServer {
     return this.#applicationConfig;
   }
 
+  appendApplicationConfig(config: Partial<RpdApplicationConfig>) {
+    const { models, routes } = config;
+    if (models) {
+      for (const model of models) {
+        const originalModel = _.find(this.#applicationConfig.models, (item) => item.singularCode == model.singularCode);
+        if (originalModel) {
+          originalModel.name = model.name;
+          const originalProperties = originalModel.properties;
+          for (const property of model.properties) {
+            const originalProperty = _.find(originalProperties, (item) => item.code == property.code);
+            if (originalProperty) {
+              originalProperty.name = property.name;
+            } else {
+              originalProperties.push(property);
+            }
+          }
+        } else {
+          this.#applicationConfig.models.push(model);
+        }
+      }
+    }
+
+    if (routes) {
+      for (const route of routes) {
+        const originalRoute = _.find(this.#applicationConfig.routes, (item) => item.code == route.code);
+        if (originalRoute) {
+          originalRoute.name = route.name;
+          originalRoute.handlers = route.handlers;
+        } else {
+          this.#applicationConfig.routes.push(route);
+        }
+      }
+    }
+  }
+
   registerHttpHandler(
     plugin: IPluginInstance,
     options: IPluginHttpHandler,
@@ -89,7 +124,7 @@ export class RapidServer implements IRpdServer {
       throw new Error(`Data model ${namespace}.${singularCode} not found.`);
     }
 
-    const dataAccessor = new DataAccessor<T>({
+    const dataAccessor = new DataAccessor<T>(this.#databaseAccessor, {
       model,
       queryBuilder: this.queryBuilder as QueryBuilder,
     });
@@ -185,7 +220,10 @@ export class RapidServer implements IRpdServer {
   }
 
   async handleRequest(request: Request, next: Next) {
-    const routeContext = new RouteContext(new RapidRequest(request));
+    const rapidRequest = new RapidRequest(request);
+    await rapidRequest.parseBody();
+    const routeContext = new RouteContext(rapidRequest);
+    console.log('routeContext', routeContext)
     await this.#buildedRoutes(routeContext, next);
     return routeContext.response.getResponse();
   }

package/src/types.ts

@@ -1,4 +1,5 @@
 export type RapidServerConfig = {
+  baseUrl?: string;
   sessionCookieName: string;
   jwtKey: string;
   localFileStoragePath: string;
@@ -303,7 +304,7 @@ export interface RpdRoute {
   handlers: RpdHttpHandler[];
 }
 
-export type RpdHttpMethod = "get" | "post" | "put" | "delete";
+export type RpdHttpMethod = "get" | "post" | "put" | "delete" | "patch";
 
 export interface RpdHttpHandler {
   code: string;