Simplify logic using minTakeoverVersion as a flag

This commit adds `minTakeoverVersion` to indicate a version jump that requires a takeover instead of
`balenahup`. This is used by `getHupActionType` to identify the need
for a takeover update.

lib/config.ts

@@ -83,10 +83,10 @@ export const actionsConfig: ActionsConfig = {
 			},
 		},
 		'jetson-xavier-nx-devkit-emmc': {
-			takeover: {
+			balenahup: {
 				// NOTE: this version is here as a placeholder for
 				// testing. Replace with the correct version before merging
-				minTargetVersion: '5.1.45+rev1',
+				minTakeoverVersion: '5.1.45+rev1',
 			},
 		},
 		qemux86: {

lib/index.ts

@@ -72,7 +72,7 @@ export class HUPActionHelper {
 		deviceType: string,
 		currentVersion: string,
 		targetVersion: string,
-	) {
+	): ActionName | 'takeover' {
 		const currentVersionParsed = bSemver.parse(currentVersion);
 		if (currentVersionParsed == null) {
 			throw new HUPActionError('Invalid current balenaOS version');
@@ -120,10 +120,10 @@ export class HUPActionHelper {
 					);
 			}
 		} else {
-			// Takeover overrides the checks below for the device type
-			if (this.isTakeoverRequired(deviceType, currentVersion, targetVersion)) {
-				return 'takeover';
-			}
+			// // Takeover overrides the checks below for the device type
+			// if (this.isTakeoverRequired(deviceType, currentVersion, targetVersion)) {
+			// 	return 'takeover';
+			// }
 			actionName = 'balenahup';
 		}
 
@@ -144,6 +144,7 @@ export class HUPActionHelper {
 			minSourceVersion,
 			targetMajorVersion,
 			minTargetVersion,
+			minTakeoverVersion,
 			maxTargetVersion,
 		} = {
 			...actionsConfig.actions[actionName],
@@ -179,28 +180,16 @@ export class HUPActionHelper {
 			);
 		}
 
-		return actionName;
-	}
-
-	private isTakeoverRequired(
-		deviceType: string,
-		currentVersion: string,
-		targetVersion: string,
-	) {
-		const { actionsConfig } = this;
-		const deviceActions = actionsConfig.deviceTypes[deviceType] || {};
-
-		if (deviceActions.takeover == null) {
-			return false;
+		if (actionName === 'balenahup' && minTakeoverVersion != null) {
+			if (
+				bSemver.lt(currentVersion, minTakeoverVersion) &&
+				bSemver.gte(targetVersion, minTakeoverVersion)
+			) {
+				return 'takeover';
+			}
 		}
 
-		const { minTargetVersion } = deviceActions.takeover;
-		if (
-			bSemver.lt(currentVersion, minTargetVersion) &&
-			bSemver.gte(targetVersion, minTargetVersion)
-		) {
-			return true;
-		}
+		return actionName;
 	}
 
 	/**

lib/types.ts

@@ -25,19 +25,17 @@ export interface ActionConfig {
 	minTargetVersion: string;
 	// first resinOS version within the major version, that the updater can no longer target (update only to strictly lower versions than this)
 	maxTargetVersion?: string;
+	// first balenaOS version that requires a takeover rather than a balenahup. An update with a target larger or equal to this version
+	// coming from a source version before it will require a takeover rather than a HUP
+	minTakeoverVersion?: string;
 }
 
-// The per device configuration can override the version configuration of the
-// action, or define a 'takeover' version when a jump between two versions
-// cannot be done with balenahup, but needs a full re-flash
-type DeviceTypeConfig = {
-	[K in ActionName]?: Partial<ActionConfig>;
-} & { takeover?: Pick<ActionConfig, 'minTargetVersion'> };
-
 export interface ActionsConfig {
 	actions: { [K in ActionName]: ActionConfig };
 	deviceTypesDefaults: { [K in ActionName]?: Partial<ActionConfig> };
 	deviceTypes: Partial<{
-		[deviceTypeSlug: string]: DeviceTypeConfig;
+		[deviceTypeSlug: string]: {
+			[K in ActionName]?: Partial<ActionConfig>;
+		};
 	}>;
 }