antietcd 1.1.2 → 1.1.4

package/anticli.js

@@ -23,7 +23,7 @@ anticli.js [OPTIONS] load [--with-lease] < dump.json
 Options:
 
 [--endpoints|-e http://node1:2379,http://node2:2379,http://node3:2379]
-[--cert cert.pem] [--key key.pem] [--timeout 1000] [--json]
+[--cert cert.pem] [--key key.pem] [--ca ca.pem] [--timeout 1000] [--json]
 `;
 
 class AntiEtcdCli
@@ -98,12 +98,15 @@ class AntiEtcdCli
         {
             this.options.endpoints = [ 'http://localhost:2379' ];
         }
+        this.tls = {};
         if (this.options.cert && this.options.key)
         {
-            this.tls = {
-                key: await fsp.readFile(this.options.key),
-                cert: await fsp.readFile(this.options.cert),
-            };
+            this.tls.key = await fsp.readFile(this.options.key);
+            this.tls.cert = await fsp.readFile(this.options.cert);
+        }
+        if (this.options.ca)
+        {
+            this.tls.ca = await fsp.readFile(this.options.ca);
         }
         if (cmd[0] == 'get')
         {
@@ -281,7 +284,7 @@ function POST(url, options, body, timeout)
             req = null;
             ok({ error: 'timeout' });
         }, timeout) : null;
-        let req = (url.substr(0, 6).toLowerCase() == 'https://' ? https : http).request(url, { method: 'POST', headers: {
+        let req = (url.substr(0, 8).toLowerCase() == 'https://' ? https : http).request(url, { method: 'POST', headers: {
             'Content-Type': 'application/json',
             'Content-Length': body_text.length,
         }, timeout, ...options }, (res) =>

package/antietcd.js

@@ -17,7 +17,7 @@ const AntiPersistence = require('./antipersistence.js');
 const AntiCluster = require('./anticluster.js');
 const { runCallbacks, de64, b64, RequestError } = require('./common.js');
 
-const VERSION = '1.1.2';
+const VERSION = '1.1.4';
 
 class AntiEtcd extends EventEmitter
 {

package/etctree.js

@@ -251,6 +251,10 @@ class EtcTree
                 {
                     delete this.leases[cur_old.lease].keys[key];
                 }
+                if (cur_new.lease && !this.leases[cur_new.lease])
+                {
+                    console.log('BUG: restoring a key with unknown lease '+cur_new.lease);
+                }
                 cur_old.lease = cur_new.lease;
                 if (cur_new.lease && this.leases[cur_new.lease])
                 {
@@ -277,17 +281,14 @@ class EtcTree
         {
             if (!cur_old.children[k])
             {
-                cur_old.children[k] = cur_new.children[k];
-            }
-            else
-            {
-                this._restore_diff(
-                    update_only, cur_old.children[k], cur_new.children[k],
-                    prefix === null ? k : prefix+'/'+k,
-                    cur_old.children[k].watchers ? [ ...watchers, ...cur_old.children[k].watchers ] : watchers,
-                    notifications
-                );
+                cur_old.children[k] = {};
             }
+            this._restore_diff(
+                update_only, cur_old.children[k], cur_new.children[k],
+                prefix === null ? k : prefix+'/'+k,
+                cur_old.children[k].watchers ? [ ...watchers, ...cur_old.children[k].watchers ] : watchers,
+                notifications
+            );
         }
         if (!update_only)
         {
@@ -818,6 +819,7 @@ class EtcTree
                 delete this.leases[cur.lease].keys[prefix === null ? '' : prefix];
             }
             cur.value = null;
+            cur.lease = null;
             cur.version = 0;
             cur.create_revision = null;
             cur.mod_revision = cur_revision;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "antietcd",
-  "version": "1.1.2",
+  "version": "1.1.4",
   "description": "Simplistic etcd replacement based on TinyRaft",
   "main": "antietcd.js",
   "scripts": {
@@ -49,7 +49,7 @@
     "ws": "^8.17.0"
   },
   "bin": {
-    "antietcd": "./antietcd-app.js",
-    "anticli": "./anticli.js"
+    "antietcd": "antietcd-app.js",
+    "anticli": "anticli.js"
   }
 }