Update notebook2

Author: renkun-ken

R/notebook2.R

@@ -14,6 +14,30 @@ r <- callr::r_session$new(
   wait = TRUE
 )
 
+r$call(function() {
+  for (i in 1:1000) {
+    x <- rnorm(1000000)
+    y <- rnorm(1000000)
+    m <- lm(y ~ x)
+    summary(m)
+  }
+})
+r$interrupt()
+
+while (TRUE) {
+  res <- r$read()
+  if (!is.null(res)) {
+    print(res)
+    break
+  }
+}
+
+
+r$call(function() print(1))
+r$read()
+r$get_state()
+r$get_status()
+
 r$run(function() {
   requireNamespace("jsonlite")
   requireNamespace("svglite")
@@ -115,19 +139,32 @@ while (TRUE) {
     cat(content, "\n", sep = "")
 
     request <- jsonlite::fromJSON(content, simplifyVector = FALSE)
-    response <- tryCatch({
-      r$call(function(id, uri, expr) {
-        .vscNotebook$evaluate(id, uri, expr)
-      }, request)
-      NULL
-    }, error = function(e) {
-      list(
-        id = request$id,
-        uri = request$uri,
-        type = "error",
-        result = conditionMessage(e)
-      )
-    })
+    if (request$type == "eval") {
+      response <- tryCatch({
+        r$call(function(id, uri, expr) {
+          .vscNotebook$evaluate(id, uri, expr)
+        }, request)
+        NULL
+      }, error = function(e) {
+        list(
+          id = request$id,
+          uri = request$uri,
+          type = "error",
+          result = conditionMessage(e)
+        )
+      })
+    } else if (request$type == "cancel") {
+      if (r$interrupt()) {
+        response <- list(
+          id = request$id,
+          uri = request$uri,
+          type = "cancel",
+          result = "cancelled"
+        )
+      } else {
+
+      }
+    }
   }
 
   result <- r$read()

src/notebook.ts

@@ -4,10 +4,17 @@ import { spawn, ChildProcess } from 'child_process';
 import { dirname } from 'path';
 import * as fs from 'fs';
 
-interface REvalOutput {
+interface RSessionRequest {
   id: number;
   uri: string;
-  type: 'text' | 'plot' | 'viewer' | 'browser' | 'error' | 'cancelled';
+  type: 'eval' | 'cancel';
+  args: any;
+}
+
+interface RSessionResponse {
+  id: number;
+  uri: string;
+  type: 'text' | 'plot' | 'viewer' | 'browser' | 'error' | 'cancel';
   result: string;
 }
 
@@ -32,10 +39,9 @@ class RKernel {
     }
   }
 
-  private async handleResponse(response: REvalOutput) {
+  private async handleResponse(response: RSessionResponse) {
     const cell = this.doc.cells.find((cell) => cell.metadata.executionOrder == response.id);
     if (cell) {
-      cell.metadata.runnable = true;
       cell.metadata.runState = vscode.NotebookCellRunState.Success;
       cell.metadata.lastRunDuration = +new Date() - cell.metadata.runStartTime;
 
@@ -97,13 +103,6 @@ class RKernel {
         this.socket = socket;
         resolve(undefined);
 
-        socket.on('data', (chunk: Buffer) => {
-          const str = chunk.toString();
-          console.log(`socket (${socket.localAddress}:${socket.localPort}): ${str}`);
-          const response: REvalOutput = JSON.parse(str);
-          this.handleResponse(response);
-        });
-
         socket.on('end', () => {
           console.log('socket disconnected');
           this.socket = undefined;
@@ -150,10 +149,21 @@ class RKernel {
       this.request({
         id: cell.metadata.executionOrder,
         uri: cell.uri.toString(),
+        type: 'eval',
         expr: cell.document.getText(),
       });
     }
   }
+
+  public async cancel(cell: vscode.NotebookCell): Promise<void> {
+    if (this.socket && cell.metadata.runState === vscode.NotebookCellRunState.Running) {
+      this.request({
+        id: cell.metadata.executionOrder,
+        uri: cell.uri.toString(),
+        type: 'cancel',
+      })
+    }
+  }
 }
 
 class RNotebook implements vscode.Disposable {
@@ -369,9 +379,8 @@ export class RNotebookProvider implements vscode.NotebookContentProvider, vscode
       return;
     }
 
-    if (notebook) {
+    if (notebook && cell.metadata.runState !== vscode.NotebookCellRunState.Running) {
       try {
-        cell.metadata.runnable = false;
         cell.metadata.runState = vscode.NotebookCellRunState.Running;
         const start = +new Date();
         cell.metadata.runStartTime = start;