xjs-common 9.1.4 → 9.1.6

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

@@ -19,6 +19,7 @@ export declare class HttpResolverContext implements IHttpClient {
      * @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 & {
@@ -31,6 +32,7 @@ export declare class HttpResolverContext implements IHttpClient {
      * @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>;

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

@@ -39,12 +39,12 @@ const http_method_1 = require("../../const/http-method");
 const u_type_1 = require("../../func/u-type");
 const u_file_1 = require("../../func/u-file");
 const u_string_1 = require("../../func/u-string");
+const u_1 = require("../../func/u");
 exports.s_clientMode = {
     nodejs: { id: 0, cipherOrder: null },
     chrome: { id: 1, cipherOrder: [2, 0, 1] },
     firefox: { id: 2, cipherOrder: [2, 1, 0] }
 };
-const s_timeout = 1000 * 20;
 const s_errCode = 200;
 const s_redirectLimit = 5;
 const s_mode2headers = new Map([
@@ -96,7 +96,8 @@ class HttpResolverContext {
         this.cmv = cmv;
         this._l = _l;
         this._mode = op?.mode ?? u_array_1.UArray.randomPick([exports.s_clientMode.chrome, exports.s_clientMode.firefox]);
-        this._ciphers = this.createCiphers(this._mode);
+        if (this._mode.id > 0)
+            this._ciphers = this.createCiphers(this._mode);
         this._proxyConfig = op?.proxy;
         this._chHeaders = s_mode2headers.get(this._mode)(this.cmv);
     }
@@ -106,6 +107,7 @@ class HttpResolverContext {
      * @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.
      */
     async get(url, op) {
@@ -122,6 +124,7 @@ class HttpResolverContext {
      * @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.
      */
     async post(url, payload, op) {
@@ -179,7 +182,7 @@ class HttpResolverContext {
     };
     reqHttps(u, params, payload) {
         const rc = this._als.getStore();
-        params.timeout = s_timeout;
+        params.timeout = rc.timeout ?? 0;
         params.protocol = u.protocol;
         params.host = u.host;
         params.path = (rc.ignoreQuery || !u.search) ? u.pathname : `${u.pathname}${u.search}`;
@@ -259,7 +262,7 @@ class HttpResolverContext {
                 .find(f => f.trim().startsWith("filename"))
                 ?.replace(/^\s+filename\s+=/, "").trim()
                 ?? u_file_1.UFile.reserveFilePath(d, `xjs-download_${u_string_1.UString.simpleTime()}`);
-            return u_file_1.UFile.joinPath(d, fname);
+            return (0, u_1.joinPath)(d, fname);
         };
         if (opPath) {
             const st = u_file_1.UFile.status(opPath);

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

@@ -16,6 +16,10 @@ export interface RequestOption {
      * default is current directory of the process with `filename` of the disposition.
      */
     downloadPath?: string;
+    /**
+     * timeout milliseconds to wait for socket inactivity. default is infinity.
+     */
+    timeout?: number;
 }
 export interface HttpResponse {
     /**
@@ -36,6 +40,7 @@ export interface IHttpClient {
      * @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.redirectAsNewRequest handle redirect as new request. this may be efficient when using proxy which is implemented reverse proxy.
      * @returns http response. {@link HttpResponse}
      */
@@ -51,6 +56,7 @@ export interface IHttpClient {
      * @param op.proxy proxy configuration.
      * @param op.ignoreQuery {@link RequestOption.ignoreQuery}
      * @param op.downloadPath {@link RequestOption.downloadPath}
+     * @param op.timeout {@link RequestOption.timeout}
      * @returns http response. {@link HttpResponse}
      */
     post(url: string, payload: any, op?: RequestOption & ClientOption): Promise<HttpResponse>;

package/package.json

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