@live-change/server 0.9.138 → 0.9.140

package/index.js

@@ -13,6 +13,8 @@ import setupDbServer from './lib/setupDbServer.js'
 import setupDbClient from './lib/setupDbClient.js'
 import setupApp from './lib/setupApp.js'
 
+import serverDao from './lib/serverDao.js'
+
 export {
   Renderer,
   Services,
@@ -20,6 +22,7 @@ export {
   TestServer,
 
   createLoopbackDao,
+  serverDao,
   renderTemplate,
   setupApiServer,
   setupApiSockJs,

package/lib/Renderer.js

@@ -152,7 +152,7 @@ class Renderer {
 
     try {
       // Use withContext only for the actual rendering part
-      const { html: appHtml, modules, data, meta, response } = await this.withContext(async (context) => {
+      const { html: appHtml, modules, data, meta, response, staticHtml } = await this.withContext(async (context) => {
         const render = await this.getRenderFunction(context)
         return await render(params)
       })
@@ -168,6 +168,7 @@ class Renderer {
           `    window.__VERSION__ = ${serialize(version, { isJSON: true })}\n`+
           `    window.__WINDOW_ID__ = ${serialize(windowId, { isJSON: true })}\n`+
           `    window.__NOW__ = ${serialize(now, { isJSON: true })}\n`+
+          `    window.__STATIC__ = ${serialize(this.settings.staticHtml || staticHtml, { isJSON: true })}\n`+
           `    console.info("SOFTWARE VERSION:" + window.__VERSION__)\n`+
           `</script>\n`
 

package/lib/SsrServer.js

@@ -2,6 +2,7 @@ import cookie from 'cookie'
 import path from 'path'
 import crypto from 'crypto'
 import os from 'os'
+import fs from 'fs'
 import expressStaticGzip from "express-static-gzip"
 
 import serverDao from './serverDao.js'
@@ -54,6 +55,9 @@ class SsrServer {
         }],
         orderPreference: ['br', 'gzip', 'deflate']
       }))
+      const prerenderPath = path.resolve(this.root, 'dist/prerender')
+      this.usePrerender = await (fs.promises.access(prerenderPath, fs.constants.F_OK).then(() => prerenderPath).catch(() => false))
+      console.log("USE PRERENDER DIRECTORY", this.usePrerender)
       //this.express.use(serveStatic(staticPath, { index: false }))
     }
 
@@ -111,15 +115,15 @@ class SsrServer {
       const clientIp = getIp(req)
       const credentials = readCredentials(req)
       const windowId = this.uidGenerator()
-      const now = Date.now()
+      const now = Date.now()      
 
       try {
         const dao = await this.createDao({ sessionKey: 'sitemap' }, clientIp)
         try {
           const version = this.version
+          const domain = this.settings.services?.clientConfig?.domain ?? process.env.BRAND_DOMAIN ?? 'localhost:8001'
           await this.renderer.renderSitemap({
-            url, headers: req.headers, dao, clientIp, credentials, windowId, version, now,
-            domain: domain ?? req.headers.host
+            url, headers: req.headers, dao, clientIp, credentials, windowId, version, now, domain
           }, res)
         } catch (e) {
           console.error("SITEMAP RENDERING ERROR", e.stack || e)
@@ -132,6 +136,30 @@ class SsrServer {
       }
     })
     this.express.use('*', async (req, res) => {
+
+      if(this.usePrerender) {        
+        const startTime = Date.now()
+        const baseFilename = path.resolve(this.usePrerender, req.originalUrl.slice(1) + (req.originalUrl.endsWith('/') ? 'index' : '/index'))
+        const htmlFilename = baseFilename + '.html'
+        const jsonFilename = baseFilename + '.json'
+        const exists = await fs.promises.access(htmlFilename, fs.constants.F_OK).then(() => true).catch(() => false)
+        if(exists) {
+          console.log("SERVE PRERENDERED PAGE", req.originalUrl)
+          try {
+            const html = await fs.promises.readFile(htmlFilename, { encoding: 'utf-8' })
+            const metadata = await JSON.parse(await fs.promises.readFile(jsonFilename, { encoding: 'utf-8' }))
+            res.status(200)
+            res.set(metadata?.headers ?? {
+              'Content-Type': 'text/html'
+            })
+            res.end(html)
+            console.log("SERVED PRERENDERED PAGE", req.originalUrl, 'IN', Date.now() - startTime, 'ms')
+            return
+          } catch(e) {
+            console.error("PRERENDERED PAGE ERROR", e.stack || e)
+          }
+        }      
+      }
       console.log("RENDERING PAGE", req.originalUrl)
       if(fbRedirect(req, res)) return
       if(this.settings.spa) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@live-change/server",
-  "version": "0.9.138",
+  "version": "0.9.140",
   "description": "Live Change Framework - server",
   "main": "index.js",
   "scripts": {
@@ -22,12 +22,12 @@
   "type": "module",
   "homepage": "https://github.com/live-change/live-change-stack",
   "dependencies": {
-    "@live-change/dao": "^0.9.138",
-    "@live-change/dao-sockjs": "^0.9.138",
-    "@live-change/db-server": "^0.9.138",
-    "@live-change/framework": "^0.9.138",
+    "@live-change/dao": "^0.9.140",
+    "@live-change/dao-sockjs": "^0.9.140",
+    "@live-change/db-server": "^0.9.140",
+    "@live-change/framework": "^0.9.140",
     "@live-change/sockjs": "0.4.1",
-    "@live-change/uid": "^0.9.138",
+    "@live-change/uid": "^0.9.140",
     "dotenv": "^17.2.1",
     "express": "^4.18.2",
     "express-static-gzip": "2.1.7",
@@ -39,5 +39,5 @@
     "websocket": "^1.0.34",
     "yargs": "^17.7.2"
   },
-  "gitHead": "af56bfe0ca7899934a4c563ead788318832336de"
+  "gitHead": "c350c0db4539d5f52161ff53967aa211f6f1267f"
 }