ncurl and stream code cleanup

Author: shikokuchuo

R/ncurl.R

@@ -138,11 +138,10 @@ ncurl <- function(url,
 
     res <- .Call(rnng_ncurl, url, convert, method, headers, data, pem)
 
-    is.integer(res) && return(res)
     is.character(res) && {
       continue <- if (interactive()) readline(sprintf("Follow redirect to <%s>? [Y/n] ", res)) else "n"
       continue %in% c("n", "N", "no", "NO") && return(res)
-      return(ncurl(res))
+      return(eval(`[[<-`(match.call(), 2L, res)))
     }
 
     res

README.md

@@ -384,7 +384,7 @@ aio
 #> < recvAio >
 #>  - $data for message data
 aio$data |> str()
-#>  num [1:100000000] -1.431 -1.057 0.272 -0.784 0.329 ...
+#>  num [1:100000000] -0.4007 -0.5114 1.4174 0.0758 0.2671 ...
 ```
 
 As `call_aio()` is blocking and will wait for completion, an alternative
@@ -540,11 +540,11 @@ ncurl("https://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 33 30 66 64 66 37 33 2d 30 65 34 33 63 35 34 62 31 37 38 39 36 37 34
-#> [101] 31 33 64 66 32 64 30 62 39 22 0a 20 20 7d 0a 7d 0a
+#>  [76] 2d 36 33 31 30 63 62 64 31 2d 36 37 66 66 32 64 31 30 30 66 39 64 33 66 66
+#> [101] 61 37 32 62 33 61 63 35 37 22 0a 20 20 7d 0a 7d 0a
 #> 
 #> $data
-#> [1] "{\n  \"headers\": {\n    \"Host\": \"httpbin.org\", \n    \"X-Amzn-Trace-Id\": \"Root=1-630fdf73-0e43c54b178967413df2d0b9\"\n  }\n}\n"
+#> [1] "{\n  \"headers\": {\n    \"Host\": \"httpbin.org\", \n    \"X-Amzn-Trace-Id\": \"Root=1-6310cbd1-67ff2d100f9d3ffa72b3ac57\"\n  }\n}\n"
 ```
 
 For advanced use, supports additional HTTP methods such as POST or PUT.
@@ -560,7 +560,7 @@ res
 #>  - $data for message data
 
 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-630fdf73-5800665b2a82f9933933d8b3\"\n  }, \n  \"json\": {\n    \"key\": \"value\"\n  }, \n  \"origin\": \"185.225.45.49\", \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-6310cbd2-332f7efa1a782b527ba19a00\"\n  }, \n  \"json\": {\n    \"key\": \"value\"\n  }, \n  \"origin\": \"79.173.189.133\", \n  \"url\": \"http://httpbin.org/post\"\n}\n"
 ```
 
 In this respect, it may be used as a performant and lightweight method
@@ -603,10 +603,10 @@ s |> send('{"action": "subscribe", "symbols": "EURUSD"}')
 #> [26] 73 79 6d 62 6f 6c 73 22 3a 20 22 45 55 52 55 53 44 22 7d 00
 
 s |> recv(keep.raw = FALSE)
-#> [1] "{\"s\":\"EURUSD\",\"a\":1.00522,\"b\":1.0052,\"dc\":\"0.2865\",\"dd\":\"0.0029\",\"ppms\":false,\"t\":1661984634000}"
+#> [1] "{\"s\":\"EURUSD\",\"a\":0.99382,\"b\":0.99375,\"dc\":\"-1.0032\",\"dd\":\"-0.0100\",\"ppms\":false,\"t\":1662045139000}"
 
 s |> recv(keep.raw = FALSE)
-#> [1] "{\"s\":\"EURUSD\",\"a\":1.00519,\"b\":1.00517,\"dc\":\"0.2835\",\"dd\":\"0.0029\",\"ppms\":false,\"t\":1661984637000}"
+#> [1] "{\"s\":\"EURUSD\",\"a\":0.99377,\"b\":0.99375,\"dc\":\"-1.0083\",\"dd\":\"-0.0100\",\"ppms\":false,\"t\":1662045139000}"
 
 close(s)
 ```

src/aio.c

@@ -554,39 +554,17 @@ SEXP rnng_ncurl_aio(SEXP http, SEXP method, SEXP headers, SEXP data, SEXP pem) {
   haio->data = handle;
   handle->cfg = NULL;
 
-  xc = nng_url_parse(&handle->url, httr);
-  if (xc) {
-    R_Free(handle);
-    R_Free(haio);
-    return mk_error(xc);
-  }
-  xc = nng_http_client_alloc(&handle->cli, handle->url);
-  if (xc) {
-    nng_url_free(handle->url);
-    R_Free(handle);
-    R_Free(haio);
-    return mk_error(xc);
-  }
-  xc = nng_http_req_alloc(&handle->req, handle->url);
-  if (xc) {
-    nng_http_client_free(handle->cli);
-    nng_url_free(handle->url);
-    R_Free(handle);
-    R_Free(haio);
-    return mk_error(xc);
-  }
+  if ((xc = nng_url_parse(&handle->url, httr)))
+    goto exitlevel1;
+  if ((xc = nng_http_client_alloc(&handle->cli, handle->url)))
+    goto exitlevel2;
+  if ((xc = nng_http_req_alloc(&handle->req, handle->url)))
+    goto exitlevel3;
 
   if (method != R_NilValue) {
     const char *met = CHAR(STRING_ELT(method, 0));
-    xc = nng_http_req_set_method(handle->req, met);
-    if (xc) {
-      nng_http_req_free(handle->req);
-      nng_http_client_free(handle->cli);
-      nng_url_free(handle->url);
-      R_Free(handle);
-      R_Free(haio);
-      return mk_error(xc);
-    }
+    if ((xc = nng_http_req_set_method(handle->req, met)))
+      goto exitlevel4;
   }
 
   if (headers != R_NilValue) {
@@ -597,30 +575,16 @@ SEXP rnng_ncurl_aio(SEXP http, SEXP method, SEXP headers, SEXP data, SEXP pem) {
       for (R_xlen_t i = 0; i < hlen; i++) {
         const char *head = CHAR(STRING_ELT(headers, i));
         const char *name = CHAR(STRING_ELT(names, i));
-        xc = nng_http_req_set_header(handle->req, name, head);
-        if (xc) {
-          nng_http_req_free(handle->req);
-          nng_http_client_free(handle->cli);
-          nng_url_free(handle->url);
-          R_Free(handle);
-          R_Free(haio);
-          return mk_error(xc);
-        }
+        if ((xc = nng_http_req_set_header(handle->req, name, head)))
+          goto exitlevel4;
       }
       break;
     case VECSXP:
       for (R_xlen_t i = 0; i < hlen; i++) {
         const char *head = CHAR(STRING_ELT(VECTOR_ELT(headers, i), 0));
         const char *name = CHAR(STRING_ELT(names, i));
-        xc = nng_http_req_set_header(handle->req, name, head);
-        if (xc) {
-          nng_http_req_free(handle->req);
-          nng_http_client_free(handle->cli);
-          nng_url_free(handle->url);
-          R_Free(handle);
-          R_Free(haio);
-          return mk_error(xc);
-        }
+        if ((xc = nng_http_req_set_header(handle->req, name, head)))
+          goto exitlevel4;
       }
       break;
     }
@@ -629,80 +593,32 @@ SEXP rnng_ncurl_aio(SEXP http, SEXP method, SEXP headers, SEXP data, SEXP pem) {
   if (data != R_NilValue) {
     unsigned char *dp = RAW(data);
     const size_t dlen = Rf_xlength(data) - 1;
-    xc = nng_http_req_set_data(handle->req, dp, dlen);
-    if (xc) {
-      nng_http_req_free(handle->req);
-      nng_http_client_free(handle->cli);
-      nng_url_free(handle->url);
-      R_Free(handle);
-      R_Free(haio);
-      return mk_error(xc);
-    }
+    if ((xc = nng_http_req_set_data(handle->req, dp, dlen)))
+      goto exitlevel4;
   }
 
-  xc = nng_http_res_alloc(&handle->res);
-  if (xc) {
-    nng_http_req_free(handle->req);
-    nng_http_client_free(handle->cli);
-    nng_url_free(handle->url);
-    R_Free(handle);
-    R_Free(haio);
-    return mk_error(xc);
-  }
+  if ((xc = nng_http_res_alloc(&handle->res)))
+    goto exitlevel4;
 
-  xc = nng_aio_alloc(&haio->aio, iaio_complete, haio);
-  if (xc) {
-    nng_http_res_free(handle->res);
-    nng_http_req_free(handle->req);
-    nng_http_client_free(handle->cli);
-    nng_url_free(handle->url);
-    R_Free(handle);
-    R_Free(haio);
-    return mk_error(xc);
-  }
+  if ((xc = nng_aio_alloc(&haio->aio, iaio_complete, haio)))
+    goto exitlevel5;
 
   if (!strcmp(handle->url->u_scheme, "https")) {
 
-    xc = nng_tls_config_alloc(&handle->cfg, NNG_TLS_MODE_CLIENT);
-    if (xc) {
-      nng_aio_free(haio->aio);
-      nng_http_res_free(handle->res);
-      nng_http_req_free(handle->req);
-      nng_http_client_free(handle->cli);
-      nng_url_free(handle->url);
-      R_Free(handle);
-      R_Free(haio);
-      return mk_error(xc);
-    }
+    if ((xc = nng_tls_config_alloc(&handle->cfg, NNG_TLS_MODE_CLIENT)))
+      goto exitlevel6;
+
     if (pem == R_NilValue) {
       if ((xc = nng_tls_config_server_name(handle->cfg, handle->url->u_hostname)) ||
           (xc = nng_tls_config_auth_mode(handle->cfg, NNG_TLS_AUTH_MODE_NONE)) ||
-          (xc = nng_http_client_set_tls(handle->cli, handle->cfg))) {
-        nng_tls_config_free(handle->cfg);
-        nng_aio_free(haio->aio);
-        nng_http_res_free(handle->res);
-        nng_http_req_free(handle->req);
-        nng_http_client_free(handle->cli);
-        nng_url_free(handle->url);
-        R_Free(handle);
-        R_Free(haio);
-        return mk_error(xc);
-      }
+          (xc = nng_http_client_set_tls(handle->cli, handle->cfg)))
+        goto exitlevel7;
     } else {
       if ((xc = nng_tls_config_server_name(handle->cfg, handle->url->u_hostname)) ||
           (xc = nng_tls_config_ca_file(handle->cfg, CHAR(STRING_ELT(pem, 0)))) ||
           (xc = nng_tls_config_auth_mode(handle->cfg, NNG_TLS_AUTH_MODE_REQUIRED)) ||
-          (xc = nng_http_client_set_tls(handle->cli, handle->cfg))) {
-        nng_tls_config_free(handle->cfg);
-        nng_aio_free(haio->aio);
-        nng_http_res_free(handle->res);
-        nng_http_req_free(handle->req);
-        nng_http_client_free(handle->cli);
-        nng_url_free(handle->url);
-        R_Free(handle);
-        R_Free(haio);
-        return mk_error(xc);
-      }
+          (xc = nng_http_client_set_tls(handle->cli, handle->cfg)))
+        goto exitlevel7;
     }
 
   }
@@ -715,6 +631,23 @@ SEXP rnng_ncurl_aio(SEXP http, SEXP method, SEXP headers, SEXP data, SEXP pem) {
   UNPROTECT(1);
   return aio;
 
+  exitlevel7:
+  nng_tls_config_free(handle->cfg);
+  exitlevel6:
+  nng_aio_free(haio->aio);
+  exitlevel5:
+  nng_http_res_free(handle->res);
+  exitlevel4:
+  nng_http_req_free(handle->req);
+  exitlevel3:
+  nng_http_client_free(handle->cli);
+  exitlevel2:
+  nng_url_free(handle->url);
+  exitlevel1:
+  R_Free(handle);
+  R_Free(haio);
+  return mk_error(xc);
+
 }
 
 SEXP rnng_aio_http(SEXP aio) {
@@ -736,8 +669,14 @@ SEXP rnng_aio_http(SEXP aio) {
   uint16_t code = nng_http_res_get_status(handle->res);
   if (code != 200) {
     REprintf("HTTP Server Response: %d %s\n", code, nng_http_res_get_reason(handle->res));
-    if (code >= 300 && code < 400)
-      return Rf_mkString(nng_http_res_get_header(handle->res, "Location"));
+    if (code >= 300 && code < 400) {
+      SEXP out;
+      PROTECT(out = Rf_allocVector(VECSXP, 2));
+      SET_VECTOR_ELT(out, 0, Rf_ScalarInteger(code));
+      SET_VECTOR_ELT(out, 1, Rf_mkString(nng_http_res_get_header(handle->res, "Location")));
+      UNPROTECT(1);
+      return out;
+    }
   }
 
   void *dat;