@webtypen/webframez-core 0.1.2 → 0.1.4

package/dist/Router/Request.d.ts

@@ -9,6 +9,7 @@ export declare class Request {
     body: any;
     bodyPlain: any;
     query: any;
+    queryRaw: any;
     params: any;
     files: any;
     socket: any;

package/dist/Router/Request.js

@@ -10,6 +10,7 @@ class Request {
         this.body = null;
         this.bodyPlain = null;
         this.query = {};
+        this.queryRaw = "";
         this.params = {};
         this.files = {};
         this.socket = undefined;

package/dist/Router/Router.js

@@ -17,6 +17,7 @@ const http_1 = require("http");
 const Response_1 = require("./Response");
 const Request_1 = require("./Request");
 const querystring_1 = __importDefault(require("querystring"));
+const url_1 = __importDefault(require("url"));
 class RouterFacade {
     constructor() {
         /**
@@ -185,7 +186,6 @@ class RouterFacade {
      */
     dissolveRoute(routes, url, request) {
         if (routes[url]) {
-            // If url matches directly -> instant return
             return Object.assign(Object.assign({}, routes[url]), { params: {} });
         }
         else {
@@ -284,6 +284,9 @@ class RouterFacade {
             }
             else if (req && req instanceof http_1.IncomingMessage) {
                 const parsedBody = yield this.parseRequestBody(req);
+                const parsedUrl = req.url ? url_1.default.parse(req.url) : null;
+                const searchParams = parsedUrl && parsedUrl.query ? new URLSearchParams(parsedUrl.query) : null;
+                const queryParams = searchParams ? Object.fromEntries(searchParams.entries()) : {};
                 request.message = req;
                 request.bodyPlain = parsedBody ? parsedBody.plain : "";
                 request.body = parsedBody ? parsedBody.parsed : {};
@@ -292,6 +295,9 @@ class RouterFacade {
                 request.url = req.url ? req.url : "";
                 request.method = req.method ? req.method : "";
                 request.socket = req.socket;
+                request.query = queryParams;
+                request.queryRaw = parsedUrl && parsedUrl.query ? parsedUrl.query : "";
+                request.pathname = parsedUrl ? parsedUrl.pathname : "";
             }
             return request;
         });

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@webtypen/webframez-core",
-    "version": "0.1.2",
+    "version": "0.1.4",
     "description": "The core package of the typescript based webframez (web-framework) by webtypen.de",
     "homepage": "https://webtypen.de/",
     "license": "MIT",

package/src/Router/Request.ts

@@ -9,6 +9,7 @@ export class Request {
     body: any = null;
     bodyPlain: any = null;
     query: any = {};
+    queryRaw: any = "";
     params: any = {};
     files: any = {};
     socket: any = undefined;

package/src/Router/Router.ts

@@ -2,6 +2,7 @@ import { IncomingMessage, ServerResponse } from "http";
 import { Response } from "./Response";
 import { Request } from "./Request";
 import querystring from "querystring";
+import url from "url";
 
 type RouteObject = {
     path: string;
@@ -218,7 +219,6 @@ class RouterFacade {
      */
     dissolveRoute(routes: any, url: string, request?: Request) {
         if (routes[url]) {
-            // If url matches directly -> instant return
             return { ...routes[url], params: {} };
         } else {
             for (const route in routes) {
@@ -321,6 +321,10 @@ class RouterFacade {
             request.bodyPlain = options && options.event && options.event.body ? options.event.body : "";
         } else if (req && req instanceof IncomingMessage) {
             const parsedBody: any = await this.parseRequestBody(req);
+            const parsedUrl = req.url ? url.parse(req.url) : null;
+            const searchParams = parsedUrl && parsedUrl.query ? new URLSearchParams(parsedUrl.query) : null;
+            const queryParams = searchParams ? Object.fromEntries(searchParams.entries()) : {};
+
             request.message = req;
             request.bodyPlain = parsedBody ? parsedBody.plain : "";
             request.body = parsedBody ? parsedBody.parsed : {};
@@ -329,6 +333,9 @@ class RouterFacade {
             request.url = req.url ? req.url : "";
             request.method = req.method ? req.method : "";
             request.socket = req.socket;
+            request.query = queryParams;
+            request.queryRaw = parsedUrl && parsedUrl.query ? parsedUrl.query : "";
+            request.pathname = parsedUrl ? parsedUrl.pathname : "";
         }
         return request;
     }