xjs-common 8.0.4 → 8.2.0

package/README.md

@@ -215,6 +215,7 @@ XJS throws error with `code` property which has one of the following numbers.
 |10|`func/u`|
 |20|`func/u-string`|
 |30|`func/u-type` (include `func/decorator/d-type`) |
+|40|`func/u-file` |
 |100|`func/decorator/transaction`|
 |200|`prcs/http/http-resolver`|
 

package/dist/const/time-unit.d.ts

@@ -0,0 +1,9 @@
+export declare enum TimeUnit {
+    Year = 1,
+    Month = 2,
+    Day = 3,
+    Hour = 4,
+    Min = 5,
+    Sec = 6,
+    Msec = 7
+}

package/dist/const/time-unit.js

@@ -0,0 +1,13 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.TimeUnit = void 0;
+var TimeUnit;
+(function (TimeUnit) {
+    TimeUnit[TimeUnit["Year"] = 1] = "Year";
+    TimeUnit[TimeUnit["Month"] = 2] = "Month";
+    TimeUnit[TimeUnit["Day"] = 3] = "Day";
+    TimeUnit[TimeUnit["Hour"] = 4] = "Hour";
+    TimeUnit[TimeUnit["Min"] = 5] = "Min";
+    TimeUnit[TimeUnit["Sec"] = 6] = "Sec";
+    TimeUnit[TimeUnit["Msec"] = 7] = "Msec";
+})(TimeUnit = exports.TimeUnit || (exports.TimeUnit = {}));

package/dist/func/u-array.js

@@ -21,8 +21,11 @@ var UArray;
             return [];
         if (op?.k)
             return Array.from((0, u_1.array2map)(array, e => e[op.k]).values()).map(a => op?.takeLast ? a.pop() : a.shift());
-        const a = op?.takeLast ? [...array].reverse() : array;
-        return a.filter((v, i) => a.findIndex(v2 => op?.predicate ? op?.predicate(v, v2) : v == v2) === i);
+        const a = op?.takeLast ? [...array].reverse() : [...array];
+        const p = op?.predicate ?? ((v1, v2) => v1 == v2);
+        const result = [a.shift()];
+        a.forEach(v => result.some(v2 => p(v, v2)) ? {} : result.push(v));
+        return result;
     }
     UArray.distinct = distinct;
     function chop(array, len) {

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

@@ -3,9 +3,11 @@ import { MaybeArray } from "../const/types";
 export declare namespace UFile {
     function mkdir(p: MaybeArray<string>): boolean;
     function write(p: MaybeArray<string>, c: string): void;
-    function exists(...p: string[]): boolean;
+    function rm(p: MaybeArray<string>): void;
+    function exists(p: MaybeArray<string>): boolean;
     function read(p: MaybeArray<string>): Buffer;
     function read(p: MaybeArray<string>, encoding: BufferEncoding): string;
     function cp(from: MaybeArray<string>, to: MaybeArray<string>): void;
     function mv(from: MaybeArray<string>, to: MaybeArray<string>): void;
+    function joinPath(p: MaybeArray<string>): string;
 }

package/dist/func/u-file.js

@@ -27,43 +27,55 @@ exports.UFile = void 0;
 const fs = __importStar(require("fs"));
 const path = __importStar(require("path"));
 const u_type_1 = require("./u-type");
+const xjs_err_1 = require("../obj/xjs-err");
+const s_errCode = 40;
 var UFile;
 (function (UFile) {
     function mkdir(p) {
-        const dirPath = join(p);
+        const dirPath = joinPath(p);
         const e = fs.existsSync(dirPath);
-        if (!e || !fs.statSync(dirPath).isDirectory())
+        if (!e)
             fs.mkdirSync(dirPath, { recursive: true });
+        else if (!fs.statSync(dirPath).isDirectory())
+            throw new xjs_err_1.XjsErr(s_errCode, "Already exists a file (not directory) on the path.");
         return !e;
     }
     UFile.mkdir = mkdir;
     function write(p, c) {
-        fs.writeFileSync(join(p), c);
+        fs.writeFileSync(joinPath(p), c);
     }
     UFile.write = write;
-    function exists(...p) {
-        return !!p && fs.existsSync(path.join(...p));
+    function rm(p) {
+        fs.rmSync(joinPath(p), { recursive: true });
+    }
+    UFile.rm = rm;
+    function exists(p) {
+        return fs.existsSync(joinPath(p));
     }
     UFile.exists = exists;
     function read(p, encoding) {
-        return fs.readFileSync(join(p), encoding);
+        const f = joinPath(p);
+        if (!fs.existsSync(f))
+            throw new xjs_err_1.XjsErr(s_errCode, `No file found => ${f}`);
+        return fs.readFileSync(f, encoding);
     }
     UFile.read = read;
     function cp(from, to) {
-        const f = join(from), t = join(to);
-        if (fs.existsSync(f))
-            fs.writeFileSync(t, fs.readFileSync(f));
+        const f = joinPath(from), t = joinPath(to);
+        if (!fs.existsSync(f))
+            throw new xjs_err_1.XjsErr(s_errCode, `No file found => ${f}`);
+        fs.copyFileSync(f, t);
     }
     UFile.cp = cp;
     function mv(from, to) {
-        const f = join(from), t = join(to);
-        if (fs.existsSync(f) && fs.statSync(f).isFile()) {
-            fs.writeFileSync(t, fs.readFileSync(f));
-            fs.rmSync(f, { force: true });
-        }
+        const f = joinPath(from), t = joinPath(to);
+        if (!fs.existsSync(f))
+            throw new xjs_err_1.XjsErr(s_errCode, `No file found => ${f}`);
+        fs.renameSync(f, t);
     }
     UFile.mv = mv;
-    function join(p) {
+    function joinPath(p) {
         return u_type_1.UType.isString(p) ? p : path.join(...p);
     }
+    UFile.joinPath = joinPath;
 })(UFile = exports.UFile || (exports.UFile = {}));

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

@@ -1,7 +1,16 @@
+import { TimeUnit } from "../const/time-unit";
 export declare namespace UString {
     function eq(s1: string, s2: string): boolean;
-    function simpleDate2sec(date?: Date): string;
-    function simpleDate2day(date?: Date): string;
+    /**
+     * generate date time number as fixed length (depends on `unit`) string without separator charactor.
+     * For example, `2025-06-08T10:15:06.366Z` is to be `20250608101506366`.
+     * @param op.date Date object refered by this. default is `new Date()`.
+     * @param op.unit time unit. default is secound.
+     */
+    function simpleTime(op?: {
+        date?: Date;
+        unit?: TimeUnit;
+    }): string;
     function trimProps(obj: any): void;
     function generateRandomString(len: number): string;
     function idx2az(idx: number): string;

package/dist/func/u-string.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.UString = void 0;
+const time_unit_1 = require("../const/time-unit");
 const xjs_err_1 = require("../obj/xjs-err");
 const u_1 = require("./u");
 const u_type_1 = require("./u-type");
@@ -11,14 +12,19 @@ var UString;
         return !u_type_1.UType.isString(s1) || !u_type_1.UType.isString(s2) ? s1 === s2 : s1.trim() === s2.trim();
     }
     UString.eq = eq;
-    function simpleDate2sec(date) {
-        return (date ?? new Date()).toISOString().split(".")[0].replace(/[-T:]/g, "");
+    /**
+     * generate date time number as fixed length (depends on `unit`) string without separator charactor.
+     * For example, `2025-06-08T10:15:06.366Z` is to be `20250608101506366`.
+     * @param op.date Date object refered by this. default is `new Date()`.
+     * @param op.unit time unit. default is secound.
+     */
+    function simpleTime(op) {
+        const t = (op?.date ?? new Date()).toISOString().split(".")[0].replace(/[-T:]/g, "");
+        if (op?.unit === time_unit_1.TimeUnit.Msec)
+            return t;
+        return t.substring(0, 14 - (6 - (op?.unit ?? time_unit_1.TimeUnit.Sec)) * 2);
     }
-    UString.simpleDate2sec = simpleDate2sec;
-    function simpleDate2day(date) {
-        return simpleDate2sec(date).substring(0, 8);
-    }
-    UString.simpleDate2day = simpleDate2day;
+    UString.simpleTime = simpleTime;
     function trimProps(obj) {
         Object.keys(obj)
             .filter(k => typeof obj[k] === "string")

package/dist/func/u.d.ts

@@ -1,6 +1,9 @@
+import { Loggable } 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[];
 export declare function array2map<K, T>(array: T[], keyGen: (e: T) => K): Map<K, T[]>;
 export declare function bitor(...bit: number[]): number;
 export declare function checkPortAvailability(port: number): Promise<boolean>;
+export declare function retry<T>(cb: () => T, count?: number, logger?: Loggable): T;
+export declare function retry<T>(cb: () => Promise<T>, count?: number, logger?: Loggable): Promise<T>;

package/dist/func/u.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.checkPortAvailability = exports.bitor = exports.array2map = exports.int2array = exports.delay = exports.getJSTDate = void 0;
+exports.retry = exports.checkPortAvailability = exports.bitor = exports.array2map = exports.int2array = exports.delay = exports.getJSTDate = void 0;
 const xjs_err_1 = require("../obj/xjs-err");
 const s_errCode = 10;
 function getJSTDate(d) {
@@ -43,3 +43,24 @@ function checkPortAvailability(port) {
     });
 }
 exports.checkPortAvailability = checkPortAvailability;
+function retry(cb, count = 2, logger = console) {
+    const prcs = (c) => {
+        if (c < 0)
+            throw new xjs_err_1.XjsErr(s_errCode, "failure exceeds retryable count.");
+        let ret = null;
+        try {
+            ret = cb();
+        }
+        catch (e) {
+            logger.warn(e);
+            ret = prcs(c - 1);
+        }
+        if (ret instanceof Promise) {
+            return new Promise(resolve => ret.then(resolve).catch(e => { logger.warn(e); resolve(prcs(c - 1)); }));
+        }
+        else
+            return ret;
+    };
+    return prcs(count);
+}
+exports.retry = retry;

package/dist/index.d.ts

@@ -1,4 +1,5 @@
 export * from "./const/types";
+export * from "./const/time-unit";
 export * from "./const/gender";
 export * from "./const/http-method";
 export * from "./func/u";

package/dist/index.js

@@ -16,6 +16,7 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.s_clientMode = exports.HttpResolver = exports.DType = void 0;
 __exportStar(require("./const/types"), exports);
+__exportStar(require("./const/time-unit"), exports);
 __exportStar(require("./const/gender"), exports);
 __exportStar(require("./const/http-method"), exports);
 __exportStar(require("./func/u"), exports);

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

@@ -1,5 +1,6 @@
 import { ClientMode } from "./http-resolver";
 import { ClientOption, IHttpClient, RequestOption } from "./i-http-client";
+import { Loggable } from "../../const/types";
 export declare const s_clientMode: Record<string, ClientMode>;
 export declare class HttpResolverContext implements IHttpClient {
     private readonly _cmv;
@@ -10,10 +11,7 @@ export declare class HttpResolverContext implements IHttpClient {
     private readonly _proxyConfig?;
     private readonly _chHeaders;
     private _cookies?;
-    constructor(_cmv: number, op?: ClientOption, _l?: {
-        log: (msg: any) => void;
-        warn: (msg: any) => void;
-    });
+    constructor(_cmv: number, op?: ClientOption, _l?: Loggable);
     /**
      * request GET to the url.
      * @param url target url.

package/package.json

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