corebasic 1.0.4 → 1.0.6

package/libs/elabase.js

@@ -32,7 +32,7 @@ let Events = {
 
 
 
-let url = "http://127.0.0.1"
+const url = process.env.DIP_URL || "http://127.0.0.1"; // Set DIP_URL to "http://dip" (Prod) or http://dip-dev (Dev) in CI/CD
 let port = 9401
 let api = 'execute'
 let fullurl = `${url}:${port}/${api}`
@@ -47,8 +47,8 @@ let Elabase = {
 }
 
 let engine = Elabase.Engine.Lmdb
-let internal = { 
-    db: undefined, 
+let internal = {
+    db: undefined,
     engineName: engine === Elabase.Engine.Lmdb ? "lmdb" : (engine === Elabase.Engine.Sled ? "sled" : engine === Elabase.Engine.Sanakirja ? "sanakirja" : "lmdb")
 }
 
@@ -56,8 +56,8 @@ let db = internal.db // default database
 
 function start(dbName) {
     if (!Utils.isEmpty(dbName) && Utils.isEmpty(db)) {
-        internal.db = dbName
-        db = dbName
+        internal.db = "data/" + dbName
+        db = "data/" + dbName
         Utils.requisites.startElabase()
     }
 }
@@ -79,15 +79,17 @@ function insert(collection, value, _id) {
     })
 }
 
-function query(collection, query) {
+function query(collection, query, options) {
     var arg = {
         collection: collection,
-        query: query
+        query: query,
+        options: options ? options : {},
     }
     return new Promise((resolve, reject) => resolve())
     .then(() => execute(arg))
 }
 
+
 function collectionArray(col) {
     var type = Object.prototype.toString.call(col)
     if (type === '[object Array]') {
@@ -105,11 +107,12 @@ function collectionArray(col) {
 }
 
 
-function update(collection, query, update) {
+function update(collection, query, update, options) {
     var arg = {
         collection: collection,
         query: query,
         update: update,
+        options: options ? options : {},
     }
     return new Promise((resolve, reject) => resolve())
     .then(() => execute(arg))

package/libs/kafka.js

@@ -6,7 +6,7 @@ let appName
 let topicPrefix = ''
 
 function start(arg) {
-    arg = !arg && !process.env.APP_DEPLOYMENT_NAME ? { clientId: (global.app?.name ?? 'app') + '-dev', brokers: ['127.0.0.1:9092'], sasl: false, logLevel: Kafka.logLevel.ERROR } : arg
+    arg = !arg && !process.env.APP_DEPLOYMENT_NAME ? { clientId: (global.app?.name ?? 'app') + '-dev', brokers: ['127.0.0.1:9092'], sasl: false, logLevel: logLevel.ERROR } : arg
     appName = arg?.clientId ?? (process.env.APP_DEPLOYMENT_NAME ?? (global.app?.name ?? 'app'))
     topicPrefix = `${appName}.`
     kafka = new Kafka({
@@ -122,33 +122,33 @@ module.exports = {
 
 
 
-const errorTypes = ['unhandledRejection', 'uncaughtException']
-const signalTraps = ['SIGTERM', 'SIGINT', 'SIGUSR2']
+// const errorTypes = ['unhandledRejection', 'uncaughtException']
+// const signalTraps = ['SIGTERM', 'SIGINT', 'SIGUSR2']
+//
+// errorTypes.forEach(type => {
+//     process.on(type, async () => {
+//         try {
+//             console.log(`process.on ${type}`)
+//             if (producer)
+//                 await producer.disconnect()
+//             for (let i = 0; i < consumers.length; i++)
+//                 await consumers[i].disconnect()
+//             process.exit(0)
+//         } catch (_) {
+//             process.exit(1)
+//         }
+//     })
+// })
 
-errorTypes.forEach(type => {
-    process.on(type, async () => {
-        try {
-            console.log(`process.on ${type}`)
-            if (producer)
-                await producer.disconnect()
-            for (let i = 0; i < consumers.length; i++)
-                await consumers[i].disconnect()
-            process.exit(0)
-        } catch (_) {
-            process.exit(1)
-        }
-    })
-})
-
-signalTraps.forEach(type => {
-    process.once(type, async () => {
-        try {
-            if (producer)
-                await producer.disconnect()
-            for (let i = 0; i < consumers.length; i++)
-                await consumers[i].disconnect()
-        } finally {
-            process.kill(process.pid, type)
-        }
-    })
-})
+// signalTraps.forEach(type => {
+//     process.once(type, async () => {
+//         try {
+//             if (producer)
+//                 await producer.disconnect()
+//             for (let i = 0; i < consumers.length; i++)
+//                 await consumers[i].disconnect()
+//         } finally {
+//             process.kill(process.pid, type)
+//         }
+//     })
+// })

package/libs/utils.js

@@ -5,10 +5,17 @@ let pipeline = { execute: execute }
 module.exports = {
     uid,
     isEmpty,
+    isEmptyJson,
     parseFloatValue,
     parseIntValue,
     now,
     pipeline,
+    toDate,
+    toAppDate,
+    deepCopy,
+    getDatesBetweenTwoDates,
+    formatAMPM,
+    sum
 }
 
 function uid() {
@@ -21,6 +28,12 @@ function isEmpty(str) { // returns true for undefined
     return str.match(/\S/) ? false : true // matches a non space character
 }
 
+function isEmptyJson(json) {
+    for (var i in json)
+        return false
+    return true
+}
+
 // --------------
 // Parse Numbers
 // --------------
@@ -36,6 +49,129 @@ function parseIntValue(val) {
 function now() {
     return new Date()
 }
+ function toAppDate(date) { // New
+        if (Object.prototype.toString.call(date) === '[object String]')
+            date = new Date(date)
+
+        var temp = date
+        if (isNaN(temp) || date === '')
+            return ''
+
+        var day = temp.getDate().toString()
+        if(day.length === 1) day = "0"+day
+        var month = (temp.getMonth() + 1).toString()
+        if(month.length == 1) month = "0"+month
+        return (day + "/" + month + "/" +  temp.getFullYear().toString())
+    }
+
+// ----------------
+// Pipeline Execute
+// ----------------
+
+
+function execute(pipeline, errfn) {
+    startPipeline(pipeline, 0, undefined, errfn)  
+}
+
+function startPipeline(pipeline, index, data, errfn) {
+    index = index == undefined ? 0 : index
+    if (index == pipeline.length)
+        return
+    pipeline[index](data).then(data => startPipeline(pipeline, index + 1, data)).catch(err => { if (errfn) errfn(err) } )
+}
+
+  function toDate(arg, currentTime) { // New
+
+        var st = arg.split('/')
+
+        var temp = new Date(st[2],parseInt(st[1]) - 1, st[0]);
+        temp.setHours(0) ; temp.setMinutes(0); temp.setSeconds(0); temp.setMilliseconds(0)
+
+        if (currentTime) {
+            var curdate = getCurrentDate()
+            temp.setHours(curdate.getHours())
+            temp.setMinutes(curdate.getMinutes())
+            temp.setSeconds(curdate.getSeconds())
+            temp.setMilliseconds(curdate.getMilliseconds())
+        }
+
+        if (isNaN(temp))
+            return undefined
+        return temp
+    }
+
+    function toAppDate(date) { // New
+        if (Object.prototype.toString.call(date) === '[object String]')
+            date = new Date(date)
+
+        var temp = date
+        if (isNaN(temp) || date === '')
+            return ''
+
+        var day = temp.getDate().toString()
+        if(day.length === 1) day = "0"+day
+        var month = (temp.getMonth() + 1).toString()
+        if(month.length == 1) month = "0"+month
+        return (day + "/" + month + "/" +  temp.getFullYear().toString())
+    }
+
+function getDatesBetweenTwoDates(start, end) {
+        var arr = [];
+        var dt = new Date(start);
+
+	dt.setHours(0)
+        dt.setMinutes(0)
+        dt.setSeconds(0)
+        dt.setMilliseconds(0)
+
+	while (dt <= end) {
+            arr.push(new Date(dt));
+            dt.setDate(dt.getDate() + 1);
+        }
+        return arr;
+}
+
+function deepCopy(obj) {
+        if (Object.prototype.toString.call(obj) === '[object Array]') {
+            var out = [], i = 0, len = obj.length;
+            for ( ; i < len; i++ ) {
+                if (Object.prototype.toString.call(obj[i]) === '[object Date]')
+                    out[i] = new Date(obj[i])
+                else
+                    out[i] = arguments.callee(obj[i]);
+            }
+            return out;
+        }
+        if (typeof obj === 'object') {
+            var out = {}, i;
+            for ( i in obj ) {
+                if (Object.prototype.toString.call(obj[i]) === '[object Date]')
+                    out[i] = new Date(obj[i])
+                else
+                    out[i] = arguments.callee(obj[i]);
+            }
+            return out;
+        }
+        return obj;
+    }
+
+
+ function formatAMPM(date) {
+      var hours = date.getHours();
+      var minutes = date.getMinutes();
+      var ampm = hours >= 12 ? 'pm' : 'am';
+      hours = hours % 12;
+      hours = hours ? hours : 12; // the hour '0' should be '12'
+      minutes = minutes < 10 ? '0'+minutes : minutes;
+      var strTime = hours + ':' + minutes + ' ' + ampm;
+      return strTime;
+    }
+function sum(array) {   // Eg: sum([10,20,undefined, NaN, 40])
+        var res = 0
+        for (var i in array)
+            res += parseFloat(array[i]) ? parseFloat(array[i]) : 0
+        return res;
+    }
 
 
 // ----------------
@@ -53,3 +189,4 @@ function startPipeline(pipeline, index, data, errfn) {
         return
     pipeline[index](data).then(data => startPipeline(pipeline, index + 1, data)).catch(err => { if (errfn) errfn(err) } )
 }
+

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "corebasic",
-  "version": "1.0.4",
+  "version": "1.0.6",
   "description": "",
   "main": "index.js",
   "scripts": {