Switch to httr2 (#2642)

* Switch to httr2

Fixes #2602

* Polishing

---------

Co-authored-by: Jenny Bryan <jenny.f.bryan@gmail.com>

Author: hadley

DESCRIPTION

@@ -47,7 +47,7 @@ Suggests:
     DT (>= 0.23),
     foghorn (>= 1.4.2),
     gh (>= 1.3.0),
-    httr (>= 1.4.3),
+    httr2 (>= 1.0.0),
     knitr (>= 1.39),
     lintr (>= 3.0.0),
     remotes (>= 2.5.0),

R/check-mac.R

@@ -100,30 +100,24 @@ check_mac <- function(
 
   url <- "https://mac.r-project.org/macbuilder/v1/submit"
 
-  check_installed("httr")
+  check_installed("httr2")
   body <- list(
-    pkgfile = httr::upload_file(built_path),
+    pkgfile = curl::form_file(built_path),
     rflavor = tolower(version)
   )
 
   if (length(dep_built_paths) > 0) {
-    uploads <- map(dep_built_paths, httr::upload_file)
+    uploads <- map(dep_built_paths, curl::form_file)
     names(uploads) <- rep("depfiles", length(uploads))
     body <- append(body, uploads)
   }
 
-  res <- httr::POST(
-    url,
-    body = body,
-    headers = list(
-      "Content-Type" = "multipart/form-data"
-    ),
-    encode = "multipart"
-  )
-
-  httr::stop_for_status(res, task = "Uploading package")
+  req <- httr2::request(url) |>
+    httr2::req_body_multipart(!!!body) |>
+    httr2::req_headers(Accept = "application/json")
+  resp <- httr2::req_perform(req)
 
-  response_url <- httr::content(res)$url
+  response_url <- httr2::resp_body_json(resp)$url
 
   if (!quiet) {
     time <- strftime(Sys.time() + 10 * 60, "%I:%M %p")

R/release.R

@@ -289,54 +289,42 @@ extract_cran_msg <- function(msg) {
 }
 
 upload_cran <- function(pkg, built_path, call = parent.frame()) {
+  check_installed("httr2")
+
   pkg <- as.package(pkg)
   maint <- maintainer(pkg)
   comments <- cran_comments(pkg, call = call)
 
   # Initial upload ---------
   cli::cli_inform(c(i = "Uploading package & comments"))
-  check_installed("httr")
-  body <- list(
+  req <- httr2::request(cran_submission_url)
+  req <- httr2::req_body_multipart(
+    req,
     pkg_id = "",
     name = maint$name,
     email = maint$email,
-    uploaded_file = httr::upload_file(built_path, "application/x-gzip"),
+    uploaded_file = curl::form_file(built_path, "application/x-gzip"),
     comment = comments,
     upload = "Upload package"
   )
-  r <- httr::POST(cran_submission_url, body = body)
-
-  # If a 404 likely CRAN is closed for maintenance, try to get the message
-  if (httr::status_code(r) == 404) {
-    msg <- ""
-    try({
-      r2 <- httr::GET(sub("index2", "index", cran_submission_url))
-      msg <- extract_cran_msg(httr::content(r2, "text"))
-    })
-    cli::cli_abort(
-      c(
-        "*" = "Submission failed",
-        "x" = msg
-      ),
-      call = call
-    )
-  }
-
-  httr::stop_for_status(r)
-  new_url <- httr::parse_url(r$url)
+  resp <- httr2::req_perform(req)
+  new_url <- httr2::url_parse(httr2::resp_url(resp))
 
   # Confirmation -----------
   cli::cli_inform(c(i = "Confirming submission"))
-  body <- list(
+
+  req <- httr2::request(cran_submission_url)
+  req <- httr2::req_body_multipart(
+    req,
     pkg_id = new_url$query$pkg_id,
     name = maint$name,
     email = maint$email,
     policy_check = "1/",
     submit = "Submit package"
   )
-  r <- httr::POST(cran_submission_url, body = body)
-  httr::stop_for_status(r)
-  new_url <- httr::parse_url(r$url)
+
+  resp <- httr2::req_perform(req)
+  new_url <- httr2::url_parse(httr2::resp_url(resp))
   if (new_url$query$submit == "1") {
     cli::cli_inform(c(
       "v" = "Package submission successful",

R/run-source.R

@@ -30,14 +30,12 @@
 #' }
 source_url <- function(url, ..., sha1 = NULL) {
   check_string(url)
-  check_installed(c("digest", "httr"))
+  check_installed(c("digest", "httr2"))
 
   temp_file <- file_temp()
   on.exit(file_delete(temp_file), add = TRUE)
 
-  request <- httr::GET(url)
-  httr::stop_for_status(request)
-  writeBin(httr::content(request, type = "raw"), temp_file)
+  httr2::req_perform(httr2::request(url), path = temp_file)
 
   check_sha1(temp_file, sha1)
 

inst/WORDLIST

@@ -99,6 +99,7 @@ hadley
 http
 https
 httr
+httr2
 hunspell
 importFrom
 initialising