fix: password question hided behind spinner on download snapshot

Signed-off-by: David Dal Busco <[email protected]>

Author: peterpeterparker

src/commands/status.ts

@@ -17,8 +17,8 @@ import type {AssetKey} from '../types/asset-key';
 import {toAssetKeys} from '../utils/asset-key.utils';
 import {orbiterKey, satelliteKey} from '../utils/cli.config.utils';
 import {
-  assertConfigAndLoadSatelliteContext,
-  assertConfigAndReadOrbiterId
+  assertConfigAndLoadOrbiterContext,
+  assertConfigAndLoadSatelliteContext
 } from '../utils/juno.config.utils';
 import {lastRelease} from '../utils/upgrade.utils';
 
@@ -96,9 +96,9 @@ const satelliteVersion = async () => {
 };
 
 const orbitersVersion = async () => {
-  const {orbiterId} = await assertConfigAndReadOrbiterId();
+  const orbiter = await assertConfigAndLoadOrbiterContext();
 
-  if (isNullish(orbiterId)) {
+  if (isNullish(orbiter)) {
     return;
   }
 
@@ -137,6 +137,10 @@ const orbitersVersion = async () => {
     });
   };
 
+  const {
+    orbiter: {orbiterId}
+  } = orbiter;
+
   await checkOrbiterVersion(orbiterId);
 };
 

src/services/modules/snapshot/snapshot.orbiter.services.ts

@@ -1,6 +1,6 @@
 import {isNullish} from '@dfinity/utils';
 import type {AssetKey} from '../../../types/asset-key';
-import {assertConfigAndReadOrbiterId} from '../../../utils/juno.config.utils';
+import {assertConfigAndLoadOrbiterContext} from '../../../utils/juno.config.utils';
 import {
   createSnapshot,
   deleteSnapshot,
@@ -53,12 +53,16 @@ const executeSnapshotFn = async ({
 }: {
   fn: (params: {canisterId: string; segment: AssetKey}) => Promise<void>;
 }) => {
-  const {orbiterId} = await assertConfigAndReadOrbiterId();
+  const orbiter = await assertConfigAndLoadOrbiterContext();
 
-  if (isNullish(orbiterId)) {
+  if (isNullish(orbiter)) {
     return;
   }
 
+  const {
+    orbiter: {orbiterId}
+  } = orbiter;
+
   await fn({
     canisterId: orbiterId,
     segment: 'orbiter'

src/services/modules/start-stop.services.ts

@@ -7,8 +7,8 @@ import {getCliMissionControl} from '../../configs/cli.config';
 import type {AssetKey} from '../../types/asset-key';
 import type {StartStopAction} from '../../types/start-stop';
 import {
-  assertConfigAndLoadSatelliteContext,
-  assertConfigAndReadOrbiterId
+  assertConfigAndLoadOrbiterContext,
+  assertConfigAndLoadSatelliteContext
 } from '../../utils/juno.config.utils';
 
 export const startStopMissionControl = async ({
@@ -32,12 +32,16 @@ export const startStopMissionControl = async ({
 };
 
 export const startStopOrbiter = async ({action}: {args?: string[]; action: StartStopAction}) => {
-  const {orbiterId} = await assertConfigAndReadOrbiterId();
+  const orbiter = await assertConfigAndLoadOrbiterContext();
 
-  if (isNullish(orbiterId)) {
+  if (isNullish(orbiter)) {
     return;
   }
 
+  const {
+    orbiter: {orbiterId}
+  } = orbiter;
+
   await startStop({
     action,
     segment: 'orbiter',

src/services/modules/upgrade/upgrade.orbiter.services.ts

@@ -8,7 +8,7 @@ import {actorParameters} from '../../../api/actor.api';
 import {ORBITER_WASM_NAME} from '../../../constants/constants';
 import type {UpgradeWasmModule} from '../../../types/upgrade';
 import {orbiterKey} from '../../../utils/cli.config.utils';
-import {assertConfigAndReadOrbiterId} from '../../../utils/juno.config.utils';
+import {assertConfigAndLoadOrbiterContext} from '../../../utils/juno.config.utils';
 import {NEW_CMD_LINE} from '../../../utils/prompt.utils';
 import {logUpgradeResult, readUpgradeOptions} from '../../../utils/upgrade.utils';
 import {
@@ -21,9 +21,9 @@ import {
 type Orbiter = Omit<OrbiterParameters, 'orbiterId'> & {orbiterId: PrincipalText};
 
 export const upgradeOrbiters = async (args?: string[]) => {
-  const {orbiterId} = await assertConfigAndReadOrbiterId();
+  const orbiter = await assertConfigAndLoadOrbiterContext();
 
-  if (isNullish(orbiterId)) {
+  if (isNullish(orbiter)) {
     return;
   }
 
@@ -51,6 +51,10 @@ export const upgradeOrbiters = async (args?: string[]) => {
     logResult(result);
   };
 
+  const {
+    orbiter: {orbiterId}
+  } = orbiter;
+
   await upgradeOrbiter(orbiterId);
 };
 

src/types/satellite.ts

@@ -1,6 +1,10 @@
 import type {PrincipalText} from '@dfinity/zod-schemas';
-import type {SatelliteParameters} from '@junobuild/ic-client/actor';
+import type {OrbiterParameters, SatelliteParameters} from '@junobuild/ic-client/actor';
 
 export type SatelliteParametersWithId = Omit<SatelliteParameters, 'satelliteId'> & {
   satelliteId: PrincipalText;
 };
+
+export type OrbiterParametersWithId = Omit<OrbiterParameters, 'orbiterId'> & {
+  orbiterId: PrincipalText;
+};

src/utils/juno.config.utils.ts

@@ -5,7 +5,7 @@ import {red} from 'kleur';
 import {actorParameters} from '../api/actor.api';
 import {noJunoConfig, readJunoConfig} from '../configs/juno.config';
 import {ENV} from '../env';
-import type {SatelliteParametersWithId} from '../types/satellite';
+import type {OrbiterParametersWithId, SatelliteParametersWithId} from '../types/satellite';
 import {consoleNoConfigFound} from './msg.utils';
 
 interface SatelliteConfigEnv {
@@ -33,6 +33,35 @@ export const assertConfigAndLoadSatelliteContext = async (): Promise<{
   return {satellite, satelliteConfig};
 };
 
+export const assertConfigAndLoadOrbiterContext = async (): Promise<
+  | {
+      orbiter: OrbiterParametersWithId;
+      orbiterConfig: OrbiterConfig;
+    }
+  | undefined
+> => {
+  const {orbiter: orbiterConfig} = await assertAndReadJunoConfig();
+
+  if (isNullish(orbiterConfig)) {
+    return undefined;
+  }
+
+  const {orbiterId} = readOrbiterId({orbiter: orbiterConfig, env: ENV});
+
+  // Unlikely
+  if (isNullish(orbiterId)) {
+    return undefined;
+  }
+
+  return {
+    orbiter: {
+      orbiterId,
+      ...(await actorParameters())
+    },
+    orbiterConfig
+  };
+};
+
 // Useful for reading the configuration without initializing an actor.
 // For example, during the authentication flow when no identity is defined yet,
 // or in other cases where we want to avoid waiting for the actor initialization timeout.
@@ -42,14 +71,6 @@ export const assertConfigAndReadSatelliteId = async (): Promise<{satelliteId: Pr
   return assertAndReadSatelliteId({satellite: satelliteConfig, env: ENV});
 };
 
-export const assertConfigAndReadOrbiterId = async (): Promise<{
-  orbiterId: PrincipalText | undefined;
-}> => {
-  const {orbiter: orbiterConfig} = await assertAndReadJunoConfig();
-
-  return readOrbiterId({orbiter: orbiterConfig, env: ENV});
-};
-
 const assertAndReadJunoConfig = async (): Promise<JunoConfig> => {
   if (await noJunoConfig()) {
     consoleNoConfigFound();