Merge pull request #434 from share/next-tick

Ponyfill `nextTick`

.eslintrc.js

@@ -28,6 +28,8 @@ const SHAREDB_RULES = {
   'no-unused-vars': ['error', {vars: 'all', args: 'after-used'}],
   // It's more readable to ensure we only have one statement per line
   'max-statements-per-line': ['error', {max: 1}],
+  // ES3 doesn't support spread
+  'prefer-spread': 'off',
   // as-needed quote props are easier to write
   'quote-props': ['error', 'as-needed'],
   'require-jsdoc': 'off',

lib/agent.js

@@ -221,7 +221,7 @@ Agent.prototype._onOp = function(collection, id, op) {
   // precaution against op middleware breaking query subscriptions, we delay
   // before calling into projection and middleware code
   var agent = this;
-  process.nextTick(function() {
+  util.nextTick(function() {
     var copy = shallowCopy(op);
     agent.backend.sanitizeOp(agent, collection, id, copy, function(err) {
       if (err) {
@@ -571,7 +571,7 @@ Agent.prototype._queryUnsubscribe = function(queryId, callback) {
     emitter.destroy();
     delete this.subscribedQueries[queryId];
   }
-  process.nextTick(callback);
+  util.nextTick(callback);
 };
 
 Agent.prototype._fetch = function(collection, id, version, callback) {
@@ -679,18 +679,18 @@ Agent.prototype._unsubscribe = function(collection, id, callback) {
   var docs = this.subscribedDocs[collection];
   var stream = docs && docs[id];
   if (stream) stream.destroy();
-  process.nextTick(callback);
+  util.nextTick(callback);
 };
 
 Agent.prototype._unsubscribeBulk = function(collection, ids, callback) {
   var docs = this.subscribedDocs[collection];
-  if (!docs) return process.nextTick(callback);
+  if (!docs) return util.nextTick(callback);
   for (var i = 0; i < ids.length; i++) {
     var id = ids[i];
     var stream = docs[id];
     if (stream) stream.destroy();
   }
-  process.nextTick(callback);
+  util.nextTick(callback);
 };
 
 Agent.prototype._submit = function(collection, id, op, callback) {

lib/backend.js

@@ -13,6 +13,7 @@ var Snapshot = require('./snapshot');
 var StreamSocket = require('./stream-socket');
 var SubmitRequest = require('./submit-request');
 var ReadSnapshotsRequest = require('./read-snapshots-request');
+var util = require('./util');
 
 var ERROR_CODE = ShareDBError.CODES;
 
@@ -251,7 +252,7 @@ Backend.prototype._sanitizeOps = function(agent, projection, collection, id, ops
   var backend = this;
   async.each(ops, function(op, eachCb) {
     backend._sanitizeOp(agent, projection, collection, id, op, function(err) {
-      process.nextTick(eachCb, err);
+      util.nextTick(eachCb, err);
     });
   }, callback);
 };

lib/client/connection.js

@@ -141,7 +141,7 @@ Connection.prototype.bindToSocket = function(socket) {
     try {
       connection.handleMessage(request.data);
     } catch (err) {
-      process.nextTick(function() {
+      util.nextTick(function() {
         connection.emit('error', err);
       });
     }
@@ -605,12 +605,12 @@ Connection.prototype.whenNothingPending = function(callback) {
     return;
   }
   // Call back when no pending operations
-  process.nextTick(callback);
+  util.nextTick(callback);
 };
 Connection.prototype._nothingPendingRetry = function(callback) {
   var connection = this;
   return function() {
-    process.nextTick(function() {
+    util.nextTick(function() {
       connection.whenNothingPending(callback);
     });
   };

lib/client/doc.js

@@ -226,7 +226,7 @@ Doc.prototype.ingestSnapshot = function(snapshot, callback) {
 
 Doc.prototype.whenNothingPending = function(callback) {
   var doc = this;
-  process.nextTick(function() {
+  util.nextTick(function() {
     if (doc.hasPending()) {
       doc.once('nothing pending', callback);
       return;
@@ -470,7 +470,7 @@ Doc.prototype._flushSubscribe = function() {
   if (!this.pendingSubscribe[0].wantSubscribe) {
     this.inflightSubscribe = this.pendingSubscribe.shift();
     var doc = this;
-    process.nextTick(function() {
+    util.nextTick(function() {
       doc._handleSubscribe();
     });
   }
@@ -753,7 +753,7 @@ Doc.prototype._submit = function(op, source, callback) {
   // The call to flush is delayed so if submit() is called multiple times
   // synchronously, all the ops are combined before being sent to the server.
   var doc = this;
-  process.nextTick(function() {
+  util.nextTick(function() {
     doc.flush();
   });
 };

lib/client/presence/local-presence.js

@@ -1,4 +1,5 @@
 var emitter = require('../../emitter');
+var util = require('../../util');
 
 module.exports = LocalPresence;
 function LocalPresence(presence, presenceId) {
@@ -73,6 +74,6 @@ LocalPresence.prototype._getCallback = function(presenceVersion) {
 };
 
 LocalPresence.prototype._callbackOrEmit = function(error, callback) {
-  if (callback) return process.nextTick(callback, error);
+  if (callback) return util.nextTick(callback, error);
   if (error) this.emit('error', error);
 };

lib/client/presence/presence.js

@@ -153,7 +153,7 @@ Presence.prototype._subscriptionCallback = function(seq) {
 };
 
 Presence.prototype._callbackOrEmit = function(error, callback) {
-  if (callback) return process.nextTick(callback, error);
+  if (callback) return util.nextTick(callback, error);
   if (error) this.emit('error', error);
 };
 

lib/client/presence/remote-presence.js

@@ -1,3 +1,5 @@
+var util = require('../../util');
+
 module.exports = RemotePresence;
 function RemotePresence(presence, presenceId) {
   this.presence = presence;
@@ -18,5 +20,5 @@ RemotePresence.prototype.receiveUpdate = function(message) {
 RemotePresence.prototype.destroy = function(callback) {
   delete this.presence._remotePresenceInstances[this.presenceId];
   delete this.presence.remotePresences[this.presenceId];
-  if (callback) process.nextTick(callback);
+  if (callback) util.nextTick(callback);
 };

lib/client/query.js

@@ -1,4 +1,5 @@
 var emitter = require('../emitter');
+var util = require('../util');
 
 // Queries are live requests to the database for particular sets of fields.
 //
@@ -80,7 +81,7 @@ Query.prototype.destroy = function(callback) {
   this.connection._destroyQuery(this);
   // There is a callback for consistency, but we don't actually wait for the
   // server's unsubscribe message currently
-  if (callback) process.nextTick(callback);
+  if (callback) util.nextTick(callback);
 };
 
 Query.prototype._onConnectionStateChanged = function() {

lib/db/memory.js

@@ -1,5 +1,6 @@
 var DB = require('./index');
 var Snapshot = require('../snapshot');
+var util = require('../util');
 
 // In-memory ShareDB database
 //
@@ -38,7 +39,7 @@ MemoryDB.prototype.close = function(callback) {
 MemoryDB.prototype.commit = function(collection, id, op, snapshot, options, callback) {
   var db = this;
   if (typeof callback !== 'function') throw new Error('Callback required');
-  process.nextTick(function() {
+  util.nextTick(function() {
     var version = db._getVersionSync(collection, id);
     if (snapshot.v !== version + 1) {
       var succeeded = false;
@@ -61,7 +62,7 @@ MemoryDB.prototype.getSnapshot = function(collection, id, fields, options, callb
   var includeMetadata = (fields && fields.$submit) || (options && options.metadata);
   var db = this;
   if (typeof callback !== 'function') throw new Error('Callback required');
-  process.nextTick(function() {
+  util.nextTick(function() {
     var snapshot = db._getSnapshotSync(collection, id, includeMetadata);
     callback(null, snapshot);
   });
@@ -80,7 +81,7 @@ MemoryDB.prototype.getOps = function(collection, id, from, to, options, callback
   var includeMetadata = options && options.metadata;
   var db = this;
   if (typeof callback !== 'function') throw new Error('Callback required');
-  process.nextTick(function() {
+  util.nextTick(function() {
     var opLog = db._getOpLogSync(collection, id);
     if (to == null) {
       to = opLog.length;
@@ -101,7 +102,7 @@ MemoryDB.prototype.query = function(collection, query, fields, options, callback
   var includeMetadata = options && options.metadata;
   var db = this;
   if (typeof callback !== 'function') throw new Error('Callback required');
-  process.nextTick(function() {
+  util.nextTick(function() {
     var collectionDocs = db.docs[collection];
     var snapshots = [];
     for (var id in collectionDocs || {}) {

lib/milestone-db/index.js

@@ -14,7 +14,7 @@ function MilestoneDB(options) {
 emitter.mixin(MilestoneDB);
 
 MilestoneDB.prototype.close = function(callback) {
-  if (callback) process.nextTick(callback);
+  if (callback) util.nextTick(callback);
 };
 
 /**
@@ -73,6 +73,6 @@ MilestoneDB.prototype._isValidTimestamp = function(timestamp) {
 };
 
 MilestoneDB.prototype._callBackOrEmitError = function(error, callback) {
-  if (callback) return process.nextTick(callback, error);
+  if (callback) return util.nextTick(callback, error);
   this.emit('error', error);
 };

lib/milestone-db/memory.js

@@ -1,5 +1,6 @@
 var MilestoneDB = require('./index');
 var ShareDBError = require('../error');
+var util = require('../util');
 
 var ERROR_CODE = ShareDBError.CODES;
 
@@ -26,7 +27,7 @@ MemoryMilestoneDB.prototype = Object.create(MilestoneDB.prototype);
 
 MemoryMilestoneDB.prototype.getMilestoneSnapshot = function(collection, id, version, callback) {
   if (!this._isValidVersion(version)) {
-    return process.nextTick(callback, new ShareDBError(ERROR_CODE.ERR_MILESTONE_ARGUMENT_INVALID, 'Invalid version'));
+    return util.nextTick(callback, new ShareDBError(ERROR_CODE.ERR_MILESTONE_ARGUMENT_INVALID, 'Invalid version'));
   }
 
   var predicate = versionLessThanOrEqualTo(version);
@@ -48,12 +49,12 @@ MemoryMilestoneDB.prototype.saveMilestoneSnapshot = function(collection, snapsho
     return a.v - b.v;
   });
 
-  process.nextTick(callback, null);
+  util.nextTick(callback, null);
 };
 
 MemoryMilestoneDB.prototype.getMilestoneSnapshotAtOrBeforeTime = function(collection, id, timestamp, callback) {
   if (!this._isValidTimestamp(timestamp)) {
-    return process.nextTick(callback, new ShareDBError(ERROR_CODE.ERR_MILESTONE_ARGUMENT_INVALID, 'Invalid timestamp'));
+    return util.nextTick(callback, new ShareDBError(ERROR_CODE.ERR_MILESTONE_ARGUMENT_INVALID, 'Invalid timestamp'));
   }
 
   var filter = timestampLessThanOrEqualTo(timestamp);
@@ -62,29 +63,29 @@ MemoryMilestoneDB.prototype.getMilestoneSnapshotAtOrBeforeTime = function(collec
 
 MemoryMilestoneDB.prototype.getMilestoneSnapshotAtOrAfterTime = function(collection, id, timestamp, callback) {
   if (!this._isValidTimestamp(timestamp)) {
-    return process.nextTick(callback, new ShareDBError(ERROR_CODE.ERR_MILESTONE_ARGUMENT_INVALID, 'Invalid timestamp'));
+    return util.nextTick(callback, new ShareDBError(ERROR_CODE.ERR_MILESTONE_ARGUMENT_INVALID, 'Invalid timestamp'));
   }
 
   var filter = timestampGreaterThanOrEqualTo(timestamp);
   this._findMilestoneSnapshot(collection, id, filter, function(error, snapshot) {
-    if (error) return process.nextTick(callback, error);
+    if (error) return util.nextTick(callback, error);
 
     var mtime = snapshot && snapshot.m && snapshot.m.mtime;
     if (timestamp !== null && mtime < timestamp) {
       snapshot = undefined;
     }
 
-    process.nextTick(callback, null, snapshot);
+    util.nextTick(callback, null, snapshot);
   });
 };
 
 MemoryMilestoneDB.prototype._findMilestoneSnapshot = function(collection, id, breakCondition, callback) {
   if (!collection) {
-    return process.nextTick(
+    return util.nextTick(
       callback, new ShareDBError(ERROR_CODE.ERR_MILESTONE_ARGUMENT_INVALID, 'Missing collection')
     );
   }
-  if (!id) return process.nextTick(callback, new ShareDBError(ERROR_CODE.ERR_MILESTONE_ARGUMENT_INVALID, 'Missing ID'));
+  if (!id) return util.nextTick(callback, new ShareDBError(ERROR_CODE.ERR_MILESTONE_ARGUMENT_INVALID, 'Missing ID'));
 
   var milestoneSnapshots = this._getMilestoneSnapshotsSync(collection, id);
 
@@ -98,7 +99,7 @@ MemoryMilestoneDB.prototype._findMilestoneSnapshot = function(collection, id, br
     }
   }
 
-  process.nextTick(callback, null, milestoneSnapshot);
+  util.nextTick(callback, null, milestoneSnapshot);
 };
 
 MemoryMilestoneDB.prototype._getMilestoneSnapshotsSync = function(collection, id) {

lib/milestone-db/no-op.js

@@ -1,4 +1,5 @@
 var MilestoneDB = require('./index');
+var util = require('../util');
 
 /**
  * A no-op implementation of the MilestoneDB class.
@@ -15,20 +16,20 @@ NoOpMilestoneDB.prototype = Object.create(MilestoneDB.prototype);
 
 NoOpMilestoneDB.prototype.getMilestoneSnapshot = function(collection, id, version, callback) {
   var snapshot = undefined;
-  process.nextTick(callback, null, snapshot);
+  util.nextTick(callback, null, snapshot);
 };
 
 NoOpMilestoneDB.prototype.saveMilestoneSnapshot = function(collection, snapshot, callback) {
-  if (callback) return process.nextTick(callback, null);
+  if (callback) return util.nextTick(callback, null);
   this.emit('save', collection, snapshot);
 };
 
 NoOpMilestoneDB.prototype.getMilestoneSnapshotAtOrBeforeTime = function(collection, id, timestamp, callback) {
   var snapshot = undefined;
-  process.nextTick(callback, null, snapshot);
+  util.nextTick(callback, null, snapshot);
 };
 
 NoOpMilestoneDB.prototype.getMilestoneSnapshotAtOrAfterTime = function(collection, id, timestamp, callback) {
   var snapshot = undefined;
-  process.nextTick(callback, null, snapshot);
+  util.nextTick(callback, null, snapshot);
 };

lib/pubsub/index.js

@@ -35,11 +35,11 @@ PubSub.prototype.close = function(callback) {
       map[id].destroy();
     }
   }
-  if (callback) process.nextTick(callback);
+  if (callback) util.nextTick(callback);
 };
 
 PubSub.prototype._subscribe = function(channel, callback) {
-  process.nextTick(function() {
+  util.nextTick(function() {
     callback(new ShareDBError(
       ERROR_CODE.ERR_DATABASE_METHOD_NOT_IMPLEMENTED,
       '_subscribe PubSub method unimplemented'
@@ -48,7 +48,7 @@ PubSub.prototype._subscribe = function(channel, callback) {
 };
 
 PubSub.prototype._unsubscribe = function(channel, callback) {
-  process.nextTick(function() {
+  util.nextTick(function() {
     callback(new ShareDBError(
       ERROR_CODE.ERR_DATABASE_METHOD_NOT_IMPLEMENTED,
       '_unsubscribe PubSub method unimplemented'
@@ -57,7 +57,7 @@ PubSub.prototype._unsubscribe = function(channel, callback) {
 };
 
 PubSub.prototype._publish = function(channels, data, callback) {
-  process.nextTick(function() {
+  util.nextTick(function() {
     callback(new ShareDBError(ERROR_CODE.ERR_DATABASE_METHOD_NOT_IMPLEMENTED, '_publish PubSub method unimplemented'));
   });
 };
@@ -70,7 +70,7 @@ PubSub.prototype.subscribe = function(channel, callback) {
 
   var pubsub = this;
   if (this.subscribed[channel]) {
-    process.nextTick(function() {
+    util.nextTick(function() {
       var stream = pubsub._createStream(channel);
       callback(null, stream);
     });