(Why) is this working?

Author: ManuelHentschel

src/debugRuntime.ts

@@ -15,7 +15,7 @@ import { Subject } from './subject';
 import { logger } from './logging';
 
 export type LineHandler = (line: string, from: DataSource, isFullLine: boolean) => string;
-export type DapHandler = (dap: string) => string;
+export type DapHandler = (dap: Buffer) => Buffer;
 
 export type DataSource = 'stdout'|'stderr'|'dapSocket'|'sinkSocket'|'stdin';
 export type OutputMode = 'all'|'filtered'|'nothing';
@@ -125,15 +125,15 @@ export class DebugRuntime extends EventEmitter {
 		const tmpHandleLine: LineHandler = (line: string, from: DataSource, isFullLine: boolean) => {
 			return this.handleLine(line, from, isFullLine);
 		};
-		const tmpHandleDapString: DapHandler = (dap: string) => {
-			return this.handleDapString(dap);
+		const tmpHandleDapData: DapHandler = (dap: Buffer) => {
+			return this.handleDapData(dap);
 		};
 		const tmpEchoStdin = (text: string) => {
 			if(this.outputModes['stdin'] === 'all'){
 				setTimeout(() => this.writeOutput(text, false, 'stdout'), 0);
 			}
 		};
-		this.rSession = new RSession(tmpHandleLine, tmpHandleDapString, tmpEchoStdin);
+		this.rSession = new RSession(tmpHandleLine, tmpHandleDapData, tmpEchoStdin);
 		// check that the child process launched properly
 		const successTerminal = await this.rSession.startR(rStartupArguments);
 		if (!successTerminal) {
@@ -413,10 +413,10 @@ export class DebugRuntime extends EventEmitter {
 		};
 		this.dispatchRequest(request);
 	}
-
-	protected handleDapString(dap: string): string {
+	
+	protected handleDapData(dap: Buffer): Buffer {
 		while(dap.length > 0){
-			const m = /^Content-Length: (\d+)\r\n\r\n/.exec(dap);
+			const m = /^Content-Length: (\d+)\r\n\r\n/.exec(dap.toString('utf-8'));
 			if(!m){
 				break;
 			}
@@ -425,10 +425,11 @@ export class DebugRuntime extends EventEmitter {
 			if(dap.length < headerLength + contentLength){
 				break;
 			}
-			const jsonString = dap.substr(headerLength, contentLength);
+			const jsonString = dap.slice(headerLength, headerLength + contentLength).toString('utf-8');
+			// const jsonString = dap.substr(headerLength, contentLength);
 			const json = <{[key: string]: any}>JSON.parse(jsonString);
 			this.handleJson(json);
-			dap = dap.substr(headerLength + contentLength);
+			dap = dap.slice(headerLength + contentLength);
 		}
 		return dap;
 	}

src/rSession.ts

@@ -1,7 +1,7 @@
 
 
 import * as child from 'child_process';
-import { LineHandler, DapHandler, DataSource } from'./debugRuntime';
+import { LineHandler, DataSource, DapHandler } from'./debugRuntime';
 import { RStartupArguments } from './debugProtocolModifications';
 import { config, getPortNumber } from './utils';
 import * as net from 'net';
@@ -16,9 +16,10 @@ import kill = require('tree-kill');
 export class RSession {
     private cp?: child.ChildProcessWithoutNullStreams;
     private handleLine: LineHandler;
-    private handleDapString: DapHandler;
+    private handleDapData: DapHandler;
     private echoStdin: (text: string) => void;
     private restOfLine: {[k in DataSource]?: string} = {};
+    private restOfDap: Buffer = Buffer.from('');
 
     public ignoreOutput: boolean = false;
 
@@ -32,12 +33,12 @@ export class RSession {
 
     constructor(
         handleLine: LineHandler,
-        handleDapString: DapHandler,
+        handleDapData: DapHandler,
         echoStdin?: (text: string) => void
     ){
         // store line/json handlers (are called by this.handleData)
         this.handleLine = handleLine;
-        this.handleDapString = handleDapString;
+        this.handleDapData = handleDapData;
         this.echoStdin = echoStdin || ((text: string) => {/* dummy */});
     }
 
@@ -66,7 +67,7 @@ export class RSession {
         this.dapServer = net.createServer((socket) => {
             socket.on('data', (data) => {
                 this.handleData(data, 'dapSocket');
-                logger.log('dapOut', data);
+                logger.log('dapIn', data);
             });
             this.dapSocket = socket;
         });
@@ -138,22 +139,24 @@ export class RSession {
 
     public handleData(data: Buffer, from: DataSource): void{
 
-        let text: string = data.toString();
-        // text = text.replace(/\r/g,''); //keep only \n as linebreak
-        text = (this.restOfLine[from] || '') + text; // append to rest of line from previouse call
-        const lines = text.split(/\n/); // split into lines
-
         // logger.debug(`data from ${from}: ${text}`);
         // 
         if(from === 'dapSocket'){
-            const restOfLine = this.handleDapString(text);
-            this.restOfLine[from] = restOfLine;
+            data = Buffer.concat([this.restOfDap, data]);
+            const restOfLine = this.handleDapData(data);
+            this.restOfDap = restOfLine;
             return;
         }
 
+
+        let text: string = data.toString();
+        // text = text.replace(/\r/g,''); //keep only \n as linebreak
+        text = (this.restOfLine[from] || '') + text; // append to rest of line from previouse call
+        const lines = text.split(/\n/); // split into lines
+
         for(let i = 0; i<lines.length; i++){
-			// abort output handling if ignoreOutput has been set to true
-			// used to avoid handling remaining output after debugging has been stopped
+            // abort output handling if ignoreOutput has been set to true
+            // used to avoid handling remaining output after debugging has been stopped
             if(this.ignoreOutput){
                 return;
             }

test/R/objects.R

@@ -2,6 +2,8 @@
 
 # options(error = traceback)
 
+# options(vsc.doLogPrint = TRUE)
+
 options(vsc.matricesByRow = FALSE)
 options(vsc.dataFramesByRow = TRUE)
 
@@ -117,6 +119,7 @@ s3 <- "a"
 s4 <- 1 + 2i
 s5 <- TRUE
 s6 <- charToRaw("h")
+s7 <- 'öé'
 
 # ...
 fun <- function(x, y=x, ...) {