create-hest-app 0.1.5 → 0.1.7

package/templates/base_scalar/package.json

@@ -30,11 +30,11 @@
   "author": "aqz236",
   "license": "MIT",
   "dependencies": {
-    "@hestjs/core": "^0.1.10",
+    "@hestjs/core": "^0.2.0",
     "@hestjs/logger": "^0.1.5",
-    "@hestjs/scalar": "^0.1.4",
+    "@hestjs/scalar": "^0.1.6",
     "@hestjs/validation": "^0.1.5",
-    "hono": "^4.8.9",
+    "hono": "^4.8.10",
     "reflect-metadata": "^0.2.2"
   },
   "devDependencies": {

package/templates/base_scalar/src/app.controller.ts

@@ -1,4 +1,4 @@
-import { Controller, Get, NotFoundException, Param, Post } from '@hestjs/core';
+import { Controller, Get, Param, Post } from '@hestjs/core';
 import {
   ApiBody,
   ApiOperation,
@@ -106,7 +106,9 @@ export class AppController {
   getUser(@Param('id') id: string) {
     const user = this.appService.getUser(id);
     if (!user) {
-      throw new NotFoundException(`User with id ${id} not found`);
+      const error = new Error(`User with id ${id} not found`) as Error & { status: number };
+      error.status = 404;
+      throw error;
     }
     return user;
   }

package/templates/base_scalar/src/common/middleware/index.ts

@@ -0,0 +1,68 @@
+import type { Context, Next } from 'hono';
+import { logger } from '@hestjs/logger';
+
+/**
+ * Hono 异常处理中间件
+ * 替代原来的全局异常过滤器
+ */
+export const exceptionMiddleware = async (c: Context, next: Next) => {
+  try {
+    await next();
+  } catch (error: unknown) {
+    const err = error as any;
+    const status = err.status || 500;
+    const response = {
+      statusCode: status,
+      timestamp: new Date().toISOString(),
+      path: c.req.url,
+      message: err.message || 'Internal Server Error',
+      error: err.error || 'Exception',
+    };
+
+    logger.error(`🔥 HTTP Exception [${status}]: ${err.message}`, {
+      requestUrl: c.req.url,
+      stack: err.stack,
+    });
+
+    return c.json(response, status);
+  }
+};
+
+/**
+ * 响应包装中间件
+ * 替代原来的响应拦截器
+ */
+export const responseMiddleware = async (c: Context, next: Next) => {
+  const start = Date.now();
+  
+  await next();
+  
+  // 跳过文档相关的路径
+  if (c.req.path === '/openapi.json' || c.req.path === '/docs' || c.req.path.startsWith('/api-docs')) {
+    return;
+  }
+  
+  // 只包装JSON响应，且响应状态为2xx
+  const contentType = c.res.headers.get('content-type');
+  if (contentType?.includes('application/json') && c.res.status >= 200 && c.res.status < 300) {
+    try {
+      const duration = Date.now() - start;
+      
+      // 克隆响应以避免消耗原始响应体
+      const responseClone = c.res.clone();
+      const originalResponse = await responseClone.json();
+      
+      const wrappedResponse = {
+        success: true,
+        data: originalResponse,
+        timestamp: new Date().toISOString(),
+        duration: `${duration}ms`,
+      };
+      
+      return c.json(wrappedResponse);
+    } catch (error) {
+      // 如果无法解析JSON，就保持原响应
+      console.warn('Failed to wrap response:', error);
+    }
+  }
+};

package/templates/base_scalar/src/index.ts

@@ -1,26 +1,23 @@
 import { HestFactory } from '@hestjs/core';
 import { logger } from '@hestjs/logger';
 import '@hestjs/scalar'; // 导入scalar扩展
-import { ValidationInterceptor } from '@hestjs/validation';
+import { Hono } from 'hono';
 import { cors } from 'hono/cors';
 import { AppModule } from './app.module';
-import { HttpExceptionFilter } from './common/filters/http-exception.filter';
-import { ResponseInterceptor } from './common/interceptors/response.interceptor';
+import { exceptionMiddleware, responseMiddleware } from './common/middleware';
 
 async function bootstrap() {
   try {
     logger.info('🚀 Starting HestJS application...');
 
-    const app = await HestFactory.create(AppModule);
-    app.hono().use(cors()); // 使用 Hono 的 CORS 中间件
-    // app.hono().use('*', log()); // 使用 Hono 的日志中间件
+    // 创建 Hono 实例
+    const hono = new Hono();
+    hono.use(cors()); // 使用 Hono 的 CORS 中间件
+    hono.use('*', exceptionMiddleware); // 使用异常处理中间件替代全局过滤器
+    hono.use('*', responseMiddleware); // 使用响应包装中间件替代拦截器
+    // hono.use('*', log()); // 使用 Hono 的日志中间件
 
-    // 全局拦截器 - 验证拦截器应该在响应拦截器之前
-    app.useGlobalInterceptors(new ValidationInterceptor());
-    app.useGlobalInterceptors(new ResponseInterceptor());
-
-    // 全局异常过滤器
-    app.useGlobalFilters(new HttpExceptionFilter());
+    const app = await HestFactory.create(hono, AppModule);
 
     // 设置OpenAPI规范端点
     app.useSwagger(
@@ -53,9 +50,11 @@ async function bootstrap() {
 
     Bun.serve({
       port: 3002,
-      fetch: app.hono().fetch,
+      fetch: hono.fetch,
       reusePort: true, // 启用端口复用
     });
+
+    logger.info(`🎉 Server is running on http://localhost:3002`);
   } catch (error) {
     logger.error('❌ Failed to start application:', error);
     process.exit(1);

package/templates/cqrs/package.json

@@ -30,9 +30,9 @@
   "author": "aqz236",
   "license": "MIT",
   "dependencies": {
-    "@hestjs/core": "^0.1.10",
+    "@hestjs/core": "^0.2.0",
     "@hestjs/validation": "^0.1.5",
-    "@hestjs/cqrs": "^0.1.3",
+    "@hestjs/cqrs": "^0.1.5",
     "hono": "^4.8.9",
     "reflect-metadata": "^0.2.2"
   },

package/templates/cqrs/src/common/middleware/index.ts

@@ -0,0 +1,73 @@
+import type { Context, Next } from 'hono';
+import type { StatusCode } from 'hono/utils/http-status';
+import { logger } from '@hestjs/logger';
+
+/**
+ * Hono 异常处理中间件
+ */
+export const exceptionMiddleware = async (c: Context, next: Next) => {
+  try {
+    await next();
+  } catch (error: unknown) {
+    const err = error as { status?: number; message?: string; error?: string; stack?: string };
+    const statusCode = err.status || 500;
+    
+    const validStatus: StatusCode = (statusCode >= 100 && statusCode < 600) 
+      ? statusCode as StatusCode 
+      : 500;
+    
+    const response = {
+      statusCode: validStatus,
+      timestamp: new Date().toISOString(),
+      path: c.req.url,
+      message: err.message || 'Internal Server Error',
+      error: err.error || 'Exception',
+    };
+
+    logger.error(`🔥 HTTP Exception [${validStatus}]: ${err.message}`, {
+      requestUrl: c.req.url,
+      stack: err.stack,
+    });
+
+    c.status(validStatus);
+    return c.json(response);
+  }
+};
+
+/**
+ * 响应包装中间件
+ */
+export const responseMiddleware = async (c: Context, next: Next) => {
+  const start = Date.now();
+  
+  await next();
+  
+  // 跳过文档相关的路径
+  if (c.req.path === '/openapi.json' || c.req.path === '/docs' || c.req.path.startsWith('/api-docs')) {
+    return;
+  }
+  
+  // 只包装JSON响应，且响应状态为2xx
+  const contentType = c.res.headers.get('content-type');
+  if (contentType?.includes('application/json') && c.res.status >= 200 && c.res.status < 300) {
+    try {
+      const duration = Date.now() - start;
+      
+      // 克隆响应以避免消耗原始响应体
+      const responseClone = c.res.clone();
+      const originalResponse = await responseClone.json();
+      
+      const wrappedResponse = {
+        success: true,
+        data: originalResponse,
+        timestamp: new Date().toISOString(),
+        duration: `${duration}ms`,
+      };
+      
+      return c.json(wrappedResponse);
+    } catch (error) {
+      // 如果无法解析JSON，就保持原响应
+      console.warn('Failed to wrap response:', error);
+    }
+  }
+};

package/templates/cqrs/src/index.ts

@@ -1,29 +1,26 @@
 import { HestFactory, logger } from '@hestjs/core';
-import { ValidationInterceptor } from '@hestjs/validation';
+import { Hono } from 'hono';
 import { cors } from 'hono/cors';
 import { logger as log } from 'hono/logger';
 import { AppModule } from './app.module';
-import { HttpExceptionFilter } from './common/filters/http-exception.filter';
-import { ResponseInterceptor } from './common/interceptors/response.interceptor';
+import { exceptionMiddleware, responseMiddleware } from './common/middleware';
 
 async function bootstrap() {
   try {
     logger.info('🚀 Starting HestJS application...');
 
-    const app = await HestFactory.create(AppModule);
-    app.hono().use(cors()); // 使用 Hono 的 CORS 中间件
-    app.hono().use('*', log()); // 使用 Hono 的日志中间件
+    // 创建 Hono 实例
+    const hono = new Hono();
+    hono.use(cors()); // 使用 Hono 的 CORS 中间件
+    hono.use('*', log()); // 使用 Hono 的日志中间件
+    hono.use('*', exceptionMiddleware); // 异常处理中间件
+    hono.use('*', responseMiddleware); // 响应包装中间件
 
-    // 全局拦截器 - 验证拦截器应该在响应拦截器之前
-    app.useGlobalInterceptors(new ValidationInterceptor());
-    app.useGlobalInterceptors(new ResponseInterceptor());
-
-    // 全局异常过滤器
-    app.useGlobalFilters(new HttpExceptionFilter());
+    await HestFactory.create(hono, AppModule);
 
     const server = Bun.serve({
       port: 3002,
-      fetch: app.hono().fetch,
+      fetch: hono.fetch,
       reusePort: true, // 启用端口复用
     });
 

package/templates/cqrs_scalar/package.json

@@ -30,10 +30,10 @@
   "author": "aqz236",
   "license": "MIT",
   "dependencies": {
-    "@hestjs/core": "^0.1.10",
+    "@hestjs/core": "^0.2.0",
     "@hestjs/validation": "^0.1.5",
-    "@hestjs/cqrs": "^0.1.3",
-    "@hestjs/scalar": "^0.1.4",
+    "@hestjs/cqrs": "^0.1.5",
+    "@hestjs/scalar": "^0.1.6",
     "hono": "^4.8.9",
     "reflect-metadata": "^0.2.2"
   },

package/templates/cqrs_scalar/src/common/middleware/index.ts

@@ -0,0 +1,59 @@
+import type { Context, Next } from 'hono';
+import type { StatusCode } from 'hono/utils/http-status';
+import { logger } from '@hestjs/logger';
+
+/**
+ * Hono 异常处理中间件
+ */
+export const exceptionMiddleware = async (c: Context, next: Next) => {
+  try {
+    await next();
+  } catch (error: unknown) {
+    const err = error as { status?: number; message?: string; error?: string; stack?: string };
+    const statusCode = err.status || 500;
+    
+    const validStatus: StatusCode = (statusCode >= 100 && statusCode < 600) 
+      ? statusCode as StatusCode 
+      : 500;
+    
+    const response = {
+      statusCode: validStatus,
+      timestamp: new Date().toISOString(),
+      path: c.req.url,
+      message: err.message || 'Internal Server Error',
+      error: err.error || 'Exception',
+    };
+
+    logger.error(`🔥 HTTP Exception [${validStatus}]: ${err.message}`, {
+      requestUrl: c.req.url,
+      stack: err.stack,
+    });
+
+    c.status(validStatus);
+    return c.json(response);
+  }
+};
+
+/**
+ * 响应包装中间件
+ */
+export const responseMiddleware = async (c: Context, next: Next) => {
+  const start = Date.now();
+  
+  await next();
+  
+  // 只包装JSON响应
+  if (c.res.headers.get('content-type')?.includes('application/json')) {
+    const duration = Date.now() - start;
+    const originalResponse = await c.res.json();
+    
+    const wrappedResponse = {
+      success: true,
+      data: originalResponse,
+      timestamp: new Date().toISOString(),
+      duration: `${duration}ms`,
+    };
+    
+    return c.json(wrappedResponse);
+  }
+};

package/templates/cqrs_scalar/src/index.ts

@@ -1,25 +1,22 @@
 import { HestFactory, logger } from '@hestjs/core';
 import '@hestjs/scalar'; // 导入scalar扩展
-import { ValidationInterceptor } from '@hestjs/validation';
+import { Hono } from 'hono';
 import { cors } from 'hono/cors';
 import { AppModule } from './app.module';
-import { HttpExceptionFilter } from './common/filters/http-exception.filter';
-import { ResponseInterceptor } from './common/interceptors/response.interceptor';
+import { exceptionMiddleware, responseMiddleware } from './common/middleware';
 
 async function bootstrap() {
   try {
     logger.info('🚀 Starting HestJS application...');
 
-    const app = await HestFactory.create(AppModule);
-    app.hono().use(cors()); // 使用 Hono 的 CORS 中间件
-    // app.hono().use('*', log()); // 使用 Hono 的日志中间件
+    // 创建 Hono 实例
+    const hono = new Hono();
+    hono.use(cors()); // 使用 Hono 的 CORS 中间件
+    hono.use('*', exceptionMiddleware); // 异常处理中间件
+    hono.use('*', responseMiddleware); // 响应包装中间件
+    // hono.use('*', log()); // 使用 Hono 的日志中间件
 
-    // 全局拦截器 - 验证拦截器应该在响应拦截器之前
-    app.useGlobalInterceptors(new ValidationInterceptor());
-    app.useGlobalInterceptors(new ResponseInterceptor());
-
-    // 全局异常过滤器
-    app.useGlobalFilters(new HttpExceptionFilter());
+    const app = await HestFactory.create(hono, AppModule);
 
     // 设置OpenAPI规范端点
     app.useSwagger(
@@ -52,7 +49,7 @@ async function bootstrap() {
 
     const server = Bun.serve({
       port: 3002,
-      fetch: app.hono().fetch,
+      fetch: hono.fetch,
       reusePort: true, // 启用端口复用
     });
 

package/templates/base/src/common/filters/http-exception.filter.ts

@@ -1,34 +0,0 @@
-import type {
-  ArgumentsHost,
-  ExceptionFilter,
-  HttpException,
-} from '@hestjs/core';
-import { createLogger } from '@hestjs/core';
-
-const logger = createLogger('HttpExceptionFilter');
-
-/**
- * 自定义 HTTP 异常过滤器
- */
-export class HttpExceptionFilter implements ExceptionFilter<HttpException> {
-  catch(exception: HttpException, host: ArgumentsHost) {
-    const ctx = host.getContext();
-    const request = host.getRequest();
-
-    const status = exception.status;
-    const response = {
-      statusCode: status,
-      timestamp: new Date().toISOString(),
-      path: request.url,
-      message: exception.message,
-      error: exception.error || 'Http Exception',
-    };
-
-    logger.error(`🔥 HTTP Exception [${status}]: ${exception.message}`, {
-      requestUrl: request.url,
-      stack: exception.stack,
-    });
-
-    return ctx.json(response, status);
-  }
-}

package/templates/base/src/common/interceptors/response.interceptor.ts

@@ -1,38 +0,0 @@
-import type { CallHandler, ExecutionContext, Interceptor } from '@hestjs/core';
-import { createLogger } from '@hestjs/core';
-
-const logger = createLogger('ResponseInterceptor');
-
-/**
- * 响应转换拦截器
- */
-export class ResponseInterceptor implements Interceptor {
-  async intercept(
-    context: ExecutionContext,
-    next: CallHandler,
-  ): Promise<{
-    success: boolean;
-    data: unknown;
-    timestamp: string;
-    duration: string;
-  }> {
-    const startTime = Date.now();
-    const request = context.switchToHttp().getRequest();
-
-    logger.info(`🚀  Request: ${request.method} ${request.url}`);
-
-    const result = await next.handle();
-
-    const duration = Date.now() - startTime;
-    logger.info(
-      `✅ Response: ${request.method} ${request.url} - ${duration}ms`,
-    );
-
-    return {
-      success: true,
-      data: result,
-      timestamp: new Date().toISOString(),
-      duration: `${duration}ms`,
-    };
-  }
-}

package/templates/base_scalar/src/common/filters/http-exception.filter.ts

@@ -1,34 +0,0 @@
-import type {
-  ArgumentsHost,
-  ExceptionFilter,
-  HttpException,
-} from '@hestjs/core';
-import { createLogger } from '@hestjs/core';
-
-const logger = createLogger('HttpExceptionFilter');
-
-/**
- * 自定义 HTTP 异常过滤器
- */
-export class HttpExceptionFilter implements ExceptionFilter<HttpException> {
-  catch(exception: HttpException, host: ArgumentsHost) {
-    const ctx = host.getContext();
-    const request = host.getRequest();
-
-    const status = exception.status;
-    const response = {
-      statusCode: status,
-      timestamp: new Date().toISOString(),
-      path: request.url,
-      message: exception.message,
-      error: exception.error || 'Http Exception',
-    };
-
-    logger.error(`🔥 HTTP Exception [${status}]: ${exception.message}`, {
-      requestUrl: request.url,
-      stack: exception.stack,
-    });
-
-    return ctx.json(response, status);
-  }
-}

package/templates/base_scalar/src/common/interceptors/response.interceptor.ts

@@ -1,38 +0,0 @@
-import type { CallHandler, ExecutionContext, Interceptor } from '@hestjs/core';
-import { createLogger } from '@hestjs/core';
-
-const logger = createLogger('ResponseInterceptor');
-
-/**
- * 响应转换拦截器
- */
-export class ResponseInterceptor implements Interceptor {
-  async intercept(
-    context: ExecutionContext,
-    next: CallHandler,
-  ): Promise<{
-    success: boolean;
-    data: unknown;
-    timestamp: string;
-    duration: string;
-  }> {
-    const startTime = Date.now();
-    const request = context.switchToHttp().getRequest();
-
-    logger.info(`🚀  Request: ${request.method} ${request.url}`);
-
-    const result = await next.handle();
-
-    const duration = Date.now() - startTime;
-    logger.info(
-      `✅ Response: ${request.method} ${request.url} - ${duration}ms`,
-    );
-
-    return {
-      success: true,
-      data: result,
-      timestamp: new Date().toISOString(),
-      duration: `${duration}ms`,
-    };
-  }
-}

package/templates/cqrs/src/common/filters/http-exception.filter.ts

@@ -1,34 +0,0 @@
-import type {
-  ArgumentsHost,
-  ExceptionFilter,
-  HttpException,
-} from '@hestjs/core';
-import { createLogger } from '@hestjs/core';
-
-const logger = createLogger('HttpExceptionFilter');
-
-/**
- * 自定义 HTTP 异常过滤器
- */
-export class HttpExceptionFilter implements ExceptionFilter<HttpException> {
-  catch(exception: HttpException, host: ArgumentsHost) {
-    const ctx = host.getContext();
-    const request = host.getRequest();
-
-    const status = exception.status;
-    const response = {
-      statusCode: status,
-      timestamp: new Date().toISOString(),
-      path: request.url,
-      message: exception.message,
-      error: exception.error || 'Http Exception',
-    };
-
-    logger.error(`🔥 HTTP Exception [${status}]: ${exception.message}`, {
-      requestUrl: request.url,
-      stack: exception.stack,
-    });
-
-    return ctx.json(response, status);
-  }
-}

package/templates/cqrs/src/common/interceptors/response.interceptor.ts

@@ -1,38 +0,0 @@
-import type { CallHandler, ExecutionContext, Interceptor } from '@hestjs/core';
-import { createLogger } from '@hestjs/core';
-
-const logger = createLogger('ResponseInterceptor');
-
-/**
- * 响应转换拦截器
- */
-export class ResponseInterceptor implements Interceptor {
-  async intercept(
-    context: ExecutionContext,
-    next: CallHandler,
-  ): Promise<{
-    success: boolean;
-    data: unknown;
-    timestamp: string;
-    duration: string;
-  }> {
-    const startTime = Date.now();
-    const request = context.switchToHttp().getRequest();
-
-    logger.info(`🚀  Request: ${request.method} ${request.url}`);
-
-    const result = await next.handle();
-
-    const duration = Date.now() - startTime;
-    logger.info(
-      `✅ Response: ${request.method} ${request.url} - ${duration}ms`,
-    );
-
-    return {
-      success: true,
-      data: result,
-      timestamp: new Date().toISOString(),
-      duration: `${duration}ms`,
-    };
-  }
-}

package/templates/cqrs_scalar/src/common/filters/http-exception.filter.ts

@@ -1,34 +0,0 @@
-import type {
-  ArgumentsHost,
-  ExceptionFilter,
-  HttpException,
-} from '@hestjs/core';
-import { createLogger } from '@hestjs/core';
-
-const logger = createLogger('HttpExceptionFilter');
-
-/**
- * 自定义 HTTP 异常过滤器
- */
-export class HttpExceptionFilter implements ExceptionFilter<HttpException> {
-  catch(exception: HttpException, host: ArgumentsHost) {
-    const ctx = host.getContext();
-    const request = host.getRequest();
-
-    const status = exception.status;
-    const response = {
-      statusCode: status,
-      timestamp: new Date().toISOString(),
-      path: request.url,
-      message: exception.message,
-      error: exception.error || 'Http Exception',
-    };
-
-    logger.error(`🔥 HTTP Exception [${status}]: ${exception.message}`, {
-      requestUrl: request.url,
-      stack: exception.stack,
-    });
-
-    return ctx.json(response, status);
-  }
-}