ANTIETCD.md

@@ -16,7 +16,6 @@ License: Mozilla Public License 2.0 or [VNPL-1.1](https://git.yourcmc.ru/vitalif
 # Contents
 
 - [CLI Usage](#cli-usage)
-  - [CLI Client](#cli-client)
 - [Options](#options)
   - [HTTP](#http)
   - [Persistence](#persistence)
@@ -48,34 +47,6 @@ node_modules/.bin/antietcd \
 
 Antietcd doesn't background itself, so use systemd or start-stop-daemon to run it as a background service.
 
-### CLI Client
-
-```
-node_modules/.bin/anticli [OPTIONS] put <key> [<value>]
-node_modules/.bin/anticli [OPTIONS] get <key> [-p|--prefix] [-v|--print-value-only] [-k|--keys-only]
-node_modules/.bin/anticli [OPTIONS] del <key> [-p|--prefix]
-```
-
-For `put`, if `<value>` is not specified, it will be read from STDIN.
-
-Options:
-
-<dl>
-
-<dt>--endpoints|-e http://node1:2379,http://node2:2379,http://node3:2379</dt>
-<dd>Specify HTTP endpoints to connect to</dd>
-
-<dt>--cert &lt;cert&gt;</dt>
-<dd>Use TLS with this certificate file (PEM format)</dd>
-
-<dt>--key &lt;key&gt;</dt>
-<dd>Use TLS with this key file (PEM format)</dd>
-
-<dt>--timeout 1000</dt>
-<dd>Specify request timeout in milliseconds</dd>
-
-</dl>
-
 ## Options
 
 ### HTTP

anticli.js

@@ -4,22 +4,6 @@ const fsp = require('fs').promises;
 const http = require('http');
 const https = require('https');
 
-const help_text = `CLI for AntiEtcd
-(c) Vitaliy Filippov, 2024
-License: Mozilla Public License 2.0 or Vitastor Network Public License 1.1
-
-Usage:
-
-anticli.js [OPTIONS] put <key> [<value>]
-anticli.js [OPTIONS] get <key> [-p|--prefix] [-v|--print-value-only] [-k|--keys-only]
-anticli.js [OPTIONS] del <key> [-p|--prefix]
-
-Options:
-
-[--endpoints|-e http://node1:2379,http://node2:2379,http://node3:2379]
-[--cert cert.pem] [--key key.pem] [--timeout 1000]
-`;
-
 class AntiEtcdCli
 {
     static parse(args)
@@ -31,7 +15,15 @@ class AntiEtcdCli
             const arg = args[i].toLowerCase().replace(/^--(.+)$/, (m, m1) => '--'+m1.replace(/-/g, '_'));
             if (arg === '-h' || arg === '--help')
             {
-                process.stderr.write(help_text);
+                process.stderr.write(
+                    'USAGE:\n'+
+                    '  anticli.js [OPTIONS] put <key> [<value>]\n'+
+                    '  anticli.js [OPTIONS] get <key> [-p|--prefix] [-v|--print-value-only] [-k|--keys-only]\n'+
+                    '  anticli.js [OPTIONS] del <key> [-p|--prefix]\n'+
+                    'OPTIONS:\n'+
+                    '  [--endpoints|-e http://node1:2379,http://node2:2379,http://node3:2379]\n'+
+                    '  [--timeout 1000]'
+                );
                 process.exit();
             }
             else if (arg == '-e' || arg == '--endpoints')
@@ -79,13 +71,6 @@ class AntiEtcdCli
         {
             this.options.endpoints = [ 'http://localhost:2379' ];
         }
-        if (this.options.cert && this.options.key)
-        {
-            this.tls = {
-                key: await fsp.readFile(this.options.key),
-                cert: await fsp.readFile(this.options.cert),
-            };
-        }
         if (cmd[0] == 'get')
         {
             await this.get(cmd.slice(1));
@@ -166,7 +151,7 @@ class AntiEtcdCli
         for (const url of this.options.endpoints)
         {
             const cur_url = url.replace(/\/+$/, '')+path;
-            const res = await POST(cur_url, this.tls||{}, body, this.options.timeout||1000);
+            const res = await POST(cur_url, body, this.options.timeout||1000);
             if (res.json)
             {
                 if (res.json.error)
@@ -195,7 +180,7 @@ class AntiEtcdCli
     }
 }
 
-function POST(url, options, body, timeout)
+function POST(url, body, timeout)
 {
     return new Promise(ok =>
     {
@@ -210,7 +195,7 @@ function POST(url, options, body, timeout)
         let req = (url.substr(0, 6).toLowerCase() == 'https://' ? https : http).request(url, { method: 'POST', headers: {
             'Content-Type': 'application/json',
             'Content-Length': body_text.length,
-        }, timeout, ...options }, (res) =>
+        } }, (res) =>
         {
             if (!req)
             {

antietcd-app.js

@@ -8,10 +8,10 @@ License: Mozilla Public License 2.0 or Vitastor Network Public License 1.1
 
 Usage:
 
-${process.argv[0]} ${process.argv[1]} \
+${process.argv[0]} ${process.argv[1]}
-    [--cert ssl.crt] [--key ssl.key] [--port 12379] \
+    [--cert ssl.crt] [--key ssl.key] [--port 12379]
-    [--data data.gz] [--persist-filter ./filter.js] [--persist_interval 500] \
+    [--data data.gz] [--persist-filter ./filter.js] [--persist_interval 500]
-    [--node_id node1 --cluster_key abcdef --cluster node1=http://localhost:12379,node2=http://localhost:12380,node3=http://localhost:12381] \
+    [--node_id node1 --cluster_key abcdef --cluster node1=http://localhost:12379,node2=http://localhost:12380,node3=http://localhost:12381]
     [other options]
 
 Supported etcd REST APIs:
@@ -91,7 +91,7 @@ function parse()
         const arg = process.argv[i].toLowerCase().replace(/^--(.+)$/, (m, m1) => '--'+m1.replace(/-/g, '_'));
         if (arg === '-h' || arg === '--help')
         {
-            process.stderr.write(help_text);
+            console.error(help_text.trim());
             process.exit();
         }
         else if (arg.substr(0, 2) == '--')