Skip to content
Draft
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
14 changes: 10 additions & 4 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
"dev:prepare": "unbuild --stub",
"build": "unbuild",
"test": "vitest dev",
"test:integration": "jest",
"test:integration": "cross-env NODE_OPTIONS=--experimental-vm-modules jest",
"test:types": "tsc --noEmit --skipLibCheck",
"lint": "pnpm lint:oxlint && pnpm lint:oxfmt",
"lint:oxlint": "oxlint --type-aware",
Expand All @@ -52,11 +52,12 @@
"@typescript-eslint/parser": "8.56.1",
"@vitest/coverage-v8": "4.0.18",
"commit-and-tag-version": "12.6.1",
"cross-env": "^10.1.0",
"crossws": "0.3.5",
"graphql": "16.13.0",
"graphql-subscriptions": "3.0.0",
"graphql-ws": "6.0.7",
"h3": "1.15.5",
"h3": "2.0.1-rc.14",
"jest": "30.2.0",
"listhen": "1.9.0",
"oxfmt": "0.35.0",
Expand All @@ -72,7 +73,7 @@
"crossws": "^0.3.0",
"graphql": "^16.0.0",
"graphql-ws": "^5.0.0 || ^6.0.0",
"h3": "^1.11.0"
"h3": "^1.11.0 || ^2.0.0"
},
"peerDependenciesMeta": {
"graphql-ws": {
Expand All @@ -82,5 +83,10 @@
"engines": {
"node": ">=20.0.0"
},
"packageManager": "pnpm@10.30.3"
"packageManager": "pnpm@10.30.3",
"pnpm": {
"overrides": {
"h3": "2.0.1-rc.14"
}
}
}
88 changes: 49 additions & 39 deletions pnpm-lock.yaml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

28 changes: 10 additions & 18 deletions src/index.ts
Original file line number Diff line number Diff line change
@@ -1,17 +1,7 @@
import type { ApolloServer, BaseContext, ContextFunction, HTTPGraphQLRequest } from '@apollo/server'
import { HeaderMap } from '@apollo/server'
import { Hooks } from 'crossws'
import {
eventHandler,
EventHandler,
getHeaders,
H3Event,
HTTPMethod,
isMethod,
setHeaders,
readBody,
RequestHeaders,
} from 'h3'
import { defineHandler, EventHandler, H3Event, HTTPMethod, isMethod, RequestHeaders } from 'h3'

Check failure on line 4 in src/index.ts

View workflow job for this annotation

GitHub Actions / ci

'"h3"' has no exported member named 'RequestHeaders'. Did you mean 'getRequestHeaders'?
import type { WithRequired } from '@apollo/utils.withrequired'

export interface H3ContextFunctionArgument {
Expand Down Expand Up @@ -42,8 +32,8 @@
const contextFunction: ContextFunction<[H3ContextFunctionArgument], TContext> =
options?.context ?? defaultContext

return eventHandler({
async handler(event) {
return defineHandler({

Check failure on line 35 in src/index.ts

View workflow job for this annotation

GitHub Actions / ci

No overload matches this call.
handler: async (event) => {
// Apollo-server doesn't handle OPTIONS calls, so we have to do this on our own
// https://github.com/apollographql/apollo-server/blob/fa82c1d5299c4803f9ef8ae7fa2e367eadd8c0e6/packages/server/src/runHttpQuery.ts#L182-L192
if (isMethod(event, 'OPTIONS')) {
Expand All @@ -62,13 +52,15 @@
throw new Error('Incremental delivery not implemented')
}

setHeaders(event, Object.fromEntries(headers))
event.res.statusCode = status || 200
for (const [key, value] of headers) {
event.res.headers.set(key, value)
}
event.res.status = status || 200
return body.string
} catch (error) {
if (error instanceof SyntaxError) {
// This is what the apollo test suite expects
event.res.statusCode = 400
event.res.status = 400
return error.message
} else {
throw error
Expand All @@ -82,7 +74,7 @@
async function toGraphqlRequest(event: H3Event): Promise<HTTPGraphQLRequest> {
return {
method: event.req.method || 'POST',
headers: normalizeHeaders(getHeaders(event)),
headers: normalizeHeaders(event.req.headers),
search: normalizeQueryString(event.req.url),
body: await normalizeBody(event),
}
Expand All @@ -94,7 +86,7 @@
if (Array.isArray(value)) {
headerMap.set(key, value.join(','))
} else if (value) {
headerMap.set(key, value)

Check failure on line 89 in src/index.ts

View workflow job for this annotation

GitHub Actions / ci

Argument of type '{}' is not assignable to parameter of type 'string'.
}
}
return headerMap
Expand All @@ -110,6 +102,6 @@
async function normalizeBody(event: H3Event): Promise<unknown> {
const PayloadMethods: HTTPMethod[] = ['PATCH', 'POST', 'PUT', 'DELETE']
if (isMethod(event, PayloadMethods)) {
return await readBody(event)
return await event.req.json()
}
}
6 changes: 3 additions & 3 deletions test/integration.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import {
CreateServerForIntegrationTestsOptions,
defineIntegrationTestSuite,
} from '@apollo/server-integration-testsuite'
import { createApp, toNodeListener } from 'h3'
import { H3, toNodeHandler } from 'h3'
import { ApolloServer, ApolloServerOptions, BaseContext } from '@apollo/server'
import { startServerAndCreateH3Handler } from '../src'
import { createServer, Server } from 'node:http'
Expand All @@ -20,7 +20,7 @@ defineIntegrationTestSuite(
serverOptions: ApolloServerOptions<BaseContext>,
testOptions?: CreateServerForIntegrationTestsOptions,
) => {
const app = createApp()
const app = new H3()
const apollo = new ApolloServer({
...serverOptions,
})
Expand All @@ -31,7 +31,7 @@ defineIntegrationTestSuite(
}),
)

const httpServer = createServer(toNodeListener(app))
const httpServer = createServer(toNodeHandler(app))
await new Promise<void>((resolve) => {
httpServer.listen({ port: 0 }, resolve)
})
Expand Down
Loading