@live-change/server 0.7.11 → 0.7.14
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/lib/Renderer.js +6 -5
- package/lib/SsrServer.js +2 -1
- package/lib/setupApiServer.js +2 -2
- package/package.json +4 -4
package/lib/Renderer.js
CHANGED
|
@@ -42,7 +42,7 @@ class Renderer {
|
|
|
42
42
|
}
|
|
43
43
|
|
|
44
44
|
async renderPage(params) {
|
|
45
|
-
const { url, headers, dao, clientIp, credentials, windowId, version } = params
|
|
45
|
+
const { url, headers, dao, clientIp, credentials, windowId, version, now } = params
|
|
46
46
|
|
|
47
47
|
const render = await this.getRenderFunction()
|
|
48
48
|
const { html: appHtml, modules, data, meta, response } = await render(params)
|
|
@@ -53,10 +53,11 @@ class Renderer {
|
|
|
53
53
|
` window.__DAO_CACHE__= ${serialize(data, { isJSON: true })}\n`+
|
|
54
54
|
(this.settings.fastAuth ? ''
|
|
55
55
|
: ` window.__CREDENTIALS__= ${serialize(credentials, { isJSON: true })}\n`)+
|
|
56
|
-
|
|
57
|
-
|
|
58
|
-
|
|
59
|
-
|
|
56
|
+
` window.__VERSION__ = ${serialize(version, { isJSON: true })}\n`+
|
|
57
|
+
` window.__WINDOW_ID__ = ${serialize(windowId, { isJSON: true })}\n`+
|
|
58
|
+
` window.__NOW__ = ${serialize(now, { isJSON: true })}\n`+
|
|
59
|
+
` console.error("SOFTWARE VERSION:" + window.__VERSION__)\n`+
|
|
60
|
+
`</script>\n`
|
|
60
61
|
|
|
61
62
|
const template = await this.prepareTemplate(url)
|
|
62
63
|
|
package/lib/SsrServer.js
CHANGED
|
@@ -109,8 +109,9 @@ class SsrServer {
|
|
|
109
109
|
|
|
110
110
|
for(let retry = 0; retry < 3; retry ++) {
|
|
111
111
|
try {
|
|
112
|
+
const now = Date.now()
|
|
112
113
|
result = await this.renderer.renderPage({
|
|
113
|
-
url, headers: req.headers, dao, clientIp, credentials, windowId, version
|
|
114
|
+
url, headers: req.headers, dao, clientIp, credentials, windowId, version, now
|
|
114
115
|
})
|
|
115
116
|
break
|
|
116
117
|
} catch(e) {
|
package/lib/setupApiServer.js
CHANGED
|
@@ -39,10 +39,10 @@ async function setupApiServer(settings) {
|
|
|
39
39
|
values: {
|
|
40
40
|
version: {
|
|
41
41
|
observable() {
|
|
42
|
-
return new Dao.ObservableValue(process.env.VERSION)
|
|
42
|
+
return new Dao.ObservableValue(settings.version || process.env.VERSION)
|
|
43
43
|
},
|
|
44
44
|
async get() {
|
|
45
|
-
return process.env.VERSION
|
|
45
|
+
return settings.version || process.env.VERSION
|
|
46
46
|
}
|
|
47
47
|
}
|
|
48
48
|
}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@live-change/server",
|
|
3
|
-
"version": "0.7.
|
|
3
|
+
"version": "0.7.14",
|
|
4
4
|
"description": "Live Change Framework - server",
|
|
5
5
|
"main": "index.js",
|
|
6
6
|
"scripts": {
|
|
@@ -24,9 +24,9 @@
|
|
|
24
24
|
"@live-change/dao": "0.5.9",
|
|
25
25
|
"@live-change/dao-sockjs": "0.5.9",
|
|
26
26
|
"@live-change/db-server": "0.5.23",
|
|
27
|
-
"@live-change/framework": "^0.7.
|
|
27
|
+
"@live-change/framework": "^0.7.14",
|
|
28
28
|
"@live-change/sockjs": "0.4.1",
|
|
29
|
-
"@live-change/uid": "
|
|
29
|
+
"@live-change/uid": "0.7.11",
|
|
30
30
|
"dotenv": "^16.0.1",
|
|
31
31
|
"express": "^4.18.1",
|
|
32
32
|
"express-static-gzip": "2.1.7",
|
|
@@ -39,5 +39,5 @@
|
|
|
39
39
|
"websocket": "^1.0.34",
|
|
40
40
|
"yargs": "^17.5.1"
|
|
41
41
|
},
|
|
42
|
-
"gitHead": "
|
|
42
|
+
"gitHead": "3cbedb6521f6bcffbd962ec1029c5b6bf597afe0"
|
|
43
43
|
}
|