mybase 1.0.45 → 1.0.47

package/README.md

@@ -42,6 +42,7 @@ var { isLocal } = require('mybase')
 ## Encryption
 ### decryptAES_CBC_NOIV(encryptedHex, encryptionKey)
 ### encryptAES_CBC_NOIV(plainString, encryptionKey)
+### hash_sha512(plain)
 ```
     var handle = await maxmindOpen(config.geoip.country)
 ```

package/mybase.js

@@ -11,6 +11,10 @@ const { match } = require('assert');
 const validator = require('validator')
 const sha512 = require('js-sha512')
 
+// create cache folder if not exists
+let vault_cache_folder = '/var/tmp/vault-cache'
+if (!fs.existsSync(vault_cache_folder)) fs.mkdirSync(vault_cache_folder)
+
 
 Date.prototype.yyyymmdd = function() {
     var mm = this.getMonth() + 1; // getMonth() is zero-based
@@ -22,6 +26,11 @@ Date.prototype.yyyymmdd = function() {
     ].join('');
 };
 
+function hash_sha512(plain) {
+    if (typeof plain==='string') return sha512(plain)
+    return false
+}
+
 function validHPassword(hpassword) { return (hpassword && hpassword.length === 128 && hpassword.search(/^[a-f0-9]+$/) == 0) }
 function randomHPassword(length=10) {
     let plain = randomString(length)
@@ -152,22 +161,53 @@ async function getMysql(mysqlClass,config,keep_pinging=true) {
     })
 }
 
-function vaultRead(vault, key) {
+function fileCacheIsValid(cacheFile, cache_in_minutes = 60) {
+    if (fs.existsSync(cacheFile)) {
+        const stat = fs.statSync(cacheFile)
+        const mtime = new Date(stat.mtime).getTime()
+        if (Date.now() - mtime < cache_in_minutes * 60 * 1000) {
+            // cache is still valid
+            return true
+        }
+    }
+    return false
+}
+
+function vaultRead(vault, key, cache_in_minutes = 10) {
+    // v2 - supports caching
     return new Promise((resolve, reject) => {
+        let cache_file = path.join(vault_cache_folder,hash_sha512(`${vault.endpoint}/${key}`))
+        if (cache_in_minutes>0 && fileCacheIsValid(cache_file,cache_in_minutes))
+            return resolve(JSON.parse(fs.readFileSync(cache_file)))
+        
         vault.read(key).then((r) => {
             if (r.data) {
                 debug(`vault ${key} - success`)
+                if (cache_in_minutes>0) 
+                    try { fs.writeFileSync(cache_file, JSON.stringify(r.data)) } catch(_) {}
                 return resolve(r.data);
             }
             debug(`vault ${key} - failed`)
             reject(r);
         }).catch(e => {
+            console.log(e)
             debug(`exception inside vaultRead`, e)
+            // we will still return latest information from cache
+            try {
+                console.log(chalk.bgRed(`returning vault@${key} from cache due to error`))
+                if (fs.existsSync(cache_file))
+                   return resolve(JSON.parse(fs.readFileSync(cache_file)))
+            }catch(e2) {
+                // content of the file is invalid
+                console.log(e2)
+            } 
+
             reject(e);
         })
     })
 }
 
+
 function vaultFill(vault, obj, ignoreError = false, keepCache=true) {
     // v2.1
     // fills all strings with ^vault@/secret/... with proper vault values
@@ -616,5 +656,6 @@ module.exports = {
     utcnow,
     Geoip2Paths,
     randomHPassword,
-    isURL
+    isURL,
+    hash_sha512
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "mybase",
-  "version": "1.0.45",
+  "version": "1.0.47",
   "description": "",
   "main": "mybase.js",
   "scripts": {