mirrors/PairDrop
1
0
Fork 0
mirror of https://github.com/schlagmichdoch/PairDrop.git synced 2025-04-20 15:06:15 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Add proper functions for all event listeners in ServerConnection constructor

Browse source
This commit is contained in:
schlagmichdoch 2024-02-22 14:11:56 +01:00
parent 00f1a20177
commit 9dae6d588d
1 changed files with 30 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

40
public/scripts/network.js
View file

@ -8,13 +8,13 @@ class ServerConnection {
navigator.connection.addEventListener('change', _ => this._reconnect()); navigator.connection.addEventListener('change', _ => this._reconnect());
} }
Events.on('room-secrets', e => this.send({ type: 'room-secrets', roomSecrets: e.detail })); Events.on('join-ip-room', _ => this._sendJoinIpRoom());
Events.on('join-ip-room', _ => this.send({ type: 'join-ip-room'})); Events.on('room-secrets', e => this._sendRoomSecrets(e.detail));
Events.on('room-secrets-deleted', e => this.send({ type: 'room-secrets-deleted', roomSecrets: e.detail})); Events.on('room-secrets-deleted', e => this._sendRoomSecretsDeleted(e.detail));
Events.on('regenerate-room-secret', e => this.send({ type: 'regenerate-room-secret', roomSecret: e.detail})); Events.on('regenerate-room-secret', e => this._sendRegenerateRoomSecret(e.detail));
Events.on('pair-device-initiate', _ => this._onPairDeviceInitiate()); Events.on('pair-device-initiate', _ => this._sendPairDeviceInitiate());
Events.on('pair-device-join', e => this._onPairDeviceJoin(e.detail)); Events.on('pair-device-join', e => this._sendPairDeviceJoin(e.detail));
Events.on('pair-device-cancel', _ => this.send({ type: 'pair-device-cancel' })); Events.on('pair-device-cancel', _ => this._sendPairDeviceCancel());
Events.on('create-public-room', _ => this._onCreatePublicRoom()); Events.on('create-public-room', _ => this._onCreatePublicRoom());
Events.on('join-public-room', e => this._onJoinPublicRoom(e.detail.roomId, e.detail.createIfInvalid)); Events.on('join-public-room', e => this._onJoinPublicRoom(e.detail.roomId, e.detail.createIfInvalid));
@ -93,7 +93,23 @@ class ServerConnection {
} }
} }
_onPairDeviceInitiate() { _sendJoinIpRoom() {
this.send({ type: 'join-ip-room'});
}
_sendRoomSecrets(roomSecrets) {
this.send({ type: 'room-secrets', roomSecrets: roomSecrets });
}
_sendRoomSecretsDeleted(roomSecrets) {
this.send({ type: 'room-secrets-deleted', roomSecrets: roomSecrets});
}
_sendRegenerateRoomSecret(roomSecret) {
this.send({ type: 'regenerate-room-secret', roomSecret: roomSecret});
}
_sendPairDeviceInitiate() {
if (!this._isConnected()) { if (!this._isConnected()) {
Events.fire('notify-user', Localization.getTranslation("notifications.online-requirement-pairing")); Events.fire('notify-user', Localization.getTranslation("notifications.online-requirement-pairing"));
return; return;
@ -101,15 +117,19 @@ class ServerConnection {
this.send({ type: 'pair-device-initiate' }); this.send({ type: 'pair-device-initiate' });
} }
_onPairDeviceJoin(pairKey) { _sendPairDeviceJoin(pairKey) {
if (!this._isConnected()) { if (!this._isConnected()) {
// Todo: instead use pending outbound ws queue // Todo: instead use pending outbound ws queue
setTimeout(() => this._onPairDeviceJoin(pairKey), 1000); setTimeout(() => this._sendPairDeviceJoin(pairKey), 1000);
return; return;
} }
this.send({ type: 'pair-device-join', pairKey: pairKey }); this.send({ type: 'pair-device-join', pairKey: pairKey });
} }
_sendPairDeviceCancel() {
this.send({ type: 'pair-device-cancel' });
}
_onCreatePublicRoom() { _onCreatePublicRoom() {
if (!this._isConnected()) { if (!this._isConnected()) {
Events.fire('notify-user', Localization.getTranslation("notifications.online-requirement-public-room")); Events.fire('notify-user', Localization.getTranslation("notifications.online-requirement-public-room"));