Update notebook2

Author: renkun-ken

R/notebook2.R

@@ -100,13 +100,15 @@ for (expr in exprs) {
 
 con <- socketConnection(host = "127.0.0.1", port = env$port, open = "r+b")
 
+request_id <- 0L
 while (TRUE) {
   if (socketSelect(list(con), timeout = 0)) {
     header <- readLines(con, 1, encoding = "UTF-8")
-    n <- as.integer(gsub("^Content-Length: (\\d+)$", "\\1", header))
+    n <- as.integer(gsub("^Content-Length\\: (\\d+)$", "\\1", header))
     content <- readChar(con, n, useBytes = TRUE)
     Encoding(content) <- "UTF-8"
-    print(content)
+    cat("request ", request_id, ": ", content, "\n", sep = "")
+    request_id <- request_id + 1L
   }
   Sys.sleep(0.1)
 }

src/notebook.ts

@@ -26,7 +26,7 @@ class RKernel {
   private request(obj: any) {
     if (this.socket) {
       const json = JSON.stringify(obj);
-      this.socket.write(`Content-Length: ${json.length}\n${json}\n`);
+      this.socket.write(`Content-Length: ${json.length}\n${json}`);
     }
   }
 
@@ -89,46 +89,50 @@ class RKernel {
   public async eval(cell: vscode.NotebookCell): Promise<REvalOutput> {
     if (this.socket) {
       this.request({
-        uri: cell.uri,
+        uri: cell.uri.toString(),
         time: Date.now(),
         expr: cell.document.getText(),
       });
     }
-    if (this.process) {
-      const client = net.createConnection({ host: '127.0.0.1', port: this.port }, () => {
-        console.log(`uri: ${cell.uri}, connect`);
-        const request = JSON.stringify({
-          time: Date.now(),
-          expr: cell.document.getText(),
-        }).concat('\n');
-        console.log(`uri: ${cell.uri}, write: ${request}`);
-        client.write(request);
-      });
-
-      client.on('end', () => {
-        console.log(`uri: ${cell.uri}, end`);
-      });
-
-      return new Promise((resolve, reject) => {
-        client.on('data', (data) => {
-          const response = data.toString();
-          console.log(`uri: ${cell.uri}, data: ${response}`);
-          client.end();
-          const output: REvalOutput = JSON.parse(response);
-          resolve(output);
-        });
-
-        client.on('error', (err) => {
-          console.log(`uri: ${cell.uri}, error: ${err.name}, ${err.message}`);
-          reject({
-            type: 'error',
-            result: [
-              err.message
-            ],
-          });
-        });
-      });
-    }
+    return {
+      type: 'text',
+      result: 'test',
+    };
+    // if (this.process) {
+    //   const client = net.createConnection({ host: '127.0.0.1', port: this.port }, () => {
+    //     console.log(`uri: ${cell.uri}, connect`);
+    //     const request = JSON.stringify({
+    //       time: Date.now(),
+    //       expr: cell.document.getText(),
+    //     }).concat('\n');
+    //     console.log(`uri: ${cell.uri}, write: ${request}`);
+    //     client.write(request);
+    //   });
+
+    //   client.on('end', () => {
+    //     console.log(`uri: ${cell.uri}, end`);
+    //   });
+
+    //   return new Promise((resolve, reject) => {
+    //     client.on('data', (data) => {
+    //       const response = data.toString();
+    //       console.log(`uri: ${cell.uri}, data: ${response}`);
+    //       client.end();
+    //       const output: REvalOutput = JSON.parse(response);
+    //       resolve(output);
+    //     });
+
+    //     client.on('error', (err) => {
+    //       console.log(`uri: ${cell.uri}, error: ${err.name}, ${err.message}`);
+    //       reject({
+    //         type: 'error',
+    //         result: [
+    //           err.message
+    //         ],
+    //       });
+    //     });
+    //   });
+    // }
   }
 }