Run init function of client lib

DESCRIPTION

@@ -1,6 +1,6 @@
 Package: callr
 Title: Call R from R
-Version: 3.7.3.9000
+Version: 3.7.3.9001
 Authors@R: c(
     person("Gábor", "Csárdi", , "csardi.gabor@gmail.com", role = c("aut", "cre", "cph"),
            comment = c(ORCID = "0000-0001-7098-9676")),

R/load-client.R

@@ -58,6 +58,7 @@ load_client_lib <- function(sofile = NULL, pxdir = NULL) {
 
   env <- new.env(parent = emptyenv())
   env$.path <- sofile
+  env$.lib <- lib
 
   mycall <- .Call
 

R/package.R

@@ -19,7 +19,10 @@ env_file <- NULL
 prepare_client_files <- function() {
   for (aa in names(client_env$`__callr_data__`$sofile)) {
     fn <- client_env$`__callr_data__`$sofile[[aa]]
-    if (!file.exists(fn)) writeBin(clients[[aa]]$bytes, fn)
+    if (!file.exists(fn)) {
+      dir.create(dirname(fn), recursive = TRUE)
+      writeBin(clients[[aa]]$bytes, fn)
+    }
   }
 
   if (!file.exists(env_file)) {
@@ -31,15 +34,16 @@ prepare_client_files <- function() {
 get_client_files <- function() {
   archs <- ls(clients)
   vapply(archs, function(aa) {
+    hash <- substr(clients[[aa]]$md5, 1, 7)
+
+    # Filename must be `client.ext` so that `dyn.load()` can find
+    # the init function
     file.path(
       tempdir(),
-      paste0(
-        "callr-client-",
-        sub("arch-", "", aa),
-        "-",
-        substr(clients[[aa]]$md5, 1, 7),
-        .Platform$dynlib.ext
-      )
+      "callr",
+      sub("arch-", "", aa),  # Might be empty
+      hash,
+      paste0("client", .Platform$dynlib.ext)
     )
   }, character(1))
 }

tests/testthat/test-load-client.R

@@ -90,3 +90,20 @@ test_that("set_stdout_file, set_setderr_file", {
   ret <- callr::r(do)  
   expect_equal(ret, c("this is output", "this is error"))
 })
+
+test_that("init function of client lib is run", {
+  pxlib <- r(function() {
+    as.environment("tools:callr")$`__callr_data__`$pxlib
+  })
+
+  # File name should be `client.SOEXT` so that R can match the init
+  # function from the name
+  expect_true(grepl("^client\\.", basename(pxlib$.path)))
+
+  # In case R removes the `dynamicLookup` field
+  skip_on_cran()
+
+  # Should be `FALSE` since processx disables dynamic lookup in the
+  # init function
+  expect_false(unclass(pxlib$.lib)$dynamicLookup)
+})