Use on-finished instead of override socket destroy

fixes #20

Author: dougwilson

HISTORY.md

@@ -1,6 +1,9 @@
 unreleased
 ==========
 
+  * Use `on-finished` instead of override socket destroy
+    - Addresses memory leaking on keep alive connections
+    - Ensures timers always get cleaned up
   * perf: enable strict mode
   * perf: remove argument reassignment
   * perf: use standard option existence check

LICENSE

@@ -1,7 +1,7 @@
 (The MIT License)
 
 Copyright (c) 2014 Jonathan Ong <[email protected]>
-Copyright (c) 2014 Douglas Christopher Wilson <[email protected]>
+Copyright (c) 2014-2015 Douglas Christopher Wilson <[email protected]>
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

index.js

@@ -1,7 +1,7 @@
 /*!
  * connect-timeout
  * Copyright(c) 2014 Jonathan Ong
- * Copyright(c) 2014 Douglas Christopher Wilson
+ * Copyright(c) 2014-2015 Douglas Christopher Wilson
  * MIT Licensed
  */
 
@@ -14,6 +14,7 @@
 var createError = require('http-errors');
 var debug = require('debug')('connect:timeout');
 var ms = require('ms');
+var onFinished = require('on-finished');
 var onHeaders = require('on-headers');
 
 /**
@@ -37,7 +38,6 @@ module.exports = function timeout(time, options) {
   var respond = opts.respond === undefined || opts.respond === true;
 
   return function(req, res, next) {
-    var destroy = req.socket.destroy;
     var id = setTimeout(function(){
       req.timedout = true;
       req.emit('timeout', delay);
@@ -51,14 +51,13 @@ module.exports = function timeout(time, options) {
       clearTimeout(id);
     };
 
-    req.socket.destroy = function(){
-      clearTimeout(id);
-      destroy.call(this);
-    };
-
     req.timedout = false;
 
-    onHeaders(res, function(){
+    onFinished(res, function () {
+      clearTimeout(id);
+    });
+
+    onHeaders(res, function () {
       clearTimeout(id);
     });
 

package.json

@@ -12,6 +12,7 @@
     "debug": "~2.2.0",
     "http-errors": "~1.3.1",
     "ms": "0.7.1",
+    "on-finished": "~2.3.0",
     "on-headers": "~1.0.0"
   },
   "devDependencies": {