@fuzionx/framework 0.1.37 → 0.1.39

package/lib/core/Application.js

@@ -349,6 +349,14 @@ export default class Application {
         this._registerDocsRoutes();
 
         this._booted = true;
+
+        // hostname → appName 매핑 사전 계산 (매 요청 O(1) 조회)
+        this._hostAppMap = new Map();
+        const appsConfig = this.config.get('apps') || {};
+        for (const [hostname, appName] of Object.entries(appsConfig)) {
+            this._hostAppMap.set(hostname, appName);
+        }
+
         await this.emit('booted');
     }
 
@@ -388,13 +396,12 @@ export default class Application {
             || headers?.['x-original-host'] || headers?.['X-Original-Host'];
         const rawHost = forwardedHost || host || '';
         const hostname = rawHost.split(':')[0]; // 포트 제거
-        const appsConfig = this.config.get('apps') || {};
-
 
+        // 사전 계산된 Map O(1) 조회
+        const mapped = this._hostAppMap?.get(hostname);
+        if (mapped) return mapped;
 
-        // 정확한 도메인 매칭
-        if (appsConfig[hostname]) return appsConfig[hostname];
-        // 매칭 없으면 첫 번째 앱 (기본)
+        // 매칭 없으면 기본 앱
         return this._getDefaultAppName();
     }
 
@@ -682,7 +689,7 @@ export default class Application {
                 const inst = new HandlerClass(this);
 
                 wsNs.on('connect', (socket) => {
-                    console.log(`[WS] connect: ${namespace} sid=${socket.sessionId}`);
+                    this.logger.debug(`[WS] connect: ${namespace} sid=${socket.sessionId}`);
                     inst.onConnect(socket);
                 });
 
@@ -692,7 +699,7 @@ export default class Application {
                     catch { parsed = { type: 'message', data: rawMessage }; }
                     const eventType = parsed.type || 'message';
                     const eventData = parsed.data || parsed;
-                    console.log(`[WS] msg: ${namespace} type=${eventType} sid=${socket.sessionId}`);
+                    this.logger.debug(`[WS] msg: ${namespace} type=${eventType} sid=${socket.sessionId}`);
                     const entry = eventMap.get(eventType);
                     if (entry) {
                         const result = entry.handler.call(inst, socket, eventData);
@@ -708,11 +715,11 @@ export default class Application {
                 });
 
                 wsNs.on('disconnect', (socket) => {
-                    console.log(`[WS] disconnect: ${namespace} sid=${socket.sessionId}`);
+                    this.logger.debug(`[WS] disconnect: ${namespace} sid=${socket.sessionId}`);
                     inst.onDisconnect(socket);
                 });
 
-                console.log(`[WS] 핸들러 등록: ${namespace} (events: ${[...eventMap.keys()].join(', ')})`);
+                this.logger.info(`[WS] 핸들러 등록: ${namespace} (events: ${[...eventMap.keys()].join(', ')})`);
             }
         }
     }
@@ -808,6 +815,7 @@ export default class Application {
     /**
      * 단일 라우트의 Bridge 핸들러 생성 (앱별)
      * rawReq → Context → middleware → controller → toResponse
+     * @deprecated _createDispatchHandler를 사용하세요. 이 메서드는 테스트 호환용으로만 유지됩니다.
      * @param {object} route
      * @param {string} appName - 이 라우트가 속한 앱
      * @private

package/lib/core/Context.js

@@ -11,6 +11,7 @@
  * @see packages/fuzionx/lib/context.js (Core SessionProto 참조)
  */
 import AppError, { ValidationError } from '../core/AppError.js';
+import { readFileSync } from 'node:fs';
 
 export default class Context {
     /**
@@ -234,26 +235,50 @@ export default class Context {
 
     /**
      * 파일 다운로드 (06-context.md)
-     * @param {string} filePath
+     * Bridge는 문자열 body만 지원하므로 파일 내용을 직접 읽어 base64 전송.
+     * @param {string} filePath - 절대 경로
      * @param {string} [filename]
      */
     download(filePath, filename) {
         const name = filename || filePath.split('/').pop();
         this._headers['Content-Disposition'] = `attachment; filename="${name}"`;
-        this._body = filePath; // Application에서 파일 전송 처리
+        try {
+            const buf = readFileSync(filePath);
+            this._body = buf.toString('base64');
+            this._headers['Content-Transfer-Encoding'] = 'base64';
+            this._headers['Content-Type'] = this._headers['Content-Type'] || 'application/octet-stream';
+        } catch (err) {
+            this._statusCode = 404;
+            this._body = JSON.stringify({ error: `File not found: ${name}` });
+            this._headers['Content-Type'] = 'application/json';
+        }
         this._sent = true;
         return this;
     }
 
     /**
      * 스트리밍 응답 (06-context.md)
-     * 대용량 응답 시 ReadableStream/Buffer를 직접 전송.
-     * @param {ReadableStream|Buffer} readableStream
+     * Bridge는 문자열 body만 지원하므로 Buffer/Stream을 문자열로 변환.
+     * Buffer → toString(), ReadableStream → 청크 수집.
+     * @param {ReadableStream|Buffer|string} readableStream
      * @param {string} [contentType='application/octet-stream']
      */
-    stream(readableStream, contentType = 'application/octet-stream') {
+    async stream(readableStream, contentType = 'application/octet-stream') {
         this._headers['Content-Type'] = contentType;
-        this._streamBody = readableStream;
+        if (Buffer.isBuffer(readableStream)) {
+            this._body = readableStream.toString();
+        } else if (typeof readableStream === 'string') {
+            this._body = readableStream;
+        } else if (readableStream && typeof readableStream[Symbol.asyncIterator] === 'function') {
+            // ReadableStream/AsyncIterable → 청크 수집
+            const chunks = [];
+            for await (const chunk of readableStream) {
+                chunks.push(Buffer.isBuffer(chunk) ? chunk : Buffer.from(chunk));
+            }
+            this._body = Buffer.concat(chunks).toString();
+        } else {
+            this._body = String(readableStream || '');
+        }
         this._sent = true;
         return this;
     }
@@ -452,9 +477,8 @@ export default class Context {
         }
         return {
             status: this._statusCode,
-            body: this._streamBody || this._body,
+            body: this._body,
             headers: this._headers,
-            stream: !!this._streamBody,
         };
     }
 }

package/lib/database/SqlQueryBuilder.js

@@ -216,25 +216,36 @@ export default class SqlQueryBuilder extends QueryBuilder {
 
         for (const w of this._wheres) {
             const safeKey = SqlQueryBuilder._sanitizeName(w.key);
-            const prefix = parts.length > 0
-                ? (w.type === 'or' ? ' OR ' : ' AND ')
-                : '';
+            let expr;
 
             if (w.op === 'IN') {
                 const placeholders = w.value.map(() => '?').join(', ');
-                parts.push(`${prefix}${safeKey} IN (${placeholders})`);
+                expr = `${safeKey} IN (${placeholders})`;
                 params.push(...w.value);
             } else if (w.op === 'IS NULL') {
-                parts.push(`${prefix}${safeKey} IS NULL`);
+                expr = `${safeKey} IS NULL`;
             } else if (w.op === 'IS NOT NULL') {
-                parts.push(`${prefix}${safeKey} IS NOT NULL`);
+                expr = `${safeKey} IS NOT NULL`;
             } else {
-                parts.push(`${prefix}${safeKey} ${w.op} ?`);
+                expr = `${safeKey} ${w.op} ?`;
                 params.push(w.value);
             }
+
+            if (w.type === 'or' && parts.length > 0) {
+                // OR 조건: 이전 항목과 괄호로 그룹핑
+                const prev = parts.pop();
+                // 이전 항목이 이미 괄호 그룹이면 내부에 추가
+                if (prev.startsWith('(') && prev.endsWith(')')) {
+                    parts.push(`${prev.slice(0, -1)} OR ${expr})`);
+                } else {
+                    parts.push(`(${prev} OR ${expr})`);
+                }
+            } else {
+                parts.push(expr);
+            }
         }
 
-        const whereClause = parts.length > 0 ? ` WHERE ${parts.join('')}` : '';
+        const whereClause = parts.length > 0 ? ` WHERE ${parts.join(' AND ')}` : '';
         return { whereClause, whereParams: params };
     }
 

package/lib/helpers/Logger.js

@@ -56,10 +56,11 @@ export default class Logger {
         // Error 객체면 전체 스택 포함
         const isErr = message instanceof Error;
         const text = isErr ? (message.stack || `${message}`) : `${message}`;
-        const msg = context ? `${text} ${JSON.stringify(context)}` : text;
 
-        // ── Bridge N-API 위임 ──
+        // ── Bridge N-API 위임 (context 결합은 Bridge 경로에서만) ──
         if (this._bridge) {
+            // Bridge는 단일 문자열만 받으므로 여기서만 concat
+            const msg = context ? `${text} ${JSON.stringify(context)}` : text;
             try {
                 if (level === 'info' && typeof this._bridge.logInfo === 'function') {
                     this._bridge.logInfo(this._prefix, msg);
@@ -88,13 +89,15 @@ export default class Logger {
                 timestamp,
                 level,
                 target: this._prefix,
-                message: msg,
+                message: text,
                 ...(context || {}),
             };
             console[level === 'debug' ? 'log' : level](JSON.stringify(entry));
         } else {
             const levelTag = level.toUpperCase().padEnd(5);
-            const fullMsg = `${timestamp}  ${levelTag}  [${this._prefix}] ${msg}`;
+            const fullMsg = context
+                ? `${timestamp}  ${levelTag}  [${this._prefix}] ${text}`
+                : `${timestamp}  ${levelTag}  [${this._prefix}] ${text}`;
             if (context && Object.keys(context).length > 0) {
                 console[level === 'debug' ? 'log' : level](fullMsg, context);
             } else {

package/lib/http/Validation.js

@@ -39,9 +39,10 @@ export function parseRules(rules, Joi) {
                 case 'max':
                     schema = schema.max(Number(args[0])); break;
                 case 'email':
-                    schema = Joi.string().email(); break;
+                    // 기존 schema가 Joi.any()면 string()으로 교체, 이미 string()이면 유지
+                    schema = (schema.type === 'any' ? Joi.string() : schema).email(); break;
                 case 'url':
-                    schema = Joi.string().uri(); break;
+                    schema = (schema.type === 'any' ? Joi.string() : schema).uri(); break;
                 case 'in':
                     schema = schema.valid(...args[0].split(',')); break;
                 case 'integer':
@@ -49,9 +50,9 @@ export function parseRules(rules, Joi) {
                 case 'positive':
                     schema = schema.positive ? schema.positive() : Joi.number().positive(); break;
                 case 'date':
-                    schema = Joi.date(); break;
+                    schema = schema.type === 'any' ? Joi.date() : schema; break;
                 case 'alpha':
-                    schema = Joi.string().alphanum(); break;
+                    schema = (schema.type === 'any' ? Joi.string() : schema).alphanum(); break;
                 default:
                     // 알 수 없는 규칙은 무시
                     break;

package/lib/schedule/Queue.js

@@ -69,11 +69,12 @@ export default class Queue {
             const task = new TaskClass(this.app);
 
             try {
+                let timer;
                 await Promise.race([
-                    task.handle(job.data),
-                    new Promise((_, reject) =>
-                        setTimeout(() => reject(new Error(`Task timeout (${timeout}ms)`)), timeout)
-                    ),
+                    task.handle(job.data).finally(() => clearTimeout(timer)),
+                    new Promise((_, reject) => {
+                        timer = setTimeout(() => reject(new Error(`Task timeout (${timeout}ms)`)), timeout);
+                    }),
                 ]);
             } catch (err) {
                 job.retries++;

package/lib/schedule/Scheduler.js

@@ -48,11 +48,12 @@ export default class Scheduler {
             const runJob = async () => {
                 const job = new JobClass(this.app);
                 try {
+                    let timer;
                     await Promise.race([
-                        job.handle(),
-                        new Promise((_, reject) =>
-                            setTimeout(() => reject(new Error(`Job timeout (${timeout}ms)`)), timeout)
-                        ),
+                        job.handle().finally(() => clearTimeout(timer)),
+                        new Promise((_, reject) => {
+                            timer = setTimeout(() => reject(new Error(`Job timeout (${timeout}ms)`)), timeout);
+                        }),
                     ]);
                 } catch (err) {
                     if (typeof job.onError === 'function') {

package/lib/schedule/WorkerPool.js

@@ -142,12 +142,12 @@ export default class WorkerPool {
             let timer;
             let settled = false;
 
-            const settle = (fn, value) => {
+            const settle = (cb, value) => {
                 if (settled) return;
                 settled = true;
                 clearTimeout(timer);
                 this._activeWorkers.delete(worker);
-                fn(value);
+                cb(value);
             };
 
             worker.on('message', (result) => settle(resolve, result));

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fuzionx/framework",
-  "version": "0.1.37",
+  "version": "0.1.39",
   "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.37",
+    "@fuzionx/core": "^0.1.39",
     "better-sqlite3": "^12.8.0",
     "knex": "^3.2.5",
     "mongoose": "^9.3.2",

package/cli/fx.js

@@ -1,3 +0,0 @@
-#!/usr/bin/env node
-import { run } from './index.js';
-run(process.argv.slice(2));