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

Merge 6f194db843 into 50539ed485

Browse source
This commit is contained in:
schlagmichdoch 2024-08-27 13:34:18 -04:00 • committed by GitHub
commit b98dbfd94d
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
4 changed files with 97 additions and 34 deletions
Download patch file Download diff file Expand all files Collapse all files

4
public/scripts/main.js
View file

@ -118,8 +118,8 @@ class PairDrop {
this.$headerNotificationBtn.removeAttribute('hidden');
}
let roomSecrets = await PersistentStorage.getAllRoomSecrets();
if (roomSecrets.length > 0) {
let roomSecretsCount = await PersistentStorage.getAllRoomSecretsCount();
if (roomSecretsCount > 0) {
this.$headerEditPairedDevicesBtn.removeAttribute('hidden');
this.$footerPairedDevicesBadge.removeAttribute('hidden');
}

40
public/scripts/network.js
View file

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

80
public/scripts/persistent-storage.js
View file

@ -4,7 +4,7 @@ class PersistentStorage {
PersistentStorage.logBrowserNotCapable();
return;
}
const DBOpenRequest = window.indexedDB.open('pairdrop_store', 5);
const DBOpenRequest = window.indexedDB.open('pairdrop_store', 6);
DBOpenRequest.onerror = e => {
PersistentStorage.logBrowserNotCapable();
Logger.error('Error initializing database:', e);
@ -49,6 +49,28 @@ class PersistentStorage {
await PersistentStorage.delete('editedDisplayName');
}
}
if (e.oldVersion <= 5) {
// migrate to v6
let roomSecretsObjectStore5 = txn.objectStore('room_secrets');
roomSecretsObjectStore5.createIndex('ws_domain', 'ws_domain');
// add current ws_domain to existing peer secret entries once the config has loaded
Events.on('config-loaded', _ => PersistentStorage.addCurrentWsDomainToAllRoomSecrets(), { once: true });
}
}
}
static getCurrentWsDomain() {
return window._config && window._config.signalingServer
? window._config.signalingServer
: location.host + location.pathname;
}
static async addCurrentWsDomainToAllRoomSecrets() {
const wsServerDomain = this.getCurrentWsDomain();
const roomSecrets = await PersistentStorage.getAllRoomSecrets(false);
for (let i = 0; i < roomSecrets.length; i++) {
await PersistentStorage.updateRoomSecret(roomSecrets[i], null, null, null, null, wsServerDomain);
}
}
@ -124,7 +146,8 @@ class PersistentStorage {
'secret': roomSecret,
'display_name': displayName,
'device_name': deviceName,
'auto_accept': false
'auto_accept': false,
'ws_domain': PersistentStorage.getCurrentWsDomain()
});
objectStoreRequest.onsuccess = e => {
Logger.debug(`Request successful. RoomSecret added: ${e.target.result}`);
@ -137,22 +160,28 @@ class PersistentStorage {
})
}
static async getAllRoomSecrets() {
try {
const roomSecrets = await this.getAllRoomSecretEntries();
let secrets = [];
for (let i = 0; i < roomSecrets.length; i++) {
secrets.push(roomSecrets[i].secret);
}
Logger.debug(`Request successful. Retrieved ${secrets.length} room_secrets`);
return(secrets);
} catch (e) {
this.logBrowserNotCapable();
return [];
}
static async getAllRoomSecretsCount(currentWsDomainOnly = true) {
return (await PersistentStorage.getAllRoomSecrets(currentWsDomainOnly)).length;
}
static getAllRoomSecretEntries() {
static async getAllRoomSecrets(currentWsDomainOnly = true) {
let secrets = [];
try {
const roomSecrets = await this.getAllRoomSecretEntries(currentWsDomainOnly);
secrets = roomSecrets.map(roomSecret => roomSecret.secret);
Logger.debug(`Request successful. Retrieved ${secrets.length} room_secrets`);
}
catch (e) {
console.debug(e)
this.logBrowserNotCapable();
}
return secrets;
}
static getAllRoomSecretEntries(currentWsDomainOnly = true) {
return new Promise((resolve, reject) => {
const DBOpenRequest = window.indexedDB.open('pairdrop_store');
DBOpenRequest.onsuccess = (e) => {
@ -161,7 +190,19 @@ class PersistentStorage {
const objectStore = transaction.objectStore('room_secrets');
const objectStoreRequest = objectStore.getAll();
objectStoreRequest.onsuccess = e => {
resolve(e.target.result);
let roomSecrets = e.target.result;
let roomSecretEntries = [];
for (let i = 0; i < roomSecrets.length; i++) {
const currentWsDomainDiffers = roomSecrets[i].ws_domain !== PersistentStorage.getCurrentWsDomain();
// if the saved ws domain differs from the current ws domain and only peers for the current ws domain should be returned -> skip this entry
if (currentWsDomainOnly && currentWsDomainDiffers) continue;
roomSecretEntries.push(roomSecrets[i]);
}
resolve(roomSecretEntries);
}
}
DBOpenRequest.onerror = (e) => {
@ -262,7 +303,7 @@ class PersistentStorage {
return this.updateRoomSecret(roomSecret, null, null, null, autoAccept);
}
static updateRoomSecret(roomSecret, updatedRoomSecret = null, updatedDisplayName = null, updatedDeviceName = null, updatedAutoAccept = null) {
static updateRoomSecret(roomSecret, updatedRoomSecret = null, updatedDisplayName = null, updatedDeviceName = null, updatedAutoAccept = null, wsDomain = null) {
return new Promise((resolve, reject) => {
const DBOpenRequest = window.indexedDB.open('pairdrop_store');
DBOpenRequest.onsuccess = e => {
@ -280,7 +321,8 @@ class PersistentStorage {
'secret': updatedRoomSecret !== null ? updatedRoomSecret : roomSecretEntry.entry.secret,
'display_name': updatedDisplayName !== null ? updatedDisplayName : roomSecretEntry.entry.display_name,
'device_name': updatedDeviceName !== null ? updatedDeviceName : roomSecretEntry.entry.device_name,
'auto_accept': updatedAutoAccept !== null ? updatedAutoAccept : roomSecretEntry.entry.auto_accept
'auto_accept': updatedAutoAccept !== null ? updatedAutoAccept : roomSecretEntry.entry.auto_accept,
'ws_domain': wsDomain !== null ? wsDomain : roomSecretEntry.entry.ws_domain
};
const objectStoreRequestUpdate = objectStore.put(updatedRoomSecretEntry, roomSecretEntry.key);

7
public/scripts/ui.js
View file

@ -1728,6 +1728,7 @@ class PairDeviceDialog extends Dialog {
Events.on('pair-device-join-key-invalid', _ => this._onPublicRoomJoinKeyInvalid());
Events.on('pair-device-canceled', e => this._onPairDeviceCanceled(e.detail));
Events.on('evaluate-number-room-secrets', _ => this._evaluateNumberRoomSecrets())
Events.on('config-loaded', _ => this._evaluateNumberRoomSecrets())
Events.on('secret-room-deleted', e => this._onSecretRoomDeleted(e.detail));
this.$el.addEventListener('paste', e => this._onPaste(e));
this.$qrCode.addEventListener('click', _ => this._copyPairUrl());
@ -1916,9 +1917,9 @@ class PairDeviceDialog extends Dialog {
_evaluateNumberRoomSecrets() {
PersistentStorage
.getAllRoomSecrets()
.then(roomSecrets => {
if (roomSecrets.length > 0) {
.getAllRoomSecretsCount()
.then(roomSecretsCount => {
if (roomSecretsCount > 0) {
this.$editPairedDevicesHeaderBtn.removeAttribute('hidden');
this.$footerInstructionsPairedDevices.removeAttribute('hidden');
}