miolo 3.0.0-beta.136 → 3.0.0-beta.138

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "miolo",
-  "version": "3.0.0-beta.136",
+  "version": "3.0.0-beta.138",
   "description": "all-in-one koa-based server",
   "author": "Donato Lorenzo <donato@afialapis.com>",
   "contributors": [

package/src/engines/cron/emails.mjs

@@ -3,7 +3,13 @@ export function sys_email_queue_config() {
     name: 'Emailer',
     cronTime: '* * * * *',
     onTick: async (miolo, _onCompleted) => {
-      await miolo.emailer.queue_send_emails(miolo.logger)
+
+      const n = await miolo.emailer.queue_send_emails(miolo.logger)
+      if (n == -1) {
+        miolo.logger.error(`[emailer] Error sending emails`)
+      } else {
+        miolo.logger.info(`[emailer] Sent ${n} emails`)
+      }
     },
     start: true   
   }

package/src/engines/emailer/queue.mjs

@@ -20,7 +20,6 @@ export async function email_queue_an_email(email, logger= undefined) {
 
 /* eslint-disable no-unused-vars */
 export function email_queue_pop_pendings(logger= undefined) { 
-
   let grouped = {}
 
   Object.values(EMAIL_QUEUE)

package/src/engines/emailer/transporter.mjs

@@ -103,30 +103,36 @@ export function _init_emailer_transporter({options, defaults, silent}) {
   async function queue_send_emails(logger= undefined) {
     const pending = email_queue_pop_pendings(logger)
     if (pending.length <= 0) {
-      return
+      return 0
     }
-    _logi(logger, `[emailer] Sending emails queue (${pending.length} emails)`)
-  
-    // const emailString = await client.lPop('email_queue')
-    // if (!emailString) break
-    // const email = JSON.parse(emailString)
-  
-    for (const email of pending) {
-      if (email.count > 1) {
-        _logs(logger, `[emailer] Sending queued and stacked email [${email.subject}](x${email.count})...`)
-        email.subject = `${email.subject} (x${email.count})`
-      } else {
-        _logs(logger, `[emailer] Sending queued email [${email.subject}]...`)
-      }
-
-      send_email(email).then((res) => {
-        _logs(logger, `[emailer] Queued email [${email.subject}]sent ${res.ok ? 'OK' : 'NOT OK'}`)
-        if (res.ok) {
-          delete email_queue_remove_ids(email.ids, logger)
+    try {
+      _logi(logger, `[emailer] Sending emails queue (${pending.length} emails)`)
+    
+      // const emailString = await client.lPop('email_queue')
+      // if (!emailString) break
+      // const email = JSON.parse(emailString)
+    
+      for (const email of pending) {
+        if (email.count > 1) {
+          _logs(logger, `[emailer] Sending queued and stacked email [${email.subject}](x${email.count})...`)
+          email.subject = `${email.subject} (x${email.count})`
+        } else {
+          _logs(logger, `[emailer] Sending queued email [${email.subject}]...`)
         }
-      })
+
+        send_email(email).then((res) => {
+          _logs(logger, `[emailer] Queued email [${email.subject}]sent ${res.ok ? 'OK' : 'NOT OK'}`)
+          if (res.ok) {
+            delete email_queue_remove_ids(email.ids, logger)
+          }
+        })
+      }
+      _logs(logger, `[emailer] Sent emails ${pending.length} from queue`)
+      return pending.length
+    } catch(error) {
+      _loge(logger, `[emailer] Error sending emails queue: ${error}`)
+      return -1
     }
-    _logs(logger, `[emailer] Sent emails ${pending.length} from queue`)
   }
   
   const emailer= {

package/src/engines/logger/injectStackTrace.mjs

@@ -14,7 +14,7 @@ const injectStackTrace = format((info) => {
     // 2. Buscamos en qué línea del stack aparece tu wrapper
     const wrapperIndex = stackLines.findIndex(line => line.includes(wrapperAnchor));
 
-    let cleanStackLines = [];
+    let cleanStackLines = stackLines;
 
     if (wrapperIndex !== -1) {
       // CASO ÉXITO: Encontramos tu wrapper.

package/src/index.mjs

@@ -7,7 +7,7 @@ import { with_miolo_schema } from './engines/schema/index.mjs'
 
 import { cacheiro as miolo_cacher} from 'cacheiro'
 import { getConnection as miolo_db_connection_pg} from 'calustra/conn-postgres'
-import { getConnection as miolo_db_connection_sqlite} from 'calustra/conn-sqlite'
+// import { getConnection as miolo_db_connection_sqlite} from 'calustra/conn-sqlite'
 
 export {
   miolo,
@@ -17,6 +17,6 @@ export {
   miolo_parser,
   miolo_cacher,
   miolo_db_connection_pg,
-  miolo_db_connection_sqlite,
+  // miolo_db_connection_sqlite,
   with_miolo_schema
 }

package/src/middleware/context/db.mjs

@@ -1,5 +1,5 @@
 import { getConnection as miolo_db_connection_pg, dropConnections as miolo_db_drop_connections_pg } from 'calustra/conn-postgres'
-import { getConnection as miolo_db_connection_sqlite, dropConnections as miolo_db_drop_connections_sqlite } from 'calustra/conn-sqlite'
+// import { getConnection as miolo_db_connection_sqlite, dropConnections as miolo_db_drop_connections_sqlite } from 'calustra/conn-sqlite'
 import {  miolo_cacher_options_for_calustra } from './cache/options.mjs'
 
 export function init_context_db (config, logger) {
@@ -14,12 +14,17 @@ export function init_context_db (config, logger) {
       cache: miolo_cacher_options_for_calustra(config, logger)
     }
     
-    let conn = undefined
+    //    let conn = undefined
+    //    if (config.db.config.dialect === 'sqlite') {
+    //      conn = await miolo_db_connection_sqlite(config.db.config, dbOptions)
+    //    } else {
+    //      conn = await miolo_db_connection_pg(config.db.config, dbOptions)
+    //    }
+
+    let conn = await miolo_db_connection_pg(config.db.config, dbOptions)
     if (config.db.config.dialect === 'sqlite') {
-      conn = await miolo_db_connection_sqlite(config.db.config, dbOptions)
-    } else {
-      conn = await miolo_db_connection_pg(config.db.config, dbOptions)
-    }
+      logger.error(`[miolo] SQLite is not supported yet`)
+    } 
     
     conn.get_model = conn.getModel
     
@@ -42,12 +47,17 @@ export function init_context_db (config, logger) {
       log: logger
     }
 
-    let conn = undefined
+    //    let conn = undefined
+    //    if (config.db.config.dialect === 'sqlite') {
+    //      conn = await miolo_db_connection_sqlite(config.db.config, dbOptions)
+    //    } else {
+    //      conn = await miolo_db_connection_pg(config.db.config, dbOptions)
+    //    }   
+    
+    let conn = await miolo_db_connection_pg(config.db.config, dbOptions)
     if (config.db.config.dialect === 'sqlite') {
-      conn = await miolo_db_connection_sqlite(config.db.config, dbOptions)
-    } else {
-      conn = await miolo_db_connection_pg(config.db.config, dbOptions)
-    }    
+      logger.error(`[miolo] SQLite is not supported yet`)
+    }     
 
     return conn.get_model(name)
   }  
@@ -63,9 +73,10 @@ export function init_context_db (config, logger) {
     },
     get_connection: get_connection_wrap,
     get_model: get_model_wrap,
-    drop_connections: (config.db.config.dialect === 'sqlite')
-      ? miolo_db_drop_connections_sqlite
-      : miolo_db_drop_connections_pg
+    drop_connections:miolo_db_drop_connections_pg
+    // drop_connections: (config.db.config.dialect === 'sqlite')
+    //   ? miolo_db_drop_connections_sqlite
+    //   : miolo_db_drop_connections_pg
   }
 
   return db