balena-sdk 16.9.2 → 16.9.4

package/es2015/index.d.ts

@@ -349,7 +349,7 @@ declare const sdkTemplate: {
             _getDeviceTypes: (() => Promise<import("./types/device-type-json").DeviceType[]>) & import("memoizee").Memoized<() => Promise<import("./types/device-type-json").DeviceType[]>>;
             _getDownloadSize: ((deviceType: string, version: string) => Promise<any>) & import("memoizee").Memoized<(deviceType: string, version: string) => Promise<any>>;
             _clearDeviceTypesAndOsVersionCaches: () => void;
-            _getMaxSatisfyingVersion: (versionOrRange: string, osVersions: Pick<import("./models/os").OsVersion, "rawVersion" | "isRecommended">[]) => string | undefined;
+            _getMaxSatisfyingVersion: (versionOrRange: string, osVersions: Pick<import("./models/os").OsVersion, "rawVersion" | "isRecommended">[]) => string | null | undefined;
             OsTypes: typeof import("./models/os").OsTypes;
             getAllOsVersions: {
                 (deviceType: string, options?: import("../typings/pinejs-client-core").ODataOptions<import("./types/models").Release> | undefined): Promise<import("./models/os").OsVersion[]>;

package/es2015/models/index.d.ts

@@ -269,7 +269,7 @@ declare const _default: (deps: InjectedDependenciesParam, opts: InjectedOptionsP
         _getDeviceTypes: (() => Promise<import("../types/device-type-json").DeviceType[]>) & import("memoizee").Memoized<() => Promise<import("../types/device-type-json").DeviceType[]>>;
         _getDownloadSize: ((deviceType: string, version: string) => Promise<any>) & import("memoizee").Memoized<(deviceType: string, version: string) => Promise<any>>;
         _clearDeviceTypesAndOsVersionCaches: () => void;
-        _getMaxSatisfyingVersion: (versionOrRange: string, osVersions: Pick<import("./os").OsVersion, "rawVersion" | "isRecommended">[]) => string | undefined;
+        _getMaxSatisfyingVersion: (versionOrRange: string, osVersions: Pick<import("./os").OsVersion, "rawVersion" | "isRecommended">[]) => string | null | undefined;
         OsTypes: typeof import("./os").OsTypes;
         getAllOsVersions: {
             (deviceType: string, options?: import("..").PineOptions<import("..").Release> | undefined): Promise<import("./os").OsVersion[]>;

package/es2015/models/os.d.ts

@@ -51,7 +51,7 @@ declare const getOsModel: (deps: InjectedDependenciesParam, opts: InjectedOption
     _getDeviceTypes: (() => Promise<DeviceTypeJson.DeviceType[]>) & import("memoizee").Memoized<() => Promise<DeviceTypeJson.DeviceType[]>>;
     _getDownloadSize: ((deviceType: string, version: string) => Promise<any>) & import("memoizee").Memoized<(deviceType: string, version: string) => Promise<any>>;
     _clearDeviceTypesAndOsVersionCaches: () => void;
-    _getMaxSatisfyingVersion: (versionOrRange: string, osVersions: Array<Pick<OsVersion, 'rawVersion' | 'isRecommended'>>) => string | undefined;
+    _getMaxSatisfyingVersion: (versionOrRange: string, osVersions: Array<Pick<OsVersion, 'rawVersion' | 'isRecommended'>>) => string | null | undefined;
     OsTypes: typeof OsTypes;
     getAllOsVersions: {
         (deviceType: string, options?: PineOptions<Release> | undefined): Promise<OsVersion[]>;

package/es2015/models/os.js

@@ -46,7 +46,9 @@ const releaseSelectedFields = (0, types_1.toWritable)([
     'known_issue_list',
     'raw_version',
 ]);
-const BALENAOS_VERSION_REGEX = /v?\d+\.\d+\.\d+(\.rev\d+)?((\-|\+).+)?/;
+const sortVersions = (a, b) => {
+    return bSemver.rcompare(a.rawVersion, b.rawVersion);
+};
 const getOsModel = function (deps, opts) {
     const { pine, request, pubsub } = deps;
     const { apiUrl, isBrowser } = opts;
@@ -58,9 +60,6 @@ const getOsModel = function (deps, opts) {
     () => require('../util/device-types'));
     const hupActionHelper = once(() => require('../util/device-actions/os-update/utils').hupActionHelper);
     const authDependentMemoizer = (0, cache_1.getAuthDependentMemoize)(pubsub);
-    const sortVersions = (a, b) => {
-        return bSemver.rcompare(a.rawVersion, b.rawVersion);
-    };
     const tagsToDictionary = (tags) => {
         const result = {};
         for (const { tag_key, value } of tags) {
@@ -187,14 +186,12 @@ const getOsModel = function (deps, opts) {
             const appTags = getOsAppTags((_c = hostApp.application_tag) !== null && _c !== void 0 ? _c : []);
             osVersionsByDeviceType[hostAppDeviceType].push(..._getOsVersionsFromReleases((_d = hostApp.owns__release) !== null && _d !== void 0 ? _d : [], appTags));
         });
-        return osVersionsByDeviceType;
-    };
-    // This mutates the passed object.
-    const _transformVersionSets = (osVersionsByDeviceType) => {
+        // transform version sets
         Object.keys(osVersionsByDeviceType).forEach((deviceType) => {
             osVersionsByDeviceType[deviceType].sort(sortVersions);
-            const recommendedPerOsType = {};
+            // TODO: Drop in next major
             // Note: the recommended version settings might come from the server in the future, for now we just set it to the latest version for each os type.
+            const recommendedPerOsType = {};
             osVersionsByDeviceType[deviceType].forEach((version) => {
                 if (!recommendedPerOsType[version.osType]) {
                     if (version.variant !== 'dev' &&
@@ -214,7 +211,7 @@ const getOsModel = function (deps, opts) {
     };
     const _getAllOsVersions = (deviceTypes, options) => (0, tslib_1.__awaiter)(this, void 0, void 0, function* () {
         const hostapps = yield _getOsVersions(deviceTypes, options);
-        return yield _transformVersionSets(_transformHostApps(hostapps));
+        return yield _transformHostApps(hostapps);
     });
     const _memoizedGetAllOsVersions = authDependentMemoizer((deviceTypes, listedByDefault) => (0, tslib_1.__awaiter)(this, void 0, void 0, function* () {
         return yield _getAllOsVersions(deviceTypes, listedByDefault
@@ -250,7 +247,7 @@ const getOsModel = function (deps, opts) {
         return (0, tslib_1.__awaiter)(this, void 0, void 0, function* () {
             const singleDeviceTypeArg = typeof deviceTypes === 'string' ? deviceTypes : false;
             deviceTypes = Array.isArray(deviceTypes) ? deviceTypes : [deviceTypes];
-            const versionsByDt = yield _memoizedGetAllOsVersions(deviceTypes.sort(), true);
+            const versionsByDt = yield _memoizedGetAllOsVersions(deviceTypes.slice().sort(), true);
             return singleDeviceTypeArg
                 ? (_a = versionsByDt[singleDeviceTypeArg]) !== null && _a !== void 0 ? _a : []
                 : versionsByDt;
@@ -284,7 +281,7 @@ const getOsModel = function (deps, opts) {
             const singleDeviceTypeArg = typeof deviceTypes === 'string' ? deviceTypes : false;
             deviceTypes = Array.isArray(deviceTypes) ? deviceTypes : [deviceTypes];
             const versionsByDt = options == null
-                ? yield _memoizedGetAllOsVersions(deviceTypes.sort(), null)
+                ? yield _memoizedGetAllOsVersions(deviceTypes.slice().sort(), null)
                 : yield _getAllOsVersions(deviceTypes, options);
             return singleDeviceTypeArg
                 ? (_a = versionsByDt[singleDeviceTypeArg]) !== null && _a !== void 0 ? _a : []
@@ -341,23 +338,12 @@ const getOsModel = function (deps, opts) {
             return v;
         }
         const vNormalized = v[0] === 'v' ? v.substring(1) : v;
-        if (!BALENAOS_VERSION_REGEX.test(vNormalized)) {
+        // We still don't want to allow `balenaOS` prefixes, which balena-semver allows.
+        if (!bSemver.valid(vNormalized) || !/^\d/.test(vNormalized)) {
             throw new Error(`Invalid semver version: ${v}`);
         }
         return vNormalized;
     };
-    const fixNonSemver = (version) => {
-        if (version == null) {
-            return version;
-        }
-        return version.replace(/\.rev(\d+)/, '+FIXED-rev$1');
-    };
-    const unfixNonSemver = (version) => {
-        if (version == null) {
-            return version;
-        }
-        return version.replace(/\+FIXED-rev(\d+)/, '.rev$1');
-    };
     /**
      * @summary Get the max OS version satisfying the given range.
      * @description Utility method exported for testability.
@@ -378,16 +364,13 @@ const getOsModel = function (deps, opts) {
             return (_d = ((_c = osVersions.find((v) => v.isRecommended)) !== null && _c !== void 0 ? _c : osVersions[0])) === null || _d === void 0 ? void 0 : _d.rawVersion;
         }
         const versions = osVersions.map((v) => v.rawVersion);
-        const semverVersions = versions.map(fixNonSemver);
-        // TODO: Once we integrate balena-semver, balena-semver should learn to handle this itself
-        const semverVersionOrRange = fixNonSemver(versionOrRange);
-        if (semverVersions.includes(semverVersionOrRange)) {
+        if (versions.includes(versionOrRange)) {
             // If the _exact_ version you're looking for exists, it's not a range, and
             // we should return it exactly, not any old equivalent version.
-            return unfixNonSemver(semverVersionOrRange);
+            return versionOrRange;
         }
-        const maxVersion = bSemver.maxSatisfying(semverVersions, semverVersionOrRange);
-        return unfixNonSemver(maxVersion);
+        const maxVersion = bSemver.maxSatisfying(versions, versionOrRange);
+        return maxVersion;
     };
     /**
      * @summary Get OS download size estimate

package/es2015/util/sdk-version.js

@@ -6,5 +6,5 @@ Object.defineProperty(exports, "__esModule", { value: true });
 // being embedded in the dist of the consumer project
 // which we want to avoid, both b/c of the dist size increase &
 // the security concerns of including the versions of the dependencies
-const sdkVersion = '16.9.2';
+const sdkVersion = '16.9.4';
 exports.default = sdkVersion;

package/es2018/balena-browser.js

@@ -9382,7 +9382,9 @@ const releaseSelectedFields = (0, types_1.toWritable)([
     'known_issue_list',
     'raw_version',
 ]);
-const BALENAOS_VERSION_REGEX = /v?\d+\.\d+\.\d+(\.rev\d+)?((\-|\+).+)?/;
+const sortVersions = (a, b) => {
+    return bSemver.rcompare(a.rawVersion, b.rawVersion);
+};
 const getOsModel = function (deps, opts) {
     const { pine, request, pubsub } = deps;
     const { apiUrl, isBrowser } = opts;
@@ -9394,9 +9396,6 @@ const getOsModel = function (deps, opts) {
     () => require('../util/device-types'));
     const hupActionHelper = once(() => require('../util/device-actions/os-update/utils').hupActionHelper);
     const authDependentMemoizer = (0, cache_1.getAuthDependentMemoize)(pubsub);
-    const sortVersions = (a, b) => {
-        return bSemver.rcompare(a.rawVersion, b.rawVersion);
-    };
     const tagsToDictionary = (tags) => {
         const result = {};
         for (const { tag_key, value } of tags) {
@@ -9531,14 +9530,12 @@ const getOsModel = function (deps, opts) {
             const appTags = getOsAppTags((_c = hostApp.application_tag) !== null && _c !== void 0 ? _c : []);
             osVersionsByDeviceType[hostAppDeviceType].push(..._getOsVersionsFromReleases((_d = hostApp.owns__release) !== null && _d !== void 0 ? _d : [], appTags));
         });
-        return osVersionsByDeviceType;
-    };
-    // This mutates the passed object.
-    const _transformVersionSets = (osVersionsByDeviceType) => {
+        // transform version sets
         Object.keys(osVersionsByDeviceType).forEach((deviceType) => {
             osVersionsByDeviceType[deviceType].sort(sortVersions);
-            const recommendedPerOsType = {};
+            // TODO: Drop in next major
             // Note: the recommended version settings might come from the server in the future, for now we just set it to the latest version for each os type.
+            const recommendedPerOsType = {};
             osVersionsByDeviceType[deviceType].forEach((version) => {
                 if (!recommendedPerOsType[version.osType]) {
                     if (version.variant !== 'dev' &&
@@ -9558,7 +9555,7 @@ const getOsModel = function (deps, opts) {
     };
     const _getAllOsVersions = async (deviceTypes, options) => {
         const hostapps = await _getOsVersions(deviceTypes, options);
-        return await _transformVersionSets(_transformHostApps(hostapps));
+        return await _transformHostApps(hostapps);
     };
     const _memoizedGetAllOsVersions = authDependentMemoizer(async (deviceTypes, listedByDefault) => {
         return await _getAllOsVersions(deviceTypes, listedByDefault
@@ -9593,7 +9590,7 @@ const getOsModel = function (deps, opts) {
         var _a;
         const singleDeviceTypeArg = typeof deviceTypes === 'string' ? deviceTypes : false;
         deviceTypes = Array.isArray(deviceTypes) ? deviceTypes : [deviceTypes];
-        const versionsByDt = await _memoizedGetAllOsVersions(deviceTypes.sort(), true);
+        const versionsByDt = await _memoizedGetAllOsVersions(deviceTypes.slice().sort(), true);
         return singleDeviceTypeArg
             ? (_a = versionsByDt[singleDeviceTypeArg]) !== null && _a !== void 0 ? _a : []
             : versionsByDt;
@@ -9625,7 +9622,7 @@ const getOsModel = function (deps, opts) {
         const singleDeviceTypeArg = typeof deviceTypes === 'string' ? deviceTypes : false;
         deviceTypes = Array.isArray(deviceTypes) ? deviceTypes : [deviceTypes];
         const versionsByDt = options == null
-            ? await _memoizedGetAllOsVersions(deviceTypes.sort(), null)
+            ? await _memoizedGetAllOsVersions(deviceTypes.slice().sort(), null)
             : await _getAllOsVersions(deviceTypes, options);
         return singleDeviceTypeArg
             ? (_a = versionsByDt[singleDeviceTypeArg]) !== null && _a !== void 0 ? _a : []
@@ -9681,23 +9678,12 @@ const getOsModel = function (deps, opts) {
             return v;
         }
         const vNormalized = v[0] === 'v' ? v.substring(1) : v;
-        if (!BALENAOS_VERSION_REGEX.test(vNormalized)) {
+        // We still don't want to allow `balenaOS` prefixes, which balena-semver allows.
+        if (!bSemver.valid(vNormalized) || !/^\d/.test(vNormalized)) {
             throw new Error(`Invalid semver version: ${v}`);
         }
         return vNormalized;
     };
-    const fixNonSemver = (version) => {
-        if (version == null) {
-            return version;
-        }
-        return version.replace(/\.rev(\d+)/, '+FIXED-rev$1');
-    };
-    const unfixNonSemver = (version) => {
-        if (version == null) {
-            return version;
-        }
-        return version.replace(/\+FIXED-rev(\d+)/, '.rev$1');
-    };
     /**
      * @summary Get the max OS version satisfying the given range.
      * @description Utility method exported for testability.
@@ -9718,16 +9704,13 @@ const getOsModel = function (deps, opts) {
             return (_d = ((_c = osVersions.find((v) => v.isRecommended)) !== null && _c !== void 0 ? _c : osVersions[0])) === null || _d === void 0 ? void 0 : _d.rawVersion;
         }
         const versions = osVersions.map((v) => v.rawVersion);
-        const semverVersions = versions.map(fixNonSemver);
-        // TODO: Once we integrate balena-semver, balena-semver should learn to handle this itself
-        const semverVersionOrRange = fixNonSemver(versionOrRange);
-        if (semverVersions.includes(semverVersionOrRange)) {
+        if (versions.includes(versionOrRange)) {
             // If the _exact_ version you're looking for exists, it's not a range, and
             // we should return it exactly, not any old equivalent version.
-            return unfixNonSemver(semverVersionOrRange);
+            return versionOrRange;
         }
-        const maxVersion = bSemver.maxSatisfying(semverVersions, semverVersionOrRange);
-        return unfixNonSemver(maxVersion);
+        const maxVersion = bSemver.maxSatisfying(versions, versionOrRange);
+        return maxVersion;
     };
     /**
      * @summary Get OS download size estimate
@@ -11916,7 +11899,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 // being embedded in the dist of the consumer project
 // which we want to avoid, both b/c of the dist size increase &
 // the security concerns of including the versions of the dependencies
-const sdkVersion = '16.9.2';
+const sdkVersion = '16.9.4';
 exports.default = sdkVersion;
 
 },{}],47:[function(require,module,exports){