Compare commits

...

42 Commits

Author SHA1 Message Date
schlagmichdoch d3e7de89cd Disable send text button after dialog has been hidden 2024-02-21 18:21:05 +01:00
schlagmichdoch 755d5e29f0 Implement fallback for text messages larger than the max message size to sent them in chunks via the send files API 2024-02-21 18:19:59 +01:00
schlagmichdoch 00f1a20177 Round progress to 4th digit to prevent weird progress bar behavior on reconnect 2024-02-17 12:27:29 +01:00
schlagmichdoch 3c8848d406 Add STATE_TRANSFER_REQUEST_RECEIVED and close transfer request dialog if requesting peer reloads 2024-02-17 12:27:29 +01:00
schlagmichdoch 0d17ada58b NoSleep: Move evaluation if any peer is still busy to the PeerManager 2024-02-17 12:27:28 +01:00
schlagmichdoch 74bd7dd406 Check if RAM would be exceeded before using navigator.share() 2024-02-17 12:27:28 +01:00
schlagmichdoch f4a947527d Move service worker digestion into separate class and add static function to check if it is supported by the browser. Change ram-exceed-ios waring accordingly. 2024-02-17 12:26:21 +01:00
schlagmichdoch 90f10910aa Fix _fileReceived getting called twice 2024-02-15 18:02:23 +01:00
schlagmichdoch aacf24c31f Fix reconnecting by always accepting new ice candidates 2024-02-15 18:02:23 +01:00
schlagmichdoch c0e5b66d41 Fix share menu error detection on iOS 2024-02-15 18:02:23 +01:00
schlagmichdoch 42bd71a3dc Add error status and check if too many bytes are received 2024-02-15 18:02:23 +01:00
schlagmichdoch a98499ea5a Move header comparison to _onTransferHeader function as there is no benefit in doing it after file is received 2024-02-15 18:02:23 +01:00
schlagmichdoch 7c471910ef Tidy up Peer classes 2024-02-15 18:02:15 +01:00
schlagmichdoch da558ddceb Move beforeunload event to Peer class to include it to the WSPeer; Add reset method to Peer class to prevent returning the "unfinished-transfers" warning when closing the page after a peer has left during transfer 2024-02-15 15:18:25 +01:00
schlagmichdoch 1df8fe258e Tidy up zipper functions 2024-02-15 15:18:25 +01:00
schlagmichdoch 65936a4d7d Truncate file used by the sw-file-digester.js after processing 2024-02-15 15:18:25 +01:00
schlagmichdoch 7c6062e1e0 Solve "transfer-complete" and "receive-complete" status detection via css instead of adding a new class 2024-02-13 18:24:08 +01:00
schlagmichdoch 902b5c6b8f Refactor file transfer 2024-02-09 04:11:36 +01:00
schlagmichdoch 19d33e11d8 Implement fallback to download if navigator.share() fails. Refactor ReceiveFileDialog 2024-02-09 04:11:36 +01:00
schlagmichdoch d8908e01ea Add alert for iOS when receiving big files using a private tab 2024-02-09 04:11:36 +01:00
schlagmichdoch 2d2cfec5f0 Add missing checks for transfer states 2024-02-09 04:11:36 +01:00
schlagmichdoch 40a12b5501 Fix progress animation 2024-02-09 04:11:36 +01:00
schlagmichdoch 5ee8bb871e Move file creation to serviceworker to prevent loading everything into RAM 2024-02-09 04:11:36 +01:00
schlagmichdoch ef3c338dad Activate NoSleep on file transfers instead of on click and deactivate when transfer is finished 2024-02-09 04:11:32 +01:00
schlagmichdoch 6d95f3f4e2 Fix canceling file selector on Windows Edge sometimes blocks UI (#257) 2024-02-09 01:59:30 +01:00
schlagmichdoch c33d49702e Animate progress circle and show complete status in blue for 10s 2024-02-09 01:56:23 +01:00
schlagmichdoch 1d62a9ff49 Add state management to network peers 2024-02-09 01:55:37 +01:00
schlagmichdoch 3dd40e238a Refactor _downloadNotification function 2024-02-09 01:55:37 +01:00
schlagmichdoch 417d5421a6 Refactor _displayFiles function; Only show ReceiveFileDialog if share menu is used OR if automatic download has not worked 2024-02-09 01:55:37 +01:00
schlagmichdoch 7af51bbd5f Tidy up chunker code 2024-02-09 01:55:37 +01:00
schlagmichdoch 88739107e4 Remove limit for sending to iOS devices (fixes #211) 2024-02-09 01:55:37 +01:00
schlagmichdoch 6de97e7ff1 Put all log prompts into new Logger class; Only log debugging logs to console if PairDrop is in debug mode; Implement activation of debug mode via URL argument (?debug=true) 2024-02-09 01:55:37 +01:00
schlagmichdoch b61de4eb87 send transfer abortion in some cases; Clarify variable names 2024-02-09 01:55:37 +01:00
schlagmichdoch cfe5b4afda Prevent full datachannel buffer on file end 2024-02-09 01:55:37 +01:00
schlagmichdoch 91fc2b7bf5 Add speed log to browser console 2024-02-09 01:55:37 +01:00
schlagmichdoch c670b39732 Fix byte size conversion 2024-02-09 01:55:37 +01:00
schlagmichdoch e5a09b6be1 Include label in x-peer size transformation; Prevent use of transparency for status & displayName; 2024-02-09 01:55:27 +01:00
schlagmichdoch 1d81b744ea Put blop sound into separate function and only play if on desktop 2024-02-05 21:08:10 +01:00
schlagmichdoch c37412cfd3 Fix variable should be static 2024-02-05 21:08:10 +01:00
schlagmichdoch a5dc8b6da2 Split transfer into message and data transfer and rewrite FileChunkerLogic completely. Condense all Relaying of the Websocket Fallback into one message type 'ws-relay' 2024-02-05 21:08:06 +01:00
schlagmichdoch d81c03a560 Prefill room secrets entry with displayName given by server to prevent displayName undefined in EditPairedDevices Dialog (fixes #221) 2024-02-05 02:16:25 +01:00
schlagmichdoch f22abca783 Implement new status 'connecting', automatic reconnect on disconnect and auto resume of transfer + sending of queued messages. (fixes #260 and #247) 2024-02-05 02:16:17 +01:00
30 changed files with 2357 additions and 1041 deletions
+2 -2
View File
@@ -447,7 +447,7 @@
<div class="center file-preview"></div> <div class="center file-preview"></div>
<div class="row-reverse center btn-row wrap"> <div class="row-reverse center btn-row wrap">
<button id="share-btn" class="btn btn-rounded btn-grey" data-i18n-key="dialogs.share" data-i18n-attrs="text" hidden></button> <button id="share-btn" class="btn btn-rounded btn-grey" data-i18n-key="dialogs.share" data-i18n-attrs="text" hidden></button>
<button id="download-btn" class="btn btn-rounded btn-grey" data-i18n-key="dialogs.download" data-i18n-attrs="text" autofocus disabled></button> <button id="download-btn" class="btn btn-rounded btn-grey" data-i18n-key="dialogs.download" data-i18n-attrs="text" autofocus disabled hidden></button>
<button class="btn btn-rounded btn-grey" data-i18n-key="dialogs.close" data-i18n-attrs="text" close></button> <button class="btn btn-rounded btn-grey" data-i18n-key="dialogs.close" data-i18n-attrs="text" close></button>
</div> </div>
</x-paper> </x-paper>
@@ -744,7 +744,7 @@
<script src="scripts/ui-main.js" defer></script> <script src="scripts/ui-main.js" defer></script>
<script src="scripts/main.js" defer></script> <script src="scripts/main.js" defer></script>
<!-- Sounds --> <!-- Sounds -->
<audio id="blop" autobuffer="true"> <audio id="blop" preload="metadata" disableremoteplayback="true" x-webkit-airplay="deny" muted>
<source src="sounds/blop.mp3" type="audio/mpeg"> <source src="sounds/blop.mp3" type="audio/mpeg">
<source src="sounds/blop.ogg" type="audio/ogg"> <source src="sounds/blop.ogg" type="audio/ogg">
</audio> </audio>
-1
View File
@@ -48,7 +48,6 @@
"pairing-cleared": "جميع الأجهزة غير مقترنة", "pairing-cleared": "جميع الأجهزة غير مقترنة",
"notifications-enabled": "تم تمكين الإشعارات", "notifications-enabled": "تم تمكين الإشعارات",
"online-requirement-pairing": "يجب أن تكون متصلاً بالإنترنت لإقران الأجهزة", "online-requirement-pairing": "يجب أن تكون متصلاً بالإنترنت لإقران الأجهزة",
"ios-memory-limit": "لا يمكن إرسال ملفات إلى iOS إلا بحجم يصل إلى 200 ميجابايت مرة واحدة",
"online-requirement-public-room": "يجب أن تكون متصلاً بالإنترنت لإنشاء غرفة عامة", "online-requirement-public-room": "يجب أن تكون متصلاً بالإنترنت لإنشاء غرفة عامة",
"copied-text-error": "فشلت الكتابة من الحافظة. انسخ يدويًا!", "copied-text-error": "فشلت الكتابة من الحافظة. انسخ يدويًا!",
"download-successful": "تم تحميل {{descriptor}}", "download-successful": "تم تحميل {{descriptor}}",
-1
View File
@@ -144,7 +144,6 @@
"pairing-cleared": "Tots els dispositius desvinculats", "pairing-cleared": "Tots els dispositius desvinculats",
"notifications-enabled": "Notificacions habilitades", "notifications-enabled": "Notificacions habilitades",
"online-requirement-pairing": "Has d'estar en línia per vincular dispositius", "online-requirement-pairing": "Has d'estar en línia per vincular dispositius",
"ios-memory-limit": "Tan sols és possible enviar fitxers de fins a 200 MB a iOS",
"online-requirement-public-room": "Cal que estiguis en línia per poder crear una sala pública", "online-requirement-public-room": "Cal que estiguis en línia per poder crear una sala pública",
"room-url-copied-to-clipboard": "Enllaç a la sala pública copiat al porta-retalls", "room-url-copied-to-clipboard": "Enllaç a la sala pública copiat al porta-retalls",
"copied-text-error": "L'escriptura al porta-retalls ha fallat. Copiar manualment!", "copied-text-error": "L'escriptura al porta-retalls ha fallat. Copiar manualment!",
-1
View File
@@ -138,7 +138,6 @@
"message-transfer-completed": "Nachricht übertragen", "message-transfer-completed": "Nachricht übertragen",
"rate-limit-join-key": "Rate Limit erreicht. Warte 10 Sekunden und versuche es erneut.", "rate-limit-join-key": "Rate Limit erreicht. Warte 10 Sekunden und versuche es erneut.",
"selected-peer-left": "Ausgewählter Peer ist gegangen", "selected-peer-left": "Ausgewählter Peer ist gegangen",
"ios-memory-limit": "Für Übertragungen an iOS Geräte beträgt die maximale Dateigröße 200 MB",
"public-room-left": "Öffentlichen Raum {{publicRoomId}} verlassen", "public-room-left": "Öffentlichen Raum {{publicRoomId}} verlassen",
"copied-to-clipboard-error": "Konnte nicht kopieren. Kopiere manuell.", "copied-to-clipboard-error": "Konnte nicht kopieren. Kopiere manuell.",
"public-room-id-invalid": "Ungültige Raum-ID", "public-room-id-invalid": "Ungültige Raum-ID",
+12 -3
View File
@@ -93,6 +93,7 @@
"file-other-description-file": "and 1 other file", "file-other-description-file": "and 1 other file",
"file-other-description-image-plural": "and {{count}} other images", "file-other-description-image-plural": "and {{count}} other images",
"file-other-description-file-plural": "and {{count}} other files", "file-other-description-file-plural": "and {{count}} other files",
"text-message-description": "A large text message",
"title-image": "Image", "title-image": "Image",
"title-file": "File", "title-file": "File",
"title-image-plural": "Images", "title-image-plural": "Images",
@@ -158,17 +159,20 @@
"connecting": "Connecting…", "connecting": "Connecting…",
"files-incorrect": "Files are incorrect", "files-incorrect": "Files are incorrect",
"file-transfer-completed": "File transfer completed", "file-transfer-completed": "File transfer completed",
"ios-memory-limit": "Sending files to iOS is only possible up to 200 MB at once",
"message-transfer-completed": "Message transfer completed", "message-transfer-completed": "Message transfer completed",
"unfinished-transfers-warning": "There are unfinished transfers. Are you sure you want to close PairDrop?", "unfinished-transfers-warning": "There are unfinished transfers. Are you sure you want to close PairDrop?",
"rate-limit-join-key": "Rate limit reached. Wait 10 seconds and try again.", "rate-limit-join-key": "Rate limit reached. Wait 10 seconds and try again.",
"selected-peer-left": "Selected peer left" "selected-peer-left": "Selected peer left",
"error-sharing-size": "Files too big to be shared. They can be downloaded instead.",
"error-sharing-default": "Error while sharing. It can be downloaded instead.",
"ram-exceed-ios": "One of the files is bigger than 250 MB and will crash the page on iOS. Use https and do not use private tabs on the iOS device to prevent this."
}, },
"document-titles": { "document-titles": {
"file-received": "File Received", "file-received": "File Received",
"file-received-plural": "{{count}} Files Received", "file-received-plural": "{{count}} Files Received",
"file-transfer-requested": "File Transfer Requested", "file-transfer-requested": "File Transfer Requested",
"image-transfer-requested": "Image Transfer Requested", "image-transfer-requested": "Image Transfer Requested",
"message-transfer-requested": "Message Transfer Requested",
"message-received": "Message Received", "message-received": "Message Received",
"message-received-plural": "{{count}} Messages Received" "message-received-plural": "{{count}} Messages Received"
}, },
@@ -176,9 +180,14 @@
"click-to-send-share-mode": "Click to send {{descriptor}}", "click-to-send-share-mode": "Click to send {{descriptor}}",
"click-to-send": "Click to send files or right click to send a message", "click-to-send": "Click to send files or right click to send a message",
"connection-hash": "To verify the security of the end-to-end encryption, compare this security number on both devices", "connection-hash": "To verify the security of the end-to-end encryption, compare this security number on both devices",
"connecting": "Connecting…",
"preparing": "Preparing…", "preparing": "Preparing…",
"waiting": "Waiting…", "waiting": "Waiting…",
"processing": "Processing…", "processing": "Processing…",
"transferring": "Transferring…" "transferring": "Sending…",
"receiving": "Receiving…",
"transfer-complete": "Sent",
"receive-complete": "Received",
"error": "Error"
} }
} }
-1
View File
@@ -64,7 +64,6 @@
"pairing-cleared": "Todos los dispositivos han sido desemparejados", "pairing-cleared": "Todos los dispositivos han sido desemparejados",
"notifications-enabled": "Notificaciones habilitadas", "notifications-enabled": "Notificaciones habilitadas",
"online-requirement-pairing": "Debes estar en línea para emparejar dispositivos", "online-requirement-pairing": "Debes estar en línea para emparejar dispositivos",
"ios-memory-limit": "Enviar archivos a iOS sólo admite hasta 200 MB a la vez",
"online-requirement-public-room": "Debes estar en línea para crear una sala pública", "online-requirement-public-room": "Debes estar en línea para crear una sala pública",
"copied-text-error": "Error al escribir en el portapapeles. ¡Cópielo manualmente!", "copied-text-error": "Error al escribir en el portapapeles. ¡Cópielo manualmente!",
"download-successful": "{{descriptor}} descargado", "download-successful": "{{descriptor}} descargado",
-1
View File
@@ -137,7 +137,6 @@
"connecting": "Connexion…", "connecting": "Connexion…",
"files-incorrect": "Les fichiers sont incorrects", "files-incorrect": "Les fichiers sont incorrects",
"file-transfer-completed": "Transfert de fichier terminé", "file-transfer-completed": "Transfert de fichier terminé",
"ios-memory-limit": "L'envoi de fichiers vers iOS n'est possible que jusqu'à 200 Mo à la fois",
"message-transfer-completed": "Transfert de message terminé", "message-transfer-completed": "Transfert de message terminé",
"unfinished-transfers-warning": "Il y a des transferts inachevés. Êtes-vous sûr de vouloir fermer PairDrop ?", "unfinished-transfers-warning": "Il y a des transferts inachevés. Êtes-vous sûr de vouloir fermer PairDrop ?",
"rate-limit-join-key": "Limite de débit atteinte. Attendez 10 secondes et réessayez.", "rate-limit-join-key": "Limite de débit atteinte. Attendez 10 secondes et réessayez.",
-1
View File
@@ -48,7 +48,6 @@
"pairing-cleared": "Semua Perangkat dilepaskan", "pairing-cleared": "Semua Perangkat dilepaskan",
"notifications-enabled": "Notifikasi diaktifkan", "notifications-enabled": "Notifikasi diaktifkan",
"online-requirement-pairing": "Anda harus online untuk memasangkan perangkat", "online-requirement-pairing": "Anda harus online untuk memasangkan perangkat",
"ios-memory-limit": "Mengirim file ke iOS hanya dapat dilakukan hingga 200 MB sekaligus",
"online-requirement-public-room": "Anda harus online untuk membuat ruang publik", "online-requirement-public-room": "Anda harus online untuk membuat ruang publik",
"copied-text-error": "Menyalin ke papan klip gagal. Salinlah secara manual!", "copied-text-error": "Menyalin ke papan klip gagal. Salinlah secara manual!",
"download-successful": "{{descriptor}} diunduh", "download-successful": "{{descriptor}} diunduh",
-1
View File
@@ -129,7 +129,6 @@
"pairing-cleared": "Tutti i dispositivi sono stati dissociati", "pairing-cleared": "Tutti i dispositivi sono stati dissociati",
"notifications-enabled": "Notifiche attivate", "notifications-enabled": "Notifiche attivate",
"online-requirement-pairing": "Devi essere online per abbinare dispositivi", "online-requirement-pairing": "Devi essere online per abbinare dispositivi",
"ios-memory-limit": "L'invio di file a dispositivi iOS è possibile solo 200 MB alla volta",
"online-requirement-public-room": "Devi essere online per creare una stanza pubblica", "online-requirement-public-room": "Devi essere online per creare una stanza pubblica",
"copied-text-error": "Scrittura negli appunti fallita. Copia manualmente!", "copied-text-error": "Scrittura negli appunti fallita. Copia manualmente!",
"download-successful": "{{descriptor}} scaricato", "download-successful": "{{descriptor}} scaricato",
-1
View File
@@ -48,7 +48,6 @@
"pairing-cleared": "全てのデバイスのペア設定を解除しました", "pairing-cleared": "全てのデバイスのペア設定を解除しました",
"notifications-enabled": "通知が有効です", "notifications-enabled": "通知が有効です",
"online-requirement-pairing": "デバイスをペア設定するにはオンラインである必要があります", "online-requirement-pairing": "デバイスをペア設定するにはオンラインである必要があります",
"ios-memory-limit": "iOSへのファイル送信は一度に200MBまでしかできません",
"online-requirement-public-room": "パブリックルームを作成するにはオンラインである必要があります", "online-requirement-public-room": "パブリックルームを作成するにはオンラインである必要があります",
"copied-text-error": "クリップボードにコピーできませんでした。手動でコピーしてください。", "copied-text-error": "クリップボードにコピーできませんでした。手動でコピーしてください。",
"download-successful": "{{descriptor}}をダウンロードしました", "download-successful": "{{descriptor}}をダウンロードしました",
-1
View File
@@ -128,7 +128,6 @@
"pairing-cleared": "ಎಲ್ಲಾ ಸಾಧನಗಳನ್ನು ಜೋಡಿಯಾಗಿ ತೆಗೆಯಲಾಗಿದೆ", "pairing-cleared": "ಎಲ್ಲಾ ಸಾಧನಗಳನ್ನು ಜೋಡಿಯಾಗಿ ತೆಗೆಯಲಾಗಿದೆ",
"notifications-enabled": "ಸೂಚನೆಗಳನ್ನು ಸಕ್ರಿಯಗೊಳಿಸಲಾಗಿದೆ", "notifications-enabled": "ಸೂಚನೆಗಳನ್ನು ಸಕ್ರಿಯಗೊಳಿಸಲಾಗಿದೆ",
"online-requirement-pairing": "ಸಾಧನಗಳನ್ನು ಜೋಡಿಸಲು ನೀವು ಆನ್‌ಲೈನ್‌ ಇರಬೇಕು", "online-requirement-pairing": "ಸಾಧನಗಳನ್ನು ಜೋಡಿಸಲು ನೀವು ಆನ್‌ಲೈನ್‌ ಇರಬೇಕು",
"ios-memory-limit": "iOSಗೆ ಫೈಲ್‌ಗಳನ್ನು ಕಳುಹಿಸುವುದು ಒಂದೇ ಬಾರಿಗೆ 200 MB ವರೆಗೆ ಮಾತ್ರ ಸಾಧ್ಯವಾಗಿದೆ",
"online-requirement-public-room": "ಸಾರ್ವಜನಿಕ ಕೊಠಡಿಯನ್ನು ರಚಿಸಲು ನೀವು ಆನ್‌ಲೈನ್‌ ಇರಬೇಕು", "online-requirement-public-room": "ಸಾರ್ವಜನಿಕ ಕೊಠಡಿಯನ್ನು ರಚಿಸಲು ನೀವು ಆನ್‌ಲೈನ್‌ ಇರಬೇಕು",
"room-url-copied-to-clipboard": "ಸಾರ್ವಜನಿಕ ಕೊಠಡಿಯ ಲಿಂಕ್ ಅನ್ನು ಕ್ಲಿಪ್‌ಬೋರ್ಡ್‌ಗೆ ನಕಲಿಸಲಾಗಿದೆ", "room-url-copied-to-clipboard": "ಸಾರ್ವಜನಿಕ ಕೊಠಡಿಯ ಲಿಂಕ್ ಅನ್ನು ಕ್ಲಿಪ್‌ಬೋರ್ಡ್‌ಗೆ ನಕಲಿಸಲಾಗಿದೆ",
"copied-text-error": "ಕ್ಲಿಪ್‌ಬೋರ್ಡ್‌ಗೆ ಬರೆಯುವುದು ವಿಫಲವಾಗಿದೆ. ಕೈಯಾರೆ ನಕಲಿಸಿ!", "copied-text-error": "ಕ್ಲಿಪ್‌ಬೋರ್ಡ್‌ಗೆ ಬರೆಯುವುದು ವಿಫಲವಾಗಿದೆ. ಕೈಯಾರೆ ನಕಲಿಸಿ!",
-1
View File
@@ -116,7 +116,6 @@
"request-title": "{{name}} ønsker å overføre {{count}} {{descriptor}}", "request-title": "{{name}} ønsker å overføre {{count}} {{descriptor}}",
"message-received": "Melding mottatt av {{name}} - Klikk for å åpne", "message-received": "Melding mottatt av {{name}} - Klikk for å åpne",
"files-incorrect": "Filene er uriktige", "files-incorrect": "Filene er uriktige",
"ios-memory-limit": "Forsendelse av filer til iOS er kun mulig opptil 200 MB av gangen",
"unfinished-transfers-warning": "Lukk med ufullførte overføringer?", "unfinished-transfers-warning": "Lukk med ufullførte overføringer?",
"rate-limit-join-key": "Forsøksgrense overskredet. Vent 10 sek. og prøv igjen." "rate-limit-join-key": "Forsøksgrense overskredet. Vent 10 sek. og prøv igjen."
}, },
-1
View File
@@ -48,7 +48,6 @@
"pairing-cleared": "Alle apparaten ontkoppeld", "pairing-cleared": "Alle apparaten ontkoppeld",
"notifications-enabled": "Meldingen geactiveerd", "notifications-enabled": "Meldingen geactiveerd",
"online-requirement-pairing": "U moet online zijn om apparaten te koppelen", "online-requirement-pairing": "U moet online zijn om apparaten te koppelen",
"ios-memory-limit": "Bestandsoverdrachten naar iOS kunnen slechts met 200 MB per keer",
"online-requirement-public-room": "U moet online zijn om een openbare kamer te maken", "online-requirement-public-room": "U moet online zijn om een openbare kamer te maken",
"copied-text-error": "Schrijven naar klembord mislukt. Kopieer handmatig!", "copied-text-error": "Schrijven naar klembord mislukt. Kopieer handmatig!",
"download-successful": "{{descriptor}} downloaden", "download-successful": "{{descriptor}} downloaden",
-1
View File
@@ -153,7 +153,6 @@
"connecting": "Conectando…", "connecting": "Conectando…",
"files-incorrect": "Os arquivos estão incorretos", "files-incorrect": "Os arquivos estão incorretos",
"file-transfer-completed": "Transferência de arquivo concluída", "file-transfer-completed": "Transferência de arquivo concluída",
"ios-memory-limit": "Enviar arquivos para iOS só é possível até 200 MB de uma vez",
"message-transfer-completed": "Transferência de mensagem concluída", "message-transfer-completed": "Transferência de mensagem concluída",
"unfinished-transfers-warning": "Há transferências inacabadas. Tem certeza de que deseja fechar o PairDrop?", "unfinished-transfers-warning": "Há transferências inacabadas. Tem certeza de que deseja fechar o PairDrop?",
"rate-limit-join-key": "Limite de taxa atingido. Aguarde 10 segundos e tente novamente.", "rate-limit-join-key": "Limite de taxa atingido. Aguarde 10 segundos e tente novamente.",
-1
View File
@@ -48,7 +48,6 @@
"pairing-cleared": "Toate dispozitivele sunt decuplate", "pairing-cleared": "Toate dispozitivele sunt decuplate",
"notifications-enabled": "Notificări activate", "notifications-enabled": "Notificări activate",
"online-requirement-pairing": "Trebuie să fiți online pentru a asocia dispozitivele", "online-requirement-pairing": "Trebuie să fiți online pentru a asocia dispozitivele",
"ios-memory-limit": "Trimiterea de fișiere pe iOS este posibilă doar până la 200 MB simultan",
"online-requirement-public-room": "Trebuie să fiți online pentru a crea o cameră publică", "online-requirement-public-room": "Trebuie să fiți online pentru a crea o cameră publică",
"copied-text-error": "Scrierea în clipboard a eșuat. Copiați manual!", "copied-text-error": "Scrierea în clipboard a eșuat. Copiați manual!",
"download-successful": "{{descriptor}} descărcat", "download-successful": "{{descriptor}} descărcat",
-1
View File
@@ -121,7 +121,6 @@
"online-requirement": "Для сопряжения устройств вам нужно быть в сети.", "online-requirement": "Для сопряжения устройств вам нужно быть в сети.",
"files-incorrect": "Файлы неверны", "files-incorrect": "Файлы неверны",
"message-transfer-completed": "Передача сообщения завершена", "message-transfer-completed": "Передача сообщения завершена",
"ios-memory-limit": "Отправка файлов на iOS устройства возможна только до 200 МБ за один раз",
"selected-peer-left": "Выбранный узел вышел", "selected-peer-left": "Выбранный узел вышел",
"request-title": "{{name}} хотел бы передать {{count}} {{descriptor}}", "request-title": "{{name}} хотел бы передать {{count}} {{descriptor}}",
"rate-limit-join-key": "Достигнут предел скорости. Подождите 10 секунд и повторите попытку.", "rate-limit-join-key": "Достигнут предел скорости. Подождите 10 секунд и повторите попытку.",
-1
View File
@@ -145,7 +145,6 @@
"pairing-cleared": "Tüm cihazlar eşleştirmeden çıkarıldı", "pairing-cleared": "Tüm cihazlar eşleştirmeden çıkarıldı",
"notifications-enabled": "Bildirimler etkinleştirildi", "notifications-enabled": "Bildirimler etkinleştirildi",
"online-requirement-pairing": "Cihazları eşleştirmek için çevrimiçi olmanız lazım", "online-requirement-pairing": "Cihazları eşleştirmek için çevrimiçi olmanız lazım",
"ios-memory-limit": "iOS'a tek seferde sadece 200MB'a kadar dosya gönderebilirsin",
"online-requirement-public-room": "Genel oda oluşturmak için çevrimiçi olmanız lazım", "online-requirement-public-room": "Genel oda oluşturmak için çevrimiçi olmanız lazım",
"room-url-copied-to-clipboard": "Genel oda bağlantı linki panoya kopyalandı", "room-url-copied-to-clipboard": "Genel oda bağlantı linki panoya kopyalandı",
"copied-text-error": "Panoya kopyalanamadı. Lütfen manuel olarak kopyalayın!", "copied-text-error": "Panoya kopyalanamadı. Lütfen manuel olarak kopyalayın!",
-1
View File
@@ -154,7 +154,6 @@
"files-incorrect": "文件不正确", "files-incorrect": "文件不正确",
"file-transfer-completed": "文件传输已完成", "file-transfer-completed": "文件传输已完成",
"connecting": "连接中…", "connecting": "连接中…",
"ios-memory-limit": "向 iOS 发送文件 一次最多只能发送 200 MB",
"rate-limit-join-key": "已达连接限制。请等待 10秒 后再试。", "rate-limit-join-key": "已达连接限制。请等待 10秒 后再试。",
"public-room-left": "已退出公共房间 {{publicRoomId}}", "public-room-left": "已退出公共房间 {{publicRoomId}}",
"copied-to-clipboard-error": "无法复制。请手动复制。", "copied-to-clipboard-error": "无法复制。请手动复制。",
+1 -1
View File
@@ -10,7 +10,7 @@ class BrowserTabsConnector {
} }
_onMessage(e) { _onMessage(e) {
console.log('Broadcast:', e.data) Logger.debug('Broadcast:', e.data)
switch (e.data.type) { switch (e.data.type) {
case 'self-display-name-changed': case 'self-display-name-changed':
Events.fire('self-display-name-changed', e.data.detail); Events.fire('self-display-name-changed', e.data.detail);
+7 -7
View File
@@ -67,7 +67,7 @@ class Localization {
Localization.$htmlRoot.setAttribute('lang', locale); Localization.$htmlRoot.setAttribute('lang', locale);
console.log("Page successfully translated", Logger.debug("Page successfully translated",
`System language: ${Localization.systemLocale}`, `System language: ${Localization.systemLocale}`,
`Selected language: ${locale}` `Selected language: ${locale}`
); );
@@ -145,7 +145,7 @@ class Localization {
translation = translationObj[lastKey]; translation = translationObj[lastKey];
} catch (e) { } catch (e) {
console.error(e); Logger.error(e);
} }
if (!translation) { if (!translation) {
@@ -179,7 +179,7 @@ class Localization {
} }
catch (e) { catch (e) {
// Log warnings and help calls // Log warnings and help calls
console.warn(e); Logger.warn(e);
Localization.logTranslationMissingOrBroken(key, attr, data, useDefault); Localization.logTranslationMissingOrBroken(key, attr, data, useDefault);
Localization.logHelpCallKey(key, attr); Localization.logHelpCallKey(key, attr);
Localization.logHelpCall(); Localization.logHelpCall();
@@ -192,7 +192,7 @@ class Localization {
else { else {
// Is not default locale yet // Is not default locale yet
// Get translation for default language with same arguments // Get translation for default language with same arguments
console.log(`Using default language ${Localization.defaultLocale.toUpperCase()} instead.`); Logger.debug(`Using default language ${Localization.defaultLocale.toUpperCase()} instead.`);
translation = this.getTranslation(key, attr, data, true); translation = this.getTranslation(key, attr, data, true);
} }
} }
@@ -205,11 +205,11 @@ class Localization {
? Localization.defaultLocale.toUpperCase() ? Localization.defaultLocale.toUpperCase()
: Localization.locale.toUpperCase(); : Localization.locale.toUpperCase();
console.warn(`Missing or broken translation for language ${usedLocale}.\n`, 'key:', key, 'attr:', attr, 'data:', data); Logger.warn(`Missing or broken translation for language ${usedLocale}.\n`, 'key:', key, 'attr:', attr, 'data:', data);
} }
static logHelpCall() { static logHelpCall() {
console.log("Help translating PairDrop: https://hosted.weblate.org/engage/pairdrop/"); Logger.warn("Help translating PairDrop: https://hosted.weblate.org/engage/pairdrop/");
} }
static logHelpCallKey(key, attr) { static logHelpCallKey(key, attr) {
@@ -219,7 +219,7 @@ class Localization {
? key ? key
: `${key}_${attr}`; : `${key}_${attr}`;
console.warn(`Translate this string here: https://hosted.weblate.org/browse/pairdrop/pairdrop-spa/${locale}/?q=${keyComplete}`); Logger.warn(`Translate this string here: https://hosted.weblate.org/browse/pairdrop/pairdrop-spa/${locale}/?q=${keyComplete}`);
} }
static escapeHTML(unsafeText) { static escapeHTML(unsafeText) {
+41 -16
View File
@@ -1,3 +1,23 @@
class Logger {
static debug(message, ...optionalParams) {
if (window.debugMode) {
console.debug("DEBUG:", message, ...optionalParams);
}
}
static log(message, ...optionalParams) {
console.log("LOG:", message, ...optionalParams);
}
static warn(message, ...optionalParams) {
console.warn("WARN:", message, ...optionalParams);
}
static error(message, ...optionalParams) {
console.error("ERROR:", message, ...optionalParams);
}
}
class PairDrop { class PairDrop {
constructor() { constructor() {
@@ -34,14 +54,14 @@ class PairDrop {
this.initialize() this.initialize()
.then(_ => { .then(_ => {
console.log("Initialization completed."); Logger.log("Initialization completed.");
}); });
} }
async initialize() { async initialize() {
// Translate page before fading in // Translate page before fading in
await this.localization.setInitialTranslation() await this.localization.setInitialTranslation()
console.log("Initial translation successful."); Logger.log("Initial translation successful.");
// Show "Loading..." until connected to WsServer // Show "Loading..." until connected to WsServer
await this.footerUI.showLoading(); await this.footerUI.showLoading();
@@ -56,16 +76,16 @@ class PairDrop {
await this.backgroundCanvas.fadeIn(); await this.backgroundCanvas.fadeIn();
// Load deferred assets // Load deferred assets
console.log("Load deferred assets..."); Logger.log("Load deferred assets...");
await this.loadDeferredAssets(); await this.loadDeferredAssets();
console.log("Loading of deferred assets completed."); Logger.log("Loading of deferred assets completed.");
console.log("Hydrate UI..."); Logger.log("Hydrate UI...");
await this.hydrate(); await this.hydrate();
console.log("UI hydrated."); Logger.log("UI hydrated.");
// Evaluate url params as soon as ws is connected // Evaluate url params as soon as ws is connected
console.log("Evaluate URL params as soon as websocket connection is established."); Logger.log("Evaluate URL params as soon as websocket connection is established.");
Events.on('ws-connected', _ => this.evaluateUrlParams(), {once: true}); Events.on('ws-connected', _ => this.evaluateUrlParams(), {once: true});
} }
@@ -74,7 +94,7 @@ class PairDrop {
navigator.serviceWorker navigator.serviceWorker
.register('service-worker.js') .register('service-worker.js')
.then(serviceWorker => { .then(serviceWorker => {
console.log('Service Worker registered'); Logger.log('Service Worker registered');
window.serviceWorker = serviceWorker window.serviceWorker = serviceWorker
}); });
} }
@@ -133,10 +153,10 @@ class PairDrop {
return new Promise( async (resolve) => { return new Promise( async (resolve) => {
try { try {
await this.loadStyleSheet(url); await this.loadStyleSheet(url);
console.log(`Stylesheet loaded successfully: ${url}`); Logger.log(`Stylesheet loaded successfully: ${url}`);
resolve(); resolve();
} catch (error) { } catch (error) {
console.error('Error loading stylesheet:', error); Logger.error('Error loading stylesheet:', error);
} }
}); });
} }
@@ -156,10 +176,10 @@ class PairDrop {
return new Promise( async (resolve) => { return new Promise( async (resolve) => {
try { try {
await this.loadScript(url); await this.loadScript(url);
console.log(`Script loaded successfully: ${url}`); Logger.log(`Script loaded successfully: ${url}`);
resolve(); resolve();
} catch (error) { } catch (error) {
console.error('Error loading script:', error); Logger.error('Error loading script:', error);
} }
}); });
} }
@@ -229,12 +249,17 @@ class PairDrop {
this.publicRoomDialog._createPublicRoom(); this.publicRoomDialog._createPublicRoom();
} }
} }
else if (urlParams.has("debug") && urlParams.get("debug") === "true") {
window.debugMode = true;
}
// remove url params from url if (!window.debugMode) {
const urlWithoutParams = getUrlWithoutArguments(); // remove url params from url
window.history.replaceState({}, "Rewrite URL", urlWithoutParams); const urlWithoutParams = getUrlWithoutArguments();
window.history.replaceState({}, "Rewrite URL", urlWithoutParams);
}
console.log("URL params evaluated."); Logger.log("URL params evaluated.");
} }
} }
+1309 -481
View File
File diff suppressed because it is too large Load Diff
+24 -25
View File
@@ -7,19 +7,18 @@ class PersistentStorage {
const DBOpenRequest = window.indexedDB.open('pairdrop_store', 5); const DBOpenRequest = window.indexedDB.open('pairdrop_store', 5);
DBOpenRequest.onerror = e => { DBOpenRequest.onerror = e => {
PersistentStorage.logBrowserNotCapable(); PersistentStorage.logBrowserNotCapable();
console.log('Error initializing database: '); Logger.error('Error initializing database:', e);
console.log(e)
}; };
DBOpenRequest.onsuccess = _ => { DBOpenRequest.onsuccess = _ => {
console.log('Database initialised.'); Logger.debug('Database initialised.');
}; };
DBOpenRequest.onupgradeneeded = async e => { DBOpenRequest.onupgradeneeded = async e => {
const db = e.target.result; const db = e.target.result;
const txn = e.target.transaction; const txn = e.target.transaction;
db.onerror = e => console.log('Error loading database: ' + e); db.onerror = e => Logger.error('Error loading database:', e);
console.log(`Upgrading IndexedDB database from version ${e.oldVersion} to version ${e.newVersion}`); Logger.debug(`Upgrading IndexedDB database from version ${e.oldVersion} to version ${e.newVersion}`);
if (e.oldVersion === 0) { if (e.oldVersion === 0) {
// initiate v1 // initiate v1
@@ -54,7 +53,7 @@ class PersistentStorage {
} }
static logBrowserNotCapable() { static logBrowserNotCapable() {
console.log("This browser does not support IndexedDB. Paired devices will be gone after the browser is closed."); Logger.log("This browser does not support IndexedDB. Paired devices will be gone after the browser is closed.");
} }
static set(key, value) { static set(key, value) {
@@ -66,7 +65,7 @@ class PersistentStorage {
const objectStore = transaction.objectStore('keyval'); const objectStore = transaction.objectStore('keyval');
const objectStoreRequest = objectStore.put(value, key); const objectStoreRequest = objectStore.put(value, key);
objectStoreRequest.onsuccess = _ => { objectStoreRequest.onsuccess = _ => {
console.log(`Request successful. Added key-pair: ${key} - ${value}`); Logger.debug(`Request successful. Added key-pair: ${key} - ${value}`);
resolve(value); resolve(value);
}; };
} }
@@ -85,7 +84,7 @@ class PersistentStorage {
const objectStore = transaction.objectStore('keyval'); const objectStore = transaction.objectStore('keyval');
const objectStoreRequest = objectStore.get(key); const objectStoreRequest = objectStore.get(key);
objectStoreRequest.onsuccess = _ => { objectStoreRequest.onsuccess = _ => {
console.log(`Request successful. Retrieved key-pair: ${key} - ${objectStoreRequest.result}`); Logger.debug(`Request successful. Retrieved key-pair: ${key} - ${objectStoreRequest.result}`);
resolve(objectStoreRequest.result); resolve(objectStoreRequest.result);
} }
} }
@@ -104,7 +103,7 @@ class PersistentStorage {
const objectStore = transaction.objectStore('keyval'); const objectStore = transaction.objectStore('keyval');
const objectStoreRequest = objectStore.delete(key); const objectStoreRequest = objectStore.delete(key);
objectStoreRequest.onsuccess = _ => { objectStoreRequest.onsuccess = _ => {
console.log(`Request successful. Deleted key: ${key}`); Logger.debug(`Request successful. Deleted key: ${key}`);
resolve(); resolve();
}; };
} }
@@ -128,7 +127,7 @@ class PersistentStorage {
'auto_accept': false 'auto_accept': false
}); });
objectStoreRequest.onsuccess = e => { objectStoreRequest.onsuccess = e => {
console.log(`Request successful. RoomSecret added: ${e.target.result}`); Logger.debug(`Request successful. RoomSecret added: ${e.target.result}`);
resolve(); resolve();
} }
} }
@@ -145,7 +144,7 @@ class PersistentStorage {
for (let i = 0; i < roomSecrets.length; i++) { for (let i = 0; i < roomSecrets.length; i++) {
secrets.push(roomSecrets[i].secret); secrets.push(roomSecrets[i].secret);
} }
console.log(`Request successful. Retrieved ${secrets.length} room_secrets`); Logger.debug(`Request successful. Retrieved ${secrets.length} room_secrets`);
return(secrets); return(secrets);
} catch (e) { } catch (e) {
this.logBrowserNotCapable(); this.logBrowserNotCapable();
@@ -182,13 +181,13 @@ class PersistentStorage {
objectStoreRequestKey.onsuccess = e => { objectStoreRequestKey.onsuccess = e => {
const key = e.target.result; const key = e.target.result;
if (!key) { if (!key) {
console.log(`Nothing to retrieve. Entry for room_secret not existing: ${roomSecret}`); Logger.debug(`Nothing to retrieve. Entry for room_secret not existing: ${roomSecret}`);
resolve(); resolve();
return; return;
} }
const objectStoreRequestRetrieval = objectStore.get(key); const objectStoreRequestRetrieval = objectStore.get(key);
objectStoreRequestRetrieval.onsuccess = e => { objectStoreRequestRetrieval.onsuccess = e => {
console.log(`Request successful. Retrieved entry for room_secret: ${key}`); Logger.debug(`Request successful. Retrieved entry for room_secret: ${key}`);
resolve({ resolve({
"entry": e.target.result, "entry": e.target.result,
"key": key "key": key
@@ -215,14 +214,14 @@ class PersistentStorage {
const objectStoreRequestKey = objectStore.index("secret").getKey(roomSecret); const objectStoreRequestKey = objectStore.index("secret").getKey(roomSecret);
objectStoreRequestKey.onsuccess = e => { objectStoreRequestKey.onsuccess = e => {
if (!e.target.result) { if (!e.target.result) {
console.log(`Nothing to delete. room_secret not existing: ${roomSecret}`); Logger.debug(`Nothing to delete. room_secret not existing: ${roomSecret}`);
resolve(); resolve();
return; return;
} }
const key = e.target.result; const key = e.target.result;
const objectStoreRequestDeletion = objectStore.delete(key); const objectStoreRequestDeletion = objectStore.delete(key);
objectStoreRequestDeletion.onsuccess = _ => { objectStoreRequestDeletion.onsuccess = _ => {
console.log(`Request successful. Deleted room_secret: ${key}`); Logger.debug(`Request successful. Deleted room_secret: ${key}`);
resolve(roomSecret); resolve(roomSecret);
} }
objectStoreRequestDeletion.onerror = e => { objectStoreRequestDeletion.onerror = e => {
@@ -245,7 +244,7 @@ class PersistentStorage {
const objectStore = transaction.objectStore('room_secrets'); const objectStore = transaction.objectStore('room_secrets');
const objectStoreRequest = objectStore.clear(); const objectStoreRequest = objectStore.clear();
objectStoreRequest.onsuccess = _ => { objectStoreRequest.onsuccess = _ => {
console.log('Request successful. All room_secrets cleared'); Logger.debug('Request successful. All room_secrets cleared');
resolve(); resolve();
}; };
} }
@@ -255,15 +254,15 @@ class PersistentStorage {
}) })
} }
static updateRoomSecretNames(roomSecret, displayName, deviceName) { static updateRoomSecretDisplayName(roomSecret, displayName) {
return this.updateRoomSecret(roomSecret, undefined, displayName, deviceName); return this.updateRoomSecret(roomSecret, null, displayName, null);
} }
static updateRoomSecretAutoAccept(roomSecret, autoAccept) { static updateRoomSecretAutoAccept(roomSecret, autoAccept) {
return this.updateRoomSecret(roomSecret, undefined, undefined, undefined, autoAccept); return this.updateRoomSecret(roomSecret, null, null, null, autoAccept);
} }
static updateRoomSecret(roomSecret, updatedRoomSecret = undefined, updatedDisplayName = undefined, updatedDeviceName = undefined, updatedAutoAccept = undefined) { static updateRoomSecret(roomSecret, updatedRoomSecret = null, updatedDisplayName = null, updatedDeviceName = null, updatedAutoAccept = null) {
return new Promise((resolve, reject) => { return new Promise((resolve, reject) => {
const DBOpenRequest = window.indexedDB.open('pairdrop_store'); const DBOpenRequest = window.indexedDB.open('pairdrop_store');
DBOpenRequest.onsuccess = e => { DBOpenRequest.onsuccess = e => {
@@ -278,16 +277,16 @@ class PersistentStorage {
const objectStore = transaction.objectStore('room_secrets'); const objectStore = transaction.objectStore('room_secrets');
// Do not use `updatedRoomSecret ?? roomSecretEntry.entry.secret` to ensure compatibility with older browsers // Do not use `updatedRoomSecret ?? roomSecretEntry.entry.secret` to ensure compatibility with older browsers
const updatedRoomSecretEntry = { const updatedRoomSecretEntry = {
'secret': updatedRoomSecret !== undefined ? updatedRoomSecret : roomSecretEntry.entry.secret, 'secret': updatedRoomSecret !== null ? updatedRoomSecret : roomSecretEntry.entry.secret,
'display_name': updatedDisplayName !== undefined ? updatedDisplayName : roomSecretEntry.entry.display_name, 'display_name': updatedDisplayName !== null ? updatedDisplayName : roomSecretEntry.entry.display_name,
'device_name': updatedDeviceName !== undefined ? updatedDeviceName : roomSecretEntry.entry.device_name, 'device_name': updatedDeviceName !== null ? updatedDeviceName : roomSecretEntry.entry.device_name,
'auto_accept': updatedAutoAccept !== undefined ? updatedAutoAccept : roomSecretEntry.entry.auto_accept 'auto_accept': updatedAutoAccept !== null ? updatedAutoAccept : roomSecretEntry.entry.auto_accept
}; };
const objectStoreRequestUpdate = objectStore.put(updatedRoomSecretEntry, roomSecretEntry.key); const objectStoreRequestUpdate = objectStore.put(updatedRoomSecretEntry, roomSecretEntry.key);
objectStoreRequestUpdate.onsuccess = e => { objectStoreRequestUpdate.onsuccess = e => {
console.log(`Request successful. Updated room_secret: ${roomSecretEntry.key}`); Logger.debug(`Request successful. Updated room_secret: ${roomSecretEntry.key}`);
resolve({ resolve({
"entry": updatedRoomSecretEntry, "entry": updatedRoomSecretEntry,
"key": roomSecretEntry.key "key": roomSecretEntry.key
+79
View File
@@ -0,0 +1,79 @@
self.addEventListener('message', async e => {
try {
switch (e.data.type) {
case "check-support":
await checkSupport();
break;
case "part":
await onPart(e.data.name, e.data.buffer, e.data.offset);
break;
case "get-file":
await onGetFile(e.data.name);
break;
case "delete-file":
await onDeleteFile(e.data.name);
break;
}
}
catch (e) {
self.postMessage({type: "error", error: e});
}
})
async function checkSupport() {
try {
await getAccessHandle("test.txt");
self.postMessage({type: "support", supported: true});
}
catch (e) {
self.postMessage({type: "support", supported: false});
}
}
async function getFileHandle(fileName) {
const root = await navigator.storage.getDirectory();
return await root.getFileHandle(fileName, {create: true});
}
async function getAccessHandle(fileName) {
const fileHandle = await getFileHandle(fileName);
// Create FileSystemSyncAccessHandle on the file.
return await fileHandle.createSyncAccessHandle();
}
async function onPart(fileName, buffer, offset) {
const accessHandle = await getAccessHandle(fileName);
// Write the message to the end of the file.
let encodedMessage = new DataView(buffer);
accessHandle.write(encodedMessage, { at: offset });
// Always close FileSystemSyncAccessHandle if done.
accessHandle.close(); accessHandle.close();
self.postMessage({type: "part", part: encodedMessage});
encodedMessage = null;
}
async function onGetFile(fileName) {
const fileHandle = await getFileHandle(fileName);
let file = await fileHandle.getFile();
self.postMessage({type: "file", file: file});
}
async function onDeleteFile(fileName) {
const accessHandle = await getAccessHandle(fileName);
// Truncate the file to 0 bytes
accessHandle.truncate(0);
// Persist changes to disk.
accessHandle.flush();
// Always close FileSystemSyncAccessHandle if done.
accessHandle.close();
self.postMessage({type: "file-deleted"});
}
+3 -3
View File
@@ -238,7 +238,7 @@ class FooterUI {
if (!displayName) return; if (!displayName) return;
console.log("Retrieved edited display name:", displayName) Logger.debug("Retrieved edited display name:", displayName)
Events.fire('self-display-name-changed', displayName); Events.fire('self-display-name-changed', displayName);
} }
@@ -275,7 +275,7 @@ class FooterUI {
Events.fire('notify-user', Localization.getTranslation("notifications.display-name-changed-permanently")); Events.fire('notify-user', Localization.getTranslation("notifications.display-name-changed-permanently"));
}) })
.catch(_ => { .catch(_ => {
console.log("This browser does not support IndexedDB. Use localStorage instead."); Logger.debug("This browser does not support IndexedDB. Use localStorage instead.");
localStorage.setItem('edited_display_name', newDisplayName); localStorage.setItem('edited_display_name', newDisplayName);
Events.fire('notify-user', Localization.getTranslation("notifications.display-name-changed-temporarily")); Events.fire('notify-user', Localization.getTranslation("notifications.display-name-changed-temporarily"));
}) })
@@ -287,7 +287,7 @@ class FooterUI {
else { else {
PersistentStorage.delete('edited_display_name') PersistentStorage.delete('edited_display_name')
.catch(_ => { .catch(_ => {
console.log("This browser does not support IndexedDB. Use localStorage instead.") Logger.debug("This browser does not support IndexedDB. Use localStorage instead.")
localStorage.removeItem('edited_display_name'); localStorage.removeItem('edited_display_name');
}) })
.finally(() => { .finally(() => {
+797 -435
View File
File diff suppressed because it is too large Load Diff
+53 -27
View File
@@ -62,41 +62,67 @@ window.isMobile = window.iOS || window.android;
// Helper functions // Helper functions
const audioPlayer = (() => {
const blop = document.getElementById('blop');
blop.addEventListener('ended', _ => {
blop.muted = true
});
return {
playBlop() {
if (window.isMobile) return;
blop.muted = false;
blop.play();
}
}
})();
const zipper = (() => { const zipper = (() => {
let zipWriter;
return { return {
createNewZipWriter() { async getObjectUrlOfZipFile(files, onZipProgressCallback){
zipWriter = new zip.ZipWriter(new zip.BlobWriter("application/zip"), { bufferedWrite: true, level: 0 }); try {
}, const zipWriter = new zip.ZipWriter(new zip.BlobWriter("application/zip"));
addFile(file, options) {
return zipWriter.add(file.name, new zip.BlobReader(file), options); let bytesProcessed = 0;
}, for (let i = 0; i < files.length; i++) {
async getBlobURL() { await zipWriter.add(
if (zipWriter) { files[i].name,
const blobURL = URL.createObjectURL(await zipWriter.close()); new zip.BlobReader(files[i]),
zipWriter = null; {
return blobURL; onprogress: (progress) => onZipProgressCallback(bytesProcessed + progress)
}
);
bytesProcessed += files[i].size;
}
return URL.createObjectURL(await zipWriter.close());
} }
else { catch (e) {
throw new Error("Zip file closed"); Logger.error(e);
} return false;
},
async getZipFile(filename = "archive.zip") {
if (zipWriter) {
const file = new File([await zipWriter.close()], filename, {type: "application/zip"});
zipWriter = null;
return file;
}
else {
throw new Error("Zip file closed");
} }
}, },
async getEntries(file, options) { async getEntries(file, options) {
return await (new zip.ZipReader(new zip.BlobReader(file))).getEntries(options); try {
return await (new zip.ZipReader(new zip.BlobReader(file))).getEntries(options);
}
catch (e) {
Logger.error(e);
return false;
}
}, },
async getData(entry, options) { async getData(entry, options) {
return await entry.getData(new zip.BlobWriter(), options); try {
return await entry.getData(new zip.BlobWriter(), options);
}
catch (e) {
Logger.error(e);
return false;
}
}, },
}; };
@@ -521,7 +547,7 @@ function getThumbnailAsDataUrl(file, width = undefined, height = undefined, qual
let dataUrl = canvas.toDataURL("image/jpeg", quality); let dataUrl = canvas.toDataURL("image/jpeg", quality);
resolve(dataUrl); resolve(dataUrl);
} catch (e) { } catch (e) {
console.error(e); Logger.error(e);
reject(new Error(`Could not create an image thumbnail from type ${file.type}`)); reject(new Error(`Could not create an image thumbnail from type ${file.type}`));
} }
}) })
+24 -11
View File
@@ -105,6 +105,8 @@ x-peer {
padding: 8px; padding: 8px;
align-content: start; align-content: start;
flex-wrap: wrap; flex-wrap: wrap;
transition: transform 150ms;
will-change: transform;
} }
x-peer input[type="file"] { x-peer input[type="file"] {
@@ -122,8 +124,6 @@ x-peer label {
x-peer x-icon { x-peer x-icon {
--icon-size: 40px; --icon-size: 40px;
margin-bottom: 4px; margin-bottom: 4px;
transition: transform 150ms;
will-change: transform;
display: flex; display: flex;
flex-direction: column; flex-direction: column;
} }
@@ -149,7 +149,7 @@ x-peer:not(.type-ip):not(.type-secret).type-public-id .icon-wrapper {
.highlight-wrapper { .highlight-wrapper {
align-self: center; align-self: center;
align-items: center; align-items: center;
margin: 7px auto 0; margin: 10px auto 0;
height: 6px; height: 6px;
} }
@@ -188,14 +188,16 @@ x-peer:not(.type-public-id) .highlight-room-public-id {
display: none; display: none;
} }
x-peer:not([status]):hover x-icon, x-peer:is(:not([status]), [status$=-complete], [status=error]):hover,
x-peer:not([status]):focus x-icon { x-peer:is(:not([status]), [status$=-complete], [status=error]):focus {
transform: scale(1.05); transform: scale(1.05);
} }
x-peer[status] x-icon { x-peer[status]:not([status$=-complete]) x-icon {
box-shadow: none; box-shadow: none;
opacity: 0.8; }
x-peer[status] {
transform: scale(1); transform: scale(1);
} }
@@ -238,7 +240,7 @@ x-peer.ws-peer .highlight-wrapper {
.status, .status,
.device-name { .device-name {
opacity: 0.7; color: color-mix(in srgb, rgb(var(--text-color)) 30%, grey);
white-space: nowrap; white-space: nowrap;
} }
@@ -247,14 +249,22 @@ x-peer[status] .device-name {
display: none; display: none;
} }
x-peer[status] { x-peer[status]:not([status$=-complete]):not([status=error]) {
pointer-events: none; pointer-events: none;
} }
x-peer x-icon { x-peer {
animation: pop 600ms ease-out 1; animation: pop 600ms ease-out 1;
} }
x-peer[status$=-complete] .status {
color: var(--primary-color);
}
x-peer[status=error] .status {
color: var(--error-color);
}
@keyframes pop { @keyframes pop {
0% { 0% {
transform: scale(0.7); transform: scale(0.7);
@@ -745,7 +755,6 @@ x-dialog .dialog-subheader {
top: -8px; top: -8px;
clip: rect(0px, 80px, 80px, 40px); clip: rect(0px, 80px, 80px, 40px);
--progress: rotate(0deg); --progress: rotate(0deg);
transition: transform 200ms;
} }
.circle { .circle {
@@ -759,6 +768,10 @@ x-dialog .dialog-subheader {
transform: var(--progress); transform: var(--progress);
} }
.animate .circle {
transition: transform 200ms;
}
.over50 { .over50 {
clip: rect(auto, auto, auto, auto); clip: rect(auto, auto, auto, auto);
} }
+1
View File
@@ -921,6 +921,7 @@ x-peers:empty~x-instructions {
body { body {
/* Constant colors */ /* Constant colors */
--primary-color: #4285f4; --primary-color: #4285f4;
--error-color: #ff6b6b;
--paired-device-color: #00a69c; --paired-device-color: #00a69c;
--public-room-color: #ed9d01; --public-room-color: #ed9d01;
--accent-color: var(--primary-color); --accent-color: var(--primary-color);
+4 -14
View File
@@ -89,22 +89,12 @@ export default class PairDropWsServer {
this._onLeavePublicRoom(sender); this._onLeavePublicRoom(sender);
break; break;
case 'signal': case 'signal':
this._signalAndRelay(sender, message); this._signalAndWsRelay(sender, message);
break; break;
case 'request': case 'ws-relay':
case 'header':
case 'partition':
case 'partition-received':
case 'progress':
case 'files-transfer-response':
case 'file-transfer-complete':
case 'message-transfer-complete':
case 'text':
case 'display-name-changed':
case 'ws-chunk':
// relay ws-fallback // relay ws-fallback
if (this._conf.wsFallback) { if (this._conf.wsFallback) {
this._signalAndRelay(sender, message); this._signalAndWsRelay(sender, message);
} }
else { else {
console.log("Websocket fallback is not activated on this instance.") console.log("Websocket fallback is not activated on this instance.")
@@ -112,7 +102,7 @@ export default class PairDropWsServer {
} }
} }
_signalAndRelay(sender, message) { _signalAndWsRelay(sender, message) {
const room = message.roomType === 'ip' const room = message.roomType === 'ip'
? sender.ip ? sender.ip
: message.roomId; : message.roomId;