miolo 0.0.3 → 0.0.4

package/lib/cacher/index.js

@@ -19,14 +19,14 @@ function _asyncToGenerator(fn) { return function () { var self = this, args = ar
 
 function init_cacher(config) {
   var client = _redis.default.createClient(config.redis.port, config.redis.host).on('connect', function () {
-    console.info("".concat((0, _farrapaColors.PURPLE)('REDIS'), " Connection established!"));
+    console.info("".concat((0, _farrapaColors.magenta)('REDIS'), " Connection established!"));
   }).on('error', function (err) {
     var msg;
 
     try {
-      if (err instanceof _redis.default.ReplyError) msg = "".concat((0, _farrapaColors.PURPLE)('REDIS'), " ").concat((0, _farrapaColors.RED)('Error ' + err.code), " Command: ").concat(err.command, " ").concat(err.toString());else msg = "".concat((0, _farrapaColors.PURPLE)('REDIS'), " ").concat((0, _farrapaColors.RED)('Error ' + err.code), " ").concat(err.toString());
+      if (err instanceof _redis.default.ReplyError) msg = "".concat((0, _farrapaColors.magenta)('REDIS'), " ").concat((0, _farrapaColors.red)('Error ' + err.code), " Command: ").concat(err.command, " ").concat(err.toString());else msg = "".concat((0, _farrapaColors.magenta)('REDIS'), " ").concat((0, _farrapaColors.red)('Error ' + err.code), " ").concat(err.toString());
     } catch (e) {
-      msg = "".concat((0, _farrapaColors.PURPLE)('REDIS'), " ").concat((0, _farrapaColors.RED)('Error '), " ").concat(e);
+      msg = "".concat((0, _farrapaColors.magenta)('REDIS'), " ").concat((0, _farrapaColors.red)('Error '), " ").concat(e);
     }
 
     console.error(msg);

package/lib/config/defaults.js

@@ -35,7 +35,7 @@ module.exports = {
 
     },
     options: {
-      log: 'debug'
+      log: 'info'
     }
   },
   routes: {//  crud: {

package/lib/db/conn.js

@@ -7,9 +7,9 @@ exports.init_db_connection = init_db_connection;
 
 var {
   getConnection
-} = require('calustra-conn');
+} = require('calustra');
 
 function init_db_connection(config) {
-  var conn = getConnection(config.connection, config.options);
+  var conn = getConnection(config);
   return conn;
 }

package/lib/logger/index.js

@@ -21,12 +21,12 @@ var {
 
 var init_logger = (config, emailer) => {
   var LEVEL_COLORS = {
-    silly: _farrapaColors.LIGHT_CYAN,
-    debug: _farrapaColors.LIGHT_BLUE,
-    verbose: _farrapaColors.LIGHT_GREEN,
-    info: _farrapaColors.YELLOW,
-    warn: _farrapaColors.LIGHT_RED,
-    error: _farrapaColors.RED
+    silly: _farrapaColors.gray,
+    debug: _farrapaColors.magenta,
+    verbose: _farrapaColors.cyan,
+    info: _farrapaColors.blue,
+    warn: _farrapaColors.yellow,
+    error: _farrapaColors.red
   };
   var myFormat = printf(info => {
     var _config$format;
@@ -89,7 +89,7 @@ var init_logger = (config, emailer) => {
 
   var logger = createLogger({
     level: (config === null || config === void 0 ? void 0 : config.level) || 'silly',
-    format: combine(format.errors({
+    format: combine(errors({
       stack: true
     }), timestamp(), myFormat),
     transports: _log_transports

package/lib/server/engines/cron/syscheck.js

@@ -28,9 +28,9 @@ function init_sys_check_and_log(logger) {
     var perc = Math.round(used * 100 / total, 2);
 
     if (perc > 80) {
-      logger.error("[SERVER][".concat((0, _farrapaColors.CYAN)('SysCheck'), "] RAM ").concat((0, _farrapaColors.YELLOW)(used), " MB used of ").concat((0, _farrapaColors.GREEN)(total), " MB (").concat((0, _farrapaColors.YELLOW)(perc), " %)"));
+      logger.error("[SERVER][".concat((0, _farrapaColors.cyan)('SysCheck'), "] RAM ").concat((0, _farrapaColors.yellow)(used), " MB used of ").concat((0, _farrapaColors.green)(total), " MB (").concat((0, _farrapaColors.yellow)(perc), " %)"));
     } else {
-      logger.info("[SERVER][".concat((0, _farrapaColors.CYAN)('SysCheck'), "] RAM ").concat((0, _farrapaColors.YELLOW)(used), " MB used of ").concat((0, _farrapaColors.GREEN)(total), " MB (").concat((0, _farrapaColors.YELLOW)(perc), " %)"));
+      logger.info("[SERVER][".concat((0, _farrapaColors.cyan)('SysCheck'), "] RAM ").concat((0, _farrapaColors.yellow)(used), " MB used of ").concat((0, _farrapaColors.green)(total), " MB (").concat((0, _farrapaColors.yellow)(perc), " %)"));
     }
 
     diskspace.check('/', function (err, result) {
@@ -39,9 +39,9 @@ function init_sys_check_and_log(logger) {
       var free = Math.round(toGB(result.free), 2);
 
       if (free < 1) {
-        logger.error("[SERVER][".concat((0, _farrapaColors.CYAN)('SysCheck'), "] DISK ").concat((0, _farrapaColors.YELLOW)(used), " GB used of ").concat((0, _farrapaColors.GREEN)(total), " MB (").concat((0, _farrapaColors.YELLOW)(free), " GB free)"));
+        logger.error("[SERVER][".concat((0, _farrapaColors.cyan)('SysCheck'), "] DISK ").concat((0, _farrapaColors.yellow)(used), " GB used of ").concat((0, _farrapaColors.green)(total), " MB (").concat((0, _farrapaColors.yellow)(free), " GB free)"));
       } else {
-        logger.info("[SERVER][".concat((0, _farrapaColors.CYAN)('SysCheck'), "] DISK ").concat((0, _farrapaColors.YELLOW)(used), " GB used of ").concat((0, _farrapaColors.GREEN)(total), " MB (").concat((0, _farrapaColors.YELLOW)(free), " GB free)"));
+        logger.info("[SERVER][".concat((0, _farrapaColors.cyan)('SysCheck'), "] DISK ").concat((0, _farrapaColors.yellow)(used), " GB used of ").concat((0, _farrapaColors.green)(total), " MB (").concat((0, _farrapaColors.yellow)(free), " GB free)"));
       }
     });
   }

package/lib/server/engines/socket/index.js

@@ -34,15 +34,15 @@ function init_socket(logger) {
   });
   io.on('connection', function (ctx, _data) {
     var i = getInfo(ctx);
-    logger.debug("".concat((0, _farrapaColors.BLUE)('SOCKET'), " Connection from ").concat(i.ip, " ").concat(i.id));
+    logger.debug("".concat((0, _farrapaColors.blue)('SOCKET'), " Connection from ").concat(i.ip, " ").concat(i.id));
   });
   io.on('disconnect', function (ctx, data) {
     var i = getInfo(ctx);
-    logger.debug("".concat((0, _farrapaColors.BLUE)('SOCKET'), " Disconnected ").concat(i.ip, " ").concat(i.id, " => ").concat(data));
+    logger.debug("".concat((0, _farrapaColors.blue)('SOCKET'), " Disconnected ").concat(i.ip, " ").concat(i.id, " => ").concat(data));
   });
   io.on('error', function (ctx, data) {
     var i = getInfo(ctx);
-    logger.error("".concat((0, _farrapaColors.BLUE)('SOCKET'), " Error on ").concat(i.ip, " ").concat(i.id, " => ").concat(data));
+    logger.error("".concat((0, _farrapaColors.blue)('SOCKET'), " Error on ").concat(i.ip, " ").concat(i.id, " => ").concat(data));
   });
   return io;
 }

package/lib/server/middleware/request.js

@@ -43,11 +43,11 @@ function init_request_middleware(app) {
 
       var ip = ctx.headers["x-real-ip"] || '127.0.0.1';
       ctx.request.ip = ip;
-      logger.info("req begin ".concat(ctx.requestId, " - ip ").concat(ip, " - ").concat((0, _farrapaColors.CYAN)(ctx.request.method), " ").concat((0, _farrapaColors.CYAN)(ctx.request.url), " ").concat(ctx.request.body != undefined ? JSON.stringify(ctx.request.body) : ''));
+      logger.info("req begin ".concat(ctx.requestId, " - ip ").concat(ip, " - ").concat((0, _farrapaColors.cyan)(ctx.request.method), " ").concat((0, _farrapaColors.cyan)(ctx.request.url), " ").concat(ctx.request.body != undefined ? JSON.stringify(ctx.request.body) : ''));
       yield next();
       var user = (ctx === null || ctx === void 0 ? void 0 : (_ctx$state = ctx.state) === null || _ctx$state === void 0 ? void 0 : _ctx$state.user) || {};
       var elapsed = parseFloat((_perf_hooks.performance.now() - started) / 1000.0).toFixed(2);
-      var tcolor = elapsed < 1.0 ? _farrapaColors.GREEN : elapsed < 2.0 ? _farrapaColors.YELLOW : _farrapaColors.RED;
+      var tcolor = elapsed < 1.0 ? _farrapaColors.green : elapsed < 2.0 ? _farrapaColors.yellow : _farrapaColors.red;
       logger.info("req end ".concat(ctx.requestId, " ").concat(user ? " - uid ".concat(user.id) : '', " => ").concat(tcolor("DONE in ".concat(elapsed, " seconds"))));
     });
     return _request_middleware.apply(this, arguments);

package/lib/server/routes/catch_js_error.js

@@ -28,7 +28,7 @@ function init_route_catch_js_error(app, route) {
         agent
       } = ctx.request.body;
       var logger = ctx.miolo.logger;
-      var msg = "".concat((0, _farrapaColors.RED)('[JS Error]'), " on ").concat((0, _farrapaColors.BLUE)(path), ": ").concat(error.msg) + "".concat((0, _farrapaColors.RED)('[JS Error]'), " File  => ").concat(error.file) + "".concat((0, _farrapaColors.RED)('[JS Error]'), " Line  => ").concat(error.line) + "".concat((0, _farrapaColors.RED)('[JS Error]'), " Col   => ").concat(error.col) + "".concat((0, _farrapaColors.RED)('[JS Error]'), " Error => ").concat(JSON.stringify(error.error)) + "".concat((0, _farrapaColors.RED)('[JS Error]'), " Agent => ").concat(agent);
+      var msg = "".concat((0, _farrapaColors.red)('[JS Error]'), " on ").concat((0, _farrapaColors.blue)(path), ": ").concat(error.msg) + "".concat((0, _farrapaColors.red)('[JS Error]'), " File  => ").concat(error.file) + "".concat((0, _farrapaColors.red)('[JS Error]'), " Line  => ").concat(error.line) + "".concat((0, _farrapaColors.red)('[JS Error]'), " Col   => ").concat(error.col) + "".concat((0, _farrapaColors.red)('[JS Error]'), " Error => ").concat(JSON.stringify(error.error)) + "".concat((0, _farrapaColors.red)('[JS Error]'), " Agent => ").concat(agent);
       logger.error(msg);
       ctx.body = {
         result: 1

package/lib/server/routes/html_render.js

@@ -37,7 +37,7 @@ function init_route_html_render(app, html) {
       var method = ctx.request.method;
       var url = ctx.request.url;
       var what = html != undefined ? 'provided html' : 'fallback page';
-      logger.info("".concat(reqid, " - ").concat(ip, " : ").concat((0, _farrapaColors.CYAN)(method), " ").concat((0, _farrapaColors.CYAN)(url), " => Rendering ").concat(what));
+      logger.info("".concat(reqid, " - ").concat(ip, " : ").concat((0, _farrapaColors.cyan)(method), " ").concat((0, _farrapaColors.cyan)(url), " => Rendering ").concat(what));
       ctx.body = html || indexHTML;
     });
     return _html_render.apply(this, arguments);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "miolo",
-  "version": "0.0.3",
+  "version": "0.0.4",
   "description": "miolo",
   "main": "lib/index.js",
   "author": "Afialapis <info@afialapis.com>",
@@ -15,11 +15,11 @@
     "babel-plugin-module-resolver": "^4.1.0",
     "basic-auth": "^2.0.1",
     "cron": "^1.8.2",
-    "calustra-conn": "0.0.12",
-    "calustra-router": "0.0.12",
+    "calustra": "0.0.16",
+    "calustra-router": "0.0.16",
     "diskspace": "^2.0.0",
     "eslint": "^8.7.0",
-    "farrapa-colors": "^1.0.0",
+    "farrapa-colors": "^1.0.2",
     "koa": "^2.13.4",
     "koa-better-body": "^3.3.9",
     "koa-bodyparser": "^4.3.0",

package/src/cacher/index.js

@@ -1,22 +1,22 @@
 import redis from 'redis'
 import { promisify } from 'util'
-import { RED, PURPLE } from 'farrapa-colors'
+import { red, magenta } from 'farrapa-colors'
 
 function init_cacher(config) {
 
   const client = redis.createClient(config.redis.port, config.redis.host)
                 .on('connect', function () {
-                  console.info(`${PURPLE('REDIS')} Connection established!`)
+                  console.info(`${magenta('REDIS')} Connection established!`)
                 })
                 .on('error', function (err) {
                   let msg
                   try {
                     if (err instanceof redis.ReplyError)
-                      msg = `${PURPLE('REDIS')} ${RED('Error ' + err.code)} Command: ${err.command} ${err.toString()}`
+                      msg = `${magenta('REDIS')} ${red('Error ' + err.code)} Command: ${err.command} ${err.toString()}`
                     else
-                      msg = `${PURPLE('REDIS')} ${RED('Error ' + err.code)} ${err.toString()}`
+                      msg = `${magenta('REDIS')} ${red('Error ' + err.code)} ${err.toString()}`
                   } catch(e) {
-                    msg = `${PURPLE('REDIS')} ${RED('Error ')} ${e}`
+                    msg = `${magenta('REDIS')} ${red('Error ')} ${e}`
                   }
                   console.error(msg)
                 })

package/src/config/defaults.js

@@ -30,7 +30,7 @@ module.exports= {
       idleTimeoutMillis: 10000,  // The maximum time, in milliseconds, that a connection can be idle before being released. Use with combination of evict for proper working, for more details read https://github.com/coopernurse/node-pool/issues/178#issuecomment-327110870,
     },
     options: {
-      log: 'debug'
+      log: 'info'
     },
   },
   routes: {

package/src/db/conn.js

@@ -1,8 +1,8 @@
-const {getConnection} = require('calustra-conn')
+const {getConnection} = require('calustra')
 
 function init_db_connection(config) {
   
-  const conn= getConnection(config.connection, config.options)
+  const conn= getConnection(config)
 
   return conn
 }

package/src/logger/index.js

@@ -1,4 +1,4 @@
-import { LIGHT_CYAN, LIGHT_BLUE, LIGHT_GREEN, YELLOW, LIGHT_RED, RED } from 'farrapa-colors'
+import { red, blue, cyan, magenta, yellow, gray } from 'farrapa-colors'
 /* https://github.com/winstonjs/winston/issues/925 */
 /* https://github.com/winstonjs/winston/issues/287 */
 const { createLogger, format, transports } = require('winston')
@@ -7,12 +7,12 @@ const { combine, timestamp, _label, printf, errors } = format
 
 const init_logger = (config, emailer) => {
   const LEVEL_COLORS= {
-    silly  : LIGHT_CYAN,
-    debug  : LIGHT_BLUE,
-    verbose: LIGHT_GREEN,
-    info   : YELLOW,
-    warn   : LIGHT_RED,
-    error  : RED
+    silly  : gray,
+    debug  : magenta,
+    verbose: cyan,
+    info   : blue,
+    warn   : yellow,
+    error  : red
   }
 
   const myFormat = printf(info => {
@@ -81,7 +81,7 @@ const init_logger = (config, emailer) => {
   const logger = createLogger({
     level: config?.level || 'silly',
     format: combine(
-      format.errors({ stack: true }),
+      errors({ stack: true }),
       timestamp(),
       myFormat
     ),

package/src/server/engines/cron/syscheck.js

@@ -1,6 +1,6 @@
 const os = require('os')
 const diskspace = require('diskspace')
-import { CYAN, GREEN, YELLOW } from 'farrapa-colors'
+import { cyan, green, yellow } from 'farrapa-colors'
 
 function init_sys_check_and_log(logger) {
   function toMB(bytes) {
@@ -22,9 +22,9 @@ function init_sys_check_and_log(logger) {
     const perc= Math.round( (used*100)/total, 2)
 
     if (perc>80) {
-      logger.error(`[SERVER][${CYAN('SysCheck')}] RAM ${YELLOW(used)} MB used of ${GREEN(total)} MB (${YELLOW(perc)} %)`)
+      logger.error(`[SERVER][${cyan('SysCheck')}] RAM ${yellow(used)} MB used of ${green(total)} MB (${yellow(perc)} %)`)
     } else {
-      logger.info(`[SERVER][${CYAN('SysCheck')}] RAM ${YELLOW(used)} MB used of ${GREEN(total)} MB (${YELLOW(perc)} %)`)
+      logger.info(`[SERVER][${cyan('SysCheck')}] RAM ${yellow(used)} MB used of ${green(total)} MB (${yellow(perc)} %)`)
     }
     
 
@@ -35,9 +35,9 @@ function init_sys_check_and_log(logger) {
       const free = Math.round(toGB(result.free), 2)
 
       if (free<1) {
-        logger.error(`[SERVER][${CYAN('SysCheck')}] DISK ${YELLOW(used)} GB used of ${GREEN(total)} MB (${YELLOW(free)} GB free)`)
+        logger.error(`[SERVER][${cyan('SysCheck')}] DISK ${yellow(used)} GB used of ${green(total)} MB (${yellow(free)} GB free)`)
       } else {
-        logger.info(`[SERVER][${CYAN('SysCheck')}] DISK ${YELLOW(used)} GB used of ${GREEN(total)} MB (${YELLOW(free)} GB free)`)
+        logger.info(`[SERVER][${cyan('SysCheck')}] DISK ${yellow(used)} GB used of ${green(total)} MB (${yellow(free)} GB free)`)
       }
     });  
   }

package/src/server/engines/socket/index.js

@@ -1,5 +1,5 @@
 import IO from 'koa-socket-2'
-import { BLUE } from 'farrapa-colors'
+import { blue } from 'farrapa-colors'
 
 function init_socket(logger) {
 
@@ -18,17 +18,17 @@ function init_socket(logger) {
 
   io.on('connection', function (ctx, _data) {
     const i= getInfo(ctx)
-    logger.debug(`${BLUE('SOCKET')} Connection from ${i.ip} ${i.id}`)
+    logger.debug(`${blue('SOCKET')} Connection from ${i.ip} ${i.id}`)
   })
 
   io.on('disconnect', function (ctx, data) {
     const i = getInfo(ctx)
-    logger.debug(`${BLUE('SOCKET')} Disconnected ${i.ip} ${i.id} => ${data}`)
+    logger.debug(`${blue('SOCKET')} Disconnected ${i.ip} ${i.id} => ${data}`)
   })
 
   io.on('error', function (ctx, data) {
     const i = getInfo(ctx)
-    logger.error(`${BLUE('SOCKET')} Error on ${i.ip} ${i.id} => ${data}`)
+    logger.error(`${blue('SOCKET')} Error on ${i.ip} ${i.id} => ${data}`)
   })
 
   return io

package/src/server/middleware/request.js

@@ -1,5 +1,5 @@
 import { performance } from 'perf_hooks'
-import { CYAN, GREEN, YELLOW, RED } from 'farrapa-colors'
+import { cyan, green, yellow, red } from 'farrapa-colors'
 
 let REQUEST_COUNTER= 1
 
@@ -24,7 +24,7 @@ function init_request_middleware(app) {
 
     ctx.request.ip = ip
     
-    logger.info(`req begin ${ctx.requestId} - ip ${ip} - ${CYAN(ctx.request.method)} ${CYAN(ctx.request.url)} ${ctx.request.body!=undefined ? JSON.stringify(ctx.request.body) : ''}`)
+    logger.info(`req begin ${ctx.requestId} - ip ${ip} - ${cyan(ctx.request.method)} ${cyan(ctx.request.url)} ${ctx.request.body!=undefined ? JSON.stringify(ctx.request.body) : ''}`)
 
     await next()
     
@@ -34,10 +34,10 @@ function init_request_middleware(app) {
     const elapsed = parseFloat( (performance.now() - started) / 1000.0 ).toFixed(2)
 
     const tcolor= elapsed < 1.0
-                  ? GREEN
+                  ? green
                   : elapsed < 2.0
-                    ? YELLOW
-                    : RED
+                    ? yellow
+                    : red
 
     logger.info(`req end ${ctx.requestId} ${user ? ` - uid ${user.id}` : ''} => ${tcolor(`DONE in ${elapsed} seconds`)}`)
   }

package/src/server/routes/catch_js_error.js

@@ -1,4 +1,4 @@
-import { BLUE, RED } from 'farrapa-colors'
+import { blue, red } from 'farrapa-colors'
 import Router    from '@koa/router'
 
 function init_route_catch_js_error(app, route) {
@@ -8,12 +8,12 @@ function init_route_catch_js_error(app, route) {
     const logger = ctx.miolo.logger
 
     const msg= 
-      `${RED('[JS Error]')} on ${BLUE(path)}: ${error.msg}` +
-      `${RED('[JS Error]')} File  => ${error.file}` +
-      `${RED('[JS Error]')} Line  => ${error.line}` + 
-      `${RED('[JS Error]')} Col   => ${error.col}` + 
-      `${RED('[JS Error]')} Error => ${JSON.stringify(error.error)}` + 
-      `${RED('[JS Error]')} Agent => ${agent}`
+      `${red('[JS Error]')} on ${blue(path)}: ${error.msg}` +
+      `${red('[JS Error]')} File  => ${error.file}` +
+      `${red('[JS Error]')} Line  => ${error.line}` + 
+      `${red('[JS Error]')} Col   => ${error.col}` + 
+      `${red('[JS Error]')} Error => ${JSON.stringify(error.error)}` + 
+      `${red('[JS Error]')} Agent => ${agent}`
 
     logger.error(msg)
 

package/src/server/routes/html_render.js

@@ -1,7 +1,7 @@
 
 import fs from 'fs'
 import { resolve } from 'path'
-import { CYAN } from 'farrapa-colors'
+import { cyan } from 'farrapa-colors'
 import Router    from '@koa/router'
 
 const indexHTMLPath= resolve(__dirname, 'fallback_index.html')
@@ -20,7 +20,7 @@ function init_route_html_render(app, html) {
     const what = html!=undefined 
                  ? 'provided html'
                  : 'fallback page'
-    logger.info(`${reqid} - ${ip} : ${CYAN(method)} ${CYAN(url)} => Rendering ${what}`)
+    logger.info(`${reqid} - ${ip} : ${cyan(method)} ${cyan(url)} => Rendering ${what}`)
 
     ctx.body = html || indexHTML
   }