@live-change/server 0.8.9 → 0.8.11

package/LICENSE.md

@@ -0,0 +1,11 @@
+Copyright 2019-2024 Michał Łaszczewski
+
+Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
+
+1. Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
+
+2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.
+
+3. Neither the name of the copyright holder nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

package/lib/Renderer.js

@@ -128,7 +128,7 @@ class Renderer {
     }
   }
 
-  async getSitemap() {
+  async getSitemapRenderFunction() {
     if(this.settings.dev) {
       /// Reload every request
       const entryPath = path.resolve(this.root, this.settings.serverEntry || 'src/entry-server.js')
@@ -138,19 +138,22 @@ class Renderer {
     }
   }
 
-  async renderSitemap({ dao }, res) {
+  async renderSitemap(params, res) {
     try {
+      const { url, headers, dao, clientIp, credentials, windowId, version, now } = params
+
       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 })
+      const sitemapFunction = await this.getSitemapRenderFunction()
+
+      function write(routeInfo) {
+        console.log("SM WRITE", routeInfo)
+        smStream.write(routeInfo)
       }
-      console.log("SR", sitemap, router)
-      await sitemap(route)
+
+      await sitemapFunction(params, write)
       //route({ name: 'index' })
       smStream.end()
     } catch(err) {

package/lib/Services.js

@@ -86,6 +86,16 @@ class Services {
         }
       }
     }
+    // push validators from services to other services
+    for(const sourceServiceDefinition of this.serviceDefinitions) {
+      for(const validatorName in sourceServiceDefinition.validators) {
+        for(const destinationServiceDefinition of this.serviceDefinitions) {
+          if(!destinationServiceDefinition.validators[validatorName]) {
+            destinationServiceDefinition.validators[validatorName] = sourceServiceDefinition.validators[validatorName]
+          }
+        }
+      }
+    }
 
     /// TODO: load dependent services!!!
   }

package/lib/SsrServer.js

@@ -81,7 +81,11 @@ class SsrServer {
   async setupSsr() {
     const readCredentials = this.settings.readCredentials || ((req) => {
       const cookies = cookie.parse(req.headers.cookie || '')
-      return { sessionKey: cookies.sessionKey || crypto.randomBytes(64).toString('base64').slice(0, 48) }
+      return {
+        sessionKey: req.query.sessionKey
+          || cookies.sessionKey
+          || crypto.randomBytes(64).toString('base64').slice(0, 48)
+      }
     })
     const writeCredentials = this.settings.writeCredentials || ((res, credentials) => {
       //console.log("WRITE CREDENTIALS", credentials)
@@ -96,10 +100,33 @@ class SsrServer {
     })
 
     this.express.get('/sitemap.xml', async (req, res) => {
-      const sitemap = await this.renderer.getSitemap()
+      if(this.settings.spa) {
+        res.status(404).end()
+        return
+      }
+
+      const url = req.originalUrl
       const clientIp = getIp(req)
-      const dao = await this.createDao({ sessionKey: 'sitemap' })
-      this.renderer.renderSitemap({ dao, clientIp }, res)
+      const credentials = readCredentials(req)
+      const windowId = this.uidGenerator()
+      const now = Date.now()
+
+      try {
+        const dao = await this.createDao({ sessionKey: 'sitemap' }, clientIp)
+        try {
+          const version = this.version
+          await this.renderer.renderSitemap({
+            url, headers: req.headers, dao, clientIp, credentials, windowId, version, now
+          }, res)
+        } catch (e) {
+          console.error("SITEMAP RENDERING ERROR", e.stack || e)
+          res.status(500).end(e.stack || e)
+        }
+        dao.dispose()
+      } catch (e) {
+        console.error("SITEMAP DAO ERROR", e.stack || e)
+        res.status(500).end(e.stack || e)
+      }
     })
     this.express.use('*', async (req, res) => {
       if(fbRedirect(req, res)) return
@@ -116,48 +143,55 @@ class SsrServer {
 
       const credentials = readCredentials(req)
       const windowId = this.uidGenerator()
-      let dao
-      try {
-        dao = await this.createDao(credentials, clientIp)
-      } catch (e) {
-        console.error("DAO ERROR", e.stack || e)
-        res.status(500).end(e.stack || e)
-      }
+
       try {
-        const version = this.version
+        const dao = await this.createDao(credentials, clientIp)
+
+        //dao.dispose(); return res.end('dao test!!\n')
+
+        try {
+          const version = this.version
+
+          let result
+          let error
+
+          for(let retry = 0; retry < 3; retry ++) {
+            try {
+              const now = Date.now()
+              result = await this.renderer.renderPage({
+                url, headers: req.headers, dao, clientIp, credentials, windowId, version, now
+              })
+              break
+            } catch(e) {
+              error = e
+            }
+          }
 
-        let result
-        let error
+          //dao.dispose(); return res.end('render page test!!\n')
 
-        for(let retry = 0; retry < 3; retry ++) {
-          try {
-            const now = Date.now()
-            result = await this.renderer.renderPage({
-              url, headers: req.headers, dao, clientIp, credentials, windowId, version, now
+          if(result) {
+            const { html, response } = result
+            res.status(response?.status || 200)
+            writeCredentials(res, credentials)
+            res.set(response?.headers ?? {
+              'Content-Type': 'text/html'
             })
-            break
-          } catch(e) {
-            error = e
+            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) {
+          console.error("ERROR", e.stack || e)
+          res.status(500).end(e.stack || e)
         }
-        if(result) {
-          const { html, response } = result
-          res.status(response?.status || 200)
-          writeCredentials(res, credentials)
-          res.set(response?.headers ?? {
-            '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)
-        }
+
+        dao.dispose()
       } catch (e) {
-        console.error("ERROR", e.stack || e)
+        console.error("DAO ERROR", e.stack || e)
         res.status(500).end(e.stack || e)
       }
-      dao.dispose()
     })
   }
 

package/lib/createLoopbackDao.js

@@ -3,6 +3,7 @@ import Dao from "@live-change/dao"
 async function createLoopbackDao(credentials, daoFactory) {
   const server = new Dao.ReactiveServer(daoFactory)
   const loopback = new Dao.LoopbackConnection(credentials, server, {})
+
   const dao = new Dao(credentials, {
     remoteUrl: 'dao',
     protocols: { local: null },
@@ -15,13 +16,20 @@ async function createLoopbackDao(credentials, daoFactory) {
       logLevel: 10,
     },
   })
+
   dao.connections.set('local:dao', loopback)
+
   await loopback.initialize()
+
+  //dao.dispose();  return null
+
   if(!loopback.connected) {
     console.error("LOOPBACK NOT CONNECTED?!")
     process.exit(1)
   }
+
   return dao
+
 }
 
 export default createLoopbackDao

package/package.json

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