next-ws 1.0.1-canary.1 → 1.0.1-experimental.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "next-ws",
-  "version": "1.0.1-canary.1",
+  "version": "1.0.1-experimental.2",
   "description": "Add support for WebSockets in Next.js 13 app directory",
   "keywords": [
     "next",

package/server/utilities/server.d.ts

@@ -2,14 +2,14 @@
 import { Server } from 'node:http';
 import NextNodeServer from 'next/dist/server/next-server';
 import { WebSocketServer } from 'ws';
-export declare const CustomHttpServer: unique symbol;
+export declare const CustomHttpServer = "NextWS::CustomHttpServer";
 /**
  * Get the HTTP Server instance from the NextNodeServer.
  * @param nextServer The NextNodeServer instance.
  * @returns The HTTP Server instance.
  */
 export declare function useHttpServer(nextServer: NextNodeServer): Server<typeof import("http").IncomingMessage, typeof import("http").ServerResponse>;
-export declare const CustomWsServer: unique symbol;
+export declare const CustomWsServer = "NextWS::CustomWsServer";
 /**
  * Create a WebSocketServer.
  * @returns The WebSocketServer instance.

package/server/utilities/server.js

@@ -7,22 +7,23 @@ const Log = tslib_1.__importStar(require("next/dist/build/output/log"));
 const next_server_1 = tslib_1.__importDefault(require("next/dist/server/next-server"));
 const ws_1 = require("ws");
 // =============== HTTP Server ===============
-exports.CustomHttpServer = Symbol('NextWS::CustomHttpServer');
+exports.CustomHttpServer = 'NextWS::CustomHttpServer';
 /**
  * Get the HTTP Server instance from the NextNodeServer.
  * @param nextServer The NextNodeServer instance.
  * @returns The HTTP Server instance.
  */
 function useHttpServer(nextServer) {
+    // NextNodeServer is always required, so check for it before attempting to use custom server
+    if (!nextServer || !(nextServer instanceof next_server_1.default)) {
+        Log.error('[next-ws] could not find the NextNodeServer instance');
+        process.exit(1);
+    }
     const existing = Reflect.get(globalThis, exports.CustomHttpServer);
     if (existing) {
         Log.warnOnce('[next-ws] is using a custom HTTP Server, this is experimental and may not work as expected');
         return existing;
     }
-    if (!nextServer || !(nextServer instanceof next_server_1.default)) {
-        Log.error('[next-ws] could not find the NextNodeServer instance');
-        process.exit(1);
-    }
     // @ts-expect-error - serverOptions is protected
     const httpServer = nextServer.serverOptions?.httpServer;
     if (!httpServer || !(httpServer instanceof node_http_1.Server)) {
@@ -33,7 +34,7 @@ function useHttpServer(nextServer) {
 }
 exports.useHttpServer = useHttpServer;
 // =============== WebSocket Server ===============
-exports.CustomWsServer = Symbol('NextWS::CustomWsServer');
+exports.CustomWsServer = 'NextWS::CustomWsServer';
 /**
  * Create a WebSocketServer.
  * @returns The WebSocketServer instance.