sharedb 4.1.2 → 4.1.4

package/lib/client/presence/presence.js

@@ -61,7 +61,9 @@ Presence.prototype.destroy = function(callback) {
       [
         function(next) {
           async.each(localIds, function(presenceId, next) {
-            presence.localPresences[presenceId].destroy(next);
+            var localPresence = presence.localPresences[presenceId];
+            if (!localPresence) return next();
+            localPresence.destroy(next);
           }, next);
         },
         function(next) {

package/lib/next-tick.js

@@ -0,0 +1,26 @@
+exports.messageChannel = function() {
+  var triggerCallback = createNextTickTrigger(arguments);
+  var channel = new MessageChannel();
+  channel.port1.onmessage = function() {
+    triggerCallback();
+    channel.port1.close();
+  };
+  channel.port2.postMessage('');
+};
+
+exports.setTimeout = function() {
+  var triggerCallback = createNextTickTrigger(arguments);
+  setTimeout(triggerCallback);
+};
+
+function createNextTickTrigger(args) {
+  var callback = args[0];
+  var _args = [];
+  for (var i = 1; i < args.length; i++) {
+    _args[i - 1] = args[i];
+  }
+
+  return function triggerCallback() {
+    callback.apply(null, _args);
+  };
+}

package/lib/op-stream.js

@@ -1,4 +1,3 @@
-var inherits = require('util').inherits;
 var Readable = require('stream').Readable;
 var util = require('./util');
 
@@ -10,7 +9,7 @@ function OpStream() {
 }
 module.exports = OpStream;
 
-inherits(OpStream, Readable);
+util.inherits(OpStream, Readable);
 
 // This function is for notifying us that the stream is empty and needs data.
 // For now, we'll just ignore the signal and assume the reader reads as fast

package/lib/stream-socket.js

@@ -1,5 +1,4 @@
 var Duplex = require('stream').Duplex;
-var inherits = require('util').inherits;
 var logger = require('./logger');
 var util = require('./util');
 
@@ -47,7 +46,7 @@ function ServerStream(socket) {
     socket.close('stopped');
   });
 }
-inherits(ServerStream, Duplex);
+util.inherits(ServerStream, Duplex);
 
 ServerStream.prototype.isServer = true;
 

package/lib/util.js

@@ -1,3 +1,4 @@
+var nextTickImpl = require('./next-tick');
 
 exports.doNothing = doNothing;
 function doNothing() {}
@@ -85,20 +86,13 @@ exports.truthy = function(arg) {
   return !!arg;
 };
 
-exports.nextTick = function(callback) {
-  if (typeof process !== 'undefined' && process.nextTick) {
-    return process.nextTick.apply(null, arguments);
-  }
-
-  var args = [];
-  for (var i = 1; i < arguments.length; i++) {
-    args[i - 1] = arguments[i];
-  }
-
-  setTimeout(function() {
-    callback.apply(null, args);
-  });
-};
+if (typeof process !== 'undefined' && typeof process.nextTick === 'function') {
+  exports.nextTick = process.nextTick;
+} else if (typeof MessageChannel !== 'undefined') {
+  exports.nextTick = nextTickImpl.messageChannel;
+} else {
+  exports.nextTick = nextTickImpl.setTimeout;
+}
 
 exports.clone = function(obj) {
   return (obj === undefined) ? undefined : JSON.parse(JSON.stringify(obj));
@@ -113,3 +107,15 @@ Object.getOwnPropertyNames(Object.prototype).forEach(function(prop) {
 exports.isDangerousProperty = function(propName) {
   return propName === '__proto__' || objectProtoPropNames[propName];
 };
+
+try {
+  var util = require('util');
+  if (typeof util.inherits !== 'function') throw new Error('Could not find util.inherits()');
+  exports.inherits = util.inherits;
+} catch (e) {
+  try {
+    exports.inherits = require('inherits');
+  } catch (e) {
+    throw new Error('If running sharedb in a browser, please install the "inherits" or "util" package');
+  }
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "sharedb",
-  "version": "4.1.2",
+  "version": "4.1.4",
   "description": "JSON OT database backend",
   "main": "lib/index.js",
   "dependencies": {

package/test/client/presence/presence.js

@@ -146,6 +146,32 @@ describe('Presence', function() {
     ], errorHandler(done));
   });
 
+  it('does not throw if LocalPresence destroys before Presence', function(done) {
+    var localPresence1 = presence1.create('presence-1');
+
+    async.series([
+      presence1.subscribe.bind(presence1),
+      function(next) {
+        // Middleware that ensures the presence update replies before the
+        // unsubscribe, so the local presence is destroyed first
+        var replies = [];
+        backend.use('reply', function(message, cb) {
+          if (!replies) return cb();
+          if (message.reply.a !== 'p') return replies.push(cb);
+          var _replies = replies;
+          replies = null;
+          cb();
+          _replies.forEach(function(reply) {
+            reply();
+          });
+        });
+
+        presence1.destroy(next);
+        localPresence1.destroy(errorHandler(done));
+      }
+    ], done);
+  });
+
   it('throws if trying to create local presence when wanting destroy', function(done) {
     presence2.destroy(errorHandler(done));
     expect(function() {

package/test/next-tick.js

@@ -0,0 +1,26 @@
+var nextTickImpl = require('../lib/next-tick');
+var expect = require('chai').expect;
+
+describe('nextTick', function() {
+  ['messageChannel', 'setTimeout'].forEach(function(name) {
+    var tick = nextTickImpl[name];
+
+    it('passes args', function(done) {
+      tick(function(arg1, arg2, arg3) {
+        expect(arg1).to.equal('foo');
+        expect(arg2).to.equal(123);
+        expect(arg3).to.be.undefined;
+        done();
+      }, 'foo', 123);
+    });
+
+    it('calls asynchronously', function(done) {
+      var called = false;
+      tick(function() {
+        called = true;
+        done();
+      });
+      expect(called).to.be.false;
+    });
+  });
+});

package/test/util-test.js

@@ -1,50 +0,0 @@
-var util = require('../lib/util');
-var expect = require('chai').expect;
-
-describe('util', function() {
-  describe('nextTick', function() {
-    it('uses process.nextTick if present', function(done) {
-      expect(process.nextTick).to.be.ok;
-
-      util.nextTick(function(arg1, arg2, arg3) {
-        expect(arg1).to.equal('foo');
-        expect(arg2).to.equal(123);
-        expect(arg3).to.be.undefined;
-        done();
-      }, 'foo', 123);
-    });
-
-    describe('without nextTick', function() {
-      var nextTick;
-
-      before(function() {
-        nextTick = process.nextTick;
-        delete process.nextTick;
-      });
-
-      after(function() {
-        process.nextTick = nextTick;
-      });
-
-      it('uses a ponyfill if process.nextTick is not present', function(done) {
-        expect(process.nextTick).to.be.undefined;
-
-        util.nextTick(function(arg1, arg2, arg3) {
-          expect(arg1).to.equal('foo');
-          expect(arg2).to.equal(123);
-          expect(arg3).to.be.undefined;
-          done();
-        }, 'foo', 123);
-      });
-
-      it('calls asynchronously', function(done) {
-        var called = false;
-        util.nextTick(function() {
-          called = true;
-          done();
-        });
-        expect(called).to.be.false;
-      });
-    });
-  });
-});