@fuzionx/framework 0.1.29 → 0.1.30

package/cli/index.js

@@ -1,7 +1,7 @@
 /**
  * CLI — fx 명령어 핸들러
  *
- * fx new <name>                    앱 스캐폴딩
+ * fx make:app <name>               앱 디렉토리 생성
  * fx make:controller <Name>        컨트롤러 생성
  * fx make:service <Name>           서비스 생성
  * fx make:model <Name>             모델 생성
@@ -120,24 +120,9 @@ export async function makeFile(type, name, baseDir = '.', appName) {
 }
 
 // ━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━
-//  fx new <name> — 앱 스캐폴딩
+//  유틸리티
 // ━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━
 
-const APP_FILES = [
-    { tpl: 'app/package.json.tpl', dest: 'package.json' },
-    { tpl: 'app/fuzionx.yaml.tpl', dest: 'fuzionx.yaml' },
-    { tpl: 'app/app.js.tpl', dest: 'app.js' },
-    { tpl: 'app/.env.example.tpl', dest: '.env.example' },
-    { tpl: 'app/.env.example.tpl', dest: '.env' },
-    { tpl: 'app/.gitignore.tpl', dest: '.gitignore' },
-];
-
-/** fuzionx 앱 템플릿 (.tpl 파일은 치환, 그 외는 직접 복사) */
-const FUZIONX_TPL_FILES = [
-    { tpl: 'app/fuzionx/routes/web.js.tpl', dest: 'app/fuzionx/routes/web.js' },
-    { tpl: 'app/fuzionx/routes/api.js.tpl', dest: 'app/fuzionx/routes/api.js' },
-];
-
 /** 디렉토리 재귀 복사 (템플릿 → 프로젝트) */
 async function copyDirRecursive(src, dst) {
     await fs.mkdir(dst, { recursive: true });
@@ -153,91 +138,6 @@ async function copyDirRecursive(src, dst) {
     }
 }
 
-/** 스캐폴딩 디렉토리 (빈 디렉토리 + .gitkeep) */
-const APP_DIRS = [
-    // fuzionx 앱 (개발자 작업 영역)
-    'app/fuzionx/services',
-    'app/fuzionx/middleware',
-    'app/fuzionx/ws',
-    // tester 앱 (빈 폴더가 아닌 것은 copyDirRecursive로 처리)
-    // 인프라
-    'database/migrations',
-    'database/seeds',
-    'storage/logs',
-    'storage/uploads',
-    'public/css',
-    'public/js',
-    'tests',
-];
-
-/**
- * fx new <name> — 앱 스캐폴딩 (fuzionx + tester 2-app 구조)
- * @param {string} name - 프로젝트 이름
- * @param {string} [targetDir] - 기본: ./<name>
- */
-export async function createApp(name, targetDir) {
-    const dir = targetDir || path.resolve(name);
-    const vars = {
-        name,
-        dbName: name.replace(/-/g, '_'),
-    };
-
-    // 빈 디렉토리 생성 (.gitkeep 포함)
-    for (const d of APP_DIRS) {
-        const fullDir = path.join(dir, d);
-        await fs.mkdir(fullDir, { recursive: true });
-        const files = await fs.readdir(fullDir).catch(() => []);
-        if (files.length === 0) {
-            await fs.writeFile(path.join(fullDir, '.gitkeep'), '');
-        }
-    }
-
-    // 루트 템플릿 파일 생성 (.tpl 치환)
-    for (const { tpl, dest } of APP_FILES) {
-        const content = await loadTemplate(tpl, vars);
-        const fullPath = path.join(dir, dest);
-        await fs.mkdir(path.dirname(fullPath), { recursive: true });
-        await fs.writeFile(fullPath, content);
-    }
-
-    // fuzionx 앱 — .tpl 파일 (치환 필요)
-    for (const { tpl, dest } of FUZIONX_TPL_FILES) {
-        const content = await loadTemplate(tpl, vars);
-        const fullPath = path.join(dir, dest);
-        await fs.mkdir(path.dirname(fullPath), { recursive: true });
-        await fs.writeFile(fullPath, content);
-    }
-
-    // fuzionx 앱 — 직접 복사 (controllers, views)
-    const fuzionxSrc = path.join(TPL_DIR, 'app/fuzionx');
-    await copyDirRecursive(
-        path.join(fuzionxSrc, 'controllers'),
-        path.join(dir, 'app/fuzionx/controllers'),
-    );
-    await copyDirRecursive(
-        path.join(fuzionxSrc, 'views'),
-        path.join(dir, 'app/fuzionx/views'),
-    );
-
-    // tester 앱 — 전체 복사
-    const testerSrc = path.join(TPL_DIR, 'app/tester');
-    await copyDirRecursive(testerSrc, path.join(dir, 'app/tester'));
-
-    // shared — 전체 복사
-    const sharedSrc = path.join(TPL_DIR, 'app/shared');
-    await copyDirRecursive(sharedSrc, path.join(dir, 'shared'));
-
-    // database/models — 복사
-    const dbSrc = path.join(TPL_DIR, 'app/database');
-    await copyDirRecursive(dbSrc, path.join(dir, 'database'));
-
-    // locales — 복사
-    const localesSrc = path.join(TPL_DIR, 'app/locales');
-    await copyDirRecursive(localesSrc, path.join(dir, 'locales'));
-
-    return dir;
-}
-
 // ━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━
 //  CLI 엔트리
 // ━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━
@@ -249,14 +149,29 @@ export async function createApp(name, targetDir) {
 export async function run(args) {
     const [command, ...rest] = args;
 
+    // ── fx new → create-fuzionx 안내 ──
     if (command === 'new') {
+        console.log(`\n  프로젝트 생성은 create-fuzionx를 사용하세요:\n`);
+        console.log(`    npx create-fuzionx <name>\n`);
+        return;
+    }
+
+    if (command === 'make:app') {
         const name = rest[0];
-        if (!name) { console.error('Usage: fx new <name>'); process.exit(1); }
-        const dir = await createApp(name);
-        console.log(`✅ Created ${name} at ${dir}`);
-        console.log(`\n   cd ${name}`);
-        console.log(`   npm install`);
-        console.log(`   npm run dev\n`);
+        if (!name) { console.error('Usage: fx make:app <appName>'); process.exit(1); }
+        const appDir = path.join('.', 'app', name);
+        // 빈 디렉토리 생성
+        for (const d of ['services', 'middleware', 'ws']) {
+            const fullDir = path.join(appDir, d);
+            await fs.mkdir(fullDir, { recursive: true });
+            await fs.writeFile(path.join(fullDir, '.gitkeep'), '');
+        }
+        // 기본 파일 복사 (HomeController, routes, views)
+        const appTplDir = path.join(TPL_DIR, 'make/app');
+        await copyDirRecursive(appTplDir, appDir);
+        console.log(`✅ Created app/${name}/`);
+        console.log(`\n   fuzionx.yaml의 apps에 추가하세요:`);
+        console.log(`   "127.0.0.1:49080": ${name}\n`);
         return;
     }
 
@@ -284,6 +199,69 @@ export async function run(args) {
         return;
     }
 
+    // ── fx stop — 서버 종료 ──
+    if (command === 'stop') {
+        const pidFile = path.resolve('fuzionx.pid');
+        try {
+            const pid = parseInt(await fs.readFile(pidFile, 'utf-8'), 10);
+            console.log(`🛑 Stopping PID ${pid}...`);
+            process.kill(pid, 'SIGTERM');
+            for (let i = 0; i < 50; i++) {
+                await new Promise(r => setTimeout(r, 100));
+                try { process.kill(pid, 0); } catch { break; }
+            }
+            await fs.unlink(pidFile).catch(() => {});
+            console.log('✅ Server stopped.');
+        } catch (err) {
+            if (err.code === 'ENOENT') {
+                console.log('⚠️  fuzionx.pid 없음 — 서버가 실행 중이 아닙니다.');
+            } else if (err.code === 'ESRCH') {
+                await fs.unlink(pidFile).catch(() => {});
+                console.log('⚠️  PID 프로세스가 이미 종료됨. PID 파일 삭제.');
+            } else {
+                console.error('❌ 종료 실패:', err.message);
+            }
+        }
+        return;
+    }
+
+    // ── fx restart — 서버 재시작 ──
+    if (command === 'restart') {
+        const pidFile = path.resolve('fuzionx.pid');
+        try {
+            const pid = parseInt(await fs.readFile(pidFile, 'utf-8'), 10);
+            console.log(`🔄 Stopping PID ${pid}...`);
+            process.kill(pid, 'SIGTERM');
+            for (let i = 0; i < 50; i++) {
+                await new Promise(r => setTimeout(r, 100));
+                try { process.kill(pid, 0); } catch { break; }
+            }
+        } catch (err) {
+            if (err.code === 'ENOENT') {
+                console.log('⚠️  fuzionx.pid 없음 — 새로 시작합니다.');
+            } else if (err.code === 'ESRCH') {
+                console.log('⚠️  PID 프로세스가 이미 종료됨.');
+            } else {
+                console.error('❌ 종료 실패:', err.message);
+            }
+        }
+        // 백그라운드로 재시작
+        const { spawn } = await import('node:child_process');
+        const logDir = path.resolve('storage/logs');
+        await fs.mkdir(logDir, { recursive: true });
+        const logFile = path.join(logDir, 'server.log');
+        const { openSync } = await import('node:fs');
+        const out = openSync(logFile, 'a');
+        const child = spawn('node', ['app.js'], {
+            cwd: process.cwd(),
+            detached: true,
+            stdio: ['ignore', out, out],
+        });
+        child.unref();
+        console.log(`🚀 Restarted (PID ${child.pid}) — logs: storage/logs/server.log`);
+        return;
+    }
+
     // ── fx test — 테스트 실행 ──
     if (command === 'test') {
         const { execSync } = await import('node:child_process');
@@ -357,7 +335,8 @@ export async function run(args) {
     }
 
     console.log(`
-  fx new <name>                    Create new app (multi-app structure)
+  npx create-fuzionx <name>         Create new project
+  fx make:app <name>               Create new app directory structure
   fx make:controller <Name> --app=  Create controller (app-specific)
   fx make:service <Name> --app=     Create service (app-specific)
   fx make:model <Name>              Create model (database/models)
@@ -369,6 +348,8 @@ export async function run(args) {
   fx make:worker <Name>             Create worker (shared/workers)
   fx make:test <Name>               Create test
   fx dev                            Start dev server (--watch)
+  fx stop                            Stop server (graceful)
+  fx restart                         Restart server (graceful)
   fx test                           Run tests
   fx routes                         Print route table
   fx config                         Print fuzionx.yaml

package/cli/templates/{app/fuzionx → make/app}/controllers/HomeController.js

@@ -7,6 +7,7 @@ import { Controller } from '@fuzionx/framework';
 export default class HomeController extends Controller {
 
     /** 홈 페이지 */
+    static index;
     async index(ctx) {
         ctx.render('home');
     }

package/cli/templates/{app/tester → make/app}/views/default/errors/404.html

@@ -6,10 +6,6 @@
 <div style="text-align:center;padding:80px 20px;">
     <h1 style="font-size:72px;color:#e74c3c;">{{ error.code }}</h1>
     <p style="font-size:20px;margin:16px 0;">{{ error.message }}</p>
-    <p style="color:#888;">요청: {{ request.url }}</p>
-    {% if config.debug %}
-        <pre style="text-align:left;max-width:600px;margin:24px auto;background:#f5f5f5;padding:16px;border-radius:8px;overflow:auto;">{{ error.stack }}</pre>
-    {% endif %}
     <a href="/" style="display:inline-block;margin-top:24px;padding:12px 24px;background:#e74c3c;color:#fff;text-decoration:none;border-radius:6px;">홈으로 돌아가기</a>
 </div>
 {% endblock %}

package/cli/templates/{app/fuzionx/views/default/errors/404.html → make/app/views/default/errors/500.html}

@@ -1,12 +1,11 @@
 {% extends "layouts/main.html" %}
 
-{% block title %}404 — 찾을 수 없습니다{% endblock %}
+{% block title %}500 — 서버 오류{% endblock %}
 
 {% block content %}
 <div style="text-align:center;padding:80px 20px;">
     <h1 style="font-size:72px;color:#e74c3c;">{{ error.code }}</h1>
     <p style="font-size:20px;margin:16px 0;">{{ error.message }}</p>
-    <p style="color:#888;">요청: {{ request.url }}</p>
     {% if config.debug %}
         <pre style="text-align:left;max-width:600px;margin:24px auto;background:#f5f5f5;padding:16px;border-radius:8px;overflow:auto;">{{ error.stack }}</pre>
     {% endif %}

package/cli/templates/make/app/views/default/pages/home.html

@@ -0,0 +1,11 @@
+{% extends "layouts/main.html" %}
+
+{% block title %}Welcome{% endblock %}
+
+{% block content %}
+<div style="text-align:center;padding:80px 20px;">
+    <h1 style="font-size:48px;color:#333;">🚀 Welcome</h1>
+    <p style="font-size:18px;color:#666;margin:16px 0;">Your new app is ready.</p>
+    <p style="color:#999;font-size:14px;">Edit <code style="background:#f0f0f0;padding:2px 8px;border-radius:4px;">routes/web.js</code> to get started</p>
+</div>
+{% endblock %}

package/lib/core/Application.js

@@ -8,6 +8,7 @@
  * @see docs/framework/04-bootstrap-lifecycle.md
  */
 import path from 'node:path';
+import { promises as fs } from 'node:fs';
 import Config from './Config.js';
 import Context from './Context.js';
 import Router from '../http/Router.js';
@@ -427,10 +428,12 @@ export default class Application {
 
         if (!this._booted) await this.boot();
 
-        // 포트 사용 여부 확인 — primary에서만 (워커는 SO_REUSEPORT로 공유)
+        // PID 파일 생성 (primary만)
         const cluster = await import('node:cluster');
         if (!cluster.default?.isWorker) {
             await this._checkPort(port);
+            const pidPath = path.join(this.baseDir, 'fuzionx.pid');
+            await fs.writeFile(pidPath, String(process.pid));
         }
 
         await this.emit('ready');

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fuzionx/framework",
-  "version": "0.1.29",
+  "version": "0.1.30",
   "type": "module",
   "description": "Full-stack MVC framework built on @fuzionx/core — Controller, Service, Model, Middleware, DI, EventBus",
   "main": "index.js",
@@ -34,7 +34,7 @@
     "url": "https://github.com/saytohenry/fuzionx"
   },
   "dependencies": {
-    "@fuzionx/core": "^0.1.29",
+    "@fuzionx/core": "^0.1.30",
     "better-sqlite3": "^12.8.0",
     "knex": "^3.2.5",
     "mongoose": "^9.3.2",

package/cli/templates/app/.env.example.tpl

@@ -1,14 +0,0 @@
-# .env — 이 파일을 .env로 복사 후 값을 채우세요
-
-# Database
-DB_HOST=127.0.0.1
-DB_PORT=3306
-DB_USER=root
-DB_PASSWORD=
-DB_NAME={{dbName}}
-
-# Auth
-JWT_SECRET=
-
-# Redis (세션/큐 공용)
-REDIS_URL=

package/cli/templates/app/.gitignore.tpl

@@ -1,4 +0,0 @@
-.env
-node_modules/
-storage/logs/
-storage/uploads/

package/cli/templates/app/app.js.tpl

@@ -1,6 +0,0 @@
-import { Application } from '@fuzionx/framework';
-
-const app = new Application({ configPath: './fuzionx.yaml' });
-
-await app.boot();
-await app.listen();

package/cli/templates/app/database/models/User.js

@@ -1,9 +0,0 @@
-import { MariaModel } from '@fuzionx/framework';
-
-export default class User extends MariaModel {
-    static table = 'users';
-    static connection = 'main';
-    static softDelete = true;
-    static hidden = ['password'];
-    static fillable = ['name', 'email', 'password', 'role'];
-}

package/cli/templates/app/fuzionx/views/default/errors/500.html

@@ -1,14 +0,0 @@
-{% extends "layouts/main.html" %}
-
-{% block title %}500 — 서버 오류{% endblock %}
-
-{% block content %}
-<div style="text-align:center;padding:80px 20px;">
-    <h1 style="font-size:72px;color:#e74c3c;">500</h1>
-    <p style="font-size:20px;margin:16px 0;">{{ error.message | default(value='Internal Server Error') }}</p>
-    {% if config.debug and error.stack %}
-        <pre style="text-align:left;max-width:600px;margin:24px auto;background:#f5f5f5;padding:16px;border-radius:8px;overflow:auto;">{{ error.stack }}</pre>
-    {% endif %}
-    <a href="/" style="display:inline-block;margin-top:24px;padding:12px 24px;background:#e74c3c;color:#fff;text-decoration:none;border-radius:6px;">홈으로 돌아가기</a>
-</div>
-{% endblock %}

package/cli/templates/app/fuzionx/views/default/pages/home.html

@@ -1,188 +0,0 @@
-<!DOCTYPE html>
-<html lang="ko">
-<head>
-    <meta charset="UTF-8">
-    <meta name="viewport" content="width=device-width, initial-scale=1.0">
-    <title>FuzionX</title>
-    <style>
-        * { margin: 0; padding: 0; box-sizing: border-box; }
-        @import url('https://fonts.googleapis.com/css2?family=Inter:wght@300;400;600;800&display=swap');
-
-        body {
-            font-family: 'Inter', system-ui, -apple-system, sans-serif;
-            min-height: 100vh;
-            display: flex;
-            align-items: center;
-            justify-content: center;
-            background: linear-gradient(135deg, #0f0c29 0%, #1a1a3e 40%, #24243e 100%);
-            color: #e0e0e0;
-            overflow: hidden;
-        }
-
-        .container {
-            text-align: center;
-            z-index: 1;
-            animation: fadeInUp 0.8s ease-out;
-        }
-
-        .logo {
-            font-size: 4rem;
-            font-weight: 800;
-            background: linear-gradient(135deg, #667eea 0%, #764ba2 50%, #f093fb 100%);
-            -webkit-background-clip: text;
-            background-clip: text;
-            -webkit-text-fill-color: transparent;
-            letter-spacing: -2px;
-            margin-bottom: 0.5rem;
-        }
-
-        .subtitle {
-            font-size: 1.1rem;
-            font-weight: 300;
-            color: rgba(255, 255, 255, 0.5);
-            margin-bottom: 2.5rem;
-            letter-spacing: 2px;
-        }
-
-        .card {
-            background: rgba(255, 255, 255, 0.05);
-            backdrop-filter: blur(20px);
-            border: 1px solid rgba(255, 255, 255, 0.1);
-            border-radius: 16px;
-            padding: 2rem 3rem;
-            max-width: 480px;
-            margin: 0 auto 2rem;
-        }
-
-        .version {
-            display: inline-block;
-            background: linear-gradient(135deg, #667eea, #764ba2);
-            color: white;
-            padding: 4px 14px;
-            border-radius: 20px;
-            font-size: 0.75rem;
-            font-weight: 600;
-            letter-spacing: 1px;
-            margin-bottom: 1.5rem;
-        }
-
-        .features {
-            display: grid;
-            grid-template-columns: 1fr 1fr;
-            gap: 1rem;
-            text-align: left;
-            margin-top: 1.5rem;
-        }
-
-        .feature {
-            display: flex;
-            align-items: center;
-            gap: 8px;
-            font-size: 0.85rem;
-            color: rgba(255, 255, 255, 0.7);
-        }
-
-        .feature span {
-            font-size: 1.1rem;
-        }
-
-        .links {
-            display: flex;
-            gap: 1rem;
-            justify-content: center;
-            margin-top: 1rem;
-        }
-
-        .links a {
-            color: rgba(255, 255, 255, 0.6);
-            text-decoration: none;
-            font-size: 0.85rem;
-            padding: 8px 20px;
-            border: 1px solid rgba(255, 255, 255, 0.15);
-            border-radius: 8px;
-            transition: all 0.3s ease;
-        }
-
-        .links a:hover {
-            color: #fff;
-            border-color: #667eea;
-            background: rgba(102, 126, 234, 0.1);
-            transform: translateY(-2px);
-        }
-
-        .hint {
-            margin-top: 2rem;
-            font-size: 0.75rem;
-            color: rgba(255, 255, 255, 0.3);
-        }
-
-        .hint code {
-            background: rgba(255, 255, 255, 0.08);
-            padding: 2px 8px;
-            border-radius: 4px;
-            font-family: 'JetBrains Mono', monospace;
-        }
-
-        /* Background orbs */
-        .orb {
-            position: fixed;
-            border-radius: 50%;
-            filter: blur(80px);
-            opacity: 0.3;
-            animation: float 8s ease-in-out infinite;
-        }
-        .orb-1 { width: 400px; height: 400px; background: #667eea; top: -100px; right: -100px; }
-        .orb-2 { width: 300px; height: 300px; background: #764ba2; bottom: -80px; left: -80px; animation-delay: -4s; }
-        .orb-3 { width: 200px; height: 200px; background: #f093fb; top: 50%; left: 60%; animation-delay: -2s; }
-
-        @keyframes fadeInUp {
-            from { opacity: 0; transform: translateY(30px); }
-            to { opacity: 1; transform: translateY(0); }
-        }
-
-        @keyframes float {
-            0%, 100% { transform: translate(0, 0); }
-            50% { transform: translate(30px, -30px); }
-        }
-
-        @media (max-width: 600px) {
-            .logo { font-size: 2.5rem; }
-            .card { padding: 1.5rem; margin: 0 1rem; }
-            .features { grid-template-columns: 1fr; }
-        }
-    </style>
-</head>
-<body>
-    <div class="orb orb-1"></div>
-    <div class="orb orb-2"></div>
-    <div class="orb orb-3"></div>
-
-    <div class="container">
-        <h1 class="logo">FuzionX</h1>
-        <p class="subtitle">HIGH-PERFORMANCE NODE.JS FRAMEWORK</p>
-
-        <div class="card">
-            <div class="version">v0.1.0 · POWERED BY RUST</div>
-
-            <div class="features">
-                <div class="feature"><span>⚡</span> 500K+ RPS</div>
-                <div class="feature"><span>🦀</span> Rust N-API Bridge</div>
-                <div class="feature"><span>🎯</span> MVC Architecture</div>
-                <div class="feature"><span>🔌</span> WebSocket</div>
-                <div class="feature"><span>🗄️</span> Multi-DB ORM</div>
-                <div class="feature"><span>🔐</span> Auth & Session</div>
-                <div class="feature"><span>📡</span> Event System</div>
-                <div class="feature"><span>⏰</span> Job Scheduler</div>
-            </div>
-        </div>
-
-        <div class="links">
-            <a href="https://github.com/saytohenry/fuzionx">GitHub</a>
-            <a href="/docs">API Docs</a>
-            <a href="/api/health">Health Check</a>
-        </div>
-
-        <p class="hint">Edit <code>routes/web.js</code> to get started</p>
-    </div>
-</body>
-</html>