5htp-core 0.6.1-2 → 0.6.1-4

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

@@ -151,8 +151,8 @@ export default ({ service: clientRouter, loaderComponent }: TProps) => {
                 //  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 ? request.url : window.location.href );
-                return page; // Don't spread since it's an instance
+                /*window.location.replace( request ? request.url : window.location.href );
+                return page; // Don't spread since it's an instance*/
 
                 context.app.setLayout(newLayout);
             }

package/client/services/router/request/api.ts

@@ -118,16 +118,36 @@ export default class ApiClient implements ApiClientService {
             // For async calls: api.post(...).then((data) => ...)
             then: (callback: (data: any) => void) => this.fetchAsync<TData>(...args)
                 .then(callback)
-                .catch( e => this.app.handleError(e)),
+                .catch( e => {
+                    this.app.handleError(e);
+
+                    // Don't run what is next
+                    return {
+                        then: () => {},
+                        catch: () => {},
+                        finally: (callback: () => void) => {
+                            callback();
+                        },
+                    }
+                }),
 
             // Default error behavior only if not handled before by the app
-            catch: (callback: (data: any) => void) => this.fetchAsync<TData>(...args)
+            catch: (callback: (data: any) => false | void) => this.fetchAsync<TData>(...args)
                 .catch((e) => {
-                    try {
-                        callback(e);
-                    } catch (error) {
-                        this.app.handleError(e)
+
+                    const shouldThrow = callback(e);
+                    if (shouldThrow) 
+                        this.app.handleError(e);
+
+                    // Don't run what is next
+                    return {
+                        then: () => {},
+                        catch: () => {},
+                        finally: (callback: () => void) => {
+                            callback();
+                        },
                     }
+
                 }),
 
             finally: (callback: () => void) => this.fetchAsync<TData>(...args)

package/common/router/index.ts

@@ -102,6 +102,7 @@ export type TRouteOptions = {
         refresh?: string, 
         urls: string[] 
     },
+    whenStatic?: boolean, // If true, the route is only executed even if the page is cached
     canonicalParams?: string[], // For SEO + unique ID for static cache
     layout?: false | string, // The nale of the layout
 

package/common/router/request/api.ts

@@ -18,6 +18,8 @@ export type TFetcher<TData extends any = unknown> = {
 
     // For async calls: api.post(...).then((data) => ...)
     then: (callback: (data: TData) => void) => Promise<TData>,
+    catch: (callback: (data: any) => false | void) => Promise<TData>,
+    finally: (callback: () => void) => Promise<TData>,
     run: () => Promise<TData>,
     
     method: HttpMethod,

package/package.json

@@ -1,7 +1,7 @@
 {
 	"name": "5htp-core",
 	"description": "Convenient TypeScript framework designed for Performance and Productivity.",
-	"version": "0.6.1-2",
+	"version": "0.6.1-4",
 	"author": "Gaetan Le Gac (https://github.com/gaetanlegac)",
 	"repository": "git://github.com/gaetanlegac/5htp-core.git",
 	"license": "MIT",
@@ -67,8 +67,8 @@
 		"object-sizeof": "^1.6.3",
 		"path-to-regexp": "^6.2.0",
 		"picomatch": "^2.3.1",
-		"preact": "^10.22.1",
-		"preact-render-to-string": "^6.5.5",
+		"preact": "^10.27.1",
+		"preact-render-to-string": "^6.6.1",
 		"prettier": "^3.3.3",
 		"react-scrollbars-custom": "^4.0.27",
 		"react-slider": "^2.0.1",

package/server/services/router/index.ts

@@ -233,7 +233,7 @@ export default class ServerRouter
 
         if (!rendered) {
 
-            const fullUrl = this.url(path, {}, true);
+            const fullUrl = this.url(path + '#bypassCache', {}, true);
             console.log('[router] renderStatic', fullUrl);
 
             const response = await got( fullUrl, {
@@ -266,11 +266,11 @@ export default class ServerRouter
 
         console.log('[router] refreshStaticPages');
         
-        for (const pageId in this.cache) {
-            const page = this.cache[pageId];
-            if (page.path && page.expire && page.expire < Date.now()) {
+        for (const pageUrl in this.cache) {
+            const page = this.cache[pageUrl];
+            if (page.expire && page.expire < Date.now()) {
 
-                this.renderStatic(page.path, page.options);
+                this.renderStatic(pageUrl, page.options);
 
             }
         }
@@ -499,15 +499,12 @@ export default class ServerRouter
             "no-store, no-cache, must-revalidate, proxy-revalidate"
         );
 
-        // 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();
+        const cachedPage = req.url.endsWith('#bypassCache') 
+            ? undefined 
+            : this.cache[req.path];
+
         const request = new ServerRequest(
             requestId,
 
@@ -533,13 +530,25 @@ export default class ServerRouter
                 return await this.resolveApiBatch(request.data.fetchers, request);
 
             } else {
-                response = await this.resolve(request);
+                response = await this.resolve(
+                    request, 
+                    // If cached page, we only run routes with priority >= 10
+                    cachedPage ? true : false
+                );
             }
         } catch (e) {
             response = await this.handleError(e, request);
         }
 
         if (!res.headersSent) {
+
+            // Static pages
+            if (cachedPage) {
+                console.log('[router] Get static page from cache', req.path);
+                res.send( cachedPage.rendered );
+                return;
+            } 
+
             // Status
             res.status(response.statusCode);
             // Headers
@@ -572,7 +581,10 @@ export default class ServerRouter
         return contextServices;
     }
 
-    public resolve = (request: ServerRequest<this>) => new Promise<ServerResponse<this>>((resolve, reject) => {
+    public resolve = (
+        request: ServerRequest<this>, 
+        isStatic?: boolean
+    ) => new Promise<ServerResponse<this>>((resolve, reject) => {
 
         // Create request context so we can access request context across all the request-triggered libs
         context.run({ 
@@ -613,6 +625,9 @@ export default class ServerRouter
                 // Classic routes
                 for (route of this.routes) {
 
+                    if (isStatic && !route.options.whenStatic)
+                        continue;
+
                     // Match Method
                     if (request.method !== route.method && route.method !== '*')
                         continue;

package/types/icons.d.ts

@@ -1 +1 @@
-export type TIcones = "solid/spinner-third"|"long-arrow-right"|"times-circle"|"brands/whatsapp"|"times"|"search"|"user"|"rocket"|"globe"|"bullhorn"|"briefcase"|"chart-line"|"handshake"|"ellipsis-h"|"brands/google"|"brands/reddit-alien"|"brands/linkedin-in"|"brands/github"|"robot"|"comments"|"user-friends"|"angle-down"|"mouse-pointer"|"thumbs-up"|"dollar-sign"|"info-circle"|"check-circle"|"exclamation-circle"|"comment-alt"|"chart-bar"|"power-off"|"home"|"user-circle"|"newspaper"|"plus-circle"|"brands/linkedin"|"brands/twitter"|"brands/facebook"|"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"|"arrow-left"|"arrow-right"|"meh-rolling-eyes"|"unlink"|"pen"|"bold"|"italic"|"underline"|"strikethrough"|"subscript"|"superscript"|"link"|"file"|"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"
+export type TIcones = "solid/spinner-third"|"long-arrow-right"|"times-circle"|"brands/whatsapp"|"times"|"search"|"user"|"rocket"|"globe"|"bullhorn"|"briefcase"|"chart-line"|"handshake"|"ellipsis-h"|"brands/google"|"brands/reddit-alien"|"brands/linkedin-in"|"brands/github"|"robot"|"comments"|"user-friends"|"angle-down"|"mouse-pointer"|"thumbs-up"|"dollar-sign"|"info-circle"|"check-circle"|"exclamation-circle"|"heart"|"lock"|"eye"|"credit-card"|"at"|"brands/linkedin"|"key"|"chart-bar"|"power-off"|"bars"|"font"|"tag"|"compress"|"bolt"|"puzzle-piece"|"planet-ringed"|"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"|"newspaper"|"pills"|"medal"|"capsules"|"balance-scale"|"home"|"praying-hands"|"shopping-cart"|"flask"|"futbol"|"microchip"|"satellite-dish"|"shipping-fast"|"passport"|"tools"|"database"|"solid/fire"|"usd-circle"|"lightbulb"|"solid/dollar-sign"|"download"|"code"|"solid/clock"|"user-circle"|"plus-circle"|"brands/twitter"|"brands/facebook"|"comment-alt"|"paper-plane"|"check"|"long-arrow-left"|"angle-left"|"angle-right"|"trash"|"meh-rolling-eyes"|"arrow-left"|"arrow-right"|"bold"|"italic"|"underline"|"link"|"strikethrough"|"subscript"|"superscript"|"empty-set"|"horizontal-rule"|"page-break"|"image"|"table"|"poll"|"columns"|"sticky-note"|"caret-right"|"unlink"|"pen"|"file"|"plus"|"list-ul"|"check-square"|"h1"|"h2"|"h3"|"h4"|"list-ol"|"paragraph"|"quote-left"|"align-left"|"align-center"|"align-right"|"align-justify"|"indent"|"outdent"