Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
3 changes: 2 additions & 1 deletion eslint.config.mjs
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,8 @@ export default [
caughtErrorsIgnorePattern: '^_'
}
],
'eslint-comments/require-description': 'off'
'eslint-comments/require-description': 'off',
'@typescript-eslint/no-invalid-void-type': 'off'
}
}
];
29 changes: 14 additions & 15 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@
"@dfinity/ic-management": "^6.2.0",
"@dfinity/identity": "^2.3.0",
"@dfinity/principal": "^2.3.0",
"@dfinity/zod-schemas": "^1.0.0",
"@junobuild/admin": "^0.6.8-next-2025-07-30.2",
"@junobuild/cdn": "^0.2.1-next-2025-07-30.2",
"@junobuild/cli-tools": "^0.3.1-next-2025-07-30.2",
Expand Down
3 changes: 2 additions & 1 deletion src/cli/env.loader.ts
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,7 @@ const loadEnvConfig = ({mode}: {mode: string | undefined}): JunoCliConfig => {

return {
projectName,
projectSettingsName: `${projectName}-cli-settings`
projectSettingsName: `${projectName}-cli-settings`,
projectStateName: `${projectName}-cli-state`
};
};
131 changes: 2 additions & 129 deletions src/commands/config.ts
Original file line number Diff line number Diff line change
@@ -1,132 +1,5 @@
import {ICManagementCanister, LogVisibility} from '@dfinity/ic-management';
import {Principal} from '@dfinity/principal';
import {isNullish, nonNullish} from '@dfinity/utils';
import {
type SatelliteParameters,
setAuthConfig,
setDatastoreConfig,
setStorageConfig
} from '@junobuild/admin';
import type {
AuthenticationConfig,
DatastoreConfig,
ModuleSettings,
StorageConfig
} from '@junobuild/config';
import {red} from 'kleur';
import ora from 'ora';
import {initAgent} from '../api/agent.api';
import {assertConfigAndLoadSatelliteContext} from '../utils/satellite.utils';

type SetConfigResults = [
PromiseSettledResult<StorageConfig>,
// eslint-disable-next-line @typescript-eslint/no-invalid-void-type
...Array<PromiseSettledResult<void | AuthenticationConfig | DatastoreConfig>>
];
import {config as configServices} from '../services/config/config.services';

export const config = async () => {
const {satellite, satelliteConfig} = await assertConfigAndLoadSatelliteContext();
const {storage, authentication, datastore, settings} = satelliteConfig;

const spinner = ora(`Configuring...`).start();

let results: SetConfigResults | undefined = undefined;

try {
results = await Promise.allSettled([
setStorageConfig({
config: {
headers: storage?.headers ?? [],
rewrites: storage?.rewrites,
redirects: storage?.redirects,
iframe: storage?.iframe,
rawAccess: storage?.rawAccess,
maxMemorySize: storage?.maxMemorySize
},
satellite
}),
...(isNullish(datastore)
? []
: [
setDatastoreConfig({
config: datastore,
satellite
})
]),
...(isNullish(authentication)
? []
: [
setAuthConfig({
config: authentication,
satellite
})
]),
...(isNullish(settings) ? [] : [setSettings({settings, satellite})])
]);
} finally {
spinner.stop();
}

if (nonNullish(results)) {
printResults(results);
}
};

const printResults = (results: SetConfigResults) => {
const errors = results.filter((result) => result.status === 'rejected');

if (errors.length === 0) {
console.log('✅ Configuration applied.');
return;
}

console.log(
red(`The configuration failed with ${errors.length} error${errors.length > 1 ? 's' : ''} 😢.`)
);

errors.forEach((error, index) => {
console.log(`${index}:`, error.reason instanceof Error ? error.reason.message : error.reason);
});
};

const setSettings = async ({
settings,
satellite
}: {
settings: ModuleSettings;
satellite: Omit<SatelliteParameters, 'satelliteId'> &
Required<Pick<SatelliteParameters, 'satelliteId'>>;
}) => {
const {
freezingThreshold,
reservedCyclesLimit,
logVisibility,
heapMemoryLimit,
memoryAllocation,
computeAllocation
} = settings;

const {satelliteId} = satellite;

const agent = await initAgent();

const {updateSettings} = ICManagementCanister.create({
agent
});

await updateSettings({
canisterId: Principal.fromText(satelliteId),
settings: {
freezingThreshold,
reservedCyclesLimit,
logVisibility: isNullish(logVisibility)
? undefined
: logVisibility === 'public'
? LogVisibility.Public
: LogVisibility.Controllers,
wasmMemoryLimit: heapMemoryLimit,
memoryAllocation,
computeAllocation
}
});
await configServices();
};
43 changes: 43 additions & 0 deletions src/configs/cli.state.config.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,43 @@
import {type PrincipalText} from '@dfinity/zod-schemas';
import Conf from 'conf';
import {ENV} from '../env';
import {
type CliState,
type CliStateSatellite,
type CliStateSatelliteAppliedConfigHashes
} from '../types/cli.state';

export const getStateConfig = (): Conf<CliState> =>
new Conf<CliState>({projectName: ENV.config.projectStateName});

export const getLatestAppliedConfig = ({
satelliteId
}: {
satelliteId: PrincipalText;
}): CliStateSatelliteAppliedConfigHashes | undefined =>
getStateConfig().get('satellites')?.[satelliteId]?.lastAppliedConfig;

export const saveLastAppliedConfig = ({
satelliteId,
lastAppliedConfig: {storage, datastore, auth, settings}
}: {satelliteId: PrincipalText} & Pick<CliStateSatellite, 'lastAppliedConfig'>) => {
const config = getStateConfig();

const satellites = config.get('satellites');

const lastAppliedConfig = satellites?.[satelliteId]?.lastAppliedConfig;

const updateSatellites = {
...(satellites ?? {}),
[satelliteId]: {
lastAppliedConfig: {
storage: storage ?? lastAppliedConfig?.storage,
datastore: datastore ?? lastAppliedConfig?.datastore,
auth: auth ?? lastAppliedConfig?.auth,
settings: settings ?? lastAppliedConfig?.settings
}
}
};

config.set('satellites', updateSatellites);
};
7 changes: 7 additions & 0 deletions src/constants/settings.constants.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
export const DEFAULT_SATELLITE_HEAP_WASM_MEMORY_LIMIT = 1_073_741_824n;
export const DEFAULT_SATELLITE_FREEZING_THRESHOLD = 31_104_000n;

export const DEFAULT_RESERVED_CYCLES_LIMIT = 5_000_000_000_000n;
export const DEFAULT_LOG_VISIBILITY = 'controllers';
export const DEFAULT_MEMORY_ALLOCATION = 0n;
export const DEFAULT_COMPUTE_ALLOCATION = 0n;
Loading