5htp-core 0.2.6-5 → 0.2.6-6

package/package.json

@@ -1,7 +1,7 @@
 {
 	"name": "5htp-core",
 	"description": "Convenient TypeScript framework designed for Performance and Productivity.",
-	"version": "0.2.6-5",
+	"version": "0.2.6-6",
 	"author": "Gaetan Le Gac (https://github.com/gaetanlegac)",
 	"repository": "git://github.com/gaetanlegac/5htp-core.git",
 	"license": "MIT",

package/src/client/services/router/components/router.tsx

@@ -55,7 +55,8 @@ export default ({ service: router }: { service: Router }) => {
 
         // Page not found: Directly load with the browser
         if (newpage === undefined) {
-            window.location.replace(request.path);
+            window.location.replace(request.url);
+            console.error("not found");
             return;
         // Unable to load (no connection, server error, ....)
         } else if (newpage === null) {
@@ -86,7 +87,7 @@ export default ({ service: router }: { service: Router }) => {
                 //  But when we call setLayout, the style of the previous layout are still oaded and applied
                 //  Find a way to unload the  previous layout / page resources before to load the new one
                 console.log(LogPrefix, `Changing layout. Before:`, curLayout, 'New layout:', newLayout);
-                window.location.replace(request.path);
+                window.location.replace(request.url);
                 return pages;
 
                 context.app.setLayout(newLayout);

package/src/client/services/router/request/index.ts

@@ -27,6 +27,8 @@ export default class ClientRequest<TRouter extends ClientRouter = ClientRouter>
 
     public api: ApiClient;
     public response?: ClientResponse<TRouter>;
+
+    public url: string;
     public hash?: string;
 
     public constructor( 
@@ -38,8 +40,16 @@ export default class ClientRequest<TRouter extends ClientRouter = ClientRouter>
         super(location.pathname);
 
         this.host = window.location.host;
+        this.url = window.location.protocol + '//' + window.location.host + this.path;
         this.hash = location.hash;
 
+        // Extract search params
+        if (location.search) {
+            this.url += location.search;
+            this.data = Object.fromEntries( new URLSearchParams( location.search ));
+        }
+    
+        // Request services
         this.api = new ApiClient(this.app, this);
     }
 

package/src/server/services/router/http/index.ts

@@ -43,6 +43,12 @@ export type Config = {
     upload: {
         maxSize: string // Expression package bytes
     },
+    csp: {
+        default?: string[],
+        styles?: string[],
+        images?: string[],
+        scripts: string[],
+    }
 }
 
 export type Hooks = {
@@ -193,9 +199,7 @@ export default class HttpServer extends Service<Config, Hooks, Application> {
         routes.use( csp.expressCspHeader({
             directives: {
                 'script-src': [csp.INLINE, csp.SELF, 
-                    // Whitelist external js scripts
-                    "https://www.googletagmanager.com/gtag/js",
-                    "https://cdn.jsdelivr.net"
+                   ...this.config.csp.scripts
                 ]
             }
         }));

package/src/types/global/modules.d.ts

@@ -36,7 +36,7 @@ declare module "*.svg" {
     export = value;
 }
 
-declare module "*.png" {
+declare module "*.(png|webp)" {
     const value: string;
     export = value;
 }