xjs-node 2.1.2 → 2.2.0

package/build/index.d.ts

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

package/build/obj/http-client.d.ts

@@ -1,5 +1,7 @@
 import { IncomingHttpHeaders, OutgoingHttpHeaders } from "http";
 import { ClientMode, ProxyConfig } from "../prcs/http-resolver";
+import { Loggable } from "xjs-common";
+export type LogLevel = "log" | "warn" | "error";
 export interface ClientOption {
     /**
      * {@link s_clientMode} that is imitated. default is random between chrome or firefox.
@@ -9,6 +11,18 @@ export interface ClientOption {
      * proxy configuration.
      */
     proxy?: ProxyConfig;
+    /**
+     * chrome major version refered when construct an user agent.
+     */
+    cmv: number;
+    /**
+     * custom logger. default is `console`.
+     */
+    logger: Loggable;
+    /**
+     * verbosity of logging.
+     */
+    logLevel: LogLevel;
 }
 export interface RequestOption {
     headers?: OutgoingHttpHeaders;
@@ -41,6 +55,14 @@ export interface HttpResponse<T = string> {
     payload?: T;
 }
 export interface HttpClient {
+    /**
+     * {@link s_clientMode} that is imitated. default is random between chrome or firefox.
+     */
+    readonly mode?: ClientMode;
+    /**
+     * chrome major version refered when construct an user agent.
+     */
+    readonly cmv: number;
     /**
      * request GET to the url with new context.
      * @param url target url. (currently https only)

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

@@ -1,5 +1,5 @@
+import { ClientMode } from "./http-resolver";
 import { ClientOption, HttpResponse, HttpClient, RequestOption } from "../obj/http-client";
-import { Loggable } from "xjs-common";
 export declare const s_clientMode: {
     nodejs: {
         id: number;
@@ -15,16 +15,16 @@ export declare const s_clientMode: {
     };
 };
 export declare class HttpResolverContext implements HttpClient {
+    readonly mode: ClientMode;
     readonly cmv: number;
-    private _l;
     private readonly _als;
-    private readonly _mode;
+    private readonly _l;
+    private readonly _logLevel;
     private readonly _ciphers;
     private readonly _proxyConfig?;
     private readonly _chHeaders;
     private _cookies?;
-    get clientMode(): string;
-    constructor(cmv: number, op?: ClientOption, _l?: Loggable);
+    constructor(op?: ClientOption);
     get(url: string, op?: RequestOption & {
         outerRedirectCount?: number;
         responseType: "string";

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

@@ -42,6 +42,7 @@ const url_1 = require("url");
 const https_1 = require("https");
 const http_1 = require("http");
 const async_hooks_1 = require("async_hooks");
+const http_resolver_1 = require("./http-resolver");
 const u_file_1 = require("../func/u-file");
 const u_1 = require("../func/u");
 const xjs_common_1 = require("xjs-common");
@@ -88,24 +89,26 @@ const s_mode2headers = new Map([
             return ch;
         }]
 ]);
+const s_logLevelMap = new Map([["log", 30], ["warn", 20], ["error", 10]]);
 class HttpResolverContext {
+    mode;
     cmv;
-    _l;
     _als = new async_hooks_1.AsyncLocalStorage();
-    _mode;
+    _l;
+    _logLevel;
     _ciphers;
     _proxyConfig;
     _chHeaders;
     _cookies;
-    get clientMode() { return Object.keys(exports.s_clientMode).find((_, i) => i === this._mode.id); }
-    constructor(cmv, op, _l = console) {
-        this.cmv = cmv;
-        this._l = _l;
-        this._mode = op?.mode ?? xjs_common_1.UArray.randomPick([exports.s_clientMode.chrome, exports.s_clientMode.firefox]);
-        this._proxyConfig = op?.proxy;
-        if (this._mode.id > 0) {
-            this._ciphers = this.createCiphers(this._mode);
-            this._chHeaders = s_mode2headers.get(this._mode)(this.cmv);
+    constructor(op = http_resolver_1.s_defaultClientOption) {
+        this.mode = op.mode ?? xjs_common_1.UArray.randomPick([exports.s_clientMode.chrome, exports.s_clientMode.firefox]);
+        this.cmv = op.cmv;
+        this._proxyConfig = op.proxy;
+        this._l = op.logger;
+        this._logLevel = s_logLevelMap.get(op.logLevel);
+        if (this.mode.id > 0) {
+            this._ciphers = this.createCiphers(this.mode);
+            this._chHeaders = s_mode2headers.get(this.mode)(this.cmv);
         }
     }
     async get(url, op) {
@@ -178,7 +181,7 @@ class HttpResolverContext {
         params.host = u.host;
         params.path = (rc.ignoreQuery || !u.search) ? u.pathname : `${u.pathname}${u.search}`;
         params.agent = rc.proxyAgent;
-        if (this._mode.id > 0) {
+        if (this.mode.id > 0) {
             params.ciphers = this._ciphers;
             params.headers = params.headers ? Object.assign(params.headers, this._chHeaders) : this._chHeaders;
         }
@@ -325,13 +328,16 @@ class HttpResolverContext {
         this.log(JSON.stringify(this._cookies));
     }
     log(msg) {
-        this._l.log(`[http-resolver] ${msg}`);
+        if (s_logLevelMap.get("log") <= this._logLevel)
+            this._l.log(`[http-resolver] ${msg}`);
     }
     warn(msg) {
-        this._l.warn(`[http-resolver] ${msg}`);
+        if (s_logLevelMap.get("warn") <= this._logLevel)
+            this._l.warn(`[http-resolver] ${msg}`);
     }
     error(msg) {
-        this._l.error(`[http-resolver] ${msg}`);
+        if (s_logLevelMap.get("error") <= this._logLevel)
+            this._l.error(`[http-resolver] ${msg}`);
     }
 }
 exports.HttpResolverContext = HttpResolverContext;

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

@@ -1,5 +1,3 @@
-import { Loggable } from "xjs-common";
-import { HttpResolverContext } from "./http-resolver-context";
 import { ClientOption, HttpResponse, HttpClient, RequestOption } from "../obj/http-client";
 export interface ClientMode {
     id: number;
@@ -13,21 +11,20 @@ export interface ProxyConfig {
         pass: string;
     };
 }
+export declare const s_defaultClientOption: ClientOption;
 export declare class HttpResolver implements HttpClient {
-    private _baseCmv;
-    private _l;
+    private readonly _op;
+    readonly mode?: ClientMode;
+    readonly cmv: number;
     /**
-     * @param _baseCmv chrome major version refered when construct a user agent, and the version will be randomized between `n` to `n-4`.
-     * @param _l custom logger. default is `console`.
+     * @param op {@link ClientOption}
      */
-    constructor(_baseCmv?: number, _l?: Loggable);
+    constructor(_op?: ClientOption);
     /**
      * create a http client as new context that keeps some states. (browser type, cookies, ciphers order, etc...)
-     * @param op.mode {@link s_clientMode} that is imitated. default is random between chrome or firefox.
-     * @param op.proxy proxy configuration.
-     * @returns a http client as new context.
+     * @param op {@link ClientOption}
      */
-    newContext(op?: ClientOption): HttpResolverContext;
+    newContext(op?: ClientOption): HttpClient;
     get(url: string, op?: RequestOption & ClientOption & {
         redirectAsNewRequest?: boolean;
         responseType: "string";
@@ -46,5 +43,4 @@ export declare class HttpResolver implements HttpClient {
         responseType: "buffer";
     }): Promise<HttpResponse<Buffer>>;
     post(url: string, payload: any, op?: RequestOption & ClientOption): Promise<HttpResponse<string>>;
-    private fixCmv;
 }

package/build/prcs/http-resolver.js

@@ -1,29 +1,31 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.HttpResolver = void 0;
+exports.HttpResolver = exports.s_defaultClientOption = 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 = 138;
+exports.s_defaultClientOption = {
+    cmv: 141,
+    logger: console,
+    logLevel: "warn"
+};
 class HttpResolver {
-    _baseCmv;
-    _l;
+    _op;
+    mode;
+    cmv;
     /**
-     * @param _baseCmv chrome major version refered when construct a user agent, and the version will be randomized between `n` to `n-4`.
-     * @param _l custom logger. default is `console`.
+     * @param op {@link ClientOption}
      */
-    constructor(_baseCmv = s_defaultCmv, _l = console) {
-        this._baseCmv = _baseCmv;
-        this._l = _l;
+    constructor(_op = exports.s_defaultClientOption) {
+        this._op = _op;
+        this.mode = this._op.mode;
+        this.cmv = this._op.cmv;
     }
     /**
      * create a http client as new context that keeps some states. (browser type, cookies, ciphers order, etc...)
-     * @param op.mode {@link s_clientMode} that is imitated. default is random between chrome or firefox.
-     * @param op.proxy proxy configuration.
-     * @returns a http client as new context.
+     * @param op {@link ClientOption}
      */
     newContext(op) {
-        return new http_resolver_context_1.HttpResolverContext(this.fixCmv(), op, this._l);
+        return new http_resolver_context_1.HttpResolverContext(Object.assign({}, this._op, op));
     }
     async get(url, op) {
         let redirectCount = op?.redirectAsNewRequest && -1;
@@ -46,8 +48,5 @@ class HttpResolver {
     async post(url, payload, op) {
         return await this.newContext(op).post(url, payload, op);
     }
-    fixCmv() {
-        return this._baseCmv - Math.floor(Math.random() * s_cmvRange);
-    }
 }
 exports.HttpResolver = HttpResolver;

package/package.json

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