bugs fixes

Author: imdkbj

example/fn.js

@@ -0,0 +1,52 @@
+const cacheManager = require("cache-manager");
+let fsStore = require('cache-manager-fs');
+
+const _cache = require('../misc/cache.js');
+let cache = new _cache();
+
+const initCache2 = () =>
+    new Promise((resolve, reject) => {
+        memoryCache = cacheManager.caching({
+            store: fsStore,
+            path: 'cache',
+            ttl: 30,
+            preventfill: false,
+            reviveBuffers: false,
+            fillcallback: data => {
+                resolve()
+            }
+        })
+    })
+
+
+getsetCache2 = async (key, ttl, cb) => {
+    let _this = this;
+    try {
+        await initCache2();
+        return memoryCache.wrap(key, async () => await cb(), {
+            ttl: ttl
+        });
+    } catch (err) {
+        throw new Error(err);
+    }
+}
+
+
+let cb = () => {
+    console.log('called');
+    return new Date();
+}
+
+async function test_class(key) {
+    let x = await cache.getsetCache(key, 10, cb);
+    console.log(key, x);
+}
+
+async function test_fn(key) {
+    let x = await getsetCache2(key, 10, cb);
+    console.log(key, x);
+}
+
+
+test_class('test_class');
+test_fn('test_fn')

example/test2.js

@@ -1,13 +1,16 @@
 const _udf = require('../index.js');
 // const conn = require('./db.js');
 
+const cacheManager = require("cache-manager");
+var fsStore = require('cache-manager-fs');
+
 let nodeUDF = new _udf();
 
 let {
     convertToTradingSymbol,
     validateOrderInput,
     download,
-    setgetCache
+    getsetCache
 } = nodeUDF;
 
 
@@ -52,10 +55,57 @@ const test2 = async () => {
 // const myCache = new NodeCache()
 
 async function test3() {
-    let cb = new Date()
-    let x = await setgetCache('k', 10, cb);
+    let cb = () => {
+        console.log('called');
+        return new Date();
+    }
+
+    let x = await getsetCache('k', 10, cb);
+
+    console.log(x);
+}
+
+test3()
+
+const initCache2 = () =>
+    new Promise((resolve, reject) => {
+        memoryCache = cacheManager.caching({
+            store: fsStore,
+            path: 'cache',
+            ttl: 30,
+            preventfill: false,
+            reviveBuffers: false,
+            fillcallback: data => {
+                resolve()
+            }
+        })
+    })
+
+
+getsetCache2 = async (key, ttl, cb) => {
+    let _this = this;
+    try {
+        await _this.initCache();
+        return memoryCache.wrap(key, async () => await cb(), {
+            ttl: ttl
+        });
+    } catch (err) {
+        throw new Error(err);
+    }
+}
+
+
+
+async function test4() {
+    let cb = () => {
+        console.log('called');
+        return new Date();
+    }
+
+    await initCache2();
+    let x = await getsetCache2('k', 10, cb);
 
     console.log(x);
 }
 
-test3()
+test4()

misc/cache.js

@@ -1,7 +1,7 @@
 const cacheManager = require("cache-manager");
 var fsStore = require('cache-manager-fs');
 
-const initCache = () =>
+const _initCache = () =>
     new Promise((resolve, reject) => {
         memoryCache = cacheManager.caching({
             store: fsStore,
@@ -15,23 +15,25 @@ const initCache = () =>
         })
     })
 
-
-
 class Cache {
     constructor(params) {
         this.params = params;
     }
 
-    setgetCache = async (key, ttl, cb) => {
+    initCache = () => _initCache();
+
+    getsetCache = async (key, ttl, cb) => {
+        let _this = this;
         try {
-            await initCache();
-            return memoryCache.wrap(key, async () => await eval(cb), {
+            await _this.initCache();
+            return memoryCache.wrap(key, async () => await cb(), {
                 ttl: ttl
             });
         } catch (err) {
-            return Promise.reject(err);
+            throw new Error(err);
         }
     }
+
 }
 
 module.exports = Cache;