feat(server, openapi)!: rewrite ORPCHandler, OpenAPIHandler

apps/content/content/docs/client/react-query.mdx

@@ -20,7 +20,7 @@ import { ORPCLink } from '@orpc/client/fetch';
 import type { router } from 'examples/server';
 
 const orpcLink = new ORPCLink({
-  url: 'http://localhost:3000/api',
+  url: 'http://localhost:3000/rpc',
   // fetch: optional override for the default fetch function
   // headers: provide additional headers
 })

apps/content/content/docs/client/vanilla.mdx

@@ -19,7 +19,7 @@ import { ORPCLink } from '@orpc/client/fetch'
 import type { router } from 'examples/server'
 
 const orpcLink = new ORPCLink({
-  url: 'http://localhost:3000/api',
+  url: 'http://localhost:3000/rpc',
   // fetch: optional override for the default fetch function
   // headers: provide additional headers
 })
@@ -51,7 +51,7 @@ type ClientContext = { cache?: RequestCache } | undefined
 // if context is not undefinable, it will require you pass context in every call
 
 const orpcLink = new ORPCLink<ClientContext>({
-  url: 'http://localhost:3000/api',
+  url: 'http://localhost:3000/rpc',
   // headers: provide additional headers
   fetch: (input, init, context) => globalThis.fetch(input, {
     ...init,
@@ -90,7 +90,7 @@ import { createORPCClient, DynamicLink, ORPCError } from '@orpc/client'
 import { ORPCLink } from '@orpc/client/fetch'
 
 const orpcLink1 = new ORPCLink({
-  url: 'http://localhost:3000/api',
+  url: 'http://localhost:3000/rpc',
   // headers: provide additional headers
 })
 

apps/content/content/docs/client/vue-colada.mdx

@@ -18,7 +18,7 @@ import { ORPCLink } from '@orpc/client/fetch';
 import type { router } from 'examples/server';
 
 const orpcLink = new ORPCLink({
-  url: 'http://localhost:3000/api',
+  url: 'http://localhost:3000/rpc',
   // fetch: optional override for the default fetch function
   // headers: provide additional headers
 });

apps/content/content/docs/client/vue-query.mdx

@@ -18,7 +18,7 @@ import { ORPCLink } from '@orpc/client/fetch';
 import type { router } from 'examples/server';
 
 const orpcLink = new ORPCLink({
-  url: 'http://localhost:3000/api',
+  url: 'http://localhost:3000/rpc',
   // fetch: optional override for the default fetch function
   // headers: provide additional headers
 });

apps/content/content/docs/contract-first.mdx

@@ -139,7 +139,7 @@ import { ORPCLink } from '@orpc/client/fetch'
 import type { contract } from 'examples/contract'
 
 const orpcLink = new ORPCLink({
-  url: 'https://localhost:3000/prefix',
+  url: 'https://localhost:3000/rpc',
   // fetch: optional override for the default fetch function
   // headers: provide additional headers
 })

apps/content/content/docs/index.mdx

@@ -146,7 +146,7 @@ In oRPC middleware is very useful and fully typed you can find more info [here](
 ## Start Your Server
 
 ```ts twoslash
-import { ORPCHandler, CompositeHandler } from '@orpc/server/node'
+import { ORPCHandler } from '@orpc/server/node'
 import { OpenAPIServerlessHandler } from '@orpc/openapi/node'
 import { createServer } from 'node:http'
 import { router } from 'examples/server'
@@ -157,15 +157,30 @@ const openapiHandler = new OpenAPIServerlessHandler(router, {
     new ZodCoercer(),
   ],
 })
+
 const orpcHandler = new ORPCHandler(router)
-const compositeHandler = new CompositeHandler([openapiHandler, orpcHandler])
 
 const server = createServer(async (req, res) => {
   if (req.url?.startsWith('/api')) {
-    return compositeHandler.handle(req, res, {
+    const { matched } = await openapiHandler.handle(req, res, {
       prefix: '/api',
       context: {},
     })
+
+    if(matched){
+      return 
+    }
+  }
+
+  if(req.url?.startsWith('/rpc')){
+    const { matched } = await orpcHandler.handle(req, res, {
+      prefix: '/rpc',
+      context: {},
+    })
+
+    if(matched){
+      return 
+    }
   }
 
   res.statusCode = 404
@@ -190,7 +205,7 @@ import { ORPCLink } from '@orpc/client/fetch'
 import type { router } from 'examples/server'
 
 const orpcLink = new ORPCLink({
-  url: 'http://localhost:3000/api',
+  url: 'http://localhost:3000/rpc',
   // fetch: optional override for the default fetch function
   // headers: provide additional headers
 })

apps/content/content/docs/server/context.mdx

@@ -87,9 +87,11 @@ import { OpenAPIServerlessHandler, OpenAPIServerHandler } from '@orpc/openapi/fe
 
 const orpcHandler = new ORPCHandler(router)
 
-export function fetch(request: Request) {
+export async function fetch(request: Request) {
     // No need to pass context; middleware handles it
-    return orpcHandler.fetch(request)
+    const { response } = await orpcHandler.handle(request)
+
+    return response ?? new Response('Not found', { status: 404 })
 }
 ```
 
@@ -130,12 +132,14 @@ export const router = base.router({
 
 const orpcHandler = new ORPCHandler(router)
 
-export function fetch(request: Request) {
+export async function fetch(request: Request) {
     // Initialize context explicitly for each request
     const db = 'fake-db' as const
     const user = request.headers.get('Authorization') ? { id: 'example' } : undefined
 
-    return orpcHandler.fetch(request, { context: { db, user } })
+    const { response } = await orpcHandler.handle(request, { context: { db, user } })
+
+    return response ?? new Response('Not Found', { status: 404 })
 }
 
 // If you want to call this procedure or use as server action

apps/content/content/docs/server/file-upload.mdx

@@ -67,7 +67,7 @@ import { createORPCClient } from '@orpc/client'
 import { ORPCLink } from '@orpc/client/fetch'
 
 const orpcLink = new ORPCLink({
-  url: 'http://localhost:3000/api',
+  url: 'http://localhost:3000/rpc',
   // fetch: optional override for the default fetch function
   // headers: provide additional headers
 })