xjs-node 1.0.4 → 1.0.6

package/README.md

@@ -58,7 +58,7 @@ import { HttpResolver, s_clientMode } from "xjs-node";
     const context = http.newContext();
     res = await context.get("https://begyyal.net/1");
     // this request sends with cookies that is set by precedent requests. 
-    // in POST, payload is treated as json if it is an object.
+    // in POST, payload is treated as json if it is an object. (but also Stream is acceptable.)
     res = await context.post("https://begyyal.net/2", { a: "b" });
 })();
 ```

package/dist/index.d.ts

@@ -2,4 +2,4 @@ export * from "./func/u";
 export * from "./func/u-file";
 export { HttpResolver, ClientMode } from "./prcs/http/http-resolver";
 export { s_clientMode } from "./prcs/http/http-resolver-context";
-export { IHttpClient } from "./prcs/http/i-http-client";
+export { IHttpClient, HttpResponse } from "./prcs/http/i-http-client";

package/dist/prcs/http/http-resolver-context.js

@@ -35,6 +35,7 @@ const async_hooks_1 = require("async_hooks");
 const u_file_1 = require("../../func/u-file");
 const u_1 = require("../../func/u");
 const xjs_common_1 = require("xjs-common");
+const stream_1 = require("stream");
 exports.s_clientMode = {
     nodejs: { id: 0, cipherOrder: null },
     chrome: { id: 1, cipherOrder: [2, 0, 1] },
@@ -44,36 +45,36 @@ const s_errCode = 1200;
 const s_redirectLimit = 5;
 const s_mode2headers = new Map([
     [exports.s_clientMode.firefox, (cmv) => ({
-            "Accept": "text/html,application/xhtml+xml,application/xml;q=0.9,image/avif,image/webp,*/*;q=0.8",
-            "Accept-Encoding": "gzip, deflate, br",
-            "Accept-Language": "en-US,en;q=0.5",
-            "Sec-Fetch-Dest": "document",
-            "Sec-Fetch-Mode": "navigate",
-            "Sec-Fetch-Site": "none",
-            "Sec-Fetch-User": "?1",
-            "Upgrade-Insecure-Requests": "1",
-            "User-Agent": `Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:${cmv}.0) Gecko/20100101 Firefox/${cmv}.0`
+            "accept": "text/html,application/xhtml+xml,application/xml;q=0.9,image/avif,image/webp,*/*;q=0.8",
+            "accept-encoding": "gzip, deflate, br",
+            "accept-language": "en-US,en;q=0.5",
+            "sec-fetch-dest": "document",
+            "sec-fetch-mode": "navigate",
+            "sec-fetch-site": "none",
+            "sec-fetch-user": "?1",
+            "upgrade-insecure-requests": "1",
+            "user-agent": `Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:${cmv}.0) Gecko/20100101 Firefox/${cmv}.0`
         })],
     [exports.s_clientMode.chrome, (cmv) => {
             const uad = cmv < 130
                 ? `"Not/A)Brand";v="8", "Chromium";v="${cmv}", "Google Chrome";v="${cmv}"`
                 : `"Chromium";v="${cmv}", "Not:A-Brand";v="24", "Google Chrome";v="${cmv}"`;
             const ch = {
-                "Accept": "text/html,application/xhtml+xml,application/xml;q=0.9,image/avif,image/webp,image/apng,*/*;q=0.8,application/signed-exchange;v=b3;q=0.7",
-                "Accept-Encoding": "gzip, deflate, br, zstd",
-                "Accept-Language": "en-US,en;q=0.9",
-                "Sec-Ch-Ua": uad,
-                "Sec-Ch-Ua-Mobile": "?0",
-                "Sec-Ch-Ua-Platform": '"Windows"',
-                "Sec-Fetch-Dest": "document",
-                "Sec-Fetch-Mode": "navigate",
-                "Sec-Fetch-Site": "none",
-                "Sec-Fetch-User": "?1",
-                "Upgrade-Insecure-Requests": "1",
-                "User-Agent": `Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/${cmv}.0.0.0 Safari/537.36`
+                "accept": "text/html,application/xhtml+xml,application/xml;q=0.9,image/avif,image/webp,image/apng,*/*;q=0.8,application/signed-exchange;v=b3;q=0.7",
+                "accept-encoding": "gzip, deflate, br, zstd",
+                "accept-language": "en-US,en;q=0.9",
+                "sec-ch-ua": uad,
+                "sec-ch-ua-mobile": "?0",
+                "sec-ch-ua-platform": '"Windows"',
+                "sec-fetch-dest": "document",
+                "sec-fetch-mode": "navigate",
+                "sec-fetch-site": "none",
+                "sec-fetch-user": "?1",
+                "upgrade-insecure-requests": "1",
+                "user-agent": `Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/${cmv}.0.0.0 Safari/537.36`
             };
             if (cmv >= 124)
-                ch["Priority"] = "u=0, i";
+                ch["priority"] = "u=0, i";
             return ch;
         }]
 ]);
@@ -116,7 +117,7 @@ class HttpResolverContext {
         return new Promise((resolve, reject) => {
             const headers = {};
             if (conf.auth)
-                headers['Proxy-Authorization'] = `Basic ${Buffer.from(conf.auth.name + ':' + conf.auth.pass).toString('base64')}`;
+                headers['proxy-authorization'] = `Basic ${Buffer.from(conf.auth.name + ':' + conf.auth.pass).toString('base64')}`;
             const req = (0, http_1.request)({
                 host: conf.server,
                 port: conf.port,
@@ -141,19 +142,22 @@ class HttpResolverContext {
         const params = {};
         const rc = this._als.getStore();
         params.method = xjs_common_1.HttpMethod.Get;
-        params.headers = rc.headers ?? {};
+        params.headers = xjs_common_1.UHttp.normalizeHeaders(rc.headers);
         return await this.reqHttps(u, params);
     };
     postIn = async (u, payload) => {
         const params = {};
         const rc = this._als.getStore();
         params.method = xjs_common_1.HttpMethod.Post;
-        params.headers = rc.headers ?? {};
+        params.headers = xjs_common_1.UHttp.normalizeHeaders(rc.headers);
         let p = payload;
-        if (xjs_common_1.UType.isObject(payload)) {
+        if (p instanceof stream_1.Stream) {
+            params.headers["content-type"] ??= "application/octet-stream";
+        }
+        else if (xjs_common_1.UType.isObject(payload)) {
             p = JSON.stringify(payload);
-            params.headers["Content-Length"] = p.length;
-            params.headers["Content-Type"] = "application/json";
+            params.headers["content-length"] = p.length;
+            params.headers["content-type"] = "application/json";
         }
         return await this.reqHttps(u, params, p);
     };
@@ -178,7 +182,10 @@ class HttpResolverContext {
                 reject(new xjs_common_1.XjsErr(s_errCode, "The http request timeout, maybe server did not respond."));
             });
             if (payload)
-                req.write(payload);
+                if (payload instanceof stream_1.Stream)
+                    payload.pipe(req);
+                else
+                    req.write(payload);
             req.end();
         });
     }

package/dist/prcs/http/i-http-client.d.ts

@@ -70,7 +70,7 @@ export interface IHttpClient {
     /**
      * request POST to the url with new context.
      * @param url target url. (currently https only)
-     * @param payload request payload. if this is an object, it is treated as json.
+     * @param payload request payload. if this is a Stream, pipe will be used, otherwise if an object, this is treated as json.
      * @param op.headers http headers.
      * @param op.mode {@link s_clientMode} that is imitated. default is random between chrome or firefox.
      * @param op.proxy proxy configuration.

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "xjs-node",
-  "version": "1.0.4",
+  "version": "1.0.6",
   "description": "library modules for nodejs + typescript that bundled general-purpose implementations.",
   "repository": {
     "type": "git",
@@ -29,6 +29,6 @@
     "typescript": "^4.9.5"
   },
   "dependencies": {
-    "xjs-common": "^10.1.0"
+    "xjs-common": "^10.1.3"
   }
 }