@ruiapp/rapid-core 0.1.0 → 0.1.2

package/dist/core/request.d.ts

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

package/dist/index.js

@@ -1842,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) => {
@@ -1865,6 +1866,7 @@ async function configureRoutes$3(server, applicationConfig) {
             });
         });
     });
+    server.appendApplicationConfig({ routes });
 }
 async function onApplicationLoaded$4(server, application) {
     console.log("[dataManager.onApplicationLoaded]");
@@ -1983,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
@@ -2709,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");
@@ -2944,36 +2948,53 @@ class RapidRequest {
     method;
     url;
     headers;
-    hasBody;
     constructor(req) {
         this.#raw = req;
         this.method = req.method;
         this.url = new URL(req.url);
         this.headers = req.headers;
-        this.hasBody = false;
     }
-    body() {
+    async parseBody() {
         if (this.#bodyParsed) {
-            return this.#body;
+            console.warn("Request body has been parsed. 'parseBody()' method should not be called more than once.");
+            return;
         }
-        this.#bodyParsed = true;
-        if (this.method === "post" || this.method === "put" || this.method === "patch") {
-            this.hasBody = true;
+        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: this.#raw.json(),
+                    value: await req.json(),
                 };
             }
-            else if (contentType.includes("application/x-www-form-urlencoded")) {
+            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: this.#raw.formData(),
+                    value: await req.formData(),
                 };
             }
         }
-        this.#body = null;
+        else {
+            this.#body = null;
+        }
+        this.#bodyParsed = true;
+    }
+    get rawRequest() {
+        return this.#raw;
+    }
+    get body() {
+        if (!this.#bodyParsed) {
+            throw new Error("Request body not parsed, you should call 'parseBody()' method before getting the body.");
+        }
         return this.#body;
     }
 }
@@ -3653,7 +3674,9 @@ class RapidServer {
         return this.#middlewares;
     }
     async handleRequest(request, 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/package.json

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

package/src/core/request.ts

@@ -1,9 +1,9 @@
-export const GlobalRequest = global.Request;
-
+import qs from "qs";
 
+export const GlobalRequest = global.Request;
 
 export interface RapidRequestBody {
-  type: "form-data" | "json";
+  type: "form-data" | "json" | "form";
   value: any;
 }
 
@@ -14,41 +14,55 @@ export class RapidRequest {
   method: string;
   url: URL;
   headers: Headers;
-  hasBody: boolean;
 
   constructor(req: Request) {
     this.#raw = req;
     this.method = req.method;
     this.url = new URL(req.url);
     this.headers = req.headers;
-    this.hasBody = false;
   }
 
-  body(): RapidRequestBody {
+  async parseBody(): Promise<void> {
     if (this.#bodyParsed) {
-      return this.#body;
+      console.warn("Request body has been parsed. 'parseBody()' method should not be called more than once.");
+      return;
     }
 
-    this.#bodyParsed = true;
-
-    if (this.method === "post" || this.method === "put" || this.method === "patch") {
-      this.hasBody = true;
-
+    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: this.#raw.json(),
+          value: await req.json(),
         };
-      } else if (contentType.includes("application/x-www-form-urlencoded")) {
+      } 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: this.#raw.formData(),
+          value: await req.formData(),
         }
       }
+    } else {
+      this.#body = null;
     }
+    this.#bodyParsed = true;
+  }
 
-    this.#body = null;
+  get rawRequest(): Request {
+    return this.#raw;
+  }
+
+  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/routesBuilder.ts

@@ -43,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/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/dataManager/mod.ts

@@ -9,6 +9,7 @@ import {
   IPluginInstance,
   RpdApplicationConfig,
   RpdHttpMethod,
+  RpdRoute,
   RunEntityHttpHandlerOptions,
 } from "~/types";
 
@@ -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;
@@ -140,6 +142,8 @@ export async function configureRoutes(
       });
     });
   });
+
+  server.appendApplicationConfig({ routes });
 }
 
 export async function onApplicationLoaded(

package/src/server.ts

@@ -220,7 +220,9 @@ 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();