fix: make Host updates simple and fast
GoodBuddy Agents / Validate Agent source (push) Canceled after 0s
GoodBuddy Agents / Build Linux arm64 Agent (push) Canceled after 0s
GoodBuddy Agents / Build Linux x64 Agent (push) Canceled after 0s
GoodBuddy Agent Release / Authorize Agent release (push) Canceled after 0s
Cross-platform packages / Validate source (push) Canceled after 0s
GoodBuddy Agent Release / Build Linux arm64 compound package (push) Canceled after 0s
GoodBuddy Agent Release / Build Linux x64 compound package (push) Canceled after 0s
GoodBuddy Agent Release / Sign cumulative Agent catalog (push) Canceled after 0s
GoodBuddy Agent Release / Publish Agent to GitHub and OSS (push) Canceled after 0s
Cross-platform packages / Authorize desktop packaging (push) Canceled after 0s
Cross-platform packages / linux arm64 (push) Canceled after 0s
Cross-platform packages / macos arm64 (push) Canceled after 0s
Cross-platform packages / windows arm64 (push) Canceled after 0s
Cross-platform packages / linux x64 (push) Canceled after 0s
Cross-platform packages / macos x64 (push) Canceled after 0s
Cross-platform packages / windows x64 (push) Canceled after 0s
Cross-platform packages / Publish GitHub and OSS release (push) Canceled after 0s
GoodBuddy Agents / Validate Agent source (push) Canceled after 0s
GoodBuddy Agents / Build Linux arm64 Agent (push) Canceled after 0s
GoodBuddy Agents / Build Linux x64 Agent (push) Canceled after 0s
GoodBuddy Agent Release / Authorize Agent release (push) Canceled after 0s
Cross-platform packages / Validate source (push) Canceled after 0s
GoodBuddy Agent Release / Build Linux arm64 compound package (push) Canceled after 0s
GoodBuddy Agent Release / Build Linux x64 compound package (push) Canceled after 0s
GoodBuddy Agent Release / Sign cumulative Agent catalog (push) Canceled after 0s
GoodBuddy Agent Release / Publish Agent to GitHub and OSS (push) Canceled after 0s
Cross-platform packages / Authorize desktop packaging (push) Canceled after 0s
Cross-platform packages / linux arm64 (push) Canceled after 0s
Cross-platform packages / macos arm64 (push) Canceled after 0s
Cross-platform packages / windows arm64 (push) Canceled after 0s
Cross-platform packages / linux x64 (push) Canceled after 0s
Cross-platform packages / macos x64 (push) Canceled after 0s
Cross-platform packages / windows x64 (push) Canceled after 0s
Cross-platform packages / Publish GitHub and OSS release (push) Canceled after 0s
Host repair could fail while adopting the published OpenCode Runtime, then repeat package and payload verification and carry durable metadata snapshots for recovery. Host preparation now verifies each acquired compound archive once, adopts signed Agent and Runtime metadata without rereading payload trees, and retries failed work by cleaning staging and preparing fresh. The desktop and Agent versions are advanced to 0.11.9 with the approved bilingual release notes. Remote Projects remain a disabled-by-default technical preview, Agent packages remain separate Linux x64/arm64 releases, and this release has no LoongArch preview. Release note: 修复 Host 更新采用失败,移除重复远端包体校验,并将中断恢复简化为清理暂存后重新准备。
This commit is contained in:
@@ -142,6 +142,8 @@ type InstallerOptions = {
|
||||
operationRoot: string
|
||||
archive: string
|
||||
expectedSha256: string
|
||||
/** The acquisition path verified the archive before installer execution. */
|
||||
archiveSha256Verified?: boolean
|
||||
homeDirectory?: string
|
||||
emit?: (event: PackageInstallerEvent) => void
|
||||
}
|
||||
@@ -1361,6 +1363,7 @@ function sameSnapshot(
|
||||
function verifyArchive(
|
||||
archivePath: string,
|
||||
expectedSha256: string,
|
||||
archiveSha256Verified: boolean,
|
||||
emit: (phase: string) => void
|
||||
): VerifiedPackage {
|
||||
const handle = openSync(
|
||||
@@ -1376,11 +1379,14 @@ function verifyArchive(
|
||||
) {
|
||||
throw new Error('Agent package archive is not a bounded regular file')
|
||||
}
|
||||
emit('hashing-archive')
|
||||
const archiveSha256 = hashArchive(handle, snapshot.size)
|
||||
if (archiveSha256 !== expectedSha256) {
|
||||
throw new Error('Agent package archive SHA-256 does not match the authenticated catalog')
|
||||
if (!archiveSha256Verified) {
|
||||
emit('hashing-archive')
|
||||
const archiveSha256 = hashArchive(handle, snapshot.size)
|
||||
if (archiveSha256 !== expectedSha256) {
|
||||
throw new Error('Agent package archive SHA-256 does not match the authenticated catalog')
|
||||
}
|
||||
}
|
||||
const archiveSha256 = expectedSha256
|
||||
emit('verifying-zip')
|
||||
const entries = parseZip(handle, snapshot.size)
|
||||
const descriptorBytes = readEntry(handle, entries, PACKAGE_DESCRIPTOR)
|
||||
@@ -1637,28 +1643,7 @@ function persistPreparedState(
|
||||
if (bytes.length > MAXIMUM_METADATA_BYTES) {
|
||||
throw new Error('Prepared package state exceeds its limit')
|
||||
}
|
||||
const handle = openSync(
|
||||
temporary,
|
||||
constants.O_WRONLY | constants.O_CREAT | constants.O_EXCL,
|
||||
0o600
|
||||
)
|
||||
try {
|
||||
let offset = 0
|
||||
while (offset < bytes.length) {
|
||||
offset += writeFileChunk(handle, bytes, offset)
|
||||
}
|
||||
fsyncSync(handle)
|
||||
} finally {
|
||||
closeSync(handle)
|
||||
}
|
||||
try {
|
||||
chmodSync(temporary, 0o600)
|
||||
renameSync(temporary, destination)
|
||||
} finally {
|
||||
if (existsSync(temporary)) {
|
||||
unlinkSync(temporary)
|
||||
}
|
||||
}
|
||||
writeBufferAtomically(destination, temporary, bytes)
|
||||
}
|
||||
|
||||
function writePreparedFile(
|
||||
@@ -1677,6 +1662,15 @@ function writePreparedFile(
|
||||
directory,
|
||||
`.${name}-${process.pid}-${Date.now().toString(36)}.tmp`
|
||||
)
|
||||
writeBufferAtomically(destination, temporary, bytes)
|
||||
}
|
||||
|
||||
function writeBufferAtomically(
|
||||
destination: string,
|
||||
temporary: string,
|
||||
bytes: Buffer,
|
||||
replaceExistingOnWindows = false
|
||||
): void {
|
||||
const handle = openSync(
|
||||
temporary,
|
||||
constants.O_WRONLY | constants.O_CREAT | constants.O_EXCL,
|
||||
@@ -1693,6 +1687,13 @@ function writePreparedFile(
|
||||
}
|
||||
try {
|
||||
chmodSync(temporary, 0o600)
|
||||
if (
|
||||
replaceExistingOnWindows &&
|
||||
process.platform === 'win32' &&
|
||||
existsSync(destination)
|
||||
) {
|
||||
unlinkSync(destination)
|
||||
}
|
||||
renameSync(temporary, destination)
|
||||
} finally {
|
||||
if (existsSync(temporary)) {
|
||||
@@ -1808,6 +1809,7 @@ export function preparePackage(options: InstallerOptions): PackageInstallerResul
|
||||
const verified = verifyArchive(
|
||||
inputs.archive,
|
||||
inputs.expectedSha256,
|
||||
options.archiveSha256Verified === true,
|
||||
progress
|
||||
)
|
||||
try {
|
||||
@@ -1940,31 +1942,12 @@ function writePrivateFileAtomic(
|
||||
dirname(destination),
|
||||
`.${basename(destination)}-${process.pid}-${Date.now().toString(36)}.tmp`
|
||||
)
|
||||
const handle = openSync(
|
||||
writeBufferAtomically(
|
||||
destination,
|
||||
temporary,
|
||||
constants.O_WRONLY | constants.O_CREAT | constants.O_EXCL,
|
||||
0o600
|
||||
contents,
|
||||
true
|
||||
)
|
||||
try {
|
||||
let offset = 0
|
||||
while (offset < contents.length) {
|
||||
offset += writeFileChunk(handle, contents, offset)
|
||||
}
|
||||
fsyncSync(handle)
|
||||
} finally {
|
||||
closeSync(handle)
|
||||
}
|
||||
try {
|
||||
chmodSync(temporary, 0o600)
|
||||
if (process.platform === 'win32' && existsSync(destination)) {
|
||||
unlinkSync(destination)
|
||||
}
|
||||
renameSync(temporary, destination)
|
||||
} finally {
|
||||
if (existsSync(temporary)) {
|
||||
unlinkSync(temporary)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
function restoreLocalMetadata(
|
||||
@@ -2571,14 +2554,18 @@ function parseCli(argv: readonly string[]): {
|
||||
const command = argv[0]
|
||||
if (command !== 'prepare' && command !== 'commit') {
|
||||
throw new Error(
|
||||
'Usage: remote-package-installer.mjs <prepare|commit> --operation-root <absolute-path> --archive <absolute-path> --expected-sha256 <hex>'
|
||||
'Usage: remote-package-installer.mjs <prepare|commit> --operation-root <absolute-path> --archive <absolute-path> --expected-sha256 <hex> [--archive-sha256-verified true]'
|
||||
)
|
||||
}
|
||||
const values: Record<string, string> = {}
|
||||
const allowed = new Set([
|
||||
const required = [
|
||||
'--operation-root',
|
||||
'--archive',
|
||||
'--expected-sha256'
|
||||
] as const
|
||||
const allowed = new Set([
|
||||
...required,
|
||||
'--archive-sha256-verified'
|
||||
])
|
||||
for (let index = 1; index < argv.length; index += 2) {
|
||||
const flag = argv[index]
|
||||
@@ -2594,17 +2581,25 @@ function parseCli(argv: readonly string[]): {
|
||||
}
|
||||
values[flag] = value
|
||||
}
|
||||
for (const flag of allowed) {
|
||||
for (const flag of required) {
|
||||
if (values[flag] === undefined) {
|
||||
throw new Error(`Missing required package installer argument: ${flag}`)
|
||||
}
|
||||
}
|
||||
if (
|
||||
values['--archive-sha256-verified'] !== undefined &&
|
||||
values['--archive-sha256-verified'] !== 'true'
|
||||
) {
|
||||
throw new Error('Invalid package installer argument')
|
||||
}
|
||||
return {
|
||||
command,
|
||||
options: {
|
||||
operationRoot: values['--operation-root']!,
|
||||
archive: values['--archive']!,
|
||||
expectedSha256: values['--expected-sha256']!
|
||||
expectedSha256: values['--expected-sha256']!,
|
||||
archiveSha256Verified:
|
||||
values['--archive-sha256-verified'] === 'true'
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user