wtfnode - npm Package Compare versions

Comparing version 0.2.1 to 0.2.2

index.js

@@ -7,2 +7,7 @@ #!/usr/bin/env node
 
+function timerCallback(thing) {
+    if (typeof thing._onTimeout === 'function') { return '_onTimeout'; }
+    if (typeof thing._onImmediate === 'function') { return '_onImmediate'; }
+}
+
 // hook stuff
@@ -32,8 +37,8 @@ (function () {
     L.append = function (list, item) {
-        if (list instanceof Timer) {
-            if (item && typeof item._onTimeout === 'function') {
+        if (list instanceof Timer || (typeof list === 'object' && list.hasOwnProperty('_idleNext'))) {
+            if (item && timerCallback(item)) {
                 var stack = __stack;
                 for (var i = 5; i < stack.length; i++) {
                     if (/\//.test(stack[i].file)) {
-                        item._onTimeout.__callSite = stack[i];
+                        item[timerCallback(item)].__callSite = stack[i];
                         break;
@@ -86,2 +91,9 @@ }
 
+function getCallsite(fn) {
+    if (!fn.__callSite) {
+        console.warn('Unable to determine callsite for function "'+(fn.name.trim() || 'unknown')+'". Did you require `wtfnode` at the top of your entry point?');
+        return { file: 'unknown', line: 'unknown' };
+    }
+    return fn.__callSite;
+};
 
@@ -91,5 +103,8 @@ function dump() {
     
-    var sockets = [ ], servers = [ ], _timers = [ ], other = [ ];
+    var sockets = [ ], fds = [ ], servers = [ ], _timers = [ ], other = [ ];
     process._getActiveHandles().forEach(function (h) {
-        if (h instanceof Socket) { sockets.push(h); }
+        if (h instanceof Socket) {
+          if (h.fd) { fds.push(h); }
+          else { sockets.push(h); }
+        }
         else if (h instanceof Server) { servers.push(h); }
@@ -100,2 +115,13 @@ else if (h instanceof Timer) { _timers.push(h); }
     
+    if (fds.length) {
+        console.log('- File descriptors: (note: stdio won\'t keep your program running)');
+        fds.forEach(function (s) {
+            var str = '  - fd '+s.fd;
+            if (s.isTTY) { str += ' (tty)'; }
+            if (s._isStdio) { str += ' (stdio)'; }
+            if (s.destroyed) { str += ' (destroyed)'; }
+            console.log(str);
+        });
+    }
+
     if (sockets.length) {
@@ -113,3 +139,4 @@ console.log('- Sockets:');
                 connectListeners.forEach(function (fn) {
-                    console.log('      - %s: %s @ %s:%d', 'connect', fn.name || 'anonymous', fn.__callSite.file, fn.__callSite.line);
+                    var callSite = getCallsite(fn);
+                    console.log('      - %s: %s @ %s:%d', 'connect', fn.name || 'anonymous', callSite.file, callSite.line);
                 });
@@ -130,4 +157,4 @@ }
                 connectListeners.forEach(function (fn) {
-                    //console.log(fn.__fullStack);
-                    console.log('      - %s: %s @ %s:%d', 'connection', fn.name || 'anonymous', fn.__callSite.file, fn.__callSite.line);
+                    var callSite = getCallsite(fn);
+                    console.log('      - %s: %s @ %s:%d', 'connection', fn.name || 'anonymous', callSite.file, callSite.line);
                 });
@@ -140,12 +167,26 @@ }
     _timers.forEach(function (t) {
-        var timer = t;
-        while ((timer = timer._idleNext)) {
-            if (timer === t) {
-                break;
-            }
-            if (timer._onTimeout && timers.indexOf(t) === -1) {
-                timers.push(timer);
-            }
+        if (t._list) {
+            // node v5ish behavior
+            var timer = t._list;
+            do {
+                if (timerCallback(timer) && timers.indexOf(timer) === -1) {
+                    timers.push(timer);
+                }
+                timer = timer._idleNext;
+            } while (!timer.constructor || timer !== t._list);
+        } else {
+            // node 0.12ish behavior
+            _timers.forEach(function (t) {
+                var timer = t;
+                while ((timer = timer._idleNext)) {
+                    if (timer === t) {
+                        break;
+                    }
+                    if (timerCallback(timer) && timers.indexOf(timer) === -1) {
+                        timers.push(timer);
+                    }
+                }
+                
+            });
         }
-        
     });
@@ -157,4 +198,5 @@
         timers.forEach(function (t) {
-            var fn = t._onTimeout;
-            console.log('  - (%d ~ %s) %s @ %s:%d', t._idleTimeout, formatTime(t._idleTimeout), fn.name, fn.__callSite.file, fn.__callSite.line);
+            var fn = t._onTimeout,
+                callSite = getCallsite(fn);
+            console.log('  - (%d ~ %s) %s @ %s:%d', t._idleTimeout, formatTime(t._idleTimeout), fn.name, callSite.file, callSite.line);
         });
@@ -161,0 +203,0 @@ }

package.json

 {
   "name": "wtfnode",
-  "version": "0.2.1",
+  "version": "0.2.2",
   "description": "Utility to help find out why Node isn't exiting",
@@ -5,0 +5,0 @@ "repository": {

New alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Fixed alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Improved metrics

Total package byte prevSize

12033

increased by24.22%

Number of package files

7

increased by40%

Lines of code

226

increased by38.65%

No dependency changes