Commit aa553877 authored by Yusei Tahara's avatar Yusei Tahara Committed by Romain Courteaud

[erp5_web_renderjs_ui] Clean up service worker code. Remove many `if`.

parent e168596a
...@@ -272,18 +272,13 @@ ...@@ -272,18 +272,13 @@
.then(function () { .then(function () {
if (!CACHE_KEY) { if (!CACHE_KEY) {
// CLIENT_CACHE_MAPPING_NAME stores CACHE_KEY of each client. // CLIENT_CACHE_MAPPING_NAME stores CACHE_KEY of each client.
return caches.open(CLIENT_CACHE_MAPPING_NAME); return caches.open(CLIENT_CACHE_MAPPING_NAME)
}
})
.then(function (erp5js_cache) { .then(function (erp5js_cache) {
if (erp5js_cache) {
// Service worker forget everything when it stops. So, when it started // Service worker forget everything when it stops. So, when it started
// again, CACHE_MAP is empty, get the associated CACHE_KEY from the // again, CACHE_MAP is empty, get the associated CACHE_KEY from the
// special Cache named CLIENT_CACHE_MAPPING_NAME. // special Cache named CLIENT_CACHE_MAPPING_NAME.
ERP5JS_CACHE = erp5js_cache; ERP5JS_CACHE = erp5js_cache;
return erp5js_cache.match(client_id); return erp5js_cache.match(client_id)
}
})
.then(function (response) { .then(function (response) {
if (response) { if (response) {
// We use Cache Storage as a persistent database. // We use Cache Storage as a persistent database.
...@@ -292,16 +287,15 @@ ...@@ -292,16 +287,15 @@
console.log("CACHE_KEY from Cache Storage " + CACHE_KEY); console.log("CACHE_KEY from Cache Storage " + CACHE_KEY);
} }
}) })
.then(function () { })
if (CACHE_KEY) {
return [];
} }
})
.then(function () {
if (!CACHE_KEY) {
// If associated CACHE_KEY is not found, it means this client is a new one. // If associated CACHE_KEY is not found, it means this client is a new one.
// Let's find the latest Cache. // Let's find the latest Cache.
return caches.keys(); return caches.keys()
})
.then(function (keys) { .then(function (keys) {
if (!CACHE_KEY) {
keys = keys.filter(function (key) {return key.startsWith(prefix); }); keys = keys.filter(function (key) {return key.startsWith(prefix); });
console.log("KEYS = " + keys); console.log("KEYS = " + keys);
if (keys.length) { if (keys.length) {
...@@ -314,6 +308,7 @@ ...@@ -314,6 +308,7 @@
// Save the associated CACHE_KEY in a persistent database because service // Save the associated CACHE_KEY in a persistent database because service
// worker forget everything when it stops. // worker forget everything when it stops.
ERP5JS_CACHE.put(client_id, new Response(null, {"statusText": CACHE_KEY})); ERP5JS_CACHE.put(client_id, new Response(null, {"statusText": CACHE_KEY}));
})
} }
}) })
.then(function () { .then(function () {
......
...@@ -228,7 +228,7 @@ ...@@ -228,7 +228,7 @@
</item> </item>
<item> <item>
<key> <string>serial</string> </key> <key> <string>serial</string> </key>
<value> <string>976.15482.50361.52206</string> </value> <value> <string>976.15605.32654.49476</string> </value>
</item> </item>
<item> <item>
<key> <string>state</string> </key> <key> <string>state</string> </key>
...@@ -246,7 +246,7 @@ ...@@ -246,7 +246,7 @@
</tuple> </tuple>
<state> <state>
<tuple> <tuple>
<float>1559917201.4</float> <float>1559924528.42</float>
<string>UTC</string> <string>UTC</string>
</tuple> </tuple>
</state> </state>
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment