corebasic 1.0.29 → 1.0.31

package/index.js

@@ -1,2 +1,15 @@
- 
-module.exports = require('./libs/app');
+
+
+import * as Elabase from './libs/elabase.js'
+import * as Kafka from './libs/kafka.js'
+import * as Utils from './libs/utils.js'
+import * as Session from './libs/session.js'
+import * as Auth from './libs/auth.js'
+
+export {
+    Elabase,
+    Kafka,
+    Utils,
+    Session,
+    Auth
+}

package/libs/ObjectId.js

@@ -17,7 +17,7 @@ if (!document) var document = { cookie: '' }; // fix crashes on node
  * Javascript class that mimics how WCF serializes a object of type MongoDB.Bson.ObjectId
  * and converts between that format and the standard 24 character representation.
 */
-var ObjectId = (function () {
+export var ObjectId = (function () {
     var increment = Math.floor(Math.random() * (16777216));
     var pid = Math.floor(Math.random() * (65536));
     var machine = Math.floor(Math.random() * (16777216));
@@ -121,7 +121,3 @@ ObjectId.prototype.toString = function () {
            '000000'.substr(0, 6 - increment.length) + increment;
 };
 
-
-module.exports = {
-    ObjectId,
-}

package/libs/auth.js

@@ -1,16 +1,16 @@
-const axios = require('axios');
-const otpGenerator = require('otp-generator')
+import * as axios from 'axios'
+import otpGenerator from 'otp-generator'
 
-const Elabase = require('./elabase')
-const Utils = require('./utils')
-const Session = require('./session')
+import * as Elabase from './elabase.js'
+import * as Utils from './utils.js'
+import * as Session from './session.js'
 
 let validateFn, validateErrMessage
-module.exports.validate = (callback, errMessage) => {
+export const validate = (callback, errMessage) => {
     validateFn = callback
 }
 
-module.exports.start = (app, successCallback) => {
+export const start = (app, successCallback) => {
     app.post("/login", async (req, res) => {
         if (validateFn && !validateFn(req)) {
             res.status(401).json({ mode: 'login', success: false, info: validateErrMessage ?? 'Validation Failed', message: 'Login Server Error' })

package/libs/elabase.js

@@ -1,14 +1,6 @@
-const axios = require('axios')
+import * as axios from 'axios'
 
 
-module.exports = {
-    start,
-    insert,
-    update,
-    query,
-    remove
-}
-
 
 
 
@@ -54,7 +46,7 @@ let internal = {
 
 let db = internal.db // default database
 
-function start(dbName) {
+export function start(dbName) {
     if (!Utils.isEmpty(dbName) && Utils.isEmpty(db)) {
         internal.db = "data/" + dbName
         db = "data/" + dbName
@@ -63,7 +55,7 @@ function start(dbName) {
 }
 
 
-function insert(collection, value, _id) {
+export const insert = async (collection, value, _id) => {
     var arg = {
         collection: collection,
         insert: value
@@ -79,7 +71,7 @@ function insert(collection, value, _id) {
     })
 }
 
-function query(collection, query, options) {
+export const query = async (collection, query, options) => {
     var arg = {
         collection: collection,
         query: query,
@@ -107,7 +99,7 @@ function collectionArray(col) {
 }
 
 
-function update(collection, query, update, options) {
+export const update = async (collection, query, update, options) => {
     var arg = {
         collection: collection,
         query: query,
@@ -122,7 +114,7 @@ function update(collection, query, update, options) {
     })
 }
 
-function remove(collection, query) {
+export const remove = async (collection, query) => {
     var arg = {
         collection: collection,
         query: query,

package/libs/kafka.js

@@ -1,11 +1,13 @@
-const { Kafka, logLevel } = require('kafkajs')
+import { Kafka, logLevel as KafkaLogLevel } from 'kafkajs'
+
+export const logLevel = KafkaLogLevel
 
 let kafka, producer, admin
 
 let appName
 let topicPrefix = ''
 
-function start(arg) {
+export const start = (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}.`
@@ -24,7 +26,7 @@ function start(arg) {
 }
 
 
-async function createTopic(topic, partition, replicas) {
+export const createTopic = async (topic, partition, replicas) => {
     topic = topicPrefix + topic
     return await admin.createTopics({ topics: [{topic, numPartitions: partition ?? 1, replicationFactor: replicas ?? 1}] })
 }
@@ -51,9 +53,9 @@ const start_consumer = async function (topic, groupId, callback) {
             // callback(topic, message.value.toString(), partition) // toString() returns array so won't parse if json.
             let success
             try {
-                success = callback(topic, JSON.parse(message.value), partition)
+                success = await callback(topic, JSON.parse(message.value), partition)
             } catch (ex) {
-                success = callback(topic, message.value, partition)
+                success = await callback(topic, message.value, partition)
             }
 
             await consumer.commitOffsets([{ topic, partition, offset: (Number(message.offset) + 1).toString() }]);
@@ -91,24 +93,17 @@ const start_producer = async function (topic, message, key) {
 // start_consumer('quickstart-events')
 // start_producer('quickstart-events', 'Hello KafkaJS user! Little')
 
-const receive = async function(topic, groupId, callback) {
+export const receive = async function(topic, groupId, callback) {
     topic = topicPrefix + topic
     await start_consumer(topic, groupId, callback)
 }
 
 
-const send = async function(topic, message, key) {
+export const send = async function(topic, message, key) {
     topic = topicPrefix + topic
     await start_producer(topic, message, key)
 }
 
-module.exports = {
-    start,
-    createTopic,
-    send,
-    receive,
-    logLevel,
-}
 
 
 

package/libs/session.js

@@ -1,10 +1,6 @@
-const jwt = require('jsonwebtoken');
+import * as jwt from 'jsonwebtoken'
 let app
 
-module.exports = {
-    start,
-    generateAccessToken,
-}
 
 
 
@@ -13,7 +9,7 @@ const REFRESH_TOKEN_SECRET = process.env.JWT_REFRESH_TOKEN_SECRET || "MY_SECRET_
 
 let urlsAllowed = []
 
-function start(expressApp, allowedUrls) {
+export const start = (expressApp, allowedUrls) => {
     urlsAllowed = ["/refreshToken", "/login"].concat(allowedUrls ?? [])
     app = expressApp
 
@@ -55,7 +51,7 @@ function start(expressApp, allowedUrls) {
 }
 
 
-function generateAccessToken(userId, clientId) {
+export const generateAccessToken = (userId, clientId) => {
     let data = { userId, clientId }
 
     const accessToken = jwt.sign(data, ACCESS_TOKEN_SECRET, { expiresIn: '1d' });

package/libs/utils.js

@@ -1,34 +1,19 @@
-let ObjectId = require('./ObjectId')
-
-let pipeline = { execute: execute }
-
-module.exports = {
-    uid,
-    isEmpty,
-    isEmptyJson,
-    parseFloatValue,
-    parseIntValue,
-    now,
-    pipeline,
-    toDate,
-    toAppDate,
-    deepCopy,
-    getDatesBetweenTwoDates,
-    formatAMPM,
-    sum
-}
+import * as ObjectId from './ObjectId.js'
+
+export let pipeline = { execute: execute }
 
-function uid() {
+
+export function uid() {
     return ObjectId.ObjectId()
 }
 
-function isEmpty(str) { // returns true for undefined
+export function isEmpty(str) { // returns true for undefined
     if(!str)
         return true
     return str.match(/\S/) ? false : true // matches a non space character
 }
 
-function isEmptyJson(json) {
+export function isEmptyJson(json) {
     for (var i in json)
         return false
     return true
@@ -38,86 +23,65 @@ function isEmptyJson(json) {
 // Parse Numbers
 // --------------
 
-function parseFloatValue(val) {
+export function parseFloatValue(val) {
     return parseFloat(val) ? parseFloat(val) : 0
 }
 
-function parseIntValue(val) {
+export function parseIntValue(val) {
     return parseInt(val) ? parseInt(val) : 0
 }
 
-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
+// Dates
 // ----------------
 
-
-function execute(pipeline, errfn) {
-    startPipeline(pipeline, 0, undefined, errfn)  
+export function now() {
+    return new Date()
 }
 
-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) } )
+
+export 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 toDate(arg, currentTime) { // New
 
-        var st = arg.split('/')
+export function toDate(arg, currentTime) { // New
 
-        var temp = new Date(st[2],parseInt(st[1]) - 1, st[0]);
-        temp.setHours(0) ; temp.setMinutes(0); temp.setSeconds(0); temp.setMilliseconds(0)
+    var st = arg.split('/')
 
-        if (currentTime) {
-            var curdate = getCurrentDate()
-            temp.setHours(curdate.getHours())
-            temp.setMinutes(curdate.getMinutes())
-            temp.setSeconds(curdate.getSeconds())
-            temp.setMilliseconds(curdate.getMilliseconds())
-        }
+    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 (isNaN(temp))
-            return undefined
-        return temp
+    if (currentTime) {
+        var curdate = getCurrentDate()
+        temp.setHours(curdate.getHours())
+        temp.setMinutes(curdate.getMinutes())
+        temp.setSeconds(curdate.getSeconds())
+        temp.setMilliseconds(curdate.getMilliseconds())
     }
 
-    function toAppDate(date) { // New
-        if (Object.prototype.toString.call(date) === '[object String]')
-            date = new Date(date)
+    if (isNaN(temp))
+        return undefined
+    return temp
+}
 
-        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);
+export function getDatesBetweenTwoDates(start, end) {
+    var arr = [];
+    var dt = new Date(start);
 
 	dt.setHours(0)
         dt.setMinutes(0)
@@ -125,53 +89,53 @@ function getDatesBetweenTwoDates(start, end) {
         dt.setMilliseconds(0)
 
 	while (dt <= end) {
-            arr.push(new Date(dt));
-            dt.setDate(dt.getDate() + 1);
-        }
-        return arr;
+        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;
+export 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]);
         }
-        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 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 obj;
+        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;
-    }
+export 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;
+}
+export 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;
+}
 
 
 // ----------------

package/package.json

@@ -1,6 +1,7 @@
 {
   "name": "corebasic",
-  "version": "1.0.29",
+  "type": "module",
+  "version": "1.0.31",
   "description": "",
   "main": "index.js",
   "scripts": {

package/libs/app.js

@@ -1,15 +0,0 @@
-
-
-let Elabase = require('./elabase')
-let Kafka = require('./kafka')
-let Utils = require('./utils')
-let Session = require('./session')
-let Auth = require('./auth')
-
-module.exports = {
-    Elabase,
-    Kafka,
-    Utils,
-    Session,
-    Auth
-}