antietcd 1.0.5 → 1.0.7

package/README.md

@@ -27,6 +27,7 @@ Simplistic miniature etcd replacement based on [TinyRaft](https://git.yourcmc.ru
   - [/v3/lease/grant](#v3-lease-grant)
   - [/v3/lease/keepalive](#v3-lease-keepalive)
   - [/v3/lease/revoke or /v3/kv/lease/revoke](#v3-lease-revoke-or-v3-kv-lease-revoke)
+  - [/v3/maintenance/status](#v3-maintenance-status)
   - [Websocket-based watch APIs](#websocket-based-watch-apis)
 - [HTTP Error Codes](#http-error-codes)
 
@@ -450,6 +451,31 @@ type LeaseRevokeResponse = {
 }
 ```
 
+### /v3/maintenance/status
+
+Request:
+
+```{}```
+
+Response:
+
+```ts
+type MaintenanceStatusResponse = {
+  header: {
+    member_id?: string,
+    revision: number,
+    compact_revision: number,
+    raft_term?: number,
+  },
+  version: string,
+  leader?: string,
+  raftTerm?: string,
+  raftState?: 'leader'|'follower'|'candidate',
+  // dbSize actually reports process memory usage
+  dbSize: number,
+}
+```
+
 ### Websocket-based watch APIs
 
 Client-to-server message format:

package/antietcd.js

@@ -181,13 +181,13 @@ class AntiEtcd extends EventEmitter
                 if (e instanceof RequestError)
                 {
                     code = e.code;
-                    reply = e.message;
+                    reply = e.message+'\n';
                 }
                 else
                 {
                     console.error(e);
                     code = 500;
-                    reply = 'Internal error: '+e.message;
+                    reply = 'Internal error: '+e.message+'\n';
                 }
             }
             try
@@ -329,7 +329,7 @@ class AntiEtcd extends EventEmitter
             if ((e instanceof RequestError) && e.code == 404)
             {
                 throw new RequestError(404, 'Supported APIs: /v3/kv/txn, /v3/kv/range, /v3/kv/put, /v3/kv/deleterange, '+
-                    '/v3/lease/grant, /v3/lease/revoke, /v3/kv/lease/revoke, /v3/lease/keepalive');
+                    '/v3/lease/grant, /v3/lease/revoke, /v3/kv/lease/revoke, /v3/lease/keepalive, /v3/maintenance/status');
             }
             else
             {
@@ -345,7 +345,7 @@ class AntiEtcd extends EventEmitter
         {
             throw new RequestError(502, 'Server is stopping');
         }
-        if (path !== 'dump' && this.cluster)
+        if (this.cluster && path !== 'dump' && path != 'maintenance_status')
         {
             const res = await this.cluster.checkRaftState(
                 path,
@@ -428,7 +428,7 @@ class AntiEtcd extends EventEmitter
         {
             throw new RequestError(400, 'Watch not found');
         }
-        this.etctree.api_cancel_watch({ watch_id: mapped_id });
+        this.etctree.api_cancel_watch(mapped_id);
         delete this.api_watches[watch_id];
     }
 
@@ -476,6 +476,24 @@ class AntiEtcd extends EventEmitter
         return this.etctree.api_keepalive_lease(data);
     }
 
+    _handle_maintenance_status(data)
+    {
+        const raft = this.cluster && this.cluster.raft;
+        return {
+            header: {
+                member_id: this.cfg.node_id || undefined,
+                revision: this.etctree.mod_revision,
+                compact_revision: this.etctree.compact_revision || 0,
+                raft_term: raft && raft.term || undefined,
+            },
+            version: 'antietcd '+AntiEtcd.VERSION,
+            leader: raft && raft.leader || undefined,
+            raftTerm: raft && raft.term || undefined,
+            raftState: raft && raft.state || undefined,
+            dbSize: process.memoryUsage().heapUsed,
+        };
+    }
+
     // eslint-disable-next-line no-unused-vars
     _handle_dump(data)
     {
@@ -514,7 +532,7 @@ class AntiEtcd extends EventEmitter
             const mapped_id = client.watches[msg.cancel_request.watch_id];
             if (mapped_id)
             {
-                this.etctree.api_cancel_watch({ watch_id: mapped_id });
+                this.etctree.api_cancel_watch(mapped_id);
                 delete client.watches[msg.cancel_request.watch_id];
                 socket.send(JSON.stringify({ result: { header: { revision: this.etctree.mod_revision }, watch_id: msg.cancel_request.watch_id, canceled: true } }));
             }
@@ -542,11 +560,13 @@ class AntiEtcd extends EventEmitter
         for (const watch_id in this.clients[client_id].watches)
         {
             const mapped_id = this.clients[client_id].watches[watch_id];
-            this.etctree.api_cancel_watch({ watch_id: mapped_id });
+            this.etctree.api_cancel_watch(mapped_id);
         }
     }
 }
 
 AntiEtcd.RequestError = RequestError;
 
+AntiEtcd.VERSION = '1.0.7';
+
 module.exports = AntiEtcd;

package/package.json

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