Upgrade webR to version 0.4.2 (#177)

* Upgrade webR v0.4.2

* Upgrade R Shiny v1.9.1.8002

* Add .tgz install fallback for traditional archives

Author: georgestagg

Makefile

@@ -20,7 +20,7 @@ SHINYLIVE_VERSION = $(shell node -p "require('./package.json').version")
 PYODIDE_VERSION = 0.26.2
 PYODIDE_DIST_FILENAME = pyodide-$(PYODIDE_VERSION).tar.bz2
 DOWNLOAD_DIR = ./downloads
-R_SHINY_VERSION = 1.9.1.8000
+R_SHINY_VERSION = 1.9.1.8002
 BUILD_DIR = ./build
 PACKAGE_DIR = ./packages
 DIST_DIR = ./dist

package-lock.json

@@ -73,7 +73,7 @@
     "tsx": "^4.7.0",
     "typescript": "^5.3.3",
     "vscode-languageserver-protocol": "^3.17.5",
-    "webr": "^0.4.1",
+    "webr": "^0.4.2",
     "xterm": "^5.3.0",
     "xterm-addon-fit": "^0.7.0",
     "xterm-readline": "^1.1.1"

package.json

@@ -259,6 +259,19 @@ webr::shim_install()
 
 .webr_pkg_cache <- list()
 
+.install_pkg_tgz <- function(path, lib) {
+  tmp <- tempfile()
+  on.exit(unlink(tmp, recursive = TRUE))
+
+  utils::download.file(path, tmp, quiet = TRUE)
+  utils::untar(
+    tmp,
+    exdir = lib,
+    tar = "internal",
+    extras = "--no-same-permissions"
+  )
+}
+
 .mount_vfs_images <- function() {
   metadata_url <- glue::glue("{.base_url}packages/metadata.rds")
   metadata_path <- glue::glue("/shinylive/webr/packages/metadata.rds")
@@ -285,7 +298,16 @@ webr::shim_install()
       try({
         # Mount the virtual filesystem image, unless we already have done so
         if (available && !file.exists(mountpoint)) {
-          webr::mount(mountpoint, glue::glue("{.base_url}{path}"))
+          tryCatch({
+            webr::mount(mountpoint, glue::glue("{.base_url}{path}"))
+          }, error = function(cnd) {
+            # File extraction fallback for .tgz with no filesystem metadata
+            if (grepl(".tgz$", path)) {
+              .install_pkg_tgz(path, "/shinylive/webr/packages/")
+            } else {
+              stop(cnd)
+            }
+          })
         }
 
         # If this is a full library, add it to .libPaths()

src/hooks/useWebR.tsx

@@ -1,6 +1,5 @@
 import type { Shelter, WebROptions } from "webr";
-import { WebR } from "webr";
-import type { EvalROptions } from "webr/webr-chan";
+import { WebR, EvalROptions } from "webr";
 import type { ASGIHTTPRequestScope } from "./messageporthttp.js";
 import { makeHttpuvRequest } from "./messageporthttp.js";
 import { openChannelHttpuv } from "./messageportwebsocket-channel.js";