에셋 리로드 파일별 캐시 검증 보강
This commit is contained in:
@@ -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);
|
||||
|
||||
@@ -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);
|
||||
|
||||
+7
-7
@@ -61,10 +61,10 @@ if ($_SERVER['REQUEST_METHOD'] === 'POST') {
|
||||
<meta name="apple-mobile-web-app-title" content="Financial">
|
||||
<meta name="apple-mobile-web-app-status-bar-style" content="default">
|
||||
|
||||
<link rel="icon" type="image/png" href="/favicon.png?v=2">
|
||||
<link rel="shortcut icon" href="/favicon.png?v=2">
|
||||
<link rel="apple-touch-icon" href="/favicon.png?v=2">
|
||||
<link rel="manifest" href="/manifest.webmanifest">
|
||||
<link rel="icon" type="image/png" href="<?= h(asset_url('/favicon.png')) ?>">
|
||||
<link rel="shortcut icon" href="<?= h(asset_url('/favicon.png')) ?>">
|
||||
<link rel="apple-touch-icon" href="<?= h(asset_url('/favicon.png')) ?>">
|
||||
<link rel="manifest" href="<?= h(asset_url('/manifest.webmanifest')) ?>">
|
||||
|
||||
<meta property="og:type" content="website">
|
||||
<meta property="og:site_name" content="Financial">
|
||||
@@ -78,9 +78,9 @@ if ($_SERVER['REQUEST_METHOD'] === 'POST') {
|
||||
<meta name="twitter:description" content="개인 금융 통합 관리 서비스">
|
||||
<meta name="twitter:image" content="https://seo.chaegeon.com/favicon.png">
|
||||
|
||||
<link href="/assets/vendor/bootstrap.min.css" rel="stylesheet">
|
||||
<link href="/assets/app.css" rel="stylesheet">
|
||||
<script src="/assets/asset-reload.js?v=20260721_nocache1" data-service="financial" defer></script>
|
||||
<link href="<?= h(asset_url('/assets/vendor/bootstrap.min.css')) ?>" rel="stylesheet">
|
||||
<link href="<?= h(asset_url('/assets/app.css')) ?>" rel="stylesheet">
|
||||
<script src="<?= h(asset_url('/assets/asset-reload.js')) ?>" data-service="financial" defer></script>
|
||||
<script src="https://chaegeon.com/log/bancheck.min.js?_=<?php echo time(); ?>"></script>
|
||||
</head>
|
||||
<body>
|
||||
|
||||
+6
-6
@@ -84,12 +84,12 @@ if ($_SERVER['REQUEST_METHOD'] === 'POST') {
|
||||
<meta name="apple-mobile-web-app-capable" content="yes">
|
||||
<meta name="apple-mobile-web-app-title" content="Financial">
|
||||
<meta name="apple-mobile-web-app-status-bar-style" content="default">
|
||||
<link rel="icon" type="image/png" href="/favicon.png?v=2">
|
||||
<link rel="apple-touch-icon" href="/favicon.png?v=2">
|
||||
<link rel="manifest" href="/manifest.webmanifest">
|
||||
<link href="/assets/vendor/bootstrap.min.css" rel="stylesheet">
|
||||
<link href="/assets/app.css" rel="stylesheet">
|
||||
<script src="/assets/asset-reload.js?v=20260721_nocache1" data-service="financial" defer></script>
|
||||
<link rel="icon" type="image/png" href="<?= h(asset_url('/favicon.png')) ?>">
|
||||
<link rel="apple-touch-icon" href="<?= h(asset_url('/favicon.png')) ?>">
|
||||
<link rel="manifest" href="<?= h(asset_url('/manifest.webmanifest')) ?>">
|
||||
<link href="<?= h(asset_url('/assets/vendor/bootstrap.min.css')) ?>" rel="stylesheet">
|
||||
<link href="<?= h(asset_url('/assets/app.css')) ?>" rel="stylesheet">
|
||||
<script src="<?= h(asset_url('/assets/asset-reload.js')) ?>" data-service="financial" defer></script>
|
||||
<script src="https://chaegeon.com/log/bancheck.min.js?_=<?php echo time(); ?>"></script>
|
||||
</head>
|
||||
<body>
|
||||
|
||||
Reference in New Issue
Block a user