Ecosystem merge by ebkr · Pull Request #2113 · ebkr/r2modmanPlus

ebkr · 2026-04-08T10:24:03Z

Ecosystem Merge

Adds support for loading from bundled ecosystem-schema.json, as well as loading from a latest-ecosystem-schema.json which can exist on disk

Process

By default, we look for a merge file
- If no merge file, we fall back to the bundled schema
Once we have loaded the schema, we (theoretically*) kick off an update to pull the latest schema
- *This is actually just a stub for now as this functionality will be implemented later
Retrofit schema changes to applicable usages

TL;DR for reviews

Most of the work happens in EcosystemSchema.ts
ThunderstoreSchema.ts changes add reactive variables which can be referenced nicely inside of a Vue context. This means we can auto-update the game list as soon as we get a result without having to trigger an internal event.
- Since all usages now use these reactive variables, we no longer have a need for the overall ThunderstoreSchema class. The file has been kept, but mostly as a holder for the variables and to keep the re-export functionality that it previously had. Out of scope to change that behaviour.
There is a boot file which is effectively a preload script. It happens before the screens are hit.
For the most part, the bundle loading logic was actually just copied sideways from the old implementation.
A couple of test fixes + new tests
- Test fixes with ! changes are just to reduce type errors in the files

Copilot

Pull request overview

Note

Copilot was unable to run its full agentic suite in this review.

Introduces a new ecosystem schema loading pathway that can hydrate Vue-reactive schema state from either a bundled schema or a cached schema on disk, and updates schema consumers/tests to use the new reactive sources.

Changes:

Added EcosystemSchema.ts to load/validate bundled schema, read an on-disk cached schema, and populate reactive exports.
Refactored schema consumers (game list, install rules, modloader variants) to read from reactive schema refs instead of a static class.
Added a Quasar boot step plus unit test updates/new tests to ensure the ecosystem reactives are initialized before use.

Reviewed changes

Copilot reviewed 14 out of 14 changed files in this pull request and generated 5 comments.

Show a summary per file

File	Description
`src/r2mm/ecosystem/EcosystemSchema.ts`	New loader/validator + cache resolution that populates reactive ecosystem state
`src/model/schema/ThunderstoreSchema.ts`	Replaces static schema class with Vue `ref` exports for supported games and modloader packages
`src/r2mm/installing/profile_installers/ModLoaderVariantRecord.ts`	Reworks modloader exports to be derived from reactive schema state
`src/r2mm/installing/InstallationRules.ts`	Uses reactive supported games to build rules
`src/model/game/GameManager.ts`	Uses reactive game list source
`src/boot/ecosystem.ts`	Boot-time initialization/hydration of ecosystem reactives
`quasar.config.ts`	Registers new `ecosystem` boot file
`src/pages/GameSelectionScreen.vue`	Adjusts flow to return after `proceed()` and stubs schema update call
`test/vitest/tests/unit/EcosystemSchema/EcosystemSchema.spec.ts`	Adds coverage for cache fallback/version match and writing schema to disk
Various `test/vitest/...` specs/utils	Ensures ecosystem reactives are initialized for unit tests

💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.

ebkr · 2026-04-15T09:43:16Z

+    FsProvider.provide(() => NodeFsImplementation);
+    await updateEcosystemReactives();
+    // @ts-ignore
+    FsProvider.provide(() => undefined);


This doesn't cause any issues because the intent is to set it when needed, then allow it to be re-set as part of the ordinary workflow.

A separate PR addresses the concern and removes the need for the unset.

+    let content: VersionedThunderstoreEcosystem;
+    try {
+        content = await getLastSavedEcosystemSchema();
+    } catch (e) {
+        const err = e as unknown as Error;
+        LoggerProvider.instance.Log(
+            LogSeverity.ERROR,
+            `Failed to load cached ecosystem schema, falling back to bundled schema\n${err.message}`
+        );
+        return bundledSchema();
+    }
+    if (!new VersionNumber(content.version).isEqualTo(ManagerInformation.VERSION)) {
+        return bundledSchema();
+    }
+    return content;


ebkr · 2026-04-15T09:44:18Z

+async function getMergedEcosystemPath(): Promise<string> {
+    return path.join(PathResolver.ROOT, "latest-ecosystem-schema.json");
+}


Updated PR description

ebkr · 2026-04-15T09:44:55Z

+async function loadBundledSchema(): Promise<ThunderstoreEcosystem> {
+    const ajv = new Ajv();
+    addFormats(ajv);
+
+    const validate = ajv.compile(jsonSchema);
+    const isOk = validate(bundledEcosystem);


Infrequent access and only used on resolve if the online schema failed to fetch. Not an issue.

ebkr · 2026-04-15T09:47:08Z

+    MODLOADER_PACKAGES = EcosystemModloaderPackages.value.map((x) =>
+        new ModLoaderPackageMapping(x.packageId, x.rootFolder, x.loader)
+    );
+    MOD_LOADER_VARIANTS = Object.fromEntries(
+        EcosystemSupportedGames.value
+            .map(([_, game]) => [
+                game.internalFolderName,
+                OVERRIDES[game.internalFolderName] || MODLOADER_PACKAGES
+            ])
+    );


Not an issue because as part of the Quasar boot files, we initialise this.

It isn't until render + load of the GameSelectionScreen.vue that this is then applicable.

…s for ecosystem. # Conflicts: # src/model/schema/ThunderstoreSchema.ts

…tions post-boot. - Start with bundled - Next, load from disk - Finally, should query live (not done yet)

- Fixed error caused by fetchLatestSchema stub not including valid keys - Changed getMergedEcosystemPath to be more viable - Enabled updateLatestMergedEcosystemSchema call in GameSelectionScreen

- Also removed EcosystemSchema class as no longer needed - Replaced usages of EcosystemSchema getters with reactive equivalents.

Copilot

Pull request overview

This PR introduces a new ecosystem schema loading flow that can populate the app’s schema data from a bundled JSON file or a cached latest-ecosystem-schema.json on disk, and retrofits consumers to read from reactive schema values.

Changes:

Added src/r2mm/ecosystem/EcosystemSchema.ts to load/resolve cached vs bundled schema and update reactive exports.
Replaced EcosystemSchema class usage with reactive refs (EcosystemSupportedGames, EcosystemModloaderPackages) and helper functions across core logic.
Added Quasar boot initialization for ecosystem schema and updated/added Vitest coverage around the new schema behavior.

Reviewed changes

Copilot reviewed 16 out of 16 changed files in this pull request and generated 11 comments.

Show a summary per file

File	Description
test/vitest/utils/InstallLogicUtils.ts	Initializes ecosystem reactives in shared installer test setup.
test/vitest/tests/unit/Profile/Profile.ts.spec.ts	Updates tests to initialize ecosystem reactives before using `GameManager.gameList`.
test/vitest/tests/unit/ModLinker/ModLinker.spec.ts	Adds ecosystem reactive initialization to prevent empty game list.
test/vitest/tests/unit/MelonLoader/state.spec.ts	Adds ecosystem initialization and adjusts type assertions in tests.
test/vitest/tests/unit/Installers/ModLoader/Installer.Tests.spec.ts	Switches to `getGameConfigBySettingsIdentifier` function API.
test/vitest/tests/unit/GameDirectoryResolver/GameDirectoryResolver.spec.ts	Ensures ecosystem reactives are initialized for game list lookups.
test/vitest/tests/unit/EcosystemSchema/EcosystemSchema.spec.ts	Adds new unit tests for cache/bundled loading + file writing.
src/r2mm/installing/profile_installers/ModLoaderVariantRecord.ts	Reworks mod loader exports to derive from reactive ecosystem refs.
src/r2mm/installing/InstallationRules.ts	Uses reactive supported games when building installation rules.
src/r2mm/ecosystem/EcosystemSchema.ts	Implements schema resolution (cached vs bundled) and reactive updates.
src/pages/GameSelectionScreen.vue	Wires (stubbed) ecosystem update hook and adjusts control flow.
src/model/schema/ThunderstoreSchema.ts	Replaces `EcosystemSchema` class with reactive refs + helper function.
src/model/game/GameManager.ts	Builds `gameList` from reactive supported games.
src/installers/InstallRulePluginInstaller.ts	Switches to `getGameConfigBySettingsIdentifier` function API.
src/boot/ecosystem.ts	Adds Quasar boot-time initialization for ecosystem reactives.
quasar.config.ts	Registers new `ecosystem` boot file.

💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.

+import * as path from 'path';
+import {beforeEach, describe, expect, test} from 'vitest';
+
+import {VersionedThunderstoreEcosystem, updateEcosystemReactives, updateLatestEcosystemSchema} from 'src/r2mm/ecosystem/EcosystemSchema';


+    try {
+        let content = await getLastSavedEcosystemSchema();
+        if (!new VersionNumber(content.version).isEqualTo(ManagerInformation.VERSION)) {
+            return bundledSchema();
+        }
+        return content;
+    } catch (e) {


+        const err = e as unknown as Error;
+        LoggerProvider.instance.Log(
+            LogSeverity.ERROR,
+            `Failed to load cached ecosystem schema, falling back to bundled schema\n${err.message}`
+        );
+        return bundledSchema();


+import ManagerInformation from "../../_managerinf/ManagerInformation";
+import {EcosystemModloaderPackages, EcosystemSupportedGames} from "../../model/schema/ThunderstoreSchema";
+import {updateModLoaderExports} from "../installing/profile_installers/ModLoaderVariantRecord";
+import LoggerProvider, {LogSeverity} from "src/providers/ror2/logging/LoggerProvider";


    describe("State file", () => {

+        beforeAll(async () => {
+            const inMemoryFs = new InMemoryFsProvider();
+            FsProvider.provide(() => inMemoryFs);
+            InMemoryFsProvider.clear();
+            await updateEcosystemReactives();
+        })
+


 import { beforeAll, describe, expect, test } from 'vitest';
 import { providePathImplementation } from '../../../../../src/providers/node/path/path';
 import { TestPathProvider } from '../../../stubs/providers/node/Node.Path.Provider';
+import { updateEcosystemReactives } from "src/r2mm/ecosystem/EcosystemSchema";


 import InMemoryFsProvider from '../../../stubs/providers/InMemory.FsProvider';
 import { providePathImplementation } from '../../../../../src/providers/node/path/path';
 import { TestPathProvider } from '../../../stubs/providers/node/Node.Path.Provider';
+import {updateEcosystemReactives} from "src/r2mm/ecosystem/EcosystemSchema";


 import { State } from '../store';
 import { useRouter } from 'vue-router';
 import ProtocolProvider from '../providers/generic/protocol/ProtocolProvider';
+import {updateEcosystemReactives, updateLatestEcosystemSchema} from "src/r2mm/ecosystem/EcosystemSchema";


 import {providePathImplementation} from "../../../../../src/providers/node/path/path";
 import {TestPathProvider} from "../../../stubs/providers/node/Node.Path.Provider";
 import StubProfileProvider from '../../../stubs/providers/stub.ProfileProvider';
+import {updateEcosystemReactives} from "src/r2mm/ecosystem/EcosystemSchema";


 import { TestPathProvider } from '../../../stubs/providers/node/Node.Path.Provider';
 import { provideAppWindowImplementation } from '../../../../../src/providers/node/app/app_window';
 import { TestAppWindowProvider } from '../../../stubs/providers/node/AppWindow.Provider';
+import {updateEcosystemReactives} from "src/r2mm/ecosystem/EcosystemSchema";


ethangreen-dev

Looks good, nice work as always.

ebkr marked this pull request as ready for review April 9, 2026 08:46

ethangreen-dev reviewed Apr 13, 2026

View reviewed changes

Comment thread src/boot/ecosystem.ts

ethangreen-dev requested changes Apr 13, 2026

View reviewed changes

Comment thread src/r2mm/ecosystem/EcosystemSchema.ts Outdated

ethangreen-dev mentioned this pull request Apr 13, 2026

Cached ecosystem fetch #2123

Closed

ebkr requested a review from ethangreen-dev April 14, 2026 08:07

ethangreen-dev mentioned this pull request Apr 14, 2026

[TS-3287] Cached ecosystem fetch #2126

Merged

ebkr requested a review from Copilot April 14, 2026 14:11

Copilot started reviewing on behalf of ebkr April 14, 2026 14:11 View session

Copilot AI reviewed Apr 14, 2026

View reviewed changes

ebkr added 13 commits April 15, 2026 10:48

Added generateMergedSchema method and added global reactive propertie…

2d035c8

…s for ecosystem. # Conflicts: # src/model/schema/ThunderstoreSchema.ts

Added implementation to allow extending static json schema

21646d0

GameSelectionScreen to start with bundled fallback and to load new op…

4f31a9a

…tions post-boot. - Start with bundled - Next, load from disk - Finally, should query live (not done yet)

Fixes and cleanup

0b5d932

- Fixed error caused by fetchLatestSchema stub not including valid keys - Changed getMergedEcosystemPath to be more viable - Enabled updateLatestMergedEcosystemSchema call in GameSelectionScreen

Removed bundle-only load at boot time, replaced with merge.

207c3d2

- Also removed EcosystemSchema class as no longer needed - Replaced usages of EcosystemSchema getters with reactive equivalents.

Fixed tests

e661b0c

Added tests for EcosystemMerge

61f61c2

Improved coverage of a few test scenarios

781013b

Removed "merge" functionality and renamed where appropriate

40e0721

Commented out updateLatestEcosystemSchema temporarily

380210f

Added cached ecosystem load failure fallback

16b23cd

Made the try/catch around resolveCachedEcosystemSchema safer

01838e6

Fixed usage of getGameConfigBySettingsIdentifier after rebase

d8825c9

ebkr force-pushed the ecosystem-merge branch from 385e74c to d8825c9 Compare April 15, 2026 09:52

ebkr requested a review from Copilot April 15, 2026 10:02

Copilot started reviewing on behalf of ebkr April 15, 2026 10:02 View session

Copilot AI reviewed Apr 15, 2026

View reviewed changes

Added cached content validation and fixed imports

e31b49b

ethangreen-dev approved these changes Apr 17, 2026

View reviewed changes

ebkr added 2 commits April 21, 2026 09:59

Fixed non-relative import

78e9f6d

Fixed validate schema and added method to init with bundle only

bb9e24a

ebkr added 4 commits April 28, 2026 09:07

Fixed EcosystemSchema.spec.ts tests

2ada885

Added missing StubLoggerProvider from previous commit

12d0ffc

Fixed mockJsonSchema declaration order

8cfce9e

Moved mockJsonSchema to module level to work around CI quirk

6afe9e4

ebkr merged commit da7d177 into develop Apr 28, 2026
6 checks passed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Ecosystem merge#2113

Ecosystem merge#2113
ebkr merged 20 commits into
developfrom
ecosystem-merge

ebkr commented Apr 8, 2026 •

edited

Loading

Uh oh!

Uh oh!

Uh oh!

Copilot AI left a comment

Uh oh!

ebkr Apr 15, 2026

Uh oh!

ebkr Apr 15, 2026

Uh oh!

ebkr Apr 15, 2026

Uh oh!

ebkr Apr 15, 2026

Uh oh!

Copilot AI left a comment

Uh oh!

ethangreen-dev left a comment

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

Conversation

ebkr commented Apr 8, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Ecosystem Merge

Process

TL;DR for reviews

Uh oh!

Uh oh!

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull request overview

Reviewed changes

Uh oh!

ebkr Apr 15, 2026

Choose a reason for hiding this comment

Uh oh!

ebkr Apr 15, 2026

Choose a reason for hiding this comment

Uh oh!

ebkr Apr 15, 2026

Choose a reason for hiding this comment

Uh oh!

ebkr Apr 15, 2026

Choose a reason for hiding this comment

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull request overview

Reviewed changes

Uh oh!

ethangreen-dev left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

ebkr commented Apr 8, 2026 •

edited

Loading