feat(fota): allow ranges

Author: coderbyheart

lambda/fota/getNextUpgrade.spec.ts

@@ -0,0 +1,49 @@
+import { FOTAJobTarget } from '@hello.nrfcloud.com/proto/hello'
+import assert from 'node:assert/strict'
+import { describe, it } from 'node:test'
+import { getNextUpgrade } from './getNextUpgrade.js'
+
+void describe('getNextUpgrade()', () => {
+	void it('should return the next upgrade based on a static version', () =>
+		assert.deepEqual(
+			getNextUpgrade(
+				{
+					'2.0.0': 'APP*1e29dfa3*v2.0.1',
+					'2.0.1': 'APP*cd5412d9*v2.0.2',
+				},
+				{
+					appVersion: '2.0.0',
+					supportedFOTATypes: [FOTAJobTarget.application],
+					mfwVersion: '1.3.6',
+				},
+			),
+			{
+				upgrade: {
+					reportedVersion: '2.0.0',
+					bundleId: 'APP*1e29dfa3*v2.0.1',
+					target: FOTAJobTarget.application,
+				},
+			},
+		))
+
+	void it('should return the next upgrade based on a range', () =>
+		assert.deepEqual(
+			getNextUpgrade(
+				{
+					'>=1.0.0': 'APP*1e29dfa3*v2.0.1',
+				},
+				{
+					appVersion: '2.0.0',
+					supportedFOTATypes: [FOTAJobTarget.application],
+					mfwVersion: '1.3.6',
+				},
+			),
+			{
+				upgrade: {
+					reportedVersion: '2.0.0',
+					bundleId: 'APP*1e29dfa3*v2.0.1',
+					target: FOTAJobTarget.application,
+				},
+			},
+		))
+})

lambda/fota/getNextUpgrade.ts

@@ -1,4 +1,5 @@
 import { bundleIdToType, FOTAJobTarget } from '@hello.nrfcloud.com/proto/hello'
+import semver from 'semver'
 import { type DeviceFirmwareDetails } from './getDeviceFirmwareDetails.js'
 import { type PersistedJob } from './jobRepo.js'
 
@@ -75,7 +76,10 @@ export const getNextUpgrade = (
 		upgrade: {
 			reportedVersion,
 			// There may no further upgrades defined
-			bundleId: upgradePath[reportedVersion] ?? null,
+			bundleId:
+				Object.entries(upgradePath).find(([targetVersion]) =>
+					semver.satisfies(reportedVersion, targetVersion),
+				)?.[1] ?? null,
 			target,
 		},
 	}

package-lock.json

@@ -131,7 +131,7 @@
     "@hello.nrfcloud.com/certificate-helpers": "1.0.0",
     "@hello.nrfcloud.com/lambda-helpers": "2.0.29",
     "@hello.nrfcloud.com/nrfcloud-api-helpers": "5.3.86",
-    "@hello.nrfcloud.com/proto": "15.2.8",
+    "@hello.nrfcloud.com/proto": "15.3.0",
     "@hello.nrfcloud.com/proto-map": "16.1.7",
     "@middy/core": "5.5.0",
     "@middy/input-output-logger": "5.5.0",