diff options
| -rw-r--r-- | package-lock.json | 5 | ||||
| -rw-r--r-- | public/scripts/chat.js | 47 |
2 files changed, 47 insertions, 5 deletions
diff --git a/package-lock.json b/package-lock.json index f6f5829..f6cc5e5 100644 --- a/package-lock.json +++ b/package-lock.json @@ -3765,6 +3765,11 @@ "object-assign": "^4.0.1" } }, + "file-type": { + "version": "10.8.0", + "resolved": "https://registry.npmjs.org/file-type/-/file-type-10.8.0.tgz", + "integrity": "sha512-287YScp3cpRWzhM+/E+A85O4FJi4dHus0eA6eBUzkRc08d/JAwqeczU/nwLstRuzzq/S7TqvQg9mhv7xVsdINQ==" + }, "filename-regex": { "version": "2.0.1", "resolved": "https://registry.npmjs.org/filename-regex/-/filename-regex-2.0.1.tgz", diff --git a/public/scripts/chat.js b/public/scripts/chat.js index 0e301e5..ef3eaef 100644 --- a/public/scripts/chat.js +++ b/public/scripts/chat.js @@ -8,8 +8,10 @@ // general imports const $ = jQuery = require('jquery'); require('jquery-ui-bundle'); +const util = require('util'); const swal = require('sweetalert'); const xkcdPassword = require('xkcd-password'); +const dragDrop = require('drag-drop'); const encryption = require('./encryption'); const wordList = require('./wordlist'); const pinInput = require('./input_pin'); @@ -94,6 +96,9 @@ function chat() { $('#chat') .fadeIn(); + // init file sending support + initFileSending(); + // start the peer const peer = new Peer(peerId, { host, @@ -172,8 +177,8 @@ function chat() { conn.send({ type: 'state', data: 'declined', - }) - .then(() => conn.close()); + }); + // .then(() => conn.close()); TODO: Add promise for connection closing } }); }); @@ -267,6 +272,8 @@ function chat() { ) .then(plaintext => $('#messages') .append(`<span>${plaintext}</span><br>`)); + } else if (message.type === 'file') { + processFile(message); } else if (message.type === 'key') { await encryption.storePeerPublicKey(connectedPeer.peer, message.data); } @@ -274,11 +281,41 @@ function chat() { /** * Sends a message of the text input field - * @returns {Promise<String>} + * @returns {Promise<void>} */ async function sendMessageFromInput() { const messageInput = $('#message'); - return await sendMessage(messageInput.val()) & messageInput.val(''); + await sendMessage(messageInput.val()); + messageInput.val(''); + } + + /** + * Initialized the file sending feature + */ + function initFileSending() { + dragDrop('body', (files) => { + files.forEach(async (file) => { + connectedPeer.send({ + type: 'file', + info: { + name: file.name, + size: file.size, + type: file.type, + }, + data: file, + }); + console.log('[LOG] File sent!'); // TODO: Make it async! + }); + }); + } + + /** + * Processes a received/sent file + * @param file + */ + function processFile(file) { + console.log(file.info); + // TODO: Show file in chat with preview and icon } /** @@ -384,7 +421,7 @@ function chat() { $(document) .ready(() => { $('#send_message') - .on('click', async () => await sendMessageFromInput()); + .on('click', async () => sendMessageFromInput()); $('#message') .on('keydown', async (e) => { if (e.key === 'Enter') await sendMessageFromInput(); |