Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: enable to return Response like object #2085

Merged
merged 2 commits into from
Jan 27, 2024
Merged

fix: enable to return Response like object #2085

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2cf4453
fix: enable to return Response like object
usualoma Jan 25, 2024
96afc32
chore: denoify
usualoma Jan 25, 2024
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
16 changes: 8 additions & 8 deletions deno_dist/hono-base.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -315,14 +315,14 @@ class Hono<
return this.handleError(err, c)
}

if (res instanceof Response) return res

return res
.then(
(resolved: Response | undefined) =>
resolved || (c.finalized ? c.res : this.notFoundHandler(c))
)
.catch((err: Error) => this.handleError(err, c))
return res instanceof Promise
? res
.then(
(resolved: Response | undefined) =>
resolved || (c.finalized ? c.res : this.notFoundHandler(c))
)
.catch((err: Error) => this.handleError(err, c))
: res
}

const composed = compose<Context>(matchResult[0], this.errorHandler, this.notFoundHandler)
Expand Down
16 changes: 8 additions & 8 deletions src/hono-base.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -315,14 +315,14 @@ class Hono<
return this.handleError(err, c)
}

if (res instanceof Response) return res

return res
.then(
(resolved: Response | undefined) =>
resolved || (c.finalized ? c.res : this.notFoundHandler(c))
)
.catch((err: Error) => this.handleError(err, c))
return res instanceof Promise
? res
.then(
(resolved: Response | undefined) =>
resolved || (c.finalized ? c.res : this.notFoundHandler(c))
)
.catch((err: Error) => this.handleError(err, c))
: res
}

const composed = compose<Context>(matchResult[0], this.errorHandler, this.notFoundHandler)
Expand Down
259 changes: 204 additions & 55 deletions src/hono.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,73 +20,222 @@ function throwExpression(errorMessage: string): never {
}

describe('GET Request', () => {
const app = new Hono()
describe('without middleware', () => {
// In other words, this is a test for cases that do not use `compose()`

app.get('/hello', async () => {
return new Response('hello', {
status: 200,
statusText: 'Hono is OK',
const app = new Hono()

app.get('/hello', async () => {
return new Response('hello', {
status: 200,
statusText: 'Hono is OK',
})
})
})

app.get('/hello-with-shortcuts', (c) => {
c.header('X-Custom', 'This is Hono')
c.status(201)
return c.html('<h1>Hono!!!</h1>')
})
app.get('/hello-with-shortcuts', (c) => {
c.header('X-Custom', 'This is Hono')
c.status(201)
return c.html('<h1>Hono!!!</h1>')
})

app.get('/hello-env', (c) => {
return c.json(c.env)
})
app.get('/hello-env', (c) => {
return c.json(c.env)
})

it('GET http://localhost/hello is ok', async () => {
const res = await app.request('http://localhost/hello')
expect(res).not.toBeNull()
expect(res.status).toBe(200)
expect(res.statusText).toBe('Hono is OK')
expect(await res.text()).toBe('hello')
})
app.get(
'/proxy-object',
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This - adding the tests to handle the Proxy object is good!

() =>
new Proxy(new Response('proxy'), {
get(target, prop: keyof Response) {
return target[prop]
},
})
)

it('GET httphello is ng', async () => {
const res = await app.request('httphello')
expect(res.status).toBe(404)
})
app.get(
'/async-proxy-object',
async () =>
new Proxy(new Response('proxy'), {
get(target, prop: keyof Response) {
return target[prop]
},
})
)

it('GET /hello is ok', async () => {
const res = await app.request('/hello')
expect(res).not.toBeNull()
expect(res.status).toBe(200)
expect(res.statusText).toBe('Hono is OK')
expect(await res.text()).toBe('hello')
})
it('GET http://localhost/hello is ok', async () => {
const res = await app.request('http://localhost/hello')
expect(res).not.toBeNull()
expect(res.status).toBe(200)
expect(res.statusText).toBe('Hono is OK')
expect(await res.text()).toBe('hello')
})

it('GET hello is ok', async () => {
const res = await app.request('hello')
expect(res).not.toBeNull()
expect(res.status).toBe(200)
expect(res.statusText).toBe('Hono is OK')
expect(await res.text()).toBe('hello')
})
it('GET httphello is ng', async () => {
const res = await app.request('httphello')
expect(res.status).toBe(404)
})

it('GET /hello-with-shortcuts is ok', async () => {
const res = await app.request('http://localhost/hello-with-shortcuts')
expect(res).not.toBeNull()
expect(res.status).toBe(201)
expect(res.headers.get('X-Custom')).toBe('This is Hono')
expect(res.headers.get('Content-Type')).toMatch(/text\/html/)
expect(await res.text()).toBe('<h1>Hono!!!</h1>')
})
it('GET /hello is ok', async () => {
const res = await app.request('/hello')
expect(res).not.toBeNull()
expect(res.status).toBe(200)
expect(res.statusText).toBe('Hono is OK')
expect(await res.text()).toBe('hello')
})

it('GET / is not found', async () => {
const res = await app.request('http://localhost/')
expect(res).not.toBeNull()
expect(res.status).toBe(404)
it('GET hello is ok', async () => {
const res = await app.request('hello')
expect(res).not.toBeNull()
expect(res.status).toBe(200)
expect(res.statusText).toBe('Hono is OK')
expect(await res.text()).toBe('hello')
})

it('GET /hello-with-shortcuts is ok', async () => {
const res = await app.request('http://localhost/hello-with-shortcuts')
expect(res).not.toBeNull()
expect(res.status).toBe(201)
expect(res.headers.get('X-Custom')).toBe('This is Hono')
expect(res.headers.get('Content-Type')).toMatch(/text\/html/)
expect(await res.text()).toBe('<h1>Hono!!!</h1>')
})

it('GET / is not found', async () => {
const res = await app.request('http://localhost/')
expect(res).not.toBeNull()
expect(res.status).toBe(404)
})

it('GET /hello-env is ok', async () => {
const res = await app.request('/hello-env', undefined, { HELLO: 'world' })
expect(res.status).toBe(200)
expect(await res.json()).toEqual({ HELLO: 'world' })
})

it('GET /proxy-object is ok', async () => {
const res = await app.request('/proxy-object')
expect(res).not.toBeNull()
expect(res.status).toBe(200)
expect(await res.text()).toBe('proxy')
})

it('GET /async-proxy-object is ok', async () => {
const res = await app.request('/proxy-object')
expect(res).not.toBeNull()
expect(res.status).toBe(200)
expect(await res.text()).toBe('proxy')
})
})

it('GET /hello-env is ok', async () => {
const res = await app.request('/hello-env', undefined, { HELLO: 'world' })
expect(res.status).toBe(200)
expect(await res.json()).toEqual({ HELLO: 'world' })
describe('with middleware', () => {
// when using `compose()`

const app = new Hono()

app.use('*', async (ctx, next) => {
await next()
})

app.get('/hello', async () => {
return new Response('hello', {
status: 200,
statusText: 'Hono is OK',
})
})

app.get('/hello-with-shortcuts', (c) => {
c.header('X-Custom', 'This is Hono')
c.status(201)
return c.html('<h1>Hono!!!</h1>')
})

app.get('/hello-env', (c) => {
return c.json(c.env)
})

app.get(
'/proxy-object',
() =>
new Proxy(new Response('proxy'), {
get(target, prop: keyof Response) {
return target[prop]
},
})
)

app.get(
'/async-proxy-object',
async () =>
new Proxy(new Response('proxy'), {
get(target, prop: keyof Response) {
return target[prop]
},
})
)

it('GET http://localhost/hello is ok', async () => {
const res = await app.request('http://localhost/hello')
expect(res).not.toBeNull()
expect(res.status).toBe(200)
expect(res.statusText).toBe('Hono is OK')
expect(await res.text()).toBe('hello')
})

it('GET httphello is ng', async () => {
const res = await app.request('httphello')
expect(res.status).toBe(404)
})

it('GET /hello is ok', async () => {
const res = await app.request('/hello')
expect(res).not.toBeNull()
expect(res.status).toBe(200)
expect(res.statusText).toBe('Hono is OK')
expect(await res.text()).toBe('hello')
})

it('GET hello is ok', async () => {
const res = await app.request('hello')
expect(res).not.toBeNull()
expect(res.status).toBe(200)
expect(res.statusText).toBe('Hono is OK')
expect(await res.text()).toBe('hello')
})

it('GET /hello-with-shortcuts is ok', async () => {
const res = await app.request('http://localhost/hello-with-shortcuts')
expect(res).not.toBeNull()
expect(res.status).toBe(201)
expect(res.headers.get('X-Custom')).toBe('This is Hono')
expect(res.headers.get('Content-Type')).toMatch(/text\/html/)
expect(await res.text()).toBe('<h1>Hono!!!</h1>')
})

it('GET / is not found', async () => {
const res = await app.request('http://localhost/')
expect(res).not.toBeNull()
expect(res.status).toBe(404)
})

it('GET /hello-env is ok', async () => {
const res = await app.request('/hello-env', undefined, { HELLO: 'world' })
expect(res.status).toBe(200)
expect(await res.json()).toEqual({ HELLO: 'world' })
})

it('GET /proxy-object is ok', async () => {
const res = await app.request('/proxy-object')
expect(res).not.toBeNull()
expect(res.status).toBe(200)
expect(await res.text()).toBe('proxy')
})

it('GET /async-proxy-object is ok', async () => {
const res = await app.request('/proxy-object')
expect(res).not.toBeNull()
expect(res.status).toBe(200)
expect(await res.text()).toBe('proxy')
})
})
})

Expand Down
Loading