Update notebook

Author: renkun-ken

R/client.R

@@ -1,8 +1,8 @@
-con <- socketConnection(host = "127.0.0.1", port = 8781, blocking = TRUE,
-  server = FALSE, open = "w", timeout = 86400)
-on.exit(close(con))
+con <- socketConnection(host = "127.0.0.1", port = 8708,
+  blocking = TRUE, server = FALSE, open = "r+")
 request <- list(time = format(Sys.time()), expr = "1+1")
 json <- jsonlite::toJSON(request, auto_unbox = TRUE)
 writeLines(json, con)
-response <- readLines(con)
+response <- readLines(con, n = 1)
 response
+close(con)

R/notebook.R

@@ -9,26 +9,21 @@ local({
 
   print(ls.str(env))
   while (TRUE) {
-    con <- try(socketConnection(host = "127.0.0.1", port = env$port,
+    con <- socketConnection(host = "127.0.0.1", port = env$port,
       blocking = TRUE, server = TRUE,
-      open = "r+", timeout = 86400L), silent = TRUE)
-    if (inherits(con, "try-error")) {
-      message(con, "\n")
-    } else {
-      tryCatch({
-        request <- jsonlite::fromJSON(readLines(con, n = 1))
-        cat(sprintf("[%s] %s\n",
-          request$time, request$expr))
-        expr <- parse(text = request$expr)
-        res <- try(eval(expr, globalenv()), silent = TRUE)
-        str <- list(
-          type = if (inherits(res, "try-error")) "error" else "output",
-          result = utils::capture.output(print(res))
-        )
-        writeLines(jsonlite::toJSON(str), con)
-      }, error = function(e) message(e, "\n"),
-      warning = function(w) message(w, "\n"),
-      finally = close(con))
-    }
+      open = "r+")
+    line <- readLines(con, n = 1)
+    request <- jsonlite::fromJSON(line)
+    cat(sprintf("[%s] %s\n",
+      request$time, request$expr))
+    expr <- parse(text = request$expr)
+    res <- try(eval(expr, globalenv()), silent = TRUE)
+    str <- list(
+      type = if (inherits(res, "try-error")) "error" else "output",
+      result = utils::capture.output(print(res))
+    )
+    result <- jsonlite::toJSON(str, force = TRUE)
+    writeLines(result, con)
+    close(con)
   }
 })

package-lock.json

@@ -566,6 +566,7 @@
     "datatables.net-fixedheader-jqui": "^3.1.7",
     "fotorama": "^4.6.4",
     "fs-extra": "^9.0.1",
+    "get-port": "^5.1.1",
     "jquery": "^3.5.1",
     "jquery.json-viewer": "^1.4.0",
     "popper.js": "^1.16.1",

package.json

@@ -99,7 +99,7 @@ class RNotebook implements vscode.Disposable {
   }
 
   public async eval(cell: vscode.NotebookCell): Promise<string> {
-    this.kernel.start();
+    await this.kernel.start();
     return this.kernel.eval(cell);
   }
 }