@live-change/server 0.1.18 → 0.1.21

package/.idea/misc.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="ProjectRootManager">
+    <output url="file://$PROJECT_DIR$/out" />
+  </component>
+</project>

package/.idea/modules.xml

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="ProjectModuleManager">
+    <modules>
+      <module fileurl="file://$PROJECT_DIR$/server.iml" filepath="$PROJECT_DIR$/server.iml" />
+    </modules>
+  </component>
+</project>

package/.idea/vcs.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="VcsDirectoryMappings">
+    <mapping directory="" vcs="Git" />
+  </component>
+</project>

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/Services.js

@@ -4,6 +4,8 @@ const path = require('path')
 const resolve = require('util').promisify(require('resolve'))
 const app = require("@live-change/framework").app()
 
+const debug = require('debug')('framework')
+
 class Services {
   constructor(configPath) {
     if(!configPath) throw new Error("services config parameter is required")
@@ -18,12 +20,12 @@ class Services {
 
   async resolve(file) {
     const path = await resolve(file, { basedir: this.servicesDir })
-    console.log("PATH RESOLVE", file, "IN", this.servicesDir, "=>", path)
+    debug("PATH RESOLVE", file, "IN", this.servicesDir, "=>", path)
     return path
   }
   async getServiceEntryFile(config) {
     const path = await resolve(config.path, { basedir: this.servicesDir })
-    console.log("PATH RESOLVE", config.path, "IN", this.servicesDir, "=>", path)
+    debug("PATH RESOLVE", config.path, "IN", this.servicesDir, "=>", path)
     return path
   }
 
@@ -39,14 +41,14 @@ class Services {
     if(this.config.plugins) {
       for(const plugin of this.config.plugins) {
         const entryFile = await this.getServiceEntryFile(plugin)
-        console.log("PLUGIN", plugin, 'ENTRY FILE', entryFile)
+        debug("PLUGIN", plugin, 'ENTRY FILE', entryFile)
         this.plugins.push(require(entryFile))
       }
     }
     if(this.config.services) {
       for(const service of this.config.services) {
         const entryFile = await this.getServiceEntryFile(service)
-        console.log("SERVICE", service, 'ENTRY FILE', entryFile)
+        debug("SERVICE", service, 'ENTRY FILE', entryFile)
         const definition = require(entryFile)
         if(definition.name != service.name) {
           console.error("SERVICE", service, "NAME", service.name, "MISMATCH", definition.name)

package/lib/SsrServer.js

@@ -21,7 +21,7 @@ class SsrServer {
 
     this.instanceId = encodeNumber(hashCode(
       `ssr${process.pid}${require("os").hostname()} ${process.cwd()}/${process.argv.join(' ')}`))
-    this.uidGenerator = uidGenerator(this.instanceId, 1)
+    this.uidGenerator = uidGenerator(this.instanceId, 1, this.settings.uidBorders)
 
     this.root = this.settings.root || process.cwd()
   }
@@ -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,33 +101,35 @@ 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
 
-        const html = await this.renderer.renderPage({ url, dao, clientIp, credentials, windowId, version })
+        let html
+        let error
 
-        res.status(200)
-        writeCredentials(res, credentials)
-        res.set({
-          'Content-Type': 'text/html'
-        })
-        res.end(html)
+        for(let retry = 0; retry < 3; retry ++) {
+          try {
+            html = await this.renderer.renderPage({ url, dao, clientIp, credentials, windowId, version })
+            break
+          } catch(e) {
+            error = e
+          }
+        }
+        if(html) {
+          res.status(200)
+          writeCredentials(res, credentials)
+          res.set({
+            'Content-Type': 'text/html'
+          })
+          res.end(html)
+        } else {
+          if(error.stack) this.renderer.fixStackTrace(error)
+          console.error("RENDERING ERROR", error.stack || error)
+          res.status(500).end(error.stack || error)
+        }
       } catch (e) {
-        this.renderer.fixStackTrace(e)
-        console.error("RENDERING ERROR", e.stack || e)
-        res.status(500).end(e.stack)
+        console.error("ERROR", e.stack || e)
+        res.status(500).end(e.stack || e)
       }
     })
   }

package/lib/TestServer.js

@@ -27,7 +27,7 @@ class TestServer {
 
     app.instanceId = encodeNumber(hashCode(
       `app${process.pid}${require("os").hostname()} ${process.cwd()}/${process.argv.join(' ')}`))
-    app.uidGenerator = uidGenerator(app.instanceId, 1)
+    app.uidGenerator = uidGenerator(app.instanceId, 1, '[]')
     this.dbServer = await setupDbServer({ dbBackend: 'mem' })
     const loopbackDao = await createLoopbackDao('local', () => this.dbServer.createDao('local'))
     app.dao = loopbackDao
@@ -60,8 +60,9 @@ class TestServer {
 
     await new Promise((resolve, reject) => {
       this.httpServer = this.expressServer.listen(this.config.port || 0, () => {
-        this.port = this.expressServer.address().port,
+        this.port = this.expressServer.address().port
         this.url = `http://localhost:${this.expressServer.address().port}`
+        process.env.SSR_PORT = this.port
         resolve()
       })
     })

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/lib/setupApp.js

@@ -4,12 +4,14 @@ const setupDbServer = require('./setupDbServer.js')
 const setupDbClient = require('./setupDbClient.js')
 const createLoopbackDao = require('./createLoopbackDao.js')
 
+const debug = require('debug')('server:app')
+
 async function setupApp(settings, env = process.env) {
   const app = require("@live-change/framework").app()
   app.instanceId = encodeNumber(hashCode(
     `app${process.pid}${require("os").hostname()} ${process.cwd()}/${process.argv.join(' ')}`))
-  app.uidGenerator = uidGenerator(app.instanceId, 1)
-  console.log("SETUP APP", settings)
+  app.uidGenerator = uidGenerator(app.instanceId, 1, settings.uidBorders)
+  debug("SETUP APP", settings)
   let dbServer
   if(settings.withDb) {
     dbServer = await setupDbServer(settings)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@live-change/server",
-  "version": "0.1.18",
+  "version": "0.1.21",
   "description": "Live Change Framework - server",
   "main": "index.js",
   "scripts": {
@@ -23,10 +23,10 @@
   "dependencies": {
     "@live-change/dao": "^0.3.12",
     "@live-change/dao-sockjs": "^0.2.1",
-    "@live-change/db-server": "^0.4.82",
+    "@live-change/db-server": "^0.5.3",
     "@live-change/framework": "^0.5.10",
     "@live-change/vue3-ssr": "^0.1.7",
-    "@live-change/uid": "^0.1.3",
+    "@live-change/uid": "^0.1.4",
     "http-proxy-middleware": "2.0.1",
     "dotenv": "^10.0.0",
     "express": "^4.17.1",
@@ -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"
   }
 }

package/server.iml

@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module type="WEB_MODULE" version="4">
+  <component name="NewModuleRootManager" inherit-compiler-output="true">
+    <exclude-output />
+    <content url="file://$MODULE_DIR$" />
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+  </component>
+</module>