From e72b87c9bf5a8fc0bbef5e511a2cbc8fce110c89 Mon Sep 17 00:00:00 2001 From: Pierre-Gilles Leymarie Date: Mon, 9 Nov 2020 15:30:15 +0200 Subject: [PATCH 1/3] Fix #932 : fix start scene button in scene list --- front/src/routes/scene/SceneCard.jsx | 55 ++++++++++++++++++---------- 1 file changed, 35 insertions(+), 20 deletions(-) diff --git a/front/src/routes/scene/SceneCard.jsx b/front/src/routes/scene/SceneCard.jsx index 8bd4830dee..5ac5e07e41 100644 --- a/front/src/routes/scene/SceneCard.jsx +++ b/front/src/routes/scene/SceneCard.jsx @@ -1,34 +1,49 @@ import { Text } from 'preact-i18n'; import { Component } from 'preact'; import { Link } from 'preact-router/match'; +import cx from 'classnames'; import style from './style.css'; class SceneCard extends Component { - startScene = () => { - this.props.startScene(this.props.scene.selector); + startScene = async () => { + try { + await this.setState({ saving: true }); + await this.props.httpClient.post(`/api/v1/scene/${this.props.scene.selector}/start`); + } catch (e) {} + // make sure the loader is displayed at least 200ms + setTimeout(() => this.setState({ saving: false }), 200); }; - render(props, {}) { + render(props, { saving }) { return (
-
-
- -
-

{props.scene.name}

-
{props.scene.description}
-
-
-
- - - - - +
+
+
+
+
+ +
+

{props.scene.name}

+
{props.scene.description}
+
+
+
+ + + + + +
+
From 3a7cfcd67ade06c7657a3484a6d2533ecadbeee6 Mon Sep 17 00:00:00 2001 From: Pierre-Gilles Leymarie Date: Mon, 9 Nov 2020 15:41:11 +0200 Subject: [PATCH 2/3] Fix #931 : WebSocket is not open bug --- server/api/websockets/index.js | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/server/api/websockets/index.js b/server/api/websockets/index.js index 0e85cf8b26..19b0e7108e 100644 --- a/server/api/websockets/index.js +++ b/server/api/websockets/index.js @@ -1,3 +1,4 @@ +const WebSocket = require('ws'); const { parseWebsocketMessage, formatWebsocketMessage } = require('../../utils/websocketUtils'); const { EVENTS, WEBSOCKET_MESSAGE_TYPES, ERROR_MESSAGES } = require('../../utils/constants'); const logger = require('../../utils/logger'); @@ -21,7 +22,9 @@ function sendMessageUser({ type, payload, userId }) { return; } this.connections[userId].forEach((userConnection) => { - userConnection.client.send(formatWebsocketMessage(type, payload)); + if (userConnection && userConnection.client && userConnection.client.readyState === WebSocket.OPEN) { + userConnection.client.send(formatWebsocketMessage(type, payload)); + } }); } @@ -35,7 +38,9 @@ function sendMessageAllUsers({ type, payload }) { const usersIds = Object.keys(this.connections); usersIds.forEach((userId) => { this.connections[userId].forEach((userConnection) => { - userConnection.client.send(formatWebsocketMessage(type, payload)); + if (userConnection && userConnection.client && userConnection.client.readyState === WebSocket.OPEN) { + userConnection.client.send(formatWebsocketMessage(type, payload)); + } }); }); } From f2d481da09740165f3b8f32c16d02b1c5b721e18 Mon Sep 17 00:00:00 2001 From: Pierre-Gilles Leymarie Date: Mon, 9 Nov 2020 17:08:27 +0200 Subject: [PATCH 3/3] Add tests on Websocket manager --- server/test/websockets/index.test.js | 61 ++++++++++++++++++++++++++++ 1 file changed, 61 insertions(+) create mode 100644 server/test/websockets/index.test.js diff --git a/server/test/websockets/index.test.js b/server/test/websockets/index.test.js new file mode 100644 index 0000000000..7afd2d5954 --- /dev/null +++ b/server/test/websockets/index.test.js @@ -0,0 +1,61 @@ +const EventEmitter = require('events'); +const WebSocket = require('ws'); +const { assert, fake } = require('sinon'); +const WebsocketManager = require('../../api/websockets'); + +describe('Websockets', () => { + it('should send message to all users', () => { + const wss = new EventEmitter(); + const gladys = { + event: new EventEmitter(), + }; + const websocketManager = new WebsocketManager(wss, gladys); + const client = { + readyState: WebSocket.OPEN, + send: fake.returns(0), + }; + const message = { + type: 'test', + payload: 'test', + }; + websocketManager.userConnected({ id: 'aa0eaee9-5b90-4287-841a-0237f9d75832' }, client); + websocketManager.sendMessageAllUsers(message); + assert.calledWith(client.send, JSON.stringify(message)); + }); + it('should not send message to all users', () => { + const wss = new EventEmitter(); + const gladys = { + event: new EventEmitter(), + }; + const websocketManager = new WebsocketManager(wss, gladys); + const client = { + readyState: WebSocket.CLOSED, + send: fake.returns(0), + }; + const message = { + type: 'test', + payload: 'test', + }; + websocketManager.userConnected({ id: 'aa0eaee9-5b90-4287-841a-0237f9d75832' }, client); + websocketManager.sendMessageAllUsers(message); + assert.notCalled(client.send); + }); + it('should send message to one users', () => { + const wss = new EventEmitter(); + const gladys = { + event: new EventEmitter(), + }; + const websocketManager = new WebsocketManager(wss, gladys); + const client = { + readyState: WebSocket.OPEN, + send: fake.returns(0), + }; + const message = { + type: 'test', + payload: 'test', + }; + websocketManager.userConnected({ id: 'aa0eaee9-5b90-4287-841a-0237f9d75832' }, client); + websocketManager.sendMessageUser({ ...message, userId: 'aa0eaee9-5b90-4287-841a-0237f9d75832' }); + assert.calledWith(client.send, JSON.stringify(message)); + }); +});