@live-change/server 0.1.16 → 0.1.20

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/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()
   }
@@ -65,7 +65,7 @@ class SsrServer {
         this.settings.sessionExpires ? new Date(Date.now() + this.settings.sessionExpires).toUTCString() : null
       if(credentials.sessionKey) {
         res.set({
-          'Set-Cookie': `sessionKey=${credentials.sessionKey}; Path=/`
+          'Set-Cookie': `sessionKey=${credentials.sessionKey}; Path=/; HttpOnly`
           + (cookieExpireDate ? `; Expires=${cookieExpireDate}` : '')
         })
       }
@@ -92,18 +92,32 @@ class SsrServer {
 
         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)
-        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

@@ -1,4 +1,6 @@
+const cookie = require("cookie")
 const Dao = require("@live-change/dao")
+const { connection } = require("websocket")
 const Services = require('../lib/Services.js')
 const app = require("@live-change/framework").app()
 
@@ -41,7 +43,14 @@ async function setupApiServer(settings) {
     },
     shareDefinition: true,
     logErrors: true,
-    createSessionOnUpdate: true /// deprecated - moved to session-service settings
+    createSessionOnUpdate: true, /// deprecated - moved to session-service settings
+    fastAuth: settings.fastAuth /* && ((connection) => {
+      const cookies = cookie.parse(connection.headers.cookie || '')
+      return {
+        sesionId: cookies.sessionId,
+        sessionKey: cookies.sessionKey
+      }
+    }) */
   }
 
   const apiServer = await app.createLiveApiServer(apiServerConfig)

package/lib/setupApiSockJs.js

@@ -1,7 +1,10 @@
-const sockjs = require('sockjs')
+const sockjs = require('@live-change/sockjs')
 
 function setupApiSockJs(httpServer, apiServer) {
-  const sockJsServer = sockjs.createServer({})
+  const sockJsServer = sockjs.createServer({
+    prefix: '/api/sockjs',
+    transports: [ 'websocket', 'websocket-raw', 'xhr-polling', 'xhr-streaming' ]
+  })
   sockJsServer.on('connection', function (conn) {
     if(!conn) {
       console.error("NULL SOCKJS connection")
@@ -10,7 +13,7 @@ function setupApiSockJs(httpServer, apiServer) {
     console.log("SOCKJS connection")
     apiServer.handleConnection(conn)
   })
-  sockJsServer.installHandlers(httpServer, { prefix: '/api/sockjs' })
+  sockJsServer.attach(httpServer)
 
   return sockJsServer
 }

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.16",
+  "version": "0.1.20",
   "description": "Live Change Framework - server",
   "main": "index.js",
   "scripts": {
@@ -21,21 +21,21 @@
   },
   "homepage": "https://github.com/live-change/server",
   "dependencies": {
-    "@live-change/dao": "^0.3.3",
-    "@live-change/dao-sockjs": "^0.2.0",
-    "@live-change/db-server": "^0.4.80",
-    "@live-change/framework": "^0.5.0",
-    "@live-change/vue3-ssr": "^0.1.0",
-    "@live-change/uid": "^0.1.3",
-    "http-proxy-middleware": "2.0.0",
-    "dotenv": "^9.0.2",
+    "@live-change/dao": "^0.3.12",
+    "@live-change/dao-sockjs": "^0.2.1",
+    "@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.4",
+    "http-proxy-middleware": "2.0.1",
+    "dotenv": "^10.0.0",
     "express": "^4.17.1",
     "resolve": "^1.20.0",
     "segfault-handler": "^1.3.0",
-    "serialize-javascript": "^5.0.1",
-    "sockjs": "^0.3.21",
+    "serialize-javascript": "^6.0.0",
+    "@live-change/sockjs": "^0.4.0-rc.1",
     "websocket": "^1.0.34",
-    "yargs": "^17.0.1",
+    "yargs": "^17.3.0",
     "express-static-gzip": "2.1.1"
   }
 }

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>