RC8; cache ncurl aio activebindings

Author: shikokuchuo

DESCRIPTION

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

NEWS.md

@@ -1,4 +1,4 @@
-# nanonext 0.6.0.9600 (development)
+# nanonext 0.6.0.9700 (development)
 
 #### New Features
 

R/nano.R

@@ -360,7 +360,7 @@ print.nanoStream <- function(x, ...) {
 print.recvAio <- function(x, ...) {
 
   if (.subset2(x, "state"))
-    cat("< recvAio >\n - $data for message data\n - $raw for raw message\n", file = stdout())
+    cat("< recvAio >\n - $raw for raw message\n - $data for message data\n", file = stdout())
   else
     cat("< recvAio >\n - $data for message data\n", file = stdout())
   invisible(x)
@@ -442,7 +442,7 @@ print.errorValue <- function(x, ...) {
 #' @export
 #'
 .DollarNames.recvAio <- function(x, pattern = "")
-  grep(pattern, c("data", if (.subset2(x, "state")) "raw"), value = TRUE, fixed = TRUE)
+  grep(pattern, c(if (.subset2(x, "state")) "raw", "data"), value = TRUE, fixed = TRUE)
 
 #' @export
 #'

README.md

@@ -237,8 +237,8 @@ complete.
 msg <- recv_aio(s2, keep.raw = TRUE)
 msg
 #> < recvAio >
-#>  - $data for message data
 #>  - $raw for raw message
+#>  - $data for message data
 msg$data
 #> 'unresolved' logi NA
 ```
@@ -365,7 +365,7 @@ aio
 #> < recvAio >
 #>  - $data for message data
 aio$data |> str()
-#>  num [1:100000000] 0.2809 0.3156 0.6802 0.0214 -0.428 ...
+#>  num [1:100000000] 0.521 -1.154 0.624 0.373 -0.547 ...
 ```
 
 As `call_aio()` is blocking and will wait for completion, an alternative
@@ -526,11 +526,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 36 33 65 32 33 64 2d 36 61 35 64 33 64 39 37 31 66 64 35 32 35 31
-#> [101] 61 37 61 39 37 36 31 36 30 22 0a 20 20 7d 0a 7d 0a
+#>  [76] 2d 36 33 36 34 66 31 64 31 2d 31 39 31 35 36 30 63 38 35 61 62 39 36 62 62
+#> [101] 32 33 39 61 32 33 31 36 33 22 0a 20 20 7d 0a 7d 0a
 #> 
 #> $data
-#> [1] "{\n  \"headers\": {\n    \"Host\": \"httpbin.org\", \n    \"X-Amzn-Trace-Id\": \"Root=1-6363e23d-6a5d3d971fd5251a7a976160\"\n  }\n}\n"
+#> [1] "{\n  \"headers\": {\n    \"Host\": \"httpbin.org\", \n    \"X-Amzn-Trace-Id\": \"Root=1-6364f1d1-191560c85ab96bb239a23163\"\n  }\n}\n"
 ```
 
 For advanced use, supports additional HTTP methods such as POST or PUT.
@@ -551,13 +551,13 @@ res
 
 call_aio(res)$headers
 #> $Date
-#> [1] "Thu, 03 Nov 2022 15:46:05 GMT"
+#> [1] "Fri, 04 Nov 2022 11:04:50 GMT"
 #> 
 #> $Server
 #> [1] "gunicorn/19.9.0"
 
 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-6363e23d-4639d32e5648c7015c23491a\"\n  }, \n  \"json\": {\n    \"key\": \"value\"\n  }, \n  \"origin\": \"80.169.103.218\", \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-6364f1d2-259652e3288ea25d5fb454a3\"\n  }, \n  \"json\": {\n    \"key\": \"value\"\n  }, \n  \"origin\": \"213.86.169.34\", \n  \"url\": \"http://httpbin.org/post\"\n}\n"
 ```
 
 In this respect, it may be used as a performant and lightweight method
@@ -599,10 +599,10 @@ s |> send('{"action": "subscribe", "symbols": "EURUSD"}')
 #> [1] 0
 
 s |> recv()
-#> [1] "{\"s\":\"EURUSD\",\"a\":0.9766,\"b\":0.97658,\"dd\":\"-0.0047\",\"dc\":\"-0.4843\",\"ppms\":false,\"t\":1667490367000}"
+#> [1] "{\"s\":\"EURUSD\",\"a\":0.9792,\"b\":0.9789,\"dc\":\"0.4371\",\"dd\":\"0.0043\",\"ppms\":false,\"t\":1667559891000}"
 
 s |> recv()
-#> [1] "{\"s\":\"EURUSD\",\"a\":0.97657,\"b\":0.97655,\"dc\":\"-0.4874\",\"dd\":\"-0.0048\",\"ppms\":false,\"t\":1667490367000}"
+#> [1] "{\"s\":\"EURUSD\",\"a\":0.9791,\"b\":0.97908,\"dc\":\"0.4269\",\"dd\":\"0.0042\",\"ppms\":false,\"t\":1667559892000}"
 
 close(s)
 ```

src/aio.c

@@ -135,18 +135,6 @@ static void haio_finalizer(SEXP xptr) {
 
 }
 
-static void create_activebinding(SEXP sym, SEXP env, SEXP clo, const int x) {
-
-  SEXP fun;
-  PROTECT(fun = Rf_allocSExp(CLOSXP));
-  SET_FORMALS(fun, nano_aioFormals);
-  SET_BODY(fun, Rf_lang5(nano_DotcallSymbol, nano_RnngHttpSymbol, nano_ContextSymbol, nano_ResponseSymbol, Rf_ScalarInteger(x)));
-  SET_CLOENV(fun, clo);
-  R_MakeActiveBinding(sym, fun, env);
-  UNPROTECT(1);
-
-}
-
 static SEXP mk_error_saio(const int xc, SEXP env) {
 
   SEXP err;
@@ -529,7 +517,7 @@ SEXP rnng_send_aio(SEXP con, SEXP data, SEXP mode, SEXP timeout, SEXP clo) {
   Rf_defineVar(nano_AioSymbol, aio, env);
   PROTECT(fun = Rf_allocSExp(CLOSXP));
   SET_FORMALS(fun, nano_aioFormals);
-  SET_BODY(fun, CAR(nano_aioFunctions));
+  SET_BODY(fun, CAR(nano_aioFuncs));
   SET_CLOENV(fun, clo);
   R_MakeActiveBinding(nano_ResultSymbol, fun, env);
   Rf_classgets(env, nano_sendAio);
@@ -638,21 +626,21 @@ SEXP rnng_recv_aio(SEXP con, SEXP mode, SEXP timeout, SEXP keep, SEXP bytes, SEX
   REPROTECT(env = Rf_eval(env, clo), pxi);
 #endif
   Rf_defineVar(nano_AioSymbol, aio, env);
-  Rf_defineVar(nano_StateSymbol, Rf_ScalarLogical(kpr), env);
+  Rf_defineVar(nano_StateSymbol, keep, env);
 
-  PROTECT(datafun = Rf_allocSExp(CLOSXP));
-  SET_FORMALS(datafun, nano_aioFormals);
-  SET_BODY(datafun, CADR(nano_aioFunctions));
-  SET_CLOENV(datafun, clo);
   if (kpr) {
     SEXP rawfun;
     PROTECT(rawfun = Rf_allocSExp(CLOSXP));
     SET_FORMALS(rawfun, nano_aioFormals);
-    SET_BODY(rawfun, CADDR(nano_aioFunctions));
+    SET_BODY(rawfun, CADDR(nano_aioFuncs));
     SET_CLOENV(rawfun, clo);
     R_MakeActiveBinding(nano_RawSymbol, rawfun, env);
     UNPROTECT(1);
   }
+  PROTECT(datafun = Rf_allocSExp(CLOSXP));
+  SET_FORMALS(datafun, nano_aioFormals);
+  SET_BODY(datafun, CADR(nano_aioFuncs));
+  SET_CLOENV(datafun, clo);
   R_MakeActiveBinding(nano_DataSymbol, datafun, env);
   Rf_classgets(env, nano_recvAio);
 
@@ -761,14 +749,32 @@ SEXP rnng_ncurl_aio(SEXP http, SEXP convert, SEXP method, SEXP headers, SEXP dat
   REPROTECT(env = Rf_eval(env, clo), pxi);
 #endif
   Rf_defineVar(nano_AioSymbol, aio, env);
-  create_activebinding(nano_StatusSymbol, env, clo, 0);
-  create_activebinding(nano_HeadersSymbol, env, clo, 1);
-  create_activebinding(nano_RawSymbol, env, clo, 2);
-  create_activebinding(nano_DataSymbol, env, clo, 3);
+
+  SEXP sfun, hfun, rfun, dfun;
+  PROTECT(sfun = Rf_allocSExp(CLOSXP));
+  SET_FORMALS(sfun, nano_aioFormals);
+  SET_BODY(sfun, CAR(nano_aioNFuncs));
+  SET_CLOENV(sfun, clo);
+  R_MakeActiveBinding(nano_StatusSymbol, sfun, env);
+  PROTECT(hfun = Rf_allocSExp(CLOSXP));
+  SET_FORMALS(hfun, nano_aioFormals);
+  SET_BODY(hfun, CADR(nano_aioNFuncs));
+  SET_CLOENV(hfun, clo);
+  R_MakeActiveBinding(nano_HeadersSymbol, hfun, env);
+  PROTECT(rfun = Rf_allocSExp(CLOSXP));
+  SET_FORMALS(rfun, nano_aioFormals);
+  SET_BODY(rfun, CADDR(nano_aioNFuncs));
+  SET_CLOENV(rfun, clo);
+  R_MakeActiveBinding(nano_RawSymbol, rfun, env);
+  PROTECT(dfun = Rf_allocSExp(CLOSXP));
+  SET_FORMALS(dfun, nano_aioFormals);
+  SET_BODY(dfun, CADDDR(nano_aioNFuncs));
+  SET_CLOENV(dfun, clo);
+  R_MakeActiveBinding(nano_DataSymbol, dfun, env);
 
   Rf_classgets(env, nano_ncurlAio);
 
-  UNPROTECT(2);
+  UNPROTECT(6);
   return env;
 
   exitlevel7:
@@ -950,22 +956,21 @@ SEXP rnng_request(SEXP con, SEXP data, SEXP sendmode, SEXP recvmode, SEXP timeou
   PROTECT(sendaio = R_MakeExternalPtr(saio, R_NilValue, R_NilValue));
   R_RegisterCFinalizerEx(sendaio, saio_finalizer, TRUE);
   R_MakeWeakRef(aio, sendaio, R_NilValue, TRUE);
+  Rf_defineVar(nano_StateSymbol, keep, env);
 
-  Rf_defineVar(nano_StateSymbol, Rf_ScalarLogical(kpr), env);
-
-  PROTECT(datafun = Rf_allocSExp(CLOSXP));
-  SET_FORMALS(datafun, nano_aioFormals);
-  SET_BODY(datafun, CADR(nano_aioFunctions));
-  SET_CLOENV(datafun, clo);
   if (kpr) {
     SEXP rawfun;
     PROTECT(rawfun = Rf_allocSExp(CLOSXP));
     SET_FORMALS(rawfun, nano_aioFormals);
-    SET_BODY(rawfun, CADDR(nano_aioFunctions));
+    SET_BODY(rawfun, CADDR(nano_aioFuncs));
     SET_CLOENV(rawfun, clo);
     R_MakeActiveBinding(nano_RawSymbol, rawfun, env);
     UNPROTECT(1);
   }
+  PROTECT(datafun = Rf_allocSExp(CLOSXP));
+  SET_FORMALS(datafun, nano_aioFormals);
+  SET_BODY(datafun, CADR(nano_aioFuncs));
+  SET_CLOENV(datafun, clo);
   R_MakeActiveBinding(nano_DataSymbol, datafun, env);
   Rf_classgets(env, nano_recvAio);
 

src/init.c

@@ -31,7 +31,6 @@ SEXP nano_ProtocolSymbol;
 SEXP nano_RawSymbol;
 SEXP nano_ResponseSymbol;
 SEXP nano_ResultSymbol;
-SEXP nano_RnngHttpSymbol;
 SEXP nano_RtcSymbol;
 SEXP nano_SerialSymbol;
 SEXP nano_SocketSymbol;
@@ -43,7 +42,8 @@ SEXP nano_UnserSymbol;
 SEXP nano_UrlSymbol;
 
 SEXP nano_aioFormals;
-SEXP nano_aioFunctions;
+SEXP nano_aioFuncs;
+SEXP nano_aioNFuncs;
 SEXP nano_error;
 SEXP nano_ncurlAio;
 SEXP nano_recvAio;
@@ -65,7 +65,6 @@ static void RegisterSymbols(void) {
   nano_RawSymbol = Rf_install("raw");
   nano_ResponseSymbol = Rf_install("response");
   nano_ResultSymbol = Rf_install("result");
-  nano_RnngHttpSymbol = Rf_install("rnng_aio_http");
   nano_RtcSymbol = Rf_install("rawToChar");
   nano_SerialSymbol = Rf_install("serialize");
   nano_SocketSymbol = Rf_install("socket");
@@ -79,12 +78,18 @@ static void RegisterSymbols(void) {
 
 static void PreserveObjects(void) {
   R_PreserveObject(nano_aioFormals = Rf_list1(Rf_install(".")));
-  SEXP result, msgdata, msgraw;
+  SEXP result, msgdata, msgraw, nstatus, nheaders, nraw, ndata;
   PROTECT(result = Rf_lang3(nano_DotcallSymbol, Rf_install("rnng_aio_result"), nano_DataSymbol));
   PROTECT(msgdata = Rf_lang3(nano_DotcallSymbol, Rf_install("rnng_aio_get_msgdata"), nano_ResultSymbol));
   PROTECT(msgraw = Rf_lang3(nano_DotcallSymbol, Rf_install("rnng_aio_get_msgraw"), nano_ResultSymbol));
-  R_PreserveObject(nano_aioFunctions = Rf_list3(result, msgdata, msgraw));
-  UNPROTECT(3);
+  R_PreserveObject(nano_aioFuncs = Rf_list3(result, msgdata, msgraw));
+  SEXP nano_AioHttpSymbol = Rf_install("rnng_aio_http");
+  PROTECT(nstatus = Rf_lang5(nano_DotcallSymbol, nano_AioHttpSymbol, nano_ContextSymbol, nano_ResponseSymbol, Rf_ScalarInteger(0)));
+  PROTECT(nheaders = Rf_lang5(nano_DotcallSymbol, nano_AioHttpSymbol, nano_ContextSymbol, nano_ResponseSymbol, Rf_ScalarInteger(1)));
+  PROTECT(nraw = Rf_lang5(nano_DotcallSymbol, nano_AioHttpSymbol, nano_ContextSymbol, nano_ResponseSymbol, Rf_ScalarInteger(2)));
+  PROTECT(ndata = Rf_lang5(nano_DotcallSymbol, nano_AioHttpSymbol, nano_ContextSymbol, nano_ResponseSymbol, Rf_ScalarInteger(3)));
+  R_PreserveObject(nano_aioNFuncs = Rf_list4(nstatus, nheaders, nraw, ndata));
+  UNPROTECT(7);
   R_PreserveObject(nano_error = Rf_mkString("errorValue"));
   R_PreserveObject(nano_ncurlAio = Rf_allocVector(STRSXP, 2));
   SET_STRING_ELT(nano_ncurlAio, 0, Rf_mkChar("ncurlAio"));
@@ -98,7 +103,8 @@ static void PreserveObjects(void) {
 
 static void ReleaseObjects(void) {
   R_ReleaseObject(nano_aioFormals);
-  R_ReleaseObject(nano_aioFunctions);
+  R_ReleaseObject(nano_aioFuncs);
+  R_ReleaseObject(nano_aioNFuncs);
   R_ReleaseObject(nano_error);
   R_ReleaseObject(nano_ncurlAio);
   R_ReleaseObject(nano_recvAio);

src/nanonext.h

@@ -90,7 +90,6 @@ extern SEXP nano_ProtocolSymbol;
 extern SEXP nano_RawSymbol;
 extern SEXP nano_ResponseSymbol;
 extern SEXP nano_ResultSymbol;
-extern SEXP nano_RnngHttpSymbol;
 extern SEXP nano_RtcSymbol;
 extern SEXP nano_SerialSymbol;
 extern SEXP nano_SocketSymbol;
@@ -102,7 +101,8 @@ extern SEXP nano_UnserSymbol;
 extern SEXP nano_UrlSymbol;
 
 extern SEXP nano_aioFormals;
-extern SEXP nano_aioFunctions;
+extern SEXP nano_aioFuncs;
+extern SEXP nano_aioNFuncs;
 extern SEXP nano_error;
 extern SEXP nano_ncurlAio;
 extern SEXP nano_recvAio;