fix(test-runner): use bootstrap seed instead of downloading stale language bundles #678
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,89 +1,15 @@ | ||
| /** | ||
| * Post-install script for @coasys/ad4m-test | ||
| * | ||
| * Previously, this script downloaded pre-built system language bundles from | ||
| * perspect3vism repos. These bundles were CJS and needed conversion to ESM | ||
| * for the executor's Deno runtime. | ||
| * | ||
| * Now, the test runner uses the bootstrap seed (tests/js/bootstrapSeed.json) | ||
| * which contains the language-language bundle inline. The language-language | ||
| * fetches other system languages by hash from the bootstrap store (Cloudflare) | ||
| * at runtime. No local language bundles are needed. | ||
| */ | ||
|
|
||
| // No-op — system languages are fetched at runtime via the bootstrap seed. | ||
| console.log('@coasys/ad4m-test: System languages will be fetched at runtime via bootstrap seed.'); |
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 |
|---|---|---|
| @@ -1,147 +1,74 @@ | ||
| import path from "path"; | ||
| import fs from 'fs-extra'; | ||
| import { ad4mDataDirectory, deleteAllAd4mData, findAndKillProcess, getAd4mHostBinary, logger } from "./utils"; | ||
|
|
||
| /** | ||
| * Prepare the test environment by setting up the bootstrap seed and initializing | ||
| * the AD4M executor data directory. | ||
| * | ||
| * The bootstrap seed contains the language-language bundle inline (ESM) and | ||
| * hashes for all system languages. At runtime, the language-language fetches | ||
| * other languages by hash from the bootstrap store (Cloudflare). | ||
| * | ||
| * The seed is located at: | ||
| * - In the AD4M monorepo: ../../tests/js/bootstrapSeed.json (relative to build/) | ||
| * - When installed as a package: ../bootstrapSeed.json (placed by consumer's setup) | ||
| * | ||
| * This replaces the previous approach of downloading individual language bundles | ||
| * from perspect3vism repos and converting them from CJS to ESM. | ||
| */ | ||
| export async function installSystemLanguages(relativePath = '') { | ||
| deleteAllAd4mData(relativePath); | ||
coderabbitai[bot] marked this conversation as resolved.
Show resolved
Hide resolved
|
||
|
|
||
| let binaryPath = path.join(ad4mDataDirectory(relativePath), 'binary', `ad4m`); | ||
|
|
||
| if (!fs.existsSync(binaryPath)) { | ||
| await getAd4mHostBinary(relativePath); | ||
| binaryPath = path.join(ad4mDataDirectory(relativePath), 'binary', `ad4m`); | ||
| } | ||
HexaField marked this conversation as resolved.
Show resolved
Hide resolved
|
||
|
|
||
| await findAndKillProcess('holochain') | ||
| await findAndKillProcess('lair-keystore') | ||
|
Member
There was a problem hiding this comment. that is also super old. we are not spawning holochain (no lair-keystore) as external processes. all inside the ad4m-executor. these lines should go away.
Member
There was a problem hiding this comment. @HexaField I will merge this now, but please note my comments above for future work on the test-runner. |
||
|
|
||
| // Look for bootstrap seed in order of preference: | ||
| // 1. Adjacent to package root (../bootstrapSeed.json from build/) — installed package | ||
| // 2. In the monorepo (../../tests/js/bootstrapSeed.json from build/) — development | ||
| const candidates = [ | ||
| path.join(__dirname, '../bootstrapSeed.json'), | ||
| path.join(__dirname, '../../tests/js/bootstrapSeed.json'), | ||
| ]; | ||
|
|
||
| let seedPath: string | null = null; | ||
| for (const candidate of candidates) { | ||
| if (fs.existsSync(candidate)) { | ||
| seedPath = candidate; | ||
| break; | ||
| } | ||
| } | ||
|
|
||
| if (!seedPath) { | ||
| throw new Error( | ||
| `Bootstrap seed not found. Looked in:\n` + | ||
| candidates.map(c => ` - ${c}`).join('\n') + | ||
| `\nEnsure bootstrapSeed.json exists (copy from tests/js/ or download from the AD4M repo).` | ||
| ); | ||
| } | ||
coderabbitai[bot] marked this conversation as resolved.
Show resolved
Hide resolved
|
||
|
|
||
| // If the seed is in the monorepo, copy it to the package root for startServer to find | ||
| const targetSeedPath = path.join(__dirname, '../bootstrapSeed.json'); | ||
| if (seedPath !== targetSeedPath) { | ||
| fs.copySync(seedPath, targetSeedPath); | ||
| logger.info(`Bootstrap seed copied from ${seedPath}`); | ||
| } else { | ||
| logger.info('Bootstrap seed found at package root'); | ||
| } | ||
| } | ||
|
|
||
| if (require.main === module) { | ||
| installSystemLanguages().then(() => { | ||
| process.exit(0); | ||
| }).catch(e => { | ||
| console.error(e); | ||
| process.exit(1); | ||
| }); | ||
| } | ||
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.