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

public/asset-version.php

@@ -55,22 +55,30 @@ function collect_asset_files(string $root, array $scanRoots): array
 clearstatcache();
 $rootPath = realpath($root);
 $fingerprints = [];
+$assets = [];
 
 foreach (collect_asset_files($root, $scanRoots) as $fullPath) {
     $relativePath = ltrim(str_replace($rootPath ?: $root, '', $fullPath), DIRECTORY_SEPARATOR);
     $fileHash = is_readable($fullPath) ? (hash_file('sha256', $fullPath) ?: 'hash-failed') : 'unreadable';
+    $fileVersion = (string)filemtime($fullPath) . '-' . substr($fileHash, 0, 10);
     $fingerprints[] = implode('|', [
         str_replace(DIRECTORY_SEPARATOR, '/', $relativePath),
         (string)filesize($fullPath),
         (string)filemtime($fullPath),
         $fileHash,
     ]);
+
+    if (str_starts_with($relativePath, 'public' . DIRECTORY_SEPARATOR)) {
+        $publicPath = substr($relativePath, strlen('public'));
+        $assets[str_replace(DIRECTORY_SEPARATOR, '/', $publicPath)] = $fileVersion;
+    }
 }
 
 echo json_encode([
     'result' => 'ok',
     'service' => $service,
     'version' => hash('sha256', implode("\n", $fingerprints)),
+    'assets' => $assets,
     'count' => count($fingerprints),
     'generatedAt' => time(),
 ], JSON_UNESCAPED_UNICODE | JSON_UNESCAPED_SLASHES);

public/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);

public/index.php

@@ -14,6 +14,20 @@ if (!headers_sent()) {
 
 $csrf = csrf_token();
 
+function asset_url(string $path): string
+{
+    $fullPath = __DIR__ . '/' . ltrim($path, '/');
+    $version = 'dev';
+
+    if (is_file($fullPath)) {
+        $mtime = filemtime($fullPath) ?: time();
+        $hash = is_readable($fullPath) ? substr(hash_file('sha256', $fullPath) ?: '', 0, 10) : '';
+        $version = $mtime . ($hash !== '' ? '-' . $hash : '');
+    }
+
+    return $path . '?v=' . rawurlencode($version);
+}
+
 if (isset($_GET['logout'])) {
     clear_remember_token();
     clear_common_admin_auth_cookie_if_available();
@@ -78,11 +92,11 @@ $loggedIn = signed_in();
 <link rel="preconnect" href="https://fonts.googleapis.com">
 <link rel="preconnect" href="https://fonts.gstatic.com" crossorigin>
 <link href="https://fonts.googleapis.com/css2?family=Gowun+Dodum&display=swap" rel="stylesheet">
-<link rel="icon" href="/assets/favicon.svg" type="image/svg+xml">
-<link rel="icon" href="/assets/icon-192.png" type="image/png" sizes="192x192">
-<link rel="apple-touch-icon" href="/assets/apple-touch-icon.png">
-<link rel="manifest" href="/manifest.json">
-<script src="/assets/asset-reload.js?v=20260721_nocache1" data-service="control" defer></script>
+<link rel="icon" href="<?= e(asset_url('/assets/favicon.svg')) ?>" type="image/svg+xml">
+<link rel="icon" href="<?= e(asset_url('/assets/icon-192.png')) ?>" type="image/png" sizes="192x192">
+<link rel="apple-touch-icon" href="<?= e(asset_url('/assets/apple-touch-icon.png')) ?>">
+<link rel="manifest" href="<?= e(asset_url('/manifest.json')) ?>">
+<script src="<?= e(asset_url('/assets/asset-reload.js')) ?>" data-service="control" defer></script>
 <meta name="theme-color" content="#0f1115">
 <script>
 try {
@@ -372,8 +386,8 @@ html[data-theme="light"] .details-panel{background:#edf3fa;border-color:#b8c7da}
         </div>
     </div>
 </div>
-<script src="/assets/app.js?v=20260723_touch_display3"></script>
-<script src="/assets/wakelock.js?v=20260607_prefs1"></script>
+<script src="<?= e(asset_url('/assets/app.js')) ?>"></script>
+<script src="<?= e(asset_url('/assets/wakelock.js')) ?>"></script>
 <?php endif; ?>
 </body>
 </html>