@live-change/server 0.1.17 → 0.1.18
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/SsrServer.js +2 -2
- package/lib/setupApiServer.js +10 -1
- package/lib/setupApiSockJs.js +6 -3
- package/package.json +2 -2
package/lib/SsrServer.js
CHANGED
|
@@ -65,7 +65,7 @@ class SsrServer {
|
|
|
65
65
|
this.settings.sessionExpires ? new Date(Date.now() + this.settings.sessionExpires).toUTCString() : null
|
|
66
66
|
if(credentials.sessionKey) {
|
|
67
67
|
res.set({
|
|
68
|
-
'Set-Cookie': `sessionKey=${credentials.sessionKey}; Path
|
|
68
|
+
'Set-Cookie': `sessionKey=${credentials.sessionKey}; Path=/; HttpOnly`
|
|
69
69
|
+ (cookieExpireDate ? `; Expires=${cookieExpireDate}` : '')
|
|
70
70
|
})
|
|
71
71
|
}
|
|
@@ -102,7 +102,7 @@ class SsrServer {
|
|
|
102
102
|
res.end(html)
|
|
103
103
|
} catch (e) {
|
|
104
104
|
this.renderer.fixStackTrace(e)
|
|
105
|
-
console.error("RENDERING ERROR", e.stack)
|
|
105
|
+
console.error("RENDERING ERROR", e.stack || e)
|
|
106
106
|
res.status(500).end(e.stack)
|
|
107
107
|
}
|
|
108
108
|
})
|
package/lib/setupApiServer.js
CHANGED
|
@@ -1,4 +1,6 @@
|
|
|
1
|
+
const cookie = require("cookie")
|
|
1
2
|
const Dao = require("@live-change/dao")
|
|
3
|
+
const { connection } = require("websocket")
|
|
2
4
|
const Services = require('../lib/Services.js')
|
|
3
5
|
const app = require("@live-change/framework").app()
|
|
4
6
|
|
|
@@ -41,7 +43,14 @@ async function setupApiServer(settings) {
|
|
|
41
43
|
},
|
|
42
44
|
shareDefinition: true,
|
|
43
45
|
logErrors: true,
|
|
44
|
-
createSessionOnUpdate: true /// deprecated - moved to session-service settings
|
|
46
|
+
createSessionOnUpdate: true, /// deprecated - moved to session-service settings
|
|
47
|
+
fastAuth: settings.fastAuth /* && ((connection) => {
|
|
48
|
+
const cookies = cookie.parse(connection.headers.cookie || '')
|
|
49
|
+
return {
|
|
50
|
+
sesionId: cookies.sessionId,
|
|
51
|
+
sessionKey: cookies.sessionKey
|
|
52
|
+
}
|
|
53
|
+
}) */
|
|
45
54
|
}
|
|
46
55
|
|
|
47
56
|
const apiServer = await app.createLiveApiServer(apiServerConfig)
|
package/lib/setupApiSockJs.js
CHANGED
|
@@ -1,7 +1,10 @@
|
|
|
1
|
-
const sockjs = require('sockjs')
|
|
1
|
+
const sockjs = require('@live-change/sockjs')
|
|
2
2
|
|
|
3
3
|
function setupApiSockJs(httpServer, apiServer) {
|
|
4
|
-
const sockJsServer = sockjs.createServer({
|
|
4
|
+
const sockJsServer = sockjs.createServer({
|
|
5
|
+
prefix: '/api/sockjs',
|
|
6
|
+
transports: [ 'websocket', 'websocket-raw', 'xhr-polling', 'xhr-streaming' ]
|
|
7
|
+
})
|
|
5
8
|
sockJsServer.on('connection', function (conn) {
|
|
6
9
|
if(!conn) {
|
|
7
10
|
console.error("NULL SOCKJS connection")
|
|
@@ -10,7 +13,7 @@ function setupApiSockJs(httpServer, apiServer) {
|
|
|
10
13
|
console.log("SOCKJS connection")
|
|
11
14
|
apiServer.handleConnection(conn)
|
|
12
15
|
})
|
|
13
|
-
sockJsServer.
|
|
16
|
+
sockJsServer.attach(httpServer)
|
|
14
17
|
|
|
15
18
|
return sockJsServer
|
|
16
19
|
}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@live-change/server",
|
|
3
|
-
"version": "0.1.
|
|
3
|
+
"version": "0.1.18",
|
|
4
4
|
"description": "Live Change Framework - server",
|
|
5
5
|
"main": "index.js",
|
|
6
6
|
"scripts": {
|
|
@@ -33,7 +33,7 @@
|
|
|
33
33
|
"resolve": "^1.20.0",
|
|
34
34
|
"segfault-handler": "^1.3.0",
|
|
35
35
|
"serialize-javascript": "^6.0.0",
|
|
36
|
-
"sockjs": "^0.
|
|
36
|
+
"@live-change/sockjs": "^0.4.0-rc.1",
|
|
37
37
|
"websocket": "^1.0.34",
|
|
38
38
|
"yargs": "^17.3.0",
|
|
39
39
|
"express-static-gzip": "2.1.1"
|