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

[erp5_web_renderjs_ui] Update service worker code. Client_id is null when it...

[erp5_web_renderjs_ui] Update service worker code. Client_id is null when it is the first request, in other words if request is navigate mode. Since major web browsers already implement client_id, if client_is is null, let's use the latest cache and don't get cache_key from CACHE_MAP and erp5js_cache.
parent a5391007
...@@ -243,24 +243,22 @@ ...@@ -243,24 +243,22 @@
client_id = event.clientId.toString(), client_id = event.clientId.toString(),
// CACHE_MAP is a temprary data store. // CACHE_MAP is a temprary data store.
// This should be kept until service worker stops. // This should be kept until service worker stops.
cache_key = CACHE_MAP[client_id], cache_key,
erp5js_cache; erp5js_cache;
url.hash = ''; url.hash = '';
if (client_id) {
// client_id is null when it is the first request, in other words
// if request is navigate mode. Since major web browsers already
// implement client_id, if client_is is null, let's use the latest cache
// and don't get cache_key from CACHE_MAP and erp5js_cache.
cache_key = CACHE_MAP[client_id];
}
console.log("Client Id = " + client_id); console.log("Client Id = " + client_id);
if (cache_key) { if (cache_key) {
console.log("cache_key from CACHE_MAP " + cache_key); console.log("cache_key from CACHE_MAP " + cache_key);
} }
if (!client_id) {
// If Client is not supported by web browser,
// use the CACHE_NAME that is defined in this service worker.
// It means that even if there is a new Cache, but web browser
// uses the Cache that was installed by this service worker.
cache_key = CACHE_NAME;
CACHE_MAP[client_id] = cache_key;
console.log("cache_key from Service Worker " + cache_key);
}
if ((event.request.method !== 'GET') || if ((event.request.method !== 'GET') ||
(required_url_list.indexOf(url.toString()) === -1)) { (required_url_list.indexOf(url.toString()) === -1)) {
// Try not to use the untrustable fetch function // Try not to use the untrustable fetch function
...@@ -300,14 +298,20 @@ ...@@ -300,14 +298,20 @@
console.log("KEYS = " + keys); console.log("KEYS = " + keys);
if (keys.length) { if (keys.length) {
cache_key = keys.sort().reverse()[0]; cache_key = keys.sort().reverse()[0];
if (client_id) {
CACHE_MAP[client_id] = cache_key; CACHE_MAP[client_id] = cache_key;
}
} else { } else {
cache_key = CACHE_NAME; cache_key = CACHE_NAME;
if (client_id) {
CACHE_MAP[client_id] = CACHE_NAME; CACHE_MAP[client_id] = CACHE_NAME;
} }
}
// 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.
if (client_id) {
erp5js_cache.put(client_id, new Response(null, {"statusText": cache_key})); erp5js_cache.put(client_id, new Response(null, {"statusText": cache_key}));
}
}); });
} }
}) })
...@@ -319,6 +323,7 @@ ...@@ -319,6 +323,7 @@
// Don't give request object itself. Firefox's Cache Storage // Don't give request object itself. Firefox's Cache Storage
// does not work properly when VARY contains Accept-Language. // does not work properly when VARY contains Accept-Language.
// Give URL string instead, then cache.match works on both Firefox and Chrome. // Give URL string instead, then cache.match works on both Firefox and Chrome.
console.log("MATCH " + cache_key + " " + url);
return cache.match(event.request.url); return cache.match(event.request.url);
}) })
.then(function (response) { .then(function (response) {
......
...@@ -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.15722.43793.37154</string> </value> <value> <string>976.56996.62202.65433</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>1559931548.14</float> <float>1562322109.66</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