Format

vikejs · Oct 22, 2024 · 6a0f80a · 6a0f80a
1 parent 9962d8f
commit 6a0f80a
Show file tree

Hide file tree

Showing 7 changed files with 24 additions and 18 deletions.
diff --git a/packages/vike-node/src/runtime/adapters/connectToWebUws.ts b/packages/vike-node/src/runtime/adapters/connectToWebUws.ts
@@ -33,7 +33,7 @@ function connectToWeb(handler: ConnectMiddlewareUws): WebHandlerUws {
         for (const [key, value] of headers) {
           res.writeHeader(key, value)
         }
-        if(statusCodesWithoutBody.has(statusCode)) {
+        if (statusCodesWithoutBody.has(statusCode)) {
           res.end()
         } else {
           res.end(await readableStreamToBuffer(Readable.toWeb(readable) as ReadableStream))

diff --git a/packages/vike-node/src/runtime/adapters/createServerResponseUws.ts b/packages/vike-node/src/runtime/adapters/createServerResponseUws.ts
@@ -4,11 +4,13 @@ import type { OutgoingHttpHeader, OutgoingHttpHeaders } from 'node:http'
 import { PassThrough, Readable } from 'node:stream'
 import type { HttpResponse } from 'uWebSockets.js'
 
-type OnReadable = (cb: (result: {
-  readable: Readable
-  headers: [string, string][]
-  statusCode: number
-}) => void) => void
+type OnReadable = (
+  cb: (result: {
+    readable: Readable
+    headers: [string, string][]
+    statusCode: number
+  }) => void
+) => void
 
 type CreatedServerReponse = {
   res: HttpResponse

diff --git a/packages/vike-node/src/runtime/frameworks/uws.ts b/packages/vike-node/src/runtime/frameworks/uws.ts
@@ -27,10 +27,10 @@ import type { PlatformRequestUws, VikeOptions } from '../types.js'
  */
 function vike(app: TemplatedApp, options?: VikeOptions<HttpRequest>): TemplatedApp {
   const handler = createHandler(options)
-  return app.get('*', (response, request) => 
+  return app.get('*', (response, request) =>
     handler({ response, request, platformRequest: request as PlatformRequestUws }).catch((error: Error) => {
-        console.error(error)
-        response.writeStatus('500').end('Internal Server Error: ' + error.message)
+      console.error(error)
+      response.writeStatus('500').end('Internal Server Error: ' + error.message)
     })
   )
 }
diff --git a/packages/vike-node/src/runtime/handler-node-only-uws.ts b/packages/vike-node/src/runtime/handler-node-only-uws.ts
@@ -18,7 +18,10 @@ export function createHandler(options: VikeOptions<PlatformRequestUws> = {}) {
   // let staticMiddleware: ConnectMiddleware | undefined
   // let compressMiddleware: ConnectMiddleware | undefined
 
-  return async function handler({ res, platformRequest }: {
+  return async function handler({
+    res,
+    platformRequest
+  }: {
     res: HttpResponse
     platformRequest: PlatformRequestUws
   }): Promise<void> {
@@ -35,7 +38,6 @@ export function createHandler(options: VikeOptions<PlatformRequestUws> = {}) {
       // if (shouldCompressResponse) {
       //   await applyCompression(req, res, shouldCache)
       // }
-
       // if (staticConfig) {
       //   const handled = await serveStaticFiles(req, res, staticConfig)
       //   if (handled) return true
@@ -87,7 +89,11 @@ function handleViteDevServer(res: HttpResponse, platformRequest: PlatformRequest
   return new Promise<boolean>((resolve) => {
     res.once('close', () => resolve(true))
     assert(globalStore.viteDevServer)
-    globalStore.viteDevServer.middlewares(platformRequest as unknown as IncomingMessage, res as unknown as ServerResponse, () => resolve(false))
+    globalStore.viteDevServer.middlewares(
+      platformRequest as unknown as IncomingMessage,
+      res as unknown as ServerResponse,
+      () => resolve(false)
+    )
   })
 }
 

diff --git a/packages/vike-node/src/runtime/handler-web-and-node-uws.ts b/packages/vike-node/src/runtime/handler-web-and-node-uws.ts
@@ -2,7 +2,7 @@ import type { HttpRequest, HttpResponse } from 'uWebSockets.js'
 import { isNodeLike } from '../utils/isNodeLike.js'
 import { connectToWeb } from './adapters/connectToWebUws.js'
 import { createHandler as createHandlerNode } from './handler-node-only-uws.js'
-import { createHandler as createHandlerWeb } from'./handler-web-only-uws.js'
+import { createHandler as createHandlerWeb } from './handler-web-only-uws.js'
 import type { HandlerUws, PlatformRequestUws, VikeOptions } from './types.js'
 
 const getHeaders = (req: HttpRequest): [string, string][] => {
@@ -38,9 +38,7 @@ export function createHandler<HttpRequest>(options: VikeOptions<HttpRequest> = {
     if (await isNodeLike()) {
       const nodeOnlyHandler = createHandlerNode(options)
       const nodeHandler: HandlerUws<PlatformRequestUws> = ({ platformRequest }) => {
-        const connectedHandler = connectToWeb((res, platformRequest) =>
-          nodeOnlyHandler({ res, platformRequest })
-        )
+        const connectedHandler = connectToWeb((res, platformRequest) => nodeOnlyHandler({ res, platformRequest }))
         return connectedHandler(response, platformRequest)
       }
 

diff --git a/packages/vike-node/src/runtime/utils/writeHttpResponse.ts b/packages/vike-node/src/runtime/utils/writeHttpResponse.ts
@@ -45,5 +45,5 @@ async function readableStreamToBuffer(readableStream: ReadableStream): Promise<B
   }
 
   // Using Buffer.concat directly to handle chunk concatenation, improving performance.
-  return Buffer.concat(chunks.map(chunk => Buffer.from(chunk)))
+  return Buffer.concat(chunks.map((chunk) => Buffer.from(chunk)))
 }
diff --git a/packages/vike-node/src/runtime/vike-handler-uws.ts b/packages/vike-node/src/runtime/vike-handler-uws.ts
@@ -40,7 +40,7 @@ async function renderPageWeb<PlatformRequest>({
   platformRequest,
   options
 }: {
-  res: HttpResponse,
+  res: HttpResponse
   url: string
   headers: [string, string][]
   platformRequest: PlatformRequest