Comparing version 1.7.0 to 1.7.1
@@ -31,2 +31,4 @@ // The ESLint ecmaVersion argument is inconsistently used. Some rules will ignore it entirely, so if the rule has | ||
'max-statements-per-line': ['error', {max: 1}], | ||
// ES3 doesn't support spread | ||
'prefer-spread': 'off', | ||
// as-needed quote props are easier to write | ||
@@ -33,0 +35,0 @@ 'quote-props': ['error', 'as-needed'], |
@@ -224,3 +224,3 @@ var hat = require('hat'); | ||
var agent = this; | ||
process.nextTick(function() { | ||
util.nextTick(function() { | ||
var copy = shallowCopy(op); | ||
@@ -575,3 +575,3 @@ agent.backend.sanitizeOp(agent, collection, id, copy, function(err) { | ||
} | ||
process.nextTick(callback); | ||
util.nextTick(callback); | ||
}; | ||
@@ -684,3 +684,3 @@ | ||
if (stream) stream.destroy(); | ||
process.nextTick(callback); | ||
util.nextTick(callback); | ||
}; | ||
@@ -690,3 +690,3 @@ | ||
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++) { | ||
@@ -697,3 +697,3 @@ var id = ids[i]; | ||
} | ||
process.nextTick(callback); | ||
util.nextTick(callback); | ||
}; | ||
@@ -700,0 +700,0 @@ |
@@ -16,2 +16,3 @@ var async = require('async'); | ||
var ReadSnapshotsRequest = require('./read-snapshots-request'); | ||
var util = require('./util'); | ||
@@ -255,3 +256,3 @@ var ERROR_CODE = ShareDBError.CODES; | ||
backend._sanitizeOp(agent, projection, collection, id, op, function(err) { | ||
process.nextTick(eachCb, err); | ||
util.nextTick(eachCb, err); | ||
}); | ||
@@ -258,0 +259,0 @@ }, callback); |
@@ -144,3 +144,3 @@ var Doc = require('./doc'); | ||
} catch (err) { | ||
process.nextTick(function() { | ||
util.nextTick(function() { | ||
connection.emit('error', err); | ||
@@ -609,3 +609,3 @@ }); | ||
// Call back when no pending operations | ||
process.nextTick(callback); | ||
util.nextTick(callback); | ||
}; | ||
@@ -615,3 +615,3 @@ Connection.prototype._nothingPendingRetry = function(callback) { | ||
return function() { | ||
process.nextTick(function() { | ||
util.nextTick(function() { | ||
connection.whenNothingPending(callback); | ||
@@ -618,0 +618,0 @@ }); |
@@ -229,3 +229,3 @@ var emitter = require('../emitter'); | ||
var doc = this; | ||
process.nextTick(function() { | ||
util.nextTick(function() { | ||
if (doc.hasPending()) { | ||
@@ -474,3 +474,3 @@ doc.once('nothing pending', callback); | ||
var doc = this; | ||
process.nextTick(function() { | ||
util.nextTick(function() { | ||
doc._handleSubscribe(); | ||
@@ -758,3 +758,3 @@ }); | ||
var doc = this; | ||
process.nextTick(function() { | ||
util.nextTick(function() { | ||
doc.flush(); | ||
@@ -761,0 +761,0 @@ }); |
var emitter = require('../../emitter'); | ||
var util = require('../../util'); | ||
@@ -76,4 +77,4 @@ module.exports = LocalPresence; | ||
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); | ||
}; |
@@ -156,3 +156,3 @@ var emitter = require('../../emitter'); | ||
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); | ||
@@ -159,0 +159,0 @@ }; |
@@ -0,1 +1,3 @@ | ||
var util = require('../../util'); | ||
module.exports = RemotePresence; | ||
@@ -21,3 +23,3 @@ function RemotePresence(presence, presenceId) { | ||
delete this.presence.remotePresences[this.presenceId]; | ||
if (callback) process.nextTick(callback); | ||
if (callback) util.nextTick(callback); | ||
}; |
var emitter = require('../emitter'); | ||
var util = require('../util'); | ||
@@ -83,3 +84,3 @@ // Queries are live requests to the database for particular sets of fields. | ||
// server's unsubscribe message currently | ||
if (callback) process.nextTick(callback); | ||
if (callback) util.nextTick(callback); | ||
}; | ||
@@ -86,0 +87,0 @@ |
var DB = require('./index'); | ||
var Snapshot = require('../snapshot'); | ||
var util = require('../util'); | ||
@@ -41,3 +42,3 @@ // In-memory ShareDB database | ||
if (typeof callback !== 'function') throw new Error('Callback required'); | ||
process.nextTick(function() { | ||
util.nextTick(function() { | ||
var version = db._getVersionSync(collection, id); | ||
@@ -65,3 +66,3 @@ if (snapshot.v !== version + 1) { | ||
if (typeof callback !== 'function') throw new Error('Callback required'); | ||
process.nextTick(function() { | ||
util.nextTick(function() { | ||
var snapshot = db._getSnapshotSync(collection, id, includeMetadata); | ||
@@ -85,3 +86,3 @@ callback(null, snapshot); | ||
if (typeof callback !== 'function') throw new Error('Callback required'); | ||
process.nextTick(function() { | ||
util.nextTick(function() { | ||
var opLog = db._getOpLogSync(collection, id); | ||
@@ -107,3 +108,3 @@ if (to == null) { | ||
if (typeof callback !== 'function') throw new Error('Callback required'); | ||
process.nextTick(function() { | ||
util.nextTick(function() { | ||
var collectionDocs = db.docs[collection]; | ||
@@ -110,0 +111,0 @@ var snapshots = []; |
@@ -17,3 +17,3 @@ var emitter = require('../emitter'); | ||
MilestoneDB.prototype.close = function(callback) { | ||
if (callback) process.nextTick(callback); | ||
if (callback) util.nextTick(callback); | ||
}; | ||
@@ -77,4 +77,4 @@ | ||
MilestoneDB.prototype._callBackOrEmitError = function(error, callback) { | ||
if (callback) return process.nextTick(callback, error); | ||
if (callback) return util.nextTick(callback, error); | ||
this.emit('error', error); | ||
}; |
var MilestoneDB = require('./index'); | ||
var ShareDBError = require('../error'); | ||
var util = require('../util'); | ||
@@ -29,3 +30,3 @@ var ERROR_CODE = ShareDBError.CODES; | ||
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')); | ||
} | ||
@@ -52,3 +53,3 @@ | ||
process.nextTick(callback, null); | ||
util.nextTick(callback, null); | ||
}; | ||
@@ -58,3 +59,3 @@ | ||
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')); | ||
} | ||
@@ -68,3 +69,3 @@ | ||
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')); | ||
} | ||
@@ -74,3 +75,3 @@ | ||
this._findMilestoneSnapshot(collection, id, filter, function(error, snapshot) { | ||
if (error) return process.nextTick(callback, error); | ||
if (error) return util.nextTick(callback, error); | ||
@@ -82,3 +83,3 @@ var mtime = snapshot && snapshot.m && snapshot.m.mtime; | ||
process.nextTick(callback, null, snapshot); | ||
util.nextTick(callback, null, snapshot); | ||
}); | ||
@@ -89,7 +90,7 @@ }; | ||
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')); | ||
@@ -108,3 +109,3 @@ var milestoneSnapshots = this._getMilestoneSnapshotsSync(collection, id); | ||
process.nextTick(callback, null, milestoneSnapshot); | ||
util.nextTick(callback, null, milestoneSnapshot); | ||
}; | ||
@@ -111,0 +112,0 @@ |
var MilestoneDB = require('./index'); | ||
var util = require('../util'); | ||
@@ -18,7 +19,7 @@ /** | ||
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); | ||
@@ -29,3 +30,3 @@ }; | ||
var snapshot = undefined; | ||
process.nextTick(callback, null, snapshot); | ||
util.nextTick(callback, null, snapshot); | ||
}; | ||
@@ -35,3 +36,3 @@ | ||
var snapshot = undefined; | ||
process.nextTick(callback, null, snapshot); | ||
util.nextTick(callback, null, snapshot); | ||
}; |
@@ -38,7 +38,7 @@ var emitter = require('../emitter'); | ||
} | ||
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( | ||
@@ -52,3 +52,3 @@ ERROR_CODE.ERR_DATABASE_METHOD_NOT_IMPLEMENTED, | ||
PubSub.prototype._unsubscribe = function(channel, callback) { | ||
process.nextTick(function() { | ||
util.nextTick(function() { | ||
callback(new ShareDBError( | ||
@@ -62,3 +62,3 @@ ERROR_CODE.ERR_DATABASE_METHOD_NOT_IMPLEMENTED, | ||
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')); | ||
@@ -76,3 +76,3 @@ }); | ||
if (this.subscribed[channel]) { | ||
process.nextTick(function() { | ||
util.nextTick(function() { | ||
var stream = pubsub._createStream(channel); | ||
@@ -79,0 +79,0 @@ callback(null, stream); |
var PubSub = require('./index'); | ||
var util = require('../util'); | ||
@@ -20,7 +21,7 @@ // In-memory ShareDB pub/sub | ||
MemoryPubSub.prototype._subscribe = function(channel, callback) { | ||
process.nextTick(callback); | ||
util.nextTick(callback); | ||
}; | ||
MemoryPubSub.prototype._unsubscribe = function(channel, callback) { | ||
process.nextTick(callback); | ||
util.nextTick(callback); | ||
}; | ||
@@ -30,3 +31,3 @@ | ||
var pubsub = this; | ||
process.nextTick(function() { | ||
util.nextTick(function() { | ||
for (var i = 0; i < channels.length; i++) { | ||
@@ -33,0 +34,0 @@ var channel = channels[i]; |
@@ -58,3 +58,3 @@ var Duplex = require('stream').Duplex; | ||
var socket = this.socket; | ||
process.nextTick(function() { | ||
util.nextTick(function() { | ||
if (socket.readyState !== 1) return; | ||
@@ -61,0 +61,0 @@ socket.onmessage({data: JSON.stringify(chunk)}); |
@@ -84,1 +84,16 @@ | ||
}; | ||
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); | ||
}); | ||
}; |
{ | ||
"name": "sharedb", | ||
"version": "1.7.0", | ||
"version": "1.7.1", | ||
"description": "JSON OT database backend", | ||
@@ -5,0 +5,0 @@ "main": "lib/index.js", |
2597120
122
15876