miolo 0.0.29 → 0.0.32

package/lib/config/defaults.js

@@ -115,7 +115,10 @@ module.exports = {
     },
     mail: {
       enabled: process.env.NODE_ENV === 'production',
-      level: 'warn'
+      level: 'warn',
+      name: 'miolo',
+      from: 'miolo@afialapis.com',
+      to: 'devel@afialapis.com'
     }
   },
   mail: {

package/lib/emailer/index.js

@@ -12,12 +12,7 @@ function init_emailer(options, defaults) {
   var nmailer = nodemailer.createTransport(options, defaults);
 
   function send_email(mail, cb) {
-    if (process.env.NODE_ENV != 'production') {
-      console.info('*********************************');
-      console.info('This mail would be sent if you were in production:');
-      console.info(mail);
-      console.info('*********************************');
-    } else if (silent) {
+    if (silent) {
       console.info('*********************************');
       console.info('This mail will not be send (emailing is disabled):');
       console.info(mail);
@@ -56,7 +51,10 @@ function init_emailer(options, defaults) {
 
   var emailer = {
     send: send_email,
-    verify: verify_emailer
+    verify: verify_emailer,
+    options,
+    defaults,
+    silent
   };
   return emailer;
 }

package/lib/logger/index.js

@@ -45,9 +45,11 @@ var init_logger = (config, emailer) => {
   // 
 
   if (config.console.enabled) {
+    var _config$console;
+
     _log_transports.push(new transports.Console({
       humanReadableUnhandledException: true,
-      level: config.console.level,
+      level: (config === null || config === void 0 ? void 0 : (_config$console = config.console) === null || _config$console === void 0 ? void 0 : _config$console.level) || (config === null || config === void 0 ? void 0 : config.level) || 'silly',
       handleExceptions: true
     }));
   } //
@@ -56,9 +58,11 @@ var init_logger = (config, emailer) => {
 
 
   if (config.file.enabled) {
+    var _config$file;
+
     _log_transports.push(new transports.File({
       filename: config.file.filename,
-      level: config.file.level,
+      level: (config === null || config === void 0 ? void 0 : (_config$file = config.file) === null || _config$file === void 0 ? void 0 : _config$file.level) || (config === null || config === void 0 ? void 0 : config.level) || 'info',
       humanReadableUnhandledException: true,
       handleExceptions: true
     }));
@@ -78,7 +82,6 @@ var init_logger = (config, emailer) => {
     winston.transports.MailerLogger = MailerLogger;
 
     _log_transports.push(new transports.MailerLogger({
-      level: config.mail.level,
       humanReadableUnhandledException: true,
       handleExceptions: true
     }));

package/lib/logger/logger_mail.js

@@ -10,9 +10,10 @@ function init_logger_to_mail(config, emailer) {
   var MailerLogger = function MailerLogger(options) {
     winston.Transport.call(this, options);
     options = options || {};
-    this.silent = options.silent || false;
-    this.level = options.level || 'info';
-    this.to = options.to || config.to, this.from = config.from;
+    this.level = config.level || 'info';
+    this.ename = (config === null || config === void 0 ? void 0 : config.name) || emailer.defaults.name;
+    this.to = config.to || emailer.defaults.to;
+    this.from = config.from || emailer.defaults.from;
     this.humanReadableUnhandledException = options.humanReadableUnhandledException || true;
     this.handleExceptions = options.handleExceptions || true;
     this.json = options.json || false;
@@ -29,7 +30,6 @@ function init_logger_to_mail(config, emailer) {
 
   MailerLogger.prototype.log = function (info, callback) {
     var self = this;
-    if (this.silent) return callback(null, true);
     var tit = '';
 
     try {
@@ -41,6 +41,7 @@ function init_logger_to_mail(config, emailer) {
     tit = (0, _farrapaColors.uncolor)(tit);
     var subject = config.name + ': [' + info.level.toUpperCase() + '] ' + tit;
     var mail = {
+      from: this.from,
       to: this.to,
       subject: subject,
       text: (0, _farrapaColors.uncolor)(info.message)

package/lib/server/index.js

@@ -39,6 +39,12 @@ var _html_render = require("./routes/html_render");
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
+function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
+
+function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
+
+function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
+
 function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) { try { var info = gen[key](arg); var value = info.value; } catch (error) { reject(error); return; } if (info.done) { resolve(value); } else { Promise.resolve(value).then(_next, _throw); } }
 
 function _asyncToGenerator(fn) { return function () { var self = this, args = arguments; return new Promise(function (resolve, reject) { var gen = fn.apply(self, args); function _next(value) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "next", value); } function _throw(err) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "throw", err); } _next(undefined); }); }; }
@@ -58,7 +64,9 @@ function _miolo() {
     var conn;
 
     if (config.database) {
-      conn = (0, _calustra.getConnection)(config.database);
+      conn = (0, _calustra.getConnection)(_objectSpread(_objectSpread({}, config.database), {}, {
+        log: logger
+      }));
     }
 
     var app = new _koa.default(); // Assign miolo stuff to ctx

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, "\n") + "".concat((0, _farrapaColors.red)('[JS Error]'), " File  => ").concat(error.file, "\n") + "".concat((0, _farrapaColors.red)('[JS Error]'), " Line  => ").concat(error.line, "\n") + "".concat((0, _farrapaColors.red)('[JS Error]'), " Col   => ").concat(error.col, "\n") + "".concat((0, _farrapaColors.red)('[JS Error]'), " Error => ").concat(JSON.stringify(error.error), "\n") + "".concat((0, _farrapaColors.red)('[JS Error]'), " Agent => ").concat(agent);
       logger.error(msg);
       ctx.body = {
         result: 1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "miolo",
-  "version": "0.0.29",
+  "version": "0.0.32",
   "description": "miolo",
   "main": "lib/index.js",
   "author": "Afialapis <info@afialapis.com>",
@@ -14,13 +14,13 @@
     "assign-deep": "^1.0.1",
     "babel-plugin-module-resolver": "^4.1.0",
     "basic-auth": "^2.0.1",
-    "calustra": "0.0.35",
-    "calustra-orm": "0.0.35",
-    "calustra-router": "0.0.35",
+    "calustra": "0.0.36",
+    "calustra-orm": "0.0.36",
+    "calustra-router": "0.0.36",
     "cron": "^1.8.2",
     "diskspace": "^2.0.0",
     "eslint": "^8.9.0",
-    "farrapa-colors": "^1.0.4",
+    "farrapa-colors": "^1.0.7",
     "koa": "^2.13.4",
     "koa-better-body": "^3.3.9",
     "koa-bodyparser": "^4.3.0",

package/src/config/defaults.js

@@ -110,6 +110,9 @@ module.exports= {
     mail: {
       enabled: process.env.NODE_ENV === 'production',
       level: 'warn',
+      name: 'miolo',
+      from: 'miolo@afialapis.com',
+      to: 'devel@afialapis.com'      
     }
   },
   mail: {

package/src/emailer/index.js

@@ -2,16 +2,10 @@ const nodemailer = require('nodemailer')
 
 function init_emailer(options, defaults, silent= false) {
 
-
   const nmailer = nodemailer.createTransport(options, defaults)
 
   function send_email(mail, cb) {
-    if (process.env.NODE_ENV != 'production') {
-      console.info('*********************************')
-      console.info('This mail would be sent if you were in production:')
-      console.info(mail)
-      console.info('*********************************')
-    } else if (silent) {
+    if (silent) {
       console.info('*********************************')
       console.info('This mail will not be send (emailing is disabled):')
       console.info(mail)
@@ -29,8 +23,7 @@ function init_emailer(options, defaults, silent= false) {
             console.log(info)
           } 
         } 
-      }
-      
+      }      
 
       nmailer.sendMail(mail, cb)
     }
@@ -53,7 +46,10 @@ function init_emailer(options, defaults, silent= false) {
 
   const emailer= {
     send: send_email, 
-    verify: verify_emailer
+    verify: verify_emailer,
+    options, 
+    defaults, 
+    silent
   }
   return emailer
 }

package/src/logger/index.js

@@ -38,7 +38,7 @@ const init_logger = (config, emailer) => {
     _log_transports.push(
         new transports.Console({
           humanReadableUnhandledException: true,
-          level    : config.console.level ,
+          level    : config?.console?.level || config?.level || 'silly',
           handleExceptions: true
     }))
   }
@@ -50,7 +50,7 @@ const init_logger = (config, emailer) => {
     _log_transports.push(
       new transports.File({ 
         filename : config.file.filename, 
-        level    : config.file.level ,
+        level    : config?.file?.level || config?.level || 'info' ,
         humanReadableUnhandledException: true,
         handleExceptions: true})
     )
@@ -68,7 +68,6 @@ const init_logger = (config, emailer) => {
 
     _log_transports.push(
       new transports.MailerLogger({
-        level    : config.mail.level,
         humanReadableUnhandledException: true,
         handleExceptions: true    
       })

package/src/logger/logger_mail.js

@@ -10,10 +10,10 @@ function init_logger_to_mail(config, emailer) {
       winston.Transport.call(this, options);
       options = options || {};
 
-      this.silent= options.silent || false
-      this.level = options.level  || 'info'
-      this.to    = options.to     || config.to,
-      this.from  = config.from
+      this.level = config.level  || 'info'
+      this.ename = config?.name  || emailer.defaults.name
+      this.to    = config.to     || emailer.defaults.to
+      this.from  = config.from   || emailer.defaults.from
       this.humanReadableUnhandledException = options.humanReadableUnhandledException || true;
       this.handleExceptions                = options.handleExceptions || true;
       this.json                            = options.json || false;
@@ -36,8 +36,6 @@ function init_logger_to_mail(config, emailer) {
   MailerLogger.prototype.log = function (info, callback) {
       let self = this;
 
-      if (this.silent) return callback(null, true);
-
       let tit= '';
       try {
         tit= info.message.split("\n")[0]
@@ -50,6 +48,7 @@ function init_logger_to_mail(config, emailer) {
       let subject = config.name + ': [' + info.level.toUpperCase() + '] ' + tit;
 
       let mail= {
+        from    : this.from,
         to      : this.to,
         subject : subject, 
         text    : uncolor(info.message)

package/src/server/index.js

@@ -29,7 +29,10 @@ async function miolo(sconfig, render, callback) {
   
   let conn
   if (config.database) {
-    conn= getConnection(config.database)
+    conn= getConnection({
+      ...config.database,
+      log: logger
+    })
   }
 
   const app = new Koa()

package/src/server/routes/catch_js_error.js

@@ -8,11 +8,11 @@ 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]')} on ${blue(path)}: ${error.msg}\n` +
+      `${red('[JS Error]')} File  => ${error.file}\n` +
+      `${red('[JS Error]')} Line  => ${error.line}\n` + 
+      `${red('[JS Error]')} Col   => ${error.col}\n` + 
+      `${red('[JS Error]')} Error => ${JSON.stringify(error.error)}\n` + 
       `${red('[JS Error]')} Agent => ${agent}`
 
     logger.error(msg)