Regatten.net/RegattenApp
1
0
Fork 0
Code Issues 40 Pull Requests Actions Packages Projects Releases Wiki Activity

Fix #5 serviceWorker DB access

Browse Source 
serviceWorker openes DB only when needed and closes it directly
This commit is contained in:
Timon Ostertun
2020-09-30 16:46:10 +02:00
parent 0fb1bb0462
commit 12c1a614bb
1 changed files with 98 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

102
service-worker.js.php
View File

@@ -109,30 +109,41 @@ workbox.routing.registerRoute(
// DB // DB
var db = null; function openDb() {
if (indexedDB) { return new Promise(function(resolve) {
var request = indexedDB.open('regatten_app_db_<?php echo BOATCLASS; ?>'); if (indexedDB) {
request.onerror = function (e) { var request = indexedDB.open('regatten_app_db_<?php echo BOATCLASS; ?>');
console.log('[sW] Cannot open DB:', e.target.errorCode); request.onerror = function (e) {
}; console.log('[sW] Cannot open DB:', e.targer.errorCode);
request.onupgradeneeded = function (e) { resolve(null);
console.log('[sW] DB does not exist'); };
e.target.transaction.abort(); request.onupgradeneeded = function (e) {
}; console.log('[sW] DB does not exist');
request.onsuccess = function (e) { e.target.transaction.abort();
console.log('[sW] DB loaded'); resolve(null);
db = e.target.result; };
db.onerror = function (e) { request.onsuccess = function (e) {
console.log('[sW] DB Error:', e) console.log('[sW] DB loaded');
var db = e.target.result;
db.onerror = function (e) {
console.log('[sW] DB Error:', e);
};
resolve(db);
}
} else {
resolve(null);
} }
}; });
} }
function dbSettingsGet(key) { function dbSettingsGet(key) {
return new Promise(function(resolve) { return new Promise(async function(resolve) {
if (db != null) { var db = await openDb();
if (db !== null) {
var request = db.transaction('settings').objectStore('settings').get(key); var request = db.transaction('settings').objectStore('settings').get(key);
request.onsuccess = function (event) { request.onsuccess = function (event) {
db.close();
console.log('[sW] DB closed');
resolve(typeof request.result != 'undefined' ? request.result.value : null); resolve(typeof request.result != 'undefined' ? request.result.value : null);
} }
} else { } else {
@@ -141,10 +152,20 @@ function dbSettingsGet(key) {
}); });
} }
function dbSettingsSet(key, value) { async function dbSettingsSet(key, value) {
var db = await openDb();
if (db != null) { if (db != null) {
var os = db.transaction('settings', 'readwrite').objectStore('settings'); var os = db.transaction('settings', 'readwrite').objectStore('settings');
os.put({ key: key, value: value}); var request = os.put({ key: key, value: value});
request.onerror = function (event) {
console.log('[sW] Error while saving data to DB:', e);
db.close();
console.log('[sW] DB closed');
}
request.onsuccess = function (event) {
db.close();
console.log('[sW] DB closed');
}
} }
} }
@@ -227,13 +248,50 @@ self.addEventListener('push', async function(event) {
} }
// Force refresh on next app open // Force refresh on next app open
var os = db.transaction('update_times', 'readwrite').objectStore('update_times'); var db = await openDb();
os.put({ table: 'last_sync', time: 0 }); if (db != null) {
var os = db.transaction('update_times', 'readwrite').objectStore('update_times');
var request = os.put({ table: 'last_sync', time: 0 });
request.onerror = function (event) {
console.log('[sW] Error while saving data to DB:', e);
db.close();
console.log('[sW] DB closed');
}
request.onsuccess = function (event) {
db.close();
console.log('[sW] DB closed');
}
}
console.log('Showing notification'); console.log('Showing notification');
self.registration.showNotification(data.title, options); self.registration.showNotification(data.title, options);
break; break;
case 'forcesync':
// Force refresh on next app open
var db = await openDb();
if (db != null) {
var os = db.transaction('update_times', 'readwrite').objectStore('update_times');
var request = os.put({ table: 'last_sync', time: 0 });
request.onerror = function (event) {
console.log('[sW] Error while saving data to DB:', e);
db.close();
console.log('[sW] DB closed');
}
request.onsuccess = function (event) {
console.log('[sW] Data successfully saved');
db.close();
console.log('[sW] DB closed');
}
}
break;
default:
console.log('[sW] Push type unknown:', data.type);
break;
} }
} else {
console.log('[sW] No push type given!');
} }
}); });