solid-ws should be self-contained

Author: nicola

index.js

@@ -1,6 +1,36 @@
+var debug = require('debug')('ldnode:ws-app')
 var SolidWs = require('./lib/server')
 
 module.exports = function attachToServer (server, app, opts) {
   var solidWs = new SolidWs(server, opts)
+
+  if (app) {
+    console.log("setting up the app")
+
+    app.post('/*', function (req, res, next) {
+      debug("pub " + req.originalUrl  + ' after post')
+      solidWs.publish(req.originalUrl)
+      solidWs.publish(path.basename(req.originalUrl))
+      next()
+    })
+    app.patch('/*', function (req, res, next) {
+      debug("pub " + req.originalUrl + ' after patch')
+      solidWs.publish(req.originalUrl)
+      console.log(solidWs.store)
+      next()
+    })
+    app.put('/*', function (req, res, next) {
+      debug("pub " + req.originalUrl + ' after put')
+      solidWs.publish(req.originalUrl)
+      next()
+    })
+    app.delete('/*', function (req, res, next) {
+      debug("pub " + req.originalUrl  + ' after delete')
+      solidWs.publish(req.originalUrl)
+      solidWs.publish(path.basename(req.originalUrl))
+      next()
+    })
+  }
+
   return solidWs
 }

lib/in-memory.js

@@ -8,24 +8,26 @@ function InMemory (opts) {
   this.subscribers = opts.subscribers || {}
 }
 
-InMemory.prototype.subscribe = function (uri, client, callback) {
+InMemory.prototype.subscribe = function (channel, uri, client, callback) {
   var self = this
-  this.uris[uri] = true
 
-  if (!this.subscribers[uri]) {
-    this.subscribers[uri] = {}
+  if (!this.subscribers[channel]) {
+    this.subscribers[channel] = {}
   }
 
-  client.uuid = uuid.v1()
-  this.subscribers[uri][client.uuid] = client
+  if (!client.uuid) {
+    client.uuid = uuid.v1()
+  }
+
+  this.subscribers[channel][client.uuid] = [client, uri]
 
   client.on('close', function () {
-    delete self.subscribers[uri][client.uuid]
+    delete self.subscribers[channel][client.uuid]
   })
 
   return callback(null, client.uuid)
 }
 
-InMemory.prototype.get = function (uri, callback) {
-  return callback(null, this.subscribers[uri] || {})
+InMemory.prototype.get = function (channel, callback) {
+  return callback(null, this.subscribers[channel] || {})
 }

lib/server.js

@@ -1,16 +1,22 @@
 var WebSocketServer = require('ws').Server
-var debug = require('debug')('solid:subscription')
+var debug = require('debug')('ldnode:ws')
 var InMemory = require('./in-memory')
 var parallel = require('run-parallel')
+var url = require('url')
 
 module.exports = WsServer
 
+function defaultToChannel(iri) {
+  return url.parse(iri).path
+}
+
 function WsServer (server, opts) {
   var self = this
 
   opts = opts || {}
   this.suffix = opts.suffix || '.changes'
   this.store = opts.store || new InMemory(opts)
+  var toChannel = opts.toChannel || defaultToChannel
 
   // Starting WSS server
   var wss = new WebSocketServer({
@@ -33,13 +39,16 @@ function WsServer (server, opts) {
       }
 
       var tuple = message.split(' ')
+      var command = tuple[0]
+      var iri = tuple[1]
 
       // Only accept 'sub http://example.tld/hello'
-      if (tuple.length < 2 || tuple[0] !== 'sub') {
+      if (tuple.length < 2 || command !== 'sub') {
         return
       }
 
-      self.store.subscribe(tuple[1], client, function (err, uuid) {
+      var channel = toChannel ? toChannel(iri) : iri
+      self.store.subscribe(channel, iri, client, function (err, uuid) {
         if (err) {
           // TODO Should return an error
           return
@@ -56,8 +65,8 @@ function WsServer (server, opts) {
   })
 }
 
-WsServer.prototype.publish = function (uri, callback) {
-  this.store.get(uri, function (err, subscribers) {
+WsServer.prototype.publish = function (iri, callback) {
+  this.store.get(iri, function (err, subscribers) {
 
     if (err) {
       if (callback) return callback(err)
@@ -71,8 +80,10 @@ WsServer.prototype.publish = function (uri, callback) {
     var tasks = Object.keys(subscribers)
       .map(function (uuid) {
         return function (cb) {
-          var client = subscribers[uuid]
-          client.send('pub ' + uri)
+          var client = subscribers[uuid][0]
+          var channel = subscribers[uuid][1]
+          debug('pub ' + channel + ' to ' + client.uuid)
+          client.send('pub ' + channel)
         }
       })
 

test/utils.js

@@ -4,11 +4,14 @@ exports.pubAll = pubAll
 
 var parallel = require('run-parallel')
 
-function connectAll(clients, url, done) {
-  parallel(clients.map(function(client) {
+function connectAll(clients, urls, done) {
+  if (typeof urls === 'string') {
+    urls = [urls]
+  }
+  parallel(clients.map(function(client, i) {
     return function (cb) {
       client.on('open', function() {
-        client.send('sub ' + url)
+        client.send('sub ' + (urls[i] || urls[0]))
         cb()
       })
     }

test/websockets.js

@@ -99,13 +99,40 @@ describe('Solid-ws', function() {
   })
 
   describe('pub', function() {
+    it('should pub to everyone, independently of the host name', function (done) {
+      var urls = [
+        'http://example.com/resource.ttl',
+        'http://domain.com/resource.ttl',
+        '/resource.ttl' ]
+      var users = [
+        'http://nicola.io/#me',
+        'http://timbl.com/#me', 
+        'http://deiu.io/#me' ]
+
+      var clients = users.map(function() {
+        return new WebSocket('http://localhost:' + port)
+      })
+
+      var pubs = []
+
+      utils.connectAll(clients, urls, function() {
+        utils.ackAll(clients, function() {
+          utils.pubAll(clients, pubs, function() {
+            assert.equal(pubs.length, users.length)
+            done()
+          })
+          pubsub.publish('/resource.ttl')
+        })
+      })
+    })
+
     it('should be received by all the clients subscribed to a resource', function(done) {
 
       var url = 'http://example.com/resource.ttl'
       var users = [
-        'http://nicola.io#me',
-        'http://timbl.com#me', 
-        'http://deiu.io#me' ]
+        'http://nicola.io/#me',
+        'http://timbl.com/#me', 
+        'http://deiu.io/#me' ]
 
       var clients = users.map(function() {
         return new WebSocket('http://localhost:' + port)
@@ -119,7 +146,7 @@ describe('Solid-ws', function() {
             assert.equal(pubs.length, users.length)
             done()
           })
-          pubsub.publish(url)
+          pubsub.publish('/resource.ttl')
         })
       })
     })