Skip to content

feat: load config when necessary only #316

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.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
peterpeterparker merged 1 commit into from
Aug 2, 2025
Merged

feat: load config when necessary only #316

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
55 changes: 36 additions & 19 deletions src/services/config/config.services.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ export const config = async () => {
const {satellite, satelliteConfig} = await assertConfigAndLoadSatelliteContext();
const {satelliteId} = satellite;

const currentConfig = await loadCurrentConfig({satellite});
const currentConfig = await loadCurrentConfig({satellite, satelliteConfig});
const lastAppliedConfig = getLatestAppliedConfig({satelliteId});

const editConfig = await prepareConfig({
Expand Down Expand Up @@ -110,34 +110,44 @@ const printResults = (results: SetConfigResults) => {
};

interface CurrentConfig {
storage: [StorageConfig, ConfigHash];
storage?: [StorageConfig, ConfigHash];
datastore?: [DatastoreConfig, ConfigHash];
auth?: [AuthenticationConfig, ConfigHash];
settings: [ModuleSettings, SettingsHash];
settings?: [ModuleSettings, SettingsHash];
}

const getCurrentConfig = async ({
satellite
satellite,
satelliteConfig
}: {
satellite: SatelliteParametersWithId;
satelliteConfig: Omit<SatelliteConfig, 'assertions'>;
}): Promise<CurrentConfig> => {
const {
storage: userStorageConfig,
datastore: userDatastoreConfig,
authentication: userAuthConfig,
settings: userSettingConfig
} = satelliteConfig;

const [storage, datastore, auth, settings] = await Promise.all([
getStorageConfig({satellite}),
getDatastoreConfig({satellite}),
getAuthConfig({satellite}),
getSettings({satellite})
nonNullish(userStorageConfig) ? getStorageConfig({satellite}) : Promise.resolve(),
nonNullish(userDatastoreConfig) ? getDatastoreConfig({satellite}) : Promise.resolve(),
nonNullish(userAuthConfig) ? getAuthConfig({satellite}) : Promise.resolve(),
nonNullish(userSettingConfig) ? getSettings({satellite}) : Promise.resolve()
]);

return {
storage: [storage, objHash(storage)],
...(nonNullish(storage) && {storage: [storage, objHash(storage)]}),
...(nonNullish(datastore) && {datastore: [datastore, objHash(datastore)]}),
...(nonNullish(auth) && {auth: [auth, objHash(auth)]}),
settings: [settings, objHash(settings)]
...(nonNullish(settings) && {settings: [settings, objHash(settings)]})
};
};

const loadCurrentConfig = async (params: {
satellite: SatelliteParametersWithId;
satelliteConfig: Omit<SatelliteConfig, 'assertions'>;
}): Promise<CurrentConfig> => {
const spinner = ora('Loading configuration...').start();

Expand Down Expand Up @@ -215,7 +225,11 @@ const prepareConfig = async ({
settings: currentSettings
} = currentConfig;

const isDefaultSettings = (): boolean => {
const isNullishOrDefaultSettings = (): boolean => {
if (isNullish(currentSettings)) {
return true;
}

const [settings] = currentSettings;
return (
settings.computeAllocation === DEFAULT_COMPUTE_ALLOCATION &&
Expand All @@ -228,9 +242,9 @@ const prepareConfig = async ({
};

const isDefaultConfig = (): boolean => {
const [storage] = currentStorage;
const storageVersion = currentStorage?.[0].version;

if (nonNullish(storage.version)) {
if (nonNullish(storageVersion)) {
return false;
}

Expand All @@ -246,7 +260,7 @@ const prepareConfig = async ({
return false;
}

return isDefaultSettings();
return isNullishOrDefaultSettings();
};

const firstTime = isNullish(lastAppliedConfig);
Expand All @@ -263,7 +277,7 @@ const prepareConfig = async ({
// Extend the satellite config from the juno.config with the current versions available in the backend
// Unless the config contains manually defined versions.
const extendWithVersions = (): Omit<SatelliteConfig, 'assertions'> => {
const [{version: versionStorage}] = currentStorage;
const versionStorage = currentStorage?.[0]?.version;
const versionDatastore = currentDatastore?.[0]?.version;
const versionAuth = currentAuth?.[0]?.version;

Expand Down Expand Up @@ -301,15 +315,15 @@ const prepareConfig = async ({
// If they match, there's no need to warn the developer about overwriting —
// they're just updating the same options they previously applied.
const isLastAppliedConfigCurrent = (): boolean => {
const [_, storageHash] = currentStorage;

const {
storage: lastStorageHash,
datastore: lastDatastoreHash,
auth: lastAuthHash,
settings: lastSettingsHash
} = lastAppliedConfig;

const storageHash = currentStorage?.[1];

if (storageHash !== lastStorageHash) {
return false;
}
Expand All @@ -326,9 +340,12 @@ const prepareConfig = async ({
return false;
}

const [__, settingsHash] = currentSettings;
const settingsHash = currentSettings?.[1];

return settingsHash === lastSettingsHash || (isDefaultSettings() && isNullish(settings));
return (
(nonNullish(settingsHash) && settingsHash === lastSettingsHash) ||
(isNullishOrDefaultSettings() && isNullish(settings))
);
};

if (isLastAppliedConfigCurrent()) {
Expand Down