namirasoft-core 1.4.43 → 1.4.45

package/dist/CacheService.d.ts

@@ -1,12 +1,13 @@
 import { IStorage } from "./IStorage";
 export declare class CacheService<DataType> {
     private name;
-    private duration_minutes;
     private storage;
+    private duration_minutes;
+    private getVersion;
     private getFromSource;
-    private onExpired;
-    constructor(name: string, duration_minutes: number, storage: IStorage, getFromSource: () => Promise<DataType>, onExpired: () => void);
+    onExpired?: () => void;
+    constructor(name: string, storage: IStorage, duration_minutes: number, getVersion: () => Promise<string>, getFromSource: () => Promise<DataType>);
     get(): Promise<DataType>;
-    set(data: DataType): void;
+    set(data: DataType, version?: string): Promise<void>;
     del(): void;
 }

package/dist/CacheService.js

@@ -11,39 +11,46 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.CacheService = void 0;
 class CacheService {
-    constructor(name, duration_minutes, storage, getFromSource, onExpired) {
+    constructor(name, storage, duration_minutes, getVersion, getFromSource) {
         this.name = name;
-        this.duration_minutes = duration_minutes;
         this.storage = storage;
+        this.duration_minutes = duration_minutes;
+        this.getVersion = getVersion;
         this.getFromSource = getFromSource;
-        this.onExpired = onExpired;
     }
     get() {
         return __awaiter(this, void 0, void 0, function* () {
-            let ans;
+            let version = yield this.getVersion();
             let value = this.storage.get(this.name, "");
             if (value) {
                 let cache = JSON.parse(value);
-                if (new Date(cache.expires_at) > new Date())
-                    return cache.data;
+                if (cache.version == version)
+                    if (new Date(cache.expires_at) > new Date())
+                        return cache.data;
             }
-            ans = yield this.getFromSource();
-            this.set(ans);
+            let ans = yield this.getFromSource();
+            yield this.set(ans, version);
             return ans;
         });
     }
-    set(data) {
-        let expires_at = new Date();
-        expires_at.setMinutes(expires_at.getMinutes() + this.duration_minutes);
-        let value = JSON.stringify({ data, expires_at });
-        this.storage.set(this.name, value);
-        let sleep = expires_at.getTime() - new Date().getTime();
-        if (sleep <= 0)
-            sleep = 5 * 1000;
-        setTimeout(() => {
-            if (this.onExpired)
-                this.onExpired();
-        }, sleep);
+    set(data, version) {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (!version)
+                version = yield 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(() => {
+                    var _a;
+                    (_a = this.onExpired) === null || _a === void 0 ? void 0 : _a.call(this);
+                }, sleep);
+            }
+        });
     }
     del() {
         this.storage.del(this.name);

package/dist/CacheService.js.map

@@ -1 +1 @@
-{"version":3,"file":"CacheService.js","sourceRoot":"","sources":["../src/CacheService.ts"],"names":[],"mappings":";;;;;;;;;;;;AAQA,MAAa,YAAY;IAOrB,YAAY,IAAY,EAAE,gBAAwB,EAAE,OAAiB,EAAE,aAAsC,EAAE,SAAqB;QAEhI,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC;QACjB,IAAI,CAAC,gBAAgB,GAAG,gBAAgB,CAAC;QACzC,IAAI,CAAC,OAAO,GAAG,OAAO,CAAC;QACvB,IAAI,CAAC,aAAa,GAAG,aAAa,CAAC;QACnC,IAAI,CAAC,SAAS,GAAG,SAAS,CAAC;IAC/B,CAAC;IACK,GAAG;;YAEL,IAAI,GAAa,CAAC;YAClB,IAAI,KAAK,GAAG,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC;YAC5C,IAAI,KAAK,EACT,CAAC;gBACG,IAAI,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC,KAAK,CAA4B,CAAC;gBACzD,IAAI,IAAI,IAAI,CAAC,KAAK,CAAC,UAAU,CAAC,GAAG,IAAI,IAAI,EAAE;oBACvC,OAAO,KAAK,CAAC,IAAI,CAAC;YAC1B,CAAC;YACD,GAAG,GAAG,MAAM,IAAI,CAAC,aAAa,EAAE,CAAC;YACjC,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;YACd,OAAO,GAAG,CAAC;QACf,CAAC;KAAA;IACD,GAAG,CAAC,IAAc;QAEd,IAAI,UAAU,GAAG,IAAI,IAAI,EAAE,CAAC;QAC5B,UAAU,CAAC,UAAU,CAAC,UAAU,CAAC,UAAU,EAAE,GAAG,IAAI,CAAC,gBAAgB,CAAC,CAAC;QACvE,IAAI,KAAK,GAAG,IAAI,CAAC,SAAS,CAAC,EAAE,IAAI,EAAE,UAAU,EAAE,CAAC,CAAC;QACjD,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,IAAI,EAAE,KAAK,CAAC,CAAC;QAEnC,IAAI,KAAK,GAAG,UAAU,CAAC,OAAO,EAAE,GAAG,IAAI,IAAI,EAAE,CAAC,OAAO,EAAE,CAAC;QACxD,IAAI,KAAK,IAAI,CAAC;YACV,KAAK,GAAG,CAAC,GAAG,IAAI,CAAC;QACrB,UAAU,CAAC,GAAG,EAAE;YAEZ,IAAI,IAAI,CAAC,SAAS;gBACd,IAAI,CAAC,SAAS,EAAE,CAAC;QACzB,CAAC,EAAE,KAAK,CAAC,CAAC;IACd,CAAC;IACD,GAAG;QAEC,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IAChC,CAAC;CACJ;AAjDD,oCAiDC"}
+{"version":3,"file":"CacheService.js","sourceRoot":"","sources":["../src/CacheService.ts"],"names":[],"mappings":";;;;;;;;;;;;AASA,MAAa,YAAY;IAQrB,YAAY,IAAY,EAAE,OAAiB,EAAE,gBAAwB,EAAE,UAAiC,EAAE,aAAsC;QAE5I,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC;QACjB,IAAI,CAAC,OAAO,GAAG,OAAO,CAAC;QACvB,IAAI,CAAC,gBAAgB,GAAG,gBAAgB,CAAC;QACzC,IAAI,CAAC,UAAU,GAAG,UAAU,CAAC;QAC7B,IAAI,CAAC,aAAa,GAAG,aAAa,CAAC;IACvC,CAAC;IACK,GAAG;;YAEL,IAAI,OAAO,GAAG,MAAM,IAAI,CAAC,UAAU,EAAE,CAAC;YACtC,IAAI,KAAK,GAAG,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC;YAC5C,IAAI,KAAK,EACT,CAAC;gBACG,IAAI,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC,KAAK,CAA4B,CAAC;gBACzD,IAAI,KAAK,CAAC,OAAO,IAAI,OAAO;oBACxB,IAAI,IAAI,IAAI,CAAC,KAAK,CAAC,UAAU,CAAC,GAAG,IAAI,IAAI,EAAE;wBACvC,OAAO,KAAK,CAAC,IAAI,CAAC;YAC9B,CAAC;YACD,IAAI,GAAG,GAAG,MAAM,IAAI,CAAC,aAAa,EAAE,CAAC;YACrC,MAAM,IAAI,CAAC,GAAG,CAAC,GAAG,EAAE,OAAO,CAAC,CAAC;YAC7B,OAAO,GAAG,CAAC;QACf,CAAC;KAAA;IACK,GAAG,CAAC,IAAc,EAAE,OAAgB;;YAEtC,IAAI,CAAC,OAAO;gBACR,OAAO,GAAG,MAAM,IAAI,CAAC,UAAU,EAAE,CAAC;YACtC,IAAI,UAAU,GAAG,IAAI,IAAI,EAAE,CAAC;YAC5B,UAAU,CAAC,UAAU,CAAC,UAAU,CAAC,UAAU,EAAE,GAAG,IAAI,CAAC,gBAAgB,CAAC,CAAC;YACvE,IAAI,KAAK,GAAG,IAAI,CAAC,SAAS,CAAC,EAAE,IAAI,EAAE,OAAO,EAAE,UAAU,EAAE,CAAC,CAAC;YAC1D,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,IAAI,EAAE,KAAK,CAAC,CAAC;YAEnC,IAAI,IAAI,CAAC,SAAS,EAClB,CAAC;gBACG,IAAI,KAAK,GAAG,UAAU,CAAC,OAAO,EAAE,GAAG,IAAI,IAAI,EAAE,CAAC,OAAO,EAAE,CAAC;gBACxD,IAAI,KAAK,IAAI,CAAC;oBACV,KAAK,GAAG,CAAC,GAAG,IAAI,CAAC;gBACrB,UAAU,CAAC,GAAG,EAAE;;oBAEZ,MAAA,IAAI,CAAC,SAAS,oDAAI,CAAC;gBACvB,CAAC,EAAE,KAAK,CAAC,CAAC;YACd,CAAC;QACL,CAAC;KAAA;IACD,GAAG;QAEC,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IAChC,CAAC;CACJ;AAvDD,oCAuDC"}

package/package.json

@@ -8,7 +8,7 @@
     "framework": "npm",
     "application": "package",
     "private": false,
-    "version": "1.4.43",
+    "version": "1.4.45",
     "author": "Amir Abolhasani",
     "license": "MIT",
     "main": "./dist/index.js",
@@ -17,7 +17,7 @@
         "build": ""
     },
     "dependencies": {
-        "@types/node": "^22.10.7",
+        "@types/node": "^22.10.10",
         "axios": "^1.7.9",
         "buffer": "^6.0.3",
         "moment": "^2.30.1",

package/src/CacheService.ts

@@ -2,6 +2,7 @@ import { IStorage } from "./IStorage";
 
 interface NSCachStorage<DataType>
 {
+    version?: string;
     expires_at: Date;
     data: DataType;
 }
@@ -9,47 +10,53 @@ interface NSCachStorage<DataType>
 export class CacheService<DataType>
 {
     private name: string;
-    private duration_minutes: number;
     private storage: IStorage;
+    private duration_minutes: number;
+    private getVersion: () => Promise<string>;
     private getFromSource: () => Promise<DataType>;
-    private onExpired: () => void;
-    constructor(name: string, duration_minutes: number, storage: IStorage, getFromSource: () => Promise<DataType>, onExpired: () => void)
+    public onExpired?: () => void;
+    constructor(name: string, storage: IStorage, duration_minutes: number, getVersion: () => Promise<string>, getFromSource: () => Promise<DataType>)
     {
         this.name = name;
-        this.duration_minutes = duration_minutes;
         this.storage = storage;
+        this.duration_minutes = duration_minutes;
+        this.getVersion = getVersion;
         this.getFromSource = getFromSource;
-        this.onExpired = onExpired;
     }
     async get(): Promise<DataType>
     {
-        let ans: DataType;
+        let version = await this.getVersion();
         let value = this.storage.get(this.name, "");
         if (value)
         {
             let cache = JSON.parse(value) as NSCachStorage<DataType>;
-            if (new Date(cache.expires_at) > new Date())
-                return cache.data;
+            if (cache.version == version)
+                if (new Date(cache.expires_at) > new Date())
+                    return cache.data;
         }
-        ans = await this.getFromSource();
-        this.set(ans);
+        let ans = await this.getFromSource();
+        await this.set(ans, version);
         return ans;
     }
-    set(data: DataType)
+    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, expires_at });
+        let value = JSON.stringify({ data, version, expires_at });
         this.storage.set(this.name, value);
-        //
-        let sleep = expires_at.getTime() - new Date().getTime();
-        if (sleep <= 0)
-            sleep = 5 * 1000;
-        setTimeout(() =>
+
+        if (this.onExpired)
         {
-            if (this.onExpired)
-                this.onExpired();
-        }, sleep);
+            let sleep = expires_at.getTime() - new Date().getTime();
+            if (sleep <= 0)
+                sleep = 5 * 1000;
+            setTimeout(() =>
+            {
+                this.onExpired?.();
+            }, sleep);
+        }
     }
     del()
     {