Use the websocket scheme instead of http for live updates

deiu · deiu · commit 801b327aada1 · 2016-03-09T15:30:29.000-05:00
diff --git a/lib/handlers/get.js b/lib/handlers/get.js
@@ -42,7 +42,7 @@ function handler (req, res, next) {
 
   // Set live updates
   if (ldp.live) {
-    res.header('Updates-Via', utils.uriBase(req))
+    res.header('Updates-Via', req.protocol.replace(/^http/, 'ws') + '://' + req.get('host'))
   }
 
   debug(req.originalUrl + ' on ' + req.hostname)
diff --git a/test/http.js b/test/http.js
@@ -8,7 +8,8 @@ var path = require('path')
 
 var suffixAcl = '.acl'
 var suffixMeta = '.meta'
-var ldpServer = ldnode({
+var ldpServer = ldnode.createServer({
+  live: true,
   root: path.join(__dirname, '/resources')
 })
 var server = supertest(ldpServer)
@@ -193,6 +194,11 @@ describe('HTTP APIs', function () {
         .expect('Link', /<http:\/\/www.w3.org\/ns\/ldp#Resource>; rel="type"/)
         .expect(200, done)
     })
+    it('should have set Updates-Via to use WebSockets', function (done) {
+      server.get('/sampleContainer/example1.ttl')
+        .expect('updates-via', /wss?:\/\//)
+        .expect(200, done)
+    })
     it('should have set acl and describedBy Links for resource',
       function (done) {
         server.get('/sampleContainer/example1.ttl')
@@ -310,6 +316,11 @@ describe('HTTP APIs', function () {
         .expect(emptyResponse)
         .expect(200, done)
     })
+    it('should have set Updates-Via to use WebSockets', function (done) {
+      server.get('/sampleContainer/example1.ttl')
+        .expect('updates-via', /wss?:\/\//)
+        .expect(200, done)
+    })
     it('should have set Link as Resource', function (done) {
       server.head('/sampleContainer/example1.ttl')
         .expect('Link', /<http:\/\/www.w3.org\/ns\/ldp#Resource>; rel="type"/)

Original file line number	Diff line number	Diff line change
`@@ -42,7 +42,7 @@ function handler (req, res, next) {`
`42`	`42`
`43`	`43`	`// Set live updates`
`44`	`44`	`if (ldp.live) {`
`45`		`- res.header('Updates-Via', utils.uriBase(req))`
	`45`	`+ res.header('Updates-Via', req.protocol.replace(/^http/, 'ws') + '://' + req.get('host'))`
`46`	`46`	`}`
`47`	`47`
`48`	`48`	`debug(req.originalUrl + ' on ' + req.hostname)`