antietcd 1.2.0 → 1.2.2

package/anticluster.js

@@ -200,13 +200,10 @@ class AntiCluster
     _resync(followers)
     {
         this.synced = false;
-        if (!this.resync_state)
-        {
-            this.resync_state = {
-                dumps: {},
-                loads: {},
-            };
-        }
+        this.resync_state = {
+            dumps: {},
+            loads: {},
+        };
         const seen = {};
         for (const f of followers)
         {
@@ -258,6 +255,7 @@ class AntiCluster
             // Some dump(s) are still pending
             return;
         }
+        const resync_state = this.resync_state;
         this.resync_state.dumps[this.cfg.node_id] = { ...this.antietcd.etctree.dump(), term: this.antietcd.stored_term };
         let max_term = -1, with_max = [];
         for (const follower in this.resync_state.dumps)
@@ -290,6 +288,10 @@ class AntiCluster
         if (this.antietcd.persistence)
         {
             await this.antietcd.persistence.persist();
+            if (this.resync_state != resync_state)
+            {
+                return;
+            }
         }
         this.antietcd.stored_term = this.raft.term;
         if (this.cfg.use_locks)

package/antietcd.js

@@ -20,7 +20,7 @@ const AntiCluster = require('./anticluster.js');
 const AntiLocker = require('./antilocker.js');
 const { runCallbacks, de64, b64, RequestError } = require('./common.js');
 
-const VERSION = '1.2.0';
+const VERSION = '1.2.2';
 
 class AntiEtcd extends EventEmitter
 {
@@ -127,7 +127,7 @@ class AntiEtcd extends EventEmitter
 
     async _persistAndReplicate(msg)
     {
-        if (this.cfg.use_locks && msg.events.length)
+        if (this.cfg.use_locks && msg.events && msg.events.length)
         {
             this.locker.set_txn_locks(msg.events, msg.header.revision);
         }
@@ -172,7 +172,7 @@ class AntiEtcd extends EventEmitter
                 this.etctree.compact(revision);
             }
         }
-        if (this.cfg.use_locks && msg.events.length &&
+        if (this.cfg.use_locks && msg.events && msg.events.length &&
             (!this.cluster || this.cluster.raft.state == TinyRaft.LEADER))
         {
             // Leader unlocks txn itself, followers wait for feedback from the leader
@@ -496,7 +496,7 @@ class AntiEtcd extends EventEmitter
         this.api_watches[watch_id] = watch.watch_id;
         if (watch.events)
         {
-            callback(this._encodeMsg({ ...watch, watch_id }));
+            callback(this._encodeMsg({ result: { ...watch, watch_id } }));
         }
         return watch_id;
     }
@@ -530,7 +530,7 @@ class AntiEtcd extends EventEmitter
                 if (!data[key])
                     continue;
                 const actions = [];
-                for (const item of data[actions])
+                for (const item of data[key])
                 {
                     const copy = {};
                     let r;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "antietcd",
-  "version": "1.2.0",
+  "version": "1.2.2",
   "description": "Simplistic etcd replacement based on TinyRaft",
   "main": "antietcd.js",
   "scripts": {