xjs-node 1.0.1 → 1.0.3

package/dist/index.d.ts

@@ -1,5 +1,5 @@
 export * from "./func/u";
 export * from "./func/u-file";
-export { HttpResolver } from "./prcs/http/http-resolver";
+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";

package/dist/prcs/http/http-resolver-context.d.ts

@@ -1,4 +1,7 @@
-import { ClientOption, HttpResponse, IHttpClient, RequestOption } from "./i-http-client";
+/// <reference types="node" />
+/// <reference types="node" />
+import { OutgoingHttpHeaders, IncomingHttpHeaders } from "http";
+import { ClientOption, IHttpClient } from "./i-http-client";
 import { Loggable } from "xjs-common";
 export declare const s_clientMode: {
     nodejs: {
@@ -25,29 +28,70 @@ export declare class HttpResolverContext implements IHttpClient {
     private _cookies?;
     get clientMode(): string;
     constructor(cmv: number, op?: ClientOption, _l?: Loggable);
-    /**
-     * request GET to the url.
-     * @param url target url.
-     * @param op.headers http headers.
-     * @param op.ignoreQuery {@link RequestOption.ignoreQuery}
-     * @param op.downloadPath {@link RequestOption.downloadPath}
-     * @param op.timeout {@link RequestOption.timeout}
-     * @returns string encoded by utf-8 as response payload.
-     */
-    get(url: string, op?: RequestOption & {
+    get(url: string, op?: {
+        headers?: OutgoingHttpHeaders;
+        ignoreQuery?: boolean;
+        downloadPath?: string;
+        timeout?: number;
+    } & {
         outerRedirectCount?: number;
-    }): Promise<HttpResponse>;
-    /**
-     * request POST to the url.
-     * @param url target url.
-     * @param payload request payload. if this is an object, it is treated as json.
-     * @param op.headers http headers.
-     * @param op.ignoreQuery {@link RequestOption.ignoreQuery}
-     * @param op.downloadPath {@link RequestOption.downloadPath}
-     * @param op.timeout {@link RequestOption.timeout}
-     * @returns string encoded by utf-8 as response payload.
-     */
-    post(url: string, payload: any, op?: RequestOption): Promise<HttpResponse>;
+    }): Promise<{
+        headers?: IncomingHttpHeaders;
+        payload: string;
+    }>;
+    get(url: string, op?: {
+        headers?: OutgoingHttpHeaders;
+        ignoreQuery?: boolean;
+        downloadPath?: string;
+        timeout?: number;
+        responseType: "string";
+    } & {
+        outerRedirectCount?: number;
+    }): Promise<{
+        headers?: IncomingHttpHeaders;
+        payload: string;
+    }>;
+    get(url: string, op?: {
+        headers?: OutgoingHttpHeaders;
+        ignoreQuery?: boolean;
+        downloadPath?: string;
+        timeout?: number;
+        responseType: "buffer";
+    } & {
+        outerRedirectCount?: number;
+    }): Promise<{
+        headers?: IncomingHttpHeaders;
+        payload: Buffer;
+    }>;
+    post(url: string, payload: any, op?: {
+        headers?: OutgoingHttpHeaders;
+        ignoreQuery?: boolean;
+        downloadPath?: string;
+        timeout?: number;
+    }): Promise<{
+        headers?: IncomingHttpHeaders;
+        payload: string;
+    }>;
+    post(url: string, payload: any, op?: {
+        headers?: OutgoingHttpHeaders;
+        ignoreQuery?: boolean;
+        downloadPath?: string;
+        timeout?: number;
+        responseType: "string";
+    }): Promise<{
+        headers?: IncomingHttpHeaders;
+        payload: string;
+    }>;
+    post(url: string, payload: any, op?: {
+        headers?: OutgoingHttpHeaders;
+        ignoreQuery?: boolean;
+        downloadPath?: string;
+        timeout?: number;
+        responseType: "buffer";
+    }): Promise<{
+        headers?: IncomingHttpHeaders;
+        payload: Buffer;
+    }>;
     private createProxyAgent;
     private getIn;
     private postIn;

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

@@ -64,7 +64,7 @@ const s_mode2headers = new Map([
                 "Accept-Language": "en-US,en;q=0.9",
                 "Sec-Ch-Ua": uad,
                 "Sec-Ch-Ua-Mobile": "?0",
-                "Sec-Ch-Ua-Platform": "Windows",
+                "Sec-Ch-Ua-Platform": '"Windows"',
                 "Sec-Fetch-Dest": "document",
                 "Sec-Fetch-Mode": "navigate",
                 "Sec-Fetch-Site": "none",
@@ -104,6 +104,7 @@ class HttpResolverContext {
      * @param op.ignoreQuery {@link RequestOption.ignoreQuery}
      * @param op.downloadPath {@link RequestOption.downloadPath}
      * @param op.timeout {@link RequestOption.timeout}
+     * @param op.responseType {@link RequestOption.responseType}
      * @returns string encoded by utf-8 as response payload.
      */
     async get(url, op) {
@@ -121,6 +122,7 @@ class HttpResolverContext {
      * @param op.ignoreQuery {@link RequestOption.ignoreQuery}
      * @param op.downloadPath {@link RequestOption.downloadPath}
      * @param op.timeout {@link RequestOption.timeout}
+     * @param op.responseType {@link RequestOption.responseType}
      * @returns string encoded by utf-8 as response payload.
      */
     async post(url, payload, op) {
@@ -238,9 +240,9 @@ class HttpResolverContext {
                     retBuf = zlib.gunzipSync(retBuf);
                 else if (contentEncofing == "br")
                     retBuf = zlib.brotliDecompressSync(retBuf);
-                const data = retBuf.toString("utf8");
+                const data = rc.responseType === "buffer" ? retBuf : retBuf.toString("utf8");
                 if (sc !== 2) {
-                    if (data.trim())
+                    if (xjs_common_1.UType.isString(data) && data.trim())
                         this.warn(data);
                     reject(new xjs_common_1.XjsErr(s_errCode, `Https received a error status ${res.statusCode}`));
                 }

package/dist/prcs/http/http-resolver.d.ts

@@ -1,6 +1,9 @@
+/// <reference types="node" />
+/// <reference types="node" />
 import { Loggable } from "xjs-common";
 import { HttpResolverContext } from "./http-resolver-context";
-import { ClientOption, HttpResponse, IHttpClient, RequestOption } from "./i-http-client";
+import { ClientOption, IHttpClient } from "./i-http-client";
+import { IncomingHttpHeaders, OutgoingHttpHeaders } from "http";
 export interface ClientMode {
     id: number;
     cipherOrder: number[];
@@ -28,9 +31,69 @@ export declare class HttpResolver implements IHttpClient {
      * @returns a http client as new context.
      */
     newContext(op?: ClientOption): HttpResolverContext;
-    get(url: string, op?: RequestOption & ClientOption & {
+    get(url: string, op?: {
+        headers?: OutgoingHttpHeaders;
+        ignoreQuery?: boolean;
+        downloadPath?: string;
+        timeout?: number;
+    } & ClientOption & {
         redirectAsNewRequest?: boolean;
-    }): Promise<HttpResponse>;
-    post(url: string, payload: any, op?: RequestOption & ClientOption): Promise<HttpResponse>;
+    }): Promise<{
+        headers?: IncomingHttpHeaders;
+        payload: string;
+    }>;
+    get(url: string, op?: {
+        headers?: OutgoingHttpHeaders;
+        ignoreQuery?: boolean;
+        downloadPath?: string;
+        timeout?: number;
+        responseType: "string";
+    } & ClientOption & {
+        redirectAsNewRequest?: boolean;
+    }): Promise<{
+        headers?: IncomingHttpHeaders;
+        payload: string;
+    }>;
+    get(url: string, op?: {
+        headers?: OutgoingHttpHeaders;
+        ignoreQuery?: boolean;
+        downloadPath?: string;
+        timeout?: number;
+        responseType: "buffer";
+    } & ClientOption & {
+        redirectAsNewRequest?: boolean;
+    }): Promise<{
+        headers?: IncomingHttpHeaders;
+        payload: Buffer;
+    }>;
+    post(url: string, payload: any, op?: {
+        headers?: OutgoingHttpHeaders;
+        ignoreQuery?: boolean;
+        downloadPath?: string;
+        timeout?: number;
+    } & ClientOption): Promise<{
+        headers?: IncomingHttpHeaders;
+        payload: string;
+    }>;
+    post(url: string, payload: any, op?: {
+        headers?: OutgoingHttpHeaders;
+        ignoreQuery?: boolean;
+        downloadPath?: string;
+        timeout?: number;
+        responseType: "string";
+    } & ClientOption): Promise<{
+        headers?: IncomingHttpHeaders;
+        payload: string;
+    }>;
+    post(url: string, payload: any, op?: {
+        headers?: OutgoingHttpHeaders;
+        ignoreQuery?: boolean;
+        downloadPath?: string;
+        timeout?: number;
+        responseType: "buffer";
+    } & ClientOption): Promise<{
+        headers?: IncomingHttpHeaders;
+        payload: Buffer;
+    }>;
     private fixCmv;
 }

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

@@ -4,7 +4,7 @@ exports.HttpResolver = void 0;
 const xjs_common_1 = require("xjs-common");
 const http_resolver_context_1 = require("./http-resolver-context");
 const s_cmvRange = 5;
-const s_defaultCmv = 137;
+const s_defaultCmv = 138;
 class HttpResolver {
     _baseCmv;
     _l;

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

@@ -1,4 +1,5 @@
 /// <reference types="node" />
+/// <reference types="node" />
 import { IncomingHttpHeaders, OutgoingHttpHeaders } from "http";
 import { ClientMode, ProxyConfig } from "./http-resolver";
 export interface ClientOption {
@@ -20,6 +21,10 @@ export interface RequestOption {
      * timeout milliseconds to wait for socket inactivity. default is infinity.
      */
     timeout?: number;
+    /**
+     * type of response payload. default is string (utf-8).
+     */
+    responseType?: "string" | "buffer";
 }
 export interface HttpResponse {
     /**
@@ -27,20 +32,21 @@ export interface HttpResponse {
      */
     headers?: IncomingHttpHeaders;
     /**
-     * string encoded by utf-8 as response payload.
+     * response payload which has a type depends on {@link RequestOption.responseType}.
      */
-    payload?: string;
+    payload?: string | Buffer;
 }
 export interface IHttpClient {
     /**
      * request GET to the url with new context.
-     * @param url target url.
+     * @param url target url. (currently https only)
      * @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.
      * @param op.ignoreQuery {@link RequestOption.ignoreQuery}
      * @param op.downloadPath {@link RequestOption.downloadPath}
      * @param op.timeout {@link RequestOption.timeout}
+     * @param op.responseType {@link RequestOption.responseType}
      * @param op.redirectAsNewRequest handle redirect as new request. this may be efficient when using proxy which is implemented reverse proxy.
      * @returns http response. {@link HttpResponse}
      */
@@ -49,7 +55,7 @@ export interface IHttpClient {
     }): Promise<HttpResponse>;
     /**
      * request POST to the url with new context.
-     * @param url target url.
+     * @param url target url. (currently https only)
      * @param payload request payload. if this is an object, it 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.
@@ -57,6 +63,7 @@ export interface IHttpClient {
      * @param op.ignoreQuery {@link RequestOption.ignoreQuery}
      * @param op.downloadPath {@link RequestOption.downloadPath}
      * @param op.timeout {@link RequestOption.timeout}
+     * @param op.responseType {@link RequestOption.responseType}
      * @returns http response. {@link HttpResponse}
      */
     post(url: string, payload: any, op?: RequestOption & ClientOption): Promise<HttpResponse>;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "xjs-node",
-  "version": "1.0.1",
+  "version": "1.0.3",
   "description": "library modules for nodejs + typescript that bundled general-purpose implementations.",
   "repository": {
     "type": "git",