@live-change/server 0.1.20 → 0.1.21

package/lib/Renderer.js

@@ -3,6 +3,8 @@ const path = require('path')
 const serialize = require('serialize-javascript')
 const renderTemplate = require('./renderTemplate.js')
 
+const { SitemapStream } = require('sitemap')
+
 class Renderer {
   constructor(manifest, settings) {
     this.manifest = manifest
@@ -15,7 +17,9 @@ class Renderer {
       await this.setupVite()
     } else {
       const serverEntryPath = path.resolve(this.root, './dist/server/entry-server.js')
-      this.renderer = require(serverEntryPath).render
+      this.module = require(serverEntryPath)
+      this.renderer = this.module.render
+      this.sitemap = this.module.sitemap
       const templatePath = path.resolve(this.root, 'dist/client/index.html')
       this.template = await fs.promises.readFile(templatePath, { encoding: 'utf-8' })
     }
@@ -117,6 +121,39 @@ class Renderer {
     }
   }
 
+  async getSitemap() {
+    if(this.settings.dev) {
+      /// Reload every request
+      const entryPath = path.resolve(this.root, 'src/entry-server.js')
+      return (await this.vite.ssrLoadModule(entryPath)).sitemap
+    } else {
+      return this.sitemap
+    }
+  }
+
+  async renderSitemap({ dao }, res) {
+    try {
+      res.header('Content-Type', 'application/xml')
+      res.status(200)
+      const smStream = new SitemapStream({ hostname: (process.env.BASE_HREF || "https://sitemap.com")+'/' })
+      smStream.pipe(res)
+      const sitemapFunction = await this.getSitemap()
+      const { sitemap, router } = await sitemapFunction({ dao })
+      function route(location, opts) {
+        smStream.write({ url: router.resolve(location).href, changefreq: 'daily', priority: 0.5, ...opts })
+      }
+      console.log("SR", sitemap, router)
+      await sitemap(route)
+      //route({ name: 'index' })
+      smStream.end()
+    } catch(err) {
+      console.error("SITEMAP RENDERING ERROR", err)
+      res.status(503)
+      res.end(`<h4>Internal server error</h4><pre>${err.stack || err.code || err}</pre>`)
+      //if(profileOp) await profileLog.end({ ...profileOp, state: 'error', error: err })
+    }
+  }
+
   fixStackTrace(e) {
     this.vite && this.vite.ssrFixStacktrace(e)
   }

package/lib/SsrServer.js

@@ -54,6 +54,23 @@ class SsrServer {
     await this.setupSsr()
   }
 
+  async createDao(credentials, clientIp) {
+    let dao
+    if(this.settings.daoFactory) {
+      dao = await this.settings.daoFactory(credentials, clientIp)
+    } else {
+      const host = (this.settings.apiHost == '0.0.0.0' || !this.settings.apiHost)
+        ? 'localhost' : this.settings.apiHost
+      dao = await serverDao(credentials, clientIp, {
+        remoteUrl: `ws://${host}:${this.settings.apiPort || 8002}/api/ws`
+      })
+    }
+    if(!dao) {
+      throw new Error("Impossible to render page without data access object. Define apiServer or daoFactory!")
+    }
+    return dao
+  }
+
   async setupSsr() {
     const readCredentials = this.settings.readCredentials || ((req) => {
       const cookies = cookie.parse(req.headers.cookie || '')
@@ -70,6 +87,13 @@ class SsrServer {
         })
       }
     })
+
+    this.express.get('/sitemap.xml', async (req, res) => {
+      const sitemap = await this.renderer.getSitemap()
+      const clientIp = getIp(req)
+      const dao = await this.createDao({ sessionKey: 'sitemap' })
+      this.renderer.renderSitemap({ dao, clientIp }, res)
+    })
     this.express.use('*', async (req, res) => {
       const url = req.originalUrl
       const clientIp = getIp(req)
@@ -77,19 +101,7 @@ class SsrServer {
       const credentials = readCredentials(req)
       const windowId = this.uidGenerator()
       try {
-        let dao
-        if(this.settings.daoFactory) {
-          dao = await this.settings.daoFactory(credentials, clientIp)
-        } else {
-          const host = (this.settings.apiHost == '0.0.0.0' || !this.settings.apiHost)
-            ? 'localhost' : this.settings.apiHost
-          dao = await serverDao(credentials, clientIp, {
-            remoteUrl: `ws://${host}:${this.settings.apiPort || 8002}/api/ws`
-          })
-        }
-        if(!dao)
-          throw new Error("Impossible to render page without data access object. Define apiServer or daoFactory!")
-
+        const dao = await this.createDao(credentials, clientIp)
         const version = this.version
 
         let html

package/lib/setupApiServer.js

@@ -39,6 +39,19 @@ async function setupApiServer(settings) {
           }
         })
       }
+      if(settings.dbAccess) {
+        local.serverDatabase = {
+          observable(what) {
+            return app.dao.observable(['database', ...what.slice(1)])
+          },
+          get(what) {
+            return app.dao.get(['database', ...what.slice(1)])
+          },
+          request(what, ...args) {
+            return app.dao.request(['database', ...what.slice(1)], ...args)
+          }
+        }
+      }
       return local
     },
     shareDefinition: true,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@live-change/server",
-  "version": "0.1.20",
+  "version": "0.1.21",
   "description": "Live Change Framework - server",
   "main": "index.js",
   "scripts": {
@@ -36,6 +36,7 @@
     "@live-change/sockjs": "^0.4.0-rc.1",
     "websocket": "^1.0.34",
     "yargs": "^17.3.0",
-    "express-static-gzip": "2.1.1"
+    "express-static-gzip": "2.1.1",
+    "sitemap": "^6.3.6"
   }
 }