proteum 2.1.6 → 2.1.8

package/server/services/router/index.ts

@@ -95,6 +95,9 @@ export type TApiResponseData = { data: any; triggers?: { [cle: string]: any } };
 
 export type HttpHeaders = { [cle: string]: string };
 
+const dynamicHtmlCacheControl = 'no-store, no-cache, must-revalidate, proxy-revalidate';
+const staticHtmlCacheControl = 'public, max-age=0, must-revalidate';
+
 /*----------------------------------
 - SERVICE CONFIG
 ----------------------------------*/
@@ -571,14 +574,10 @@ export default class ServerRouter<
     - RESOLUTION
     ----------------------------------*/
     public async middleware(req: express.Request, res: express.Response) {
-        // Don't cache HTML, because in case of update, assets file name will change (hash.ext)
-        // https://github.com/helmetjs/nocache/blob/main/index.ts
-        res.setHeader('Surrogate-Control', 'no-store');
-        res.setHeader('Cache-Control', 'no-store, no-cache, must-revalidate, proxy-revalidate');
-
         // Create request
         let requestId = uuid();
         const cachedPage = req.headers['bypasscache'] ? undefined : this.cache[req.path];
+        this.applyHtmlCacheHeaders(res, Boolean(cachedPage));
         const headers: HttpHeaders = Object.fromEntries(
             Object.entries(req.headers).map(([key, value]) => [key, Array.isArray(value) ? value.join(', ') : value || '']),
         );
@@ -638,10 +637,39 @@ export default class ServerRouter<
             // Static pages
             if (cachedPage) {
                 console.log('[router] Get static page from cache', req.path);
+                res.status(response.statusCode);
+                res.header(response.headers);
+
+                if (response.headers['Location']) {
+                    res.send(response.data === undefined ? '' : response.data);
+                    this.app.container.Trace.record(
+                        request.id,
+                        'response.send',
+                        {
+                            cached: true,
+                            statusCode: response.statusCode,
+                            contentType: response.headers['Content-Type'] || '',
+                            headerKeys: Object.keys(response.headers),
+                            redirected: true,
+                        },
+                        'summary',
+                    );
+                    this.app.container.Trace.finishRequest(request.id, {
+                        statusCode: response.statusCode,
+                        user: request.user?.email,
+                    });
+                    return;
+                }
+
                 this.app.container.Trace.record(
                     request.id,
                     'response.send',
-                    { cached: true, statusCode: response.statusCode, contentType: 'text/html' },
+                    {
+                        cached: true,
+                        statusCode: response.statusCode,
+                        contentType: response.headers['Content-Type'] || 'text/html',
+                        headerKeys: Object.keys(response.headers),
+                    },
                     'summary',
                 );
                 res.send(cachedPage.rendered);
@@ -870,6 +898,12 @@ export default class ServerRouter<
                         }
 
                         this.app.container.Trace.record(request.id, 'resolve.routes-evaluated', routeStats, 'resolve');
+
+                        if (isStatic) {
+                            resolve(response);
+                            return;
+                        }
+
                         this.app.container.Trace.record(request.id, 'resolve.not-found', { path: request.path }, 'summary');
                         reject(new NotFound());
                     } catch (error) {
@@ -923,10 +957,19 @@ export default class ServerRouter<
         await response.runController(route);
         if (!response.wasProvided) return;
 
-        // Set in cache
-        if (response.request.path && 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);
+        if (response.request.path && route.options.static) {
+            const staticUrls = route.options.static.urls.includes('*') ? [response.request.path] : route.options.static.urls;
+
+            for (const staticUrl of staticUrls) {
+                if (!staticUrl) continue;
+
+                console.log('[router] Set in cache', staticUrl);
+                void this.renderStatic(
+                    staticUrl,
+                    route.options.static,
+                    staticUrl === response.request.path ? response.data : undefined,
+                );
+            }
         }
 
         const timeEndResolving = Date.now();
@@ -1008,4 +1051,17 @@ export default class ServerRouter<
 
         return response;
     }
+
+    private applyHtmlCacheHeaders(res: express.Response, isStaticHtml: boolean) {
+        if (isStaticHtml) {
+            res.removeHeader('Surrogate-Control');
+            res.setHeader('Cache-Control', staticHtmlCacheControl);
+            return;
+        }
+
+        // Don't cache dynamic HTML, because updated releases can change asset hashes.
+        // https://github.com/helmetjs/nocache/blob/main/index.ts
+        res.setHeader('Surrogate-Control', 'no-store');
+        res.setHeader('Cache-Control', dynamicHtmlCacheControl);
+    }
 }

package/server/services/router/response/page/document.tsx

@@ -34,12 +34,10 @@ export default class DocumentRenderer<TRouter extends TServerRouter> {
                     <head>
                         {/* Format */}
                         <meta charSet="utf-8" />
-                        <meta name="viewport" content="width=device-width,minimum-scale=1,initial-scale=1" />
+                        <meta name="viewport" content="width=device-width, initial-scale=1" />
 
                         {/* CSS */}
                         {this.clientStyles()}
-                        <link rel="preload" as="font" href={'/public/icons.woff2?v=' + BUILD_ID} type="font/woff2" />
-                        <link rel="stylesheet" type="text/css" href="/public/icons.css" />
 
                         {/* JS */}
                         <script
@@ -69,7 +67,7 @@ export default class DocumentRenderer<TRouter extends TServerRouter> {
                         {/* Format */}
                         <meta charSet="utf-8" />
                         <meta content="IE=edge" httpEquiv="X-UA-Compatible" />
-                        <meta name="viewport" content="width=device-width,minimum-scale=1,initial-scale=1" />
+                        <meta name="viewport" content="width=device-width, initial-scale=1" />
 
                         {/* Mobile */}
                         <meta name="application-name" content={this.app.identity.web.title} />
@@ -80,18 +78,28 @@ export default class DocumentRenderer<TRouter extends TServerRouter> {
                         <meta name="msapplication-TileColor" content={this.app.identity.maincolor} />
                         <meta name="apple-mobile-web-app-capable" content="yes" />
                         <meta name="mobile-web-app-capable" content="yes" />
-                        <meta
-                            name="viewport"
-                            content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=0"
-                        />
 
                         {/* https://stackoverflow.com/questions/48956465/favicon-standard-2019-svg-ico-png-and-dimensions */}
                         {/*<link rel="manifest" href={RES['manifest.json']} />*/}
-                        <link rel="shortcut icon" href="/public/app/favicon.ico" />
-                        <link rel="icon" type="image/png" sizes="16x16" href="/public/app/favicon-16x16.png" />
-                        <link rel="icon" type="image/png" sizes="32x32" href="/public/app/favicon-32x32.png" />
-                        <link rel="apple-touch-icon" sizes="180x180" href="/public/app/apple-touch-icon-180x180.png" />
-                        <meta name="msapplication-config" content="/public/app/browserconfig.xml" />
+                        <link rel="shortcut icon" href={this.publicAssetUrl('app/favicon.ico', true)} />
+                        <link
+                            rel="icon"
+                            type="image/png"
+                            sizes="16x16"
+                            href={this.publicAssetUrl('app/favicon-16x16.png', true)}
+                        />
+                        <link
+                            rel="icon"
+                            type="image/png"
+                            sizes="32x32"
+                            href={this.publicAssetUrl('app/favicon-32x32.png', true)}
+                        />
+                        <link
+                            rel="apple-touch-icon"
+                            sizes="180x180"
+                            href={this.publicAssetUrl('app/apple-touch-icon-180x180.png', true)}
+                        />
+                        <meta name="msapplication-config" content={this.publicAssetUrl('app/browserconfig.xml', true)} />
 
                         {/* Page */}
                         <title>{page.title}</title>
@@ -165,7 +173,7 @@ export default class DocumentRenderer<TRouter extends TServerRouter> {
         return (
             <>
                 {scripts.map((script) => {
-                    const src = this.clientAssetUrl(script, true);
+                    const src = this.clientAssetUrl(script);
 
                     return (
                         <React.Fragment key={script}>
@@ -248,6 +256,10 @@ export default class DocumentRenderer<TRouter extends TServerRouter> {
     }
 
     private clientAssetUrl(asset: string, withBuildId = false) {
+        return this.publicAssetUrl(asset, withBuildId);
+    }
+
+    private publicAssetUrl(asset: string, withBuildId = false) {
         return `/public/${asset}${withBuildId ? `?v=${BUILD_ID}` : ''}`;
     }
 }