miolo 0.0.46 → 0.0.49

package/lib/config/defaults.js

@@ -44,22 +44,31 @@ module.exports = {
       sameSite: process.env.NODE_ENV != 'development' ? null : 'strict'
     }
   },
-  database: {
-    dialect: 'postgres',
-    host: 'localhost',
-    port: 5432,
-    database: 'miolo',
-    user: 'postgres',
-    password: 'postgres',
-    max: 5,
-    // Maximum number of connection in pool
-    min: 0,
-    // Minimum number of connection in pool
-    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,
-  },
+  db: {
+    connection: {
+      database: {
+        dialect: 'postgres',
+        host: 'localhost',
+        port: 5432,
+        database: 'miolo',
+        user: 'postgres',
+        password: 'postgres',
+        max: 5,
+        // Maximum number of connection in pool
+        min: 0,
+        // Minimum number of connection in pool
+        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: 'silly' //  will be updated on the fly with miolo logger
+      }
+    },
 
+    tables: []
+  },
   routes: {
-    body_field: undefined,
+    bodyField: undefined,
     getUserId: ctx => {
       try {
         var from_pport = ctx.state.user.id;
@@ -237,9 +246,9 @@ module.exports = {
     //  paths: [],
     //},
     //passport: {
-    //  get_user_id:  (user, done) => done(null, user.id), // default
-    //  find_user_by_id: (id, done) => done(null, {id: 1}),  // ok=> done(null, user)  err=> done(error, null)
-    //  local_auth_user: (username, password, done) => done(null, {id: 1})
+    //  get_user_id:  (user, done, miolo) => done(null, user.id), // default
+    //  find_user_by_id: (id, done, miolo) => done(null, {id: 1}),  // ok=> done(null, user)  err=> done(error, null)
+    //  local_auth_user: (username, password, done, miolo) => done(null, {id: 1})
     //                   // auth=> done(null, user) noauth=> done(null, false, {message: ''}) err=> done(error, null)
     //  url_login : '/login',
     //  url_logout: '/logout',

package/lib/index.js

@@ -27,12 +27,6 @@ Object.defineProperty(exports, "getLogger", {
     return _logger.init_logger;
   }
 });
-Object.defineProperty(exports, "getModel", {
-  enumerable: true,
-  get: function get() {
-    return _calustraRouter.getModel;
-  }
-});
 Object.defineProperty(exports, "miolo", {
   enumerable: true,
   get: function get() {

package/lib/server/index.js

@@ -10,7 +10,6 @@ var _emailer = require("../emailer");
 var _logger = require("../logger");
 var _cron = require("./engines/cron");
 var _calustraRouter = require("calustra-router");
-var _context = require("./middleware/context");
 var _body = require("./middleware/body");
 var _catcher = require("./middleware/catcher");
 var _static = require("./middleware/static");
@@ -30,37 +29,20 @@ function miolo(sconfig, render, callback) {
   var config = (0, _config.init_config)(sconfig);
   var emailer = (0, _emailer.init_emailer)(config.mail.options, config.mail.defaults);
   var logger = (0, _logger.init_logger)(config.log, emailer);
-  var miolo_getConnection = () => {
-    var conn;
-    if (config.database) {
-      conn = (0, _calustraRouter.getConnection)(config.database, {
-        log: logger
-      });
-    }
-    return conn;
-  };
-  var miolo_getModel = (tableName, options) => {
-    var model;
-    if (config.database) {
-      model = (0, _calustraRouter.getModel)(config.database, tableName, options);
-    }
-    return model;
-  };
-  var conn = miolo_getConnection();
+  config.db.connection.options.log = logger;
   var app = new _koa.default();
 
+  // attach to app calustra's db methods
+  (0, _calustraRouter.useCalustraDbContext)(app, config.db);
+
   // attach to app some custom miolo methods
-  app.miolo = {
+  app.context.miolo = {
     config: _objectSpread({}, config),
     emailer,
     logger,
-    getConnection: miolo_getConnection,
-    getModel: miolo_getModel
+    db: app.context.db
   };
 
-  // Assign this miolo stuff also to ctx
-  (0, _context.init_context_middleware)(app, app.miolo);
-
   // Compress and body parser
   (0, _body.init_body_middleware)(app);
 
@@ -107,10 +89,7 @@ function miolo(sconfig, render, callback) {
 
   // Routes to /crud
   if (config !== null && config !== void 0 && config.routes) {
-    var {
-      init_calustra_router
-    } = require("./routes/calustra");
-    init_calustra_router(app, conn, config.routes);
+    (0, _calustraRouter.useCalustraRouter)(app, config.db, config.routes);
   }
   // Socket.io
   // const io= init_socket(logger)

package/lib/server/middleware/auth/passport.js

@@ -6,6 +6,7 @@ Object.defineProperty(exports, "__esModule", {
 exports.init_passport_auth_middleware = void 0;
 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); }); }; }
+/* eslint-disable no-unused-vars*/
 var passport = require('koa-passport');
 var LocalStrategy = require('passport-local').Strategy;
 var Router = require('@koa/router');
@@ -17,12 +18,12 @@ var Router = require('@koa/router');
 //                    // auth=> done(null, user) noauth=> done(null, false, {message: ''}) err=> done(error, null)
 // }
 
-var def_get_user_id = (user, done) => done(null, user.id);
-var def_find_user_by_id = (id, done) => {
+var def_get_user_id = (user, done, miolo) => done(null, user.id);
+var def_find_user_by_id = (id, done, miolo) => {
   var err = Error('You need to define auth.passport.find_user_by_id');
   done(err, null);
 };
-var def_local_auth_user = (username, password, done) => {
+var def_local_auth_user = (username, password, done, miolo) => {
   var err = Error('You need to define auth.passport.local_auth_user');
   done(err, null);
 };
@@ -49,16 +50,16 @@ var init_passport_auth_middleware = (app, options) => {
   // init passport
   var serialize_user = (user, done) => {
     process.nextTick(function () {
-      get_user_id_f(user, done);
+      get_user_id_f(user, done, app.context.miolo);
     });
   };
   var deserialize_user = (id, done) => {
     process.nextTick(function () {
-      find_user_by_id_f(id, done);
+      find_user_by_id_f(id, done, app.context.miolo);
     });
   };
   var local_strategy = new LocalStrategy((username, password, done) => {
-    local_auth_user_f(username, password, done);
+    local_auth_user_f(username, password, done, app.context.miolo);
   });
   passport.serializeUser(serialize_user);
   passport.deserializeUser(deserialize_user);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "miolo",
-  "version": "0.0.46",
+  "version": "0.0.49",
   "description": "miolo",
   "main": "lib/index.js",
   "author": "Afialapis <info@afialapis.com>",
@@ -14,7 +14,7 @@
     "assign-deep": "^1.0.1",
     "babel-plugin-module-resolver": "^4.1.0",
     "basic-auth": "^2.0.1",
-    "calustra-router": "0.1.3",
+    "calustra-router": "0.2.1",
     "cron": "^1.8.2",
     "diskspace": "^2.0.0",
     "eslint": "^8.9.0",

package/src/config/defaults.js

@@ -46,19 +46,27 @@ module.exports= {
       sameSite: process.env.NODE_ENV != 'development' ? null : 'strict', 
     }
   },
-  database: {
-    dialect:  'postgres',
-    host:     'localhost',
-    port:     5432,
-    database: 'miolo',
-    user:     'postgres',
-    password: 'postgres',
-    max:      5,          // Maximum number of connection in pool
-    min:      0,          // Minimum number of connection in pool
-    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,
+  db: {
+    connection: {
+      database: {
+        dialect:  'postgres',
+        host:     'localhost',
+        port:     5432,
+        database: 'miolo',
+        user:     'postgres',
+        password: 'postgres',
+        max:      5,          // Maximum number of connection in pool
+        min:      0,          // Minimum number of connection in pool
+        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: 'silly' //  will be updated on the fly with miolo logger
+      }
+    },
+    tables: []
   },
   routes: {
-    body_field: undefined,
+    bodyField: undefined,
   
     getUserId: (ctx) => {
       try {
@@ -237,9 +245,9 @@ module.exports= {
     //  paths: [],
     //},
     //passport: {
-    //  get_user_id:  (user, done) => done(null, user.id), // default
-    //  find_user_by_id: (id, done) => done(null, {id: 1}),  // ok=> done(null, user)  err=> done(error, null)
-    //  local_auth_user: (username, password, done) => done(null, {id: 1})
+    //  get_user_id:  (user, done, miolo) => done(null, user.id), // default
+    //  find_user_by_id: (id, done, miolo) => done(null, {id: 1}),  // ok=> done(null, user)  err=> done(error, null)
+    //  local_auth_user: (username, password, done, miolo) => done(null, {id: 1})
     //                   // auth=> done(null, user) noauth=> done(null, false, {message: ''}) err=> done(error, null)
     //  url_login : '/login',
     //  url_logout: '/logout',

package/src/index.js

@@ -2,13 +2,12 @@ import {miolo} from './server'
 import { init_emailer as getEmailer} from './emailer'
 import { init_cacher as getCacher} from './cacher'
 import { init_logger as getLogger } from './logger'
-import { getConnection, getModel } from 'calustra-router'
+import { getConnection } from 'calustra-router'
 
 export {
   miolo,
   getEmailer,
   getCacher,
   getLogger,
-  getConnection,
-  getModel
+  getConnection
 }

package/src/server/index.js

@@ -5,10 +5,8 @@ import { init_logger } from 'src/logger'
 import { init_cron } from './engines/cron'
 // import {init_socket} from './engines/socket'
 
-import { getConnection, getModel } from 'calustra-router'
+import { useCalustraDbContext, useCalustraRouter } from 'calustra-router'
 
-
-import { init_context_middleware } from './middleware/context'
 import { init_body_middleware } from './middleware/body'
 import { init_catcher_middleware } from './middleware/catcher'
 import { init_static_middleware } from './middleware/static'
@@ -22,42 +20,28 @@ import { init_route_catch_js_error} from './routes/catch_js_error'
 import { init_route_html_render} from './routes/html_render'
 
 function miolo(sconfig, render, callback) {
+
   
   // Init some pieces
   const config = init_config(sconfig)
   const emailer = init_emailer(config.mail.options, config.mail.defaults)
   const logger = init_logger(config.log, emailer)
 
-  const miolo_getConnection = () => {
-    let conn
-    if (config.database) {
-      conn= getConnection(config.database, {log: logger})
-    }
-    return conn
-  }
-  const miolo_getModel = (tableName, options) => {
-    let model
-    if (config.database) {
-      model= getModel(config.database, tableName, options)
-    }
-    return model    
-  }
-  const conn = miolo_getConnection()  
-
+  config.db.connection.options.log= logger
+  
   const app = new Koa()
 
+
+  // attach to app calustra's db methods
+  useCalustraDbContext(app, config.db)
+
   // attach to app some custom miolo methods
-  app.miolo = {
+  app.context.miolo = {
     config: {...config},
     emailer,
     logger,
-    getConnection: miolo_getConnection,
-    getModel: miolo_getModel
-  }
-
-
-  // Assign this miolo stuff also to ctx
-  init_context_middleware(app, app.miolo)
+    db: app.context.db
+  } 
 
   // Compress and body parser
   init_body_middleware(app)
@@ -101,8 +85,8 @@ function miolo(sconfig, render, callback) {
 
   // Routes to /crud
   if (config?.routes) {
-    const {init_calustra_router} = require('./routes/calustra')
-    init_calustra_router(app, conn, config.routes)
+    useCalustraRouter(app, config.db, config.routes)
+
   }
   // Socket.io
   // const io= init_socket(logger)

package/src/server/middleware/auth/passport.js

@@ -1,8 +1,9 @@
+/* eslint-disable no-unused-vars*/
 const passport = require('koa-passport');
 const LocalStrategy = require('passport-local').Strategy;
-
 const Router = require('@koa/router')
 
+
 // passport: {
 //   get_user_id:     (user, done) => done(null, user.id), // default
 //   find_user_by_id: (id, done) => done(null, {id: 1}),  // ok=> done(null, user)  err=> done(error, null)
@@ -10,14 +11,15 @@ const Router = require('@koa/router')
 //                    // auth=> done(null, user) noauth=> done(null, false, {message: ''}) err=> done(error, null)
 // }
 
-const def_get_user_id = (user, done) => done(null, user.id)
 
-const def_find_user_by_id = (id, done) => {
+const def_get_user_id = (user, done, miolo) => done(null, user.id)
+
+const def_find_user_by_id = (id, done, miolo) => {
   const err = Error('You need to define auth.passport.find_user_by_id')
   done(err, null)
 }
 
-const def_local_auth_user = (username, password, done) => {
+const def_local_auth_user = (username, password, done, miolo) => {
   const err = Error('You need to define auth.passport.local_auth_user')
   done(err, null)
 }
@@ -39,19 +41,19 @@ const init_passport_auth_middleware = ( app, options ) => {
   // init passport
   const serialize_user = (user, done) => {
     process.nextTick(function() {
-      get_user_id_f(user, done)
+      get_user_id_f(user, done, app.context.miolo)
     })
   }
 
   const deserialize_user = (id, done) => {
     process.nextTick(function() {
-      find_user_by_id_f(id, done)
+      find_user_by_id_f(id, done, app.context.miolo)
     })
   }
 
   const local_strategy= new LocalStrategy(
     (username, password, done) => {
-      local_auth_user_f(username, password, done)
+      local_auth_user_f(username, password, done, app.context.miolo)
   })
   
   passport.serializeUser(serialize_user)

package/lib/server/routes/calustra.js

@@ -1,30 +0,0 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.init_calustra_router = init_calustra_router;
-exports.init_calustra_router_async = init_calustra_router_async;
-var _calustraRouter = require("calustra-router");
-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); }); }; }
-function init_calustra_router(app, conn, config) {
-  if (!config) {
-    return undefined;
-  }
-  var router = (0, _calustraRouter.calustraRouter)(conn, config);
-  app.use(router.routes());
-}
-function init_calustra_router_async(_x, _x2, _x3) {
-  return _init_calustra_router_async.apply(this, arguments);
-}
-function _init_calustra_router_async() {
-  _init_calustra_router_async = _asyncToGenerator(function* (app, conn, config) {
-    if (!config) {
-      return undefined;
-    }
-    var router = yield (0, _calustraRouter.calustraRouterAll)(conn, config);
-    app.use(router.routes());
-  });
-  return _init_calustra_router_async.apply(this, arguments);
-}

package/src/server/routes/calustra.js

@@ -1,27 +0,0 @@
-import {calustraRouter, calustraRouterAll} from 'calustra-router'
-
-function init_calustra_router (app, conn, config) {
-
-  if (! config) {
-    return undefined
-  }
-  
-  const router= calustraRouter(conn, config)
-  app.use(router.routes())
-  
-}
-
-
-async function init_calustra_router_async (app, conn, config) {
-
-  if (! config) {
-    return undefined
-  }
-  
-  const router= await calustraRouterAll(conn, config)
-  app.use(router.routes())
-  
-}
-
-
-export {init_calustra_router, init_calustra_router_async}