namirasoft-core 1.5.3 → 1.5.5

package/src/BaseUUID.ts

@@ -1,77 +1,77 @@
-import { NIL, v4, v5 } from "uuid";
-
-export class BaseUUID
-{
-    public static SIZE = 20;
-    static isValid(id: any): boolean
-    {
-        let value = (id ?? "") + "";
-        if (value.length != BaseUUID.SIZE)
-            return false;
-        let parts = id.split("@")[0].split("-");
-        if (parts.length < 2)
-            return false;
-        return /^[a-z][a-z][a-z]$/.test(parts[0]);
-    }
-    static isValidShort(id: string, short: string): boolean
-    {
-        if (BaseUUID.isValid(id))
-            return BaseUUID.getShort(id) === short;
-        return false;
-    }
-    static getShort(id: string)
-    {
-        let parts = (id ?? "").split("@")[0].split("-");
-        let ans = [];
-        for (let index = 0; index < parts.length - 1; index++)
-        {
-            const part = parts[index];
-            if (/^[a-z][a-z][a-z]$/.test(part))
-                ans.push(part);
-            else
-                break;
-        }
-        return ans.join("-");
-    }
-    short: string;
-    lenght: number
-    constructor(short: string, lenght?: number)
-    {
-        this.short = short;
-        this.lenght = lenght ?? BaseUUID.SIZE;
-    }
-    static uuid(lenght?: number, seed?: string): string
-    {
-        if (!lenght)
-            lenght = BaseUUID.SIZE;
-        let value = null;
-        if (seed)
-        {
-            value = v5(seed, NIL);
-        }
-        else
-            value = v4();
-        let ans = value.replace(/-/g, '');
-        while (ans.length < lenght)
-            ans += this.uuid(BaseUUID.SIZE, seed);
-        ans = ans.substring(0, lenght);
-        return ans;
-    }
-    static isChild(id: string): boolean
-    {
-        let index = id.indexOf("@")
-        return index != -1;
-    }
-    static changeToChild(owner_id: string, name: string): string
-    {
-        let index = owner_id.indexOf("@")
-        if (index != -1)
-            return owner_id.substring(0, index + 1) + name.substring(0, BaseUUID.SIZE - index - 1).padStart(BaseUUID.SIZE - index - 1, '-');
-        return "";
-    }
-    new(seed?: string, lenght?: number)
-    {
-        let ans = this.short + "-" + BaseUUID.uuid(BaseUUID.SIZE, seed);
-        return ans.substring(0, lenght ?? this.lenght);
-    }
+import { NIL, v4, v5 } from "uuid";
+
+export class BaseUUID
+{
+    public static SIZE = 20;
+    static isValid(id: any): boolean
+    {
+        let value = (id ?? "") + "";
+        if (value.length != BaseUUID.SIZE)
+            return false;
+        let parts = id.split("@")[0].split("-");
+        if (parts.length < 2)
+            return false;
+        return /^[a-z][a-z][a-z]$/.test(parts[0]);
+    }
+    static isValidShort(id: string, short: string): boolean
+    {
+        if (BaseUUID.isValid(id))
+            return BaseUUID.getShort(id) === short;
+        return false;
+    }
+    static getShort(id: string)
+    {
+        let parts = (id ?? "").split("@")[0].split("-");
+        let ans = [];
+        for (let index = 0; index < parts.length - 1; index++)
+        {
+            const part = parts[index];
+            if (/^[a-z][a-z][a-z]$/.test(part))
+                ans.push(part);
+            else
+                break;
+        }
+        return ans.join("-");
+    }
+    short: string;
+    lenght: number
+    constructor(short: string, lenght?: number)
+    {
+        this.short = short;
+        this.lenght = lenght ?? BaseUUID.SIZE;
+    }
+    static uuid(lenght?: number, seed?: string): string
+    {
+        if (!lenght)
+            lenght = BaseUUID.SIZE;
+        let value = null;
+        if (seed)
+        {
+            value = v5(seed, NIL);
+        }
+        else
+            value = v4();
+        let ans = value.replace(/-/g, '');
+        while (ans.length < lenght)
+            ans += this.uuid(BaseUUID.SIZE, seed);
+        ans = ans.substring(0, lenght);
+        return ans;
+    }
+    static isChild(id: string): boolean
+    {
+        let index = id.indexOf("@")
+        return index != -1;
+    }
+    static changeToChild(owner_id: string, name: string): string
+    {
+        let index = owner_id.indexOf("@")
+        if (index != -1)
+            return owner_id.substring(0, index + 1) + name.substring(0, BaseUUID.SIZE - index - 1).padStart(BaseUUID.SIZE - index - 1, '-');
+        return "";
+    }
+    new(seed?: string, lenght?: number)
+    {
+        let ans = this.short + "-" + BaseUUID.uuid(BaseUUID.SIZE, seed);
+        return ans.substring(0, lenght ?? this.lenght);
+    }
 };

package/src/ByteOperation.ts

@@ -1,58 +1,58 @@
-export enum ByteUnit
-{
-    B = "B",
-    KB = "KB",
-    MB = "MB",
-    GB = "GB",
-    TB = "TB",
-    PB = "PB",
-};
-
-const SIGN_TO_NUMBER: Record<ByteUnit, number> = {
-    [ByteUnit.B]: 0,
-    [ByteUnit.KB]: 1,
-    [ByteUnit.MB]: 2,
-    [ByteUnit.GB]: 3,
-    [ByteUnit.TB]: 4,
-    [ByteUnit.PB]: 5,
-};
-const NUMBER_TO_SIGN: Record<number, ByteUnit> = {
-    0: ByteUnit.B,
-    1: ByteUnit.KB,
-    2: ByteUnit.MB,
-    3: ByteUnit.GB,
-    4: ByteUnit.TB,
-    5: ByteUnit.PB,
-};
-
-export class ByteOperation
-{
-    static format(value: number, unit: ByteUnit)
-    {
-        let KILO = 1024;
-        let bytes = this.convert(value, unit, ByteUnit.B);
-        if (!bytes || bytes < 1) return "0B";
-
-        let index = 0;
-        while (bytes >= KILO && NUMBER_TO_SIGN[index] != null)
-        {
-            bytes /= KILO;
-            index++;
-        }
-
-        function formatNumber(value: number): string
-        {
-            if (value != Math.round(value))
-            {
-                if (value < 1) return value.toFixed(2);
-                if (value < 100) return value.toFixed(1);
-            }
-            return value.toFixed(0);
-        }
-        return `${formatNumber(bytes)}${NUMBER_TO_SIGN[index]}`;
-    }
-    static convert(value: number, from: ByteUnit, to: ByteUnit)
-    {
-        return value * (2 ** (10 * (SIGN_TO_NUMBER[from] - SIGN_TO_NUMBER[to])));
-    }
+export enum ByteUnit
+{
+    B = "B",
+    KB = "KB",
+    MB = "MB",
+    GB = "GB",
+    TB = "TB",
+    PB = "PB",
+};
+
+const SIGN_TO_NUMBER: Record<ByteUnit, number> = {
+    [ByteUnit.B]: 0,
+    [ByteUnit.KB]: 1,
+    [ByteUnit.MB]: 2,
+    [ByteUnit.GB]: 3,
+    [ByteUnit.TB]: 4,
+    [ByteUnit.PB]: 5,
+};
+const NUMBER_TO_SIGN: Record<number, ByteUnit> = {
+    0: ByteUnit.B,
+    1: ByteUnit.KB,
+    2: ByteUnit.MB,
+    3: ByteUnit.GB,
+    4: ByteUnit.TB,
+    5: ByteUnit.PB,
+};
+
+export class ByteOperation
+{
+    static format(value: number, unit: ByteUnit)
+    {
+        let KILO = 1024;
+        let bytes = this.convert(value, unit, ByteUnit.B);
+        if (!bytes || bytes < 1) return "0B";
+
+        let index = 0;
+        while (bytes >= KILO && NUMBER_TO_SIGN[index] != null)
+        {
+            bytes /= KILO;
+            index++;
+        }
+
+        function formatNumber(value: number): string
+        {
+            if (value != Math.round(value))
+            {
+                if (value < 1) return value.toFixed(2);
+                if (value < 100) return value.toFixed(1);
+            }
+            return value.toFixed(0);
+        }
+        return `${formatNumber(bytes)}${NUMBER_TO_SIGN[index]}`;
+    }
+    static convert(value: number, from: ByteUnit, to: ByteUnit)
+    {
+        return value * (2 ** (10 * (SIGN_TO_NUMBER[from] - SIGN_TO_NUMBER[to])));
+    }
 }

package/src/CacheService.ts

@@ -1,77 +1,90 @@
-import { Mutex } from "async-mutex";
-import { IStorage } from "./IStorage";
-
-interface CacheStorage<DataType>
-{
-    version?: string;
-    expires_at: Date;
-    data: DataType;
-}
-
-export class CacheService<DataType>
-{
-    private name: string;
-    private storage: IStorage;
-    private duration_minutes: number;
-    private getVersion: () => Promise<string>;
-    private getFromSource: () => Promise<DataType>;
-    public onExpired?: () => void;
-    public runGetOn?: Mutex;
-    constructor(name: string, storage: IStorage, duration_minutes: number, getVersion: () => Promise<string>, getFromSource: () => Promise<DataType>)
-    {
-        this.name = name;
-        this.storage = storage;
-        this.duration_minutes = duration_minutes;
-        this.getVersion = getVersion;
-        this.getFromSource = getFromSource;
-    }
-    async get(): Promise<DataType>
-    {
-        let innerGet = async () =>
-        {
-            let version = await this.getVersion();
-            let value = this.storage.get(this.name, "");
-            if (value)
-            {
-                let cache = JSON.parse(value) as CacheStorage<DataType>;
-                if (cache.version == version)
-                    if (new Date(cache.expires_at) > new Date())
-                        if (cache.data != null)
-                            return cache.data;
-            }
-            let ans = await this.getFromSource();
-            await this.set(ans, version);
-            return ans;
-        };
-        if (this.runGetOn)
-            return await this.runGetOn.runExclusive(async () =>
-            {
-                return await innerGet();
-            });
-        return await innerGet();
-    }
-    async set(data: DataType, version?: string)
-    {
-        if (!version)
-            version = await this.getVersion();
-        let expires_at = new Date();
-        expires_at.setMinutes(expires_at.getMinutes() + this.duration_minutes);
-        let value = JSON.stringify({ data, version, expires_at });
-        this.storage.set(this.name, value);
-
-        if (this.onExpired)
-        {
-            let sleep = expires_at.getTime() - new Date().getTime();
-            if (sleep <= 0)
-                sleep = 5 * 1000;
-            setTimeout(() =>
-            {
-                this.onExpired?.();
-            }, sleep);
-        }
-    }
-    del()
-    {
-        this.storage.del(this.name);
-    }
+import { IStorage } from "./IStorage";
+
+interface CacheStorage<DataType>
+{
+    version?: string;
+    expires_at: Date;
+    data: DataType;
+}
+
+export class CacheService<DataType>
+{
+    private static pending: { [name: string]: Promise<any> } = {};
+    private static fetcherSources: { [name: string]: string } = {};
+
+    private name: string;
+    private storage: IStorage;
+    private duration_minutes: number;
+    private getVersion: () => Promise<string>;
+    private getFromSource: () => Promise<DataType>;
+    public onExpired?: () => void;
+    constructor(name: string, storage: IStorage, duration_minutes: number, getVersion: () => Promise<string>, getFromSource: () => Promise<DataType>)
+    {
+        let source = getFromSource.toString();
+        let existing = CacheService.fetcherSources[name];
+        if (existing !== undefined && existing !== source)
+            throw new Error(`CacheService: name "${name}" was already registered with a different getFromSource. The name is a global dedup key — instances that share a name must share the same fetcher.`);
+        CacheService.fetcherSources[name] = source;
+
+        this.name = name;
+        this.storage = storage;
+        this.duration_minutes = duration_minutes;
+        this.getVersion = getVersion;
+        this.getFromSource = getFromSource;
+    }
+    async get(): Promise<DataType>
+    {
+        if (this.name in CacheService.pending)
+            return CacheService.pending[this.name] as Promise<DataType>;
+
+        let promise = (async (): Promise<DataType> =>
+        {
+            let version = await this.getVersion();
+            let value = this.storage.get(this.name, "");
+            if (value)
+            {
+                let cache = JSON.parse(value) as CacheStorage<DataType>;
+                if (cache.version == version)
+                    if (new Date(cache.expires_at) > new Date())
+                        if (cache.data != null)
+                            return cache.data;
+            }
+            let ans = await this.getFromSource();
+            await this.set(ans, version);
+            return ans;
+        })().finally(() =>
+        {
+            delete CacheService.pending[this.name];
+        }) as Promise<DataType>;
+
+        CacheService.pending[this.name] = promise;
+        return promise;
+    }
+    async set(data: DataType, version?: string)
+    {
+        delete CacheService.pending[this.name];
+
+        if (!version)
+            version = await this.getVersion();
+        let expires_at = new Date();
+        expires_at.setMinutes(expires_at.getMinutes() + this.duration_minutes);
+        let value = JSON.stringify({ data, version, expires_at });
+        this.storage.set(this.name, value);
+
+        if (this.onExpired)
+        {
+            let sleep = expires_at.getTime() - new Date().getTime();
+            if (sleep <= 0)
+                sleep = 5 * 1000;
+            setTimeout(() =>
+            {
+                this.onExpired?.();
+            }, sleep);
+        }
+    }
+    del()
+    {
+        delete CacheService.pending[this.name];
+        this.storage.del(this.name);
+    }
 }