Handle stack trace with function name

Author: tomdale

lib/tasks/fastboot-server.js

@@ -140,24 +140,31 @@ module.exports = CoreObject.extend({
       // Verify there's a second line with path information.
       // (First line is the error message itself.)
       if (stack[1]) {
-        // Extract path and line number information. An example line looks like:
+        // Extract path and line number information. An example line looks like either:
         //     at /Users/monegraph/Code/fastboot-test/dist/fastboot/vendor.js:65045:19
-        var match = stack[1].match(/\s*at ([^:]+):(\d+):(\d+)$/);
+        // or
+        //     at Module.callback (/Users/monegraph/Code/fastboot test/dist/fastboot/fastboot-test.js:23:31)
+        var match = stack[1].match(/\s*(?:at .* \(([^:]+):(\d+):(\d+)|at ([^:]+):(\d+):(\d+)$)/);
         if (match) {
+          var fileName = match[1] || match[4];
+          var lineNumber = match[2] || match[5];
+
           // Print file name and line number from the top of the stack. This is displayed
           // anyway, of course, but not everyone knows how to read a stack trace. This makes
           // it more obvious.
-          var badFilePath = path.relative(process.cwd(), match[1]);
-          preamble.push("Based on the stack trace, it looks like the exception was generated in " + badFilePath + " on line " + match[2] + ".");
-        }
-
-        // If the exception is coming from `vendor.js`, that usually means it's from an addon and thus may be
-        // out of the user's control. Give the user some instructions so they can try to figure out which
-        // addon is causing the problem.
-        if (match && match[1].substr(-9) === 'vendor.js') {
-          preamble.push("Because it's coming from vendor.js, an addon is most likely responsible for this error. You should look at this " +
-                        "file and line number to determine which addon is not yet FastBoot compatible.");
-
+          var badFilePath = path.relative(process.cwd(), fileName);
+          preamble.push("Based on the stack trace, it looks like the exception was generated in " + badFilePath + " on line " + lineNumber + ".");
+
+          // If the exception is coming from `vendor.js`, that usually means it's from an addon and thus may be
+          // out of the user's control. Give the user some instructions so they can try to figure out which
+          // addon is causing the problem.
+          if (fileName.substr(-9) === 'vendor.js') {
+            preamble.push("Because it's coming from vendor.js, an addon is most likely responsible for this error. You should look at this " +
+                          "file and line number to determine which addon is not yet FastBoot compatible.");
+
+          } else {
+            preamble.push("The exception is probably coming from your app. Look at this file and line number to determine what is triggering the exception.");
+          }
         }
       }