fix: stop desktop startup update loop — manifest version matches bundles

Do not inflate latest.json from dmg filenames; use build version only.
Add client loop guard when the same update retries without version bump.

Co-authored-by: Cursor <cursoragent@cursor.com>
This commit is contained in:
Macbook
2026-06-14 12:36:42 +09:00
parent e658d9afe4
commit 36c06b55ea
3 changed files with 112 additions and 28 deletions
+10 -3
View File
@@ -60,17 +60,19 @@ function addPlatform(platformKey, bundleName) {
return;
}
const bundleVersion = versionFromName(bundleName);
const effectiveVersion = bundleVersion === '0.0.0' ? version : bundleVersion;
const existing = platforms[platformKey];
if (existing && cmpSemver(bundleVersion, existing.bundleVersion) <= 0) return;
if (existing && cmpSemver(effectiveVersion, existing.bundleVersion) <= 0) return;
platforms[platformKey] = {
url: `${baseUrl}/${encodeURIComponent(bundleName)}`,
signature,
bundleVersion,
bundleVersion: effectiveVersion,
};
}
for (const f of files) {
if (f.endsWith('.sig')) continue;
if (f.endsWith('.dmg')) continue; // 설치용 dmg — updater manifest 대상 아님
const lower = f.toLowerCase();
if (lower.includes('aarch64') && (lower.endsWith('.tar.gz') || lower.endsWith('.app.tar.gz'))) {
addPlatform('darwin-aarch64', f);
@@ -91,7 +93,12 @@ const bundleMaxVersion = Object.values(platforms).reduce(
(max, p) => (cmpSemver(p.bundleVersion, max) > 0 ? p.bundleVersion : max),
'0.0.0',
);
const manifestVersion = cmpSemver(bundleMaxVersion, version) > 0 ? bundleMaxVersion : version;
// manifest 버전 = 빌드 버전(--version). 번들 파일명에 버전 없으면 CLI 버전 사용.
// dmg 파일명으로 올리지 않음 — tar.gz 내용과 불일치하면 업데이트 무한 루프.
let manifestVersion = version;
if (bundleMaxVersion !== '0.0.0' && cmpSemver(bundleMaxVersion, version) < 0) {
console.warn(`[warn] bundle version ${bundleMaxVersion} < build ${version} — using build version`);
}
const manifest = {
version: manifestVersion,
+8 -25
View File
@@ -15,40 +15,23 @@ if [[ ! -d "$UPDATES_DIR" ]]; then
fi
VERSION="$(node -p "require('$CONF').version" 2>/dev/null || echo '0.1.0')"
LATEST_JSON="$UPDATES_DIR/latest.json"
BUILD_INFO="$UPDATES_DIR/build-info.json"
# bundle 파일명·build-info·기존 manifest 중 최고 버전 사용 (build-info stale 방지)
VERSION="$(node <<NODE
if [[ -f "$BUILD_INFO" ]]; then
VERSION="$(node <<NODE
const fs = require('fs');
const path = require('path');
const cmp = (a, b) => {
const pa = a.split('.').map(Number), pb = b.split('.').map(Number);
for (let i = 0; i < 3; i++) { const d = (pa[i]||0)-(pb[i]||0); if (d) return d; }
return 0;
};
const maxV = (a, b) => (cmp(a, b) >= 0 ? a : b);
let version = '$VERSION';
const dir = '$UPDATES_DIR';
try {
const bi = JSON.parse(fs.readFileSync('$BUILD_INFO', 'utf8'));
if (bi.version) version = maxV(version, bi.version);
} catch {}
try {
const j = JSON.parse(fs.readFileSync('$LATEST_JSON', 'utf8'));
if (j.version && j.platforms && Object.keys(j.platforms).length > 0) {
version = maxV(version, j.version);
}
} catch {}
try {
for (const f of fs.readdirSync(dir)) {
const m = f.match(/(\\d+\\.\\d+\\.\\d+)/);
if (m) version = maxV(version, m[1]);
}
} catch {}
console.log(version);
const confV = '$VERSION';
let biV = confV;
try { biV = JSON.parse(fs.readFileSync('$BUILD_INFO', 'utf8')).version || confV; } catch {}
console.log(cmp(biV, confV) > 0 ? biV : confV);
NODE
)"
fi
# dmg/exe 설치 파일명 버전은 manifest에 반영하지 않음 (updater tar.gz/exe와 불일치 시 루프 유발)
NOTES="${DESKTOP_RELEASE_NOTES:-GoldenChart Desktop $VERSION}"
set +e