1. fix watchdir delete not work (#35)

2. fix readdir kv.key not decode_base64
3. check if kv.value is exist

Author: DoubleSpout

lib/resty/etcd/v3.lua

@@ -20,7 +20,6 @@ local encode_base64 = ngx.encode_base64
 local decode_base64 = ngx.decode_base64
 local INIT_COUNT_RESIZE = 2e8
 
-
 local _M = {}
 
 
@@ -321,6 +320,7 @@ local function get(self, key, attr)
     if res.status==200 then
         if res.body.kvs and tab_nkeys(res.body.kvs)>0 then
             for _, kv in ipairs(res.body.kvs) do
+                kv.key = decode_base64(kv.key)
                 kv.value = decode_base64(kv.value)
                 kv.value = decode_json(kv.value)
             end
@@ -446,8 +446,10 @@ local function request_chunk(self, method, host, port, path, opts, timeout)
 
         if body.result.events then
             for _, event in ipairs(body.result.events) do
-                event.kv.value = decode_base64(event.kv.value)
-                event.kv.value = decode_json(event.kv.value)
+                if event.kv.value then   -- DELETE not have value
+                    event.kv.value = decode_base64(event.kv.value)
+                    event.kv.value = decode_json(event.kv.value)
+                end
                 event.kv.key = decode_base64(event.kv.key)
             end
         end

t/v3/key.t

@@ -174,6 +174,10 @@ timeout/
                 etcd:set("/wdir/a", "bcd4a")
             end)
 
+            ngx.timer.at(0.3, function ()
+                etcd:delete("/wdir/a")
+            end)
+
             local cur_time = ngx.now()
             local body_chunk_fun, err = etcd:watchdir("/wdir", {timeout = 1.5})
             if not body_chunk_fun then
@@ -204,6 +208,7 @@ GET /t
 qr/1:.*"created":true.*
 2:.*"value":"bcd4".*
 3:.*"value":"bcd4a".*
+4:.*"type":"DELETE".*
 timeout/
 --- timeout: 5