Add a launch.json option to capture output from stdoutput and stderr streams

package.json

@@ -339,6 +339,14 @@
                 "type": "boolean",
                 "description": "%node.showAsyncStacks.description%",
                 "default": true
+              },
+              "outputCapture": {
+                "enum": [
+                  "console",
+                  "std"
+                ],
+                "description": "%node.launch.outputCapture.description%",
+                "default": "console"
               }
             }
           },

package.nls.json

@@ -31,6 +31,7 @@
 	"node.launch.runtimeArgs.description": "Optional arguments passed to the runtime executable.",
 	"node.launch.env.description": "Environment variables passed to the program.",
 	"node.launch.envFile.description": "Absolute path to a file containing environment variable definitions.",
+	"node.launch.outputCapture.description": "Where to capture output messages: Console API, or stdout/stderr streams.",
 
 	"node.launch.config.name": "Launch",
 

src/nodeDebugAdapter.ts

@@ -44,6 +44,7 @@ export class NodeDebugAdapter extends ChromeDebugAdapter {
     private _waitingForEntryPauseEvent = true;
     private _finishedConfig = false;
     private _handlingEarlyNodeMsgs = true;
+    private _captureFromStd: boolean = false;
 
     private _supportsRunInTerminalRequest: boolean;
     private _restartMode: boolean;
@@ -134,6 +135,8 @@ export class NodeDebugAdapter extends ChromeDebugAdapter {
             }
         }
 
+        this._captureFromStd = args.outputCapture === 'std';
+
         return this.resolveProgramPath(programPath, args.sourceMaps).then<void>(resolvedProgramPath => {
             let program: string;
             let cwd = args.cwd;
@@ -295,8 +298,7 @@ export class NodeDebugAdapter extends ChromeDebugAdapter {
 
             // Must attach a listener to stdout or process will hang on Windows
             nodeProcess.stdout.on('data', (data: string) => {
-                // If only running, use stdout/stderr instead of debug protocol logs
-                if (noDebugMode) {
+                if (noDebugMode || this._captureFromStd) {
                     let msg = data.toString();
                     this._session.sendEvent(new OutputEvent(msg, 'stdout'));
                 }
@@ -335,7 +337,7 @@ export class NodeDebugAdapter extends ChromeDebugAdapter {
                 msg = msg.replace(helpMsg, '');
             }
 
-            if (this._handlingEarlyNodeMsgs || noDebugMode) {
+            if (this._handlingEarlyNodeMsgs || noDebugMode || this._captureFromStd) {
                 this._session.sendEvent(new OutputEvent(msg, 'stderr'));
             }
 
@@ -349,6 +351,10 @@ export class NodeDebugAdapter extends ChromeDebugAdapter {
         // Once any console API message is received, we are done listening to initial stderr output
         this._handlingEarlyNodeMsgs = false;
 
+        if (this._captureFromStd) {
+            return;
+        }
+
         // Strip the --debug-brk deprecation message which is printed at startup
         if (!params.args || params.args.length !== 1 || typeof params.args[0].value !== 'string' || !params.args[0].value.match(NodeDebugAdapter.DEBUG_BRK_DEP_MSG)) {
             super.onConsoleAPICalled(params);

src/nodeDebugInterfaces.d.ts

@@ -7,6 +7,8 @@ import * as Core from 'vscode-chrome-debug-core';
 
 type ConsoleType = "internalConsole" | "integratedTerminal" | "externalTerminal";
 
+type OutputCaptureType = "console" | "std";
+
 export interface ICommonRequestArgs extends Core.ICommonRequestArgs {
     stopOnEntry?: boolean;
     address?: string;
@@ -38,6 +40,8 @@ export interface ILaunchRequestArguments extends Core.ILaunchRequestArgs, ICommo
     console?: ConsoleType;
     /** Manually selected debugging port */
     port?: number;
+    /** Source of the debug output */
+    outputCapture?: OutputCaptureType;
 
     /** Logging options */
     diagnosticLogging?: boolean;