에셋 리로드 파일별 캐시 검증 보강

assets/asset-reload.js

@@ -21,6 +21,7 @@
     var running = false;
     var memoryStore = {};
     var lastCheckAt = 0;
+    var bfcacheReturn = false;
 
     function cookieName(key) {
         return key.replace(/[^A-Za-z0-9_-]/g, '_');
@@ -167,12 +168,26 @@
 
     unregisterServiceWorkers();
 
-    function reloadWith(version) {
+    function loadedAssetMismatch(assets) {
+        if (!assets || typeof assets !== 'object') return false;
+
+        var nodes = Array.prototype.slice.call(document.querySelectorAll('script[src], link[href]'));
+        return nodes.some(function (element) {
+            var attr = element.tagName.toLowerCase() === 'script' ? 'src' : 'href';
+            var current = element.getAttribute(attr);
+            var parsed = current ? sameOriginUrl(current) : null;
+            if (!parsed || !Object.prototype.hasOwnProperty.call(assets, parsed.pathname)) return false;
+
+            return parsed.searchParams.get('v') !== String(assets[parsed.pathname]);
+        });
+    }
+
+    function reloadWith(version, force) {
         var token = version.slice(0, 12);
         var marker = token + ':' + Math.floor(Date.now() / 10000);
 
-        if (assetTokenFromLocation() === token) return;
-        if (assetTokenFromLocation() && sessionGet(reloadKey) === marker) return;
+        if (!force && assetTokenFromLocation() === token) return;
+        if (sessionGet(reloadKey) === marker) return;
 
         sessionSet(reloadKey, marker);
         withTimeout(Promise.all([deleteCaches(), unregisterServiceWorkers()]), 2500).then(function () {
@@ -201,15 +216,18 @@
 
             var token = data.version.slice(0, 12);
             var previous = storeGet(storageKey);
+            var mismatch = loadedAssetMismatch(data.assets);
+            var forceReload = bfcacheReturn;
+            bfcacheReturn = false;
             storeSet(storageKey, data.version);
 
-            if (assetTokenFromLocation() !== token) {
-                reloadWith(data.version);
+            if (assetTokenFromLocation() !== token || mismatch || forceReload) {
+                reloadWith(data.version, mismatch || forceReload);
                 return;
             }
 
             if (previous && previous !== data.version) {
-                reloadWith(data.version);
+                reloadWith(data.version, false);
             }
         }).then(function () {
             running = false;
@@ -218,7 +236,10 @@
         });
     }
 
-    window.addEventListener('pageshow', function () {
+    window.addEventListener('pageshow', function (event) {
+        if (event && event.persisted) {
+            bfcacheReturn = true;
+        }
         check(true);
         setTimeout(function () { check(true); }, 250);
         setTimeout(function () { check(true); }, 1500);