update libmbedtls and libnng; adds strcat()

Author: shikokuchuo

DESCRIPTION

@@ -1,7 +1,7 @@
 Package: nanonext
 Type: Package
 Title: NNG (Nanomsg Next Gen) Lightweight Messaging Library
-Version: 0.9.0.9038
+Version: 0.9.0.9039
 Description: R binding for NNG (Nanomsg Next Gen), a successor to ZeroMQ. NNG is 
     a socket library providing high-performance scalability protocols, a
     cross-platform standard for messaging and communications. Serves as a

NAMESPACE

@@ -84,6 +84,7 @@ export(socket)
 export(stat)
 export(status_code)
 export(stop_aio)
+export(strcat)
 export(stream)
 export(subscribe)
 export(survey_time)

NEWS.md

@@ -1,19 +1,20 @@
-# nanonext 0.9.0.9038 (development)
+# nanonext 0.9.0.9039 (development)
 
 #### New Features
 
 * Enables secure TLS transports `tls+tcp://` and `wss://` for scalability protocols.
   + `listen()` and `dial()` gain the argument 'tls' for supplying a TLS configuration object
   + `write_cert()` generates 4096 bit RSA keys and self-signed X.509 certificates for use with `tls_config()`.
-* `weakref()`, `weakref_key()` and `weakref_value()` implement an interface to R's weak reference system. These may be used for purposes including synchronising the lifetimes of objects or creating read-only objects.
+* `weakref()`, `weakref_key()` and `weakref_value()` implement an interface to R's weak reference system. These may be used for synchronising the lifetimes of objects with reference objects such as Sockets or Aios, or creating read-only objects accessible by the weakref value alone.
+* `strcat()` provides a simple, fast utility to concatenate two strings.
 
 #### Updates
 
 * 'tlsConfig' objects no longer have a 'source' attribute.
 * Fix cases where `base64enc()` failed for objects exceeding a certain size.
 * `stream()` has been updated internally for additional robustness.
-* Updates bundled 'libmbedtls' v3.4.0 source configuration for threading support and fixes one case of undefined behaviour.
-* Updates bundled `libnng` cmake helper to better detect the correct version of `libmbedtls`.
+* Updates bundled 'libmbedtls' v3.4.0 source configuration for threading support.
+* Updates bundled 'libnng' to v1.6.0 alpha (c5e9d8a) again, having resolved previous issues.
 
 # nanonext 0.9.0
 

R/messenger.R

@@ -64,28 +64,28 @@ messenger <- function(url, auth = NULL) {
     cat("\r", `length<-`(intro, i), sep = " ", file = stdout())
     msleep(32L)
   }
-  cat(sprintf("\n| url: %s\n", url), file = stdout())
+  cat(strcat("\n| url: ", url), file = stdout())
 
   s <- send(sock, data = writeBin(":c ", raw()), mode = 2L, block = FALSE)
   if (s) {
     length(attr(sock, "dialer")) && {
-      cat("| connection error... exiting\n", file = stderr())
+      cat("\n| connection error... exiting\n", file = stderr())
       return(invisible())
     }
-    cat(sprintf("| peer offline: %s\n", format.POSIXct(Sys.time())), file = stderr())
+    cat(strcat("\n| peer offline: ", format.POSIXct(Sys.time())), file = stderr())
   } else {
-    cat(sprintf("| peer online: %s\n", format.POSIXct(Sys.time())), file = stderr())
+    cat(strcat("\n| peer online: ", format.POSIXct(Sys.time())), file = stderr())
     r <- recv(sock, mode = 5L, block = TRUE)
     for (i in seq_len(32L))
       lock[r[i]] == r[i + 32L] || {
-        cat("| authentication failed\n", file = stderr())
+        cat("\n| authentication failed\n", file = stderr())
         return(invisible())
       }
-    cat("| authenticated\n", file = stderr())
+    cat("\n| authenticated", file = stderr())
   }
 
   sock <- .Call(rnng_messenger_thread_create, list(sock, key))
-  cat("type your message:\n", file = stdout())
+  cat("\ntype your message:\n", file = stdout())
 
   repeat {
     data <- readline()

R/tls.R

@@ -22,15 +22,15 @@
 #'     'client' to create a client configuration or 'server' to create a server
 #'     configuration.
 #'
-#' @param client \strong{either} the absolute path to a file containing X.509
+#' @param client \strong{either} the character path to a file containing X.509
 #'     certificate(s) in PEM format, comprising the certificate authority
 #'     certificate chain (and revocation list if present), used to validate
 #'     certificates presented by peers,
 #'
 #'     \strong{or} a length 2 character vector comprising [i] the certificate
 #'     authority certificate chain and [ii] the certificate revocation list or
 #'     the empty character \code{""} if not applicable.
-#' @param server \strong{either} the absolute path to a single file containing
+#' @param server \strong{either} the character path to a file containing
 #'     the PEM encoded certificate and associated private key (may contain
 #'     additional certificates leading to a validation chain, with the leaf
 #'     certificate first, although the self-signed root is not required as the
@@ -270,4 +270,4 @@ base64dec <- function(x, convert = TRUE) .Call(rnng_base64dec, x, convert)
 #' @export
 #'
 write_cert <- function(cn = "localhost", valid = "20301231235959")
-  .Call(rnng_cert_write, cn, valid, interactive())
+  .Call(rnng_write_cert, cn, valid, interactive())

R/utils.R

@@ -276,3 +276,22 @@ status_code <- function(x) .Call(rnng_status_code, x)
 #' @keywords internal
 #'
 nng_fini <- function() invisible(.Call(rnng_fini))
+
+#' Concatenate 2 Strings
+#'
+#' A fast implementation that simply combines two strings into one.
+#'
+#' @param a character value.
+#' @param b character value.
+#'
+#' @return A character vector of length 1.
+#'
+#' @details If either 'a' or 'b' is a vector of length greater than 1, only the
+#'     first element of each is concatenated.
+#'
+#' @examples
+#' strcat("hello ", "world!")
+#'
+#' @export
+#'
+strcat <- function(a, b) .Call(rnng_strcat, a, b)

configure

@@ -1,7 +1,7 @@
 #!/bin/sh
 
 # Library versions
-LIB_VER="8e1836f"
+LIB_VER="c5e9d8a"
 TLS_VER="1873d3b"
 
 # Initialise

configure.ucrt

@@ -1,5 +1,5 @@
 # Library versions
-LIB_VER="8e1836f"
+LIB_VER="c5e9d8a"
 TLS_VER="1873d3b"
 
 tar -xf inst/mbedtls-$TLS_VER.tar.xz