fixed files not downloading properly

This commit is contained in:
2026-09-07 11:21:39 -07:00
parent bb39db0272
commit ba8266bd86
6 changed files with 85 additions and 25 deletions

48
main.js
View File

@@ -216,18 +216,20 @@ async function start() {
debugLog(`Is First Run: ${isFirstRun}, Local Version: ${localVersion}, Local SHA: ${localSha}`);
function findLocalZip() {
const searchRoots = [__dirname, process.cwd()];
const searchRoots = [__dirname, process.cwd(), path.join(__dirname, '../../..')];
for (const root of searchRoots) {
let cur = root;
for (let i = 0; i < 6; i++) {
const zp = path.join(cur, 'update-payload.zip');
if (fs.existsSync(zp)) {
const mp = path.join(cur, 'manifest.json');
return { zipPath: zp, manifestPath: fs.existsSync(mp) ? mp : null };
}
const parent = path.dirname(cur);
if (parent === cur) break;
cur = parent;
try {
const zp = path.join(cur, 'update-payload.zip');
if (fs.existsSync(zp)) {
const mp = path.join(cur, 'manifest.json');
return { zipPath: zp, manifestPath: fs.existsSync(mp) ? mp : null };
}
const parent = path.dirname(cur);
if (parent === cur) break;
cur = parent;
} catch (e) { }
}
}
return null;
@@ -309,12 +311,24 @@ async function start() {
debugLog("Update available. Prompting user...");
sendToTauri('status', { message: `New update available (${release.version}). Awaiting confirmation...` });
try {
if (process.platform === 'win32') {
require('child_process').spawnSync('powershell.exe', [
'-NoProfile', '-NonInteractive', '-Command',
`Get-NetTCPConnection -LocalPort 4891 -ErrorAction SilentlyContinue | ForEach-Object { Stop-Process -Id $_.OwningProcess -Force }`
], { stdio: 'ignore', windowsHide: true });
} else {
require('child_process').spawnSync('fuser', ['-k', '-9', `4891/tcp`], { stdio: 'ignore' });
}
} catch (e) { }
const tempApp = express();
let userDecision = null;
tempApp.use((req, res, next) => {
res.header('Access-Control-Allow-Origin', '*');
res.header('Access-Control-Allow-Methods', 'GET,POST,OPTIONS');
res.header('Access-Control-Allow-Headers', '*');
res.header('Connection', 'close');
if (req.method === 'OPTIONS') return res.sendStatus(200);
next();
});
@@ -326,15 +340,27 @@ async function start() {
const tempServer = await new Promise((resolve) => {
const s = tempApp.listen(4891, '127.0.0.1', () => resolve(s));
s.on('error', (err) => {
debugLog(`Update server bind error: ${err.message}`);
resolve(null);
});
});
sendToTauri('update-available', { current: localVersion, latest: release.version });
let waitLoops = 0;
while (userDecision === null) {
if (!tempServer && waitLoops > 400) {
userDecision = false;
break;
}
waitLoops++;
await new Promise(r => setTimeout(r, 25));
}
await new Promise((resolve) => tempServer.close(resolve));
if (tempServer) {
tempServer.close();
}
if (userDecision) {
debugLog("User accepted update.");
@@ -374,7 +400,7 @@ async function start() {
sendToTauri('status', { message: 'Validating critical components...' });
if (!patcher.verifyExtraction()) {
throw new Error('No application files found. Ensure you run "npm run build:payload" to generate the local development payload.');
throw new Error('No application files found. Ensure you ran "npm run build:payload" and the extraction succeeded.');
}
sendToTauri('status', { message: 'Loading encrypted credentials...' });