Briq
/
multiparty-meeting
7
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Cleaned up some socket request code

master
Håvar Aambø Fosstveit 2018-10-19 11:11:49 +02:00
parent 10c3427355
commit a7340fa155
2 changed files with 28 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
app/lib/RoomClient.js
View File

@ -275,7 +275,18 @@ export default class RoomClient
{ {
logger.debug('getChatHistory()'); logger.debug('getChatHistory()');
return this.sendRequest('chat-history', {}) return this.sendRequest('chat-history')
.then((response) =>
{
const { chatHistory } = response;
if (chatHistory.length > 0)
{
logger.debug('Got chat history');
this._dispatch(
stateActions.addChatHistory(chatHistory));
}
})
.catch((error) => .catch((error) =>
{ {
logger.error('getChatHistory() | failed: %o', error); logger.error('getChatHistory() | failed: %o', error);
@ -292,7 +303,18 @@ export default class RoomClient
{ {
logger.debug('getFileHistory()'); logger.debug('getFileHistory()');
return this.sendRequest('file-history', {}) return this.sendRequest('file-history')
.then((response) =>
{
const { fileHistory } = response;
if (fileHistory.length > 0)
{
logger.debug('Got files history');
this._dispatch(stateActions.addFileHistory(fileHistory));
}
})
.catch((error) => .catch((error) =>
{ {
logger.error('getFileHistory() | failed: %o', error); logger.error('getFileHistory() | failed: %o', error);
@ -1169,18 +1191,6 @@ export default class RoomClient
stateActions.addResponseMessage({ ...chatMessage, peerName })); stateActions.addResponseMessage({ ...chatMessage, peerName }));
}); });
this._signalingSocket.on('chat-history-receive', (data) =>
{
const { chatHistory } = data;
if (chatHistory.length > 0)
{
logger.debug('Got chat history');
this._dispatch(
stateActions.addChatHistory(chatHistory));
}
});
this._signalingSocket.on('file-receive', (data) => this._signalingSocket.on('file-receive', (data) =>
{ {
const payload = data.file; const payload = data.file;
@ -1191,18 +1201,6 @@ export default class RoomClient
text : `${payload.name} shared a file` text : `${payload.name} shared a file`
})); }));
}); });
this._signalingSocket.on('file-history-receive', (data) =>
{
const files = data.fileHistory;
if (files.length > 0)
{
logger.debug('Got files history');
this._dispatch(stateActions.addFileHistory(files));
}
});
} }
_joinRoom({ displayName, device }) _joinRoom({ displayName, device })

22
server/lib/Room.js
View File

@ -265,14 +265,8 @@ class Room extends EventEmitter
signalingPeer.socket.on('chat-history', (request, cb) => signalingPeer.socket.on('chat-history', (request, cb) =>
{ {
// Return no error // Return to sender
cb(null); cb(null, { chatHistory: this._chatHistory });
// Return to socket
signalingPeer.socket.emit(
'chat-history-receive',
{ chatHistory: this._chatHistory }
);
}); });
signalingPeer.socket.on('send-file', (request, cb) => signalingPeer.socket.on('send-file', (request, cb) =>
@ -300,16 +294,8 @@ class Room extends EventEmitter
signalingPeer.socket.on('file-history', (request, cb) => signalingPeer.socket.on('file-history', (request, cb) =>
{ {
// Return no error // Return to sender
cb(null); cb(null, { fileHistory : this._fileHistory });
// Return to socket
signalingPeer.socket.emit(
'file-history-receive',
{
fileHistory : this._fileHistory
}
);
}); });
signalingPeer.socket.on('raisehand-message', (request, cb) => signalingPeer.socket.on('raisehand-message', (request, cb) =>