harmacist/darkwire.io
1
0
Fork 0
mirror of https://github.com/darkwire/darkwire.io.git synced 2025-07-18 18:54:52 +00:00
Code Issues Projects Releases Wiki Activity

Creating some stability

Browse Source
This commit is contained in:
Dan Seripap 2016-02-19 11:57:01 -05:00
parent e59bb2a1cf
commit ebeab321e1
2 changed files with 113 additions and 95 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
src/js/darkwire.js
View File

@ -52,14 +52,21 @@ export default class Darkwire {
return importKeysPromises; return importKeysPromises;
} }
sendMessage(message, messageType) { removeUser(data) {
this._users = _.without(this._users, _.findWhere(this._users, {id: data.id}));
return this._users;
}
encodeMessage(message, messageType) {
// Don't send unless other users exist // Don't send unless other users exist
console.log(this._users); return new Promise( (resolve, reject) => {
if (this._users.length <= 1) return; if (this._users.length <= 1) {
reject();
return;
};
// if there is a non-empty message and a socket connection // if there is a non-empty message and a socket connection
if (message && this._connected) { if (message && this._connected) {
$inputMessage.val('');
$('#send-message-btn').removeClass('active'); $('#send-message-btn').removeClass('active');
addChatMessage({ addChatMessage({
username: username, username: username,
@ -84,10 +91,10 @@ export default class Darkwire {
signingKey = key; signingKey = key;
// Generate secretKey and encrypt with each user's public key // Generate secretKey and encrypt with each user's public key
let promises = []; let promises = [];
_.each(this._users, function(user) { _.each(this._users, (user) => {
// If not me // If not me
if (user.username !== window.username) { if (user.username !== window.username) {
let promise = new Promise(function(resolve, reject) { let promise = new Promise((res, rej) => {
let thisUser = user; let thisUser = user;
let secretKeyStr; let secretKeyStr;
@ -110,7 +117,7 @@ export default class Darkwire {
.then(function(encryptedSigningKey) { .then(function(encryptedSigningKey) {
let encData = new Uint8Array(encryptedSigningKey); let encData = new Uint8Array(encryptedSigningKey);
var str = this._cryptoUtil.convertArrayBufferViewToString(encData); var str = this._cryptoUtil.convertArrayBufferViewToString(encData);
resolve({ res({
id: thisUser.id, id: thisUser.id,
secretKey: secretKeyStr, secretKey: secretKeyStr,
encryptedSigningKey: str encryptedSigningKey: str
@ -136,7 +143,7 @@ export default class Darkwire {
let msg = this._cryptoUtil.convertArrayBufferViewToString(new Uint8Array(encryptedMessageData)); let msg = this._cryptoUtil.convertArrayBufferViewToString(new Uint8Array(encryptedMessageData));
let vct = this._cryptoUtil.convertArrayBufferViewToString(new Uint8Array(vector)); let vct = this._cryptoUtil.convertArrayBufferViewToString(new Uint8Array(vector));
let sig = this._cryptoUtil.convertArrayBufferViewToString(new Uint8Array(signature)); let sig = this._cryptoUtil.convertArrayBufferViewToString(new Uint8Array(signature));
socket.emit('new message', { resolve({
message: msg, message: msg,
vector: vct, vector: vct,
messageType: type, messageType: type,
@ -145,6 +152,8 @@ export default class Darkwire {
}); });
}); });
} }
});
} }
decodeMessage(data) { decodeMessage(data) {

19
src/js/main.js
View File

@ -232,7 +232,12 @@ $(function() {
// When the client hits ENTER on their keyboard and chat message input is focused // When the client hits ENTER on their keyboard and chat message input is focused
if (event.which === 13 && $('.inputMessage').is(':focus')) { if (event.which === 13 && $('.inputMessage').is(':focus')) {
let message = cleanInput($inputMessage.val()); let message = cleanInput($inputMessage.val());
darkwire.sendMessage(message, 'chat'); darkwire.encodeMessage(message, 'chat').then( (message) => {
$inputMessage.val('');
socket.emit('new message', message);
}).catch( (err) => {
console.log(err);
});
socket.emit('stop typing'); socket.emit('stop typing');
typing = false; typing = false;
} }
@ -309,7 +314,7 @@ $(function() {
addParticipantsMessage(data); addParticipantsMessage(data);
removeChatTyping(data); removeChatTyping(data);
users = _.without(users, _.findWhere(users, {id: data.id})); darkwire.removeUser(data);
renderParticipantsList(); renderParticipantsList();
}); });
@ -358,10 +363,14 @@ $(function() {
} }
$('#send-message-btn').click(function() { $('#send-message-btn').click(function() {
let message = $inputMessage.val(); let message = cleanInput($inputMessage.val());
// Prevent markup from being injected into the message // Prevent markup from being injected into the message
message = cleanInput(message); darkwire.encodeMessage(message, 'chat').then( (message) => {
darkwire.sendMessage(message, 'chat'); $inputMessage.val('');
socket.emit('new message', message);
}).catch( (err) => {
console.log(err);
});
socket.emit('stop typing'); socket.emit('stop typing');
typing = false; typing = false;
}); });