Handle I/O on background thread

.Rbuildignore

@@ -9,3 +9,4 @@
 ^\.travis\.yml$
 ^appveyor\.yml$
 ^src/libuv/.github$
+^src/libuv/m4/lt~obsolete.m4$

DESCRIPTION

@@ -1,7 +1,7 @@
 Package: httpuv
 Type: Package
 Title: HTTP and WebSocket Server Library
-Version: 1.3.5.9002
+Version: 1.3.5.9005
 Author: Joe Cheng, Hector Corrada Bravo [ctb], Jeroen Ooms [ctb],
     Winston Chang [ctb]
 Copyright: RStudio, Inc.; Joyent, Inc.; Nginx Inc.; Igor Sysoev; Niels Provos;
@@ -22,11 +22,12 @@ Imports:
     Rcpp (>= 0.11.0),
     utils,
     promises,
-    later
+    later (>= 0.7.1)
 Remotes:
+    r-lib/later,
     rstudio/promises
 LinkingTo: Rcpp, BH, later
 URL: https://github.com/rstudio/httpuv
 SystemRequirements: GNU make
-RoxygenNote: 6.0.1
+RoxygenNote: 6.0.1.9000
 Suggests: testthat

NAMESPACE

@@ -12,11 +12,13 @@ export(service)
 export(startDaemonizedServer)
 export(startPipeServer)
 export(startServer)
+export(stopAllServers)
 export(stopDaemonizedServer)
 export(stopServer)
 exportClasses(WebSocket)
 import(methods)
 importFrom(Rcpp,evalCpp)
+importFrom(later,run_now)
 importFrom(promises,"%...!%")
 importFrom(promises,"%...>%")
 importFrom(promises,finally)

NEWS.md

@@ -1,4 +1,4 @@
-httpuv 1.3.5.9002
+httpuv 1.3.5.9004
 =================
 
 * Upgraded to libuv 1.15.0. ([#91](https://github.com/rstudio/httpuv/pull/91))

R/RcppExports.R

@@ -5,8 +5,8 @@ sendWSMessage <- function(conn, binary, message) {
     invisible(.Call('_httpuv_sendWSMessage', PACKAGE = 'httpuv', conn, binary, message))
 }
 
-closeWS <- function(conn) {
-    invisible(.Call('_httpuv_closeWS', PACKAGE = 'httpuv', conn))
+closeWS <- function(conn, code, reason) {
+    invisible(.Call('_httpuv_closeWS', PACKAGE = 'httpuv', conn, code, reason))
 }
 
 makeTcpServer <- function(host, port, onHeaders, onBodyData, onRequest, onWSOpen, onWSMessage, onWSClose) {
@@ -17,30 +17,38 @@ makePipeServer <- function(name, mask, onHeaders, onBodyData, onRequest, onWSOpe
     .Call('_httpuv_makePipeServer', PACKAGE = 'httpuv', name, mask, onHeaders, onBodyData, onRequest, onWSOpen, onWSMessage, onWSClose)
 }
 
-destroyServer <- function(handle) {
-    invisible(.Call('_httpuv_destroyServer', PACKAGE = 'httpuv', handle))
-}
-
-run <- function(timeoutMillis) {
-    .Call('_httpuv_run', PACKAGE = 'httpuv', timeoutMillis)
+#' Stop a server
+#' 
+#' Given a handle that was returned from a previous invocation of 
+#' \code{\link{startServer}} or \code{\link{startPipeServer}}, this closes all
+#' open connections for that server and  unbinds the port.
+#' 
+#' @param handle A handle that was previously returned from
+#'   \code{\link{startServer}} or \code{\link{startPipeServer}}.
+#'
+#' @seealso \code{\link{stopAllServers}} to stop all servers.
+#'
+#' @export
+stopServer <- function(handle) {
+    invisible(.Call('_httpuv_stopServer', PACKAGE = 'httpuv', handle))
 }
 
-stopLoop <- function() {
-    invisible(.Call('_httpuv_stopLoop', PACKAGE = 'httpuv'))
+#' Stop all applications
+#'
+#' This will stop all applications which were created by
+#' \code{\link{startServer}} or \code{\link{startPipeServer}}.
+#'
+#' @seealso \code{\link{stopServer}} to stop a specific server.
+#'
+#' @export
+stopAllServers <- function() {
+    invisible(.Call('_httpuv_stopAllServers', PACKAGE = 'httpuv'))
 }
 
 base64encode <- function(x) {
     .Call('_httpuv_base64encode', PACKAGE = 'httpuv', x)
 }
 
-daemonize <- function(handle) {
-    .Call('_httpuv_daemonize', PACKAGE = 'httpuv', handle)
-}
-
-destroyDaemonizedServer <- function(handle) {
-    invisible(.Call('_httpuv_destroyDaemonizedServer', PACKAGE = 'httpuv', handle))
-}
-
 #' URI encoding/decoding
 #' 
 #' Encodes/decodes strings using URI encoding/decoding in the same way that web
@@ -93,8 +101,8 @@ decodeURIComponent <- function(value) {
     .Call('_httpuv_decodeURIComponent', PACKAGE = 'httpuv', value)
 }
 
-invokeCppCallback <- function(data, callback_sexp) {
-    invisible(.Call('_httpuv_invokeCppCallback', PACKAGE = 'httpuv', data, callback_sexp))
+invokeCppCallback <- function(data, callback_xptr) {
+    invisible(.Call('_httpuv_invokeCppCallback', PACKAGE = 'httpuv', data, callback_xptr))
 }
 
 #' Apply the value of .Random.seed to R's internal RNG state
@@ -111,3 +119,7 @@ getRNGState <- function() {
     invisible(.Call('_httpuv_getRNGState', PACKAGE = 'httpuv'))
 }
 
+wsconn_address <- function(external_ptr) {
+    .Call('_httpuv_wsconn_address', PACKAGE = 'httpuv', external_ptr)
+}
+