miolo 2.0.0-beta.3 → 2.0.0-beta.5

package/bin/build-client.mjs

@@ -0,0 +1,19 @@
+
+import {xeiraBundle} from 'xeira'
+import { cleanFolder } from './util.mjs'
+
+export default async function({ appName, entry, dest }) {
+  console.log(`[${appName}][prod] Building client from entry ${entry}`)
+  cleanFolder(dest)
+
+  // fs.copyFileSync(proot('./cli/index.html'), proot('./build/cli/index.html'))
+  await xeiraBundle({
+    source_index: entry,
+    target: 'browser',
+    bundle_folder: dest,
+    bundle_name: appName,
+    bundle_extension: 'iife.bundle.min',
+    bundler: 'rollup',
+    bundle_node_polyfill: true
+  })
+}

package/bin/build-server.mjs

@@ -0,0 +1,55 @@
+
+import path from 'node:path'
+import { readFile, writeFile} from 'node:fs/promises'
+import { build } from 'vite'
+import {xeiraBundle} from 'xeira'
+import { cleanFolder } from './util.mjs'
+
+export async function _fixProdBuild(appName, filePath) {
+  try {
+    const content = await readFile(filePath, 'utf8')
+    const newContent = content.replace(
+      /var key = crypto\.pseudoRandomBytes\(32\)/g,
+      'var key = crypto.randomBytes(32)'
+    )
+    await writeFile(filePath, newContent, 'utf8')
+    console.log(`[${appName}][prod] Fixed server build (prod)!`)
+  } catch (error) {
+    console.error(`[${appName}][prod] Error fixing server build (prod): ${error}`)
+  }
+}
+
+export default async function({ appName, ssrEntry, ssrDest, entry, dest }) {
+
+  console.log(`[${appName}][prod] Building first the SSR entry ${ssrEntry}`)
+  await build({
+    build: {
+      outDir: path.resolve(process.cwd(), ssrDest),
+      ssr: path.resolve(process.cwd(), ssrEntry),
+      rollupOptions: {
+        // Opciones adicionales de Rollup si las necesitas
+      },
+    },
+    // Otras opciones de Vite si son necesarias
+    // root: path.resolve(process.cwd(), 'demo'), // Si tu root del proyecto es /demo
+    // plugins: [/* tus plugins */],
+  })
+  
+  console.log(`[${appName}][prod] Building server from entry ${entry}`)
+  cleanFolder(dest)
+  
+  const serverExt = 'node.bundle.mjs'
+  await xeiraBundle({
+    source_index: entry,
+    target: 'node',
+    bundle_folder: dest,
+    bundle_name: appName,
+    bundle_extension: serverExt,
+    bundler: 'rollup',
+    bundle_node_polyfill: true,
+  })
+  
+  console.log(`[${appName}][prod] Fixing server build (prod)...`)
+  const destFile =  path.join(process.cwd(), `${dest}/${appName}.${serverExt}`)
+  await _fixProdBuild(appName, destFile)
+}

package/bin/dev.mjs

@@ -0,0 +1,8 @@
+import path from 'node:path'
+
+export default async function({ appName, entry, serverName }) {
+  console.log(`[${appName}][dev] Running DEV server ${serverName} from entry ${entry}`)
+  const srv_module = await import(path.join(process.cwd(), entry))
+  const server = srv_module[serverName]
+  await server()  
+}

package/bin/index.mjs

@@ -0,0 +1,64 @@
+#!/usr/bin/env node
+import yargs from 'yargs-parser'
+import { getAppName } from './util.mjs'
+
+async function main() {
+  const args = yargs(process.argv.slice(2))
+  const command = args._[0]
+
+  try {
+    const appName = await getAppName()
+    const serverName = args['server-name'] || 'miolo_server'
+
+    switch (command) {
+      case 'dev':
+        const devHandler = await import ('./dev.mjs')
+        const devEntry = args.entry || './src/server/server-dev.mjs'
+        const devServerName = args['server-name'] || 'miolo_server'
+        await devHandler({ appName, entry: devEntry, serverName: devServerName })
+        break
+
+      case 'build-client':
+        const buildClientHandler = await import ('./build-client.mjs')
+        const clientEntry = args.entry || './cli/entry-cli.jsx'
+        const clientDest = args.dest || './dist/cli'
+        await buildClientHandler({ appName, entry: clientEntry, dest: clientDest })
+        break
+
+      case 'build-server':
+        const buildServerHandler = await import ('./build-server.mjs')
+        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 })
+        break
+
+      case 'start':
+        const startHandler = await import ('./start.mjs')
+        const startDest = args.dest || './dist/server'
+        await startHandler({appName, serverName, dest: startDest})
+        break
+
+      case 'stop':
+        const stopHandler = await import ('./stop.mjs')
+        await stopHandler({appName})
+        break
+
+      case 'restart':
+        const restartHandler = await import ('./restart.mjs')
+        await restartHandler({appName, serverName})
+        break
+
+      default:
+        console.error(`[miolo] Unknown command: ${command}`)
+        console.log('[miolo] Available commands: dev, build-client, build-server, start, stop, restart')
+        process.exit(1)
+    }
+  } catch (error) {
+    console.error('[miolo] Error during command execution:', error)
+    process.exit(1)
+  }
+}
+
+main()

package/bin/restart.mjs

@@ -0,0 +1,10 @@
+import start from "./start.mjs"
+import stop from "./stop.mjs"
+
+export default async function(appName, dest, serverName) {
+  console.log(`[${appName}][prod][stop] Restarting server...`)
+
+  await stop(appName)
+  await start(appName, dest, serverName)
+
+}

package/bin/start.mjs

@@ -0,0 +1,26 @@
+import path from 'node:path'
+import { pidFileCreate } from "./util.mjs"
+
+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 pid = pidFileCreate(appName)
+  console.log(`[${appName}][prod][start] Starting server. PID is ${pid}...`)
+
+  await server()  
+}

package/bin/stop.mjs

@@ -0,0 +1,20 @@
+import { pidFileRead } from "./util.mjs";
+
+export default async function(appName) {
+  console.log(`[${appName}][prod][stop] Stopping server...`)
+
+  try {
+    const pid = pidFileRead(appName)
+    console.log(`[${appName}][prod][stop] Killing current process with PID ${pid}`)
+
+    process.kill(pid, 'SIGKILL')
+
+    return 1
+  } catch(_) {
+    console.log(`[${appName}][prod][stop] No current process to kill`)
+    console.error(_)
+
+    return 0
+  }  
+
+}

package/bin/util.mjs

@@ -0,0 +1,37 @@
+import {readdirSync, rmSync, writeFileSync, readFileSync} from 'node:fs'
+import { readFile } from 'node:fs/promises'
+import path from 'node:path'
+
+
+export async function getAppName() {
+  try {
+    const packageJsonPath = path.join(process.cwd(), 'package.json')
+    const content = await readFile(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 => {
+    rmSync(`${folder}/${file}`, { recursive: true, force: true });
+  })
+}
+
+
+export function pidFileCreate(appName) {
+  const pidFilePath = `/tmp/${appName}.pid`
+  writeFileSync(pidFilePath, `${process.pid}`, {encoding:'utf8',flag:'w'})
+  return process.pid
+}
+
+export function pidFileRead(appName) {
+  const pidFilePath = `/tmp/${appName}.pid`
+  const pid = readFileSync(pidFilePath, {encoding:'utf8'})
+  return pid
+}
+
+

package/dist/cli/miolo.cli.umd.js

@@ -1,5 +1,5 @@
 /**
- * miolo v2.0.0-beta.3
+ * miolo v2.0.0-beta.4
  *
  * https://www.afialapis.com/os/miolo
  *

package/dist/cli-react/miolo.cli-react.umd.js

@@ -1,5 +1,5 @@
 /**
- * miolo v2.0.0-beta.3
+ * miolo v2.0.0-beta.4
  *
  * https://www.afialapis.com/os/miolo
  *

package/dist/server/miolo.server.node.mjs

@@ -1,5 +1,5 @@
 /**
- * miolo v2.0.0-beta.3
+ * miolo v2.0.0-beta.4
  *
  * https://www.afialapis.com/os/miolo
  *

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "miolo",
-  "version": "2.0.0-beta.3",
+  "version": "2.0.0-beta.5",
   "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"
@@ -30,6 +33,7 @@
     }
   },
   "files": [
+    "bin",
     "src",
     "logo",
     "dist"
@@ -45,27 +49,20 @@
     "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",
@@ -101,7 +98,8 @@
     "socket.io-client": "^4.8.1",
     "tinguir": "^0.0.7",
     "winston": "^3.17.0",
-    "winston-daily-rotate-file": "^5.0.0"
+    "winston-daily-rotate-file": "^5.0.0",
+    "yargs-parser": "^21.1.1"
   },
   "peerDependencies": {
     "react": "^18.3.1",