debugger: accommodate line chunking in Windows

PR-URL: #38161 Refs: https://github.com/nodejs/node/discussions/36481 Reviewed-By: Matteo Collina <[email protected]> Reviewed-By: Jan Krems <[email protected]> Reviewed-By: Colin Ihrig <[email protected]> Reviewed-By: Stephen Belanger <[email protected]> Reviewed-By: Gerhard Stöbich <[email protected]> Reviewed-By: Michaël Zasso <[email protected]>

Author: Trott

lib/internal/inspector/_inspect.js

@@ -97,8 +97,8 @@ function runScript(script, scriptArgs, inspectHost, inspectPort, childPrint){
 constchild=spawn(process.execPath,args);
 child.stdout.setEncoding('utf8');
 child.stderr.setEncoding('utf8');
-child.stdout.on('data',childPrint);
-child.stderr.on('data',childPrint);
+child.stdout.on('data',(chunk)=>childPrint(chunk,'stdout'));
+child.stderr.on('data',(chunk)=>childPrint(chunk,'stderr'));
 
 letoutput='';
 functionwaitForListenHint(text){
@@ -231,7 +231,7 @@ class NodeInspector{
 returnthis.client.connect(port,host)
 .then(()=>{
 debuglog('connection established');
-this.stdout.write(' ok');
+this.stdout.write(' ok\n');
 },(error)=>{
 debuglog('connect failed',error);
 // If it's failed to connect 10 times then print failed message
@@ -245,7 +245,7 @@ class NodeInspector{
 });
 };
 
-this.print(`connecting to ${host}:${port} ..`,true);
+this.print(`connecting to ${host}:${port} ..`,false);
 returnattemptConnect();
 });
 }
@@ -259,23 +259,32 @@ class NodeInspector{
 }
 }
 
-print(text,oneline=false){
+print(text,appendNewline=false){
 this.clearLine();
-this.stdout.write(oneline ? text : `${text}\n`);
+this.stdout.write(appendNewline ? `${text}\n` : text);
 }
 
-childPrint(text){
-this.print(
-text.toString()
-.split(/\r\n|\r|\n/g)
-.filter((chunk)=>!!chunk)
-.map((chunk)=>`< ${chunk}`)
-.join('\n')
-);
-if(!this.paused){
-this.repl.displayPrompt(true);
+ #stdioBuffers ={stdout: '',stderr: ''};
+childPrint(text,which){
+constlines=(this.#stdioBuffers[which]+text)
+.split(/\r\n|\r|\n/g);
+
+this.#stdioBuffers[which]='';
+
+if(lines[lines.length-1]!==''){
+this.#stdioBuffers[which]=lines.pop();
+}
+
+consttextToPrint=lines.map((chunk)=>`< ${chunk}`).join('\n');
+
+if(lines.length){
+this.print(textToPrint,true);
+if(!this.paused){
+this.repl.displayPrompt(true);
+}
 }
-if(/Waitingforthedebuggertodisconnect\.\.\.\n$/.test(text)){
+
+if(textToPrint.endsWith('Waiting for the debugger to disconnect...\n')){
 this.killChild();
 }
 }

lib/internal/inspector/inspect_repl.js

@@ -320,9 +320,9 @@ function createRepl(inspector){
 returnutil.inspect(value,INSPECT_OPTIONS);
 }
 
-functionprint(value,oneline=false){
+functionprint(value,addNewline=true){
 consttext=typeofvalue==='string' ? value : inspect(value);
-returninspector.print(text,oneline);
+returninspector.print(text,addNewline);
 }
 
 functiongetCurrentLocation(){
@@ -928,13 +928,13 @@ function createRepl(inspector){
 if(finished){
 print('Heap snaphost prepared.');
 }else{
-print(`Heap snapshot: ${done}/${total}`,true);
+print(`Heap snapshot: ${done}/${total}`,false);
 }
 }
 functiononChunk({ chunk }){
 sizeWritten+=chunk.length;
 writer.write(chunk);
-print(`Writing snapshot: ${sizeWritten}`,true);
+print(`Writing snapshot: ${sizeWritten}`,false);
 }
 functiononResolve(){
 writer.end(()=>{
@@ -956,7 +956,7 @@ function createRepl(inspector){
 HeapProfiler.on('reportHeapSnapshotProgress',onProgress);
 HeapProfiler.on('addHeapSnapshotChunk',onChunk);
 
-print('Heap snapshot: 0/0',true);
+print('Heap snapshot: 0/0',false);
 HeapProfiler.takeHeapSnapshot({reportProgress: true})
 .then(onResolve,onReject);
 });