npm - miolo - Versions diffs - 2.1.0-beta.1 → 3.0.0-beta.2 - Mend

miolo 2.1.0-beta.1 → 3.0.0-beta.2

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (111) hide show

package/bin/.env ADDED Viewed

@@ -0,0 +1,107 @@
+#
+# General
+#
+MIOLO_NAME=miolo
+MIOLO_CONFIG=./src/server/config.mjs
+#
+# HTTP
+#
+MIOLO_PORT=8001
+MIOLO_HOSTNAME=localhost
+MIOLO_HTTP_CORS=simple # true | false | simple. For {options}, use JS
+MIOLO_HTTP_PROXY=true # true | false. For {options}, use JS
+MIOLO_RATELIMIT_MAX=1000
+MIOLO_RATELIMIT_DURATION=60 * 1000
+#MIOLO_RATELIMIT_WHITELIST_IPS=
+#MIOLO_RATELIMIT_BLACKLIST_IPS=
+MIOLO_REQUEST_LAZY=1 # seconds to consider lazy a request
+MIOLO_REQUEST_SLOW=2 # seconds to consider slow a request
+MIOLO_GEOIP_ENABLED=false
+MIOLO_GEOIP_DB=/var/lib/GeoIP/GeoLite2-City.mmdb
+MIOLO_GEOIP_LOCAL_IPS=127.0.0.1
+#
+# Session
+#
+MIOLO_SESSION_SALT=11111111-2222-3333-4444-555555555555
+MIOLO_SESSION_SECRET=secret
+MIOLO_SESSION_MAX_AGE=864000000
+MIOLO_SESSION_SECURE=true
+#
+# Database
+#
+MIOLO_DB_DIALECT=postgres
+MIOLO_DB_HOST=localhost
+MIOLO_DB_PORT=5432
+MIOLO_DB_DATABASE=my_database
+MIOLO_DB_USER=my_user
+MIOLO_DB_PASSWORD=my_password
+MIOLO_DB_POOL_MAX=5 # Maximum number of connection in pool
+MIOLO_DB_POOL_MIN=0 # Minimum number of connection in pool
+# 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,
+MIOLO_DB_POOL_IDLE_TIMEOUT_MS=10000
+#
+# Logging
+#
+MIOLO_LOG_LEVEL=verbose
+MIOLO_LOG_CONSOLE_ENABLED=true
+#MIOLO_LOG_CONSOLE_LEVEL=verbose
+MIOLO_LOG_FILE_ENABLED=true
+#MIOLO_LOG_FILE_LEVEL=verbose
+MIOLO_LOG_FILE_PATH=/var/log/afialapis/%MIOLO%.log
+MIOLO_LOG_MAIL_ENABLED=false
+#MIOLO_LOG_MAIL_LEVEL=warn
+MIOLO_LOG_MAIL_FROM=noreply@mail.com
+MIOLO_LOG_MAIL_TO=noreply@mail.com
+#
+# Mailer
+#
+MIOLO_MAILER_SILENT=true
+MIOLO_MAILER_HOST=mail.com
+MIOLO_MAILER_PORT=25
+MIOLO_MAILER_FROM=noreply@mail.com
+MIOLO_MAILER_TO=noreply@mail.com
+MIOLO_MAILER_AUTH_METHOD=PLAIN # PLAIN / LOGIN
+# If LOGIN, you need to specify:
+MIOLO_MAILER_SMTP_USER=noreply@mail.com
+MIOLO_MAILER_SMTP_PASS=****
+#
+# Cache
+#
+MIOLO_CACHE_VERSION=1
+MIOLO_CACHE_CALUSTRA_VERSION=1
+MIOLO_CACHE_CALUSTRA_TTL=86400000
+MIOLO_CACHE_SESSION_VERSION=1
+MIOLO_CACHE_SESSION_TTL=864000000
+#
+# Others
+#
+MIOLO_DOTENVX_DEBUG=false
+#
+# Build
+#
+MIOLO_BUILD_HTML_FILE=./src/cli/index.html
+MIOLO_BUILD_CLIENT_ENTRY=./src/cli/entry-cli.jsx
+MIOLO_BUILD_CLIENT_DEST=./dist/cli
+MIOLO_BUILD_SERVER_SSR_ENTRY=./src/server/ssr/entry-server.jsx
+MIOLO_BUILD_SERVER_DEST=./dist/server
+MIOLO_BUNDLE_SUFFIX=iife.bundle.min
+MIOLO_DEV_WATCH_ENABLED=true
+MIOLO_DEV_WATCH_DIRS=./src/server

package/bin/build-client.mjs CHANGED Viewed

@@ -1,13 +1,9 @@
 import {xeiraBundle} from 'xeira'
-import { cleanFolder, copyFileSync, getAppName, isFileExistingSync } from './util.mjs'
+import { cleanFolder, copyFileSync, isFileExistingSync } from './util.mjs'
-process.env.NODE_ENV = 'production'
-const BUNDLE_SUFFIX = 'iife.bundle.min'
-function _addCssLinkToHead(htmlString) {
-  const linkTag = `  <link href="/dist/cli/${getAppName()}.${BUNDLE_SUFFIX}.css" rel="stylesheet" media="all">`
+function _addCssLinkToHead(appName, htmlString, dest) {
+  const linkTag = `  <link href="${dest}/${appName}.${process.env.MIOLO_BUNDLE_SUFFIX}.css" rel="stylesheet" media="all">`
   // Expresión regular para encontrar la etiqueta </head> de cierre.
   // Usamos un grupo de captura para mantener el contenido antes de </head>.
@@ -17,11 +13,13 @@ function _addCssLinkToHead(htmlString) {
   const match = htmlString.match(headCloseTagRegex);
   if (match) {
+    console.log(`[${appName}][prod] adding css link ${linkTag} to <head>`)
     // Si se encuentra </head>, inserta la etiqueta <link> justo antes de ella.
     return htmlString.replace(headCloseTagRegex, `${linkTag}\n$&`);
   } else {
     // Si no se encuentra </head>, devuelve el HTML original sin modificar.
-    console.warn(`[miolo] No se encontró la etiqueta <head> en el HTML proporcionado.`);
+    console.warn(`[${appName}][prod] No se encontró la etiqueta <head> en el HTML proporcionado.`);
     return htmlString;
   }
 }
@@ -37,17 +35,20 @@ export default async function(appName, entry, htmlFile, dest) {
     target: 'browser',
     bundle_folder: dest,
     bundle_name: appName,
-    bundle_extension: BUNDLE_SUFFIX,
+    bundle_extension: process.env.MIOLO_BUNDLE_SUFFIX,
     bundler: 'rollup',
     bundle_node_polyfill: true
   })
-  const destCssFile = `${dest}/${appName}.${BUNDLE_SUFFIX}.css`
+  const destCssFile = `${dest}/${appName}.${process.env.MIOLO_BUNDLE_SUFFIX}.css`
   const destCssFileExists = isFileExistingSync(destCssFile)
+  console.log(`[${appName}][prod] destCssFile ${destCssFile} exists?: ${destCssFileExists}`)
+  console.log(`[${appName}][prod] Copying HTML file ${htmlFile} to ${dest}/index.html`)
   copyFileSync(htmlFile, `${dest}/index.html`, (content) => {
     if (destCssFileExists) {
-      content = _addCssLinkToHead(content)
+      content = _addCssLinkToHead(appName, content, dest)
     }
     return content
   })

package/bin/build-server.mjs CHANGED Viewed

@@ -5,7 +5,7 @@ import { build } from 'vite'
 import {xeiraBundle} from 'xeira'
 import { cleanFolder } from './util.mjs'
-process.env.NODE_ENV = 'production'
 export async function _fixProdBuild(appName, filePath) {
   try {
@@ -21,7 +21,7 @@ export async function _fixProdBuild(appName, filePath) {
   }
 }
-export default async function(appName, ssrEntry, ssrDest, entry, dest) {
+export default async function(appName, ssrEntry, ssrDest, dest) {
   cleanFolder(dest)
   console.log(`[${appName}][prod] Building first the SSR entry ${ssrEntry}`)
@@ -29,29 +29,19 @@ export default async function(appName, ssrEntry, ssrDest, entry, dest) {
     build: {
       outDir: path.resolve(process.cwd(), ssrDest),
       ssr: path.resolve(process.cwd(), ssrEntry),
-      rollupOptions: {
-        /*
-        external: ['react', 'react-dom'],
-        output: {
-          globals: {
-            react: 'React',
-            'react-dom': 'ReactDOM'
-          }
-        }
-          */
-      },
+      rollupOptions: {},
     },
     // server ssr's entry must bundle externals
     ssr: {
       noExternal: true
     }
   })
-  console.log(`[${appName}][prod] Building server from entry ${entry}`)
   const serverExt = 'node.bundle.mjs'
   await xeiraBundle({
-    source_index: entry,
+    //source_index: 'node_modules/miolo/packages/miolo/bin/prod_start.mjs',
+    source_index: '../miolo/bin/prod_start.mjs',
     target: 'node',
     bundle_folder: dest,
     bundle_name: appName,

package/bin/dev.mjs CHANGED Viewed

@@ -1,7 +1,10 @@
 import path from 'node:path'
+import { fileURLToPath } from 'node:url'
 import { fork } from 'node:child_process'
-process.env.NODE_ENV = 'development'
+const __filename = fileURLToPath(import.meta.url)
+const __dirname = path.dirname(__filename)
 let serverProcess = null
 // let retryCount = 0
@@ -16,8 +19,8 @@ function _isProcessRunning(pid) {
   }
 }
-async function startDevServerProcess({ appName, entry }) {
-  const serverPath = path.join(process.cwd(), entry)
+async function startDevServerProcess({ appName }) {
+  const serverPath = path.join(__dirname, './dev_start.mjs')
   serverProcess = fork(serverPath)
   console.log(`[${appName}][dev] Server process started with pid ${serverProcess.pid} from ${process.pid}`)
@@ -56,13 +59,13 @@ async function startDevServerProcess({ appName, entry }) {
         }, 2000)
       }
-      startDevServerProcess({ appName, entry }) // Inicia un nuevo proceso
+      startDevServerProcess({ appName }) // Inicia un nuevo proceso
     }
   })
 }
-export default async function(appName, entry) {
-  console.log(`[${appName}][dev] Running DEV server from entry ${entry}`)
-  await startDevServerProcess({ appName, entry })
+export default async function(appName) {
+  console.log(`[${appName}][dev] Running DEV server`)
+  await startDevServerProcess({ appName })
 }

package/bin/dev_start.mjs ADDED Viewed

@@ -0,0 +1,11 @@
+import path from 'node:path'
+import {miolo_dev} from '../src/server-dev.mjs'
+async function _miolo_dev_start_server() {
+  const config = await import(path.join(process.cwd(), process.env.MIOLO_CONFIG))
+  const app = await miolo_dev(config.default)
+  await app.start()
+  return app
+}
+_miolo_dev_start_server()

package/bin/env.mjs ADDED Viewed

@@ -0,0 +1,39 @@
+import { config } from '@dotenvx/dotenvx'
+import path from 'path'
+import { fileURLToPath } from 'url'
+import fs from 'fs'
+function _find_closest_package_json(dir) {
+  if (fs.existsSync(path.join(dir, 'package.json'))) {
+    return dir
+  }
+  const parentDir = path.dirname(dir)
+  if (parentDir === dir) {
+    return null
+  }
+  return _find_closest_package_json(parentDir)
+}
+function _get_miolo_config_path() {
+  const __filename = fileURLToPath(import.meta.url)
+  const __dirname = path.dirname(__filename)
+  return path.join(__dirname, '.env')
+}
+export function init_env_config() {
+  const debug = process.env.DOTENVX_DEBUG === 'true'
+  // miolo defaults
+  const libEnvPath = _get_miolo_config_path()
+  config({ path: libEnvPath, debug })
+  // proyect config
+  const proyEnvPath = _find_closest_package_json(process.cwd())
+  if (proyEnvPath) {
+    config({ path: path.join(proyEnvPath, '.env'), override: true, debug })
+  }
+}

package/bin/index.mjs CHANGED Viewed

@@ -1,59 +1,65 @@
 #!/usr/bin/env node
 import yargs from 'yargs-parser'
-import { getAppName } from './util.mjs'
+import { init_env_config } from './env.mjs'
 async function main() {
   const args = yargs(process.argv.slice(2))
   const command = args._[0]
   try {
-    const appName = getAppName()
+    init_env_config()
+    const appName = process.env.MIOLO_NAME
     const serverName = args['server-name'] || 'miolo_server'
     switch (command) {
       case 'dev':
+        process.env.NODE_ENV = 'development'
         const devHandler = (await import ('./dev.mjs')).default
-        const devEntry = args.entry || './src/server/server-dev.mjs'
-        await devHandler(appName, /*entry*/ devEntry)
+        await devHandler(appName)
         break
       case 'build-client':
+        process.env.NODE_ENV = 'production'
         const buildClientHandler = (await import ('./build-client.mjs')).default
-        const clientEntry = args.entry || './cli/entry-cli.jsx'
-        const htmlFile = args['html-file'] || './cli/index.html'
-        const clientDest = args.dest || './dist/cli'
+        const clientEntry = args.entry || process.env.MIOLO_BUILD_CLIENT_ENTRY
+        const htmlFile = args['html-file'] || process.env.MIOLO_BUILD_HTML_FILE
+        const clientDest = args.dest || process.env.MIOLO_BUILD_CLIENT_DEST
         await buildClientHandler(appName, /*entry*/ clientEntry, htmlFile, /*dest*/ clientDest)
         break
       case 'build-server':
+        process.env.NODE_ENV = 'production'
         const buildServerHandler = (await import ('./build-server.mjs')).default
-        const ssrEntry = args['ssr-entry'] || './server/ssr/entry-server.jsx'
-        const ssrDest = args['ssr-dest'] || './dist/server'
-        const serverEntry = args.entry || './src/server/server-prod.mjs'
-        const serverDest = args.dest || './dist/server'
-        await buildServerHandler(appName, ssrEntry, ssrDest, /*entry*/ serverEntry, /*dest*/ serverDest)
+        const ssrEntry = args['ssr-entry'] || process.env.MIOLO_BUILD_SERVER_SSR_ENTRY
+        const ssrDest = args['ssr-dest'] || process.env.MIOLO_BUILD_SERVER_DEST
+        const serverDest = args.dest || process.env.MIOLO_BUILD_SERVER_DEST
+        await buildServerHandler(appName, ssrEntry, ssrDest,  /*dest*/ serverDest)
         break
       case 'start':
+        process.env.NODE_ENV = 'production'
         const startHandler = (await import ('./start.mjs')).default
-        const startDest = args.dest || './dist/server'
+        const startDest = args.dest || process.env.MIOLO_BUILD_SERVER_DEST
         await startHandler(appName, /*dest*/ startDest, serverName)
         break
       case 'stop':
+        process.env.NODE_ENV = 'production'
         const stopHandler = (await import ('./stop.mjs')).default
         await stopHandler(appName)
         break
       case 'restart':
+        process.env.NODE_ENV = 'production'
         const restartHandler = (await import ('./restart.mjs')).default
-        const restartDest = args.dest || './dist/server'
+        const restartDest = args.dest || process.env.MIOLO_BUILD_SERVER_DEST
         await restartHandler({appName, /*dest*/ restartDest, serverName})
         break
       case 'create-bin':
+        process.env.NODE_ENV = 'production'
         const createHandler = (await import ('./create-bin.mjs')).default
-        const createDest = args.dest || './dist/server'
+        const createDest = args.dest || process.env.MIOLO_BUILD_SERVER_DEST
         await createHandler(appName, /*dest*/ createDest, serverName)
         break

package/bin/prod_start.mjs ADDED Viewed

@@ -0,0 +1,9 @@
+import path from 'node:path'
+import {miolo} from '../src/server.mjs'
+export default async function _miolo_prod_start_server() {
+  const config = await import(path.join(process.cwd(), process.env.MIOLO_CONFIG))
+  const app = await miolo(config.default)
+  await app.start()
+  return app
+}

package/bin/restart.mjs CHANGED Viewed

@@ -1,8 +1,6 @@
 import start from "./start.mjs"
 import stop from "./stop.mjs"
-process.env.NODE_ENV = 'production'
 export default async function(appName, dest, serverName) {
   console.log(`[${appName}][prod][restart] Restarting server...`)

package/bin/start.mjs CHANGED Viewed

@@ -1,25 +1,15 @@
 import path from 'node:path'
 import { pidFileCreate } from "./util.mjs"
-process.env.NODE_ENV = 'production'
 export default async function(appName, dest, serverName) {
-  // if (! fs.existsSync(CLI_DEST_MAIN)) {
-  //   console.error(`[${appName}][prod][start] Cannot start server (prod): CLI bundle does not exist ${CLI_DEST_MAIN}`)
-  //   return
-  // }
-  // if (! fs.existsSync(SRV_DEST_MAIN)) {
-  //   console.error(`[${appName}][prod][start] Cannot start server (prod): SERVER bundle does not exist ${SRV_DEST_MAIN}`)
-  //   return
-  // }
   console.log(`[${appName}][prod][start] Starting server...`)
   const serverExt = 'node.bundle.mjs'
   const destFile =  path.join(process.cwd(), `${dest}/${appName}.${serverExt}`)
   const srv_module = await import(destFile)
-  const server = srv_module[serverName]
+  //const server = srv_module[serverName]
+  const server = srv_module.default
   const pid = pidFileCreate(appName)
   console.log(`[${appName}][prod][start] Starting server. PID is ${pid}...`)

package/bin/stop.mjs CHANGED Viewed

@@ -1,7 +1,5 @@
 import { pidFileRead } from "./util.mjs"
-process.env.NODE_ENV = 'production'
 export default async function(appName) {
   console.log(`[${appName}][prod][stop] Stopping server...`)
@@ -17,6 +15,5 @@ export default async function(appName) {
     console.error(_)
     return 0
-  }
+  }
 }

package/bin/util.mjs CHANGED Viewed

@@ -2,17 +2,17 @@ import {readdirSync, rmSync, writeFileSync, readFileSync} from 'node:fs'
 import path from 'node:path'
-export function getAppName() {
-  try {
-    const packageJsonPath = path.join(process.cwd(), 'package.json')
-    const content = readFileSync(packageJsonPath, 'utf8')
-    const packageData = JSON.parse(content)
-    return packageData.name
-  } catch (error) {
-    console.error('[miolo] Error reading package.json:', error)
-    return 'miolo'
-  }
-}
+// export function getAppName() {
+//   try {
+//     const packageJsonPath = path.join(process.cwd(), 'package.json')
+//     const content = readFileSync(packageJsonPath, 'utf8')
+//     const packageData = JSON.parse(content)
+//     return packageData.name
+//   } catch (error) {
+//     console.error('[miolo] Error reading package.json:', error)
+//     return 'miolo'
+//   }
+// }
 export function cleanFolder(folder) {
   readdirSync(folder).forEach(file => {

package/package.json CHANGED Viewed

@@ -1,6 +1,6 @@
 {
   "name": "miolo",
-  "version": "2.1.0-beta.1",
+  "version": "3.0.0-beta.2",
   "description": "all-in-one koa-based server",
   "author": "Donato Lorenzo <donato@afialapis.com>",
   "contributors": [
@@ -21,49 +21,29 @@
   "type": "module",
   "exports": {
     "./server": {
-      "node": "./src/server/index.mjs",
-      "import": "./src/server/index.mjs",
-      "default": "./dist/server/miolo.server.node.mjs"
+      "node": "./src/index.mjs",
+      "import": "./src/index.mjs",
+      "default": "./dist/miolo.node.mjs"
     },
     "./server-dev": {
-      "default": "./src/server/server-dev.mjs"
-    },
-    "./cli": {
-      "node": "./src/cli/index.mjs",
-      "import": "./dist/cli/miolo.cli.mjs",
-      "default": "./dist/cli/miolo.cli.umd.js"
-    },
-    "./cli-react": {
-      "node": "./src/cli-react/index.mjs",
-      "import": "./dist/cli-react/miolo.cli-react.mjs",
-      "default": "./dist/cli-react/miolo.cli-react.umd.js"
+      "default": "./src/server-dev.mjs"
     }
   },
   "files": [
     "bin",
-    "src",
-    "logo",
-    "dist"
+    "src"
   ],
   "scripts": {
-    "reset": "rm -fr node_modules package-lock.json npm-lock.yaml && npm i",
-    "cli-clean": "rm -fr ./dist/cli/* ",
-    "cli-bundle": "npx xeira bundle --target=browser --source_index=./src/cli/index.mjs --bundle_folder=./dist/cli --bundle_name=miolo.cli --bundle_node_polyfill=true --bundle_extension=umd,mjs",
-    "cli-dist": "npm run cli-clean && npm run cli-bundle",
-    "cli-react-clean": "rm -fr ./dist/cli-react/*",
-    "cli-react-bundle": "npx xeira bundle --target=browser --source_index=./src/cli-react/index.mjs --bundle_folder=./dist/cli-react --bundle_name=miolo.cli-react --bundle_node_polyfill=true --bundle_extension=umd,mjs",
-    "cli-react-dist": "npm run cli-react-clean && npm run cli-react-bundle",
-    "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",
-    "dist": "npm run cli-dist && npm run cli-react-dist && npm run server-dist",
-    "site": "npx xeira site",
+    "reset": "rm -fr package-lock.json npm-lock.yaml dist/* && npm i",
+    "clean": "rm -fr ./dist/*",
+    "bundle": "npx xeira bundle --target=node --source_index=./src/index.mjs --bundle_folder=./dist --bundle_name=miolo --bundle_extension=node.mjs",
+    "dist": "npm run clean && npm run bundle",
     "test": "npx xeira test --files=./test/index.mjs",
-    "pre-publish": "npm run dist && npm run site"
+    "publish": "npm publish"
   },
   "dependencies": {
     "@babel/plugin-proposal-decorators": "^7.28.0",
-    "@dotenvx/dotenvx": "^1.47.5",
+    "@dotenvx/dotenvx": "^1.47.6",
     "@koa/bodyparser": "^6.0.0",
     "@koa/cors": "^5.0.0",
     "@koa/router": "^13.1.1",
@@ -96,19 +76,16 @@
     "vite": "^7.0.4",
     "winston": "^3.17.0",
     "winston-daily-rotate-file": "^5.0.0",
-    "xeira": "^1.2.2",
     "yargs-parser": "^22.0.0"
   },
-  "peerDependencies": {
-    "react": "^18.3.1",
-    "react-dom": "^18.3.1"
-  },
   "devDependencies": {
-    "node-fetch": "^3.3.2"
+    "esbuild": "^0.25.6",
+    "node-fetch": "^3.3.2",
+    "xeira": "^1.2.3"
   },
   "eslintConfig": {
     "extends": [
-      "./node_modules/xeira/configs/eslint.react.cjs"
+      "../../node_modules/xeira/configs/eslint.react.cjs"
     ]
   }
 }