motion-master-client 0.0.136 → 0.0.138

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "motion-master-client",
-  "version": "0.0.136",
+  "version": "0.0.138",
   "type": "commonjs",
   "description": "A library and CLI program used for communicating with Motion Master.",
   "dependencies": {

package/src/lib/firmware.d.ts

@@ -1,17 +1,18 @@
 /// <reference types="node" />
 import { DeviceComponent, HardwareDescription, StackInfo } from "./hardware-description";
 import { IntegroVariant } from "./integro-variant";
+import { RangeOptions } from "semver";
 export declare const firmwareIdRegExp: RegExp;
-export declare const newFirmwarePackageNameRegExp: RegExp;
-export declare const oldFirmwarePackageNameRegExp: RegExp;
+export declare const newFirmwarePackageFilenameRegExp: RegExp;
+export declare const oldFirmwarePackageFilenameRegExp: RegExp;
 /**
- * New firmware package names are described in section 4.3.3 of the "Hardware Description File Format".
+ * New firmware package filenames are described in section 4.3.3 of the "Hardware Description File Format".
  * For more details, refer to the document at: {@link https://docs.google.com/document/d/1bafY-F8qFMLd0Las8fQFF6H9PTVYFjv01bhV7owqx8E}.
  *
  * @example
  * "package_SOMANET-Servo-Node-400-EtherCAT_9501-01-4622-1_motion-drive_v4.1.0.zip"
  */
-export interface NewFirmwarePackageName {
+export interface NewFirmwarePackageFilename {
     /**
      * General format description: "package" refers to the zip bundles used to deliver firmware for SOMANET devices.
      */
@@ -44,12 +45,12 @@ export interface NewFirmwarePackageName {
     fieldbusProtocol?: number;
 }
 /**
- * Documentation for old firmware package names is not available.
+ * Documentation for old firmware package filenames is not available.
  *
  * @example
  * "package-motion-drive_ComEtherCAT-b_CoreC2X-a_Drive400-e_v4.2.1.zip"
  */
-export interface OldFirmwarePackageName {
+export interface OldFirmwarePackageFilename {
     description: string;
     components: DeviceComponent[];
     firmwareVersion: string;
@@ -78,24 +79,24 @@ export interface FirmwareId {
  */
 export declare function parseFirmwareId(fwid: string): FirmwareId;
 /**
- * The format for new firmware package names is detailed in the "Hardware Description File Format" document.
+ * The format for new firmware package filenames is detailed in the "Hardware Description File Format" document.
  */
-export declare function isNewFirmwarePackageName(name: string): boolean;
+export declare function isNewFirmwarePackageFilename(filename: string): boolean;
 /**
- * Documentation for older firmware package names, such as "package-motion-drive_ComEtherCAT-b_CoreC2X-a_Drive400-e_v4.2.1.zip", is unavailable.
- * These package names consist of three hardware components (modules): Com, Core, and Drive.
+ * Documentation for older firmware package filenames, such as "package-motion-drive_ComEtherCAT-b_CoreC2X-a_Drive400-e_v4.2.1.zip", is unavailable.
+ * These package filenames consist of three hardware components (modules): Com, Core, and Drive.
  * Firmware packages with these older naming conventions are specifically built for legacy SOMANET Node devices.
  */
-export declare function isOldFirmwarePackageName(name: string): boolean;
+export declare function isOldFirmwarePackageFilename(filename: string): boolean;
 /**
- * Parses a new firmware package name and returns an instance of {@link NewFirmwarePackageName}.
- * Returns `undefined` if the name does not match the new firmware package name format.
+ * Parses a new firmware package filename and returns an instance of {@link NewFirmwarePackageFilename}.
+ * Returns `undefined` if the filename does not match the new firmware package filename format.
  *
- * @throws {Error} Throws an error if the provided name does not match the expected pattern.
+ * @throws {Error} Throws an error if the provided filename does not match the expected pattern.
  */
-export declare function parseNewFirmwarePackageName(name: string): NewFirmwarePackageName;
+export declare function parseNewFirmwarePackageFilename(filename: string): NewFirmwarePackageFilename;
 /**
- * Given an old firmware package name in the format:
+ * Given an old firmware package filename in the format:
  * "package-motion-drive_ComEtherCAT-b_CoreC2X-a_Drive400-e_v4.2.1.zip",
  * this function extracts the hardware components and returns an array of objects.
  * Each object includes the component name, version, and an empty serial number.
@@ -104,36 +105,36 @@ export declare function parseNewFirmwarePackageName(name: string): NewFirmwarePa
  * which includes only hardware components but lacks a firmware ID. To check if two sets of components match and verify compatibility,
  * use the {@link deviceComponentsMatch} function.
  *
- * @throws {Error} Throws an error if the provided name does not match the expected pattern.
+ * @throws {Error} Throws an error if the provided filename does not match the expected pattern.
  */
-export declare function extractDeviceComponentsFromOldFirmwarePackageName(name: string): DeviceComponent[];
+export declare function extractDeviceComponentsFromOldFirmwarePackageFilename(filename: string): DeviceComponent[];
 /**
- * Parses an old firmware package name and returns an instance of {@link OldFirmwarePackageName}.
- * Returns `undefined` if the name does not match the old firmware package name format.
+ * Parses an old firmware package filename and returns an instance of {@link OldFirmwarePackageFilename}.
+ * Returns `undefined` if the filename does not match the old firmware package filename format.
  *
- * @throws {Error} Throws an error if the provided name does not match the expected pattern.
+ * @throws {Error} Throws an error if the provided filename does not match the expected pattern.
  */
-export declare function parseOldFirmwarePackageName(name: string): OldFirmwarePackageName;
+export declare function parseOldFirmwarePackageFilename(filename: string): OldFirmwarePackageFilename;
 /**
  * Type guard to determine if the provided value is a Stack Info object.
  */
 export declare function isStackInfo(value: any): value is StackInfo;
 /**
- * Checks if a firmware package name is compatible with a device based on the provided FWID, Stack Info, or Hardware Description.
+ * Checks if a firmware package filename is compatible with a device based on the provided FWID, Stack Info, or Hardware Description.
  * This function is useful for determining whether a firmware package can be installed on a device.
  *
- * - If you provide Stack Info, use the old firmware package name.
- * - If you provide FWID or Hardware Description, use the new firmware package name.
+ * - If you provide Stack Info, use the old firmware package filename.
+ * - If you provide FWID or Hardware Description, use the new firmware package filename.
  *
- * @param name The firmware package name (either old or new).
+ * @param filename The firmware package filename (either old or new).
  * @param id The identifier, which can be FWID, Stack Info, or Hardware Description.
  * @param integroVariant The parsed Integro Variant file or its raw buffer.
- * @returns `true` if the firmware package name is compatible with the device; otherwise, `false`.
- * @throws {Error} Throws an error if an invalid combination is provided, such as FWID with an old firmware package name.
+ * @returns `true` if the firmware package filename is compatible with the device; otherwise, `false`.
+ * @throws {Error} Throws an error if an invalid combination is provided, such as FWID with an old firmware package filename.
  */
-export declare function isFirmwarePackageNameCompatibleWithDevice(name: string, id: string | StackInfo | HardwareDescription, integroVariant?: Buffer | IntegroVariant): boolean;
+export declare function isFirmwarePackageFilenameCompatibleWithDevice(filename: string, id: string | StackInfo | HardwareDescription, integroVariant?: Buffer | IntegroVariant): boolean;
 /**
- * Extracts the Firmware ID (FWID) from either the new firmware package name or the provided Hardware Description.
+ * Extracts the Firmware ID (FWID) from either the new firmware package filename or the provided Hardware Description.
  * The optional Integro Variant is used if the Firmware ID includes the Fieldbus Protocol.
  *
  * Note: If additional options from the Integro Variant are incorporated into the FWID in the future, this code will need to be updated accordingly.
@@ -143,26 +144,57 @@ export declare function isFirmwarePackageNameCompatibleWithDevice(name: string,
  * - If an assembly is present, the ID and version are taken from the assembly, while the key ID is still taken from the device.
  * - In all cases, the key ID is sourced from the device.
  *
- * @param sub The new firmware package name or hardware description.
+ * @param sub The new firmware package filename or hardware description.
  * @param integroVariant The parsed Integro Variant file or its raw buffer.
- * @throws {Error} If the provided name does not match the expected pattern.
+ * @throws {Error} If the provided filename does not match the expected pattern.
  * @returns The Firmware ID (FWID), e.g., "9501-01-4622-1".
  */
 export declare function extractFirmwareId(sub: string | HardwareDescription, integroVariant?: Buffer | IntegroVariant): string;
 /**
- * Extracts the firmware version from the given firmware package name, whether it's in the old or new format.
+ * Extracts the firmware version from the given firmware package filename, whether it's in the old or new format.
  *
  * @example
  * "v4.1.0"
  *
- * @throws {Error} Throws an error if the provided name does not match the expected pattern.
+ * @throws {Error} Throws an error if the provided filename does not match the expected pattern.
  */
-export declare function extractFirmwareVersionFromFirmwarePackageName(name: string): string;
+export declare function extractFirmwareVersionFromFirmwarePackageFilename(filename: string): string;
 /**
  * Older firmware versions for Circulo included a different build to support the Encoder Calibration feature in order to save memory.
  * Newer firmware versions now include the Encoder Calibration feature, so a separate build is no longer necessary.
  *
  * @example
  * "package_SOMANET-Servo-Node-Circulo-7-700_8502-01_motion-drive_v0.4.3-calibration.zip"
+ * "v0.4.3-calibration"
  */
-export declare function isFirmwareVersionCalibration(version: string): boolean;
+export declare function isCalibrationFirmware(version?: string): boolean;
+/**
+ * Some older firmware versions included invalid build metadata.
+ * This function removes any invalid metadata from the provided version.
+ */
+export declare function removeInvalidBuildMetadataFromFirmwareVersion(version: string): string;
+/**
+ * Checks if a firmware version satisfies the given range.
+ * If no options are specified, a custom one will be used.
+ * Older firmware versions sometimes included invalid build metadata, which could cause the function to fail.
+ * To prevent this, the function removes any invalid build metadata before performing the version check.
+ */
+export declare function firmwareVersionSatisfies(version: string, range: string, options?: RangeOptions): boolean;
+/**
+ * Determines if a firmware version falls within a specified range.
+ *
+ * @param version The firmware version to check.
+ * @param range A version range, following the syntax outlined in {@link https://github.com/npm/node-semver#ranges}.
+ * @param calibration If a string, it will be treated as a range. Otherwise, the function returns the boolean value of `calibration`.
+ */
+export declare function isFirmwareVersionInRange(version: string, range?: string | null, calibration?: boolean | string): boolean;
+/**
+ * Checks if the provided firmware version includes the new encoder configuration objects (0x2110 and 0x2112).
+ * Firmware versions starting from v5.0.0-rc.5 and v0.4.0-calibration include these objects.
+ *
+ * Previously, firmware had separate objects for each type of encoder (sensor), resulting in more than 12 record objects,
+ * each with several subitems. This consumed unnecessary memory, prompting a refactor to introduce the new encoder configuration objects.
+ *
+ * The new configuration is referred to as "encoder configuration" (0x2110, 0x2112), while the older is called "sensor configuration".
+ */
+export declare function isEncoderConfigurationFirmware(version?: string): boolean;

package/src/lib/firmware.js

@@ -1,11 +1,12 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.isFirmwareVersionCalibration = exports.extractFirmwareVersionFromFirmwarePackageName = exports.extractFirmwareId = exports.isFirmwarePackageNameCompatibleWithDevice = exports.isStackInfo = exports.parseOldFirmwarePackageName = exports.extractDeviceComponentsFromOldFirmwarePackageName = exports.parseNewFirmwarePackageName = exports.isOldFirmwarePackageName = exports.isNewFirmwarePackageName = exports.parseFirmwareId = exports.oldFirmwarePackageNameRegExp = exports.newFirmwarePackageNameRegExp = exports.firmwareIdRegExp = void 0;
+exports.isEncoderConfigurationFirmware = exports.isFirmwareVersionInRange = exports.firmwareVersionSatisfies = exports.removeInvalidBuildMetadataFromFirmwareVersion = exports.isCalibrationFirmware = exports.extractFirmwareVersionFromFirmwarePackageFilename = exports.extractFirmwareId = exports.isFirmwarePackageFilenameCompatibleWithDevice = exports.isStackInfo = exports.parseOldFirmwarePackageFilename = exports.extractDeviceComponentsFromOldFirmwarePackageFilename = exports.parseNewFirmwarePackageFilename = exports.isOldFirmwarePackageFilename = exports.isNewFirmwarePackageFilename = exports.parseFirmwareId = exports.oldFirmwarePackageFilenameRegExp = exports.newFirmwarePackageFilenameRegExp = exports.firmwareIdRegExp = void 0;
 const hardware_description_1 = require("./hardware-description");
 const integro_variant_1 = require("./integro-variant");
-exports.firmwareIdRegExp = /^\d{4}-\d{2}(-\d{4})?(-\d{1})?$/;
-exports.newFirmwarePackageNameRegExp = /^package_[^_]+_\d{4}-\d{2}(-\d{4})?(-\d{1})?_([^_]+)_v(.*)\.zip$/;
-exports.oldFirmwarePackageNameRegExp = /^package-motion-drive_[^_]+(?:_[^_]+)*_v(.*)\.zip$/;
+const semver_1 = require("semver");
+exports.firmwareIdRegExp = /^\d{4}-\d{2}(-\d{4})?(-\d+)*?$/;
+exports.newFirmwarePackageFilenameRegExp = /^package_(.*).zip$/;
+exports.oldFirmwarePackageFilenameRegExp = /^package-motion-drive_(.*).zip$/;
 /**
  * Parses the FWID string and returns an instance of the {@link FirmwareId} object.
  *
@@ -20,42 +21,42 @@ function parseFirmwareId(fwid) {
 }
 exports.parseFirmwareId = parseFirmwareId;
 /**
- * The format for new firmware package names is detailed in the "Hardware Description File Format" document.
+ * The format for new firmware package filenames is detailed in the "Hardware Description File Format" document.
  */
-function isNewFirmwarePackageName(name) {
-    return exports.newFirmwarePackageNameRegExp.test(name);
+function isNewFirmwarePackageFilename(filename) {
+    return exports.newFirmwarePackageFilenameRegExp.test(filename);
 }
-exports.isNewFirmwarePackageName = isNewFirmwarePackageName;
+exports.isNewFirmwarePackageFilename = isNewFirmwarePackageFilename;
 /**
- * Documentation for older firmware package names, such as "package-motion-drive_ComEtherCAT-b_CoreC2X-a_Drive400-e_v4.2.1.zip", is unavailable.
- * These package names consist of three hardware components (modules): Com, Core, and Drive.
+ * Documentation for older firmware package filenames, such as "package-motion-drive_ComEtherCAT-b_CoreC2X-a_Drive400-e_v4.2.1.zip", is unavailable.
+ * These package filenames consist of three hardware components (modules): Com, Core, and Drive.
  * Firmware packages with these older naming conventions are specifically built for legacy SOMANET Node devices.
  */
-function isOldFirmwarePackageName(name) {
-    return exports.oldFirmwarePackageNameRegExp.test(name);
+function isOldFirmwarePackageFilename(filename) {
+    return exports.oldFirmwarePackageFilenameRegExp.test(filename);
 }
-exports.isOldFirmwarePackageName = isOldFirmwarePackageName;
+exports.isOldFirmwarePackageFilename = isOldFirmwarePackageFilename;
 /**
- * Parses a new firmware package name and returns an instance of {@link NewFirmwarePackageName}.
- * Returns `undefined` if the name does not match the new firmware package name format.
+ * Parses a new firmware package filename and returns an instance of {@link NewFirmwarePackageFilename}.
+ * Returns `undefined` if the filename does not match the new firmware package filename format.
  *
- * @throws {Error} Throws an error if the provided name does not match the expected pattern.
+ * @throws {Error} Throws an error if the provided filename does not match the expected pattern.
  */
-function parseNewFirmwarePackageName(name) {
-    if (!isNewFirmwarePackageName(name)) {
-        throw new Error(`The provided name "${name}" does not match the expected pattern.`);
+function parseNewFirmwarePackageFilename(filename) {
+    if (!isNewFirmwarePackageFilename(filename)) {
+        throw new Error(`The provided filename "${filename}" does not match the expected pattern.`);
     }
-    const nameNoExt = name.replace(/\.[^/.]+$/, "");
-    const [description, hardwareName, firmwareId, firmwareName, firmwareVersion] = nameNoExt.split('_');
+    const filenameNoExt = filename.replace(/\.[^/.]+$/, "");
+    const [description, hardwareName, firmwareId, firmwareName, firmwareVersion] = filenameNoExt.split('_');
     return Object.assign({ description,
         hardwareName,
         firmwareId,
         firmwareName,
         firmwareVersion }, (parseFirmwareId(firmwareId)));
 }
-exports.parseNewFirmwarePackageName = parseNewFirmwarePackageName;
+exports.parseNewFirmwarePackageFilename = parseNewFirmwarePackageFilename;
 /**
- * Given an old firmware package name in the format:
+ * Given an old firmware package filename in the format:
  * "package-motion-drive_ComEtherCAT-b_CoreC2X-a_Drive400-e_v4.2.1.zip",
  * this function extracts the hardware components and returns an array of objects.
  * Each object includes the component name, version, and an empty serial number.
@@ -64,14 +65,14 @@ exports.parseNewFirmwarePackageName = parseNewFirmwarePackageName;
  * which includes only hardware components but lacks a firmware ID. To check if two sets of components match and verify compatibility,
  * use the {@link deviceComponentsMatch} function.
  *
- * @throws {Error} Throws an error if the provided name does not match the expected pattern.
+ * @throws {Error} Throws an error if the provided filename does not match the expected pattern.
  */
-function extractDeviceComponentsFromOldFirmwarePackageName(name) {
-    if (!isOldFirmwarePackageName(name)) {
-        throw new Error(`The provided name "${name}" does not match the expected pattern.`);
+function extractDeviceComponentsFromOldFirmwarePackageFilename(filename) {
+    if (!isOldFirmwarePackageFilename(filename)) {
+        throw new Error(`The provided filename "${filename}" does not match the expected pattern.`);
     }
-    if (name.match(/_Com[^_]+_Core[^_]+_Drive/g)) {
-        return name
+    if (filename.match(/_Com[^_]+_Core[^_]+_Drive/g)) {
+        return filename
             .split('_')
             .slice(1, 4)
             .map((b) => {
@@ -85,27 +86,27 @@ function extractDeviceComponentsFromOldFirmwarePackageName(name) {
     }
     return [];
 }
-exports.extractDeviceComponentsFromOldFirmwarePackageName = extractDeviceComponentsFromOldFirmwarePackageName;
+exports.extractDeviceComponentsFromOldFirmwarePackageFilename = extractDeviceComponentsFromOldFirmwarePackageFilename;
 /**
- * Parses an old firmware package name and returns an instance of {@link OldFirmwarePackageName}.
- * Returns `undefined` if the name does not match the old firmware package name format.
+ * Parses an old firmware package filename and returns an instance of {@link OldFirmwarePackageFilename}.
+ * Returns `undefined` if the filename does not match the old firmware package filename format.
  *
- * @throws {Error} Throws an error if the provided name does not match the expected pattern.
+ * @throws {Error} Throws an error if the provided filename does not match the expected pattern.
  */
-function parseOldFirmwarePackageName(name) {
+function parseOldFirmwarePackageFilename(filename) {
     var _a, _b;
-    if (!isOldFirmwarePackageName(name)) {
-        throw new Error(`The provided name "${name}" does not match the expected pattern.`);
+    if (!isOldFirmwarePackageFilename(filename)) {
+        throw new Error(`The provided filename "${filename}" does not match the expected pattern.`);
     }
-    const parts = name.split('_');
-    const components = extractDeviceComponentsFromOldFirmwarePackageName(name);
+    const parts = filename.split('_');
+    const components = extractDeviceComponentsFromOldFirmwarePackageFilename(filename);
     return {
         description: parts[0],
         components,
         firmwareVersion: (_b = (_a = parts === null || parts === void 0 ? void 0 : parts.at(-1)) === null || _a === void 0 ? void 0 : _a.replace('.zip', '')) !== null && _b !== void 0 ? _b : '',
     };
 }
-exports.parseOldFirmwarePackageName = parseOldFirmwarePackageName;
+exports.parseOldFirmwarePackageFilename = parseOldFirmwarePackageFilename;
 /**
  * Type guard to determine if the provided value is a Stack Info object.
  */
@@ -114,42 +115,42 @@ function isStackInfo(value) {
 }
 exports.isStackInfo = isStackInfo;
 /**
- * Checks if a firmware package name is compatible with a device based on the provided FWID, Stack Info, or Hardware Description.
+ * Checks if a firmware package filename is compatible with a device based on the provided FWID, Stack Info, or Hardware Description.
  * This function is useful for determining whether a firmware package can be installed on a device.
  *
- * - If you provide Stack Info, use the old firmware package name.
- * - If you provide FWID or Hardware Description, use the new firmware package name.
+ * - If you provide Stack Info, use the old firmware package filename.
+ * - If you provide FWID or Hardware Description, use the new firmware package filename.
  *
- * @param name The firmware package name (either old or new).
+ * @param filename The firmware package filename (either old or new).
  * @param id The identifier, which can be FWID, Stack Info, or Hardware Description.
  * @param integroVariant The parsed Integro Variant file or its raw buffer.
- * @returns `true` if the firmware package name is compatible with the device; otherwise, `false`.
- * @throws {Error} Throws an error if an invalid combination is provided, such as FWID with an old firmware package name.
+ * @returns `true` if the firmware package filename is compatible with the device; otherwise, `false`.
+ * @throws {Error} Throws an error if an invalid combination is provided, such as FWID with an old firmware package filename.
  */
-function isFirmwarePackageNameCompatibleWithDevice(name, id, integroVariant) {
-    if (isOldFirmwarePackageName(name) && !isStackInfo(id)) {
-        throw new Error('The old firmware package name must be checked against the Stack Info to verify compatibility.');
+function isFirmwarePackageFilenameCompatibleWithDevice(filename, id, integroVariant) {
+    if (isOldFirmwarePackageFilename(filename) && !isStackInfo(id)) {
+        throw new Error('The old firmware package filename must be checked against the Stack Info to verify compatibility.');
     }
-    if (isNewFirmwarePackageName(name) && isStackInfo(id)) {
-        throw new Error('The new firmware package name must be checked against the FWID or Hardware Description to verify compatibility.');
+    if (isNewFirmwarePackageFilename(filename) && isStackInfo(id)) {
+        throw new Error('The new firmware package filename must be checked against the FWID or Hardware Description to verify compatibility.');
     }
     if (typeof id === 'string') {
-        return id === extractFirmwareId(name);
+        return id === extractFirmwareId(filename);
     }
     else if (isStackInfo(id)) {
-        const firmwarePackageNameDeviceComponents = extractDeviceComponentsFromOldFirmwarePackageName(name);
+        const firmwarePackageFilenameDeviceComponents = extractDeviceComponentsFromOldFirmwarePackageFilename(filename);
         const stackInfoDeviceComponents = (0, hardware_description_1.extractDeviceComponentsFromStackInfo)(id);
-        return (0, hardware_description_1.deviceComponentsMatch)(firmwarePackageNameDeviceComponents, stackInfoDeviceComponents);
+        return (0, hardware_description_1.deviceComponentsMatch)(firmwarePackageFilenameDeviceComponents, stackInfoDeviceComponents);
     }
     else {
-        const firmwarePackageNameFirmwareId = extractFirmwareId(name);
+        const firmwarePackageFilenameFirmwareId = extractFirmwareId(filename);
         const hardwareDescriptionFirmwareId = extractFirmwareId(id, integroVariant);
-        return firmwarePackageNameFirmwareId === hardwareDescriptionFirmwareId;
+        return firmwarePackageFilenameFirmwareId === hardwareDescriptionFirmwareId;
     }
 }
-exports.isFirmwarePackageNameCompatibleWithDevice = isFirmwarePackageNameCompatibleWithDevice;
+exports.isFirmwarePackageFilenameCompatibleWithDevice = isFirmwarePackageFilenameCompatibleWithDevice;
 /**
- * Extracts the Firmware ID (FWID) from either the new firmware package name or the provided Hardware Description.
+ * Extracts the Firmware ID (FWID) from either the new firmware package filename or the provided Hardware Description.
  * The optional Integro Variant is used if the Firmware ID includes the Fieldbus Protocol.
  *
  * Note: If additional options from the Integro Variant are incorporated into the FWID in the future, this code will need to be updated accordingly.
@@ -159,19 +160,19 @@ exports.isFirmwarePackageNameCompatibleWithDevice = isFirmwarePackageNameCompati
  * - If an assembly is present, the ID and version are taken from the assembly, while the key ID is still taken from the device.
  * - In all cases, the key ID is sourced from the device.
  *
- * @param sub The new firmware package name or hardware description.
+ * @param sub The new firmware package filename or hardware description.
  * @param integroVariant The parsed Integro Variant file or its raw buffer.
- * @throws {Error} If the provided name does not match the expected pattern.
+ * @throws {Error} If the provided filename does not match the expected pattern.
  * @returns The Firmware ID (FWID), e.g., "9501-01-4622-1".
  */
 function extractFirmwareId(sub, integroVariant) {
     if (typeof sub === 'string') {
-        if (isNewFirmwarePackageName(sub)) {
-            const obj = parseNewFirmwarePackageName(sub);
+        if (isNewFirmwarePackageFilename(sub)) {
+            const obj = parseNewFirmwarePackageFilename(sub);
             return obj === null || obj === void 0 ? void 0 : obj.firmwareId;
         }
         else {
-            throw new Error(`The provided name "${sub}" does not match the expected pattern.`);
+            throw new Error(`The provided filename "${sub}" does not match the expected pattern.`);
         }
     }
     else {
@@ -193,37 +194,98 @@ function extractFirmwareId(sub, integroVariant) {
 }
 exports.extractFirmwareId = extractFirmwareId;
 /**
- * Extracts the firmware version from the given firmware package name, whether it's in the old or new format.
+ * Extracts the firmware version from the given firmware package filename, whether it's in the old or new format.
  *
  * @example
  * "v4.1.0"
  *
- * @throws {Error} Throws an error if the provided name does not match the expected pattern.
+ * @throws {Error} Throws an error if the provided filename does not match the expected pattern.
  */
-function extractFirmwareVersionFromFirmwarePackageName(name) {
-    if (isNewFirmwarePackageName(name)) {
-        const parsed = parseNewFirmwarePackageName(name);
+function extractFirmwareVersionFromFirmwarePackageFilename(filename) {
+    if (isNewFirmwarePackageFilename(filename)) {
+        const parsed = parseNewFirmwarePackageFilename(filename);
         return parsed.firmwareVersion;
     }
-    else if (isOldFirmwarePackageName(name)) {
-        const parsed = parseOldFirmwarePackageName(name);
+    else if (isOldFirmwarePackageFilename(filename)) {
+        const parsed = parseOldFirmwarePackageFilename(filename);
         return parsed.firmwareVersion;
     }
     else {
-        throw new Error(`The provided name "${name}" does not match the expected pattern.`);
+        throw new Error(`The provided filename "${filename}" does not match the expected pattern.`);
     }
 }
-exports.extractFirmwareVersionFromFirmwarePackageName = extractFirmwareVersionFromFirmwarePackageName;
+exports.extractFirmwareVersionFromFirmwarePackageFilename = extractFirmwareVersionFromFirmwarePackageFilename;
 /**
  * Older firmware versions for Circulo included a different build to support the Encoder Calibration feature in order to save memory.
  * Newer firmware versions now include the Encoder Calibration feature, so a separate build is no longer necessary.
  *
  * @example
  * "package_SOMANET-Servo-Node-Circulo-7-700_8502-01_motion-drive_v0.4.3-calibration.zip"
+ * "v0.4.3-calibration"
  */
-function isFirmwareVersionCalibration(version) {
+function isCalibrationFirmware(version) {
     var _a;
-    return (_a = version.includes('calibration')) !== null && _a !== void 0 ? _a : false;
+    return (_a = version === null || version === void 0 ? void 0 : version.includes('calibration')) !== null && _a !== void 0 ? _a : false;
 }
-exports.isFirmwareVersionCalibration = isFirmwareVersionCalibration;
+exports.isCalibrationFirmware = isCalibrationFirmware;
+/**
+ * Some older firmware versions included invalid build metadata.
+ * This function removes any invalid metadata from the provided version.
+ */
+function removeInvalidBuildMetadataFromFirmwareVersion(version) {
+    return version.replace(/-\d+-[A-Za-z0-9]+$/, '');
+}
+exports.removeInvalidBuildMetadataFromFirmwareVersion = removeInvalidBuildMetadataFromFirmwareVersion;
+/**
+ * Checks if a firmware version satisfies the given range.
+ * If no options are specified, a custom one will be used.
+ * Older firmware versions sometimes included invalid build metadata, which could cause the function to fail.
+ * To prevent this, the function removes any invalid build metadata before performing the version check.
+ */
+function firmwareVersionSatisfies(version, range, options = { includePrerelease: true, loose: true }) {
+    version = removeInvalidBuildMetadataFromFirmwareVersion(version);
+    return (0, semver_1.satisfies)(version, range, options);
+}
+exports.firmwareVersionSatisfies = firmwareVersionSatisfies;
+/**
+ * Determines if a firmware version falls within a specified range.
+ *
+ * @param version The firmware version to check.
+ * @param range A version range, following the syntax outlined in {@link https://github.com/npm/node-semver#ranges}.
+ * @param calibration If a string, it will be treated as a range. Otherwise, the function returns the boolean value of `calibration`.
+ */
+function isFirmwareVersionInRange(version, range, calibration) {
+    let result = false;
+    if (isCalibrationFirmware(version)) {
+        result = typeof calibration === 'string'
+            ? firmwareVersionSatisfies(version, calibration)
+            : calibration !== null && calibration !== void 0 ? calibration : false;
+    }
+    else if (range) {
+        result = firmwareVersionSatisfies(version, range);
+    }
+    return result;
+}
+exports.isFirmwareVersionInRange = isFirmwareVersionInRange;
+/**
+ * Checks if the provided firmware version includes the new encoder configuration objects (0x2110 and 0x2112).
+ * Firmware versions starting from v5.0.0-rc.5 and v0.4.0-calibration include these objects.
+ *
+ * Previously, firmware had separate objects for each type of encoder (sensor), resulting in more than 12 record objects,
+ * each with several subitems. This consumed unnecessary memory, prompting a refactor to introduce the new encoder configuration objects.
+ *
+ * The new configuration is referred to as "encoder configuration" (0x2110, 0x2112), while the older is called "sensor configuration".
+ */
+function isEncoderConfigurationFirmware(version) {
+    if (!version) {
+        return false;
+    }
+    if (isCalibrationFirmware(version)) {
+        return firmwareVersionSatisfies(version, '>=v0.4.0-calibration');
+    }
+    else {
+        return firmwareVersionSatisfies(version, '>=v5.0.0-rc.5');
+    }
+}
+exports.isEncoderConfigurationFirmware = isEncoderConfigurationFirmware;
 //# sourceMappingURL=firmware.js.map

package/src/lib/firmware.js.map

@@ -1 +1 @@
-{"version":3,"file":"firmware.js","sourceRoot":"","sources":["../../../../../libs/motion-master-client/src/lib/firmware.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"firmware.js","sourceRoot":"","sources":["../../../../../libs/motion-master-client/src/lib/firmware.ts"],"names":[],"mappings":"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"}