mirror of
https://github.com/stablyai/orca.git
synced 2026-09-21 16:02:20 +00:00
* refactor(windows): vendor the registry addon as @orca/windows-registry windows-native-registry@3.2.2 was last published in 2023 by a single maintainer. Orca called two of its exports, both read-only, so the whole dependency is replaced by a local N-API addon under native/. The vendored addon is read-only by construction: setValue, createKey and deleteKey are gone, so RegDeleteTreeW no longer ships in the app. Two upstream defects are also fixed rather than carried over — the name/data scratch buffers were file-scope statics that concurrent reads would scribble over, and createKey/deleteKey called .c_str() on a temporary. Build wiring keeps the existing shape: still an optionalDependency gated to win32, still excluded from pnpm's allowBuilds so only Orca's own Windows rebuild runs node-gyp for it, still copied into the packaged resources. The CI native caches now key on the vendored sources so an addon.cc edit cannot restore a stale .node. * test(windows): check the vendored registry addon against reg.exe The addon is vendored source, so no upstream release proves it still decodes values the way Orca's PATH readers expect. reg.exe is the only independent oracle on the box. * ci(windows): register the registry addon test on the Windows runner A Windows-gated file self-skips on ubuntu, so without both registrations it reports success while running on no machine at all. * fix(build): link the registry addon as a workspace package, not file: As a `file:` dependency pnpm re-resolved and re-linked the package on every install, including `--frozen-lockfile` (measured: "added 1" on a repeat no-op install). That virtual-store churn ran concurrently with node-gyp reading the same tree and cost @vscode/windows-process-tree its binding.gyp mid-rebuild, failing package (windows) whenever the native cache hit and only that module needed building. The linux packaging job hit the same race from the other side, as a pnpm staging move failure. A workspace link resolves once and leaves the store alone; repeat installs are now 55ms no-ops. native/windows-registry is listed explicitly so `packages:` still does not auto-discover mobile/. * fix(build): stop tracking node-gyp output for the vendored addon The build/ tree is generated per host and ABI; the committed copy was macOS-specific gyp scaffolding from a local build and would have shipped stale Makefiles to every checkout. * chore: ignore the vendored addon's node-gyp bin output too node-gyp also emits bin/<platform>-<abi>/ beside build/; both are per-host generated output that must never be committed.
371 lines
13 KiB
JavaScript
371 lines
13 KiB
JavaScript
import { spawnSync } from 'node:child_process'
|
|
import {
|
|
chmodSync,
|
|
copyFileSync,
|
|
mkdirSync,
|
|
mkdtempSync,
|
|
readFileSync,
|
|
rmSync,
|
|
writeFileSync
|
|
} from 'node:fs'
|
|
import { tmpdir } from 'node:os'
|
|
import { delimiter, join } from 'node:path'
|
|
import { fileURLToPath } from 'node:url'
|
|
import { describe, expect, it } from 'vitest'
|
|
import { copyScriptWithLocalModules } from './script-module-dependencies.mjs'
|
|
|
|
const sourceScriptPath = fileURLToPath(new URL('./ensure-native-runtime.mjs', import.meta.url))
|
|
// The import walk sees `from './x.mjs'` only, so the createRequire'd CJS
|
|
// siblings have to be named. Without them the temp project cannot even load.
|
|
const REQUIRED_CJS_SIBLINGS = [
|
|
'node-pty-job-ownership.cjs',
|
|
'windows-process-tree-creation-time.cjs'
|
|
]
|
|
|
|
describe('ensure-native-runtime', () => {
|
|
it('rechecks Node native modules in fresh child processes after rebuilding', () => {
|
|
const projectDir = mkTempProject()
|
|
|
|
try {
|
|
const scriptPath = join(projectDir, 'config', 'scripts', 'ensure-native-runtime.mjs')
|
|
const logPath = join(projectDir, 'native-runtime.log')
|
|
const markerPath = join(projectDir, 'rebuilt.marker')
|
|
const binDir = join(projectDir, 'bin')
|
|
writeFakeNativeModules(projectDir)
|
|
writeNodePtyPatchFile(projectDir)
|
|
writeFakePnpm(binDir)
|
|
|
|
const result = spawnSync(process.execPath, [scriptPath, '--runtime=node'], {
|
|
cwd: projectDir,
|
|
encoding: 'utf8',
|
|
env: envWithPrependedPath(binDir, {
|
|
ORCA_NATIVE_TEST_LOG: logPath,
|
|
ORCA_NATIVE_TEST_MARKER: markerPath
|
|
})
|
|
})
|
|
|
|
expect(result.status, result.stderr).toBe(0)
|
|
const log = readFileSync(logPath, 'utf8')
|
|
expect(log).toContain('pnpm exec node-gyp rebuild\n')
|
|
expect(log).toContain(join('node_modules', 'node-pty'))
|
|
if (process.platform === 'linux') {
|
|
expect(log).toMatch(/^cxxflags=(?:.*\s)?-std=gnu\+\+2a$/m)
|
|
}
|
|
expect(log.split('\n').filter((line) => line.startsWith('node-pty child '))).toEqual([
|
|
expect.stringMatching(/^node-pty child (?:conpty|pty) marker=false$/),
|
|
expect.stringMatching(/^node-pty child (?:conpty|pty) marker=true$/)
|
|
])
|
|
} finally {
|
|
rmSync(projectDir, { recursive: true, force: true })
|
|
}
|
|
})
|
|
|
|
it.skipIf(process.platform !== 'win32')(
|
|
'rebuilds other failed Windows addons with patched node-pty',
|
|
() => {
|
|
const projectDir = mkTempProject()
|
|
|
|
try {
|
|
const scriptPath = join(projectDir, 'config', 'scripts', 'ensure-native-runtime.mjs')
|
|
const logPath = join(projectDir, 'native-runtime.log')
|
|
const markerPath = join(projectDir, 'rebuilt.marker')
|
|
const binDir = join(projectDir, 'bin')
|
|
writeFakeNativeModules(projectDir, { windowsRegistryRequiresMarker: true })
|
|
writeNodePtyPatchFile(projectDir)
|
|
writeFakePnpm(binDir)
|
|
|
|
const result = spawnSync(process.execPath, [scriptPath, '--runtime=node'], {
|
|
cwd: projectDir,
|
|
encoding: 'utf8',
|
|
env: envWithPrependedPath(binDir, {
|
|
ORCA_NATIVE_TEST_LOG: logPath,
|
|
ORCA_NATIVE_TEST_MARKER: markerPath
|
|
})
|
|
})
|
|
|
|
expect(result.status, result.stderr).toBe(0)
|
|
const log = readFileSync(logPath, 'utf8')
|
|
expect(log.match(/pnpm exec node-gyp rebuild\n/g)).toHaveLength(2)
|
|
expect(log).toContain(join('node_modules', 'node-pty'))
|
|
expect(log).toContain(join('node_modules', '@orca', 'windows-registry'))
|
|
} finally {
|
|
rmSync(projectDir, { recursive: true, force: true })
|
|
}
|
|
}
|
|
)
|
|
|
|
it.skipIf(process.platform === 'win32')(
|
|
'rebuilds patched node-pty artifacts even when the Node load check passes',
|
|
() => {
|
|
const projectDir = mkTempProject()
|
|
|
|
try {
|
|
const scriptPath = join(projectDir, 'config', 'scripts', 'ensure-native-runtime.mjs')
|
|
const logPath = join(projectDir, 'native-runtime.log')
|
|
const markerPath = join(projectDir, 'rebuilt.marker')
|
|
const binDir = join(projectDir, 'bin')
|
|
writeLoadableNativeModules(projectDir)
|
|
writeNodePtyPatchFile(projectDir)
|
|
writeFakePnpm(binDir)
|
|
|
|
const result = spawnSync(process.execPath, [scriptPath, '--runtime=node'], {
|
|
cwd: projectDir,
|
|
encoding: 'utf8',
|
|
env: envWithPrependedPath(binDir, {
|
|
ORCA_NATIVE_TEST_LOG: logPath,
|
|
ORCA_NATIVE_TEST_MARKER: markerPath
|
|
})
|
|
})
|
|
|
|
expect(result.status, result.stderr).toBe(0)
|
|
expect(result.stderr).toContain(
|
|
'Patched node-pty build artifacts are missing; rebuilding native deps.'
|
|
)
|
|
expect(readFileSync(logPath, 'utf8')).toContain('pnpm exec node-gyp rebuild\n')
|
|
} finally {
|
|
rmSync(projectDir, { recursive: true, force: true })
|
|
}
|
|
}
|
|
)
|
|
|
|
it.skipIf(process.platform === 'win32')(
|
|
'rebuilds when patched artifacts exist but node-pty resolves to prebuilds',
|
|
() => {
|
|
const projectDir = mkTempProject()
|
|
|
|
try {
|
|
const scriptPath = join(projectDir, 'config', 'scripts', 'ensure-native-runtime.mjs')
|
|
const logPath = join(projectDir, 'native-runtime.log')
|
|
const markerPath = join(projectDir, 'rebuilt.marker')
|
|
const binDir = join(projectDir, 'bin')
|
|
writeLoadableNativeModules(projectDir)
|
|
writeNodePtyPatchFile(projectDir)
|
|
writePatchedNodePtyBuildArtifacts(projectDir)
|
|
writeFakePnpm(binDir)
|
|
|
|
const result = spawnSync(process.execPath, [scriptPath, '--runtime=node'], {
|
|
cwd: projectDir,
|
|
encoding: 'utf8',
|
|
env: envWithPrependedPath(binDir, {
|
|
ORCA_NATIVE_TEST_LOG: logPath,
|
|
ORCA_NATIVE_TEST_MARKER: markerPath
|
|
})
|
|
})
|
|
|
|
expect(result.status, result.stderr).toBe(0)
|
|
expect(result.stderr).toContain("expected build/Release so Orca's node-pty patch is active")
|
|
expect(readFileSync(logPath, 'utf8')).toContain('pnpm exec node-gyp rebuild\n')
|
|
} finally {
|
|
rmSync(projectDir, { recursive: true, force: true })
|
|
}
|
|
}
|
|
)
|
|
|
|
it.skipIf(process.platform === 'win32')(
|
|
'keeps the fast path when the platform-specific patched artifacts exist',
|
|
() => {
|
|
const projectDir = mkTempProject()
|
|
|
|
try {
|
|
const scriptPath = join(projectDir, 'config', 'scripts', 'ensure-native-runtime.mjs')
|
|
const logPath = join(projectDir, 'native-runtime.log')
|
|
const markerPath = join(projectDir, 'rebuilt.marker')
|
|
const binDir = join(projectDir, 'bin')
|
|
writeLoadableNativeModules(projectDir, { nativeDir: '../build/Release/' })
|
|
writeNodePtyPatchFile(projectDir)
|
|
writePatchedNodePtyBuildArtifacts(projectDir)
|
|
writeFakePnpm(binDir)
|
|
|
|
const result = spawnSync(process.execPath, [scriptPath, '--runtime=node'], {
|
|
cwd: projectDir,
|
|
encoding: 'utf8',
|
|
env: envWithPrependedPath(binDir, {
|
|
ORCA_NATIVE_TEST_LOG: logPath,
|
|
ORCA_NATIVE_TEST_MARKER: markerPath
|
|
})
|
|
})
|
|
|
|
expect(result.status, result.stderr).toBe(0)
|
|
expect(result.stderr).not.toContain('Patched node-pty build artifacts are missing')
|
|
expect(readFileSync(logPath, 'utf8')).not.toContain('pnpm exec node-gyp rebuild')
|
|
} finally {
|
|
rmSync(projectDir, { recursive: true, force: true })
|
|
}
|
|
}
|
|
)
|
|
})
|
|
|
|
function mkTempProject() {
|
|
const projectDir = mkdtempSync(join(tmpdir(), 'orca-native-runtime-'))
|
|
// Walked, not listed: the script imports windows-process-tree-gyp-rebuild.mjs, and a fixture
|
|
// missing it fails every case with a module-resolution error instead of the defect under test.
|
|
copyScriptWithLocalModules(sourceScriptPath, join(projectDir, 'config', 'scripts'))
|
|
for (const name of REQUIRED_CJS_SIBLINGS) {
|
|
copyFileSync(
|
|
fileURLToPath(new URL(`./${name}`, import.meta.url)),
|
|
join(projectDir, 'config', 'scripts', name)
|
|
)
|
|
}
|
|
return projectDir
|
|
}
|
|
|
|
function envWithPrependedPath(binDir, extraEnv) {
|
|
const pathKey =
|
|
process.platform === 'win32'
|
|
? (Object.keys(process.env).find((key) => key.toLowerCase() === 'path') ?? 'Path')
|
|
: 'PATH'
|
|
return {
|
|
...process.env,
|
|
...extraEnv,
|
|
[pathKey]: `${binDir}${delimiter}${process.env[pathKey] ?? ''}`
|
|
}
|
|
}
|
|
|
|
function writeFakeNativeModules(projectDir, { windowsRegistryRequiresMarker = false } = {}) {
|
|
const nodePtyDir = join(projectDir, 'node_modules', 'node-pty')
|
|
mkdirSync(join(nodePtyDir, 'lib'), { recursive: true })
|
|
writeFileSync(
|
|
join(nodePtyDir, 'package.json'),
|
|
'{"name":"node-pty","version":"1.1.0","main":"index.js"}\n'
|
|
)
|
|
mkdirSync(join(nodePtyDir, 'scripts'), { recursive: true })
|
|
writeFileSync(join(nodePtyDir, 'scripts', 'post-install.js'), '')
|
|
|
|
writeFileSync(join(nodePtyDir, 'index.js'), 'module.exports = {}\n')
|
|
writeFileSync(
|
|
join(nodePtyDir, 'lib', 'utils.js'),
|
|
`
|
|
const { appendFileSync, existsSync } = require('node:fs')
|
|
|
|
exports.loadNativeModule = function loadNativeModule(nativeName) {
|
|
const markerExists = existsSync(process.env.ORCA_NATIVE_TEST_MARKER)
|
|
appendFileSync(
|
|
process.env.ORCA_NATIVE_TEST_LOG,
|
|
\`node-pty \${process.argv.includes('--check-only') ? 'child' : 'parent'} \${nativeName} marker=\${markerExists}\\n\`
|
|
)
|
|
if (!markerExists) {
|
|
throw new Error('ABI mismatch sentinel')
|
|
}
|
|
return {
|
|
dir: '../build/Release/',
|
|
module: {
|
|
listJobProcessIds() {},
|
|
terminateJob() {},
|
|
assignCurrentProcessToJob() {}
|
|
}
|
|
}
|
|
}
|
|
`
|
|
)
|
|
writeFakeWindowsRegistry(projectDir, { requiresMarker: windowsRegistryRequiresMarker })
|
|
}
|
|
|
|
function writeLoadableNativeModules(projectDir, { nativeDir = null } = {}) {
|
|
const nodePtyDir = join(projectDir, 'node_modules', 'node-pty')
|
|
mkdirSync(join(nodePtyDir, 'lib'), { recursive: true })
|
|
writeFileSync(
|
|
join(nodePtyDir, 'package.json'),
|
|
'{"name":"node-pty","version":"1.1.0","main":"index.js"}\n'
|
|
)
|
|
mkdirSync(join(nodePtyDir, 'scripts'), { recursive: true })
|
|
writeFileSync(join(nodePtyDir, 'scripts', 'post-install.js'), '')
|
|
|
|
writeFileSync(join(nodePtyDir, 'index.js'), 'module.exports = {}\n')
|
|
writeFileSync(
|
|
join(nodePtyDir, 'lib', 'utils.js'),
|
|
`
|
|
const { appendFileSync, existsSync } = require('node:fs')
|
|
|
|
exports.loadNativeModule = function loadNativeModule(nativeName) {
|
|
const rebuilt = existsSync(process.env.ORCA_NATIVE_TEST_MARKER)
|
|
const dir = ${JSON.stringify(nativeDir)} ??
|
|
(rebuilt ? '../build/Release/' : '../prebuilds/' + process.platform + '-' + process.arch + '/')
|
|
appendFileSync(process.env.ORCA_NATIVE_TEST_LOG, \`node-pty load \${nativeName} dir=\${dir}\\n\`)
|
|
return {
|
|
dir,
|
|
module: {
|
|
listJobProcessIds: () => [],
|
|
terminateJob: () => true,
|
|
assignCurrentProcessToJob: () => true
|
|
}
|
|
}
|
|
}
|
|
`
|
|
)
|
|
writeFakeWindowsRegistry(projectDir)
|
|
}
|
|
|
|
function writeFakeWindowsRegistry(projectDir, { requiresMarker = false } = {}) {
|
|
if (process.platform !== 'win32') {
|
|
return
|
|
}
|
|
const registryDir = join(projectDir, 'node_modules', '@orca', 'windows-registry')
|
|
mkdirSync(registryDir, { recursive: true })
|
|
writeFileSync(
|
|
join(registryDir, 'package.json'),
|
|
'{"name":"@orca/windows-registry","version":"1.0.0","main":"index.js"}\n'
|
|
)
|
|
const markerGate = requiresMarker
|
|
? `if (!require('node:fs').existsSync(process.env.ORCA_NATIVE_TEST_MARKER)) { throw new Error('registry ABI mismatch sentinel') }`
|
|
: ''
|
|
writeFileSync(
|
|
join(registryDir, 'index.js'),
|
|
`exports.HK = { CU: 0x80000001 }; exports.getRegistryKey = () => { ${markerGate}; return {} }\n`
|
|
)
|
|
const processTreeDir = join(projectDir, 'node_modules', '@vscode', 'windows-process-tree')
|
|
mkdirSync(processTreeDir, { recursive: true })
|
|
writeFileSync(join(processTreeDir, 'index.js'), 'module.exports = {}\n')
|
|
}
|
|
|
|
function writeNodePtyPatchFile(projectDir) {
|
|
mkdirSync(join(projectDir, 'config', 'patches'), { recursive: true })
|
|
writeFileSync(join(projectDir, 'config', 'patches', 'node-pty@1.1.0.patch'), 'patch marker\n')
|
|
}
|
|
|
|
function writePatchedNodePtyBuildArtifacts(projectDir) {
|
|
const buildDir = join(projectDir, 'node_modules', 'node-pty', 'build', 'Release')
|
|
mkdirSync(buildDir, { recursive: true })
|
|
if (process.platform === 'win32') {
|
|
writeFileSync(join(buildDir, 'conpty.node'), '')
|
|
mkdirSync(join(buildDir, 'conpty'), { recursive: true })
|
|
writeFileSync(join(buildDir, 'conpty', 'conpty.dll'), '')
|
|
writeFileSync(join(buildDir, 'conpty', 'OpenConsole.exe'), '')
|
|
return
|
|
}
|
|
writeFileSync(join(buildDir, 'pty.node'), '')
|
|
if (process.platform === 'darwin') {
|
|
writeFileSync(join(buildDir, 'spawn-helper'), '')
|
|
}
|
|
}
|
|
|
|
function writeFakePnpm(binDir) {
|
|
mkdirSync(binDir, { recursive: true })
|
|
const shimPath = join(binDir, 'pnpm-shim.cjs')
|
|
writeFileSync(
|
|
shimPath,
|
|
`
|
|
const { appendFileSync, writeFileSync } = require('node:fs')
|
|
|
|
appendFileSync(process.env.ORCA_NATIVE_TEST_LOG, \`pnpm \${process.argv.slice(2).join(' ')}\\n\`)
|
|
appendFileSync(process.env.ORCA_NATIVE_TEST_LOG, \`cwd=\${process.cwd()}\\n\`)
|
|
appendFileSync(
|
|
process.env.ORCA_NATIVE_TEST_LOG,
|
|
\`npm_config_build_from_source=\${process.env.npm_config_build_from_source || ''}\\n\`
|
|
)
|
|
appendFileSync(
|
|
process.env.ORCA_NATIVE_TEST_LOG,
|
|
\`cxxflags=\${process.env.CXXFLAGS || ''}\\n\`
|
|
)
|
|
writeFileSync(process.env.ORCA_NATIVE_TEST_MARKER, 'rebuilt')
|
|
`
|
|
)
|
|
|
|
const posixPnpmPath = join(binDir, 'pnpm')
|
|
writeFileSync(posixPnpmPath, `#!/usr/bin/env node\nrequire(${JSON.stringify(shimPath)})\n`)
|
|
chmodSync(posixPnpmPath, 0o755)
|
|
writeFileSync(
|
|
join(binDir, 'pnpm.cmd'),
|
|
`@echo off\r\n"${process.execPath}" "%~dp0\\pnpm-shim.cjs" %*\r\n`
|
|
)
|
|
}
|