reqrio 0.2.0-alpha1 → 0.2.0-beta1

package/2.log

@@ -36,3 +36,9 @@ CLIENT_RANDOM 40c4a4038db16498b18defb475f76eb960fab4d7c3cb614e6e1f7992df9e98f0 4
 CLIENT_RANDOM 966ed32241c38b1d168bc87b4789e52401c588746c4ad42e29975d0ff49b363c c5a52901916cd4c993e7f774b97174d4cef2a1be24f3cf0675ab866b80dab69140f290a99dd3c307ac6dbeb01f4e4ead
 CLIENT_RANDOM 6f71074305989527086d8ebce133d155a85b232bdc474f9fb1e18aa005031adb ad1d2821354848d10703f04647ca324438fc5e2df60639b3db89082f0995590f0d88ac9d613039a7e885eb97ad9392c9
 CLIENT_RANDOM 58329af12e3a0c20da02cd91e8add6cff9e296e6432791f77afdc02c6e2c8189 833119fc15c1d797632bd86ba840f1bcbe8214e8e7a88ab46881b6d388f735d268045f19902a694cda9aa9c85f3c4d86
+CLIENT_RANDOM 57ebe1865008502c2eee11b6419166ecbbe2d6408ea988b2b9e42ec08b12c2ff c3f0e97fa83edc2944cf637865aa0bd212fc3bf9f081c6a7a382cfbd6bab14224ca8ebf49fc6cf82adf96240e44686c6
+CLIENT_RANDOM 2b18740baa2ae2d6dfce9ac88e71ca49532d8b5bdd4ceed0fa83bce652b699c5 3e025245ee0a2daf5524dd657df695e35880099e8d235ed26515db97903003e3412ef30a0e7f2639ca0868692ee4c382
+CLIENT_RANDOM d1e0c818e88c5e01fadfe05b8895ab54348ff3d7f8109e267ac404088f834221 37deaf63f7c91645ef2bfd70a8f861e637460103e3713dbc8a8eab353bc0f58ef73c871b050455d2bcc5802817da4193
+CLIENT_RANDOM 485a849f8ef01449b464211c26aab0fc33f7dfc4e89b7f2b8704adc3884a42b4 81b7344cf7d796fd0f14cffcccb171eae634a7ef33eb3a07f06201ced0fa8332e1dea461feb031ba69f448f68d056950
+CLIENT_RANDOM d36388c2674bc82f9f55e6e5ba75a486d88f36dfe2059a2dddd51a399ac620b8 d1c4eab2faf6bc61c4e596ca26a0f49cb5b592ea72344ba4b6410aa452fecebd0a0277e8caf51912a0423ab0f0b7f9cc
+CLIENT_RANDOM ba15d711142d8f0f0211f740e88b8614d2ab56c5680e89468e251e844bc937fd 8012359c5503ff84daffc5a06ddb6a36b880330904d98bc81aa28eb7e9d025d494f89ea90d9b409e0c6a976baa8323bd

package/bindings.js

@@ -4,7 +4,7 @@ const path = require("path");
 
 const voidPtr = ref.refType(ref.types.void);
 const charPtr = ref.types.CString;
-const bytePtr = ref.refType(ref.types.char)
+const uint8Ptr = ref.refType(ref.types.uint8);
 
 const Method = {
     GET: 0,
@@ -39,10 +39,8 @@ const library = ffi.Library(libpath, {
     ScReq_set_proxy: ['int', [voidPtr, charPtr]],
     ScReq_set_url: ['int', [voidPtr, charPtr]],
     ScReq_add_param: ['int', [voidPtr, charPtr, charPtr]],
-    ScReq_set_data: ['int', [voidPtr, charPtr]],
-    ScReq_set_json: ['int', [voidPtr, charPtr]],
-    ScReq_set_bytes: ['int', [voidPtr, bytePtr, "uint32"]],
-    ScReq_set_text: ["int", [voidPtr, charPtr]],
+    ScReq_set_bytes: ['int', [voidPtr, uint8Ptr, "uint32", charPtr]],
+    ScReq_set_context_type: ['int', [voidPtr, charPtr]],
     ScReq_set_timeout: ["int", [voidPtr, charPtr]],
     ScReq_set_cookie: ['int', [voidPtr, charPtr]],
     ScReq_add_cookie: ['int', [voidPtr, charPtr, charPtr]],

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "reqrio",
-  "version": "0.2.0-alpha1",
+  "version": "0.2.0-beta1",
   "description": "A lightweight, high concurrency HTTP request library",
   "main": "index.js",
   "keywords": [

package/session.js

@@ -76,24 +76,25 @@ class Session {
 
     set_data(data) {
         let data_str = JSON.stringify(data)
-        let ret = library.ScReq_set_data(data_str);
-        if (ret === -1) throw "set_data error"
+        this.set_bytes(new TextEncoder().encode(data_str), "application/x-www-form-urlencoded")
     }
 
     set_json(json) {
-        let json_str = JSON.stringify(this.req, json);
-        let ret = library.ScReq_set_header_json(this.req, json_str);
-        if (ret === -1) throw "set_json error"
+        let json_str = JSON.stringify(json);
+        this.set_bytes(new TextEncoder().encode(json_str), "application/json")
     }
 
-    set_bytes(buffer) {
-        let ret = library.ScReq_set_bytes(this.req, buffer, buffer.length);
-        if (ret === -1) throw "set_bytes error"
+    set_bytes(buffer, ct = "application/octet-stream") {
+        let ret = library.ScReq_set_bytes(this.req, buffer, buffer.length, ct);
+        if (ret === -1) throw "set body error"
     }
 
     set_text(text) {
-        let ret = library.ScReq_set_text(this.req, text);
-        if (ret === -1) throw "set_text error"
+        this.set_bytes(new TextEncoder().encode(text), "text/plain")
+    }
+
+    set_context_type(ct) {
+        library.ScReq_set_context_type(this.req, ct)
     }
 
     /*

package/test.js

@@ -1,6 +1,7 @@
 const {Session, ALPN, Websocket} = require('./index')
 
 let session = new Session(ALPN.HTTP20, true, "sd", false);
+session.set_text("sdfdgdfg")
 session.set_url("https://m.so.com");
 session.set_callback(function (data) {
     console.log(data.length)