Add httpServer reference for socket.io (#1018)

- added viteDevServer.httpServer in dev mode - added polka.server for start-node in build mode Co-authored-by: Ryan Carniato <[email protected]>
solidjs · Aug 29, 2023 · 15650ac · 15650ac
1 parent 2e3fd35
commit 15650ac
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 2 deletions.
diff --git a/packages/start-node/server.js b/packages/start-node/server.js
@@ -29,7 +29,7 @@ export function createServer({ handler, paths, env }) {
       })
     : (_req, _res, next) => next();
 
-  const render = async (req, res) => {
+  const render = async (req, res, server) => {
     try {
       env.getStaticHTML = async assetPath => {
         let text = await readFile(join(paths.assets, assetPath + ".html"), "utf8");
@@ -50,6 +50,7 @@ export function createServer({ handler, paths, env }) {
         console.log("[internal]", url.method, url.href);
         return handler({
           request: request,
+          httpServer: server,
           clientAddress: req.socket.remoteAddress,
           locals: {},
           env,
@@ -59,6 +60,7 @@ export function createServer({ handler, paths, env }) {
 
       const webRes = await handler({
         request: createRequest(req),
+        httpServer: server,
         clientAddress: req.socket.remoteAddress,
         locals: {},
         env,
@@ -74,7 +76,8 @@ export function createServer({ handler, paths, env }) {
     }
   };
 
-  const server = polka().use("/", comp, assets_handler).use(comp, render);
+  const server = polka();
+  server.use("/", comp, assets_handler).use(comp, (req, res) => render(req, res, server.server));
 
   return server;
 }
diff --git a/packages/start/api/middleware.ts b/packages/start/api/middleware.ts
@@ -8,6 +8,7 @@ export const apiRoutes: Middleware = ({ forward }) => {
     if (apiHandler) {
       let apiEvent = Object.freeze({
         request: event.request,
+        httpServer: event.httpServer,
         clientAddress: event.clientAddress,
         locals: event.locals,
         params: apiHandler.params,

diff --git a/packages/start/dev/server.js b/packages/start/dev/server.js
@@ -102,13 +102,15 @@ export function createDevHandler(viteServer, config, options) {
 
       return entry({
         request: internalRequest,
+        httpServer: viteServer.httpServer,
         env: devEnv,
         fetch: internalFetch
       });
     }
 
     return await entry({
       request,
+      httpServer: viteServer.httpServer,
       env: devEnv,
       clientAddress,
       locals,

diff --git a/packages/start/server/types.tsx b/packages/start/server/types.tsx
@@ -1,3 +1,5 @@
+import { Server } from "http";
+
 export type ManifestEntry = {
   type: string;
   href: string;
@@ -74,6 +76,7 @@ declare global {
 
 export interface FetchEvent {
   request: Request;
+  httpServer?: Server;
   env: Env;
   fetch(url: string, init?: RequestInit): Promise<Response>;
   clientAddress: string;