From f46da7438d4810bee099bff2ba618774df30d539 Mon Sep 17 00:00:00 2001
From: Tal Hadad <thadad@istraresearch.com>
Date: Mon, 17 Jul 2023 20:34:28 +0300
Subject: [PATCH 01/28] wip: start working on connection to the requests by a
 tcp server. Fixes #1359

---
 R/session/init.R                   |   2 +-
 R/session/vsc.R                    |  83 ++++++---
 package.json                       |   1 +
 src/extension.ts                   |   5 +
 src/liveShare/index.ts             |   1 -
 src/liveShare/shareSession.ts      |  21 ++-
 src/session.ts                     | 278 +++++++++++++++++++----------
 src/{liveShare => }/virtualDocs.ts |   0
 yarn.lock                          |  39 ++++
 9 files changed, 305 insertions(+), 125 deletions(-)
 rename src/{liveShare => }/virtualDocs.ts (100%)

diff --git a/R/session/init.R b/R/session/init.R
index b44cc6c96..ffe71a5e2 100644
--- a/R/session/init.R
+++ b/R/session/init.R
@@ -95,7 +95,7 @@ init_last <- function() {
   )
 
   # Attach to vscode
-  exports$.vsc.attach()
+  #exports$.vsc.attach()
 
   invisible()
 }
diff --git a/R/session/vsc.R b/R/session/vsc.R
index 5a13f993b..27e9a94bb 100644
--- a/R/session/vsc.R
+++ b/R/session/vsc.R
@@ -8,6 +8,7 @@ dir_watcher <- Sys.getenv("VSCODE_WATCHER_DIR", file.path(homedir, ".vscode-R"))
 request_file <- file.path(dir_watcher, "request.log")
 request_lock_file <- file.path(dir_watcher, "request.lock")
 settings_file <- file.path(dir_watcher, "settings.json")
+request_tcp_connection <- NA
 user_options <- names(options())
 
 logger <- if (getOption("vsc.debug", FALSE)) {
@@ -208,9 +209,12 @@ request <- function(command, ...) {
     command = command,
     ...
   )
-  jsonlite::write_json(obj, request_file,
-    auto_unbox = TRUE, null = "null", force = TRUE)
-  cat(get_timestamp(), file = request_lock_file)
+  request_target <- if (is.na(request_tcp_connection)) request_file else request_tcp_connection
+  jsonlite::write_json(obj, request_target,
+    auto_unbox = TRUE, na = "string", null = "null", force = TRUE)
+  if (is.na(request_tcp_connection)) {
+    cat(get_timestamp(), file = request_lock_file)
+  }
 }
 
 try_catch_timeout <- function(expr, timeout = Inf, ...) {
@@ -369,8 +373,12 @@ update_workspace <- function(...) {
       loaded_namespaces = loadedNamespaces(),
       globalenv = if (show_globalenv) inspect_env(.GlobalEnv, globalenv_cache) else NULL
     )
-    jsonlite::write_json(data, workspace_file, force = TRUE, pretty = FALSE)
-    cat(get_timestamp(), file = workspace_lock_file)
+    if (is.na(request_tcp_connection)) {
+      jsonlite::write_json(data, workspace_file, force = TRUE, pretty = FALSE)
+      cat(get_timestamp(), file = workspace_lock_file)
+    } else {
+      request("updateWorkspace", workspaceData = data)
+    }
   }, error = message)
   TRUE
 }
@@ -419,6 +427,7 @@ if (use_httpgd && "httpgd" %in% .packages(all.available = TRUE)) {
     }
   )
 
+  # TODO: Make this be available by TCP only as well
   update_plot <- function(...) {
     tryCatch({
       if (plot_updated && check_null_dev()) {
@@ -595,47 +604,64 @@ if (show_view) {
         )
       }
     }
+    send_data_request <- function(data, source, type, ...) {
+      if (is.na(request_tcp_connection)) {
+        file <- tempfile(tmpdir = tempdir, ...)
+        if (type == "json") {
+          jsonlite::write_json(data, file, na = "string", null = "null", auto_unbox = TRUE, force = TRUE)
+        } else {
+          writeLines(code, file)
+        }
+        request("dataview", source = source, type = type,
+          title = title, file = file, viewer = viewer, uuid = uuid)
+      } else {
+        request("dataview", source = source, type = type,
+          title = title, data = data, viewer = viewer, uuid = uuid)
+      }
+    }
     if (is.data.frame(x) || is.matrix(x)) {
       x <- as_truncated_data(x)
       data <- dataview_table(x)
-      file <- tempfile(tmpdir = tempdir, fileext = ".json")
-      jsonlite::write_json(data, file, na = "string", null = "null", auto_unbox = TRUE, force = TRUE)
-      request("dataview", source = "table", type = "json",
-        title = title, file = file, viewer = viewer, uuid = uuid)
+      send_data_request(data, source = "table", type = "json", fileext = ".json")
     } else if (is.list(x)) {
       tryCatch({
-        file <- tempfile(tmpdir = tempdir, fileext = ".json")
-        jsonlite::write_json(x, file, na = "string", null = "null", auto_unbox = TRUE, force = TRUE)
-        request("dataview", source = "list", type = "json",
-          title = title, file = file, viewer = viewer, uuid = uuid)
+        send_data_request(x, source = "list", type = "json", fileext = ".json")
       }, error = function(e) {
-        file <- file.path(tempdir, paste0(make.names(title), ".txt"))
         text <- utils::capture.output(print(x))
-        writeLines(text, file)
-        request("dataview", source = "object", type = "txt",
-          title = title, file = file, viewer = viewer, uuid = uuid)
+        send_data_request(text, source = "object", type = "txt", paste0(make.names(title)), fileext = ".txt")
       })
     } else {
-      file <- file.path(tempdir, paste0(make.names(title), ".R"))
       if (is.primitive(x)) {
         code <- utils::capture.output(print(x))
       } else {
         code <- deparse(x)
       }
-      writeLines(code, file)
-      request("dataview", source = "object", type = "R",
-        title = title, file = file, viewer = viewer, uuid = uuid)
+      send_data_request(code, source = "object", type = "R", paste0(make.names(title)), fileext = ".R")
     }
   }
 
   rebind("View", show_dataview, "utils")
 }
 
-attach <- function() {
+attach <- function(host = "127.0.0.1", port = NA) {
   load_settings()
   if (rstudioapi_enabled()) {
     rstudioapi_util_env$update_addin_registry(addin_registry)
   }
+  if (!is.na(request_tcp_connection)) {
+    close(request_tcp_connection)
+    request_tcp_connection <<- NA
+  }
+  if (!is.na(port)) {
+    request_tcp_connection <<- socketConnection(
+      host = host,
+      port = port,
+      blocking = TRUE,
+      server = FALSE,
+      open = "a+"
+    )
+  }
+  parent <- parent.env(environment())
   request("attach",
     version = sprintf("%s.%s", R.version$major, R.version$minor),
     tempdir = tempdir,
@@ -646,9 +672,9 @@ attach <- function() {
     ),
     plot_url = if (identical(names(dev.cur()), "httpgd")) httpgd::hgd_url(),
     server = if (use_webserver) list(
-      host = host,
-      port = port,
-      token = token
+      host = parent$host,
+      port = parent$port,
+      token = parent$token
     ) else NULL
   )
 }
@@ -929,4 +955,9 @@ print.hsearch <- function(x, ...) {
   invisible(NULL)
 }
 
-reg.finalizer(.GlobalEnv, function(e) .vsc$request("detach"), onexit = TRUE)
+reg.finalizer(.GlobalEnv, function(e) {
+  .vsc$request("detach")
+  if (!is.na(request_tcp_connection)) {
+    close(request_tcp_connection)
+  }
+}, onexit = TRUE)
diff --git a/package.json b/package.json
index 23c830459..3f914e6b7 100644
--- a/package.json
+++ b/package.json
@@ -2157,6 +2157,7 @@
     "jquery.json-viewer": "^1.5.0",
     "js-yaml": "^4.1.0",
     "node-fetch": "^2.6.7",
+    "promise-socket": "^7.0.0",
     "vscode-languageclient": "^8.1.0",
     "vsls": "^1.0.4753",
     "winreg": "^1.2.4"
diff --git a/src/extension.ts b/src/extension.ts
index c994d9a46..fe40910c8 100644
--- a/src/extension.ts
+++ b/src/extension.ts
@@ -24,6 +24,7 @@ import * as rShare from './liveShare';
 import * as httpgdViewer from './plotViewer';
 import * as languageService from './languageService';
 import { RTaskProvider } from './tasks';
+import { docProvider, docScheme } from './virtualDocs';
 
 
 // global objects used in other files
@@ -45,6 +46,10 @@ export async function activate(context: vscode.ExtensionContext): Promise<apiImp
         void vscode.commands.executeCommand('workbench.extensions.search', '@installed R Tools');
     }
 
+    context.subscriptions.push(
+        vscode.workspace.registerTextDocumentContentProvider(docScheme, docProvider)
+    );
+
     // create a new instance of RExtensionImplementation
     // is used to export an interface to the help panel
     // this export is used e.g. by vscode-r-debugger to show the help panel from within debug sessions
diff --git a/src/liveShare/index.ts b/src/liveShare/index.ts
index e18305693..423905d5a 100644
--- a/src/liveShare/index.ts
+++ b/src/liveShare/index.ts
@@ -2,7 +2,6 @@
 export * from './shareCommands';
 export * from './shareSession';
 export * from './shareTree';
-export * from './virtualDocs';
 
 import * as vscode from 'vscode';
 import * as vsls from 'vsls';
diff --git a/src/liveShare/shareSession.ts b/src/liveShare/shareSession.ts
index d11b930e0..634839002 100644
--- a/src/liveShare/shareSession.ts
+++ b/src/liveShare/shareSession.ts
@@ -6,7 +6,6 @@ import { asViewColumn, config, readContent } from '../util';
 import { showBrowser, showDataView, showWebView, WorkspaceData } from '../session';
 import { liveSession, UUID, rGuestService, _sessionStatusBarItem as sessionStatusBarItem } from '.';
 import { autoShareBrowser } from './shareTree';
-import { docProvider, docScheme } from './virtualDocs';
 
 // Workspace Vars
 let guestPid: string;
@@ -19,7 +18,7 @@ let info: IRequest['info'];
 // Used to keep track of shared browsers
 export const browserDisposables: { Disposable: vscode.Disposable, url: string, name: string }[] = [];
 
-export interface IRequest {
+export type IRequest = {
     command: string;
     time?: string;
     pid?: string;
@@ -30,6 +29,7 @@ export interface IRequest {
     file?: string;
     viewer?: string;
     plot?: string;
+    workspaceData?: WorkspaceData;
     action?: string;
     args?: unknown;
     sd?: string;
@@ -43,7 +43,17 @@ export interface IRequest {
         command: string,
         start_time: string
     };
-}
+} & (
+    {
+        coomad: 'dataview';
+        type: 'json';
+        data: object;
+    } | {
+        coomad: 'dataview';
+        type: 'txt' | 'R';
+        data: string;
+    }
+)
 
 export function initGuest(context: vscode.ExtensionContext): void {
     // create status bar item that contains info about the *guest* session watcher
@@ -54,8 +64,7 @@ export function initGuest(context: vscode.ExtensionContext): void {
     sessionStatusBarItem.tooltip = 'Click to attach to host terminal';
     sessionStatusBarItem.show();
     context.subscriptions.push(
-        sessionStatusBarItem,
-        vscode.workspace.registerTextDocumentContentProvider(docScheme, docProvider)
+        sessionStatusBarItem
     );
     rGuestService?.setStatusBarItem(sessionStatusBarItem);
     guestResDir = path.join(context.extensionPath, 'dist', 'resources');
@@ -149,7 +158,7 @@ export async function updateGuestRequest(file: string, force: boolean = false):
                 if (request.source && request.type && request.title && request.file
                     && request.viewer !== undefined) {
                     await showDataView(request.source,
-                        request.type, request.title, request.file, request.viewer);
+                        request.type, request.title, request.file, request.data, request.viewer);
                 }
                 break;
             }
diff --git a/src/session.ts b/src/session.ts
index b5959019a..ebc5ea8f2 100644
--- a/src/session.ts
+++ b/src/session.ts
@@ -4,6 +4,8 @@ import * as fs from 'fs-extra';
 import * as os from 'os';
 import * as path from 'path';
 import { Agent } from 'http';
+import { AddressInfo, Server, Socket } from 'node:net';
+import { PromiseSocket } from 'promise-socket';
 import fetch from 'node-fetch';
 import { commands, StatusBarItem, Uri, ViewColumn, Webview, window, workspace, env, WebviewPanelOnDidChangeViewStateEvent, WebviewPanel } from 'vscode';
 
@@ -14,7 +16,8 @@ import { purgeAddinPickerItems, dispatchRStudioAPICall } from './rstudioapi';
 
 import { IRequest } from './liveShare/shareSession';
 import { homeExtDir, rWorkspace, globalRHelp, globalHttpgdManager, extensionContext, sessionStatusBarItem } from './extension';
-import { UUID, rHostService, rGuestService, isLiveShare, isHost, isGuestSession, closeBrowser, guestResDir, shareBrowser, openVirtualDoc, shareWorkspace } from './liveShare';
+import { UUID, rHostService, rGuestService, isLiveShare, isHost, isGuestSession, closeBrowser, guestResDir, shareBrowser, shareWorkspace } from './liveShare';
+import { openVirtualDoc } from './virtualDocs';
 
 export interface GlobalEnv {
     [key: string]: {
@@ -49,6 +52,7 @@ let requestTimeStamp: number;
 let responseTimeStamp: number;
 export let sessionDir: string;
 export let workingDir: string;
+let incomingRequestServerConnected = false;
 let rVer: string;
 let pid: string;
 // eslint-disable-next-line @typescript-eslint/no-explicit-any
@@ -95,6 +99,9 @@ export function startRequestWatcher(sessionStatusBarItem: StatusBarItem): void {
     fs.watch(requestLockFile, {}, () => {
         void updateRequest(sessionStatusBarItem);
     });
+
+    void startIncomingRequestServer('0.0.0.0', sessionStatusBarItem);// TODO: Make it more configurable
+
     console.info('[startRequestWatcher] Done');
 }
 
@@ -334,8 +341,21 @@ export async function showWebView(file: string, title: string, viewer: string |
     console.info('[showWebView] Done');
 }
 
-export async function showDataView(source: string, type: string, title: string, file: string, viewer: string): Promise<void> {
+export async function showDataView(source: string, type: string, title: string, file: string | undefined, data: string | object | undefined, viewer: string): Promise<void> {
     console.info(`[showDataView] source: ${source}, type: ${type}, title: ${title}, file: ${file}, viewer: ${viewer}`);
+    console.debug(`data: ${JSON.stringify(data)}`);
+
+    const getDataContent = async () : Promise<string | undefined> => {
+        if (file === undefined) {
+            return typeof data == "string" ? data : JSON.stringify(data);
+        } else {
+            const fileContent = await readContent(file, 'utf8');
+            if (fileContent == null) {
+                console.error("Error: File wasn't found!");
+                return undefined;
+            }
+        }
+    };
 
     if (isGuestSession) {
         resDir = guestResDir;
@@ -353,7 +373,8 @@ export async function showDataView(source: string, type: string, title: string,
                 retainContextWhenHidden: true,
                 localResourceRoots: [Uri.file(resDir)],
             });
-        const content = await getTableHtml(panel.webview, file);
+        const fileContent = await getDataContent();
+        const content = await getTableHtml(panel.webview, fileContent!);
         panel.iconPath = new UriIcon('open-preview');
         panel.webview.html = content;
     } else if (source === 'list') {
@@ -368,14 +389,15 @@ export async function showDataView(source: string, type: string, title: string,
                 retainContextWhenHidden: true,
                 localResourceRoots: [Uri.file(resDir)],
             });
-        const content = await getListHtml(panel.webview, file);
+        const fileContent = await getDataContent();
+        const content = await getListHtml(panel.webview, fileContent!);
         panel.iconPath = new UriIcon('open-preview');
         panel.webview.html = content;
     } else {
-        if (isGuestSession) {
-            const fileContent = await rGuestService?.requestFileContent(file, 'utf8');
+        if (isGuestSession || file === undefined) {
+            const fileContent = file === undefined ? data as string : await rGuestService?.requestFileContent(file, 'utf8');
             if (fileContent) {
-                await openVirtualDoc(file, fileContent, true, true, ViewColumn[viewer as keyof typeof ViewColumn]);
+                await openVirtualDoc(file ?? "R View", fileContent, true, true, ViewColumn[viewer as keyof typeof ViewColumn]);
             }
         } else {
             await commands.executeCommand('vscode.open', Uri.file(file), {
@@ -388,10 +410,9 @@ export async function showDataView(source: string, type: string, title: string,
     console.info('[showDataView] Done');
 }
 
-export async function getTableHtml(webview: Webview, file: string): Promise<string> {
+export async function getTableHtml(webview: Webview, content: string): Promise<string> {
     resDir = isGuestSession ? guestResDir : resDir;
     const pageSize = config().get<number>('session.data.pageSize', 500);
-    const content = await readContent(file, 'utf8');
     return `
 <!DOCTYPE html>
 <html lang="en">
@@ -512,7 +533,7 @@ export async function getTableHtml(webview: Webview, file: string): Promise<stri
             }
         }
     };
-    const data = ${String(content)};
+    const data = ${content};
     const gridOptions = {
         defaultColDef: {
             sortable: true,
@@ -575,9 +596,8 @@ export async function getTableHtml(webview: Webview, file: string): Promise<stri
 `;
 }
 
-export async function getListHtml(webview: Webview, file: string): Promise<string> {
+export async function getListHtml(webview: Webview, content: string): Promise<string> {
     resDir = isGuestSession ? guestResDir : resDir;
-    const content = await readContent(file, 'utf8');
 
     return `
 <!doctype HTML>
@@ -629,7 +649,7 @@ export async function getListHtml(webview: Webview, file: string): Promise<strin
     }
     </style>
     <script>
-    var data = ${String(content)};
+    var data = ${content};
     $(document).ready(function() {
       var options = {
         collapsed: false,
@@ -754,84 +774,7 @@ async function updateRequest(sessionStatusBarItem: StatusBarItem) {
         const request = JSON.parse(requestContent) as ISessionRequest;
         if (request.wd && isFromWorkspace(request.wd)) {
             if (request.uuid === null || request.uuid === undefined || request.uuid === UUID) {
-                switch (request.command) {
-                    case 'help': {
-                        if (globalRHelp && request.requestPath) {
-                            console.log(request.requestPath);
-                            await globalRHelp.showHelpForPath(request.requestPath, request.viewer);
-                        }
-                        break;
-                    }
-                    case 'httpgd': {
-                        if (request.url) {
-                            await globalHttpgdManager?.showViewer(request.url);
-                        }
-                        break;
-                    }
-                    case 'attach': {
-                        if (!request.tempdir || !request.wd) {
-                            return;
-                        }
-                        rVer = String(request.version);
-                        pid = String(request.pid);
-                        info = request.info;
-                        sessionDir = path.join(request.tempdir, 'vscode-R');
-                        workingDir = request.wd;
-                        console.info(`[updateRequest] attach PID: ${pid}`);
-                        sessionStatusBarItem.text = `R ${rVer}: ${pid}`;
-                        // eslint-disable-next-line @typescript-eslint/restrict-template-expressions, @typescript-eslint/no-unsafe-member-access
-                        sessionStatusBarItem.tooltip = `${info?.version}\nProcess ID: ${pid}\nCommand: ${info?.command}\nStart time: ${info?.start_time}\nClick to attach to active terminal.`;
-                        sessionStatusBarItem.show();
-                        updateSessionWatcher();
-
-                        if (request.server) {
-                            server = request.server;
-                        }
-
-                        purgeAddinPickerItems();
-                        await setContext('rSessionActive', true);
-                        if (request.plot_url) {
-                            await globalHttpgdManager?.showViewer(request.plot_url);
-                        }
-                        void watchProcess(pid).then((v: string) => {
-                            void cleanupSession(v);
-                        });
-                        break;
-                    }
-                    case 'detach': {
-                        if (request.pid) {
-                            await cleanupSession(request.pid);
-                        }
-                        break;
-                    }
-                    case 'browser': {
-                        if (request.url && request.title && request.viewer !== undefined) {
-                            await showBrowser(request.url, request.title, request.viewer);
-                        }
-                        break;
-                    }
-                    case 'webview': {
-                        if (request.file && request.title && request.viewer !== undefined) {
-                            await showWebView(request.file, request.title, request.viewer);
-                        }
-                        break;
-                    }
-                    case 'dataview': {
-                        if (request.source && request.type && request.file && request.title && request.viewer !== undefined) {
-                            await showDataView(request.source,
-                                request.type, request.title, request.file, request.viewer);
-                        }
-                        break;
-                    }
-                    case 'rstudioapi': {
-                        if (request.action && request.args && request.sd) {
-                            await dispatchRStudioAPICall(request.action, request.args, request.sd);
-                        }
-                        break;
-                    }
-                    default:
-                        console.error(`[updateRequest] Unsupported command: ${request.command}`);
-                }
+                await processRequest(request, null, sessionStatusBarItem);
             }
         } else {
             console.info(`[updateRequest] Ignored request outside workspace`);
@@ -842,6 +785,159 @@ async function updateRequest(sessionStatusBarItem: StatusBarItem) {
     }
 }
 
+function startIncomingRequestServer(ip: string, sessionStatusBarItem: StatusBarItem) {
+    console.info("Test Here")
+    const incomingRequestServer = new Server(async (socket: Socket) => {
+        if (incomingRequestServerConnected) {
+            // TODO: Add some details (ip+port) of the incoming connection
+            console.error('A new connection to the incoming request server tries to connect but another connection currently connected!');
+            return;
+        }
+
+        console.info('A new connection to the incoming request server has been established.');
+        incomingRequestServerConnected = true;
+        // TODO: Handle correct status bar update
+    
+        const promiseSocket = new PromiseSocket(socket);
+
+        console.info("Waiting for TCP input...")
+    
+        // TODO: Handle Exceptions
+        let contentToProcess = "";
+        while (true) {
+            const currentChunk = await promiseSocket.read();
+            console.info("Got something")
+            if (currentChunk === undefined) {
+                console.info("Should close the socket now")
+                // The end of the socket
+    
+                // TODO: Verify a correct detach!
+                // TODO: Verify that `contentToProcess` is empty!
+                incomingRequestServerConnected = false;
+                return;
+            }
+            // otherwise
+    
+            contentToProcess = contentToProcess + currentChunk;
+    
+            const requests = contentToProcess.split((/\r?\n/));
+            for (let i = 0; i < requests.length - 1; ++i) {
+                const requestContent = requests[i];
+
+                console.info(`TCP Request received from client: ${requestContent}.`);
+                console.info(`TCP request: ${requestContent}`);
+                const request = JSON.parse(requestContent) as ISessionRequest;
+                await processRequest(request, socket, sessionStatusBarItem);
+            }
+            contentToProcess = requests[requests.length - 1];
+        }
+    });
+    console.info("Test After")
+
+    const server = incomingRequestServer.listen(0, ip, function() {
+        const addressInfo = server.address() as AddressInfo;
+        console.info(`Started listening on ${addressInfo.address}:${addressInfo.port}`);
+    });
+
+    return server;
+}
+
+export async function processRequest(request: ISessionRequest, socket: Socket | null, sessionStatusBarItem: StatusBarItem) {
+    switch (request.command) {
+        case 'help': {
+            if (globalRHelp && request.requestPath) {
+                console.log(request.requestPath);
+                await globalRHelp.showHelpForPath(request.requestPath, request.viewer);
+            }
+            break;
+        }
+        case 'httpgd': {
+            if (request.url) {
+                await globalHttpgdManager?.showViewer(request.url);
+            }
+            break;
+        }
+        case 'updateWorkspace' : {
+            if (request.workspaceData == null) {
+                console.error("[updateRequest] workspaceData is not set!")
+                return;
+            }
+
+            workspaceData = request.workspaceData;
+            void rWorkspace?.refresh();
+
+            break;
+        }
+        case 'attach': {
+            if (!request.tempdir || !request.wd) {
+                return;
+            }
+            rVer = String(request.version);
+            pid = String(request.pid);
+            info = request.info;
+            sessionDir = path.join(request.tempdir, 'vscode-R');
+            workingDir = request.wd;
+            console.info(`[updateRequest] attach PID: ${pid}`);
+            sessionStatusBarItem.text = `R ${rVer}: ${pid}`;
+            // eslint-disable-next-line @typescript-eslint/restrict-template-expressions, @typescript-eslint/no-unsafe-member-access
+            sessionStatusBarItem.tooltip = `${info?.version}\nProcess ID: ${pid}\nCommand: ${info?.command}\nStart time: ${info?.start_time}\nClick to attach to active terminal.`;
+            sessionStatusBarItem.show();
+            if (socket == null) {
+                updateSessionWatcher();
+            }
+
+            if (request.server) {
+                server = request.server;
+            }
+
+            purgeAddinPickerItems();
+            await setContext('rSessionActive', true);
+            if (request.plot_url) {
+                await globalHttpgdManager?.showViewer(request.plot_url);
+            }
+            if (socket == null) {
+                void watchProcess(pid).then((v: string) => {
+                    void cleanupSession(v);
+                });
+            }
+            break;
+        }
+        case 'detach': {// Only on filesystem based session?
+            if (request.pid) {
+                await cleanupSession(request.pid);
+            }
+            break;
+        }
+        case 'browser': {
+            if (request.url && request.title && request.viewer !== undefined) {
+                await showBrowser(request.url, request.title, request.viewer);
+            }
+            break;
+        }
+        case 'webview': {
+            if (request.file && request.title && request.viewer !== undefined) {
+                await showWebView(request.file, request.title, request.viewer);
+            }
+            break;
+        }
+        case 'dataview': {
+            if (request.source && request.type && (request.file || request.data) && request.title && request.viewer !== undefined) {
+                await showDataView(request.source,
+                    request.type, request.title, request.file, request.data, request.viewer);
+            }
+            break;
+        }
+        case 'rstudioapi': {
+            if (request.action && request.args && request.sd) {
+                await dispatchRStudioAPICall(request.action, request.args, request.sd);
+            }
+            break;
+        }
+        default:
+            console.error(`[updateRequest] Unsupported command: ${request.command}`);
+    }
+}
+
 export async function cleanupSession(pidArg: string): Promise<void> {
     if (pid === pidArg) {
         if (sessionStatusBarItem) {
diff --git a/src/liveShare/virtualDocs.ts b/src/virtualDocs.ts
similarity index 100%
rename from src/liveShare/virtualDocs.ts
rename to src/virtualDocs.ts
diff --git a/yarn.lock b/yarn.lock
index 5ce56fb37..bb151d94e 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1009,6 +1009,11 @@ copy-webpack-plugin@^9.0.0:
     schema-utils "^3.0.0"
     serialize-javascript "^5.0.1"
 
+core-js@^3.6.5:
+  version "3.31.1"
+  resolved "https://registry.yarnpkg.com/core-js/-/core-js-3.31.1.tgz#f2b0eea9be9da0def2c5fece71064a7e5d687653"
+  integrity sha512-2sKLtfq1eFST7l7v62zaqXacPc7uG8ZAya8ogijLhTtaKNcpzpB4TMoTw2Si+8GYKRwFPMMtUT0263QFWFfqyQ==
+
 core-util-is@~1.0.0:
   version "1.0.3"
   resolved "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.3.tgz"
@@ -2373,6 +2378,35 @@ progress@^2.0.0:
   resolved "https://registry.npmjs.org/progress/-/progress-2.0.3.tgz"
   integrity sha512-7PiHtLll5LdnKIMw100I+8xJXR5gW2QwWYkT6iJva0bXitZKa/XMrSbdmg3r2Xnaidz9Qumd0VPaMrZlF9V9sA==
 
+promise-duplex@^6.0.0:
+  version "6.0.0"
+  resolved "https://registry.yarnpkg.com/promise-duplex/-/promise-duplex-6.0.0.tgz#9d9d13383ac0f70701b9f095ffd486f106c2232e"
+  integrity sha512-ZL7rquzjTFzInDBeWYcsT+qddolNvzigahk6MI6qLSbQvlyRRCJkU3JztgaVunzvkH28smRa2Qu/cY9RXtSkgA==
+  dependencies:
+    core-js "^3.6.5"
+    promise-readable "^6.0.0"
+    promise-writable "^6.0.0"
+
+promise-readable@^6.0.0:
+  version "6.0.0"
+  resolved "https://registry.yarnpkg.com/promise-readable/-/promise-readable-6.0.0.tgz#ab1ec1a3daa53ed8764b61902fb7f3de3242025a"
+  integrity sha512-5NxtmUswijvX5cAM0zPSy6yiCXH/eKBpiiBq6JfAUrmngMquMbzcBhF2qA+ocs4rYYKdvAfv3cOvZxADLtL1CA==
+  dependencies:
+    core-js "^3.6.5"
+
+promise-socket@^7.0.0:
+  version "7.0.0"
+  resolved "https://registry.yarnpkg.com/promise-socket/-/promise-socket-7.0.0.tgz#20c147c417033a50fe7e1d1236a46ff59d4280b3"
+  integrity sha512-Oic9BrxmcHOPEnzKp2Js+ehFyvsbd0WxsE5khweCTHuRvdzbXjHUZmSDT6F9TW8SIkAJ0lCzoHjMYnb0WQJPiw==
+  dependencies:
+    promise-duplex "^6.0.0"
+    tslib "^2.0.1"
+
+promise-writable@^6.0.0:
+  version "6.0.0"
+  resolved "https://registry.yarnpkg.com/promise-writable/-/promise-writable-6.0.0.tgz#4d703e75873a4e755a39bdb926a37f41538e507f"
+  integrity sha512-b81zre/itgJFS7dwWzIdKNVVqvLiUxYRS/wolUB0H1YY/tAaS146XGKa4Q/5wCbsnXLyn0MCeV6f8HHe4iUHLg==
+
 punycode@^2.1.0:
   version "2.1.1"
   resolved "https://registry.npmjs.org/punycode/-/punycode-2.1.1.tgz"
@@ -2781,6 +2815,11 @@ tslib@^1.8.1:
   resolved "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz"
   integrity sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==
 
+tslib@^2.0.1:
+  version "2.6.0"
+  resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.6.0.tgz#b295854684dbda164e181d259a22cd779dcd7bc3"
+  integrity sha512-7At1WUettjcSRHXCyYtTselblcHl9PJFFVKiCAy/bY97+BPZXSQ2wbq0P9s8tK2G7dFQfNnlJnPAiArVBVBsfA==
+
 tslib@^2.2.0:
   version "2.3.0"
   resolved "https://registry.npmjs.org/tslib/-/tslib-2.3.0.tgz"

From 0d7f44f1554c433a6d13d16e0d4e4f532d43a5ff Mon Sep 17 00:00:00 2001
From: Tal Hadad <thadad@istraresearch.com>
Date: Mon, 24 Jul 2023 15:56:06 +0300
Subject: [PATCH 02/28] support png plots over TCP

---
 R/session/init.R              |  2 +-
 R/session/vsc.R               |  8 ++++++-
 package.json                  |  2 ++
 src/liveShare/shareSession.ts |  2 ++
 src/session.ts                | 39 ++++++++++++++++++++++++++++++-----
 yarn.lock                     | 14 ++++++++++++-
 6 files changed, 59 insertions(+), 8 deletions(-)

diff --git a/R/session/init.R b/R/session/init.R
index ffe71a5e2..f03b5b93d 100644
--- a/R/session/init.R
+++ b/R/session/init.R
@@ -17,7 +17,7 @@ init_first <- function() {
   }
 
   # check requried packages
-  required_packages <- c("jsonlite", "rlang")
+  required_packages <- c("jsonlite", "rlang", "readr")
   missing_packages <- required_packages[
     !vapply(required_packages, requireNamespace,
       logical(1L), quietly = TRUE)
diff --git a/R/session/vsc.R b/R/session/vsc.R
index 27e9a94bb..fd15d23db 100644
--- a/R/session/vsc.R
+++ b/R/session/vsc.R
@@ -427,7 +427,6 @@ if (use_httpgd && "httpgd" %in% .packages(all.available = TRUE)) {
     }
   )
 
-  # TODO: Make this be available by TCP only as well
   update_plot <- function(...) {
     tryCatch({
       if (plot_updated && check_null_dev()) {
@@ -439,6 +438,13 @@ if (use_httpgd && "httpgd" %in% .packages(all.available = TRUE)) {
           on.exit({
             dev.off()
             cat(get_timestamp(), file = plot_lock_file)
+            if (request_tcp_connection) {
+              tryCatch({
+                  plot_file_content <- readr::read_file_raw(plot_file)
+                  format <- "image/png"# right now only this format is supported
+                  request("plot", format = format, plot_base64 = jsonlite::base64_enc(plot_file_content))
+              }, error = message)
+            }
           })
           replayPlot(record)
         }
diff --git a/package.json b/package.json
index 3f914e6b7..543152615 100644
--- a/package.json
+++ b/package.json
@@ -2129,6 +2129,7 @@
     "@types/node": "^16.11.7",
     "@types/node-fetch": "^2.5.10",
     "@types/sinon": "^10.0.13",
+    "@types/tmp": "^0.2.3",
     "@types/vscode": "^1.67.0",
     "@types/winreg": "^1.2.31",
     "@typescript-eslint/eslint-plugin": "^5.30.0",
@@ -2158,6 +2159,7 @@
     "js-yaml": "^4.1.0",
     "node-fetch": "^2.6.7",
     "promise-socket": "^7.0.0",
+    "tmp": "^0.2.1",
     "vscode-languageclient": "^8.1.0",
     "vsls": "^1.0.4753",
     "winreg": "^1.2.4"
diff --git a/src/liveShare/shareSession.ts b/src/liveShare/shareSession.ts
index 634839002..863bc4ead 100644
--- a/src/liveShare/shareSession.ts
+++ b/src/liveShare/shareSession.ts
@@ -29,6 +29,8 @@ export type IRequest = {
     file?: string;
     viewer?: string;
     plot?: string;
+    format?: string;
+    plot_base64?: string;
     workspaceData?: WorkspaceData;
     action?: string;
     args?: unknown;
diff --git a/src/session.ts b/src/session.ts
index ebc5ea8f2..2986f5c67 100644
--- a/src/session.ts
+++ b/src/session.ts
@@ -4,6 +4,7 @@ import * as fs from 'fs-extra';
 import * as os from 'os';
 import * as path from 'path';
 import { Agent } from 'http';
+import * as tmp from 'tmp';
 import { AddressInfo, Server, Socket } from 'node:net';
 import { PromiseSocket } from 'promise-socket';
 import fetch from 'node-fetch';
@@ -193,11 +194,7 @@ async function updatePlot() {
     if (newTimeStamp !== plotTimeStamp) {
         plotTimeStamp = newTimeStamp;
         if (fs.existsSync(plotFile) && fs.statSync(plotFile).size > 0) {
-            void commands.executeCommand('vscode.open', Uri.file(plotFile), {
-                preserveFocus: true,
-                preview: true,
-                viewColumn: ViewColumn[(config().get<string>('session.viewers.viewColumn.plot') || 'Two') as keyof typeof ViewColumn],
-            });
+            showPlot(plotFile);
             console.info('[updatePlot] Done');
             if (isLiveShare()) {
                 void rHostService?.notifyPlot(plotFile);
@@ -208,6 +205,14 @@ async function updatePlot() {
     }
 }
 
+function showPlot(plotFile: string) {
+    void commands.executeCommand('vscode.open', Uri.file(plotFile), {
+        preserveFocus: true,
+        preview: true,
+        viewColumn: ViewColumn[(config().get<string>('session.viewers.viewColumn.plot') || 'Two') as keyof typeof ViewColumn],
+    });
+}
+
 async function updateWorkspace() {
     console.info(`[updateWorkspace] ${workspaceFile}`);
 
@@ -842,6 +847,18 @@ function startIncomingRequestServer(ip: string, sessionStatusBarItem: StatusBarI
     return server;
 }
 
+const create_tmp_file: (options: tmp.FileOptions) => Promise<{ name: string, fd: number, removeCallback: () => void }> =
+    (options) => new Promise((resolve, reject) => {
+        tmp.file(options, (err, name, fd, removeCallback) => {
+            if (err) {
+                reject(err);
+            } else {
+                resolve({ name, fd, removeCallback });
+            }
+        });
+    }
+);
+
 export async function processRequest(request: ISessionRequest, socket: Socket | null, sessionStatusBarItem: StatusBarItem) {
     switch (request.command) {
         case 'help': {
@@ -927,6 +944,18 @@ export async function processRequest(request: ISessionRequest, socket: Socket |
             }
             break;
         }
+        case 'plot': {
+            if (request.format !== 'image/png') {
+                console.info(`Error: the format ${request.format} isn't supported, only image/png is supported for now.`);
+                break;
+            }
+
+            const { name: filePath, fd } = await create_tmp_file({ postfix: '.png' });
+            const arrayData = Buffer.from(request.plot_base64!, 'base64');
+            await fs.writeFile(fd, arrayData);
+            showPlot(filePath);
+            break;
+        }
         case 'rstudioapi': {
             if (request.action && request.args && request.sd) {
                 await dispatchRStudioAPICall(request.action, request.args, request.sd);
diff --git a/yarn.lock b/yarn.lock
index bb151d94e..889bb7488 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -349,6 +349,11 @@
   resolved "https://registry.npmjs.org/@types/text-table/-/text-table-0.2.1.tgz"
   integrity sha512-dchbFCWfVgUSWEvhOkXGS7zjm+K7jCUvGrQkAHPk2Fmslfofp4HQTH2pqnQ3Pw5GPYv0zWa2AQjKtsfZThuemQ==
 
+"@types/tmp@^0.2.3":
+  version "0.2.3"
+  resolved "https://registry.yarnpkg.com/@types/tmp/-/tmp-0.2.3.tgz#908bfb113419fd6a42273674c00994d40902c165"
+  integrity sha512-dDZH/tXzwjutnuk4UacGgFRwV+JSLaXL1ikvidfJprkb7L9Nx1njcRHHmi3Dsvt7pgqqTEeucQuOrWHPFgzVHA==
+
 "@types/vscode@^1.67.0":
   version "1.69.1"
   resolved "https://registry.npmjs.org/@types/vscode/-/vscode-1.69.1.tgz"
@@ -2513,7 +2518,7 @@ rimraf@2:
   dependencies:
     glob "^7.1.3"
 
-rimraf@^3.0.2:
+rimraf@^3.0.0, rimraf@^3.0.2:
   version "3.0.2"
   resolved "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz"
   integrity sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==
@@ -2783,6 +2788,13 @@ text-table@0.2.0, text-table@^0.2.0:
   resolved "https://registry.npmjs.org/text-table/-/text-table-0.2.0.tgz"
   integrity sha1-f17oI66AUgfACvLfSoTsP8+lcLQ=
 
+tmp@^0.2.1:
+  version "0.2.1"
+  resolved "https://registry.yarnpkg.com/tmp/-/tmp-0.2.1.tgz#8457fc3037dcf4719c251367a1af6500ee1ccf14"
+  integrity sha512-76SUhtfqR2Ijn+xllcI5P1oyannHNHByD80W1q447gU3mp9G9PSpGdWmjUOHRDPiHYacIk66W7ubDTuPF3BEtQ==
+  dependencies:
+    rimraf "^3.0.0"
+
 to-regex-range@^5.0.1:
   version "5.0.1"
   resolved "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz"

From bbe6d592460763de7f575da498475e7396d7851d Mon Sep 17 00:00:00 2001
From: Tal Hadad <thadad@istraresearch.com>
Date: Mon, 24 Jul 2023 16:50:12 +0300
Subject: [PATCH 03/28] remove test logging

---
 src/session.ts | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/src/session.ts b/src/session.ts
index 2986f5c67..eb137824b 100644
--- a/src/session.ts
+++ b/src/session.ts
@@ -791,7 +791,6 @@ async function updateRequest(sessionStatusBarItem: StatusBarItem) {
 }
 
 function startIncomingRequestServer(ip: string, sessionStatusBarItem: StatusBarItem) {
-    console.info("Test Here")
     const incomingRequestServer = new Server(async (socket: Socket) => {
         if (incomingRequestServerConnected) {
             // TODO: Add some details (ip+port) of the incoming connection
@@ -811,9 +810,8 @@ function startIncomingRequestServer(ip: string, sessionStatusBarItem: StatusBarI
         let contentToProcess = "";
         while (true) {
             const currentChunk = await promiseSocket.read();
-            console.info("Got something")
             if (currentChunk === undefined) {
-                console.info("Should close the socket now")
+                console.info("Incoming request server socket EOF")
                 // The end of the socket
     
                 // TODO: Verify a correct detach!
@@ -829,15 +827,13 @@ function startIncomingRequestServer(ip: string, sessionStatusBarItem: StatusBarI
             for (let i = 0; i < requests.length - 1; ++i) {
                 const requestContent = requests[i];
 
-                console.info(`TCP Request received from client: ${requestContent}.`);
-                console.info(`TCP request: ${requestContent}`);
+                //console.debug(`TCP Request received from client: ${requestContent}.`);
                 const request = JSON.parse(requestContent) as ISessionRequest;
                 await processRequest(request, socket, sessionStatusBarItem);
             }
             contentToProcess = requests[requests.length - 1];
         }
     });
-    console.info("Test After")
 
     const server = incomingRequestServer.listen(0, ip, function() {
         const addressInfo = server.address() as AddressInfo;

From d19307ef7a706cdead2c3f5c6900c83cbbec354c Mon Sep 17 00:00:00 2001
From: Tal Hadad <thadad@istraresearch.com>
Date: Mon, 24 Jul 2023 17:52:00 +0300
Subject: [PATCH 04/28] improve status bar details and info if connected or not

---
 src/session.ts | 120 ++++++++++++++++++++++++++++++-------------------
 1 file changed, 75 insertions(+), 45 deletions(-)

diff --git a/src/session.ts b/src/session.ts
index eb137824b..73bc6de15 100644
--- a/src/session.ts
+++ b/src/session.ts
@@ -71,6 +71,23 @@ let plotWatcher: FSWatcher;
 let activeBrowserPanel: WebviewPanel | undefined;
 let activeBrowserUri: Uri | undefined;
 let activeBrowserExternalUri: Uri | undefined;
+let incomingRequestServerAddressInfo: AddressInfo | undefined = undefined;
+let attached = false;
+
+const addressToStr = (addressInfo: AddressInfo) => `${addressInfo.address}:${addressInfo.port}`;
+
+function updateSessionStatusBarItem(sessionStatusBarItem: StatusBarItem) {
+    const addressInfoStr = incomingRequestServerAddressInfo && addressToStr(incomingRequestServerAddressInfo);
+    if (attached) {
+        sessionStatusBarItem.text = `R ${rVer}: ${pid}` + (addressInfoStr ? ` (Connected via ${addressInfoStr})` : '');
+        // eslint-disable-next-line @typescript-eslint/restrict-template-expressions, @typescript-eslint/no-unsafe-member-access
+        sessionStatusBarItem.tooltip = `${info?.version}\nProcess ID: ${pid}\n${addressInfoStr ? (`Connected via TCP address: ${addressInfoStr}\n`) : ''}Command: ${info?.command}\nStart time: ${info?.start_time}\nClick to attach to active terminal.`;
+    } else {
+        sessionStatusBarItem.text = `R: (not attached${addressInfoStr ? `, listening on ${addressInfoStr}` : ''})`;
+        sessionStatusBarItem.tooltip = 'Click to attach active terminal.';// TODO: Make clicking be aware of TCP R connections
+    }
+    sessionStatusBarItem.show();
+}
 
 export function deploySessionWatcher(extensionPath: string): void {
     console.info(`[deploySessionWatcher] extensionPath: ${extensionPath}`);
@@ -792,52 +809,62 @@ async function updateRequest(sessionStatusBarItem: StatusBarItem) {
 
 function startIncomingRequestServer(ip: string, sessionStatusBarItem: StatusBarItem) {
     const incomingRequestServer = new Server(async (socket: Socket) => {
+        console.info(`Incoming connection to the request server from ${addressToStr(socket.address() as AddressInfo)}`)
         if (incomingRequestServerConnected) {
-            // TODO: Add some details (ip+port) of the incoming connection
             console.error('A new connection to the incoming request server tries to connect but another connection currently connected!');
             return;
         }
 
         console.info('A new connection to the incoming request server has been established.');
         incomingRequestServerConnected = true;
-        // TODO: Handle correct status bar update
-    
-        const promiseSocket = new PromiseSocket(socket);
-
-        console.info("Waiting for TCP input...")
-    
-        // TODO: Handle Exceptions
-        let contentToProcess = "";
-        while (true) {
-            const currentChunk = await promiseSocket.read();
-            if (currentChunk === undefined) {
-                console.info("Incoming request server socket EOF")
-                // The end of the socket
-    
-                // TODO: Verify a correct detach!
-                // TODO: Verify that `contentToProcess` is empty!
-                incomingRequestServerConnected = false;
-                return;
-            }
-            // otherwise
-    
-            contentToProcess = contentToProcess + currentChunk;
-    
-            const requests = contentToProcess.split((/\r?\n/));
-            for (let i = 0; i < requests.length - 1; ++i) {
-                const requestContent = requests[i];
-
-                //console.debug(`TCP Request received from client: ${requestContent}.`);
-                const request = JSON.parse(requestContent) as ISessionRequest;
-                await processRequest(request, socket, sessionStatusBarItem);
+
+        try {
+            const promiseSocket = new PromiseSocket(socket);
+            console.info("Waiting for TCP input...")
+        
+            let contentToProcess = "";
+            while (true) {
+                    const currentChunk = await promiseSocket.read();
+                    if (currentChunk === undefined) {
+                        // The end of the socket
+                        console.info("Incoming request server socket EOF");
+
+                        // Force cleaning even if somehow not detached
+                        await cleanupSession();
+            
+                        if (contentToProcess) {
+                            console.error("TCP connection recieved EOF, but the last content didn't end up with line break.")
+                        }
+                        incomingRequestServerConnected = false;
+                        return;
+                    }
+                    // otherwise
+            
+                    contentToProcess = contentToProcess + currentChunk;
+        
+                const requests = contentToProcess.split((/\r?\n/));
+                for (let i = 0; i < requests.length - 1; ++i) {
+                    const requestContent = requests[i];
+
+                    //console.debug(`TCP Request received from client: ${requestContent}.`);
+                    const request = JSON.parse(requestContent) as ISessionRequest;
+                    await processRequest(request, socket, sessionStatusBarItem);
+                }
+                contentToProcess = requests[requests.length - 1];
             }
-            contentToProcess = requests[requests.length - 1];
+        } catch (err) {
+            console.error(`Error while processing TCP connection: ${err}`);
+
+            await cleanupSession();
+            incomingRequestServerConnected = false;
         }
     });
 
     const server = incomingRequestServer.listen(0, ip, function() {
-        const addressInfo = server.address() as AddressInfo;
-        console.info(`Started listening on ${addressInfo.address}:${addressInfo.port}`);
+        incomingRequestServerAddressInfo = server.address() as AddressInfo;
+        console.info(`Started listening on ${addressToStr(incomingRequestServerAddressInfo)}`);
+
+        updateSessionStatusBarItem(sessionStatusBarItem);
     });
 
     return server;
@@ -885,16 +912,15 @@ export async function processRequest(request: ISessionRequest, socket: Socket |
             if (!request.tempdir || !request.wd) {
                 return;
             }
+            attached = true;
             rVer = String(request.version);
             pid = String(request.pid);
             info = request.info;
             sessionDir = path.join(request.tempdir, 'vscode-R');
             workingDir = request.wd;
+            // TODO: Log and show correct TCP info here
             console.info(`[updateRequest] attach PID: ${pid}`);
-            sessionStatusBarItem.text = `R ${rVer}: ${pid}`;
-            // eslint-disable-next-line @typescript-eslint/restrict-template-expressions, @typescript-eslint/no-unsafe-member-access
-            sessionStatusBarItem.tooltip = `${info?.version}\nProcess ID: ${pid}\nCommand: ${info?.command}\nStart time: ${info?.start_time}\nClick to attach to active terminal.`;
-            sessionStatusBarItem.show();
+            updateSessionStatusBarItem(sessionStatusBarItem);
             if (socket == null) {
                 updateSessionWatcher();
             }
@@ -915,9 +941,13 @@ export async function processRequest(request: ISessionRequest, socket: Socket |
             }
             break;
         }
-        case 'detach': {// Only on filesystem based session?
-            if (request.pid) {
-                await cleanupSession(request.pid);
+        case 'detach': {
+            if (socket == null) {
+                if (request.pid) {
+                    await cleanupSession(request.pid);
+                }
+            } else {
+                await cleanupSession();
             }
             break;
         }
@@ -963,11 +993,11 @@ export async function processRequest(request: ISessionRequest, socket: Socket |
     }
 }
 
-export async function cleanupSession(pidArg: string): Promise<void> {
-    if (pid === pidArg) {
+export async function cleanupSession(pidArg?: string): Promise<void> {
+    if (pidArg === undefined || pid === pidArg) {
+        attached = false;
         if (sessionStatusBarItem) {
-            sessionStatusBarItem.text = 'R: (not attached)';
-            sessionStatusBarItem.tooltip = 'Click to attach active terminal.';
+            updateSessionStatusBarItem(sessionStatusBarItem);
         }
         server = undefined;
         workspaceData.globalenv = {};

From 4bae0a7cad439db1e9b221601192967aa9a8cc09 Mon Sep 17 00:00:00 2001
From: Tal Hadad <thadad@istraresearch.com>
Date: Mon, 24 Jul 2023 18:18:05 +0300
Subject: [PATCH 05/28] Use active terminal if R is attached already

---
 src/rTerminal.ts | 10 +++++++---
 src/session.ts   |  5 +++--
 2 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/src/rTerminal.ts b/src/rTerminal.ts
index 076e80bc8..9fd278b76 100644
--- a/src/rTerminal.ts
+++ b/src/rTerminal.ts
@@ -9,7 +9,7 @@ import { extensionContext, homeExtDir } from './extension';
 import * as util from './util';
 import * as selection from './selection';
 import { getSelection } from './selection';
-import { cleanupSession } from './session';
+import { cleanupSession, attached } from './session';
 import { config, delay, getRterm } from './util';
 import { rGuestService, isGuestSession } from './liveShare';
 import * as fs from 'fs';
@@ -227,8 +227,12 @@ export async function chooseTerminal(): Promise<vscode.Terminal | undefined> {
     }
 
     if (rTerm === undefined) {
-        await createRTerm(true);
-        await delay(200); // Let RTerm warm up
+        if (attached && vscode.window.activeTerminal) {
+            return vscode.window.activeTerminal;
+        } else {
+            await createRTerm(true);
+            await delay(200); // Let RTerm warm up
+        }
     }
 
     return rTerm;
diff --git a/src/session.ts b/src/session.ts
index 73bc6de15..4b7f2e643 100644
--- a/src/session.ts
+++ b/src/session.ts
@@ -72,7 +72,7 @@ let activeBrowserPanel: WebviewPanel | undefined;
 let activeBrowserUri: Uri | undefined;
 let activeBrowserExternalUri: Uri | undefined;
 let incomingRequestServerAddressInfo: AddressInfo | undefined = undefined;
-let attached = false;
+export let attached = false;
 
 const addressToStr = (addressInfo: AddressInfo) => `${addressInfo.address}:${addressInfo.port}`;
 
@@ -84,7 +84,7 @@ function updateSessionStatusBarItem(sessionStatusBarItem: StatusBarItem) {
         sessionStatusBarItem.tooltip = `${info?.version}\nProcess ID: ${pid}\n${addressInfoStr ? (`Connected via TCP address: ${addressInfoStr}\n`) : ''}Command: ${info?.command}\nStart time: ${info?.start_time}\nClick to attach to active terminal.`;
     } else {
         sessionStatusBarItem.text = `R: (not attached${addressInfoStr ? `, listening on ${addressInfoStr}` : ''})`;
-        sessionStatusBarItem.tooltip = 'Click to attach active terminal.';// TODO: Make clicking be aware of TCP R connections
+        sessionStatusBarItem.tooltip = 'Click to attach active terminal.';
     }
     sessionStatusBarItem.show();
 }
@@ -126,6 +126,7 @@ export function startRequestWatcher(sessionStatusBarItem: StatusBarItem): void {
 export function attachActive(): void {
     if (config().get<boolean>('sessionWatcher')) {
         console.info('[attachActive]');
+        // TODO: Connect it via TCP connection instead, if available in the configurations (and the server is up)
         void runTextInTerm('.vsc.attach()');
         if (isLiveShare() && shareWorkspace) {
             rHostService?.notifyRequest(requestFile, true);

From 5f60ba61b48be5bf599180e22443f6c41e570da4 Mon Sep 17 00:00:00 2001
From: Tal Hadad <thadad@istraresearch.com>
Date: Mon, 24 Jul 2023 19:14:37 +0300
Subject: [PATCH 06/28] allow attaching in a later stage

---
 R/session/init.R      | 48 +------------------------------------------
 R/session/init_late.R | 47 ++++++++++++++++++++++++++++++++++++++++++
 src/session.ts        |  8 +++++---
 3 files changed, 53 insertions(+), 50 deletions(-)
 create mode 100644 R/session/init_late.R

diff --git a/R/session/init.R b/R/session/init.R
index f03b5b93d..ba670a006 100644
--- a/R/session/init.R
+++ b/R/session/init.R
@@ -44,59 +44,13 @@ old.First.sys <- .First.sys
 init_last <- function() {
   old.First.sys()
 
-  # cleanup previous version
-  removeTaskCallback("vscode-R")
-  options(vscodeR = NULL)
-  .vsc.name <- "tools:vscode"
-  if (.vsc.name %in% search()) {
-    detach(.vsc.name, character.only = TRUE)
-  }
-
-  # Source vsc utils in new environmeent
-  .vsc <- new.env()
-  source(file.path(dir_init, "vsc.R"), local = .vsc)
-
-  # attach functions that are meant to be called by the user/vscode
-  exports <- local({
-    .vsc <- .vsc
-    .vsc.attach <- .vsc$attach
-    .vsc.view <- .vsc$show_dataview
-    .vsc.browser <- .vsc$show_browser
-    .vsc.viewer <- .vsc$show_viewer
-    .vsc.page_viewer <- .vsc$show_page_viewer
-    View <- .vsc.view
-    environment()
-  })
-  attach(exports, name = .vsc.name, warn.conflicts = FALSE)
-
-  # overwrite S3 bindings from other packages
-  suppressWarnings({
-    if (!identical(getOption("vsc.helpPanel", "Two"), FALSE)) {
-      # Overwrite print function for results of `?`
-      .vsc$.S3method(
-        "print",
-        "help_files_with_topic",
-        .vsc$print.help_files_with_topic
-      )
-      # Overwrite print function for results of `??`
-      .vsc$.S3method(
-        "print",
-        "hsearch",
-        .vsc$print.hsearch
-      )
-    }
-    # Further S3 overwrites can go here
-    # ...
-  })
+  source(file.path(dir_init, "init_late.R"), chdir = TRUE)
 
   # remove this function from globalenv()
   suppressWarnings(
     rm(".First.sys", envir = globalenv())
   )
 
-  # Attach to vscode
-  #exports$.vsc.attach()
-
   invisible()
 }
 
diff --git a/R/session/init_late.R b/R/session/init_late.R
new file mode 100644
index 000000000..0e5443283
--- /dev/null
+++ b/R/session/init_late.R
@@ -0,0 +1,47 @@
+dir_init <- getwd()
+
+
+# cleanup previous version
+removeTaskCallback("vscode-R")
+options(vscodeR = NULL)
+.vsc.name <- "tools:vscode"
+if (.vsc.name %in% search()) {
+detach(.vsc.name, character.only = TRUE)
+}
+
+# Source vsc utils in new environmeent
+.vsc <- new.env()
+source(file.path(dir_init, "vsc.R"), local = .vsc)
+
+# attach functions that are meant to be called by the user/vscode
+exports <- local({
+.vsc <- .vsc
+.vsc.attach <- .vsc$attach
+.vsc.view <- .vsc$show_dataview
+.vsc.browser <- .vsc$show_browser
+.vsc.viewer <- .vsc$show_viewer
+.vsc.page_viewer <- .vsc$show_page_viewer
+View <- .vsc.view
+environment()
+})
+attach(exports, name = .vsc.name, warn.conflicts = FALSE)
+
+# overwrite S3 bindings from other packages
+suppressWarnings({
+if (!identical(getOption("vsc.helpPanel", "Two"), FALSE)) {
+    # Overwrite print function for results of `?`
+    .vsc$.S3method(
+    "print",
+    "help_files_with_topic",
+    .vsc$print.help_files_with_topic
+    )
+    # Overwrite print function for results of `??`
+    .vsc$.S3method(
+    "print",
+    "hsearch",
+    .vsc$print.hsearch
+    )
+}
+# Further S3 overwrites can go here
+# ...
+})
\ No newline at end of file
diff --git a/src/session.ts b/src/session.ts
index 4b7f2e643..0dfd0b3f8 100644
--- a/src/session.ts
+++ b/src/session.ts
@@ -93,9 +93,11 @@ export function deploySessionWatcher(extensionPath: string): void {
     console.info(`[deploySessionWatcher] extensionPath: ${extensionPath}`);
     resDir = path.join(extensionPath, 'dist', 'resources');
 
-    const initPath = path.join(extensionPath, 'R', 'session', 'init.R');
-    const linkPath = path.join(homeExtDir(), 'init.R');
-    fs.writeFileSync(linkPath, `local(source("${initPath.replace(/\\/g, '\\\\')}", chdir = TRUE, local = TRUE))\n`);
+    for (const initFileName of ['init.R', 'init_late.R']) {
+        const initPath = path.join(extensionPath, 'R', 'session', initFileName);
+        const linkPath = path.join(homeExtDir(), initFileName);
+        fs.writeFileSync(linkPath, `local(source("${initPath.replace(/\\/g, '\\\\')}", chdir = TRUE, local = TRUE))\n`);
+    }
 
     writeSettings();
     workspace.onDidChangeConfiguration(event => {

From 873af37ec2fceaee2c144aa62be72bd71562078e Mon Sep 17 00:00:00 2001
From: Tal Hadad <thadad@istraresearch.com>
Date: Mon, 24 Jul 2023 20:01:43 +0300
Subject: [PATCH 07/28] smart start of new R terminal, with the right TCP
 address

---
 R/session/init.R |  7 +++++++
 package.json     | 15 +++++++++++++++
 src/rTerminal.ts |  6 ++++--
 src/session.ts   | 18 ++++++++++++------
 4 files changed, 38 insertions(+), 8 deletions(-)

diff --git a/R/session/init.R b/R/session/init.R
index ba670a006..fd38e9f75 100644
--- a/R/session/init.R
+++ b/R/session/init.R
@@ -51,6 +51,13 @@ init_last <- function() {
     rm(".First.sys", envir = globalenv())
   )
 
+  if (nzchar(Sys.getenv("VSCODE_INIT_R"))) {
+    .vsc.attach(
+      host = Sys.getenv("VSCODE_ATTACH_HOST", unset = NA),
+      port = strtoi(Sys.getenv("VSCODE_ATTACH_PORT", unset = NA))
+    )
+  }
+
   invisible()
 }
 
diff --git a/package.json b/package.json
index 543152615..4a53ec045 100644
--- a/package.json
+++ b/package.json
@@ -1730,6 +1730,21 @@
           "default": true,
           "description": "Enable R session watcher. Required for workspace viewer and most features to work with an R session. Restart required to take effect."
         },
+        "r.sessionWatcherTCPServer": {
+          "type": "boolean",
+          "default": true,
+          "description": "Enable TCP server connection for watching over R sessions. Requires `#r.sessionWatcher#` to be set to `true`. Requires reloading for changes to take effect."
+        },
+        "r.sessionWatcherTCPServerHostName": {
+          "type": "string",
+          "default": "127.0.0.1",
+          "description": "The host name to listen for watching over R sessions. E.g. 127.0.0.1 for local connection only, and 0.0.0.0 for global exposure (security note: use the latter only in a secured close local network!). Requires `#r.sessionWatcher#` and `r.sessionWatcher.TCPServer` to be set to `true`. Requires reloading for changes to take effect."
+        },
+        "r.sessionWatcherTCPServerPort": {
+          "type": "integer",
+          "default": 0,
+          "description": "The port to listen to, or 0 for automatic port selection (recommended). Requires `#r.sessionWatcher#` and `r.sessionWatcher.TCPServer` to be set to `true`. Requires reloading for changes to take effect."
+        },
         "r.session.useWebServer": {
           "type": "boolean",
           "default": false,
diff --git a/src/rTerminal.ts b/src/rTerminal.ts
index 9fd278b76..b8edb4258 100644
--- a/src/rTerminal.ts
+++ b/src/rTerminal.ts
@@ -9,7 +9,7 @@ import { extensionContext, homeExtDir } from './extension';
 import * as util from './util';
 import * as selection from './selection';
 import { getSelection } from './selection';
-import { cleanupSession, attached } from './session';
+import { cleanupSession, attached, incomingRequestServerAddressInfo } from './session';
 import { config, delay, getRterm } from './util';
 import { rGuestService, isGuestSession } from './liveShare';
 import * as fs from 'fs';
@@ -129,7 +129,9 @@ export async function makeTerminalOptions(): Promise<vscode.TerminalOptions> {
             R_PROFILE_USER_OLD: process.env.R_PROFILE_USER,
             R_PROFILE_USER: newRprofile,
             VSCODE_INIT_R: initR,
-            VSCODE_WATCHER_DIR: homeExtDir()
+            VSCODE_WATCHER_DIR: homeExtDir(),
+            VSCODE_ATTACH_HOST: incomingRequestServerAddressInfo?.address,
+            VSCODE_ATTACH_PORT: incomingRequestServerAddressInfo?.port?.toString(),
         };
     }
     return termOptions;
diff --git a/src/session.ts b/src/session.ts
index 0dfd0b3f8..980969401 100644
--- a/src/session.ts
+++ b/src/session.ts
@@ -71,7 +71,7 @@ let plotWatcher: FSWatcher;
 let activeBrowserPanel: WebviewPanel | undefined;
 let activeBrowserUri: Uri | undefined;
 let activeBrowserExternalUri: Uri | undefined;
-let incomingRequestServerAddressInfo: AddressInfo | undefined = undefined;
+export let incomingRequestServerAddressInfo: AddressInfo | undefined = undefined;
 export let attached = false;
 
 const addressToStr = (addressInfo: AddressInfo) => `${addressInfo.address}:${addressInfo.port}`;
@@ -120,7 +120,9 @@ export function startRequestWatcher(sessionStatusBarItem: StatusBarItem): void {
         void updateRequest(sessionStatusBarItem);
     });
 
-    void startIncomingRequestServer('0.0.0.0', sessionStatusBarItem);// TODO: Make it more configurable
+    if (config().get<boolean>('sessionWatcherTCPServer')) {
+        void startIncomingRequestServer(sessionStatusBarItem);
+    }
 
     console.info('[startRequestWatcher] Done');
 }
@@ -128,8 +130,11 @@ export function startRequestWatcher(sessionStatusBarItem: StatusBarItem): void {
 export function attachActive(): void {
     if (config().get<boolean>('sessionWatcher')) {
         console.info('[attachActive]');
-        // TODO: Connect it via TCP connection instead, if available in the configurations (and the server is up)
-        void runTextInTerm('.vsc.attach()');
+        if (incomingRequestServerAddressInfo) {
+            void runTextInTerm(`.vsc.attach(host=${incomingRequestServerAddressInfo.address}, port=${incomingRequestServerAddressInfo.port}L)`);
+        } else {
+            void runTextInTerm('.vsc.attach()');
+        }
         if (isLiveShare() && shareWorkspace) {
             rHostService?.notifyRequest(requestFile, true);
         }
@@ -810,7 +815,7 @@ async function updateRequest(sessionStatusBarItem: StatusBarItem) {
     }
 }
 
-function startIncomingRequestServer(ip: string, sessionStatusBarItem: StatusBarItem) {
+function startIncomingRequestServer(sessionStatusBarItem: StatusBarItem) {
     const incomingRequestServer = new Server(async (socket: Socket) => {
         console.info(`Incoming connection to the request server from ${addressToStr(socket.address() as AddressInfo)}`)
         if (incomingRequestServerConnected) {
@@ -863,7 +868,8 @@ function startIncomingRequestServer(ip: string, sessionStatusBarItem: StatusBarI
         }
     });
 
-    const server = incomingRequestServer.listen(0, ip, function() {
+    const server = incomingRequestServer.listen(config().get<number>('sessionWatcherTCPServerPort'),
+        config().get<string>('sessionWatcherTCPServerHostName'), function() {
         incomingRequestServerAddressInfo = server.address() as AddressInfo;
         console.info(`Started listening on ${addressToStr(incomingRequestServerAddressInfo)}`);
 

From 0460b3d01278958f0ebcb58a51f7a8ec0f5c677a Mon Sep 17 00:00:00 2001
From: Tal Hadad <thadad@istraresearch.com>
Date: Tue, 1 Aug 2023 14:42:40 +0300
Subject: [PATCH 08/28] fix linting errors

---
 src/session.ts | 103 +++++++++++++++++++++++++++----------------------
 1 file changed, 56 insertions(+), 47 deletions(-)

diff --git a/src/session.ts b/src/session.ts
index 980969401..c52156615 100644
--- a/src/session.ts
+++ b/src/session.ts
@@ -372,16 +372,16 @@ export async function showWebView(file: string, title: string, viewer: string |
 }
 
 export async function showDataView(source: string, type: string, title: string, file: string | undefined, data: string | object | undefined, viewer: string): Promise<void> {
-    console.info(`[showDataView] source: ${source}, type: ${type}, title: ${title}, file: ${file}, viewer: ${viewer}`);
+    console.info(`[showDataView] source: ${source}, type: ${type}, title: ${title}, file: ${file ?? 'none'}, viewer: ${viewer}`);
     console.debug(`data: ${JSON.stringify(data)}`);
 
     const getDataContent = async () : Promise<string | undefined> => {
         if (file === undefined) {
-            return typeof data == "string" ? data : JSON.stringify(data);
+            return typeof data === 'string' ? data : JSON.stringify(data);
         } else {
             const fileContent = await readContent(file, 'utf8');
-            if (fileContent == null) {
-                console.error("Error: File wasn't found!");
+            if (fileContent === undefined) {
+                console.error('Error: File wasn\'t found!');
                 return undefined;
             }
         }
@@ -404,9 +404,11 @@ export async function showDataView(source: string, type: string, title: string,
                 localResourceRoots: [Uri.file(resDir)],
             });
         const fileContent = await getDataContent();
-        const content = await getTableHtml(panel.webview, fileContent!);
-        panel.iconPath = new UriIcon('open-preview');
-        panel.webview.html = content;
+        if (fileContent !== undefined) {
+            const content = getTableHtml(panel.webview, fileContent);
+            panel.iconPath = new UriIcon('open-preview');
+            panel.webview.html = content;
+        }
     } else if (source === 'list') {
         const panel = window.createWebviewPanel('dataview', title,
             {
@@ -420,14 +422,16 @@ export async function showDataView(source: string, type: string, title: string,
                 localResourceRoots: [Uri.file(resDir)],
             });
         const fileContent = await getDataContent();
-        const content = await getListHtml(panel.webview, fileContent!);
-        panel.iconPath = new UriIcon('open-preview');
-        panel.webview.html = content;
+        if (fileContent !== undefined) {
+            const content = getListHtml(panel.webview, fileContent);
+            panel.iconPath = new UriIcon('open-preview');
+            panel.webview.html = content;
+        }
     } else {
         if (isGuestSession || file === undefined) {
             const fileContent = file === undefined ? data as string : await rGuestService?.requestFileContent(file, 'utf8');
             if (fileContent) {
-                await openVirtualDoc(file ?? "R View", fileContent, true, true, ViewColumn[viewer as keyof typeof ViewColumn]);
+                await openVirtualDoc(file ?? 'R View', fileContent, true, true, ViewColumn[viewer as keyof typeof ViewColumn]);
             }
         } else {
             await commands.executeCommand('vscode.open', Uri.file(file), {
@@ -440,7 +444,7 @@ export async function showDataView(source: string, type: string, title: string,
     console.info('[showDataView] Done');
 }
 
-export async function getTableHtml(webview: Webview, content: string): Promise<string> {
+export function getTableHtml(webview: Webview, content: string): string {
     resDir = isGuestSession ? guestResDir : resDir;
     const pageSize = config().get<number>('session.data.pageSize', 500);
     return `
@@ -626,7 +630,7 @@ export async function getTableHtml(webview: Webview, content: string): Promise<s
 `;
 }
 
-export async function getListHtml(webview: Webview, content: string): Promise<string> {
+export function getListHtml(webview: Webview, content: string): string {
     resDir = isGuestSession ? guestResDir : resDir;
 
     return `
@@ -816,8 +820,9 @@ async function updateRequest(sessionStatusBarItem: StatusBarItem) {
 }
 
 function startIncomingRequestServer(sessionStatusBarItem: StatusBarItem) {
+    // eslint-disable-next-line @typescript-eslint/no-misused-promises
     const incomingRequestServer = new Server(async (socket: Socket) => {
-        console.info(`Incoming connection to the request server from ${addressToStr(socket.address() as AddressInfo)}`)
+        console.info(`Incoming connection to the request server from ${addressToStr(socket.address() as AddressInfo)}`);
         if (incomingRequestServerConnected) {
             console.error('A new connection to the incoming request server tries to connect but another connection currently connected!');
             return;
@@ -828,27 +833,28 @@ function startIncomingRequestServer(sessionStatusBarItem: StatusBarItem) {
 
         try {
             const promiseSocket = new PromiseSocket(socket);
-            console.info("Waiting for TCP input...")
+            console.info('Waiting for TCP input...');
         
-            let contentToProcess = "";
+            let contentToProcess = '';
+            // eslint-disable-next-line no-constant-condition
             while (true) {
-                    const currentChunk = await promiseSocket.read();
-                    if (currentChunk === undefined) {
-                        // The end of the socket
-                        console.info("Incoming request server socket EOF");
-
-                        // Force cleaning even if somehow not detached
-                        await cleanupSession();
-            
-                        if (contentToProcess) {
-                            console.error("TCP connection recieved EOF, but the last content didn't end up with line break.")
-                        }
-                        incomingRequestServerConnected = false;
-                        return;
+                const currentChunk = await promiseSocket.read() as string | undefined;
+                if (currentChunk === undefined) {
+                    // The end of the socket
+                    console.info('Incoming request server socket EOF');
+
+                    // Force cleaning even if somehow not detached
+                    await cleanupSession();
+        
+                    if (contentToProcess) {
+                        console.error('TCP connection recieved EOF, but the last content didn\'t end up with line break.');
                     }
-                    // otherwise
-            
-                    contentToProcess = contentToProcess + currentChunk;
+                    incomingRequestServerConnected = false;
+                    return;
+                }
+                // otherwise
+        
+                contentToProcess = contentToProcess + currentChunk;
         
                 const requests = contentToProcess.split((/\r?\n/));
                 for (let i = 0; i < requests.length - 1; ++i) {
@@ -861,6 +867,7 @@ function startIncomingRequestServer(sessionStatusBarItem: StatusBarItem) {
                 contentToProcess = requests[requests.length - 1];
             }
         } catch (err) {
+            // eslint-disable-next-line @typescript-eslint/restrict-template-expressions
             console.error(`Error while processing TCP connection: ${err}`);
 
             await cleanupSession();
@@ -870,11 +877,11 @@ function startIncomingRequestServer(sessionStatusBarItem: StatusBarItem) {
 
     const server = incomingRequestServer.listen(config().get<number>('sessionWatcherTCPServerPort'),
         config().get<string>('sessionWatcherTCPServerHostName'), function() {
-        incomingRequestServerAddressInfo = server.address() as AddressInfo;
-        console.info(`Started listening on ${addressToStr(incomingRequestServerAddressInfo)}`);
+            incomingRequestServerAddressInfo = server.address() as AddressInfo;
+            console.info(`Started listening on ${addressToStr(incomingRequestServerAddressInfo)}`);
 
-        updateSessionStatusBarItem(sessionStatusBarItem);
-    });
+            updateSessionStatusBarItem(sessionStatusBarItem);
+        });
 
     return server;
 }
@@ -889,7 +896,7 @@ const create_tmp_file: (options: tmp.FileOptions) => Promise<{ name: string, fd:
             }
         });
     }
-);
+    );
 
 export async function processRequest(request: ISessionRequest, socket: Socket | null, sessionStatusBarItem: StatusBarItem) {
     switch (request.command) {
@@ -907,8 +914,8 @@ export async function processRequest(request: ISessionRequest, socket: Socket |
             break;
         }
         case 'updateWorkspace' : {
-            if (request.workspaceData == null) {
-                console.error("[updateRequest] workspaceData is not set!")
+            if (!request.workspaceData) {
+                console.error('[updateRequest] workspaceData is not set!');
                 return;
             }
 
@@ -930,7 +937,7 @@ export async function processRequest(request: ISessionRequest, socket: Socket |
             // TODO: Log and show correct TCP info here
             console.info(`[updateRequest] attach PID: ${pid}`);
             updateSessionStatusBarItem(sessionStatusBarItem);
-            if (socket == null) {
+            if (socket === null) {
                 updateSessionWatcher();
             }
 
@@ -943,7 +950,7 @@ export async function processRequest(request: ISessionRequest, socket: Socket |
             if (request.plot_url) {
                 await globalHttpgdManager?.showViewer(request.plot_url);
             }
-            if (socket == null) {
+            if (socket === null) {
                 void watchProcess(pid).then((v: string) => {
                     void cleanupSession(v);
                 });
@@ -951,7 +958,7 @@ export async function processRequest(request: ISessionRequest, socket: Socket |
             break;
         }
         case 'detach': {
-            if (socket == null) {
+            if (socket === null) {
                 if (request.pid) {
                     await cleanupSession(request.pid);
                 }
@@ -981,14 +988,16 @@ export async function processRequest(request: ISessionRequest, socket: Socket |
         }
         case 'plot': {
             if (request.format !== 'image/png') {
-                console.info(`Error: the format ${request.format} isn't supported, only image/png is supported for now.`);
+                console.info(`Error: the format ${request.format || '(none)'} isn't supported, only image/png is supported for now.`);
                 break;
             }
 
-            const { name: filePath, fd } = await create_tmp_file({ postfix: '.png' });
-            const arrayData = Buffer.from(request.plot_base64!, 'base64');
-            await fs.writeFile(fd, arrayData);
-            showPlot(filePath);
+            if (request.plot_base64) {
+                const { name: filePath, fd } = await create_tmp_file({ postfix: '.png' });
+                const arrayData = Buffer.from(request.plot_base64, 'base64');
+                await fs.writeFile(fd, arrayData);
+                showPlot(filePath);
+            }
             break;
         }
         case 'rstudioapi': {

From 72d57de45cc3bb9f28a2ae7c2918b9fa6cb832c7 Mon Sep 17 00:00:00 2001
From: Tal Hadad <thadad@istraresearch.com>
Date: Tue, 1 Aug 2023 17:34:36 +0300
Subject: [PATCH 09/28] ignore errors on TCP disconnecting in the R side

---
 R/session/vsc.R | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/R/session/vsc.R b/R/session/vsc.R
index fd15d23db..a5b1db6f0 100644
--- a/R/session/vsc.R
+++ b/R/session/vsc.R
@@ -962,8 +962,12 @@ print.hsearch <- function(x, ...) {
 }
 
 reg.finalizer(.GlobalEnv, function(e) {
-  .vsc$request("detach")
-  if (!is.na(request_tcp_connection)) {
-    close(request_tcp_connection)
-  }
+  # TODO: When exiting radian by EOF("CTRL+D") when coonecting to vsc by TCP,
+  #  the TCP connection is getting closed before we're able to call detach...
+  tryCatch({
+    .vsc$request("detach")
+    if (!is.na(request_tcp_connection)) {
+      close(request_tcp_connection)
+    }
+  }, error = function(e) NULL)
 }, onexit = TRUE)

From 099ccea8699ed9f4ee7910d8be513279bf58a992 Mon Sep 17 00:00:00 2001
From: Tal Hadad <thadad@istraresearch.com>
Date: Tue, 1 Aug 2023 17:35:39 +0300
Subject: [PATCH 10/28] never call `.vsc.attach` on init automatically, since
 it happen by sending command by vscode

---
 R/session/init.R | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/R/session/init.R b/R/session/init.R
index fd38e9f75..ba670a006 100644
--- a/R/session/init.R
+++ b/R/session/init.R
@@ -51,13 +51,6 @@ init_last <- function() {
     rm(".First.sys", envir = globalenv())
   )
 
-  if (nzchar(Sys.getenv("VSCODE_INIT_R"))) {
-    .vsc.attach(
-      host = Sys.getenv("VSCODE_ATTACH_HOST", unset = NA),
-      port = strtoi(Sys.getenv("VSCODE_ATTACH_PORT", unset = NA))
-    )
-  }
-
   invisible()
 }
 

From 6496252bcf453cbc54a35da74a3555ceb0aecf62 Mon Sep 17 00:00:00 2001
From: Tal Hadad <thadad@istraresearch.com>
Date: Tue, 1 Aug 2023 17:37:35 +0300
Subject: [PATCH 11/28] fix the host passing on `.vsc.attach`

---
 src/rTerminal.ts | 3 ++-
 src/session.ts   | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/rTerminal.ts b/src/rTerminal.ts
index b8edb4258..7235418f6 100644
--- a/src/rTerminal.ts
+++ b/src/rTerminal.ts
@@ -1,6 +1,7 @@
 'use strict';
 
 import * as path from 'path';
+import * as os from 'os';
 import { isDeepStrictEqual } from 'util';
 
 import * as vscode from 'vscode';
@@ -130,7 +131,7 @@ export async function makeTerminalOptions(): Promise<vscode.TerminalOptions> {
             R_PROFILE_USER: newRprofile,
             VSCODE_INIT_R: initR,
             VSCODE_WATCHER_DIR: homeExtDir(),
-            VSCODE_ATTACH_HOST: incomingRequestServerAddressInfo?.address,
+            VSCODE_ATTACH_HOST: os.hostname(),
             VSCODE_ATTACH_PORT: incomingRequestServerAddressInfo?.port?.toString(),
         };
     }
diff --git a/src/session.ts b/src/session.ts
index c52156615..de8f8d192 100644
--- a/src/session.ts
+++ b/src/session.ts
@@ -131,7 +131,7 @@ export function attachActive(): void {
     if (config().get<boolean>('sessionWatcher')) {
         console.info('[attachActive]');
         if (incomingRequestServerAddressInfo) {
-            void runTextInTerm(`.vsc.attach(host=${incomingRequestServerAddressInfo.address}, port=${incomingRequestServerAddressInfo.port}L)`);
+            void runTextInTerm(`.vsc.attach(host=${JSON.stringify(os.hostname())}, port=${incomingRequestServerAddressInfo.port}L)`);
         } else {
             void runTextInTerm('.vsc.attach()');
         }

From a4102bf9e544af6ac773542bccdc11bf7d252019 Mon Sep 17 00:00:00 2001
From: Tal Hadad <thadad@istraresearch.com>
Date: Tue, 1 Aug 2023 17:38:37 +0300
Subject: [PATCH 12/28] modify TCP->Tcp in vscode confs

---
 package.json   | 6 +++---
 src/session.ts | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/package.json b/package.json
index 4a53ec045..4fab8b612 100644
--- a/package.json
+++ b/package.json
@@ -1730,17 +1730,17 @@
           "default": true,
           "description": "Enable R session watcher. Required for workspace viewer and most features to work with an R session. Restart required to take effect."
         },
-        "r.sessionWatcherTCPServer": {
+        "r.sessionWatcherTcpServer": {
           "type": "boolean",
           "default": true,
           "description": "Enable TCP server connection for watching over R sessions. Requires `#r.sessionWatcher#` to be set to `true`. Requires reloading for changes to take effect."
         },
-        "r.sessionWatcherTCPServerHostName": {
+        "r.sessionWatcherTcpServerHostName": {
           "type": "string",
           "default": "127.0.0.1",
           "description": "The host name to listen for watching over R sessions. E.g. 127.0.0.1 for local connection only, and 0.0.0.0 for global exposure (security note: use the latter only in a secured close local network!). Requires `#r.sessionWatcher#` and `r.sessionWatcher.TCPServer` to be set to `true`. Requires reloading for changes to take effect."
         },
-        "r.sessionWatcherTCPServerPort": {
+        "r.sessionWatcherTcpServerPort": {
           "type": "integer",
           "default": 0,
           "description": "The port to listen to, or 0 for automatic port selection (recommended). Requires `#r.sessionWatcher#` and `r.sessionWatcher.TCPServer` to be set to `true`. Requires reloading for changes to take effect."
diff --git a/src/session.ts b/src/session.ts
index de8f8d192..7d4bd4dcb 100644
--- a/src/session.ts
+++ b/src/session.ts
@@ -120,7 +120,7 @@ export function startRequestWatcher(sessionStatusBarItem: StatusBarItem): void {
         void updateRequest(sessionStatusBarItem);
     });
 
-    if (config().get<boolean>('sessionWatcherTCPServer')) {
+    if (config().get<boolean>('sessionWatcherTcpServer')) {
         void startIncomingRequestServer(sessionStatusBarItem);
     }
 
@@ -875,8 +875,8 @@ function startIncomingRequestServer(sessionStatusBarItem: StatusBarItem) {
         }
     });
 
-    const server = incomingRequestServer.listen(config().get<number>('sessionWatcherTCPServerPort'),
-        config().get<string>('sessionWatcherTCPServerHostName'), function() {
+    const server = incomingRequestServer.listen(config().get<number>('sessionWatcherTcpServerPort'),
+        config().get<string>('sessionWatcherTcpServerHostName'), function() {
             incomingRequestServerAddressInfo = server.address() as AddressInfo;
             console.info(`Started listening on ${addressToStr(incomingRequestServerAddressInfo)}`);
 

From cc2aa9b5c4b087c243678d024b0bd461c24366af Mon Sep 17 00:00:00 2001
From: Tal Hadad <thadad@istraresearch.com>
Date: Wed, 2 Aug 2023 14:54:01 +0300
Subject: [PATCH 13/28] cleaning old active connection if a new one wants to
 connect

---
 src/session.ts | 51 +++++++++++++++++++++++++++++++++++++++++---------
 1 file changed, 42 insertions(+), 9 deletions(-)

diff --git a/src/session.ts b/src/session.ts
index 7d4bd4dcb..c6ab3dff1 100644
--- a/src/session.ts
+++ b/src/session.ts
@@ -53,7 +53,7 @@ let requestTimeStamp: number;
 let responseTimeStamp: number;
 export let sessionDir: string;
 export let workingDir: string;
-let incomingRequestServerConnected = false;
+let incomingRequestServerCurrentSocket: Socket | null = null;
 let rVer: string;
 let pid: string;
 // eslint-disable-next-line @typescript-eslint/no-explicit-any
@@ -74,6 +74,15 @@ let activeBrowserExternalUri: Uri | undefined;
 export let incomingRequestServerAddressInfo: AddressInfo | undefined = undefined;
 export let attached = false;
 
+class AnotherSocketConnectionError extends Error {
+    finishCleaningCallback: () => void;
+
+    constructor (finishCleaningCallback: () => void) {
+        super();
+        this.finishCleaningCallback = finishCleaningCallback;
+    }
+}
+
 const addressToStr = (addressInfo: AddressInfo) => `${addressInfo.address}:${addressInfo.port}`;
 
 function updateSessionStatusBarItem(sessionStatusBarItem: StatusBarItem) {
@@ -823,13 +832,29 @@ function startIncomingRequestServer(sessionStatusBarItem: StatusBarItem) {
     // eslint-disable-next-line @typescript-eslint/no-misused-promises
     const incomingRequestServer = new Server(async (socket: Socket) => {
         console.info(`Incoming connection to the request server from ${addressToStr(socket.address() as AddressInfo)}`);
-        if (incomingRequestServerConnected) {
-            console.error('A new connection to the incoming request server tries to connect but another connection currently connected!');
-            return;
+        if (incomingRequestServerCurrentSocket !== null) {
+            console.info('Closing existing connection to the incoming request server since a new one is pending.');
+
+            let resolveHandle: (() => void) | null = null;
+            let wasHandledQuick = false;
+            const promise = new Promise<void>((resolve) => {
+                resolveHandle = resolve;
+            });
+            const callback = () => {
+                if (resolveHandle === null) {
+                    wasHandledQuick = true;
+                } else {
+                    resolveHandle();
+                }
+            };
+            incomingRequestServerCurrentSocket.destroy(new AnotherSocketConnectionError(callback));
+            if (!wasHandledQuick) {
+                await promise;
+            }
         }
 
         console.info('A new connection to the incoming request server has been established.');
-        incomingRequestServerConnected = true;
+        incomingRequestServerCurrentSocket = socket;
 
         try {
             const promiseSocket = new PromiseSocket(socket);
@@ -849,7 +874,7 @@ function startIncomingRequestServer(sessionStatusBarItem: StatusBarItem) {
                     if (contentToProcess) {
                         console.error('TCP connection recieved EOF, but the last content didn\'t end up with line break.');
                     }
-                    incomingRequestServerConnected = false;
+                    incomingRequestServerCurrentSocket = null;
                     return;
                 }
                 // otherwise
@@ -867,11 +892,19 @@ function startIncomingRequestServer(sessionStatusBarItem: StatusBarItem) {
                 contentToProcess = requests[requests.length - 1];
             }
         } catch (err) {
-            // eslint-disable-next-line @typescript-eslint/restrict-template-expressions
-            console.error(`Error while processing TCP connection: ${err}`);
+            if (err instanceof AnotherSocketConnectionError) {
+                console.error(`Closing this TCP connection since another one is pending.`);
+            } else {
+                // eslint-disable-next-line @typescript-eslint/restrict-template-expressions
+                console.error(`Error while processing TCP connection: ${err}`);
+            }
 
             await cleanupSession();
-            incomingRequestServerConnected = false;
+            incomingRequestServerCurrentSocket = null;
+
+            if (err instanceof AnotherSocketConnectionError) {
+                err.finishCleaningCallback();
+            }
         }
     });
 

From 0d3f446c9117a56555b73772e2d097eb4a1ec744 Mon Sep 17 00:00:00 2001
From: Tal Hadad <thadad@istraresearch.com>
Date: Wed, 2 Aug 2023 15:11:30 +0300
Subject: [PATCH 14/28] minor issue fix

---
 R/session/vsc.R | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/R/session/vsc.R b/R/session/vsc.R
index a5b1db6f0..bcb8d3a07 100644
--- a/R/session/vsc.R
+++ b/R/session/vsc.R
@@ -438,7 +438,7 @@ if (use_httpgd && "httpgd" %in% .packages(all.available = TRUE)) {
           on.exit({
             dev.off()
             cat(get_timestamp(), file = plot_lock_file)
-            if (request_tcp_connection) {
+            if (!is.na(request_tcp_connection)) {
               tryCatch({
                   plot_file_content <- readr::read_file_raw(plot_file)
                   format <- "image/png"# right now only this format is supported

From a7abdcf4cfb17cd661d8601b77f1ee15ca71e8ad Mon Sep 17 00:00:00 2001
From: Tal Hadad <thadad@istraresearch.com>
Date: Wed, 2 Aug 2023 15:12:52 +0300
Subject: [PATCH 15/28] expose detach function to R API

---
 R/session/init_late.R |  1 +
 R/session/vsc.R       | 16 ++++++++++------
 2 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/R/session/init_late.R b/R/session/init_late.R
index 0e5443283..2b8f061de 100644
--- a/R/session/init_late.R
+++ b/R/session/init_late.R
@@ -17,6 +17,7 @@ source(file.path(dir_init, "vsc.R"), local = .vsc)
 exports <- local({
 .vsc <- .vsc
 .vsc.attach <- .vsc$attach
+.vsc.detach <- .vsc$detach
 .vsc.view <- .vsc$show_dataview
 .vsc.browser <- .vsc$show_browser
 .vsc.viewer <- .vsc$show_viewer
diff --git a/R/session/vsc.R b/R/session/vsc.R
index bcb8d3a07..4f4743ff2 100644
--- a/R/session/vsc.R
+++ b/R/session/vsc.R
@@ -655,8 +655,7 @@ attach <- function(host = "127.0.0.1", port = NA) {
     rstudioapi_util_env$update_addin_registry(addin_registry)
   }
   if (!is.na(request_tcp_connection)) {
-    close(request_tcp_connection)
-    request_tcp_connection <<- NA
+    detach()
   }
   if (!is.na(port)) {
     request_tcp_connection <<- socketConnection(
@@ -685,6 +684,14 @@ attach <- function(host = "127.0.0.1", port = NA) {
   )
 }
 
+detach <- function() {
+    request("detach")
+    if (!is.na(request_tcp_connection)) {
+      close(request_tcp_connection)
+      request_tcp_connection <<- NA
+    }
+}
+
 path_to_uri <- function(path) {
   if (length(path) == 0) {
     return(character())
@@ -965,9 +972,6 @@ reg.finalizer(.GlobalEnv, function(e) {
   # TODO: When exiting radian by EOF("CTRL+D") when coonecting to vsc by TCP,
   #  the TCP connection is getting closed before we're able to call detach...
   tryCatch({
-    .vsc$request("detach")
-    if (!is.na(request_tcp_connection)) {
-      close(request_tcp_connection)
-    }
+    detach()
   }, error = function(e) NULL)
 }, onexit = TRUE)

From b5cb235c2c4254c083d24f4ff888ed6356c811f3 Mon Sep 17 00:00:00 2001
From: Tal Hadad <thadad@istraresearch.com>
Date: Thu, 3 Aug 2023 12:25:59 +0300
Subject: [PATCH 16/28] fix r-linting error in `init_late.R`

---
 R/session/init_late.R | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/R/session/init_late.R b/R/session/init_late.R
index 2b8f061de..7a6fa9cd8 100644
--- a/R/session/init_late.R
+++ b/R/session/init_late.R
@@ -45,4 +45,4 @@ if (!identical(getOption("vsc.helpPanel", "Two"), FALSE)) {
 }
 # Further S3 overwrites can go here
 # ...
-})
\ No newline at end of file
+})

From 2a6681c67e51942f8285f7405f62330b0822b279 Mon Sep 17 00:00:00 2001
From: Tal Hadad <thadad@istraresearch.com>
Date: Thu, 3 Aug 2023 13:04:09 +0300
Subject: [PATCH 17/28] omit old TODO

---
 src/session.ts | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/session.ts b/src/session.ts
index c6ab3dff1..14e58d595 100644
--- a/src/session.ts
+++ b/src/session.ts
@@ -967,7 +967,6 @@ export async function processRequest(request: ISessionRequest, socket: Socket |
             info = request.info;
             sessionDir = path.join(request.tempdir, 'vscode-R');
             workingDir = request.wd;
-            // TODO: Log and show correct TCP info here
             console.info(`[updateRequest] attach PID: ${pid}`);
             updateSessionStatusBarItem(sessionStatusBarItem);
             if (socket === null) {

From 860c8d5856e519282b450d70faf1fa8de8c2c5d2 Mon Sep 17 00:00:00 2001
From: Tal Hadad <thadad@istraresearch.com>
Date: Thu, 3 Aug 2023 13:22:51 +0300
Subject: [PATCH 18/28] graceful detach that restoring the previous
 hooks/handlers before vsc

---
 R/session/init_late.R |  1 -
 R/session/vsc.R       | 85 ++++++++++++++++++++++++++++++++++++-------
 2 files changed, 71 insertions(+), 15 deletions(-)

diff --git a/R/session/init_late.R b/R/session/init_late.R
index 7a6fa9cd8..61a592db4 100644
--- a/R/session/init_late.R
+++ b/R/session/init_late.R
@@ -22,7 +22,6 @@ exports <- local({
 .vsc.browser <- .vsc$show_browser
 .vsc.viewer <- .vsc$show_viewer
 .vsc.page_viewer <- .vsc$show_page_viewer
-View <- .vsc.view
 environment()
 })
 attach(exports, name = .vsc.name, warn.conflicts = FALSE)
diff --git a/R/session/vsc.R b/R/session/vsc.R
index 4f4743ff2..0673ff02d 100644
--- a/R/session/vsc.R
+++ b/R/session/vsc.R
@@ -9,7 +9,24 @@ request_file <- file.path(dir_watcher, "request.log")
 request_lock_file <- file.path(dir_watcher, "request.lock")
 settings_file <- file.path(dir_watcher, "settings.json")
 request_tcp_connection <- NA
+request_is_attached <- FALSE
+before_attach_options <- list()
+options_when_connected_list <- list()
+options_when_connected <- function(...) {
+  l <- list(...)
+  mapply(function(option, value) {
+    options_when_connected_list[[option]] <<- value
+  }, names(l), l)
+}
+before_attach_hooks <- list()
+hooks_when_connected_list <- list()
+hook_when_connected <- function(hook, cb) {
+  hooks_when_connected_list[[hook]] <<- cb
+}
 user_options <- names(options())
+created_devices <- c()
+View_impl <- NULL
+old_view_impl <- View
 
 logger <- if (getOption("vsc.debug", FALSE)) {
   function(...) cat(..., "\n", sep = "")
@@ -64,7 +81,7 @@ load_settings <- function() {
 load_settings()
 
 if (is.null(getOption("help_type"))) {
-  options(help_type = "html")
+  options_when_connected(help_type = "html")
 }
 
 use_webserver <- isTRUE(getOption("vsc.use_webserver", FALSE))
@@ -389,10 +406,11 @@ removeTaskCallback("vsc.plot")
 use_httpgd <- identical(getOption("vsc.use_httpgd", FALSE), TRUE)
 show_plot <- !identical(getOption("vsc.plot", "Two"), FALSE)
 if (use_httpgd && "httpgd" %in% .packages(all.available = TRUE)) {
-  options(device = function(...) {
+  options_when_connected(device = function(...) {
     httpgd::hgd(
       silent = TRUE
     )
+    created_devices <<- append(created_devices, dev.cur())
     .vsc$request("httpgd", url = httpgd::hgd_url())
   })
 } else if (use_httpgd) {
@@ -417,12 +435,13 @@ if (use_httpgd && "httpgd" %in% .packages(all.available = TRUE)) {
     }
   }
 
-  options(
+  options_when_connected(
     device = function(...) {
       pdf(NULL,
         width = null_dev_size[[1L]],
         height = null_dev_size[[2L]],
         bg = "white")
+      created_devices <<- append(created_devices, dev.cur())
       dev.control(displaylist = "enable")
     }
   )
@@ -436,7 +455,9 @@ if (use_httpgd && "httpgd" %in% .packages(all.available = TRUE)) {
           dev_args <- getOption("vsc.dev.args")
           do.call(png, c(list(filename = plot_file), dev_args))
           on.exit({
+            cur_dev <- dev.cur()
             dev.off()
+            created_devices <<- created_devices[created_devices != cur_dev]
             cat(get_timestamp(), file = plot_lock_file)
             if (!is.na(request_tcp_connection)) {
               tryCatch({
@@ -453,12 +474,12 @@ if (use_httpgd && "httpgd" %in% .packages(all.available = TRUE)) {
     TRUE
   }
 
-  setHook("plot.new", new_plot, "replace")
-  setHook("grid.newpage", new_plot, "replace")
+  hook_when_connected("plot.new", new_plot)
+  hook_when_connected("grid.newpage", new_plot)
 
   rebind(".External.graphics", function(...) {
     out <- .Primitive(".External.graphics")(...)
-    if (check_null_dev()) {
+    if (request_is_attached && check_null_dev()) {
       plot_updated <<- TRUE
     }
     out
@@ -646,17 +667,17 @@ if (show_view) {
     }
   }
 
-  rebind("View", show_dataview, "utils")
+  View_impl <- show_dataview
 }
 
 attach <- function(host = "127.0.0.1", port = NA) {
+  if (request_is_attached) {
+    detach()
+  }
   load_settings()
   if (rstudioapi_enabled()) {
     rstudioapi_util_env$update_addin_registry(addin_registry)
   }
-  if (!is.na(request_tcp_connection)) {
-    detach()
-  }
   if (!is.na(port)) {
     request_tcp_connection <<- socketConnection(
       host = host,
@@ -682,6 +703,23 @@ attach <- function(host = "127.0.0.1", port = NA) {
       token = parent$token
     ) else NULL
   )
+  if (!request_is_attached) {
+    options_name <- names(options_when_connected_list)
+    before_attach_options <<- setNames(lapply(options_name, function(option) getOption(option)), options_name)
+
+    hooks_name <- names(hooks_when_connected_list)
+    before_attach_hooks <<- setNames(lapply(hooks_name, function(hook_name) getHook(hook_name)), hooks_name)
+
+    old_view_impl <<- View
+    if (!is.null(View_impl)) {
+      rebind("View", View_impl, "utils")
+    }
+  }
+  do.call(options, options_when_connected_list)
+  mapply(function(hook_name, cb) {
+    setHook(hook_name, cb, "replace")
+  }, hooks_name, hooks_when_connected_list)
+  request_is_attached <<- TRUE
 }
 
 detach <- function() {
@@ -690,6 +728,25 @@ detach <- function() {
       close(request_tcp_connection)
       request_tcp_connection <<- NA
     }
+  if (request_is_attached) {
+    # restore previous options
+    options_name <- names(options_when_connected_list)
+    do.call(options, setNames(before_attach_options[options_name], options_name))
+
+    # restore previous hooks
+    hooks_name <- names(hooks_when_connected_list)
+    mapply(function(hook_name, cbs) {
+      setHook(hook_name, cbs, "replace")
+    }, hooks_name, before_attach_hooks[hooks_name])
+
+    if (!is.null(View_impl)) {
+      rebind("View", old_view_impl, "utils")
+    }
+
+    lapply(created_devices, function(dev) dev.off(dev))
+    created_devices <<- c()
+  }
+  request_is_attached <<- FALSE
 }
 
 path_to_uri <- function(path) {
@@ -827,7 +884,7 @@ show_page_viewer <- function(url, title = NULL, ...,
   show_webview(url = url, title = title, ..., viewer = viewer)
 }
 
-options(
+options_when_connected(
   browser = show_browser,
   viewer = show_viewer,
   page_viewer = show_page_viewer
@@ -882,7 +939,7 @@ if (rstudioapi_enabled()) {
   rstudioapi_env <- new.env(parent = rstudioapi_util_env)
   source(file.path(dir_init, "rstudioapi_util.R"), local = rstudioapi_util_env)
   source(file.path(dir_init, "rstudioapi.R"), local = rstudioapi_env)
-  setHook(
+  hook_when_connected(
     packageEvent("rstudioapi", "onLoad"),
     function(...) {
       rstudioapi_util_env$rstudioapi_patch_hook(rstudioapi_env)
@@ -900,7 +957,7 @@ if (rstudioapi_enabled()) {
 
 print.help_files_with_topic <- function(h, ...) {
   viewer <- getOption("vsc.helpPanel", "Two")
-  if (!identical(FALSE, viewer) && length(h) >= 1 && is.character(h)) {
+  if (request_is_attached && !identical(FALSE, viewer) && length(h) >= 1 && is.character(h)) {
     file <- h[1]
     path <- dirname(file)
     dirpath <- dirname(path)
@@ -921,7 +978,7 @@ print.help_files_with_topic <- function(h, ...) {
 
 print.hsearch <- function(x, ...) {
   viewer <- getOption("vsc.helpPanel", "Two")
-  if (!identical(FALSE, viewer) && length(x) >= 1) {
+  if (request_is_attached && !identical(FALSE, viewer) && length(x) >= 1) {
     requestPath <- paste0(
       "/doc/html/Search?pattern=",
       tools:::escapeAmpersand(x$pattern),

From 6f6199d684367eda64ae83e310563999c715c50d Mon Sep 17 00:00:00 2001
From: Tal Hadad <thadad@istraresearch.com>
Date: Thu, 3 Aug 2023 16:37:36 +0300
Subject: [PATCH 19/28] acknowledgement on successful request and best-effort
 on server EOF message

---
 R/session/vsc.R | 74 +++++++++++++++++++++++++++++++++++++++----------
 src/session.ts  |  5 +++-
 2 files changed, 64 insertions(+), 15 deletions(-)

diff --git a/R/session/vsc.R b/R/session/vsc.R
index 0673ff02d..736b9179c 100644
--- a/R/session/vsc.R
+++ b/R/session/vsc.R
@@ -231,7 +231,17 @@ request <- function(command, ...) {
     auto_unbox = TRUE, na = "string", null = "null", force = TRUE)
   if (is.na(request_tcp_connection)) {
     cat(get_timestamp(), file = request_lock_file)
+  } else {
+    response <- readLines(request_tcp_connection, n = 1)
+    if (length(response) == 0) {
+      # If the server ends up the connection
+      detach(including_request_detach = FALSE)
+      return(TRUE)
+    } else if (length(response) != 1 && response != "req_finished") {
+      stop(paste("Error in connection: Malform response: \n", paste(response, collapse = "\n"), "\n"))
+    }
   }
+  FALSE
 }
 
 try_catch_timeout <- function(expr, timeout = Inf, ...) {
@@ -463,7 +473,14 @@ if (use_httpgd && "httpgd" %in% .packages(all.available = TRUE)) {
               tryCatch({
                   plot_file_content <- readr::read_file_raw(plot_file)
                   format <- "image/png"# right now only this format is supported
-                  request("plot", format = format, plot_base64 = jsonlite::base64_enc(plot_file_content))
+                  if (request("plot", format = format, plot_base64 = jsonlite::base64_enc(plot_file_content))) {
+                    cat(stderr(),
+                      paste(
+                        "The connection to VSCode was disconnected, and it was detected only now after plotting.",
+                        "Please run the plot task again."
+                      )
+                    )
+                  }
               }, error = message)
             }
           })
@@ -646,7 +663,7 @@ if (show_view) {
           title = title, data = data, viewer = viewer, uuid = uuid)
       }
     }
-    if (is.data.frame(x) || is.matrix(x)) {
+    should_default_view <- if (is.data.frame(x) || is.matrix(x)) {
       x <- as_truncated_data(x)
       data <- dataview_table(x)
       send_data_request(data, source = "table", type = "json", fileext = ".json")
@@ -665,6 +682,9 @@ if (show_view) {
       }
       send_data_request(code, source = "object", type = "R", paste0(make.names(title)), fileext = ".R")
     }
+    if (should_default_view) {
+      old_view_impl(x, title)
+    }
   }
 
   View_impl <- show_dataview
@@ -722,12 +742,14 @@ attach <- function(host = "127.0.0.1", port = NA) {
   request_is_attached <<- TRUE
 }
 
-detach <- function() {
+detach <- function(including_request_detach = TRUE) {
+  if (including_request_detach) {
     request("detach")
-    if (!is.na(request_tcp_connection)) {
-      close(request_tcp_connection)
-      request_tcp_connection <<- NA
-    }
+  }
+  if (!is.na(request_tcp_connection)) {
+    close(request_tcp_connection)
+    request_tcp_connection <<- NA
+  }
   if (request_is_attached) {
     # restore previous options
     options_name <- names(options_when_connected_list)
@@ -795,7 +817,7 @@ show_browser <- function(url, title = url, ...,
     request_browser(url = url, title = title, ..., viewer = FALSE)
   } else {
     path <- sub("^file\\://", "", url)
-    if (file.exists(path)) {
+    should_default_browser <- if (file.exists(path)) {
       path <- normalizePath(path, "/", mustWork = TRUE)
       if (grepl("\\.html?$", path, ignore.case = TRUE)) {
         message(
@@ -811,6 +833,10 @@ show_browser <- function(url, title = url, ...,
     } else {
       stop("File not exists")
     }
+    if (should_default_browser) {
+      browser <- before_attach_options[["browser"]]
+      utils::browseURL(url, browser = browser)
+    }
   }
 }
 
@@ -868,7 +894,16 @@ show_viewer <- function(url, title = NULL, ...,
       title <- deparse(expr, nlines = 1)
     }
   }
-  show_webview(url = url, title = title, ..., viewer = viewer)
+  should_default_viewer <- show_webview(url = url, title = title, ..., viewer = viewer)
+  if (should_default_viewer) {
+    # Reference: https://rstudio.github.io/rstudio-extensions/rstudio_viewer.html
+    viewer <- before_attach_options[["viewer"]]
+    if (!is.null(viewer)) {
+      viewer(url)
+    } else {
+      utils::browseURL(url)
+    }
+  }
 }
 
 show_page_viewer <- function(url, title = NULL, ...,
@@ -881,7 +916,16 @@ show_page_viewer <- function(url, title = NULL, ...,
       title <- deparse(expr, nlines = 1)
     }
   }
-  show_webview(url = url, title = title, ..., viewer = viewer)
+  should_default_page_viewer <- show_webview(url = url, title = title, ..., viewer = viewer)
+  if (should_default_page_viewer) {
+    # Reference: https://rstudio.github.io/rstudio-extensions/rstudio_viewer.html
+    page_viewer <- before_attach_options[["page_viewer"]]
+    if (!is.null(page_viewer)) {
+      page_viewer(url)
+    } else {
+      utils::browseURL(url)
+    }
+  }
 }
 
 options_when_connected(
@@ -969,7 +1013,9 @@ print.help_files_with_topic <- function(h, ...) {
       basename(file),
       ".html"
     )
-    request(command = "help", requestPath = requestPath, viewer = viewer)
+    if (request(command = "help", requestPath = requestPath, viewer = viewer)) {
+      utils:::print.help_files_with_topic(h, ...)
+    }
   } else {
     utils:::print.help_files_with_topic(h, ...)
   }
@@ -1008,7 +1054,9 @@ print.hsearch <- function(x, ...) {
         )
       }
     )
-    request(command = "help", requestPath = requestPath, viewer = viewer)
+    if (request(command = "help", requestPath = requestPath, viewer = viewer)) {
+      utils:::print.hsearch(x, ...)
+    }
   } else {
     utils:::print.hsearch(x, ...)
   }
@@ -1026,8 +1074,6 @@ print.hsearch <- function(x, ...) {
 }
 
 reg.finalizer(.GlobalEnv, function(e) {
-  # TODO: When exiting radian by EOF("CTRL+D") when coonecting to vsc by TCP,
-  #  the TCP connection is getting closed before we're able to call detach...
   tryCatch({
     detach()
   }, error = function(e) NULL)
diff --git a/src/session.ts b/src/session.ts
index 14e58d595..2f291fea2 100644
--- a/src/session.ts
+++ b/src/session.ts
@@ -855,9 +855,9 @@ function startIncomingRequestServer(sessionStatusBarItem: StatusBarItem) {
 
         console.info('A new connection to the incoming request server has been established.');
         incomingRequestServerCurrentSocket = socket;
+        const promiseSocket = new PromiseSocket(socket);
 
         try {
-            const promiseSocket = new PromiseSocket(socket);
             console.info('Waiting for TCP input...');
         
             let contentToProcess = '';
@@ -888,6 +888,7 @@ function startIncomingRequestServer(sessionStatusBarItem: StatusBarItem) {
                     //console.debug(`TCP Request received from client: ${requestContent}.`);
                     const request = JSON.parse(requestContent) as ISessionRequest;
                     await processRequest(request, socket, sessionStatusBarItem);
+                    await promiseSocket.write('req_finished\n');
                 }
                 contentToProcess = requests[requests.length - 1];
             }
@@ -899,6 +900,8 @@ function startIncomingRequestServer(sessionStatusBarItem: StatusBarItem) {
                 console.error(`Error while processing TCP connection: ${err}`);
             }
 
+            void promiseSocket.end();
+
             await cleanupSession();
             incomingRequestServerCurrentSocket = null;
 

From b45db8d191bb995b5ef8c02410ba38a0ef2d531e Mon Sep 17 00:00:00 2001
From: Tal Hadad <thadad@istraresearch.com>
Date: Thu, 3 Aug 2023 17:49:05 +0300
Subject: [PATCH 20/28] user button for detaching from session

---
 package.json     | 12 ++++++++
 src/extension.ts |  1 +
 src/session.ts   | 75 +++++++++++++++++++++++++++++++-----------------
 src/util.ts      | 22 ++++++++++++++
 4 files changed, 84 insertions(+), 26 deletions(-)

diff --git a/package.json b/package.json
index 4fab8b612..179c2e2b8 100644
--- a/package.json
+++ b/package.json
@@ -322,6 +322,13 @@
       }
     ],
     "commands": [
+      {
+        "command": "r.workspaceViewer.detachSession",
+        "title": "Detach Session",
+        "icon": "$(debug-disconnect)",
+        "category": "R Workspace Viewer",
+        "enablement": "rSessionActive"
+      },
       {
         "command": "r.workspaceViewer.refreshEntry",
         "title": "Manual Refresh",
@@ -1365,6 +1372,11 @@
           "group": "navigation@3",
           "when": "r.WorkspaceViewer:show && view == workspaceViewer"
         },
+        {
+          "command": "r.workspaceViewer.detachSession",
+          "group": "navigation@4",
+          "when": "r.WorkspaceViewer:show && view == workspaceViewer && !r.liveShare:isGuest"
+        },
         {
           "command": "r.helpPanel.showQuickPick",
           "group": "navigation",
diff --git a/src/extension.ts b/src/extension.ts
index fe40910c8..cbeffde68 100644
--- a/src/extension.ts
+++ b/src/extension.ts
@@ -139,6 +139,7 @@ export async function activate(context: vscode.ExtensionContext): Promise<apiImp
         'r.launchAddinPicker': rstudioapi.launchAddinPicker,
 
         // workspace viewer
+        'r.workspaceViewer.detachSession': session.detach,
         'r.workspaceViewer.refreshEntry': () => rWorkspace?.refresh(),
         'r.workspaceViewer.view': (node: workspaceViewer.GlobalEnvItem) => node?.label && workspaceViewer.viewItem(node.label),
         'r.workspaceViewer.remove': (node: workspaceViewer.GlobalEnvItem) => node?.label && workspaceViewer.removeItem(node.label),
diff --git a/src/session.ts b/src/session.ts
index 2f291fea2..6d4b89373 100644
--- a/src/session.ts
+++ b/src/session.ts
@@ -12,7 +12,7 @@ import { commands, StatusBarItem, Uri, ViewColumn, Webview, window, workspace, e
 
 import { runTextInTerm } from './rTerminal';
 import { FSWatcher } from 'fs-extra';
-import { config, readContent, setContext, UriIcon } from './util';
+import { config, createWaiterForInvoker, readContent, setContext, UriIcon } from './util';
 import { purgeAddinPickerItems, dispatchRStudioAPICall } from './rstudioapi';
 
 import { IRequest } from './liveShare/shareSession';
@@ -74,12 +74,28 @@ let activeBrowserExternalUri: Uri | undefined;
 export let incomingRequestServerAddressInfo: AddressInfo | undefined = undefined;
 export let attached = false;
 
-class AnotherSocketConnectionError extends Error {
-    finishCleaningCallback: () => void;
+enum InterruptReason {
+    ANOTHER_CONNECTION,
+    USER_REQUEST
+}
+
+class InterruptSocketConnectionError extends Error {
+    reason: InterruptReason;
+    finishWaiter: Promise<void>;
+    private finishInvoker: () => void;
 
-    constructor (finishCleaningCallback: () => void) {
+    constructor (reason: InterruptReason) {
         super();
-        this.finishCleaningCallback = finishCleaningCallback;
+
+        this.reason = reason;
+
+        const pair = createWaiterForInvoker();
+        this.finishWaiter = pair.waiter;
+        this.finishInvoker = pair.invoker;
+    }
+
+    reportFinishHandling() {
+        this.finishInvoker();
     }
 }
 
@@ -339,6 +355,17 @@ function getBrowserHtml(uri: Uri): string {
 `;
 }
 
+export async function detach() {
+    if (incomingRequestServerCurrentSocket === null) {
+        return;
+    }
+    // otherwise
+    
+    const interrupt = new InterruptSocketConnectionError(InterruptReason.USER_REQUEST);
+    incomingRequestServerCurrentSocket.destroy(interrupt);
+    await interrupt.finishWaiter;
+}
+
 export function refreshBrowser(): void {
     console.log('[refreshBrowser]');
     if (activeBrowserPanel) {
@@ -835,22 +862,9 @@ function startIncomingRequestServer(sessionStatusBarItem: StatusBarItem) {
         if (incomingRequestServerCurrentSocket !== null) {
             console.info('Closing existing connection to the incoming request server since a new one is pending.');
 
-            let resolveHandle: (() => void) | null = null;
-            let wasHandledQuick = false;
-            const promise = new Promise<void>((resolve) => {
-                resolveHandle = resolve;
-            });
-            const callback = () => {
-                if (resolveHandle === null) {
-                    wasHandledQuick = true;
-                } else {
-                    resolveHandle();
-                }
-            };
-            incomingRequestServerCurrentSocket.destroy(new AnotherSocketConnectionError(callback));
-            if (!wasHandledQuick) {
-                await promise;
-            }
+            const interrupt = new InterruptSocketConnectionError(InterruptReason.ANOTHER_CONNECTION);
+            incomingRequestServerCurrentSocket.destroy(interrupt);
+            await interrupt.finishWaiter;
         }
 
         console.info('A new connection to the incoming request server has been established.');
@@ -893,20 +907,29 @@ function startIncomingRequestServer(sessionStatusBarItem: StatusBarItem) {
                 contentToProcess = requests[requests.length - 1];
             }
         } catch (err) {
-            if (err instanceof AnotherSocketConnectionError) {
-                console.error(`Closing this TCP connection since another one is pending.`);
+            if (err instanceof InterruptSocketConnectionError) {
+                switch (err.reason) {
+                    case InterruptReason.ANOTHER_CONNECTION:
+                        console.log(`Closing this TCP connection since another one is pending.`);
+                        break;
+                    case InterruptReason.USER_REQUEST:
+                        console.log(`Closing this TCP connection because of a user request.`);
+                        break;
+                }
             } else {
                 // eslint-disable-next-line @typescript-eslint/restrict-template-expressions
                 console.error(`Error while processing TCP connection: ${err}`);
             }
 
-            void promiseSocket.end();
+            void promiseSocket.end().catch(() => {
+                // For some reason, there is an error when ending this connection, so we're ignoring the error for now
+            });
 
             await cleanupSession();
             incomingRequestServerCurrentSocket = null;
 
-            if (err instanceof AnotherSocketConnectionError) {
-                err.finishCleaningCallback();
+            if (err instanceof InterruptSocketConnectionError) {
+                err.reportFinishHandling();
             }
         }
     });
diff --git a/src/util.ts b/src/util.ts
index 0d8ef7995..9fc14a788 100644
--- a/src/util.ts
+++ b/src/util.ts
@@ -642,3 +642,25 @@ export function uniqueEntries<T>(array: T[], isIdentical: (x: T, y: T) => boolea
     }
     return array.filter(uniqueFunction);
 }
+
+export function createWaiterForInvoker() {
+    let resolveHandle: (() => void) | null = null;
+    let wasHandledQuick = false;
+    const invoker = () => {
+        if (resolveHandle === null) {
+            wasHandledQuick = true;
+        } else {
+            resolveHandle();
+        }
+    };
+
+    const waiter = new Promise<void>((resolve) => {
+        if (wasHandledQuick) {
+            resolve();
+        } else {
+            resolveHandle = resolve;
+        }
+    });
+
+    return { invoker, waiter };
+}
\ No newline at end of file

From 9f300eefd9841f974237993e3c00a4b105230578 Mon Sep 17 00:00:00 2001
From: Tal Hadad <thadad@istraresearch.com>
Date: Thu, 3 Aug 2023 19:05:29 +0300
Subject: [PATCH 21/28] add missing TODO

---
 R/session/vsc.R | 1 +
 1 file changed, 1 insertion(+)

diff --git a/R/session/vsc.R b/R/session/vsc.R
index 736b9179c..0ab56c25d 100644
--- a/R/session/vsc.R
+++ b/R/session/vsc.R
@@ -878,6 +878,7 @@ show_webview <- function(url, title, ..., viewer) {
     request_browser(url = url, title = title, ..., viewer = FALSE)
   } else if (file.exists(url)) {
     file <- normalizePath(url, "/", mustWork = TRUE)
+    # TODO: On TCP connection, need to send file content via TCP and display it
     request("webview", file = file, title = title, viewer = viewer, ...)
   } else {
     stop("File not exists")

From db53c609e1a6866840051d1f180dca5c5502ae48 Mon Sep 17 00:00:00 2001
From: Tal Hadad <thadad@istraresearch.com>
Date: Fri, 4 Aug 2023 13:49:36 +0300
Subject: [PATCH 22/28] fix webview on local html files by sending the HTML
 files content via TCP

---
 R/session/vsc.R               | 26 +++++++++++++++++++++--
 src/liveShare/shareSession.ts |  3 ++-
 src/session.ts                | 40 +++++++++++++++++++----------------
 src/util.ts                   | 27 ++++++++++++++++++++++-
 4 files changed, 74 insertions(+), 22 deletions(-)

diff --git a/R/session/vsc.R b/R/session/vsc.R
index 0ab56c25d..7193eead6 100644
--- a/R/session/vsc.R
+++ b/R/session/vsc.R
@@ -878,8 +878,30 @@ show_webview <- function(url, title, ..., viewer) {
     request_browser(url = url, title = title, ..., viewer = FALSE)
   } else if (file.exists(url)) {
     file <- normalizePath(url, "/", mustWork = TRUE)
-    # TODO: On TCP connection, need to send file content via TCP and display it
-    request("webview", file = file, title = title, viewer = viewer, ...)
+    file_basename <- basename(file)
+    dir <- dirname(file)
+    lib_dir <- file.path(dir, "lib")
+    if (!is.na(request_tcp_connection) && file_basename == "index.html" && file.exists(lib_dir)) {
+      # pass detailed content via TCP, instead of just give a path to HTML
+      lib_dir_absolute <- normalizePath(path.expand(lib_dir), "/", mustWork = TRUE)
+      lib_files_path_relative <- file.path(
+        "lib",
+        list.files(lib_dir_absolute, all.files = TRUE, recursive = TRUE)
+      )
+      files_path_relative <- c(lib_files_path_relative, file_basename)
+
+      files_content_base64 <- setNames(
+        lapply(files_path_relative, function(file_path) {
+          raw_content <- readr::read_file_raw(file.path(dir, file_path))
+          jsonlite::base64_enc(raw_content)
+        }),
+        files_path_relative
+      )
+      request("webview", file = file_basename, files_content_base64 = files_content_base64,
+        title = title, viewer = viewer, ...)
+    } else {
+      request("webview", file = file, title = title, viewer = viewer, ...)
+    }
   } else {
     stop("File not exists")
   }
diff --git a/src/liveShare/shareSession.ts b/src/liveShare/shareSession.ts
index 863bc4ead..8f46faca6 100644
--- a/src/liveShare/shareSession.ts
+++ b/src/liveShare/shareSession.ts
@@ -27,6 +27,7 @@ export type IRequest = {
     type?: string;
     title?: string;
     file?: string;
+    files_content_base64?: Record<string, string>;
     viewer?: string;
     plot?: string;
     format?: string;
@@ -152,7 +153,7 @@ export async function updateGuestRequest(file: string, force: boolean = false):
             }
             case 'webview': {
                 if (request.file && request.title && request.viewer !== undefined) {
-                    await showWebView(request.file, request.title, request.viewer);
+                    await showWebView(request.file, request.files_content_base64, request.title, request.viewer);
                 }
                 break;
             }
diff --git a/src/session.ts b/src/session.ts
index 6d4b89373..8b319c244 100644
--- a/src/session.ts
+++ b/src/session.ts
@@ -4,7 +4,6 @@ import * as fs from 'fs-extra';
 import * as os from 'os';
 import * as path from 'path';
 import { Agent } from 'http';
-import * as tmp from 'tmp';
 import { AddressInfo, Server, Socket } from 'node:net';
 import { PromiseSocket } from 'promise-socket';
 import fetch from 'node-fetch';
@@ -12,7 +11,7 @@ import { commands, StatusBarItem, Uri, ViewColumn, Webview, window, workspace, e
 
 import { runTextInTerm } from './rTerminal';
 import { FSWatcher } from 'fs-extra';
-import { config, createWaiterForInvoker, readContent, setContext, UriIcon } from './util';
+import { config, createTempDir2, createTempFile, createWaiterForInvoker, readContent, setContext, UriIcon } from './util';
 import { purgeAddinPickerItems, dispatchRStudioAPICall } from './rstudioapi';
 
 import { IRequest } from './liveShare/shareSession';
@@ -383,12 +382,29 @@ export function openExternalBrowser(): void {
     }
 }
 
-export async function showWebView(file: string, title: string, viewer: string | boolean): Promise<void> {
+export async function showWebView(file: string, files_content_base64: Record<string, string> | undefined,
+    title: string, viewer: string | boolean): Promise<void> {
     console.info(`[showWebView] file: ${file}, viewer: ${viewer.toString()}`);
     if (viewer === false) {
         void env.openExternal(Uri.file(file));
     } else {
-        const dir = path.dirname(file);
+        let dir: string;
+        if (files_content_base64 !== undefined) {
+            dir = (await createTempDir2()).path;
+            const subdirs = new Set(Object.keys(files_content_base64).map((relativePath) => path.dirname(relativePath)));
+            subdirs.delete('');
+            subdirs.delete('.');
+            await Promise.all(
+                Array.from(subdirs).map((subdir) => fs.mkdir(path.join(dir, subdir), { recursive: true }))
+            );
+            await Promise.all(Object.entries(files_content_base64).map(async ([realtivePath, contentBase64]) => {
+                const arrayData = Buffer.from(contentBase64, 'base64');
+                return fs.writeFile(path.join(dir, realtivePath), arrayData);
+            }));
+            file = path.join(dir, file);
+        } else {
+            dir = path.dirname(file);
+        }
         const webviewDir = extensionContext.asAbsolutePath('html/session/webview/');
         const panel = window.createWebviewPanel('webview', title,
             {
@@ -945,18 +961,6 @@ function startIncomingRequestServer(sessionStatusBarItem: StatusBarItem) {
     return server;
 }
 
-const create_tmp_file: (options: tmp.FileOptions) => Promise<{ name: string, fd: number, removeCallback: () => void }> =
-    (options) => new Promise((resolve, reject) => {
-        tmp.file(options, (err, name, fd, removeCallback) => {
-            if (err) {
-                reject(err);
-            } else {
-                resolve({ name, fd, removeCallback });
-            }
-        });
-    }
-    );
-
 export async function processRequest(request: ISessionRequest, socket: Socket | null, sessionStatusBarItem: StatusBarItem) {
     switch (request.command) {
         case 'help': {
@@ -1033,7 +1037,7 @@ export async function processRequest(request: ISessionRequest, socket: Socket |
         }
         case 'webview': {
             if (request.file && request.title && request.viewer !== undefined) {
-                await showWebView(request.file, request.title, request.viewer);
+                await showWebView(request.file, request.files_content_base64, request.title, request.viewer);
             }
             break;
         }
@@ -1051,7 +1055,7 @@ export async function processRequest(request: ISessionRequest, socket: Socket |
             }
 
             if (request.plot_base64) {
-                const { name: filePath, fd } = await create_tmp_file({ postfix: '.png' });
+                const { name: filePath, fd } = await createTempFile({ postfix: '.png' });
                 const arrayData = Buffer.from(request.plot_base64, 'base64');
                 await fs.writeFile(fd, arrayData);
                 showPlot(filePath);
diff --git a/src/util.ts b/src/util.ts
index 9fc14a788..061090962 100644
--- a/src/util.ts
+++ b/src/util.ts
@@ -2,6 +2,7 @@
 
 import { existsSync, PathLike, readFile } from 'fs-extra';
 import * as fs from 'fs';
+import * as tmp from 'tmp';
 import winreg = require('winreg');
 import * as path from 'path';
 import * as vscode from 'vscode';
@@ -663,4 +664,28 @@ export function createWaiterForInvoker() {
     });
 
     return { invoker, waiter };
-}
\ No newline at end of file
+}
+
+export const createTempFile: (options: tmp.FileOptions) => Promise<{ name: string, fd: number, removeCallback: () => void }> =
+    (options) => new Promise((resolve, reject) => {
+        tmp.file(options, (err, name, fd, removeCallback) => {
+            if (err) {
+                reject(err);
+            } else {
+                resolve({ name, fd, removeCallback });
+            }
+        });
+    }
+    );
+
+export const createTempDir2: () => Promise<{ path: string, removeCallback: () => void }> =
+    () => new Promise((resolve, reject) => {
+        tmp.dir((err, path, removeCallback) => {
+            if (err) {
+                reject(err);
+            } else {
+                resolve({ path, removeCallback });
+            }
+        });
+    }
+    );
\ No newline at end of file

From f3490d7611377e976146f60ac99551ba748bdd2f Mon Sep 17 00:00:00 2001
From: Tal Hadad <thadad@istraresearch.com>
Date: Fri, 4 Aug 2023 14:02:26 +0300
Subject: [PATCH 23/28] use a more specific hostname if the TCP listening is on
 localhost

---
 src/rTerminal.ts | 6 +++---
 src/session.ts   | 6 ++++--
 src/util.ts      | 7 ++++++-
 3 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/src/rTerminal.ts b/src/rTerminal.ts
index 7235418f6..9f646261c 100644
--- a/src/rTerminal.ts
+++ b/src/rTerminal.ts
@@ -1,7 +1,6 @@
 'use strict';
 
 import * as path from 'path';
-import * as os from 'os';
 import { isDeepStrictEqual } from 'util';
 
 import * as vscode from 'vscode';
@@ -11,7 +10,7 @@ import * as util from './util';
 import * as selection from './selection';
 import { getSelection } from './selection';
 import { cleanupSession, attached, incomingRequestServerAddressInfo } from './session';
-import { config, delay, getRterm } from './util';
+import { config, delay, getRterm, hostnameOfListeningAddress } from './util';
 import { rGuestService, isGuestSession } from './liveShare';
 import * as fs from 'fs';
 export let rTerm: vscode.Terminal | undefined = undefined;
@@ -131,7 +130,8 @@ export async function makeTerminalOptions(): Promise<vscode.TerminalOptions> {
             R_PROFILE_USER: newRprofile,
             VSCODE_INIT_R: initR,
             VSCODE_WATCHER_DIR: homeExtDir(),
-            VSCODE_ATTACH_HOST: os.hostname(),
+            VSCODE_ATTACH_HOST: incomingRequestServerAddressInfo === undefined ? undefined :
+                hostnameOfListeningAddress(incomingRequestServerAddressInfo),
             VSCODE_ATTACH_PORT: incomingRequestServerAddressInfo?.port?.toString(),
         };
     }
diff --git a/src/session.ts b/src/session.ts
index 8b319c244..75281cb67 100644
--- a/src/session.ts
+++ b/src/session.ts
@@ -11,7 +11,7 @@ import { commands, StatusBarItem, Uri, ViewColumn, Webview, window, workspace, e
 
 import { runTextInTerm } from './rTerminal';
 import { FSWatcher } from 'fs-extra';
-import { config, createTempDir2, createTempFile, createWaiterForInvoker, readContent, setContext, UriIcon } from './util';
+import { config, createTempDir2, createTempFile, createWaiterForInvoker, hostnameOfListeningAddress, readContent, setContext, UriIcon } from './util';
 import { purgeAddinPickerItems, dispatchRStudioAPICall } from './rstudioapi';
 
 import { IRequest } from './liveShare/shareSession';
@@ -155,7 +155,9 @@ export function attachActive(): void {
     if (config().get<boolean>('sessionWatcher')) {
         console.info('[attachActive]');
         if (incomingRequestServerAddressInfo) {
-            void runTextInTerm(`.vsc.attach(host=${JSON.stringify(os.hostname())}, port=${incomingRequestServerAddressInfo.port}L)`);
+            void runTextInTerm(`.vsc.attach(host=${
+                JSON.stringify(hostnameOfListeningAddress(incomingRequestServerAddressInfo))
+            }, port=${incomingRequestServerAddressInfo.port}L)`);
         } else {
             void runTextInTerm('.vsc.attach()');
         }
diff --git a/src/util.ts b/src/util.ts
index 061090962..291a2f80b 100644
--- a/src/util.ts
+++ b/src/util.ts
@@ -2,6 +2,7 @@
 
 import { existsSync, PathLike, readFile } from 'fs-extra';
 import * as fs from 'fs';
+import * as os from 'os';
 import * as tmp from 'tmp';
 import winreg = require('winreg');
 import * as path from 'path';
@@ -10,6 +11,7 @@ import * as cp from 'child_process';
 import { rGuestService, isGuestSession } from './liveShare';
 import { extensionContext } from './extension';
 import { randomBytes } from 'crypto';
+import { AddressInfo } from 'node:net';
 
 export function config(): vscode.WorkspaceConfiguration {
     return vscode.workspace.getConfiguration('r');
@@ -688,4 +690,7 @@ export const createTempDir2: () => Promise<{ path: string, removeCallback: () =>
             }
         });
     }
-    );
\ No newline at end of file
+    );
+
+export const hostnameOfListeningAddress = (addressInfo: AddressInfo) =>
+    (addressInfo.address === '127.0.0.1') ? '127.0.0.1' : os.hostname();
\ No newline at end of file

From 6056266cddb139a99bb31f359788c80674ed349d Mon Sep 17 00:00:00 2001
From: Tal Hadad <thadad@istraresearch.com>
Date: Wed, 6 Sep 2023 15:41:37 +0300
Subject: [PATCH 24/28] fix: better logging and strill create the session
 watcher tcp server even when we have file system error on previous lock file

---
 src/session.ts | 44 +++++++++++++++++++++++++++++++-------------
 1 file changed, 31 insertions(+), 13 deletions(-)

diff --git a/src/session.ts b/src/session.ts
index 75281cb67..fff8c5867 100644
--- a/src/session.ts
+++ b/src/session.ts
@@ -133,19 +133,32 @@ export function deploySessionWatcher(extensionPath: string): void {
 
 export function startRequestWatcher(sessionStatusBarItem: StatusBarItem): void {
     console.info('[startRequestWatcher] Starting');
-    requestFile = path.join(homeExtDir(), 'request.log');
-    requestLockFile = path.join(homeExtDir(), 'request.lock');
-    requestTimeStamp = 0;
-    responseTimeStamp = 0;
-    if (!fs.existsSync(requestLockFile)) {
-        fs.createFileSync(requestLockFile);
+    
+    try {
+        requestFile = path.join(homeExtDir(), 'request.log');
+        requestLockFile = path.join(homeExtDir(), 'request.lock');
+        requestTimeStamp = 0;
+        responseTimeStamp = 0;
+        if (!fs.existsSync(requestLockFile)) {
+            fs.createFileSync(requestLockFile);
+        }
+        fs.watch(requestLockFile, {}, () => {
+            void updateRequest(sessionStatusBarItem);
+        });
+    } catch (e) {
+        // eslint-disable-next-line @typescript-eslint/restrict-template-expressions
+        console.error(`Error in request file creating and watching: ${e}`);
+        // TODO: Handle better
     }
-    fs.watch(requestLockFile, {}, () => {
-        void updateRequest(sessionStatusBarItem);
-    });
 
-    if (config().get<boolean>('sessionWatcherTcpServer')) {
-        void startIncomingRequestServer(sessionStatusBarItem);
+    try {
+        if (config().get<boolean>('sessionWatcherTcpServer')) {
+            void startIncomingRequestServer(sessionStatusBarItem);
+        }
+    } catch (e) {
+        // eslint-disable-next-line @typescript-eslint/restrict-template-expressions
+        console.error(`Error in incoming request server setup: ${e}`);
+        // TODO: Handle better
     }
 
     console.info('[startRequestWatcher] Done');
@@ -874,6 +887,8 @@ async function updateRequest(sessionStatusBarItem: StatusBarItem) {
 }
 
 function startIncomingRequestServer(sessionStatusBarItem: StatusBarItem) {
+    console.log('Trying to start incoming request server now.');
+
     // eslint-disable-next-line @typescript-eslint/no-misused-promises
     const incomingRequestServer = new Server(async (socket: Socket) => {
         console.info(`Incoming connection to the request server from ${addressToStr(socket.address() as AddressInfo)}`);
@@ -952,8 +967,11 @@ function startIncomingRequestServer(sessionStatusBarItem: StatusBarItem) {
         }
     });
 
-    const server = incomingRequestServer.listen(config().get<number>('sessionWatcherTcpServerPort'),
-        config().get<string>('sessionWatcherTcpServerHostName'), function() {
+    const hostname = config().get<string>('sessionWatcherTcpServerHostName');
+    const port = config().get<number>('sessionWatcherTcpServerPort');
+    console.log(`Trying opening connection on ${hostname ?? '-'}:${port ?? '-'}`);
+    const server = incomingRequestServer.listen(port,
+        hostname, function() {
             incomingRequestServerAddressInfo = server.address() as AddressInfo;
             console.info(`Started listening on ${addressToStr(incomingRequestServerAddressInfo)}`);
 

From 7229e9f9f93162e59933d25f00f3d073b789ee89 Mon Sep 17 00:00:00 2001
From: Tal Hadad <thadad@istraresearch.com>
Date: Tue, 10 Oct 2023 14:31:29 +0300
Subject: [PATCH 25/28] remove an attempt to use type discrimination for now

---
 src/liveShare/shareSession.ts | 15 +++------------
 1 file changed, 3 insertions(+), 12 deletions(-)

diff --git a/src/liveShare/shareSession.ts b/src/liveShare/shareSession.ts
index 8f46faca6..522968847 100644
--- a/src/liveShare/shareSession.ts
+++ b/src/liveShare/shareSession.ts
@@ -18,7 +18,7 @@ let info: IRequest['info'];
 // Used to keep track of shared browsers
 export const browserDisposables: { Disposable: vscode.Disposable, url: string, name: string }[] = [];
 
-export type IRequest = {
+export interface IRequest {
     command: string;
     time?: string;
     pid?: string;
@@ -26,6 +26,7 @@ export type IRequest = {
     source?: string;
     type?: string;
     title?: string;
+    data?: string;
     file?: string;
     files_content_base64?: Record<string, string>;
     viewer?: string;
@@ -46,17 +47,7 @@ export type IRequest = {
         command: string,
         start_time: string
     };
-} & (
-    {
-        coomad: 'dataview';
-        type: 'json';
-        data: object;
-    } | {
-        coomad: 'dataview';
-        type: 'txt' | 'R';
-        data: string;
-    }
-)
+}
 
 export function initGuest(context: vscode.ExtensionContext): void {
     // create status bar item that contains info about the *guest* session watcher

From f73521ef8b811f6407fd022f690e092e729aaa94 Mon Sep 17 00:00:00 2001
From: Tal Hadad <thadad@istraresearch.com>
Date: Tue, 7 May 2024 11:45:40 +0300
Subject: [PATCH 26/28] remove unsued

---
 src/rTerminal.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/rTerminal.ts b/src/rTerminal.ts
index ad4c7056b..f0335a9d1 100644
--- a/src/rTerminal.ts
+++ b/src/rTerminal.ts
@@ -9,7 +9,7 @@ import { extensionContext, homeExtDir } from './extension';
 import * as util from './util';
 import * as selection from './selection';
 import { getSelection } from './selection';
-import { cleanupSession, attached, incomingRequestServerAddressInfo } from './session';
+import { cleanupSession, incomingRequestServerAddressInfo } from './session';
 import { config, delay, getRterm, getCurrentWorkspaceFolder, hostnameOfListeningAddress } from './util';
 import { rGuestService, isGuestSession } from './liveShare';
 import * as fs from 'fs';

From cfdeb373f5ba6e80692a79f5fc8ff760b1b8bd49 Mon Sep 17 00:00:00 2001
From: Tal Hadad <thadad@istraresearch.com>
Date: Tue, 7 May 2024 11:52:57 +0300
Subject: [PATCH 27/28] error if r.term doesn't exist as file only if the path
 is absolute

---
 src/rTerminal.ts | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/rTerminal.ts b/src/rTerminal.ts
index f0335a9d1..5c71e1f3c 100644
--- a/src/rTerminal.ts
+++ b/src/rTerminal.ts
@@ -13,6 +13,7 @@ import { cleanupSession, incomingRequestServerAddressInfo } from './session';
 import { config, delay, getRterm, getCurrentWorkspaceFolder, hostnameOfListeningAddress } from './util';
 import { rGuestService, isGuestSession } from './liveShare';
 import * as fs from 'fs';
+import { isAbsolute } from 'path';
 export let rTerm: vscode.Terminal | undefined = undefined;
 
 export async function runSource(echo: boolean): Promise<void>  {
@@ -146,7 +147,7 @@ export async function createRTerm(preserveshow?: boolean): Promise<boolean> {
     if(!termPath){
         void vscode.window.showErrorMessage('Could not find R path. Please check r.term and r.path setting.');
         return false;
-    } else if(!fs.existsSync(termPath)){
+    } else if(isAbsolute(termPath) && !fs.existsSync(termPath)){
         void vscode.window.showErrorMessage(`Cannot find R client at ${termPath}. Please check r.rterm setting.`);
         return false;
     }

From 79590c44325624dc62ba3dfbb0b4d6b613592a90 Mon Sep 17 00:00:00 2001
From: Tal Hadad <thadad@istraresearch.com>
Date: Tue, 17 Jun 2025 15:47:28 +0300
Subject: [PATCH 28/28] bump promose-socket version to resolve promise-duplex
 type errors

---
 package.json |  2 +-
 yarn.lock    | 52 +++++++++++++++++++---------------------------------
 2 files changed, 20 insertions(+), 34 deletions(-)

diff --git a/package.json b/package.json
index 37a45451d..3cdd855a4 100644
--- a/package.json
+++ b/package.json
@@ -2061,7 +2061,7 @@
     "jquery.json-viewer": "^1.5.0",
     "js-yaml": "^4.1.0",
     "node-fetch": "^2.6.7",
-    "promise-socket": "^7.0.0",
+    "promise-socket": "^8.0.0",
     "tmp": "^0.2.1",
     "vscode-languageclient": "^9.0.1",
     "vsls": "^1.0.4753",
diff --git a/yarn.lock b/yarn.lock
index 8dc5d1927..216030c97 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1045,11 +1045,6 @@ copy-webpack-plugin@^9.0.0:
     schema-utils "^3.1.1"
     serialize-javascript "^6.0.0"
 
-core-js@^3.6.5:
-  version "3.43.0"
-  resolved "https://registry.npmjs.org/core-js/-/core-js-3.43.0.tgz"
-  integrity sha512-N6wEbTTZSYOY2rYAn85CuvWWkCK6QweMn7/4Nr3w+gDBeBhk/x4EJeY6FPo4QzDoJZxVTv8U7CMvgWk6pOHHqA==
-
 core-util-is@~1.0.0:
   version "1.0.3"
   resolved "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.3.tgz"
@@ -2555,34 +2550,30 @@ progress@^2.0.0:
   resolved "https://registry.npmjs.org/progress/-/progress-2.0.3.tgz"
   integrity sha512-7PiHtLll5LdnKIMw100I+8xJXR5gW2QwWYkT6iJva0bXitZKa/XMrSbdmg3r2Xnaidz9Qumd0VPaMrZlF9V9sA==
 
-promise-duplex@^6.0.0:
-  version "6.0.0"
-  resolved "https://registry.npmjs.org/promise-duplex/-/promise-duplex-6.0.0.tgz"
-  integrity sha512-ZL7rquzjTFzInDBeWYcsT+qddolNvzigahk6MI6qLSbQvlyRRCJkU3JztgaVunzvkH28smRa2Qu/cY9RXtSkgA==
+promise-duplex@^8.0.0:
+  version "8.0.0"
+  resolved "https://registry.yarnpkg.com/promise-duplex/-/promise-duplex-8.0.0.tgz#139c846fcff71f27c980c42375c5fd3539982c20"
+  integrity sha512-JlrnT6KZMRD+t4cxP7gh/dlGP2pl01/jTPg3pTLvFLBTdHTbTTdc+g25q0qswC3ziO9RAr3L1b2n/++4y23GQg==
   dependencies:
-    core-js "^3.6.5"
-    promise-readable "^6.0.0"
-    promise-writable "^6.0.0"
+    promise-readable "^8.0.1"
+    promise-writable "^8.0.0"
 
-promise-readable@^6.0.0:
-  version "6.0.0"
-  resolved "https://registry.npmjs.org/promise-readable/-/promise-readable-6.0.0.tgz"
-  integrity sha512-5NxtmUswijvX5cAM0zPSy6yiCXH/eKBpiiBq6JfAUrmngMquMbzcBhF2qA+ocs4rYYKdvAfv3cOvZxADLtL1CA==
-  dependencies:
-    core-js "^3.6.5"
+promise-readable@^8.0.1:
+  version "8.0.1"
+  resolved "https://registry.yarnpkg.com/promise-readable/-/promise-readable-8.0.1.tgz#f5e9d59b1c4c655cc4d90578283fa626f563b13d"
+  integrity sha512-peVAz+49xRooF1Om2wYSOluKpOApnpiJVOKgQ6IR/ZAWo15tBa4ZtcKKSTAytRiNJVlkvil9NoFhqihY4Sl1Fw==
 
-promise-socket@^7.0.0:
-  version "7.0.0"
-  resolved "https://registry.npmjs.org/promise-socket/-/promise-socket-7.0.0.tgz"
-  integrity sha512-Oic9BrxmcHOPEnzKp2Js+ehFyvsbd0WxsE5khweCTHuRvdzbXjHUZmSDT6F9TW8SIkAJ0lCzoHjMYnb0WQJPiw==
+promise-socket@^8.0.0:
+  version "8.0.0"
+  resolved "https://registry.yarnpkg.com/promise-socket/-/promise-socket-8.0.0.tgz#82c795018773915f91f362bdc1d34c6f7249410d"
+  integrity sha512-5Qb5719QcOm3/zrt0DLiAsJXutv2vb4HRxCiOVro1eyAOMak6vF2gTIoB6f0M1mnKMCsXW1SC/O+4G3P6p7kbw==
   dependencies:
-    promise-duplex "^6.0.0"
-    tslib "^2.0.1"
+    promise-duplex "^8.0.0"
 
-promise-writable@^6.0.0:
-  version "6.0.0"
-  resolved "https://registry.npmjs.org/promise-writable/-/promise-writable-6.0.0.tgz"
-  integrity sha512-b81zre/itgJFS7dwWzIdKNVVqvLiUxYRS/wolUB0H1YY/tAaS146XGKa4Q/5wCbsnXLyn0MCeV6f8HHe4iUHLg==
+promise-writable@^8.0.0:
+  version "8.0.0"
+  resolved "https://registry.yarnpkg.com/promise-writable/-/promise-writable-8.0.0.tgz#1a62b38403f4085dc42899c6deea8d9e0a3525e8"
+  integrity sha512-Qn7/5tE42fjLUWevPm/SFmVz26tRdhmxmPXgOJSeIwLnkI2V4u0/t+CrRXb8ic1Jy9qqvOHVYm+sAIgel++eVA==
 
 punycode@^2.1.0:
   version "2.3.1"
@@ -3018,11 +3009,6 @@ tslib@^1.8.1:
   resolved "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz"
   integrity sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==
 
-tslib@^2.0.1:
-  version "2.8.1"
-  resolved "https://registry.npmjs.org/tslib/-/tslib-2.8.1.tgz"
-  integrity sha512-oJFu94HQb+KVduSUQL7wnpmqnfmLsOA/nAh6b6EH0wCEoK0/mPeXU6c3wKDV83MkOuHPRHtSXKKU99IBazS/2w==
-
 tsutils@^3.21.0:
   version "3.21.0"
   resolved "https://registry.npmjs.org/tsutils/-/tsutils-3.21.0.tgz"