@mittwald/cli 1.0.0-alpha.43 → 1.0.0-alpha.45

package/README.md

@@ -136,8 +136,10 @@ USAGE
 * [`mw app install typo3`](#mw-app-install-typo3)
 * [`mw app install wordpress`](#mw-app-install-wordpress)
 * [`mw app list`](#mw-app-list)
+* [`mw app list-upgrade-candidates [INSTALLATION-ID]`](#mw-app-list-upgrade-candidates-installation-id)
 * [`mw app ssh [INSTALLATION-ID]`](#mw-app-ssh-installation-id)
 * [`mw app uninstall [INSTALLATION-ID]`](#mw-app-uninstall-installation-id)
+* [`mw app upgrade [INSTALLATION-ID]`](#mw-app-upgrade-installation-id)
 * [`mw app upload [INSTALLATION-ID]`](#mw-app-upload-installation-id)
 * [`mw app versions [APP]`](#mw-app-versions-app)
 * [`mw autocomplete [SHELL]`](#mw-autocomplete-shell)
@@ -1751,6 +1753,33 @@ FLAG DESCRIPTIONS
     to persistently set a default project for all commands that accept this flag.
 ```
 
+## `mw app list-upgrade-candidates [INSTALLATION-ID]`
+
+List upgrade candidates for an app installation.
+
+```
+USAGE
+  $ mw app list-upgrade-candidates [INSTALLATION-ID] [--columns <value> | -x] [--no-header | [--csv | --no-truncate]] [-o
+    txt|json|yaml|csv |  | ] [--no-relative-dates]
+
+ARGUMENTS
+  INSTALLATION-ID  ID or short ID of an app installation; this argument is optional if a default app installation is set
+                   in the context
+
+FLAGS
+  -o, --output=<option>    [default: txt] output in a more machine friendly format
+                           <options: txt|json|yaml|csv>
+  -x, --extended           show extra columns
+      --columns=<value>    only show provided columns (comma-separated)
+      --csv                output is csv format [alias: --output=csv]
+      --no-header          hide table header from output
+      --no-relative-dates  show dates in absolute format, not relative
+      --no-truncate        do not truncate output to fit screen
+
+DESCRIPTION
+  List upgrade candidates for an app installation.
+```
+
 ## `mw app ssh [INSTALLATION-ID]`
 
 Connect to an app via SSH
@@ -1826,6 +1855,42 @@ FLAG DESCRIPTIONS
     scripts), you can use this flag to easily get the IDs of created resources for further processing.
 ```
 
+## `mw app upgrade [INSTALLATION-ID]`
+
+Upgrade app installation to target version
+
+```
+USAGE
+  $ mw app upgrade [INSTALLATION-ID] [--target-version <value>] [-w] [-f] [-p <value>] [-q]
+
+ARGUMENTS
+  INSTALLATION-ID  ID or short ID of an app installation; this argument is optional if a default app installation is set
+                   in the context
+
+FLAGS
+  -f, --force                   Do not ask for confirmation.
+  -p, --project-id=<value>      ID or short ID of a project; this flag is optional if a default project is set in the
+                                context
+  -q, --quiet                   suppress process output and only display a machine-readable summary.
+  -w, --wait                    wait for the upgrade process to finish
+      --target-version=<value>  target version to upgrade app to; if omitted, target version will be prompted
+                                interactively
+
+DESCRIPTION
+  Upgrade app installation to target version
+
+FLAG DESCRIPTIONS
+  -p, --project-id=<value>  ID or short ID of a project; this flag is optional if a default project is set in the context
+
+    May contain a short ID or a full ID of a project; you can also use the "mw context set --project-id=<VALUE>" command
+    to persistently set a default project for all commands that accept this flag.
+
+  -q, --quiet  suppress process output and only display a machine-readable summary.
+
+    This flag controls if you want to see the process output or only a summary. When using mw non-interactively (e.g. in
+    scripts), you can use this flag to easily get the IDs of created resources for further processing.
+```
+
 ## `mw app upload [INSTALLATION-ID]`
 
 Upload the filesystem of an app to a project
@@ -1932,7 +1997,7 @@ EXAMPLES
   $ mw autocomplete --refresh-cache
 ```
 
-_See code: [@oclif/plugin-autocomplete](https://github.com/oclif/plugin-autocomplete/blob/v3.0.16/src/commands/autocomplete/index.ts)_
+_See code: [@oclif/plugin-autocomplete](https://github.com/oclif/plugin-autocomplete/blob/v3.0.18/src/commands/autocomplete/index.ts)_
 
 ## `mw backup create`
 
@@ -3703,7 +3768,7 @@ DESCRIPTION
   Display help for mw.
 ```
 
-_See code: [@oclif/plugin-help](https://github.com/oclif/plugin-help/blob/v6.0.21/src/commands/help.ts)_
+_See code: [@oclif/plugin-help](https://github.com/oclif/plugin-help/blob/v6.0.22/src/commands/help.ts)_
 
 ## `mw login reset`
 
@@ -5200,7 +5265,7 @@ EXAMPLES
     $ mw update --available
 ```
 
-_See code: [@oclif/plugin-update](https://github.com/oclif/plugin-update/blob/v4.2.8/src/commands/update.ts)_
+_See code: [@oclif/plugin-update](https://github.com/oclif/plugin-update/blob/v4.2.11/src/commands/update.ts)_
 
 ## `mw user api-token create`
 

package/dist/BaseCommand.js

@@ -3,6 +3,7 @@ import { MittwaldAPIV2Client } from "@mittwald/api-client";
 import { configureAxiosRetry } from "./lib/api_retry.js";
 import { configureConsistencyHandling } from "./lib/api_consistency.js";
 import { getTokenFilename, readApiToken } from "./lib/auth/token.js";
+import { configureAxiosLogging } from "./lib/api_logging.js";
 export class BaseCommand extends Command {
     authenticationRequired = true;
     apiClient = MittwaldAPIV2Client.newUnauthenticated();
@@ -16,6 +17,7 @@ export class BaseCommand extends Command {
             this.apiClient = MittwaldAPIV2Client.newWithToken(token);
             this.apiClient.axios.defaults.headers["User-Agent"] =
                 `mittwald-cli/${this.config.version}`;
+            configureAxiosLogging(this.apiClient.axios);
             configureAxiosRetry(this.apiClient.axios);
             configureConsistencyHandling(this.apiClient.axios);
         }

package/dist/commands/app/list-upgrade-candidates.d.ts

@@ -0,0 +1,40 @@
+import { Simplify } from "@mittwald/api-client-commons";
+import { ListBaseCommand } from "../../ListBaseCommand.js";
+import { MittwaldAPIV2, MittwaldAPIV2Client } from "@mittwald/api-client";
+import { ListColumns } from "../../Formatter.js";
+type ResponseItem = Simplify<MittwaldAPIV2.Paths.V2AppsAppIdVersions.Get.Responses.$200.Content.ApplicationJson[number]>;
+type Response = Awaited<ReturnType<MittwaldAPIV2Client["app"]["listAppversions"]>>;
+export default class List extends ListBaseCommand<typeof List, ResponseItem, Response> {
+    static description: string;
+    static args: {
+        "installation-id": import("@oclif/core/lib/interfaces/parser.js").Arg<string>;
+    };
+    static flags: {
+        columns?: import("@oclif/core/lib/interfaces/parser.js").OptionFlag<string | undefined> | undefined;
+        csv?: import("@oclif/core/lib/interfaces/parser.js").BooleanFlag<boolean> | undefined;
+        extended?: import("@oclif/core/lib/interfaces/parser.js").BooleanFlag<boolean> | undefined;
+        filter?: import("@oclif/core/lib/interfaces/parser.js").OptionFlag<string | undefined> | undefined;
+        'no-header'?: import("@oclif/core/lib/interfaces/parser.js").BooleanFlag<boolean> | undefined;
+        'no-truncate'?: import("@oclif/core/lib/interfaces/parser.js").BooleanFlag<boolean> | undefined;
+        output: import("@oclif/core/lib/interfaces/parser.js").FlagProps & {
+            type: "option";
+            helpValue?: string | undefined;
+            options?: readonly string[] | undefined;
+            multiple?: boolean | undefined;
+            multipleNonGreedy?: boolean | undefined;
+            delimiter?: "," | undefined;
+            allowStdin?: boolean | "only" | undefined;
+        } & {
+            parse: import("@oclif/core/lib/interfaces/parser.js").FlagParser<string | undefined, string, import("@oclif/core/lib/interfaces/parser.js").CustomOptions>;
+            defaultHelp?: import("@oclif/core/lib/interfaces/parser.js").FlagDefaultHelp<string | undefined, import("@oclif/core/lib/interfaces/parser.js").CustomOptions>;
+            input: string[];
+            default?: import("@oclif/core/lib/interfaces/parser.js").FlagDefault<string | undefined, import("@oclif/core/lib/interfaces/parser.js").CustomOptions>;
+        };
+        sort?: import("@oclif/core/lib/interfaces/parser.js").OptionFlag<string | undefined> | undefined;
+        "no-relative-dates": import("@oclif/core/lib/interfaces/parser.js").BooleanFlag<boolean>;
+    };
+    protected getData(): Promise<Response>;
+    protected mapData(data: ResponseItem[]): Promise<ResponseItem[]>;
+    protected getColumns(): ListColumns<ResponseItem>;
+}
+export {};

package/dist/commands/app/list-upgrade-candidates.js

@@ -0,0 +1,37 @@
+import { appInstallationArgs, withAppInstallationId, } from "../../lib/app/flags.js";
+import { ListBaseCommand } from "../../ListBaseCommand.js";
+import { getAppInstallationFromUuid } from "../../lib/app/uuid.js";
+import { sortArrayByExternalVersion } from "../../lib/app/versions.js";
+export default class List extends ListBaseCommand {
+    static description = "List upgrade candidates for an app installation.";
+    static args = {
+        ...appInstallationArgs,
+    };
+    static flags = {
+        ...ListBaseCommand.baseFlags,
+    };
+    async getData() {
+        const appInstallationId = await withAppInstallationId(this.apiClient, List, this.flags, this.args, this.config);
+        const currentAppInstallation = await getAppInstallationFromUuid(this.apiClient, appInstallationId);
+        if (currentAppInstallation.appVersion.current === undefined) {
+            throw new Error("current app version could not be determined");
+        }
+        return await this.apiClient.app.listUpdateCandidatesForAppversion({
+            appId: currentAppInstallation.appId,
+            baseAppVersionId: currentAppInstallation.appVersion.current,
+        });
+    }
+    async mapData(data) {
+        return sortArrayByExternalVersion(data);
+    }
+    getColumns() {
+        return {
+            externalVersion: {
+                header: "Version",
+                get: (i) => {
+                    return i.externalVersion;
+                },
+            },
+        };
+    }
+}

package/dist/commands/app/upgrade.d.ts

@@ -0,0 +1,17 @@
+import { ExecRenderBaseCommand } from "../../rendering/react/ExecRenderBaseCommand.js";
+import { ReactNode } from "react";
+export declare class UpgradeApp extends ExecRenderBaseCommand<typeof UpgradeApp, void> {
+    static description: string;
+    static args: {
+        "installation-id": import("@oclif/core/lib/interfaces/parser.js").Arg<string>;
+    };
+    static flags: {
+        quiet: import("@oclif/core/lib/interfaces/parser.js").BooleanFlag<boolean>;
+        "project-id": import("@oclif/core/lib/interfaces/parser.js").OptionFlag<string>;
+        "target-version": import("@oclif/core/lib/interfaces/parser.js").OptionFlag<string | undefined, import("@oclif/core/lib/interfaces/parser.js").CustomOptions>;
+        wait: import("@oclif/core/lib/interfaces/parser.js").BooleanFlag<boolean>;
+        force: import("@oclif/core/lib/interfaces/parser.js").BooleanFlag<boolean>;
+    };
+    protected exec(): Promise<void>;
+    protected render(): ReactNode;
+}

package/dist/commands/app/upgrade.js

@@ -0,0 +1,108 @@
+import { jsxs as _jsxs, Fragment as _Fragment, jsx as _jsx } from "react/jsx-runtime";
+import { ExecRenderBaseCommand } from "../../rendering/react/ExecRenderBaseCommand.js";
+import { appInstallationArgs, withAppInstallationId, } from "../../lib/app/flags.js";
+import { projectFlags } from "../../lib/project/flags.js";
+import { Flags, ux } from "@oclif/core";
+import { Text } from "ink";
+import { getAppFromUuid, getAppInstallationFromUuid, getAppVersionFromUuid, } from "../../lib/app/uuid.js";
+import { getAllUpgradeCandidatesFromAppInstallationId, getAvailableTargetAppVersionFromExternalVersion, getLatestAvailableTargetAppVersionForAppVersionUpgradeCandidates, } from "../../lib/app/versions.js";
+import { makeProcessRenderer, processFlags, } from "../../rendering/process/process_flags.js";
+import { Success } from "../../rendering/react/components/Success.js";
+import { waitUntilAppStateHasNormalized } from "../../lib/app/wait.js";
+import { assertStatus } from "@mittwald/api-client-commons";
+export class UpgradeApp extends ExecRenderBaseCommand {
+    static description = "Upgrade app installation to target version";
+    static args = {
+        ...appInstallationArgs,
+    };
+    static flags = {
+        "target-version": Flags.string({
+            description: "target version to upgrade app to; if omitted, target version will be prompted interactively",
+        }),
+        wait: Flags.boolean({
+            description: "wait for the upgrade process to finish",
+            char: "w",
+        }),
+        force: Flags.boolean({
+            char: "f",
+            description: "Do not ask for confirmation.",
+        }),
+        ...projectFlags,
+        ...processFlags,
+    };
+    async exec() {
+        const process = makeProcessRenderer(this.flags, "App upgrade");
+        const appInstallationId = await withAppInstallationId(this.apiClient, UpgradeApp, this.flags, this.args, this.config), currentAppInstallation = await getAppInstallationFromUuid(this.apiClient, appInstallationId), currentApp = await getAppFromUuid(this.apiClient, currentAppInstallation.appId), targetAppVersionCandidates = await getAllUpgradeCandidatesFromAppInstallationId(this.apiClient, currentAppInstallation.id);
+        if (currentAppInstallation.appVersion.current === undefined) {
+            process.error("Current version could not be determined properly.");
+            ux.exit(1);
+        }
+        const currentAppVersion = await getAppVersionFromUuid(this.apiClient, currentApp.id, currentAppInstallation.appVersion.current);
+        if (targetAppVersionCandidates.length == 0) {
+            process.addInfo(_jsxs(Text, { children: ["Your ", currentApp.name, " ", currentAppVersion.externalVersion, " is already Up-To-Date. \u2705"] }));
+            process.complete(_jsx(_Fragment, {}));
+            ux.exit(0);
+        }
+        let targetAppVersion;
+        if (this.flags["target-version"] == "latest") {
+            targetAppVersion =
+                await getLatestAvailableTargetAppVersionForAppVersionUpgradeCandidates(this.apiClient, currentApp.id, currentAppVersion.id);
+        }
+        else if (this.flags["target-version"]) {
+            const targetVersionMatchFromCandidates = targetAppVersionCandidates.find((targetAppVersionCandidate) => targetAppVersionCandidate.externalVersion ===
+                this.flags["target-version"]);
+            if (targetVersionMatchFromCandidates) {
+                targetAppVersion = targetVersionMatchFromCandidates;
+            }
+            else {
+                process.addInfo(_jsx(Text, { children: "The given target upgrade version does not seem to be a valid upgrade candidate." }));
+                targetAppVersion = await forceTargetVersionSelection(process, this.apiClient, targetAppVersionCandidates, currentApp, currentAppVersion);
+            }
+        }
+        else {
+            targetAppVersion = await forceTargetVersionSelection(process, this.apiClient, targetAppVersionCandidates, currentApp, currentAppVersion);
+        }
+        if (!targetAppVersion) {
+            process.error("Target app version could not be determined properly.");
+            return;
+        }
+        if (!this.flags.force) {
+            const confirmed = await process.addConfirmation(_jsxs(Text, { children: ["Confirm upgrading ", currentApp.name, " ", currentAppVersion.externalVersion, " (", currentAppInstallation.description, ") to version", " ", targetAppVersion.externalVersion] }));
+            if (!confirmed) {
+                process.addInfo(_jsx(Text, { children: "Upgrade will not be triggered." }));
+                process.complete(_jsx(_Fragment, {}));
+                ux.exit(1);
+            }
+        }
+        else {
+            process.addInfo(_jsxs(Text, { children: ["Commencing upgrade of ", currentApp.name, " ", currentAppVersion.externalVersion, " (", currentAppInstallation.description, ") to Version", " ", targetAppVersion.externalVersion, "."] }));
+        }
+        const patchAppTriggerResponse = await this.apiClient.app.patchAppinstallation({
+            appInstallationId,
+            data: { appVersionId: targetAppVersion.id },
+        });
+        assertStatus(patchAppTriggerResponse, 204);
+        let successText;
+        if (this.flags.wait) {
+            await waitUntilAppStateHasNormalized(this.apiClient, process, appInstallationId, "waiting for app upgrade to be done");
+            successText =
+                "The upgrade finished successfully. Please check if everything is in its place. 🔎";
+        }
+        else {
+            successText = "The upgrade has been started. Buckle up! 🚀";
+        }
+        await process.complete(_jsx(Success, { children: successText }));
+    }
+    render() {
+        return true;
+    }
+}
+async function forceTargetVersionSelection(process, apiClient, targetAppVersionCandidates, currentApp, currentAppVersion) {
+    const targetAppVersionString = await process.addSelect(`Please select target upgrade for your ${currentApp.name} ${currentAppVersion.externalVersion} from one of the following`, [
+        ...targetAppVersionCandidates.map((targetAppVersionCandidate) => ({
+            value: targetAppVersionCandidate.externalVersion,
+            label: `${targetAppVersionCandidate.externalVersion}`,
+        })),
+    ]);
+    return await getAvailableTargetAppVersionFromExternalVersion(apiClient, currentApp.id, currentAppVersion.id, targetAppVersionString);
+}

package/dist/lib/api_logging.d.ts

@@ -0,0 +1,8 @@
+import { AxiosInstance } from "@mittwald/api-client-commons";
+/**
+ * Configure logging for Axios requests and responses using the `debug` module.
+ *
+ * Run the CLI with `DEBUG=mw:api:client:*` to see the logs. Keep in mind that
+ * this will also log sensitive information in request bodies or headers.
+ */
+export declare function configureAxiosLogging(axios: AxiosInstance): void;

package/dist/lib/api_logging.js

@@ -0,0 +1,20 @@
+import debug from "debug";
+/**
+ * Configure logging for Axios requests and responses using the `debug` module.
+ *
+ * Run the CLI with `DEBUG=mw:api:client:*` to see the logs. Keep in mind that
+ * this will also log sensitive information in request bodies or headers.
+ */
+export function configureAxiosLogging(axios) {
+    const baseDebugger = debug("mw:api:client");
+    const reqDebugger = baseDebugger.extend("request");
+    const resDebugger = baseDebugger.extend("response");
+    axios.interceptors.request.use((config) => {
+        reqDebugger("%s %s requested with %O", config.method?.toUpperCase(), config.url, config.data);
+        return config;
+    });
+    axios.interceptors.response.use((response) => {
+        resDebugger("%s %s responded with %o %O", response.config.method?.toUpperCase(), response.config.url, response.status + " " + response.statusText, response.data);
+        return response;
+    });
+}

package/dist/lib/app/Installer.js

@@ -4,7 +4,7 @@ import { withProjectId } from "../project/flags.js";
 import { autofillFlags, provideSupportedFlags, } from "./flags.js";
 import { normalizeToAppVersionUuid } from "./versions.js";
 import { triggerAppInstallation } from "./install.js";
-import { waitUntilAppIsInstalled } from "./wait.js";
+import { waitUntilAppStateHasNormalized } from "./wait.js";
 import { Success } from "../../rendering/react/components/Success.js";
 export class AppInstaller {
     appId;
@@ -36,7 +36,7 @@ export class AppInstaller {
         const appInstallationId = await triggerAppInstallation(apiClient, process, projectId, flags, appVersion);
         let successText;
         if (flags.wait) {
-            await waitUntilAppIsInstalled(apiClient, process, appInstallationId);
+            await waitUntilAppStateHasNormalized(apiClient, process, appInstallationId, "waiting for app installation to be ready");
             successText = `Your ${this.appName} installation is now complete. Have fun! 🎉`;
         }
         else {

package/dist/lib/app/upgrade.d.ts

@@ -0,0 +1 @@
+export {};

package/dist/lib/app/upgrade.js

@@ -0,0 +1 @@
+export {};

package/dist/lib/app/uuid.d.ts

@@ -1,4 +1,5 @@
 import { MittwaldAPIV2, MittwaldAPIV2Client } from "@mittwald/api-client";
+type AppAppInstallation = MittwaldAPIV2.Components.Schemas.AppAppInstallation;
 type AppAppVersion = MittwaldAPIV2.Components.Schemas.AppAppVersion;
 type AppApp = MittwaldAPIV2.Components.Schemas.AppApp;
 /**
@@ -16,6 +17,13 @@ export declare function getAppFromUuid(apiClient: MittwaldAPIV2Client, appId: st
  * @param appVersionId
  */
 export declare function getAppVersionFromUuid(apiClient: MittwaldAPIV2Client, appId: string, appVersionId: string): Promise<AppAppVersion>;
+/**
+ * Lookup an appInstallation by its UUID
+ *
+ * @param apiClient
+ * @param appInstallationId
+ */
+export declare function getAppInstallationFromUuid(apiClient: MittwaldAPIV2Client, appInstallationId: string): Promise<AppAppInstallation>;
 /**
  * Lookup an app by its human readable name
  *

package/dist/lib/app/uuid.js

@@ -1,4 +1,3 @@
-import { isUuid } from "../../normalize_id.js";
 import { assertStatus, } from "@mittwald/api-client";
 /**
  * Lookup an app by its UUID
@@ -19,9 +18,6 @@ export async function getAppFromUuid(apiClient, appId) {
  * @param appVersionId
  */
 export async function getAppVersionFromUuid(apiClient, appId, appVersionId) {
-    if (!isUuid(appId) && !isUuid(appVersionId)) {
-        throw new Error("Given UUID not valid.");
-    }
     const appVersion = await apiClient.app.getAppversion({
         appId: appId,
         appVersionId: appVersionId,
@@ -29,6 +25,19 @@ export async function getAppVersionFromUuid(apiClient, appId, appVersionId) {
     assertStatus(appVersion, 200);
     return appVersion.data;
 }
+/**
+ * Lookup an appInstallation by its UUID
+ *
+ * @param apiClient
+ * @param appInstallationId
+ */
+export async function getAppInstallationFromUuid(apiClient, appInstallationId) {
+    const appInstallation = await apiClient.app.getAppinstallation({
+        appInstallationId: appInstallationId,
+    });
+    assertStatus(appInstallation, 200);
+    return appInstallation.data;
+}
 /**
  * Convert an app name in a format suitable for fuzzy comparison (ignore casing,
  * punctuation, etc.)

package/dist/lib/app/versions.d.ts

@@ -3,5 +3,9 @@ import { ProcessRenderer } from "../../rendering/process/process.js";
 type AppVersion = MittwaldAPIV2.Components.Schemas.AppAppVersion;
 export declare function normalizeToAppVersionUuid(apiClient: MittwaldAPIV2Client, version: string, process: ProcessRenderer, appUuid: string): Promise<MittwaldAPIV2.Components.Schemas.AppAppVersion>;
 export declare function getLatestAvailableAppVersionForApp(apiClient: MittwaldAPIV2Client, appId: string): Promise<AppVersion | undefined>;
+export declare function getAllUpgradeCandidatesFromAppInstallationId(apiClient: MittwaldAPIV2Client, appInstallationId: string): Promise<AppVersion[]>;
+export declare function getLatestAvailableTargetAppVersionForAppVersionUpgradeCandidates(apiClient: MittwaldAPIV2Client, appId: string, baseAppVersionId: string): Promise<AppVersion | undefined>;
+export declare function getAvailableTargetAppVersionFromExternalVersion(apiClient: MittwaldAPIV2Client, appId: string, baseAppVersionId: string, targetExternalVersion: string): Promise<AppVersion | undefined>;
 export declare function getAppVersionUuidFromAppVersion(apiClient: MittwaldAPIV2Client, appId: string, appVersion: string | undefined): Promise<AppVersion | undefined>;
+export declare function sortArrayByExternalVersion(versions: AppVersion[]): AppVersion[];
 export {};

package/dist/lib/app/versions.js

@@ -3,7 +3,8 @@ import { assertStatus } from "@mittwald/api-client-commons";
 import { gt } from "semver";
 import { Value } from "../../rendering/react/components/Value.js";
 import { Text } from "ink";
-import { getAppNameFromUuid } from "./uuid.js";
+import { getAppInstallationFromUuid, getAppNameFromUuid } from "./uuid.js";
+import { compare } from "semver";
 export async function normalizeToAppVersionUuid(apiClient, version, process, appUuid) {
     let appVersion;
     if (version && version !== "latest") {
@@ -35,7 +36,39 @@ export async function getLatestAvailableAppVersionForApp(apiClient, appId) {
     }
     return versions.data.find((item) => item.internalVersion === latestVersion);
 }
-// App Version UUID from App Version irellevant if internal or external
+export async function getAllUpgradeCandidatesFromAppInstallationId(apiClient, appInstallationId) {
+    const currentAppInstallation = await getAppInstallationFromUuid(apiClient, appInstallationId), updateCandidates = await apiClient.app.listUpdateCandidatesForAppversion({
+        appId: currentAppInstallation.appId,
+        baseAppVersionId: currentAppInstallation.appVersion.current,
+    });
+    assertStatus(updateCandidates, 200);
+    return sortArrayByExternalVersion(updateCandidates.data);
+}
+export async function getLatestAvailableTargetAppVersionForAppVersionUpgradeCandidates(apiClient, appId, baseAppVersionId) {
+    const versions = await apiClient.app.listUpdateCandidatesForAppversion({
+        appId,
+        baseAppVersionId,
+    });
+    assertStatus(versions, 200);
+    if (versions.data.length === 0) {
+        return undefined;
+    }
+    let latestVersion;
+    for (const version of versions.data) {
+        if (gt(version.internalVersion, latestVersion?.internalVersion ?? "0.0.0")) {
+            latestVersion = version;
+        }
+    }
+    return latestVersion;
+}
+export async function getAvailableTargetAppVersionFromExternalVersion(apiClient, appId, baseAppVersionId, targetExternalVersion) {
+    const versions = await apiClient.app.listUpdateCandidatesForAppversion({
+        appId,
+        baseAppVersionId,
+    });
+    assertStatus(versions, 200);
+    return versions.data.find((item) => item.externalVersion === targetExternalVersion);
+}
 export async function getAppVersionUuidFromAppVersion(apiClient, appId, appVersion) {
     const versions = await apiClient.app.listAppversions({
         appId,
@@ -47,3 +80,6 @@ export async function getAppVersionUuidFromAppVersion(apiClient, appId, appVersi
     return versions.data.find((item) => item.internalVersion === appVersion ||
         item.externalVersion === appVersion);
 }
+export function sortArrayByExternalVersion(versions) {
+    return versions.sort((a, b) => compare(b.externalVersion, a.externalVersion));
+}

package/dist/lib/app/wait.d.ts

@@ -1,3 +1,3 @@
 import { MittwaldAPIV2Client } from "@mittwald/api-client";
 import { ProcessRenderer } from "../../rendering/process/process.js";
-export declare function waitUntilAppIsInstalled(apiClient: MittwaldAPIV2Client, process: ProcessRenderer, appInstallationId: string): Promise<void>;
+export declare function waitUntilAppStateHasNormalized(apiClient: MittwaldAPIV2Client, process: ProcessRenderer, appInstallationId: string, label: string): Promise<void>;

package/dist/lib/app/wait.js

@@ -1,8 +1,8 @@
 import { jsx as _jsx } from "react/jsx-runtime";
 import { waitUntil } from "../wait.js";
 import { Text } from "ink";
-export async function waitUntilAppIsInstalled(apiClient, process, appInstallationId) {
-    const stepWaiting = process.addStep(_jsx(Text, { children: "waiting for app installation to be ready" }));
+export async function waitUntilAppStateHasNormalized(apiClient, process, appInstallationId, label) {
+    const stepWaiting = process.addStep(_jsx(Text, { children: label }));
     await waitUntil(async () => {
         const installationResponse = await apiClient.app.getAppinstallation({
             appInstallationId,

package/dist/rendering/react/components/Error/APIError.d.ts

@@ -1,6 +1,6 @@
-import { ApiClientError } from "@mittwald/api-client-commons";
+import { AxiosError } from "@mittwald/api-client-commons";
 interface APIErrorProps {
-    err: ApiClientError;
+    err: AxiosError;
     withStack: boolean;
     withHTTPMessages: "no" | "body" | "full";
 }

package/dist/rendering/react/components/Error/APIError.js

@@ -1,8 +1,10 @@
-import { jsx as _jsx, jsxs as _jsxs, Fragment as _Fragment } from "react/jsx-runtime";
+import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 import { Box, Text } from "ink";
 import ErrorStack from "./ErrorStack.js";
 import ErrorText from "./ErrorText.js";
 import ErrorBox from "./ErrorBox.js";
+import { SingleResultTable } from "../SingleResult.js";
+import { Value } from "../Value.js";
 function RequestHeaders({ headers }) {
     const lines = headers.trim().split("\r\n");
     const requestLine = lines.shift();
@@ -19,11 +21,21 @@ function HttpMessages({ err }) {
     const response = err.response ? (_jsx(Response, { status: err.response.status, statusText: err.response.statusText, body: err.response.data, headers: err.response.headers })) : (_jsx(Text, { children: "no response received" }));
     return (_jsxs(Box, { marginX: 2, marginY: 1, flexDirection: "column", rowGap: 1, children: [_jsx(RequestHeaders, { headers: err.request._header }), response] }));
 }
+function ErrorDetails({ err }) {
+    const errorBody = err.response?.data;
+    return (_jsx(SingleResultTable, { rows: {
+            Request: (_jsxs(Value, { bold: true, children: [err.config?.method?.toUpperCase(), " ", err.config?.url] })),
+            Response: (_jsxs(Value, { bold: true, children: [err.response?.status, " ", err.response?.statusText] })),
+            "Error Type": _jsx(Value, { bold: true, children: errorBody?.type }),
+            Message: _jsx(Value, { bold: true, children: errorBody?.message }),
+            "Trace ID": _jsx(Value, { bold: true, children: errorBody?.params?.["traceId"] }),
+        } }));
+}
 /**
  * Render an API client error to the terminal. In the case of an API client
  * error, the error message will be displayed, as well as (when enabled) the
  * request and response headers and body.
  */
 export default function APIError({ err, withStack, withHTTPMessages, }) {
-    return (_jsxs(_Fragment, { children: [_jsxs(ErrorBox, { children: [_jsx(ErrorText, { bold: true, underline: true, children: "API CLIENT ERROR" }), _jsxs(ErrorText, { children: ["An error occurred while communicating with the API: ", err.message] }), _jsx(Text, { children: JSON.stringify(err.response?.data, undefined, 2) })] }), withHTTPMessages === "full" ? _jsx(HttpMessages, { err: err }) : undefined, withStack && "stack" in err ? _jsx(ErrorStack, { err: err }) : undefined] }));
+    return (_jsxs(Box, { flexDirection: "column", children: [_jsxs(ErrorBox, { children: [_jsx(ErrorText, { bold: true, underline: true, children: "API CLIENT ERROR" }), _jsxs(ErrorText, { children: ["An error occurred while communicating with the API: ", err.message] }), _jsx(ErrorDetails, { err: err }), _jsx(Text, { children: JSON.stringify(err.response?.data, undefined, 2) })] }), withHTTPMessages === "full" ? _jsx(HttpMessages, { err: err }) : undefined, withStack && "stack" in err ? _jsx(ErrorStack, { err: err }) : undefined] }));
 }

package/dist/rendering/react/components/Error/GenericError.js

@@ -1,4 +1,4 @@
-import { jsx as _jsx, jsxs as _jsxs, Fragment as _Fragment } from "react/jsx-runtime";
+import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 import { Box } from "ink";
 import ErrorStack from "./ErrorStack.js";
 import ErrorText from "./ErrorText.js";
@@ -9,5 +9,5 @@ const issueURL = "https://github.com/mittwald/cli/issues/new";
  * have a specific rendering function.
  */
 export default function GenericError({ err, withStack, withIssue = true, title = "Error", }) {
-    return (_jsxs(_Fragment, { children: [_jsxs(ErrorBox, { children: [_jsx(ErrorText, { bold: true, underline: true, children: title.toUpperCase() }), _jsx(ErrorText, { children: "An error occurred while executing this command:" }), _jsx(Box, { marginX: 2, children: _jsx(ErrorText, { children: err.toString() }) }), withIssue ? (_jsxs(ErrorText, { children: ["If you believe this to be a bug, please open an issue at ", issueURL, "."] })) : undefined] }), withStack && "stack" in err ? _jsx(ErrorStack, { err: err }) : undefined] }));
+    return (_jsxs(Box, { flexDirection: "column", children: [_jsxs(ErrorBox, { children: [_jsx(ErrorText, { bold: true, underline: true, children: title.toUpperCase() }), _jsx(ErrorText, { children: "An error occurred while executing this command:" }), _jsx(Box, { marginX: 2, children: _jsx(ErrorText, { children: err.toString() }) }), withIssue ? (_jsxs(ErrorText, { children: ["If you believe this to be a bug, please open an issue at ", issueURL, "."] })) : undefined] }), withStack && "stack" in err ? _jsx(ErrorStack, { err: err }) : undefined] }));
 }

package/dist/rendering/react/components/ErrorBox.js

@@ -1,6 +1,6 @@
 import { jsx as _jsx } from "react/jsx-runtime";
 import { FailedFlagValidationError, RequiredArgsError, } from "@oclif/core/lib/parser/errors.js";
-import { ApiClientError } from "@mittwald/api-client-commons";
+import { AxiosError } from "@mittwald/api-client-commons";
 import InteractiveInputRequiredError from "../../../lib/error/InteractiveInputRequiredError.js";
 import UnexpectedShortIDPassedError from "../../../lib/error/UnexpectedShortIDPassedError.js";
 import GenericError from "./Error/GenericError.js";
@@ -21,7 +21,7 @@ export const ErrorBox = ({ err }) => {
     else if (err instanceof RequiredArgsError) {
         return _jsx(InvalidArgsError, { err: err });
     }
-    else if (err instanceof ApiClientError) {
+    else if (err instanceof AxiosError) {
         return _jsx(APIError, { err: err, withStack: true, withHTTPMessages: "body" });
     }
     else if (err instanceof InteractiveInputRequiredError) {

package/dist/rendering/react/components/Value.d.ts

@@ -1,5 +1,6 @@
 import React, { PropsWithChildren } from "react";
 export type ValueProps = PropsWithChildren<{
     notSet?: boolean;
+    bold?: boolean;
 }>;
 export declare const Value: React.FC<ValueProps>;

package/dist/rendering/react/components/Value.js

@@ -1,8 +1,8 @@
 import { jsx as _jsx } from "react/jsx-runtime";
 import { Text } from "ink";
-export const Value = ({ children, notSet }) => {
+export const Value = ({ children, notSet, bold }) => {
     if (notSet || children === undefined) {
         return _jsx(Text, { color: "gray", children: "not set" });
     }
-    return _jsx(Text, { color: "blue", children: children });
+    return (_jsx(Text, { color: "blue", bold: bold, children: children }));
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mittwald/cli",
-  "version": "1.0.0-alpha.43",
+  "version": "1.0.0-alpha.45",
   "description": "Hand-crafted CLI for the mittwald API",
   "license": "MIT",
   "author": {