merge #26 from shikokuchuo/dev: Add timeout to list_r_sessions

Author: simonpcouch

DESCRIPTION

@@ -27,7 +27,7 @@ Imports:
     cli,
     ellmer,
     jsonlite,
-    nanonext (>= 1.5.2.9016),
+    nanonext (>= 1.5.2.9019),
     promises,
     rlang
 Depends: R (>= 4.1.0)

R/acquaint-package.R

@@ -5,3 +5,12 @@
 #' @import rlang
 ## usethis namespace: end
 NULL
+
+.onLoad <- function(libname, pkgname) {
+  the$socket_url <- switch(
+    Sys.info()[["sysname"]],
+    Linux = "abstract://acquaint-socket",
+    Windows = "ipc://acquaint-socket",
+    "ipc:///tmp/acquaint-socket"
+  )
+}

R/server.R

@@ -14,7 +14,7 @@ mcp_server <- function() {
 
   the$server_socket <- nanonext::socket("poly")
   on.exit(nanonext::reap(the$server_socket), add = TRUE)
-  nanonext::dial(the$server_socket, url = sprintf("%s%d", acquaint_socket, 1L))
+  nanonext::dial(the$server_socket, url = sprintf("%s%d", the$socket_url, 1L))
 
   client <- nanonext::recv_aio(reader_socket, mode = "string", cv = cv)
   session <- nanonext::recv_aio(the$server_socket, mode = "string", cv = cv)

R/session.R

@@ -55,17 +55,16 @@ mcp_session <- function() {
 
   the$session_socket <- nanonext::socket("poly")
   i <- 1L
-  suppressWarnings(
-    while (i < 1024L) {
-      # prevent indefinite loop
-      nanonext::listen(
-        the$session_socket,
-        url = sprintf("%s%d", acquaint_socket, i)
-      ) ||
-        break
-      i <- i + 1L
-    }
-  )
+  while (i < 1024L) {
+    # prevent indefinite loop
+    nanonext::listen(
+      the$session_socket,
+      url = sprintf("%s%d", the$socket_url, i),
+      fail = "none"
+    ) ||
+      break
+    i <- i + 1L
+  }
   the$session <- i
 
   schedule_handle_message_from_server()

R/tools.R

@@ -6,23 +6,22 @@ list_r_sessions <- function() {
   on.exit(nanonext::reap(sock))
   cv <- nanonext::cv()
   monitor <- nanonext::monitor(sock, cv)
-  suppressWarnings(
-    for (i in seq_len(1024L)) {
-      if (
-        nanonext::dial(
-          sock,
-          url = sprintf("%s%d", acquaint_socket, i),
-          autostart = NA
-        ) &&
-          i > 8L
-      )
-        break
-    }
-  )
+  for (i in seq_len(1024L)) {
+    if (
+      nanonext::dial(
+        sock,
+        url = sprintf("%s%d", the$socket_url, i),
+        autostart = NA,
+        fail = "none"
+      ) &&
+      i > 8L
+    )
+      break
+  }
   pipes <- nanonext::read_monitor(monitor)
   res <- lapply(
     pipes,
-    function(x) nanonext::recv_aio(sock, mode = "string")
+    function(x) nanonext::recv_aio(sock, mode = "string", timeout = 5000L)
   )
   lapply(
     pipes,
@@ -47,14 +46,14 @@ list_r_sessions_tool <-
     )
   )
 
-select_r_session <- function(i) {
+select_r_session <- function(session) {
   nanonext::reap(the$server_socket[["dialer"]][[1L]])
   attr(the$server_socket, "dialer") <- NULL
   nanonext::dial(
     the$server_socket,
-    url = sprintf("%s%d", acquaint_socket, as.integer(i))
+    url = sprintf("%s%d", the$socket_url, session)
   )
-  paste0("Selected session ", i, " successfully.")
+  sprintf("Selected session %d successfully.", session)
 }
 
 select_r_session_tool <-
@@ -72,7 +71,7 @@ select_r_session_tool <-
       "Your choice of session will persist after the tool is called; only",
       "call this tool more than once if you need to switch between sessions."
     ),
-    i = ellmer::type_integer("The index of the R session to select.")
+    session = ellmer::type_integer("The R session number to select.")
   )
 
 get_acquaint_tools <- function() {

R/utils.R

@@ -1,7 +1,5 @@
 the <- new_environment()
 
-acquaint_socket <- "ipc:///tmp/acquaint-socket"
-
 jsonrpc_response <- function(id, result = NULL, error = NULL) {
   if (!xor(is.null(result), is.null(error))) {
     warning("Either `result` or `error` must be provided, but not both.")