correct casts in messenger()

Author: shikokuchuo

README.Rmd

@@ -439,7 +439,7 @@ In this respect, it may be used as a performant and lightweight method for makin
 
 s <- stream(dial = "wss://demo.piesocket.com/v3/channel_1", textframes = TRUE)
 s
-s |> recv(keep.raw = FALSE)
+s |> recv()
 
 ```
 

README.md

@@ -379,7 +379,7 @@ aio
 #> < recvAio >
 #>  - $data for message data
 aio$data |> str()
-#>  num [1:100000000] -0.0183 0.9349 -0.8196 0.0607 -0.1335 ...
+#>  num [1:100000000] -1.072 1.447 0.962 -0.483 -0.843 ...
 ```
 
 As `call_aio()` is blocking and will wait for completion, an alternative
@@ -516,11 +516,11 @@ ncurl("http://httpbin.org/headers")
 #>   [1] 7b 0a 20 20 22 68 65 61 64 65 72 73 22 3a 20 7b 0a 20 20 20 20 22 48 6f 73
 #>  [26] 74 22 3a 20 22 68 74 74 70 62 69 6e 2e 6f 72 67 22 2c 20 0a 20 20 20 20 22
 #>  [51] 58 2d 41 6d 7a 6e 2d 54 72 61 63 65 2d 49 64 22 3a 20 22 52 6f 6f 74 3d 31
-#>  [76] 2d 36 32 36 35 39 30 34 32 2d 34 38 34 35 64 63 30 36 36 32 66 30 63 38 66
-#> [101] 30 32 31 33 63 35 63 63 32 22 0a 20 20 7d 0a 7d 0a
+#>  [76] 2d 36 32 36 35 62 32 62 31 2d 33 33 30 61 30 30 30 37 32 33 61 32 61 39 63
+#> [101] 36 36 61 30 36 66 38 36 61 22 0a 20 20 7d 0a 7d 0a
 #> 
 #> $data
-#> [1] "{\n  \"headers\": {\n    \"Host\": \"httpbin.org\", \n    \"X-Amzn-Trace-Id\": \"Root=1-62659042-4845dc0662f0c8f0213c5cc2\"\n  }\n}\n"
+#> [1] "{\n  \"headers\": {\n    \"Host\": \"httpbin.org\", \n    \"X-Amzn-Trace-Id\": \"Root=1-6265b2b1-330a000723a2a9c66a06f86a\"\n  }\n}\n"
 ```
 
 For advanced use, supports additional HTTP methods such as POST or PUT.
@@ -535,7 +535,7 @@ res
 #>  - $raw for raw message
 
 call_aio(res)$data
-#> [1] "{\n  \"args\": {}, \n  \"data\": \"{\\\"key\\\": \\\"value\\\"}\", \n  \"files\": {}, \n  \"form\": {}, \n  \"headers\": {\n    \"Authorization\": \"Bearer APIKEY\", \n    \"Content-Length\": \"16\", \n    \"Content-Type\": \"application/json\", \n    \"Host\": \"httpbin.org\", \n    \"X-Amzn-Trace-Id\": \"Root=1-62659042-7ab689205d5bd45b62c030da\"\n  }, \n  \"json\": {\n    \"key\": \"value\"\n  }, \n  \"origin\": \"78.145.225.121\", \n  \"url\": \"http://httpbin.org/post\"\n}\n"
+#> [1] "{\n  \"args\": {}, \n  \"data\": \"{\\\"key\\\": \\\"value\\\"}\", \n  \"files\": {}, \n  \"form\": {}, \n  \"headers\": {\n    \"Authorization\": \"Bearer APIKEY\", \n    \"Content-Length\": \"16\", \n    \"Content-Type\": \"application/json\", \n    \"Host\": \"httpbin.org\", \n    \"X-Amzn-Trace-Id\": \"Root=1-6265b2b1-09b62748201d88f5057952ab\"\n  }, \n  \"json\": {\n    \"key\": \"value\"\n  }, \n  \"origin\": \"78.145.225.121\", \n  \"url\": \"http://httpbin.org/post\"\n}\n"
 ```
 
 In this respect, it may be used as a performant and lightweight method
@@ -556,7 +556,12 @@ s
 #>  - type: dialer 
 #>  - url: wss://demo.piesocket.com/v3/channel_1 
 #>  - textframes: TRUE
-s |> recv(keep.raw = FALSE)
+s |> recv()
+#> $raw
+#>  [1] 7b 22 65 72 72 6f 72 22 3a 22 4d 69 73 73 69 6e 67 20 61 70 69 4b 65 79 22
+#> [26] 7d
+#> 
+#> $data
 #> [1] "{\"error\":\"Missing apiKey\"}"
 ```
 

src/utils.c

@@ -480,7 +480,7 @@ static void thread_finalizer(SEXP xptr) {
 static void rnng_thread(void *arg) {
 
   nng_socket *sock = (nng_socket *) arg;
-  char *buf = NULL;
+  unsigned char *buf;
   size_t sz;
   time_t now;
   struct tm *tms;
@@ -498,15 +498,15 @@ static void rnng_thread(void *arg) {
       break;
     }
 
-    if (!strncmp(buf, ":", 1)) {
-      if (!strcmp(buf, ":c ")) {
+    if (!strncmp((char *) buf, ":", 1)) {
+      if (!strcmp((char *) buf, ":c ")) {
         REprintf("| <- peer connected: %d-%02d-%02d %02d:%02d:%02d\n",
                  tms->tm_year + 1900, tms->tm_mon + 1, tms->tm_mday,
                  tms->tm_hour, tms->tm_min, tms->tm_sec);
         nng_free(buf, sz);
         continue;
       }
-      if (!strcmp(buf, ":d ")) {
+      if (!strcmp((char *) buf, ":d ")) {
         REprintf("| -> peer disconnected: %d-%02d-%02d %02d:%02d:%02d\n",
                  tms->tm_year + 1900, tms->tm_mon + 1, tms->tm_mday,
                  tms->tm_hour, tms->tm_min, tms->tm_sec);

tests/tests.R

@@ -10,6 +10,9 @@ nanotest(inherits(n, "nanoObject"))
 nanotest(inherits(n$socket, "nanoSocket"))
 nanotest(inherits(n$socket, "nano"))
 nanotest(identical(is_nano(n), TRUE))
+n$newmethod <- "doesnotwork"
+nanotest(is.null(n$newmethod))
+
 nanotest(is.integer(attr(n$socket, "id")))
 nanotest(n$socket$state == "opened")
 nanotest(n$socket$protocol == "pair")
@@ -46,18 +49,24 @@ nanotest(identical(is_nano(saio), FALSE))
 nanotestn(saio[["aio"]])
 nanotestn(saio$result)
 raio <- n1$recv_aio(timeout = 500)
-nanotest(identical(is_aio(raio), TRUE))
+raio$newfield <- "doesnotwork"
+nanotest(is.null(raio$newfield))
+nanotest(is_aio(raio) == TRUE)
 nanotestn(raio[["aio"]])
-nanotestn(raio$data)
 nanotestn(raio$raw)
+nanotestn(raio$data)
 saio <- n$send_aio(c(1.1, 2.2), mode = "raw", timeout = 500)
+saio$newfield <- "doesnotwork"
+nanotest(is.null(saio$newfield))
+nanotest(is_aio(saio) == TRUE)
 nanotest(is.logical(unresolved(saio)))
 msg <- n1$recv_aio(mode = "double", timeout = 500, keep.raw = FALSE)
 nanotest(is.null(stop_aio(msg)))
 nanotest(is.null(stop_aio(n)))
 nanotest(identical(call_aio(msg), msg))
+nanotestn(tryCatch(msg$data, error = function(e) 0L))
 nanotest(identical(call_aio(n), n))
-nanotest(identical(is_aio(n), FALSE))
+nanotest(is_aio(n) == FALSE)
 
 xc <- n$dial(url = "inproc://two", autostart = TRUE)
 nanotest(is.integer(xc))
@@ -97,10 +106,11 @@ msg <- recv_aio(ctx1, mode = "serial", timeout = 400, keep.raw = FALSE)
 nanotest(is.logical(unresolved(msg)))
 nanotestn(call_aio(msg)$data)
 nanotest(unresolved(msg) == FALSE)
-nanotestwn(send(ctx, c(TRUE, FALSE, TRUE), block = 500))
-msg <- recv_aio(ctx1, mode = "logical", timeout = 500)
-nanotestn(call_aio(msg)$raw)
-nanotestwn(request(ctx, data.frame(), recv_mode = "complex", timeout = 100))
+nanotestwn(send(ctx, c(TRUE, FALSE, TRUE), block = 300))
+msg <- recv_aio(ctx1, mode = "logical", timeout = 300)
+nanotestn(msg$raw)
+nanotestwn(request(ctx, c(1+3i, 4+2i), recv_mode = "complex", timeout = 300))
+nanotestwn(reply(ctx1, execute = identity, send_mode = "raw", timeout = 300))
 nanotest(close(ctx) == 0L)
 nanotestw(close(ctx) > 0L)
 nanotest(ctx$state == "closed")
@@ -124,6 +134,7 @@ nanotest(survey_time(sock, time = 5000) == 0L)
 nanotest(close(sock) == 0L)
 nanotest(close(sock2) == 0L)
 
+nanotestwn(ncurl("http://www.cam.ac.uk/"))
 nanotestwn(ncurl("http://httpbin.org/post", convert = FALSE, method = "POST", headers = c(`Content-Type` = "text/plain"), data = "test"))
 nanotestwn(ncurl("http://httpbin.org/post", convert = FALSE, method = "POST", headers = list(`Content-Type` = "text/plain")))
 nanotestwn(ncurl("http://httpbin.org/put", async = TRUE, method = "PUT", headers = c(Authorization = "Bearer token"), data = "test"))
@@ -135,6 +146,8 @@ nanotest(is.character(ver <- nng_version()) && length(ver) == 2L)
 nanotest(is.character(nng_error(0L)))
 nanotest(is_nul_byte(as.raw(0L)) && !is_nul_byte(NULL))
 nanotest(!is_error_value(1L))
+nanotestwn(messenger("invalidURL"))
+nanotestn(tryCatch(.mirai_scm(), error = function(e) 0L))
 
 nanotest(inherits(bus <- socket(protocol = "bus"), "nanoSocket"))
 nanotest(inherits(push <- socket(protocol = "push"), "nanoSocket"))