bugfix: watch body has '\n', may cause json decode err bug (#76)

Author: DoubleSpout

lib/resty/etcd/utils.lua

@@ -2,6 +2,7 @@
 local http          = require("resty.http")
 local clear_tab     = require("table.clear")
 local split         = require("ngx.re").split
+local find          = ngx.re.find
 local concat_tab    = table.concat
 local tostring      = tostring
 local select        = select
@@ -100,5 +101,9 @@ local function verify_key(key)
 end
 _M.verify_key = verify_key
 
+local function is_empty_str(input_str)
+    return (find(input_str or '', [=[^\s*$]=], "jo"))
+end
+_M.is_empty_str = is_empty_str
 
 return _M

lib/resty/etcd/v3.lua

@@ -513,11 +513,18 @@ local function request_chunk(self, method, host, port, path, opts, timeout)
         return nil, "failed to watch data, response code: " .. res.status
     end
 
+
     local function read_watch()
-        local body, err = res.body_reader()
 
-        if not body then
-            return nil, err
+        while(1) do
+            body, err = res.body_reader()
+            if not body then
+                return nil, err
+            end
+            if not utils.is_empty_str(body) then
+                break
+            end
+
         end
 
         body, err = decode_json(body)

t/normalize.t

@@ -43,6 +43,15 @@ __DATA__
             ifNotEqual(normalize('/path/../to/dir/../../../file'), '/file')
             ifNotEqual(normalize('path', '..', 'to', 'dir', '..', '..', '..', 'file'), '/file')
 
+            local is_empty_str = require("resty.etcd.utils").is_empty_str
+            ifNotEqual(not not is_empty_str("\n"), true)
+            ifNotEqual(not not is_empty_str("\n\n"), true)
+            ifNotEqual(not not is_empty_str("\r\n"), true)
+            ifNotEqual(not not is_empty_str("\t\n"), true)
+            ifNotEqual(not not is_empty_str("\t"), true)
+            ifNotEqual(not not is_empty_str("\t\t"), true)
+            ifNotEqual(not not is_empty_str("\r\t\n"), true)
+
             ngx.say("all done")
         }
     }

t/v2/dir.t

@@ -210,6 +210,7 @@ checked val as expect: b
             check_res(res, err, nil, nil, true)
 
             local cur_time = ngx.now()
+            ngx.update_time()
             local res2, err = etcd:wait("/dir", res.body.node.modifiedIndex + 1, 1)
             ngx.say("err: ", err, ", more than 1sec: ", ngx.now() - cur_time > 1)