Skip to content
Open
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
1 change: 1 addition & 0 deletions packages/nest/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,7 @@
"@orpc/shared": "workspace:*",
"@orpc/standard-server": "workspace:*",
"@orpc/standard-server-fastify": "workspace:*",
"@orpc/standard-server-fetch": "workspace:*",
"@orpc/standard-server-node": "workspace:*"
},
"devDependencies": {
Expand Down
36 changes: 28 additions & 8 deletions packages/nest/src/implement.ts
Original file line number Diff line number Diff line change
Expand Up @@ -15,11 +15,19 @@ import { getRouter, isProcedure, unlazy } from '@orpc/server'
import { StandardHandler } from '@orpc/server/standard'
import { get, intercept, toArray } from '@orpc/shared'
import * as StandardServerFastify from '@orpc/standard-server-fastify'
import * as StandardServerFetch from '@orpc/standard-server-fetch'
import * as StandardServerNode from '@orpc/standard-server-node'
import { mergeMap } from 'rxjs'
import { ORPC_MODULE_CONFIG_SYMBOL } from './module'
import { toNestPattern } from './utils'

interface HonoContext {
req: { raw: globalThis.Request }
res?: globalThis.Response
finalized: boolean
newResponse: (body: BodyInit | null, init?: ResponseInit) => globalThis.Response
}

const MethodDecoratorMap = {
HEAD: Head,
GET: Get,
Expand Down Expand Up @@ -122,12 +130,21 @@ export class ImplementInterceptor implements NestInterceptor {
`)
}

const req: Request | FastifyRequest = ctx.switchToHttp().getRequest()
const res: Response | FastifyReply = ctx.switchToHttp().getResponse()
const req: Request | FastifyRequest | HonoContext['req'] = ctx.switchToHttp().getRequest()
const res: Response | FastifyReply | HonoContext = ctx.switchToHttp().getResponse()

const standardRequest = 'raw' in req
? StandardServerFastify.toStandardLazyRequest(req, res as FastifyReply)
: StandardServerNode.toStandardLazyRequest(req, res as Response)
const isHono = 'finalized' in res && typeof (res as HonoContext).newResponse === 'function'
const isFastify = 'raw' in req && !isHono

const standardRequest = (() => {
if (isHono) {
return StandardServerFetch.toStandardLazyRequest((req as HonoContext['req']).raw)
}
if (isFastify) {
return StandardServerFastify.toStandardLazyRequest(req as FastifyRequest, res as FastifyReply)
}
return StandardServerNode.toStandardLazyRequest(req as Request, res as Response)
})()

const handler = new StandardHandler(procedure, {
init: () => {},
Expand All @@ -148,11 +165,14 @@ export class ImplementInterceptor implements NestInterceptor {
toArray(this.config.sendResponseInterceptors),
{ request: req, response: res, standardResponse: result.response },
async ({ response, standardResponse }) => {
if ('raw' in response) {
await StandardServerFastify.sendStandardResponse(response, standardResponse, this.config)
if (isHono) {
(response as HonoContext).res = StandardServerFetch.toFetchResponse(standardResponse, this.config)
Copy link
Member

Choose a reason for hiding this comment

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

I don't think we should set res directly, we should use built-in method to well integrate with hono apis: https://orpc.dev/docs/adapters/hono

}
else if (isFastify) {
await StandardServerFastify.sendStandardResponse(response as FastifyReply, standardResponse, this.config)
}
else {
await StandardServerNode.sendStandardResponse(response, standardResponse, this.config)
await StandardServerNode.sendStandardResponse(response as Response, standardResponse, this.config)
}
},
)
Expand Down