fix(net): double callback

Author: Ryan Phillips

.luacheckrc

@@ -3,5 +3,4 @@ globals = {
   "p", "exports", "process", "args", "_ENV"
 }
 unused_args = false
-ignore = { "122" }
-
+ignore = { "122", "421", "422", "423", "431", "432", "433"  }

deps/http.lua

@@ -107,9 +107,9 @@ function ServerResponse:flushHeaders()
   self:writeHead(self.statusCode, self.headers)
 end
 
-function ServerResponse:write(chunk)
+function ServerResponse:write(chunk, callback)
   self:flushHeaders()
-  return self.socket:write(self.encode(chunk))
+  return self.socket:write(self.encode(chunk), callback)
 end
 
 function ServerResponse:finish(chunk)
@@ -120,11 +120,12 @@ function ServerResponse:finish(chunk)
   end
   last = last .. (self.encode("") or "")
   if #last > 0 then
-    self.socket:write(last)
-  end
-  self.socket:shutdown(function()
+    self.socket:write(last, function()
+      self.socket:_end()
+    end)
+  else
     self.socket:_end()
-  end)
+  end
 end
 
 function ServerResponse:writeHead(statusCode, headers)

deps/net.lua

@@ -94,12 +94,11 @@ function Socket:_write(data, callback)
   uv.write(self._handle, data, function(err)
     timer.active(self)
     if err then
-      callback(err)
       self:destroy(err)
-      return
+      return callback(err)
     end
+    callback()
   end)
-  callback()
 end
 
 function Socket:_read(n)

deps/url.lua

@@ -23,9 +23,9 @@ local querystring = require('querystring')
 function exports.parse(url, parseQueryString)
   local href = url
   local chunk, protocol = url:match("^(([a-z0-9+]+)://)")
+  local auth
   url = url:sub((chunk and #chunk or 0) + 1)
-
-  local chunk, auth = url:match('(([0-9a-zA-Z]+:?[0-9a-zA-Z]+)@)')
+  chunk, auth = url:match('(([0-9a-zA-Z]+:?[0-9a-zA-Z]+)@)')
   url = url:sub((chunk and #chunk or 0) + 1)
 
   local host = url:match("^([^/]+)")

make.bat

@@ -1,5 +1,5 @@
 @ECHO off
-@SET LIT_VERSION=1.0.3
+@SET LIT_VERSION=1.1.2
 
 IF NOT "x%1" == "x" GOTO :%1
 

tests/test-fs-readstream.lua

@@ -30,7 +30,7 @@ proident, sunt in culpa qui officia deserunt mollit anim id est laborum.]]
 
 
   test('fs.readstream length', function(expect)
-    local tmp_file = path.join(module.dir, 'test_readstream')
+    local tmp_file = path.join(module.dir, 'test_readstream1.txt')
     fs.writeFileSync(tmp_file, text)
 
     local options = {
@@ -60,7 +60,7 @@ proident, sunt in culpa qui officia deserunt mollit anim id est laborum.]]
   end)
 
   test('fs.readstream offset and length', function(expect)
-    local tmp_file = path.join(module.dir, 'test_readstream')
+    local tmp_file = path.join(module.dir, 'test_readstream2.txt')
     fs.writeFileSync(tmp_file, text)
 
     local options = {
@@ -90,7 +90,7 @@ proident, sunt in culpa qui officia deserunt mollit anim id est laborum.]]
   end)
 
   test('fs.readstream offset only', function(expect)
-    local tmp_file = path.join(module.dir, 'test_readstream')
+    local tmp_file = path.join(module.dir, 'test_readstream3.txt')
     fs.writeFileSync(tmp_file, text)
 
     local options = {

tests/test-http-post-1mb.lua

@@ -44,7 +44,6 @@ require('tap')(function(test)
         assert(postBuffer == data)
         response:write(data)
         response:finish()
-        server:close()
       end))
     end)
 
@@ -69,6 +68,7 @@ require('tap')(function(test)
         end))
         response:on('end', expect(function(data)
           p('Response ended')
+          server:close()
         end))
       end)
       req:write(data)

tests/test-http-stream-finish.lua

@@ -7,7 +7,6 @@ require('tap')(function(test)
       local body = "Hello world\n"
       res:on("finish", expect(function()
         p('sending resp finished')
-        server:close()
       end))
       res:writeHead(200, {
         ["Content-Type"] = "text/plain",
@@ -18,6 +17,7 @@ require('tap')(function(test)
     http.get('http://127.0.0.1:8080', expect(function(resp)
       resp:on('end', expect(function(data)
         p('Get response ended')
+        server:close()
       end))
     end))
   end)