sharedb 5.2.0 → 5.2.2

package/lib/client/presence/local-doc-presence.js

@@ -30,10 +30,20 @@ LocalDocPresence.prototype.submit = function(value, callback) {
     // be null. Let's early return, instead of error since this is a harmless
     // no-op
     if (value === null) return this._callbackOrEmit(null, callback);
-    var error = {
-      code: ERROR_CODE.ERR_DOC_DOES_NOT_EXIST,
-      message: 'Cannot submit presence. Document has not been created'
-    };
+
+    var error = null;
+    if (this._doc._isInHardRollback) {
+      error = {
+        code: ERROR_CODE.ERR_DOC_IN_HARD_ROLLBACK,
+        message: 'Cannot submit presence. Document is processing hard rollback'
+      };
+    } else {
+      error = {
+        code: ERROR_CODE.ERR_DOC_DOES_NOT_EXIST,
+        message: 'Cannot submit presence. Document has not been created'
+      };
+    }
+
     return this._callbackOrEmit(error, callback);
   };
 

package/lib/util.js

@@ -9,7 +9,9 @@ exports.hasKeys = function(object) {
 };
 
 var hasOwn;
-exports.hasOwn = hasOwn = Object.hasOwn || Object.prototype.hasOwnProperty.call;
+exports.hasOwn = hasOwn = Object.hasOwn || function(obj, prop) {
+  return Object.prototype.hasOwnProperty.call(obj, prop);
+};
 
 // https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Number/isInteger#Polyfill
 exports.isInteger = Number.isInteger || function(value) {

package/package.json

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

package/test/client/presence/doc-presence.js

@@ -829,6 +829,20 @@ describe('DocPresence', function() {
     ], done);
   });
 
+
+  it('errors local presence when doc is in hard rollback', function(done) {
+    var localPresence1 = presence1.create('presence-1');
+
+    doc1.on('error', function(error) {
+      expect(error).to.be.equal('some error');
+    });
+    doc1._hardRollback('some error');
+    localPresence1.submit({index: 1}, function(error) {
+      expect(error.code).to.be.equal('ERR_DOC_IN_HARD_ROLLBACK');
+      done();
+    });
+  });
+
   it('returns errors sent from the middleware', function(done) {
     backend.use(backend.MIDDLEWARE_ACTIONS.sendPresence, function(request, callback) {
       callback('some error');