5htp-core 0.6.0-97 → 0.6.0-99

package/client/assets/css/utils/borders.less

@@ -12,4 +12,4 @@
 .bl-2, .bh-2 { border-left: solid 1px var(--cLine); }
 
 .b-0 { border: none; }
-.b-1 { border-top: solid 1px var(--cLine); }
+.b-1 { border: solid 1px var(--cLine); }

package/common/router/index.ts

@@ -98,7 +98,10 @@ export type TRouteOptions = {
     redirectLogged?: string, // Redirect to this route if auth: false and user is logged
 
     // Rendering
-    static?: boolean,
+    static?: { 
+        refresh?: string, 
+        urls: string[] 
+    },
     canonicalParams?: string[], // For SEO + unique ID for static cache
     layout?: false | string, // The nale of the layout
 

package/package.json

@@ -1,7 +1,7 @@
 {
 	"name": "5htp-core",
 	"description": "Convenient TypeScript framework designed for Performance and Productivity.",
-	"version": "0.6.0-97",
+	"version": "0.6.0-99",
 	"author": "Gaetan Le Gac (https://github.com/gaetanlegac)",
 	"repository": "git://github.com/gaetanlegac/5htp-core.git",
 	"license": "MIT",
@@ -76,6 +76,7 @@
 		"regenerator-runtime": "^0.13.9",
 		"request": "^2.88.2",
 		"slugify": "^1.6.6",
+		"source-map-support": "^0.5.21",
 		"sql-formatter": "^4.0.2",
 		"stopword": "^3.1.1",
 		"tslog": "^4.9.1",

package/server/app/container/index.ts

@@ -4,6 +4,7 @@
 
 // Set timezone
 process.env.TZ = 'UTC';
+import 'source-map-support/register';
 
 // Npm
 import path from 'path';

package/server/services/router/index.ts

@@ -11,6 +11,8 @@
 
 // Node
 // Npm
+import got from 'got';
+import hInterval from 'human-interval';
 import type express from 'express';
 import type { Request, Response, NextFunction } from 'express';
 import { v4 as uuid } from 'uuid';
@@ -137,7 +139,13 @@ export default class ServerRouter
     public ssrRoutes: TSsrUnresolvedRoute[] = [];
 
     // Cache (ex: for static pages)
-    public cache: {[pageId: string]: string} = {}
+    public cache: {
+        [pageId: string]: {
+            rendered: any,
+            expire: number | undefined,
+            options: TRouteOptions["static"]
+        }
+    } = {}
 
     /*----------------------------------
     - SERVICE
@@ -157,6 +165,11 @@ export default class ServerRouter
 
     public async ready() {
 
+        // Every hours
+        setInterval(() => {
+            this.refreshStaticPages();
+        }, 1000 * 60 * 60);
+
         // Detect router services
         for (const serviceName in this.config.plugins) {
             this.app.register( this.config.plugins[serviceName] )
@@ -172,7 +185,6 @@ export default class ServerRouter
         // Start HTTP server
         await this.http.start();
 
-
         // override
         const originalLog = console.log;
         console.log = (...args: any[]) => {
@@ -209,6 +221,65 @@ export default class ServerRouter
     - ACTIONS
     ----------------------------------*/
 
+    private async renderStatic( 
+        path: string, 
+        options: TRouteOptions["static"],
+        rendered?: any
+    ) {
+
+        // Wildcard: tell that the newly rendered pages should be cached
+        if (path === '*')
+            return;
+
+        if (!rendered) {
+
+            const fullUrl = this.url(path, {}, true);
+            console.log('[router] renderStatic', fullUrl);
+
+            const response = await got( fullUrl, {
+                method: 'GET',
+                headers: {
+                    'Accept': 'text/html'
+                },
+                throwHttpErrors: false,
+            });
+
+            if (response.statusCode !== 200) {
+                console.error('renderStatic', response.statusCode, response.body);
+                return;
+            }
+
+            rendered = response.body;
+        }
+
+        this.cache[path] = {
+            rendered: rendered,
+            options: options,
+            expire: typeof options === 'object' 
+                ? Date.now() + (hInterval(options.refresh) || 3600) 
+                : undefined
+        };
+        
+    }
+
+    private refreshStaticPages() {
+
+        console.log('[router] refreshStaticPages');
+        
+        for (const pageId in this.cache) {
+            const page = this.cache[pageId];
+            if (page.expire && page.expire < Date.now()) {
+
+                this.renderStatic(page.path, page.options);
+
+            }
+        }
+    }
+
+
+
+
+
     private registerRoutes(defModules: GlobImportedWithMetas<TRouteModule>) {
         for (const routeModule of defModules) {
 
@@ -257,6 +328,14 @@ export default class ServerRouter
 
         this.routes.push(route);
 
+        // Add to static pages
+        // Should be a GET oage that don't take any parameter
+        if (options.static) {
+            for (const url of options.static.urls) {
+                this.renderStatic(url, options.static);
+            }
+        }
+
         return this;
 
     }
@@ -419,7 +498,13 @@ export default class ServerRouter
             "Cache-Control",
             "no-store, no-cache, must-revalidate, proxy-revalidate"
         );
-        res.setHeader("Pragma", "no-cache");
+
+        // Static pages
+        if (this.cache[req.path]) {
+            console.log('[router] Get static page from cache', req.path);
+            res.send( this.cache[req.path].rendered );
+            return;
+        }
 
         // Create request
         let requestId = uuid();
@@ -578,6 +663,12 @@ export default class ServerRouter
         if (!response.wasProvided)
             return;
 
+        // Set in cache
+        if (route.options.static && route.options.static.urls.includes('*')) {
+            console.log('[router] Set in cache', response.request.path);
+            this.renderStatic(response.request.path, route.options.static, response.data);
+        }
+
         const timeEndResolving = Date.now();
         this.printTakenTime(timeStart, timeEndResolving);
     }

package/server/services/router/response/index.ts

@@ -111,17 +111,6 @@ export default class ServerResponse<
         // Create response context for controllers
         const context = await this.createContext(route);
 
-        // Static rendering
-        const chunkId = route.options["id"];
-        if (route.options.static && 
-            chunkId !== undefined 
-            && 
-            this.router.cache[ chunkId ] !== undefined
-        ) {
-            await this.html( this.router.cache[ chunkId ] );
-            return;
-        }
-
         // Run controller
         const content = await this.route.controller( context );
         if (content === undefined)
@@ -139,10 +128,6 @@ export default class ServerResponse<
         // Return JSON
         else
             await this.json(content);
-
-        // Cache
-        if (route.options.static)
-            this.router.cache[ chunkId ] = this.data;
     }
 
     private updateCanonicalUrl( route: TAnyRoute ) {

package/types/icons.d.ts

@@ -1 +1 @@
-export type TIcones = "solid/spinner-third"|"long-arrow-right"|"times-circle"|"brands/whatsapp"|"times"|"search"|"mouse-pointer"|"thumbs-up"|"dollar-sign"|"exclamation"|"exclamation-circle"|"solid/download"|"angle-down"|"info-circle"|"check-circle"|"home"|"user-circle"|"newspaper"|"plus-circle"|"brands/linkedin"|"brands/twitter"|"brands/facebook"|"books"|"box-full"|"planet-ringed"|"chart-bar"|"power-off"|"comment-alt"|"heart"|"chart-line"|"lock"|"eye"|"credit-card"|"at"|"key"|"bars"|"font"|"tag"|"compress"|"bolt"|"puzzle-piece"|"hourglass-half"|"hourglass-end"|"rocket"|"seedling"|"palette"|"car"|"plane"|"university"|"briefcase"|"hard-hat"|"graduation-cap"|"cogs"|"film"|"leaf"|"tshirt"|"utensils"|"globe"|"map-marked-alt"|"dumbbell"|"stethoscope"|"concierge-bell"|"book"|"shield-alt"|"gavel"|"industry"|"square-root-alt"|"pills"|"medal"|"capsules"|"balance-scale"|"praying-hands"|"shopping-cart"|"flask"|"futbol"|"microchip"|"satellite-dish"|"shipping-fast"|"passport"|"tools"|"database"|"brain"|"download"|"code"|"money-bill"|"angle-left"|"angle-right"|"paper-plane"|"brands/google"|"check"|"trash"|"meh-rolling-eyes"|"arrow-left"|"arrow-right"|"link"|"file"|"bold"|"italic"|"underline"|"strikethrough"|"subscript"|"superscript"|"unlink"|"pen"|"plus"|"empty-set"|"horizontal-rule"|"page-break"|"image"|"table"|"poll"|"columns"|"sticky-note"|"caret-right"|"align-left"|"align-center"|"align-right"|"align-justify"|"indent"|"outdent"|"list-ul"|"check-square"|"h1"|"h2"|"h3"|"h4"|"list-ol"|"paragraph"|"quote-left"
+export type TIcones = "solid/spinner-third"|"long-arrow-right"|"times-circle"|"brands/whatsapp"|"times"|"user"|"rocket"|"globe"|"bullhorn"|"briefcase"|"chart-line"|"handshake"|"ellipsis-h"|"brands/google"|"brands/reddit-alien"|"brands/linkedin-in"|"brands/github"|"robot"|"comments"|"user-friends"|"mouse-pointer"|"thumbs-up"|"dollar-sign"|"search"|"angle-down"|"info-circle"|"check-circle"|"exclamation-circle"|"chart-bar"|"power-off"|"home"|"user-circle"|"newspaper"|"plus-circle"|"brands/linkedin"|"brands/twitter"|"brands/facebook"|"comment-alt"|"heart"|"lock"|"eye"|"credit-card"|"at"|"key"|"bars"|"font"|"tag"|"compress"|"bolt"|"puzzle-piece"|"planet-ringed"|"database"|"solid/fire"|"usd-circle"|"lightbulb"|"solid/dollar-sign"|"download"|"code"|"solid/clock"|"exclamation"|"solid/download"|"seedling"|"palette"|"car"|"plane"|"university"|"hard-hat"|"graduation-cap"|"cogs"|"film"|"leaf"|"tshirt"|"utensils"|"map-marked-alt"|"dumbbell"|"stethoscope"|"concierge-bell"|"book"|"shield-alt"|"gavel"|"industry"|"square-root-alt"|"pills"|"medal"|"capsules"|"balance-scale"|"praying-hands"|"shopping-cart"|"flask"|"futbol"|"microchip"|"satellite-dish"|"shipping-fast"|"passport"|"tools"|"angle-left"|"angle-right"|"check"|"paper-plane"|"trash"|"meh-rolling-eyes"|"arrow-left"|"arrow-right"|"unlink"|"pen"|"link"|"file"|"bold"|"italic"|"underline"|"strikethrough"|"subscript"|"superscript"|"empty-set"|"horizontal-rule"|"page-break"|"image"|"table"|"poll"|"columns"|"sticky-note"|"caret-right"|"plus"|"align-left"|"align-center"|"align-right"|"align-justify"|"indent"|"outdent"|"list-ul"|"check-square"|"h1"|"h2"|"h3"|"h4"|"list-ol"|"paragraph"|"quote-left"