Enhance patch-windows-binaries script with retry logic and improved error handling
Some checks reported errors
farmcontrol/farmcontrol-ui/pipeline/head Something is wrong with the build of this commit
Some checks reported errors
farmcontrol/farmcontrol-ui/pipeline/head Something is wrong with the build of this commit
- Introduced a retry mechanism in the `patchExecutable` function to handle transient errors when patching executables, allowing up to 6 attempts with exponential backoff. - Updated the patching process to create a temporary copy of the executable before applying changes, reducing the risk of file locks by antivirus software. - Improved logging to provide clearer feedback on patching attempts and failures.
This commit is contained in:
parent
4a1badb5aa
commit
c056a2b021
@ -1,9 +1,51 @@
|
|||||||
import { existsSync } from 'node:fs'
|
import { copyFileSync, existsSync, unlinkSync } from 'node:fs'
|
||||||
import path from 'node:path'
|
import path from 'node:path'
|
||||||
import { fileURLToPath } from 'node:url'
|
import { fileURLToPath } from 'node:url'
|
||||||
import rcedit from 'rcedit'
|
import rcedit from 'rcedit'
|
||||||
|
|
||||||
const PATCH_TARGETS = new Set(['launcher.exe'])
|
const PATCH_TARGETS = new Set(['launcher.exe'])
|
||||||
|
const MAX_ATTEMPTS = 6
|
||||||
|
const BASE_DELAY_MS = 500
|
||||||
|
|
||||||
|
function sleep(ms) {
|
||||||
|
return new Promise((resolve) => setTimeout(resolve, ms))
|
||||||
|
}
|
||||||
|
|
||||||
|
async function patchExecutable(executablePath) {
|
||||||
|
let lastError
|
||||||
|
|
||||||
|
for (let attempt = 1; attempt <= MAX_ATTEMPTS; attempt++) {
|
||||||
|
const tempPath = `${executablePath}.rcedit-${process.pid}-${attempt}.tmp`
|
||||||
|
|
||||||
|
try {
|
||||||
|
// Patch a copy then replace — avoids AV/indexer locks on the live PE.
|
||||||
|
copyFileSync(executablePath, tempPath)
|
||||||
|
await rcedit(tempPath, {
|
||||||
|
'requested-execution-level': 'asInvoker'
|
||||||
|
})
|
||||||
|
copyFileSync(tempPath, executablePath)
|
||||||
|
return
|
||||||
|
} catch (error) {
|
||||||
|
lastError = error
|
||||||
|
const message = error instanceof Error ? error.message : String(error)
|
||||||
|
console.warn(
|
||||||
|
`patch-windows-binaries: attempt ${attempt}/${MAX_ATTEMPTS} failed for ${executablePath}: ${message}`
|
||||||
|
)
|
||||||
|
|
||||||
|
if (attempt < MAX_ATTEMPTS) {
|
||||||
|
await sleep(BASE_DELAY_MS * 2 ** (attempt - 1))
|
||||||
|
}
|
||||||
|
} finally {
|
||||||
|
try {
|
||||||
|
unlinkSync(tempPath)
|
||||||
|
} catch {
|
||||||
|
// Ignore cleanup failures.
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
throw lastError
|
||||||
|
}
|
||||||
|
|
||||||
export async function patchWindowsBinaries(appDir) {
|
export async function patchWindowsBinaries(appDir) {
|
||||||
if (process.platform !== 'win32') {
|
if (process.platform !== 'win32') {
|
||||||
@ -23,9 +65,7 @@ export async function patchWindowsBinaries(appDir) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
try {
|
try {
|
||||||
await rcedit(executablePath, {
|
await patchExecutable(executablePath)
|
||||||
'requested-execution-level': 'asInvoker'
|
|
||||||
})
|
|
||||||
console.log(`patch-windows-binaries: set asInvoker on ${executablePath}`)
|
console.log(`patch-windows-binaries: set asInvoker on ${executablePath}`)
|
||||||
} catch (error) {
|
} catch (error) {
|
||||||
console.warn(
|
console.warn(
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user