xjs-common 9.1.3 → 9.1.5

package/dist/func/u-file.d.ts

@@ -41,6 +41,11 @@ export declare namespace UFile {
      * @param destDir directory that the decompress files export to.
      */
     function unzip(zipPath: MaybeArray<string>, destDir?: MaybeArray<string>): void;
+    /**
+     * @deprecated since v9.1.4
+     * @removed this will be removed in v10.
+     * @replaced it should uses this without namespace `UFile`.
+     */
     function joinPath(...p: MaybeArray<string>[]): string;
 }
 export {};

package/dist/func/u-file.js

@@ -159,6 +159,11 @@ var UFile;
         }
     }
     UFile.unzip = unzip;
+    /**
+     * @deprecated since v9.1.4
+     * @removed this will be removed in v10.
+     * @replaced it should uses this without namespace `UFile`.
+     */
     function joinPath(...p) {
         return path.join(...p.flatMap(u_type_1.UType.takeAsArray));
     }

package/dist/func/u.d.ts

@@ -1,4 +1,4 @@
-import { Loggable } from "../const/types";
+import { Loggable, MaybeArray } from "../const/types";
 export declare function getJSTDate(d?: Date): Date;
 export declare function delay(sec: number): Promise<void>;
 export declare function int2array(size: number): number[];
@@ -23,3 +23,4 @@ export declare function retry<T>(cb: () => T, op?: RetryOption<void>): T;
 export declare function retry<T>(cb: () => T, op?: RetryOption<Promise<void>>): Promise<T>;
 export declare function retry<T>(cb: () => Promise<T>, op?: RetryOption<void>): Promise<T>;
 export declare function retry<T>(cb: () => Promise<T>, op?: RetryOption<Promise<void>>): Promise<T>;
+export declare function joinPath(...p: MaybeArray<string>[]): string;

package/dist/func/u.js

@@ -1,7 +1,32 @@
 "use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.retry = exports.checkPortAvailability = exports.bitor = exports.array2map = exports.int2array = exports.delay = exports.getJSTDate = void 0;
+exports.joinPath = exports.retry = exports.checkPortAvailability = exports.bitor = exports.array2map = exports.int2array = exports.delay = exports.getJSTDate = void 0;
+const path = __importStar(require("path"));
 const xjs_err_1 = require("../obj/xjs-err");
+const u_type_1 = require("./u-type");
 const s_errCode = 10;
 function getJSTDate(d) {
     return new Date((d ? d.getTime() : Date.now()) + 9 * 60 * 60 * 1000);
@@ -83,3 +108,7 @@ function retry(cb, op) {
     return prcs(initialCount);
 }
 exports.retry = retry;
+function joinPath(...p) {
+    return path.join(...p.flatMap(u_type_1.UType.takeAsArray));
+}
+exports.joinPath = joinPath;

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([
@@ -106,6 +106,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 +123,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 +181,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 +261,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.3",
+  "version": "9.1.5",
   "description": "library modules for nodejs + typescript that bundled general-purpose implementations.",
   "repository": {
     "type": "git",