mirror of
https://github.com/stablyai/orca.git
synced 2026-09-22 08:02:28 +00:00
* fix(windows): prune the unpatched conpty prebuild by header, not host arch `prunePackagedNodePty` deleted the published `prebuilds/win32-<arch>/conpty.node` only when `electronArch === process.arch`. That proxy stood in for "build/Release holds an addon this slice can load", and it is false for the arm64 slice cross-built on an x64 Windows host — a rebuild that DOES emit a correct arm64 addon. That slice shipped the unpatched prebuild. Nothing loads it today: `verifyPackagedConptyBreakawayMarker` resolves the addon the way node-pty's loader does, so the patched `build/Release` wins and the release passes correctly. But the loader swallows every require failure and falls through, so an AV quarantine or a missing dependency on `build/Release` hands the pane to that unpatched prebuild — the silent downgrade the gate exists to close, with the binary still sitting in the package. Read the PE `Machine` field instead of guessing, reusing `readPeMachine` from the verifier's `windows-pe-machine.cjs` so prune and verifier ask one question. A missing, truncated or non-PE `build/Release` reads as unloadable and keeps the prebuild, which is what the true cross-host case needs: packaging Windows from macOS leaves no Windows binary in `build/Release`, and removing the prebuild there would leave the package with no ConPTY at all. Mutation-proven: restoring the `electronArch === process.arch` guard fails exactly the two new rows in packaged-node-pty-prebuild-prune. * docs(windows): note the cross-arch conpty slice is real but not yet built
139 lines
5.5 KiB
JavaScript
139 lines
5.5 KiB
JavaScript
import { existsSync, mkdirSync, mkdtempSync, rmSync, writeFileSync } from 'node:fs'
|
|
import { tmpdir } from 'node:os'
|
|
import { createRequire } from 'node:module'
|
|
import { join } from 'node:path'
|
|
import { afterEach, beforeEach, describe, expect, it } from 'vitest'
|
|
|
|
const require = createRequire(import.meta.url)
|
|
const { prunePackagedNodePty } = require('../packaged-runtime-node-modules.cjs')
|
|
const { PE_MACHINE } = require('./windows-pe-machine.cjs')
|
|
|
|
/**
|
|
* node-pty's loader tries build/Release, then build/Debug, then
|
|
* prebuilds/<platform>-<arch>, swallowing failures in between. Only the source
|
|
* build carries Orca's job-object exports, so leaving the prebuilt conpty.node
|
|
* beside it means an ABI mismatch or an AV quarantine silently downgrades the
|
|
* app to a binary that cannot own a PTY tree.
|
|
*
|
|
* The siblings must survive: Orca's patch deletes the `conpty_console_list` and
|
|
* winpty `pty` gyp targets, so those binaries exist nowhere but here.
|
|
*/
|
|
describe('prunePackagedNodePty: the Windows conpty fallback', () => {
|
|
let resources
|
|
const HOST_ARCH = process.arch
|
|
|
|
const nodePty = () => join(resources, 'node_modules', 'node-pty')
|
|
const write = (relative, contents = 'x') => {
|
|
const target = join(nodePty(), relative)
|
|
mkdirSync(join(target, '..'), { recursive: true })
|
|
writeFileSync(target, contents)
|
|
}
|
|
|
|
/** Minimal PE far enough to carry a `Machine`, which is what the prune now reads. */
|
|
const peAddon = (arch) => {
|
|
const buffer = Buffer.alloc(0x50)
|
|
buffer.write('MZ')
|
|
buffer.writeUInt32LE(0x40, 0x3c)
|
|
buffer.write('PE\0\0', 0x40)
|
|
buffer.writeUInt16LE(PE_MACHINE[arch], 0x44)
|
|
return buffer
|
|
}
|
|
const prebuilt = (name, arch = HOST_ARCH) => join(nodePty(), 'prebuilds', `win32-${arch}`, name)
|
|
|
|
/** What a real packaged win32 prebuilds/<arch> directory holds. */
|
|
const SIBLINGS = ['conpty_console_list.node', 'pty.node', 'winpty.dll', 'winpty-agent.exe']
|
|
|
|
/** `buildArch` is what build/Release actually holds, which is not always the slice's arch. */
|
|
const seedWindowsTree = (arch = HOST_ARCH, buildArch = arch) => {
|
|
write(join('build', 'Release', 'conpty.node'), peAddon(buildArch))
|
|
write(join('third_party', 'conpty', 'v1', `win10-${arch}`, 'conpty.dll'))
|
|
write(join('third_party', 'conpty', 'v1', `win10-${arch}`, 'OpenConsole.exe'))
|
|
write(join('prebuilds', `win32-${arch}`, 'conpty.node'))
|
|
for (const sibling of SIBLINGS) {
|
|
write(join('prebuilds', `win32-${arch}`, sibling))
|
|
}
|
|
}
|
|
|
|
beforeEach(() => {
|
|
resources = mkdtempSync(join(tmpdir(), 'orca-prune-'))
|
|
})
|
|
afterEach(() => {
|
|
rmSync(resources, { recursive: true, force: true })
|
|
})
|
|
|
|
it('removes the stale conpty fallback when the source build is present', () => {
|
|
seedWindowsTree()
|
|
|
|
prunePackagedNodePty(resources, 'win32', HOST_ARCH)
|
|
|
|
expect(existsSync(join(nodePty(), 'build', 'Release', 'conpty.node'))).toBe(true)
|
|
expect(existsSync(prebuilt('conpty.node'))).toBe(false)
|
|
})
|
|
|
|
it.each(SIBLINGS)('keeps %s, which exists nowhere else in a packaged build', (sibling) => {
|
|
// Orca's patch removes the conpty_console_list and winpty gyp targets, so a
|
|
// Windows source build never produces these. Deleting them kills console
|
|
// membership silently and breaks PTY spawn below Windows build 18309.
|
|
seedWindowsTree()
|
|
|
|
prunePackagedNodePty(resources, 'win32', HOST_ARCH)
|
|
|
|
expect(existsSync(prebuilt(sibling))).toBe(true)
|
|
})
|
|
|
|
it('keeps the fallback when there is no source build to prefer', () => {
|
|
write(join('prebuilds', `win32-${HOST_ARCH}`, 'conpty.node'))
|
|
write(join('third_party', 'conpty', 'v1', `win10-${HOST_ARCH}`, 'conpty.dll'))
|
|
write(join('third_party', 'conpty', 'v1', `win10-${HOST_ARCH}`, 'OpenConsole.exe'))
|
|
|
|
prunePackagedNodePty(resources, 'win32', HOST_ARCH)
|
|
|
|
expect(existsSync(prebuilt('conpty.node'))).toBe(true)
|
|
})
|
|
|
|
it('keeps the fallback when build/Release holds a different arch than the slice', () => {
|
|
// A cross-HOST package can copy a build/Release that the target cannot load;
|
|
// deleting the prebuild would remove the only binary the shipped app has.
|
|
const target = HOST_ARCH === 'arm64' ? 'x64' : 'arm64'
|
|
seedWindowsTree(target, HOST_ARCH)
|
|
|
|
prunePackagedNodePty(resources, 'win32', target)
|
|
|
|
expect(existsSync(prebuilt('conpty.node', target))).toBe(true)
|
|
})
|
|
|
|
it('removes the fallback on a cross-arch package whose build/Release IS the slice arch', () => {
|
|
// Measured on Windows: `electron-builder --win --arm64` on an x64 host does
|
|
// cross-rebuild a correct arm64 addon. Keying off the host arch skipped this
|
|
// case, so the slice shipped the unpatched prebuild as a reachable fallback.
|
|
const target = HOST_ARCH === 'arm64' ? 'x64' : 'arm64'
|
|
seedWindowsTree(target, target)
|
|
|
|
prunePackagedNodePty(resources, 'win32', target)
|
|
|
|
expect(existsSync(prebuilt('conpty.node', target))).toBe(false)
|
|
expect(existsSync(prebuilt('pty.node', target))).toBe(true)
|
|
})
|
|
|
|
it('keeps the fallback when build/Release is not a readable PE at all', () => {
|
|
seedWindowsTree()
|
|
write(join('build', 'Release', 'conpty.node'), 'not-a-pe')
|
|
|
|
prunePackagedNodePty(resources, 'win32', HOST_ARCH)
|
|
|
|
expect(existsSync(prebuilt('conpty.node'))).toBe(true)
|
|
})
|
|
|
|
it.each([
|
|
['darwin', 'arm64'],
|
|
['linux', 'x64']
|
|
])('leaves %s prebuilds alone', (platform, arch) => {
|
|
write(join('build', 'Release', 'conpty.node'), peAddon('x64'))
|
|
write(join('prebuilds', `${platform}-${arch}`, 'pty.node'))
|
|
|
|
prunePackagedNodePty(resources, platform, arch)
|
|
|
|
expect(existsSync(join(nodePty(), 'prebuilds', `${platform}-${arch}`, 'pty.node'))).toBe(true)
|
|
})
|
|
})
|