sharedb 5.1.0 → 5.2.0

package/lib/agent.js

@@ -569,7 +569,7 @@ Agent.prototype._querySubscribe = function(queryId, collection, query, options,
   }
   this.backend.querySubscribe(this, collection, query, options, function(err, emitter, results, extra) {
     if (err) return finish(err);
-    if (this.closed) return emitter.destroy();
+    if (agent.closed) return emitter.destroy();
 
     agent._subscribeToQuery(emitter, queryId, collection, query);
     // No results are returned when ids are passed in as an option. Instead,

package/lib/client/doc.js

@@ -61,6 +61,7 @@ function Doc(connection, collection, id) {
   this.id = id;
 
   this.version = null;
+  // The OT type of this document. An uncreated document has type `null`
   this.type = null;
   this.data = undefined;
 
@@ -70,6 +71,8 @@ function Doc(connection, collection, id) {
   this.pendingFetch = [];
   this.pendingSubscribe = [];
 
+  this._isInHardRollback = false;
+
   // Whether we think we are subscribed on the server. Synchronously set to
   // false on calls to unsubscribe and disconnect. Should never be true when
   // this.wantSubscribe is false
@@ -93,9 +96,6 @@ function Doc(connection, collection, id) {
   // This is a list of {[create:{...}], [del:true], [op:...], callbacks:[...]}
   this.pendingOps = [];
 
-  // The OT type of this document. An uncreated document has type `null`
-  this.type = null;
-
   // The applyStack enables us to track any ops submitted while we are
   // applying an op incrementally. This value is an array when we are
   // performing an incremental apply and null otherwise. When it is an array,
@@ -748,10 +748,18 @@ Doc.prototype._submit = function(op, source, callback) {
   // The op contains either op, create, delete, or none of the above (a no-op).
   if ('op' in op) {
     if (!this.type) {
-      var err = new ShareDBError(
-        ERROR_CODE.ERR_DOC_DOES_NOT_EXIST,
-        'Cannot submit op. Document has not been created. ' + this.collection + '.' + this.id
-      );
+      if (this._isInHardRollback) {
+        var err = new ShareDBError(
+          ERROR_CODE.ERR_DOC_IN_HARD_ROLLBACK,
+          'Cannot submit op. Document is performing hard rollback. ' + this.collection + '.' + this.id
+        );
+      } else {
+        var err = new ShareDBError(
+          ERROR_CODE.ERR_DOC_DOES_NOT_EXIST,
+          'Cannot submit op. Document has not been created. ' + this.collection + '.' + this.id
+        );
+      }
+
       if (callback) return callback(err);
       return this.emit('error', err);
     }
@@ -1030,6 +1038,7 @@ Doc.prototype._rollback = function(err) {
 };
 
 Doc.prototype._hardRollback = function(err) {
+  this._isInHardRollback = true;
   // Store pending ops so that we can notify their callbacks of the error.
   // We combine the inflight op and the pending ops, because it's possible
   // to hit a condition where we have no inflight op, but we do have pending
@@ -1047,6 +1056,8 @@ Doc.prototype._hardRollback = function(err) {
   // Fetch the latest version from the server to get us back into a working state
   var doc = this;
   this._fetch({force: true}, function(fetchError) {
+    doc._isInHardRollback = false;
+
     // We want to check that no errors are swallowed, so we check that:
     // - there are callbacks to call, and
     // - that every single pending op called a callback

package/lib/error.js

@@ -30,6 +30,7 @@ ShareDBError.CODES = {
   ERR_DOC_DOES_NOT_EXIST: 'ERR_DOC_DOES_NOT_EXIST',
   ERR_DOC_TYPE_NOT_RECOGNIZED: 'ERR_DOC_TYPE_NOT_RECOGNIZED',
   ERR_DOC_WAS_DELETED: 'ERR_DOC_WAS_DELETED',
+  ERR_DOC_IN_HARD_ROLLBACK: 'ERR_DOC_IN_HARD_ROLLBACK',
   ERR_INFLIGHT_OP_MISSING: 'ERR_INFLIGHT_OP_MISSING',
   ERR_INGESTED_SNAPSHOT_HAS_NO_VERSION: 'ERR_INGESTED_SNAPSHOT_HAS_NO_VERSION',
   ERR_MAX_SUBMIT_RETRIES_EXCEEDED: 'ERR_MAX_SUBMIT_RETRIES_EXCEEDED',

package/package.json

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

package/test/client/doc.js

@@ -636,6 +636,25 @@ describe('Doc', function() {
         }
       ], done);
     });
+
+    it('rejects ops with ERR_DOC_IN_HARD_ROLLBACK error when in hard rollback', function(done) {
+      var backend = this.backend;
+      var doc = backend.connect().get('dogs', 'snoopy');
+
+      async.series([
+        doc.create.bind(doc, {color: 'red'}),
+        function(next) {
+          doc.on('error', function(error) {
+            expect(error.code).to.be.equal('TEST_ERROR');
+          });
+          doc._hardRollback(new ShareDBError('TEST_ERROR'));
+          doc.submitOp({p: ['color'], oi: 'blue', od: 'red'}, function(error) {
+            expect(error.code).to.be.equal('ERR_DOC_IN_HARD_ROLLBACK');
+            next();
+          });
+        }
+      ], done);
+    });
   });
 
   describe('errors on ops that could cause prototype corruption', function() {

package/test/client/query-subscribe.js

@@ -729,6 +729,29 @@ function commonTests(options) {
     connection.get('dogs', 'fido').on('error', done).create({age: 3});
   });
 
+  it('does not reply if the agent is closed before the query returns', function(done) {
+    var backend = this.backend;
+    var connection = backend.connect();
+    var agent = connection.agent;
+
+    backend.use('query', function(request, next) {
+      backend.use('reply', function() {
+        done(new Error('unexpected reply'));
+      });
+
+      expect(agent.closed).to.be.false;
+      agent.stream.on('close', function() {
+        expect(agent.closed).to.be.true;
+        next();
+        done();
+      });
+
+      agent.close();
+    });
+
+    connection.createSubscribeQuery('dogs', {});
+  });
+
   describe('passing agent.custom to the DB adapter', function() {
     var connection;
     var expectedArg = {