next-ws 0.2.1-next.b55c6fe → 0.2.2

package/README.md

@@ -159,8 +159,7 @@ import { useCallback, useEffect, useState } from 'react';
 
 export default function Page() {
     const ws = useWebSocket();
-    // WebSocket instance only exists when connected
-    // It will be null when state is closed or connecting
+    //    ^? WebSocket on the client, null on the server
 
     const [value, setValue] = useState('');
     const [message, setMessage] = useState<string | null>('');

package/package.json

@@ -1,14 +1,8 @@
 {
     "name": "next-ws",
-    "version": "0.2.1-next.b55c6fe",
+    "version": "0.2.2",
     "description": "Add support for WebSockets in Next.js 13 app directory",
-    "keywords": [
-        "next",
-        "websocket",
-        "ws",
-        "server",
-        "client"
-    ],
+    "keywords": ["next", "websocket", "ws", "server", "client"],
     "license": "MIT",
     "homepage": "https://github.com/apteryxxyz/next-ws#readme",
     "repository": {
@@ -19,12 +13,7 @@
     "bugs": {
         "url": "https://github.com/apteryxxyz/next-ws/issues"
     },
-    "files": [
-        "index.js",
-        "index.d.ts",
-        "client",
-        "server"
-    ],
+    "files": ["index.js", "index.d.ts", "client", "server"],
     "main": "./index.js",
     "types": "./index.d.ts",
     "scripts": {
@@ -54,4 +43,4 @@
         "rimraf": "^5.0.1",
         "typescript": "<5.1.0"
     }
-}
+}

package/server/setup.js

@@ -2,7 +2,6 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.hookNextNodeServer = exports.setupWebSocketServer = void 0;
 const tslib_1 = require("tslib");
-const node_path_1 = tslib_1.__importDefault(require("node:path"));
 const Log = tslib_1.__importStar(require("next/dist/build/output/log"));
 const ws_1 = require("ws");
 const next_1 = require("./utilities/next");
@@ -12,21 +11,24 @@ function setupWebSocketServer(nextServer) {
     Log.ready('[next-ws] websocket server started successfully');
     httpServer.on('upgrade', async (request, socket, head) => {
         const url = new URL(request.url ?? '', 'http://next-ws');
-        const pathname = await (0, next_1.resolvePathname)(nextServer, url.pathname);
-        if (!pathname)
-            return;
-        const fsPathname = node_path_1.default
-            .join(pathname, 'route')
-            .replaceAll(node_path_1.default.sep, '/');
+        const pathname = url.pathname;
+        const fsPathname = await (0, next_1.resolvePathname)(nextServer, pathname);
+        if (!fsPathname) {
+            Log.error(`[next-ws] could not find module for page ${pathname}`);
+            return socket.destroy();
+        }
         const pageModule = await (0, next_1.getPageModule)(nextServer, fsPathname);
-        if (!pageModule)
-            return Log.error(`[next-ws] could not find module for page ${pathname}`);
+        if (!pageModule) {
+            Log.error(`[next-ws] could not find module for page ${pathname}`);
+            return socket.destroy();
+        }
         const socketHandler = pageModule?.routeModule?.userland?.SOCKET;
-        if (!socketHandler || typeof socketHandler !== 'function')
-            return Log.error(`[next-ws] could not find SOCKET handler for page ${pathname}`);
-        wsServer.handleUpgrade(request, socket, head, (client, request) => {
-            socketHandler(client, request, wsServer);
-        });
+        if (!socketHandler || typeof socketHandler !== 'function') {
+            Log.error(`[next-ws] ${pathname} does not export a SOCKET handler`);
+            return socket.destroy();
+        }
+        // prettier-ignore
+        return wsServer.handleUpgrade(request, socket, head, (client, request) => socketHandler(client, request, wsServer));
     });
 }
 exports.setupWebSocketServer = setupWebSocketServer;

package/server/utilities/next.js

@@ -4,7 +4,6 @@ exports.getPageModule = exports.resolvePathname = exports.getHttpServer = void 0
 const tslib_1 = require("tslib");
 const node_http_1 = require("node:http");
 const next_server_1 = tslib_1.__importDefault(require("next/dist/server/next-server"));
-const is_dynamic_1 = require("next/dist/shared/lib/router/utils/is-dynamic");
 /**
  * Get the http.Server instance from the NextNodeServer.
  * @param nextServer The NextNodeServer instance.
@@ -30,14 +29,18 @@ exports.getHttpServer = getHttpServer;
 async function resolvePathname(nextServer, pathname) {
     if (pathname.startsWith('/_next'))
         return null;
-    // @ts-expect-error hasPage is protected
-    if (!(0, is_dynamic_1.isDynamicRoute)(pathname) && (await nextServer.hasPage(pathname)))
-        return pathname;
-    // @ts-expect-error dynamicRoutes is protected
-    for (const route of nextServer.dynamicRoutes ?? []) {
-        const params = route.match(pathname) || undefined;
-        if (params)
-            return route.page;
+    const appRoutes = {
+        // @ts-expect-error appPathRoutes is protected
+        ...nextServer.appPathRoutes,
+        // @ts-expect-error getAppPathRoutes is protected
+        ...nextServer.getAppPathRoutes(),
+    };
+    // TODO: 'appRoutes[pathname]' is an array of routes,  need to investigate in which case that array has more than one item
+    if (pathname in appRoutes) {
+        const route = appRoutes[pathname][0];
+        if (!route?.endsWith('/route'))
+            return null;
+        return route;
     }
     return null;
 }