Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions .changeset/swift-birds-read.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
'@smooai/utils': patch
---

Fixed addHonoMiddleware.
37 changes: 17 additions & 20 deletions src/api/hono.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import * as env from '@/env';
import { Hono } from 'hono';
import { beforeEach, describe, expect, it, vi } from 'vitest';
import { z } from 'zod';
import { addHonoMiddleware } from './hono';
import { addHonoMiddleware, createHonoAwsLambdaHandler } from './hono';

// Mock dependencies
vi.mock('@/env');
Expand All @@ -25,12 +25,11 @@ describe('addHonoMiddleware', () => {
});

it('should create a Hono app with middleware', async () => {
const appFunction = (app: Hono) => {
app.get('/test', (c) => c.json({ message: 'success' }));
return app;
};
const app = new Hono();
app.get('/test', (c) => c.json({ message: 'success' }));

const handler = addHonoMiddleware(appFunction);
const middlewaredApp = addHonoMiddleware(app);
const handler = createHonoAwsLambdaHandler(middlewaredApp);
const event = {
version: '2.0',
rawPath: '/test',
Expand Down Expand Up @@ -64,16 +63,15 @@ describe('addHonoMiddleware', () => {
name: z.string(),
});

const appFunction = (app: Hono) => {
app.post('/validate', async (c) => {
const body = await c.req.json();
schema.parse(body);
return c.json({ success: true });
});
return app;
};
const app = new Hono();
app.post('/validate', async (c) => {
const body = await c.req.json();
schema.parse(body);
return c.json({ success: true });
});

const handler = addHonoMiddleware(appFunction);
const middlewaredApp = addHonoMiddleware(app);
const handler = createHonoAwsLambdaHandler(middlewaredApp);
const event = {
version: '2.0',
rawPath: '/validate',
Expand Down Expand Up @@ -103,12 +101,11 @@ describe('addHonoMiddleware', () => {
it('should add pretty JSON middleware when running locally', async () => {
vi.mocked(env.isRunningLocally).mockReturnValue(true);

const appFunction = (app: Hono) => {
app.get('/test', (c) => c.json({ message: 'success' }));
return app;
};
const app = new Hono();
app.get('/test', (c) => c.json({ message: 'success' }));

const handler = addHonoMiddleware(appFunction);
const middlewaredApp = addHonoMiddleware(app);
const handler = createHonoAwsLambdaHandler(middlewaredApp);
const event = {
version: '2.0',
rawPath: '/test',
Expand Down
10 changes: 3 additions & 7 deletions src/api/hono.ts
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@ import { fromZodError } from 'zod-validation-error';
const logger = new AwsServerLogger();

// eslint-disable-next-line @typescript-eslint/no-explicit-any -- accepting any hono generic
export function addHonoMiddleware(appFunction: (app: Hono<any>) => Hono<any>): ReturnType<typeof handle> {
const app = new Hono();
export function addHonoMiddleware(_app: Hono<any>): Hono<any> {
const app = _app ?? new Hono();

app.use(requestId());
app.use(
Expand Down Expand Up @@ -51,11 +51,7 @@ export function addHonoMiddleware(appFunction: (app: Hono<any>) => Hono<any>): R
throw error;
});

const appWithRoutes = appFunction(app);
return (event: LambdaEvent, lambdaContext?: LambdaContext) => {
logger.addLambdaContext(event as unknown as APIGatewayProxyEventV2, lambdaContext as unknown as Context);
return handle(appWithRoutes)(event, lambdaContext);
};
return app;
}

// eslint-disable-next-line @typescript-eslint/no-explicit-any -- accepting any hono generic
Expand Down
Loading