fix(ui): bust browser localStorage and HTTP cache on update, render version server-side (v1.3.9)
This commit is contained in:
1 parent
1d09f06dc2
commit
c5eb849095
5 files changed
+89
-31
No files matched your search
+25
-13
@@ -136,8 +136,15 @@ try {
|
||||
$settings['local_networks'] = [$settings['local_net']];
|
||||
}
|
||||
|
||||
$appDir = dirname(__DIR__);
|
||||
$installedVerData = file_exists("{$appDir}/version.json")
|
||||
? json_decode((string)file_get_contents("{$appDir}/version.json"), true)
|
||||
: [];
|
||||
$installedVer = $installedVerData['version'] ?? '1.3.9';
|
||||
|
||||
echo json_encode([
|
||||
'success' => true,
|
||||
'version' => $installedVer,
|
||||
'user' => Auth::getUsername(),
|
||||
'settings' => $settings,
|
||||
'extensions' => $extensions,
|
||||
@@ -2233,23 +2240,28 @@ try {
|
||||
|
||||
case 'check_update':
|
||||
$appDir = dirname(__DIR__);
|
||||
clearstatcache(true, "{$appDir}/version.json");
|
||||
$localVerJson = file_exists("{$appDir}/version.json")
|
||||
? json_decode((string)file_get_contents("{$appDir}/version.json"), true)
|
||||
: ['version' => '1.2.0', 'changelog' => []];
|
||||
: ['version' => '1.3.8', 'changelog' => []];
|
||||
|
||||
$currentVer = $localVerJson['version'] ?? '1.2.0';
|
||||
$currentVer = $localVerJson['version'] ?? '1.3.8';
|
||||
$remoteVer = $currentVer;
|
||||
$remoteChangelog = [];
|
||||
$remoteDate = '';
|
||||
|
||||
// 1. Interrogation directe via HTTP Raw (indépendant de .git et ultra-rapide)
|
||||
$rawHttp = @shell_exec("curl -k -s --connect-timeout 4 \"https://git.sorcier-research.com/sorcier/NexusPBX/raw/branch/main/version.json\" 2>/dev/null");
|
||||
// 1. Interrogation directe via HTTP Raw avec cache-busting strict (bypass OpenResty/Cloudflare max-age)
|
||||
$ts = time();
|
||||
$rawHttp = @shell_exec("curl -k -s -H 'Cache-Control: no-cache, no-store' -H 'Pragma: no-cache' --connect-timeout 4 \"https://git.sorcier-research.com/sorcier/NexusPBX/raw/branch/main/version.json?_t={$ts}\" 2>/dev/null");
|
||||
if (empty($rawHttp)) {
|
||||
$ctx = stream_context_create([
|
||||
'http' => ['timeout' => 4],
|
||||
'http' => [
|
||||
'timeout' => 4,
|
||||
'header' => "Cache-Control: no-cache\r\nPragma: no-cache\r\n"
|
||||
],
|
||||
'ssl' => ['verify_peer' => false, 'verify_peer_name' => false]
|
||||
]);
|
||||
$rawHttp = @file_get_contents("https://git.sorcier-research.com/sorcier/NexusPBX/raw/branch/main/version.json", false, $ctx);
|
||||
$rawHttp = @file_get_contents("https://git.sorcier-research.com/sorcier/NexusPBX/raw/branch/main/version.json?_t={$ts}", false, $ctx);
|
||||
}
|
||||
|
||||
if (!empty($rawHttp)) {
|
||||
@@ -2274,11 +2286,6 @@ try {
|
||||
}
|
||||
|
||||
$hasUpdate = version_compare($remoteVer, $currentVer, '>');
|
||||
$localHash = trim((string)shell_exec("git --git-dir={$appDir}/.git rev-parse HEAD 2>/dev/null"));
|
||||
$remoteHash = trim((string)shell_exec("git --git-dir={$appDir}/.git rev-parse origin/main 2>/dev/null"));
|
||||
if (!$hasUpdate && $localHash !== '' && $remoteHash !== '' && $localHash !== $remoteHash) {
|
||||
$hasUpdate = true;
|
||||
}
|
||||
|
||||
echo json_encode([
|
||||
'success' => true,
|
||||
@@ -2297,13 +2304,18 @@ try {
|
||||
$outputStr = implode("\n", $output);
|
||||
|
||||
$appDir = dirname(__DIR__);
|
||||
clearstatcache(true, "{$appDir}/version.json");
|
||||
if (function_exists('opcache_reset')) {
|
||||
@opcache_reset();
|
||||
}
|
||||
|
||||
$newVerJson = file_exists("{$appDir}/version.json")
|
||||
? json_decode((string)file_get_contents("{$appDir}/version.json"), true)
|
||||
: ['version' => '1.3.0'];
|
||||
: ['version' => '1.3.8'];
|
||||
|
||||
echo json_encode([
|
||||
'success' => ($code === 0),
|
||||
'new_version' => $newVerJson['version'] ?? '1.3.0',
|
||||
'new_version' => $newVerJson['version'] ?? '1.3.8',
|
||||
'output' => $outputStr,
|
||||
'message' => ($code === 0) ? "Mise à jour réussie !" : "Erreur lors de la mise à jour",
|
||||
]);
|
||||
|
||||
Reference in new issue
Block a user