next-ws 0.1.1 → 0.1.3

package/package.json

@@ -1,7 +1,6 @@
 {
     "name": "next-ws",
-    "private": false,
-    "version": "0.1.1",
+    "version": "0.1.3",
     "description": "Add support for WebSockets in Next.js 13 app directory",
     "packageManager": "yarn@3.6.0",
     "license": "MIT",
@@ -20,7 +19,7 @@
         "clean": "rimraf ./*.{js,d.ts,js.map}",
         "lint": "eslint --ext .ts,.tsx src",
         "format": "prettier --write src/**/*.{ts,tsx} && eslint --fix --ext .ts,.tsx src/",
-        "postinstall": "node patch.js"
+        "postinstall": "node -e \"try{require('./patch.js')}catch{}\""
     },
     "dependencies": {
         "@babel/generator": "^7.22.3",

package/patch.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 const tslib_1 = require("tslib");
+/* eslint-disable no-template-curly-in-string */
 const fs = tslib_1.__importStar(require("node:fs/promises"));
 const generator_1 = tslib_1.__importDefault(require("@babel/generator"));
 const parser = tslib_1.__importStar(require("@babel/parser"));
@@ -8,6 +9,7 @@ const template_1 = tslib_1.__importDefault(require("@babel/template"));
 void main();
 async function main() {
     await patchNextNodeServer();
+    await patchNextTypesPlugin();
 }
 const mod = template_1.default.expression.ast `require("next-ws/server")`;
 // Add `require('next-ws/server').hookNextNodeServer.call(this)` to the
@@ -33,4 +35,16 @@ async function patchNextNodeServer() {
         constructorMethod.body.body.push(statement);
     await fs.writeFile(filePath, (0, generator_1.default)(ast).code);
 }
+// Add `SOCKET?: Function` to the page module interface check field thing in
+// `next/dist/build/webpack/plugins/next-types-plugin.js`
+async function patchNextTypesPlugin() {
+    const filePath = require.resolve('next/dist/build/webpack/plugins/next-types-plugin.js');
+    const content = await fs.readFile(filePath, 'utf8');
+    if (content.includes('SOCKET?: Function'))
+        return;
+    const toFind = '.map((method)=>`${method}?: Function`).join("\\n  ")';
+    const replaceWith = `${toFind} + "; SOCKET?: Function"`;
+    const newContent = content.replace(toFind, replaceWith);
+    await fs.writeFile(filePath, newContent);
+}
 //# sourceMappingURL=patch.js.map

package/server.js

@@ -5,11 +5,11 @@ const tslib_1 = require("tslib");
 const node_http_1 = require("node:http");
 const node_path_1 = tslib_1.__importDefault(require("node:path"));
 const Log = tslib_1.__importStar(require("next/dist/build/output/log"));
-const is_api_route_1 = require("next/dist/lib/is-api-route");
 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");
 const ws_1 = require("ws");
 const openSockets = new Set();
+let existingWebSocketServer;
 function hookNextNodeServer() {
     var _a;
     if (!this || !(this instanceof next_server_1.default))
@@ -17,8 +17,11 @@ function hookNextNodeServer() {
     const server = (_a = this.serverOptions) === null || _a === void 0 ? void 0 : _a.httpServer;
     if (!server || !(server instanceof node_http_1.Server))
         throw new Error("[next-ws] Failed to find NextNodeServer's HTTP server");
+    if (existingWebSocketServer)
+        return;
     const wss = new ws_1.WebSocketServer({ noServer: true });
     Log.ready('[next-ws] loaded successfully');
+    existingWebSocketServer = wss;
     server.on('upgrade', async (request, socket, head) => {
         var _a;
         const url = new URL((_a = request.url) !== null && _a !== void 0 ? _a : '', 'http://next-ws');
@@ -59,14 +62,12 @@ function hookNextNodeServer() {
 }
 exports.hookNextNodeServer = hookNextNodeServer;
 async function isPageFound(pathname) {
-    const isPageFound = !(0, is_dynamic_1.isDynamicRoute)(pathname) && (await this.hasPage(pathname));
-    if (isPageFound)
+    var _a;
+    if (!(0, is_dynamic_1.isDynamicRoute)(pathname) && (await this.hasPage(pathname)))
         return pathname;
-    else if (!this.dynamicRoutes)
-        return false;
-    for (const route of this.dynamicRoutes) {
+    for (const route of (_a = this.dynamicRoutes) !== null && _a !== void 0 ? _a : []) {
         const params = route.match(pathname) || undefined;
-        if ((0, is_api_route_1.isAPIRoute)(route.page) && params)
+        if (params)
             return route.page;
     }
     return false;