Skip to content

Commit 4808abd

Browse files
authoredApr 3, 2020
feat(progess): emit progress-update (#2498)
closes: #1666
1 parent adeb92e commit 4808abd

File tree

3 files changed

+17
-5
lines changed

3 files changed

+17
-5
lines changed
 

‎lib/Server.js

+4
Original file line numberDiff line numberDiff line change
@@ -155,6 +155,10 @@ class Server {
155155
}
156156

157157
this.sockWrite(this.sockets, 'progress-update', { percent, msg });
158+
159+
if (this.listeningApp) {
160+
this.listeningApp.emit('progress-update', { percent, msg });
161+
}
158162
}).apply(this.compiler);
159163
}
160164

‎lib/servers/WebsocketServer.js

+6-4
Original file line numberDiff line numberDiff line change
@@ -31,11 +31,13 @@ module.exports = class WebsocketServer extends BaseServer {
3131
const noop = () => {};
3232

3333
setInterval(() => {
34-
this.wsServer.clients.forEach((ws) => {
35-
if (ws.isAlive === false) return ws.terminate();
34+
this.wsServer.clients.forEach((socket) => {
35+
if (socket.isAlive === false) {
36+
return socket.terminate();
37+
}
3638

37-
ws.isAlive = false;
38-
ws.ping(noop);
39+
socket.isAlive = false;
40+
socket.ping(noop);
3941
});
4042
}, this.server.heartbeatInterval);
4143
}

‎test/server/progress-option.test.js

+7-1
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,13 @@ describe('progress', () => {
4646
});
4747

4848
compiler.run(() => {});
49-
server.listen(port, 'localhost');
49+
const app = server.listen(port, 'localhost');
50+
51+
app.on('progress-update', ({ percent, msg }) => {
52+
expect(percent).toBeGreaterThanOrEqual(0);
53+
expect(percent).toBeLessThanOrEqual(100);
54+
expect(typeof msg).toEqual('string');
55+
});
5056
});
5157
});
5258
});

0 commit comments

Comments
 (0)
Please sign in to comment.