Repository navigation
馃敆 fix: Update Node Runtimes And Preserve Restored Modules #347
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We鈥檒l occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merged
Merged
Changes from all commits
Commits
Show all changes
5 commits
Select commit
Hold shift + click to select a range
67f8305
馃敆 fix: Refresh Runtime Module Links After Upgrades
lia-librechat bdaca35
fix: Preserve Canonical User Module Links
lia-librechat 1cf876c
test: Isolate Input-Cache Route Setup
lia-librechat 304d09e
fix: Complete Runtime Module Link Migration Paths
lia-librechat ea984bf
fix: Update Patched Node Runtimes And Align Rollout Defaults
lia-librechat File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,198 @@ | ||
| import { expect, test } from 'bun:test'; | ||
| import * as fs from 'node:fs'; | ||
| import * as os from 'node:os'; | ||
| import * as path from 'node:path'; | ||
|
|
||
| const initializer = fs.readFileSync( | ||
| path.resolve(__dirname, '../../docker/package-init.sh'), | ||
| 'utf8' | ||
| ); | ||
|
|
||
| for (const oldRuntimeExists of [false, true]) { | ||
| test(`cached PVC refreshes Node and Bun launchers with ${ | ||
| oldRuntimeExists ? 'retained' : 'removed' | ||
| } old runtimes`, () => { | ||
| const root = fs.mkdtempSync( | ||
| path.join(os.tmpdir(), 'cached-package-init-') | ||
| ); | ||
| try { | ||
| const packages = path.join(root, 'pkgs'); | ||
| const workspace = path.join(root, 'workspace'); | ||
| const manifest = path.join(root, 'javascript-packages.txt'); | ||
| fs.mkdirSync(workspace); | ||
| fs.writeFileSync(manifest, 'runtime-fixture@1.0.0\n'); | ||
| const runtimes = [ | ||
| { | ||
| directory: 'node/24.22.1', | ||
| binary: 'bin/node', | ||
| args: ['hello world', '--version'], | ||
| }, | ||
| { | ||
| directory: 'bun/1.4.2', | ||
| binary: 'bun', | ||
| args: ['run', 'hello world', '--version'], | ||
| }, | ||
| ]; | ||
| for (const runtime of runtimes) { | ||
| const destination = path.join(packages, runtime.directory); | ||
| const fixture = path.join( | ||
| destination, | ||
| 'node_modules/runtime-fixture' | ||
| ); | ||
| fs.mkdirSync(fixture, { recursive: true }); | ||
| fs.mkdirSync( | ||
| path.dirname(path.join(destination, runtime.binary)), | ||
| { recursive: true } | ||
| ); | ||
| fs.writeFileSync( | ||
| path.join(fixture, 'package.json'), | ||
| '{"version": "1.0.0"}' | ||
| ); | ||
| fs.writeFileSync( | ||
| path.join(destination, '.package-installed'), | ||
| 'installed' | ||
| ); | ||
| fs.writeFileSync( | ||
| path.join(destination, '.env'), | ||
| 'preserve runtime environment' | ||
| ); | ||
| fs.writeFileSync( | ||
| path.join(destination, runtime.binary), | ||
| '#!/bin/bash\nprintf "<%s>\\n" "$@"\n', | ||
| { mode: 0o755 } | ||
| ); | ||
| fs.writeFileSync( | ||
| path.join(destination, 'run'), | ||
| '#!/bin/bash\nexit 99\n', | ||
| { mode: 0o755 } | ||
| ); | ||
| } | ||
| const python = path.join(packages, 'python/3.14.4'); | ||
| for (const name of [ | ||
| 'PIL', | ||
| 'markitdown', | ||
| 'chdb', | ||
| 'statsmodels', | ||
| 'rasterio', | ||
| ]) { | ||
| fs.mkdirSync( | ||
| path.join(python, 'lib/python3.14/site-packages', name), | ||
| { recursive: true } | ||
| ); | ||
| } | ||
| fs.writeFileSync( | ||
| path.join(python, 'lib/python3.14/.sandbox-pipe-runtime-v1'), | ||
| 'installed' | ||
| ); | ||
| fs.writeFileSync( | ||
| path.join(python, '.package-installed'), | ||
| 'installed' | ||
| ); | ||
| fs.mkdirSync(path.join(packages, 'bash/5.2.0'), { | ||
| recursive: true, | ||
| }); | ||
| fs.writeFileSync( | ||
| path.join(packages, 'bash/5.2.0/.package-installed'), | ||
| 'installed' | ||
| ); | ||
| fs.writeFileSync( | ||
| path.join(packages, '.initialized'), | ||
| 'original initialization' | ||
| ); | ||
|
|
||
| const forbidden = path.join(root, 'forbidden'); | ||
| fs.mkdirSync(forbidden); | ||
| for (const binary of [ | ||
| 'curl', | ||
| 'wget', | ||
| 'make', | ||
| 'npm', | ||
| 'tar', | ||
| 'unzip', | ||
| ]) { | ||
| fs.writeFileSync( | ||
| path.join(forbidden, binary), | ||
| '#!/bin/bash\necho "unexpected reinstall" >&2\nexit 98\n', | ||
| { mode: 0o755 } | ||
| ); | ||
| } | ||
| const script = path.join(root, 'package-init.sh'); | ||
| fs.writeFileSync( | ||
| script, | ||
| initializer | ||
| .split('/pkgs') | ||
| .join(packages) | ||
| .split('/mnt/data/node_modules') | ||
| .join(path.join(workspace, 'node_modules')) | ||
| ); | ||
| const env = { | ||
| ...process.env, | ||
| PATH: `${forbidden}:${process.env.PATH}`, | ||
| FORCE_REBUILD: 'false', | ||
| PYTHON_VERSION: '3.14.4', | ||
| NODE_VERSION: '24.22.1', | ||
| BUN_VERSION: '1.4.2', | ||
| BASH_PACKAGE_VERSION: '5.2.0', | ||
| JS_PACKAGE_MANIFEST: manifest, | ||
| }; | ||
| for (let pass = 0; pass < 2; pass += 1) { | ||
| const initialized = Bun.spawnSync({ | ||
| cmd: ['bash', script], | ||
| env, | ||
| }); | ||
| expect(initialized.stderr.toString()).toBe(''); | ||
| expect(initialized.exitCode).toBe(0); | ||
| expect(initialized.stdout.toString()).toContain( | ||
| 'Packages already initialized' | ||
| ); | ||
| expect( | ||
| fs.readFileSync(path.join(packages, '.initialized'), 'utf8') | ||
| ).toBe('original initialization'); | ||
| for (const runtime of runtimes) { | ||
| const destination = path.join(packages, runtime.directory); | ||
| const oldModules = path.join( | ||
| packages, | ||
| runtime.directory.split('/')[0], | ||
| '0.0.1/node_modules' | ||
| ); | ||
| if (oldRuntimeExists) | ||
| fs.mkdirSync(oldModules, { recursive: true }); | ||
| const link = path.join(workspace, 'node_modules'); | ||
| fs.rmSync(link, { force: true }); | ||
| fs.symlinkSync(oldModules, link); | ||
| const launched = Bun.spawnSync({ | ||
| cmd: [ | ||
| path.join(destination, 'run'), | ||
| 'hello world', | ||
| '--version', | ||
| ], | ||
| }); | ||
| expect(launched.stderr.toString()).toBe(''); | ||
| expect(launched.exitCode).toBe(0); | ||
| expect(launched.stdout.toString()).toBe( | ||
| runtime.args.map(arg => `<${arg}>\n`).join('') | ||
| ); | ||
| expect(fs.readlinkSync(link)).toBe( | ||
| path.join(destination, 'node_modules') | ||
| ); | ||
| expect( | ||
| fs.readFileSync( | ||
| path.join(destination, '.package-installed'), | ||
| 'utf8' | ||
| ) | ||
| ).toBe('installed'); | ||
| expect( | ||
| fs.readFileSync(path.join(destination, '.env'), 'utf8') | ||
| ).toBe('preserve runtime environment'); | ||
| expect( | ||
| fs | ||
| .readdirSync(destination) | ||
| .some(name => name.startsWith('.run.')) | ||
| ).toBe(false); | ||
| } | ||
| } | ||
| } finally { | ||
| fs.rmSync(root, { recursive: true, force: true }); | ||
| } | ||
| }); | ||
| } |
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.