@live-change/server 0.1.18 → 0.1.19

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/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()
   }
@@ -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 || 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/setupApp.js

@@ -8,7 +8,7 @@ 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)
+  app.uidGenerator = uidGenerator(app.instanceId, 1, settings.uidBorders)
   console.log("SETUP APP", settings)
   let dbServer
   if(settings.withDb) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@live-change/server",
-  "version": "0.1.18",
+  "version": "0.1.19",
   "description": "Live Change Framework - server",
   "main": "index.js",
   "scripts": {
@@ -26,7 +26,7 @@
     "@live-change/db-server": "^0.4.82",
     "@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",

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>