From 7a446f7b8e9d4162d8e81eb863e151ef0ab66554 Mon Sep 17 00:00:00 2001 From: Vijay A Date: Wed, 8 Sep 2021 19:27:23 +0530 Subject: refactor: use the exposed methods for session handling from the main repo --- all.json | 8 ++++---- recipes/android-messages/package.json | 2 +- recipes/android-messages/webview.js | 16 ++-------------- recipes/googlemeet/package.json | 2 +- recipes/googlemeet/webview.js | 10 ++++------ recipes/lastpass/package.json | 2 +- recipes/lastpass/webview.js | 17 +++-------------- recipes/whatsapp/package.json | 2 +- recipes/whatsapp/webview.js | 16 ++-------------- 9 files changed, 19 insertions(+), 56 deletions(-) diff --git a/all.json b/all.json index 52cd408..6f75c3e 100644 --- a/all.json +++ b/all.json @@ -42,7 +42,7 @@ "featured": false, "id": "android-messages", "name": "Android Messages", - "version": "2.2.0", + "version": "2.2.1", "icons": { "svg": "https://cdn.jsdelivr.net/gh/getferdi/recipes/recipes/android-messages/icon.svg" } @@ -548,7 +548,7 @@ "featured": false, "id": "googlemeet", "name": "Google Meet", - "version": "2.2.0", + "version": "2.2.1", "icons": { "svg": "https://cdn.jsdelivr.net/gh/getferdi/recipes/recipes/googlemeet/icon.svg" } @@ -804,7 +804,7 @@ "featured": false, "id": "lastpass", "name": "LastPass", - "version": "2.2.0", + "version": "2.2.1", "icons": { "svg": "https://cdn.jsdelivr.net/gh/getferdi/recipes/recipes/lastpass/icon.svg" } @@ -1575,7 +1575,7 @@ "featured": true, "id": "whatsapp", "name": "WhatsApp", - "version": "3.3.0", + "version": "3.3.1", "icons": { "svg": "https://cdn.jsdelivr.net/gh/getferdi/recipes/recipes/whatsapp/icon.svg" } diff --git a/recipes/android-messages/package.json b/recipes/android-messages/package.json index 852b942..354c21d 100644 --- a/recipes/android-messages/package.json +++ b/recipes/android-messages/package.json @@ -1,7 +1,7 @@ { "id": "android-messages", "name": "Android Messages", - "version": "2.2.0", + "version": "2.2.1", "license": "MIT", "config": { "serviceURL": "https://messages.google.com/web", diff --git a/recipes/android-messages/webview.js b/recipes/android-messages/webview.js index 4b57700..e1cfde4 100644 --- a/recipes/android-messages/webview.js +++ b/recipes/android-messages/webview.js @@ -7,20 +7,8 @@ setTimeout(() => { }, 1000); window.addEventListener('beforeunload', async () => { - try { - const { session } = Ferdi.getCurrentWebContents(); - session.flushStorageData(); - session.clearStorageData({ - storages: ['appcache', 'serviceworkers', 'cachestorage', 'websql', 'indexdb'], - }); - const registrations = await window.navigator.serviceWorker.getRegistrations(); - registrations.forEach(r => { - r.unregister(); - console.log('ServiceWorker unregistered'); - }); - } catch (err) { - console.err(err); - } + Ferdi.clearStorageData(['appcache', 'serviceworkers', 'cachestorage', 'websql', 'indexdb']); + Ferdi.releaseServiceWorkers(); }); module.exports = (Ferdi, settings) => { diff --git a/recipes/googlemeet/package.json b/recipes/googlemeet/package.json index 9cab8dd..55cc0b8 100644 --- a/recipes/googlemeet/package.json +++ b/recipes/googlemeet/package.json @@ -1,7 +1,7 @@ { "id": "googlemeet", "name": "Google Meet", - "version": "2.2.0", + "version": "2.2.1", "license": "MIT", "config": { "serviceURL": "https://meet.google.com", diff --git a/recipes/googlemeet/webview.js b/recipes/googlemeet/webview.js index d6a29fe..9d334ba 100644 --- a/recipes/googlemeet/webview.js +++ b/recipes/googlemeet/webview.js @@ -10,13 +10,11 @@ window.onload = () => { } }; -module.exports = Ferdi => { - const { session } = Ferdi.getCurrentWebContents(); - session.flushStorageData(); - session.clearStorageData({ - storages: ['serviceworkers'], - }); +window.addEventListener('beforeunload', async () => { + Ferdi.clearStorageData(['serviceworkers']); +}); +module.exports = Ferdi => { const getMessages = function getMessages() { const elements = document.querySelectorAll('.CxUIE, .unread'); let count = 0; diff --git a/recipes/lastpass/package.json b/recipes/lastpass/package.json index cf08063..75632bd 100644 --- a/recipes/lastpass/package.json +++ b/recipes/lastpass/package.json @@ -1,7 +1,7 @@ { "id": "lastpass", "name": "LastPass", - "version": "2.2.0", + "version": "2.2.1", "license": "MIT", "config": { "serviceURL": "https://lastpass.com/?ac=1&lpnorefresh=1", diff --git a/recipes/lastpass/webview.js b/recipes/lastpass/webview.js index 878fa5e..4a92e0c 100644 --- a/recipes/lastpass/webview.js +++ b/recipes/lastpass/webview.js @@ -7,21 +7,10 @@ setTimeout(() => { window.location.reload(); } }, 1000); + window.addEventListener('beforeunload', async () => { - try { - const { session } = Ferdi.getCurrentWebContents(); - session.flushStorageData(); - session.clearStorageData({ - storages: ['appcache', 'serviceworkers', 'cachestorage', 'websql', 'indexdb'], - }); - const registrations = await window.navigator.serviceWorker.getRegistrations(); - registrations.forEach(r => { - r.unregister(); - console.log('ServiceWorker unregistered'); - }); - } catch (err) { - console.err(err); - } + Ferdi.clearStorageData(['appcache', 'serviceworkers', 'cachestorage', 'websql', 'indexdb']); + Ferdi.releaseServiceWorkers(); }); module.exports = Ferdi => { diff --git a/recipes/whatsapp/package.json b/recipes/whatsapp/package.json index 785a3fe..c33b115 100644 --- a/recipes/whatsapp/package.json +++ b/recipes/whatsapp/package.json @@ -1,7 +1,7 @@ { "id": "whatsapp", "name": "WhatsApp", - "version": "3.3.0", + "version": "3.3.1", "license": "MIT", "config": { "serviceURL": "https://web.whatsapp.com", diff --git a/recipes/whatsapp/webview.js b/recipes/whatsapp/webview.js index 8087b08..eaaf2c2 100644 --- a/recipes/whatsapp/webview.js +++ b/recipes/whatsapp/webview.js @@ -3,20 +3,8 @@ const _path = _interopRequireDefault(require('path')); function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; } window.addEventListener('beforeunload', async () => { - try { - const { session } = Ferdi.getCurrentWebContents(); - session.flushStorageData(); - session.clearStorageData({ - storages: ['appcache', 'serviceworkers', 'cachestorage', 'websql', 'indexdb'], - }); - const registrations = await window.navigator.serviceWorker.getRegistrations(); - registrations.forEach(r => { - r.unregister(); - console.log('ServiceWorker unregistered'); - }); - } catch (err) { - console.err(err); - } + Ferdi.clearStorageData(['appcache', 'serviceworkers', 'cachestorage', 'websql', 'indexdb']); + Ferdi.releaseServiceWorkers(); }); module.exports = Ferdi => { -- cgit v1.2.3-70-g09d2