@smartico/public-api 0.0.201 → 0.0.202

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@smartico/public-api",
-	"version": "0.0.201",
+	"version": "0.0.202",
 	"description": "Smartico public API",
 	"main": "dist/index.js",
 	"types": "dist/index.d.ts",

package/src/NodeCache.ts

@@ -1,17 +1,17 @@
 class NodeCache {
-	private static ttlChecker: NodeJS.Timeout;
+	private ttlChecker: NodeJS.Timeout;
 
-	private static cache: { [key: string]: any } = {};
+	private cache: { [key: string]: any } = {};
 
-	constructor() {
-		if (NodeCache.ttlChecker === undefined) {
-			NodeCache.ttlChecker = setInterval(() => {
+	constructor() {		
+		if (this.ttlChecker === undefined) {
+			this.ttlChecker = setInterval(() => {
 				const now = new Date().getTime();
-				for (const key in NodeCache.cache) {
-					if (NodeCache.cache.hasOwnProperty(key)) {
-						const o = NodeCache.cache[key];
+				for (const key in this.cache) {
+					if (this.cache.hasOwnProperty(key)) {
+						const o = this.cache[key];
 						if (o.ttl < now) {
-							delete NodeCache.cache[key];
+							delete this.cache[key];
 						}
 					}
 				}
@@ -20,27 +20,31 @@ class NodeCache {
 	}
 
 	public get(key: string): any {
-		const o = NodeCache.cache[key];
+		const o = this.cache[key];
 		if (o !== undefined && o.ttl > new Date().getTime()) {
 			return o.value;
 		}
 	}
 
 	public set(key: string, value: any, ttlSeconds: number = 60) {
-		NodeCache.cache[key] = {
+		this.cache[key] = {
 			value,
 			ttl: new Date().getTime() + ttlSeconds * 1000,
 		};
 	}
 
 	public remove(key: string) {
-		if (NodeCache.cache.hasOwnProperty(key)) {
-			delete NodeCache.cache[key];
+		if (this.cache.hasOwnProperty(key)) {
+			delete this.cache[key];
 		}
 	}
 
 	public flushAll() {
-		NodeCache.cache = {};
+		this.cache = {};
+		if (this.ttlChecker) {
+			clearInterval(this.ttlChecker);
+			this.ttlChecker = undefined
+		}
 	}
 }
 

package/src/OCache.ts

@@ -63,6 +63,11 @@ export class OCache {
 	}
 
 	public static async clearAll() {
+		for (const cacheContext in this.cache) {
+			if (this.cache.hasOwnProperty(cacheContext)) {
+				this.cache[cacheContext].flushAll();
+			}
+		}
 		this.cache = {};
 	}
 }