Merge pull request #152 from shikokuchuo/dev

Cleanup Namespace

DESCRIPTION

@@ -1,7 +1,7 @@
 Package: mirai
 Type: Package
 Title: Minimalist Async Evaluation Framework for R
-Version: 1.2.0.9013
+Version: 1.2.0.9014
 Description: Designed for simplicity, a 'mirai' evaluates an R expression
     asynchronously in a parallel process, locally or distributed over the
     network, with the result automatically available upon completion. Modern
@@ -26,7 +26,7 @@ Encoding: UTF-8
 Depends: 
     R (>= 3.6)
 Imports: 
-    nanonext (>= 1.2.1.9017)
+    nanonext (>= 1.2.1.9018)
 Enhances: 
     parallel,
     promises

NAMESPACE

@@ -20,7 +20,6 @@ S3method(promises::as.promise,mirai)
 S3method(promises::is.promising,mirai)
 S3method(utils::.DollarNames,miraiError)
 S3method(with,miraiDaemons)
-export(.daemon)
 export(.flat)
 export(.progress)
 export(.progress_cli)

NEWS.md

@@ -1,4 +1,4 @@
-# mirai 1.2.0.9013 (development)
+# mirai 1.2.0.9014 (development)
 
 * `daemons(dispatcher = NA)` now provides access to threaded dispatcher (experimental). This implements dispatcher using a thread rather than an external process and is faster and more efficient.
 * `mirai_map()` behavioural changes:
@@ -8,7 +8,7 @@
 * Fixes flatmap with `mirai_map()[.flat]` assigning a variable 'typ' to the calling environment.
 * `everywhere()` now errors if the specified compute profile is not yet set up, rather than fail silently.
 * Internal performance enhancements.
-* Requires `nanonext` >= [1.2.1.9017].
+* Requires `nanonext` >= [1.2.1.9018].
 
 # mirai 1.2.0
 

R/daemon.R

@@ -178,8 +178,7 @@ daemon <- function(url, autoexit = TRUE, cleanup = TRUE, output = FALSE,
 #'
 #' @return Logical TRUE or FALSE.
 #'
-#' @keywords internal
-#' @export
+#' @noRd
 #'
 .daemon <- function(url) {
 

R/dispatcher.R

@@ -47,11 +47,11 @@
 #'     specified port is not open etc.). Specifying TRUE continues retrying
 #'     (indefinitely) if not immediately successful, which is more resilient but
 #'     can mask potential connection issues.
-#' @param retry [default FALSE] if TRUE, a task where the daemon crashes or
-#'     terminates unexpectedly will be automatically re-tried on the next daemon
-#'     instance to connect. In such a case, the mirai will remain unresolved but
+#' @param retry [default FALSE] logical value, whether to automatically retry
+#'     tasks where the daemon crashes or terminates unexpectedly on the next
+#'     daemon instance to connect. If TRUE, the mirai will remain unresolved but
 #'     \code{\link{status}} will show \sQuote{online} as 0 and \sQuote{assigned}
-#'     > \sQuote{complete}. To cancel a task in such a case, use
+#'     > \sQuote{complete}. To cancel a task in this case, use
 #'     \code{saisei(force = TRUE)}. If FALSE, such tasks will be returned as
 #'     \sQuote{errorValue} 19 (Connection reset).
 #' @param token [default FALSE] if TRUE, appends a unique 24-character token

R/mirai.R

@@ -175,30 +175,19 @@ mirai <- function(.expr, ..., .args = list(), .timeout = NULL, .compute = "defau
     .expr = if (is.symbol(expr) && exists(expr, parent.frame()) && is.language(.expr)) .expr else expr
   )
   if (length(.args))
-    data <- c(
-      if (is.environment(.args)) as.list.environment(.args) else {
-        length(names(.args)) && all(nzchar(names(.args))) || stop(._[["named_args"]])
-        .args
-      },
-      data
-    )
+    data <- c(if (is.environment(.args)) as.list.environment(.args) else
+    {
+      length(names(.args)) && all(nzchar(names(.args))) || stop(._[["named_args"]])
+      .args
+    },
+    data)
 
   envir <- ..[[.compute]]
 
-  is.null(envir) && {
-    sock <- ephemeral_daemon(local_url())
-    aio <- request(
-      .context(sock), data = data, send_mode = 1L, recv_mode = 1L,
-      timeout = .timeout, cv = NA
-    )
-    `attr<-`(.subset2(aio, "aio"), "sock", sock)
-    return(aio)
-  }
+  is.null(envir) && return(ephemeral_daemon(data = data, timeout = .timeout))
 
-  request(
-    .context(envir[["sock"]]), data = data, send_mode = 1L, recv_mode = 1L,
-    timeout = .timeout, cv = envir[["cv"]]
-  )
+  request(.context(envir[["sock"]]), data = data, send_mode = 1L, recv_mode = 1L,
+          timeout = .timeout, cv = envir[["cv"]])
 
 }
 
@@ -594,10 +583,13 @@ print.miraiInterrupt <- function(x, ...) {
 
 # internals --------------------------------------------------------------------
 
-ephemeral_daemon <- function(url) {
+ephemeral_daemon <- function(data, timeout) {
+  url <- local_url()
   sock <- req_socket(url)
-  system2(command = .command, args = c("-e", shQuote(sprintf("mirai::.daemon(\"%s\")", url))), stdout = FALSE, stderr = FALSE, wait = FALSE)
-  sock
+  system2(command = .command, args = c("-e", shQuote(sprintf("mirai:::.daemon(\"%s\")", url))), stdout = FALSE, stderr = FALSE, wait = FALSE)
+  aio <- request(.context(sock), data = data, send_mode = 1L, recv_mode = 1L, timeout = timeout, cv = NA)
+  `attr<-`(.subset2(aio, "aio"), "sock", sock)
+  aio
 }
 
 deparse_safe <- function(x) if (length(x))