@modern-js/server 1.4.1 → 1.4.2

package/CHANGELOG.md

@@ -1,5 +1,15 @@
 # @modern-js/server
 
+## 1.4.2
+
+### Patch Changes
+
+- 735b2a81: prevent ssr compiler to send socket message
+- Updated dependencies [b376c8d6]
+- Updated dependencies [e62c4efd]
+- Updated dependencies [e2a8233f]
+  - @modern-js/core@1.4.2
+
 ## 1.4.1
 
 ### Patch Changes

package/dist/js/modern/dev-tools/socket-server.js

@@ -8,6 +8,7 @@ export default class SocketServer {
     this.options = void 0;
     this.app = void 0;
     this.stats = void 0;
+    this.timer = null;
     this.options = options;
   } // create socket, install socket handler, bind socket event
 
@@ -32,7 +33,7 @@ export default class SocketServer {
       // only dev server, use default logger
       logger.error(err);
     });
-    setInterval(() => {
+    this.timer = setInterval(() => {
       this.wsServer.clients.forEach(socket => {
         const extWs = socket;
 
@@ -45,49 +46,7 @@ export default class SocketServer {
       });
     }, 30000);
     this.wsServer.on('connection', socket => {
-      const connection = socket;
-      connection.isAlive = true;
-      connection.on('pong', () => {
-        connection.isAlive = true;
-      });
-
-      if (!connection) {
-        return;
-      }
-
-      this.sockets.push(connection);
-      connection.on('close', () => {
-        const idx = this.sockets.indexOf(connection);
-
-        if (idx >= 0) {
-          this.sockets.splice(idx, 1);
-        }
-      });
-
-      if (this.options.client.logging) {
-        this.sockWrite('logging', this.options.client.logging);
-      }
-
-      if (this.options.hot || this.options.hot === 'only') {
-        this.sockWrite('hot');
-      }
-
-      if (this.options.liveReload) {
-        this.sockWrite('liveReload');
-      }
-
-      if (this.options.client.progress) {
-        this.sockWrite('progress', this.options.client.progress);
-      }
-
-      if (this.options.client.overlay) {
-        this.sockWrite('overlay', this.options.client.overlay);
-      } // send first stats to active client sock if stats exist
-
-
-      if (this.stats) {
-        this.sendStats(true);
-      }
+      this.onConnect(socket);
     });
   }
 
@@ -106,10 +65,68 @@ export default class SocketServer {
     });
   }
 
+  singleWrite(socket, type, data) {
+    this.send(socket, JSON.stringify({
+      type,
+      data
+    }));
+  }
+
   close() {
     this.sockets.forEach(socket => {
       socket.close();
     });
+
+    if (this.timer) {
+      clearInterval(this.timer);
+      this.timer = null;
+    }
+  }
+
+  onConnect(socket) {
+    const connection = socket;
+    connection.isAlive = true;
+    connection.on('pong', () => {
+      connection.isAlive = true;
+    });
+
+    if (!connection) {
+      return;
+    }
+
+    this.sockets.push(connection);
+    connection.on('close', () => {
+      const idx = this.sockets.indexOf(connection);
+
+      if (idx >= 0) {
+        this.sockets.splice(idx, 1);
+      }
+    });
+
+    if (this.options.client.logging) {
+      this.singleWrite(connection, 'logging', this.options.client.logging);
+    }
+
+    if (this.options.hot || this.options.hot === 'only') {
+      this.singleWrite(connection, 'hot');
+    }
+
+    if (this.options.liveReload) {
+      this.singleWrite(connection, 'liveReload');
+    }
+
+    if (this.options.client.progress) {
+      this.singleWrite(connection, 'progress', this.options.client.progress);
+    }
+
+    if (this.options.client.overlay) {
+      this.singleWrite(connection, 'overlay', this.options.client.overlay);
+    } // send first stats to active client sock if stats exist
+
+
+    if (this.stats) {
+      this.sendStats(true);
+    }
   } // get standard stats
 
 

package/dist/js/modern/server/dev-server/dev-server.js

@@ -183,6 +183,10 @@ export class ModernDevServer extends ModernServer {
     };
 
     const addHooks = compiler => {
+      if (compiler.name === 'server') {
+        return;
+      }
+
       const {
         compile,
         invalid,

package/dist/js/node/dev-tools/socket-server.js

@@ -20,6 +20,7 @@ class SocketServer {
     this.options = void 0;
     this.app = void 0;
     this.stats = void 0;
+    this.timer = null;
     this.options = options;
   } // create socket, install socket handler, bind socket event
 
@@ -44,7 +45,7 @@ class SocketServer {
       // only dev server, use default logger
       _utils.logger.error(err);
     });
-    setInterval(() => {
+    this.timer = setInterval(() => {
       this.wsServer.clients.forEach(socket => {
         const extWs = socket;
 
@@ -57,49 +58,7 @@ class SocketServer {
       });
     }, 30000);
     this.wsServer.on('connection', socket => {
-      const connection = socket;
-      connection.isAlive = true;
-      connection.on('pong', () => {
-        connection.isAlive = true;
-      });
-
-      if (!connection) {
-        return;
-      }
-
-      this.sockets.push(connection);
-      connection.on('close', () => {
-        const idx = this.sockets.indexOf(connection);
-
-        if (idx >= 0) {
-          this.sockets.splice(idx, 1);
-        }
-      });
-
-      if (this.options.client.logging) {
-        this.sockWrite('logging', this.options.client.logging);
-      }
-
-      if (this.options.hot || this.options.hot === 'only') {
-        this.sockWrite('hot');
-      }
-
-      if (this.options.liveReload) {
-        this.sockWrite('liveReload');
-      }
-
-      if (this.options.client.progress) {
-        this.sockWrite('progress', this.options.client.progress);
-      }
-
-      if (this.options.client.overlay) {
-        this.sockWrite('overlay', this.options.client.overlay);
-      } // send first stats to active client sock if stats exist
-
-
-      if (this.stats) {
-        this.sendStats(true);
-      }
+      this.onConnect(socket);
     });
   }
 
@@ -118,10 +77,68 @@ class SocketServer {
     });
   }
 
+  singleWrite(socket, type, data) {
+    this.send(socket, JSON.stringify({
+      type,
+      data
+    }));
+  }
+
   close() {
     this.sockets.forEach(socket => {
       socket.close();
     });
+
+    if (this.timer) {
+      clearInterval(this.timer);
+      this.timer = null;
+    }
+  }
+
+  onConnect(socket) {
+    const connection = socket;
+    connection.isAlive = true;
+    connection.on('pong', () => {
+      connection.isAlive = true;
+    });
+
+    if (!connection) {
+      return;
+    }
+
+    this.sockets.push(connection);
+    connection.on('close', () => {
+      const idx = this.sockets.indexOf(connection);
+
+      if (idx >= 0) {
+        this.sockets.splice(idx, 1);
+      }
+    });
+
+    if (this.options.client.logging) {
+      this.singleWrite(connection, 'logging', this.options.client.logging);
+    }
+
+    if (this.options.hot || this.options.hot === 'only') {
+      this.singleWrite(connection, 'hot');
+    }
+
+    if (this.options.liveReload) {
+      this.singleWrite(connection, 'liveReload');
+    }
+
+    if (this.options.client.progress) {
+      this.singleWrite(connection, 'progress', this.options.client.progress);
+    }
+
+    if (this.options.client.overlay) {
+      this.singleWrite(connection, 'overlay', this.options.client.overlay);
+    } // send first stats to active client sock if stats exist
+
+
+    if (this.stats) {
+      this.sendStats(true);
+    }
   } // get standard stats
 
 

package/dist/js/node/server/dev-server/dev-server.js

@@ -212,6 +212,10 @@ class ModernDevServer extends _modernServer.ModernServer {
     };
 
     const addHooks = compiler => {
+      if (compiler.name === 'server') {
+        return;
+      }
+
       const {
         compile,
         invalid,

package/dist/types/dev-tools/socket-server.d.ts

@@ -1,5 +1,6 @@
 /// <reference types="node" />
 import { Server } from 'http';
+import ws from 'ws';
 import type { Stats } from 'webpack';
 import { DevServerOptions } from '../type';
 export default class SocketServer {
@@ -8,11 +9,14 @@ export default class SocketServer {
   private readonly options;
   private app?;
   private stats?;
+  private timer;
   constructor(options: DevServerOptions);
   prepare(app: Server): void;
   updateStats(stats: Stats): void;
   sockWrite(type: string, data?: Record<string, any> | string | boolean): void;
+  singleWrite(socket: ws, type: string, data?: Record<string, any> | string | boolean): void;
   close(): void;
+  private onConnect;
   private getStats;
   private sendStats;
   private send;

package/package.json

@@ -11,7 +11,7 @@
     "modern",
     "modern.js"
   ],
-  "version": "1.4.1",
+  "version": "1.4.2",
   "jsnext:source": "./src/index.ts",
   "types": "./dist/types/index.d.ts",
   "main": "./dist/js/node/index.js",
@@ -34,7 +34,7 @@
     "@babel/preset-typescript": "^7.15.0",
     "@babel/register": "^7.15.3",
     "@babel/runtime": "^7",
-    "@modern-js/core": "^1.4.1",
+    "@modern-js/core": "^1.4.2",
     "@modern-js/hmr-client": "^1.2.1",
     "@modern-js/server-core": "^1.2.2",
     "@modern-js/server-utils": "^1.2.1",
@@ -65,7 +65,7 @@
   },
   "devDependencies": {
     "@scripts/build": "0.0.0",
-    "@modern-js/types": "^1.3.1",
+    "@modern-js/types": "^1.3.2",
     "@types/jest": "^26",
     "@types/lru-cache": "^5.1.1",
     "@types/mime-types": "^2.1.0",

package/tests/dev.test.ts

@@ -53,14 +53,31 @@ describe('test dev tools', () => {
 
     const socket = {
       state: 1,
+      readyState: 1,
+      data: '',
       close() {
         socket.state = 0;
+      },
+      send(data: string) {
+        socket.data = data;
+      },
+      on() {
         // empty
       },
     };
+
+    socketServer.onConnect(socket);
+
     socketServer.sockets = [socket];
+    socketServer.sockWrite('test');
+    expect(socket.data).toBe(JSON.stringify({ type: 'test' }));
+
+    socketServer.singleWrite(socket, 'single');
+    expect(socket.data).toBe(JSON.stringify({ type: 'single' }));
+
     socketServer.close();
     expect(socket.state).toBe(0);
+    app.close();
   });
 
   test('should dev server plugin work correctly', () => {