miolo 2.0.0-beta.2 → 2.0.0-beta.21

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "miolo",
-  "version": "2.0.0-beta.2",
+  "version": "2.0.0-beta.21",
   "description": "all-in-one koa-based server",
   "author": "Donato Lorenzo <donato@afialapis.com>",
   "contributors": [
@@ -15,6 +15,9 @@
   },
   "homepage": "https://www.afialapis.com/os/miolo",
   "license": "MIT",
+  "bin": {
+    "miolo": "./bin/index.mjs"
+  },
   "exports": {
     "./server": {
       "default": "./dist/server/miolo.server.node.mjs"
@@ -23,15 +26,14 @@
       "default": "./src/server/server-dev.mjs"
     },
     "./cli": {
-      "import": "./src/cli/index.mjs",
       "default": "./dist/cli/miolo.cli.umd.js"
     },
     "./cli-react": {
-      "import": "./src/cli-react/index.mjs",
       "default": "./dist/cli-react/miolo.cli-react.umd.js"
     }
   },
   "files": [
+    "bin",
     "src",
     "logo",
     "dist"
@@ -47,37 +49,32 @@
     "server-clean": "rm -fr ./dist/server/*",
     "server-bundle": "npx xeira bundle --target=node --source_index=./src/server/index.mjs --bundle_folder=./dist/server --bundle_name=miolo.server --bundle_extension=node.mjs",
     "server-dist": "npm run server-clean && npm run server-bundle",
-
     "YY-server-dev-clean": "rm -fr ./dist/server-dev/*",
     "YY-server-dev-bundle": "npx xeira bundle --target=node --source_index=./src/server/server-dev.mjs --bundle_folder=./dist/server-dev --bundle_name=miolo.server.dev --bundle_extension=node.mjs",
     "YY-server-dev-dist": "npm run server-dev-clean && npm run server-dev-bundle",
-
     "dist": "npm run cli-dist && npm run cli-react-dist && npm run server-dist",
     "site": "npx xeira site",
     "test": "npx xeira test --files=./test/index.mjs",
-
     "X_pre-publish": "npm run test && npm run dist && npm run site",
-    "pre-publish": "npm run dist && npm run site",    
-
-
+    "pre-publish": "npm run dist && npm run site",
     "xxx_demo-guest": "rm -fr ./demo/build/miolo-demo-guest* && node demo/run.cjs --guest",
     "xxx_demo-basic": "rm -fr ./demo/build/miolo-demo-basic* && node demo/run.cjs --basic",
     "xxx_demo-credentials": "rm -fr ./demo/build/miolo-demo-credentials* && node demo/run.cjs --credentials",
     "xxx_demo-credentials-debug": "rm -fr ./demo/build/miolo-demo-credentials* && DEBUG=winston* node demo/run.cjs --credentials",
     "xxx_demo": "npm run demo-credentials",
-
     "xxx_server-dist-esbuild": "npx esbuild ./src/server/index.mjs --bundle --platform=node --outfile=dist/server/server.mjs --format=esm --external:@babel/preset-typescript --external:lightningcss --external:tty",
-
     "xxx_demo-vite": "AUTH_TYPE=credentials node demo/server/server.mjs",
     "xxx_demo-vite-prod": "NODE_ENV=production AUTH_TYPE=credentials node demo/server/server.mjs",
     "xxx_demo-vite-build-client": "vite build --outDir demo/dist/client",
     "xxx_demo-vite-build-server": "vite build --outDir demo/dist/server --ssr demo/server/ssr/entry-server.jsx"
   },
   "dependencies": {
+    "@babel/plugin-proposal-decorators": "^7.25.9",
     "@koa/bodyparser": "^5.1.1",
     "@koa/cors": "^5.0.0",
     "@koa/router": "^13.1.0",
     "@maxmind/geoip2-node": "^6.0.0",
+    "@vitejs/plugin-react": "^4.3.4",
     "cacheiro": "^0.4.0",
     "calustra": "^0.15.0",
     "cron": "^4.1.4",
@@ -102,24 +99,18 @@
     "socket.io": "^4.8.1",
     "socket.io-client": "^4.8.1",
     "tinguir": "^0.0.7",
+    "vite": "^6.2.5",
     "winston": "^3.17.0",
-    "winston-daily-rotate-file": "^5.0.0"
+    "winston-daily-rotate-file": "^5.0.0",
+    "xeira": "^1.1.10",
+    "yargs-parser": "^21.1.1"
   },
   "peerDependencies": {
     "react": "^18.3.1",
     "react-dom": "^18.3.1"
   },
   "devDependencies": {
-    "@babel/core": "^7.26.10",
-    "@babel/preset-env": "7.26.9",
-    "@babel/preset-react": "7.26.3",
-    "@babel/register": "7.25.9",
-    "@vitejs/plugin-react": "^4.3.4",
-    "babel-plugin-transform-import-meta": "^2.3.2",
-    "esbuild": "^0.25.2",
-    "node-fetch": "^3.3.2",
-    "vite": "^6.2.5",
-    "xeira": "^1.1.9"
+    "node-fetch": "^3.3.2"
   },
   "eslintConfig": {
     "extends": [

package/src/cli/fetcher/utils.mjs

@@ -14,7 +14,7 @@ export function json_to_query_string(obj) {
         }
       }
     }
-    return uparams.toString()
+    return `?${uparams.toString()}`
   }
   return ''
 }

package/src/server/config/defaults.mjs

@@ -332,11 +332,11 @@ export default {
     // {
     //   name,
     //   cronTime, 
-    //   onTick(miolo, onComplete),
+    //   onTick: async (miolo, onComplete),
     //      Notice that if task runs too fast, you may see that
     //       onTick is actually never run, but onComplete is.
     //      Consider passing a higher interval on cronTime
-    //   onComplete(miolo),
+    //   onComplete: async (miolo),
     //   timezone, context, runOnInit, utcOffset, unrefTimeout
     // }
     // check https://github.com/kelektiv/node-cron#readme
@@ -414,5 +414,12 @@ export default {
     // html: '',
     // loader: async (ctx) => {}
   },
+
+  dev: {
+    watcher: {
+      enabled: true,
+      // dirs: []    By default, server's entry dir
+    },
+  }
 };
 

package/src/server/engines/cron/emails.mjs

@@ -2,8 +2,8 @@ export function sys_email_queue_config() {
   return {
     name: 'Emailer',
     cronTime: '* * * * *',
-    onTick: (miolo, _onCompleted) => {
-      miolo.emailer.queue_send_emails(miolo.logger)
+    onTick: async (miolo, _onCompleted) => {
+      await miolo.emailer.queue_send_emails(miolo.logger)
     },
     start: true   
   }

package/src/server/engines/cron/index.mjs

@@ -52,9 +52,9 @@ export function init_cron(app, custom) {
     return jobInfo
   }
 
-  const _start_job = (jobInfo) => {
+  const _start_job = async (jobInfo) => {
     try {
-      jobInfo.job.start()
+      await jobInfo.job.start()
       jobInfo.isActive= true
       logger.debug(`[cron][Job ${cyan(jobInfo.name)}] ${green_bold('started!')}`)
       return 1
@@ -65,26 +65,26 @@ export function init_cron(app, custom) {
     }
   }  
 
-  const _start_job_by_idx_or_name = (idxOrName) => {
+  const _start_job_by_idx_or_name = async (idxOrName) => {
     const jobInfo = _find_job_by_idx_or_name(idxOrName)
     if (jobInfo) {
-      const done = _start_job(jobInfo)
+      const done = await _start_job(jobInfo)
       return [done, jobInfo.name]
     }
     return [0, '']
   }
 
-  const _start_all_jobs = () => {
+  const _start_all_jobs = async () => {
     try {
       let started= [], errors= []
-      jobInfos.map(jobInfo => {
-        const done= _start_job(jobInfo)
+      for (const jobInfo of jobInfos) {
+        const done= await _start_job(jobInfo)
         if (done == 1) {
           started.push(jobInfo.name)
         } else {
           errors.push(jobInfo.name)
         }
-      })
+      }
       if (started.length > 0) {
         logger.info(`[cron] Started ${started.length} jobs: ${started}`)
       }
@@ -97,9 +97,9 @@ export function init_cron(app, custom) {
   
   }
 
-  const _stop_job = (jobInfo) => {
+  const _stop_job = async (jobInfo) => {
     try {
-      jobInfo.job.stop()
+      await jobInfo.job.stop()
       jobInfo.isActive= false
       logger.debug(`[cron][Job ${cyan(jobInfo.name)}] ${yellow_bold('stopped!')}`) 
       return 1
@@ -110,26 +110,26 @@ export function init_cron(app, custom) {
     }
   }
 
-  const _stop_job_by_idx_or_name = (idxOrName) => {
+  const _stop_job_by_idx_or_name = async (idxOrName) => {
     const jobInfo = _find_job_by_idx_or_name(idxOrName)
     if (jobInfo) {
-      const done = _stop_job(jobInfo)
+      const done = await _stop_job(jobInfo)
       return [done, jobInfo.name]
     }
     return [0, '']
   }
 
-  const _stop_all_jobs = () => {
+  const _stop_all_jobs = async () => {
     try {
       let stopped= [], errors= []
-      jobInfos.map(jobInfo => {
-        const done= _stop_job(jobInfo)
+      for (const jobInfo of jobInfos) {
+        const done= await _stop_job(jobInfo)
         if (done == 1) {
           stopped.push(jobInfo.name)
         } else {
           errors.push(jobInfo.name)
         }
-      })
+      }
       if (stopped.length > 0) {
         logger.info(`[cron] Stopped ${stopped.length} jobs: ${stopped}`)
       }

package/src/server/engines/cron/init.mjs

@@ -17,10 +17,10 @@ export function init_cron_job(miolo, config) {
     config?.cronTime || '*/5 * * * *',
     
     // onTick(miolo, onComplete)
-    (onComplete) => {
+    async (onComplete) => {
       try {
         logger.silly(`[cron][Custom Job ${cyan(name)}] ${green_bold('ticks!')}`)
-        config.onTick(miolo, onComplete)
+        await config.onTick(miolo, onComplete)
       } catch(e) {
         logger.error(`[cron][Custom Job ${cyan(name)}] Error at onTick()`)
         logger.error(e)
@@ -28,11 +28,11 @@ export function init_cron_job(miolo, config) {
     },
 
     // onComplete(miolo)
-    () => {
+    async () => {
       logger.silly(`[cron][Custom Job ${cyan(name)}] ${green_bold('completed!')}`)
       if (config?.onComplete) {
         try {
-          config.onComplete(miolo)
+          await config.onComplete(miolo)
         } catch(e) {
           logger.error(`[cron][Custom Job ${cyan(name)}] Error at onComplete()`)
           logger.error(e)

package/src/server/engines/cron/ipsum.mjs

@@ -122,7 +122,7 @@ export function ipsum_config() {
   return {
     name: 'IPsum',
     cronTime: '0 0 * * *',
-    onTick: (miolo, _onCompleted) => {
+    onTick: async (miolo, _onCompleted) => {
       const folder = miolo.config.http.ratelimit.ipsum_folder || _IPSUM_DEF_FOLDER
       ipsum_update(folder, (ips) => {
         miolo.logger.debug(`[cron][${cyan('IPsum')}] File downloaded. ${green(ips.length)} ips will be ${yellow('blacklisted')}!`)

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

@@ -48,7 +48,7 @@ export function sys_check_config() {
   return {
     name: 'SysCheck',
     cronTime: '0,15,30,45 * * * *',
-    onTick: (miolo, _onCompleted) => {
+    onTick: async (miolo, _onCompleted) => {
       _sys_check_and_log(miolo.logger)
     },
     start: true   

package/src/server/index.mjs

@@ -1,4 +1,5 @@
 import { miolo } from './server.mjs'
+import { miolo_cron } from './server-cron.mjs'
 import { init_emailer_transporter as miolo_emailer} from './engines/emailer/index.mjs'
 import { init_logger as miolo_logger } from './engines/logger/index.mjs'
 import { init_parser as miolo_parser } from './engines/parser/index.mjs'
@@ -8,6 +9,7 @@ import { getConnection as miolo_db_connection} from 'calustra/conn-postgres'
 
 export {
   miolo,
+  miolo_cron,
   miolo_emailer,
   miolo_logger,
   miolo_parser,

package/src/server/middleware/vite/devserver.mjs

@@ -13,7 +13,15 @@ export async function init_vite_dev_server_middleware(app, config) {
     vite = await createServer({
       server: { middlewareMode: true },
       appType: 'custom',
-      plugins: [react.default()],
+      plugins: [react.default(
+        {
+          babel: {
+            plugins: [
+              ["@babel/plugin-proposal-decorators", { "legacy": true }]
+            ]
+          }
+        }
+      )],
       // 
       base: config?.base || '/',
       root: config?.root || '',

package/src/server/middleware/vite/watcher.mjs

@@ -0,0 +1,42 @@
+import path from 'path'
+
+
+// Resuse Vite Watcher
+export async function init_watcher_dev_server_middleware(app, watcherConfig, ssrConfig) {
+  let watcher
+
+  const isEnabled = watcherConfig?.enabled === true
+  const isProduction = process.env.NODE_ENV === 'production'
+  
+  if (isEnabled && (!isProduction)){
+
+    // Let's reuse Vite's cholkidar instance to listen to changes in server code
+    watcher = app.vite.watcher
+
+    // Extra dirs to watch
+    const serverDirsToWatch = watcherConfig?.dirs || ['server', 'src/server']
+
+    // Listen to changes in the extra dirs
+    serverDirsToWatch.forEach((dir) => {
+      watcher.add(path.resolve(process.cwd(), dir))
+      app.context.miolo.logger.info(`[watcher] Vite is now watching for changes also in: ${dir}`)
+    })
+   
+    // Listen to changes in the extra dirs
+    watcher.on('change', async (filePath) => {
+      let isCustom = false
+      serverDirsToWatch.forEach((dir) => {
+        if (filePath.startsWith(path.resolve(process.cwd(), dir))) {
+          isCustom = true
+        }
+      })
+      if (!isCustom) return // Ignore changes outside the custom watched directories
+      app.context.miolo.logger.info(`[watcher] File changed: ${filePath}. Reloading server...`)
+
+      await app.stop()
+      process.send('miolo_restart') // Envía un mensaje al proceso padre para reiniciar
+    })
+  } 
+
+  app.watcher= watcher
+}

package/src/server/server-cron.mjs

@@ -0,0 +1,40 @@
+import { init_config }                    from './config/index.mjs'
+import { init_context_middleware }         from './middleware/context/index.mjs'
+import { init_cron }                       from './engines/cron/index.mjs'
+
+export async function miolo_cron(sconfig) {
+
+  const app = {
+    use: () => {},
+    context: {}
+  }
+
+  // Init some pieces
+  const config = init_config(sconfig)
+  
+  // attach to app some custom miolo methods
+  init_context_middleware(app, config)
+
+
+  // Init cron (will not start jobs yet)
+  init_cron(app, config?.cron)
+    
+  // Util callbacks
+  app.start = async () => {
+    // Init and reset db connection
+    await app.context.miolo.db.init_connection()
+    await app.cron.start()
+  }
+  
+  app.stop = async () => {
+    await app.context.miolo.db.drop_connections()
+    await app.cron.stop()
+  }
+
+  app.restart = async () => {
+    await app.stop()
+    await app.start()
+  }
+
+  return app
+}

package/src/server/server-dev.mjs

@@ -1,5 +1,6 @@
 import { miolo } from "./server.mjs"
 import { init_vite_dev_server_middleware } from './middleware/vite/devserver.mjs'
+import { init_watcher_dev_server_middleware } from './middleware/vite/watcher.mjs'
 
 /**
  * We use two separated servers 
@@ -18,6 +19,7 @@ export async function miolo_dev(sconfig) {
   // Vite DEV server init
   const devInit= async (app, config) => {
     await init_vite_dev_server_middleware(app, config.vite)
+    await init_watcher_dev_server_middleware(app, config.dev.watcher, config.ssr)
   }
 
   // Vite SSR side

package/src/server/server.mjs

@@ -112,13 +112,16 @@ async function miolo(sconfig, devInit= undefined, devRender= undefined) {
     await app.context.miolo.db.init_connection()
     
     await app.http.start()
-    app.cron.start()
+    await app.cron.start()
   }
   
   app.stop = async () => {
-    app.context.miolo.db.drop_connections()
+    await app.context.miolo.db.drop_connections()
     await app.http.stop()
-    app.cron.stop()
+    await app.cron.stop()
+    if (app?.vite) {
+      app.vite.close()
+    }
   }
 
   app.restart = async () => {