avoid global variables in subscription

nicola · nicola · commit 5b36ba133f44 · 2015-07-29T04:54:58.000+02:00
diff --git a/bin/ldnode.js b/bin/ldnode.js
@@ -117,4 +117,3 @@ try {
 app.listen(argv.port, function() {
     debug('LDP started on port ' + argv.port);
 });
-
diff --git a/lib/ldp.js b/lib/ldp.js
@@ -58,6 +58,8 @@ function LDP(argv) {
 
   // Cache of usedURIs
   ldp.usedURIs = {};
+  ldp.SSEsubscriptions = {};
+  ldp.subscriptions = {};
 
   debug.settings("mount: " + ldp.mount);
   debug.settings("root: " + ldp.root);
diff --git a/lib/subscription.js b/lib/subscription.js
@@ -4,24 +4,19 @@
 var $rdf = require('rdflib');
 var redis = require('redis');
 var debug = require('./logging').subscription;
-
 var utils = require('./utils.js');
-
-var subscriptions = {}; // Map URI to array of watchers
-var SSEsubscriptions = {};
-
 var PATCH = $rdf.Namespace('http://www.w3.org/ns/pim/patch#');
 
 exports.subscribeToChanges_SSE = function(req, res) {
-    var options = req.app.locals.ldp;
+    var ldp = req.app.locals.ldp;
 
     var messageCount;
     debug("Server Side Events subscription");
-    var targetPath = req.originalUrl.slice(0, - options.suffixChanges.length); // lop off ',events'
-    if (SSEsubscriptions[targetPath] === undefined) {
-        SSEsubscriptions[targetPath] = redis.createClient();
+    var targetPath = req.originalUrl.slice(0, - ldp.suffixChanges.length); // lop off ',events'
+    if (ldp.SSEsubscriptions[targetPath] === undefined) {
+        ldp.SSEsubscriptions[targetPath] = redis.createClient();
     }
-    var subscriber = SSEsubscriptions[targetPath];
+    var subscriber = ldp.SSEsubscriptions[targetPath];
     debug("Server Side Events subscription: " + targetPath);
 
     subscriber.subscribe('updates');
@@ -60,9 +55,9 @@ exports.subscribeToChanges_SSE = function(req, res) {
 
 exports.publishDelta_SSE = function (req, res, patchKB, targetURI){
     // @@ TODO
-    var options = req.app.locals.ldp;
-    var targetPath = req.originalUrl.slice(0, - options.suffixChanges.length); // lop off ',changes'
-    var publisherClient = SSEsubscriptions[targetPath];
+    var ldp = req.app.locals.ldp;
+    var targetPath = req.originalUrl.slice(0, - ldp.suffixChanges.length); // lop off ',changes'
+    var publisherClient = ldp.SSEsubscriptions[targetPath];
     publisherClient.publish( 'updates', ('"' + targetPath + '" data changed visited') );
 };
 
@@ -73,29 +68,29 @@ var DelayedResponse = require('http-delayed-response');
 
 
 exports.subscribeToChangesLongPoll = function(req, res) {
-    var options = req.app.locals.ldp;
-    var targetPath = req.originalUrl.slice(0, - options.suffixChanges.length); // lop off ',changes'
-    if (subscriptions[targetPath] === undefined) {
-        subscriptions[targetPath] = [];
+    var ldp = req.app.locals.ldp;
+    var targetPath = req.originalUrl.slice(0, - ldp.suffixChanges.length); // lop off ',changes'
+    if (ldp.subscriptions[targetPath] === undefined) {
+        ldp.subscriptions[targetPath] = [];
     }
 
     var delayed = new DelayedResponse(req, res);
 
     var subscription = { 'targetPath': targetPath,
             'request': req, 'response': res, 'delayed': delayed,
             'timestamp': utils.timestamp() };
-    subscriptions[targetPath].push(subscription);
+    ldp.subscriptions[targetPath].push(subscription);
 
     var unsubscribe = function() {
-        for (var i=0; i < subscriptions[targetPath].length; i++) {
-            if (subscriptions[targetPath][i] === subscription) {
-                subscriptions[targetPath] = subscriptions[targetPath].splice(i, 1);
-                debug("UNSUBSCRIBED " + targetPath + " now " + subscriptions[targetPath].length);
+        for (var i=0; i < ldp.subscriptions[targetPath].length; i++) {
+            if (ldp.subscriptions[targetPath][i] === ldp.subscription) {
+                ldp.subscriptions[targetPath] = ldp.subscriptions[targetPath].splice(i, 1);
+                debug("UNSUBSCRIBED " + targetPath + " now " + ldp.subscriptions[targetPath].length);
                 return;
             }
         }
         debug("ERROR - COULD NOT FIND SUB of " + subscription.timestamp +
-            " for " + targetPath + " now " + subscriptions[targetPath].length);
+            " for " + targetPath + " now " + ldp.subscriptions[targetPath].length);
 
     };
 
@@ -122,7 +117,7 @@ exports.subscribeToChangesLongPoll = function(req, res) {
     // was: res.setTimeout
     req.socket.setTimeout(0); // Disable timeout (does this work??)
 
-    debug("LONG POLL : Now " + subscriptions[targetPath].length +  " subscriptions for " +  targetPath);
+    debug("LONG POLL : Now " + ldp.subscriptions[targetPath].length +  " subscriptions for " +  targetPath);
 
 };
 
@@ -152,12 +147,12 @@ exports.publishDelta = function (req, res, patchKB, targetURI){
 };
 
 exports.publishDelta_LongPoll = function (req, res, patchData, targetURI){
-    var options = req.app.locals.ldp;
-    debug("    Long poll change subscription count " + (subscriptions[req.originalUrl] || []).length);
-    if (! subscriptions[req.originalUrl]) return;
-    subscriptions[req.originalUrl].map(function(subscription){
+    var ldp = req.app.locals.ldp;
+    debug("    Long poll change subscription count " + (ldp.subscriptions[req.originalUrl] || []).length);
+    if (! ldp.subscriptions[req.originalUrl]) return;
+    ldp.subscriptions[req.originalUrl].map(function(subscription){
         debug("    Long poll change to " + req.originalUrl);
-        if (options.leavePatchConnectionOpen) {
+        if (ldp.leavePatchConnectionOpen) {
             subscription.response.write(patchData);
         } else {
             // debug("    --- headersSent 2  " + res.headersSent);
@@ -166,6 +161,6 @@ exports.publishDelta_LongPoll = function (req, res, patchData, targetURI){
         }
     });
 
-    subscriptions[req.originalUrl] = []; // one-off polll
+    ldp.subscriptions[req.originalUrl] = []; // one-off polll
     debug("LONG POLL : Now NO subscriptions for " +  targetURI);
 };
diff --git a/test/ldp.js b/test/ldp.js
@@ -105,4 +105,4 @@ describe('LDP', function () {
       });
     });
   });
-});
+});

-Original file line number
+Diff line change
       });
     });
   });
 -});
 +});