motion-master-client 0.0.421 → 0.0.423

package/src/lib/motion-master-req-res-client.js

@@ -310,47 +310,61 @@ class MotionMasterReqResClient {
      *
      * If the requested file content is empty, Motion Master will return a not found error. This is subject to change now that Motion Master reads the file error codes.
      *
-     * SOMANET_CiA_402.xml and SOMANET_CiA_402.xml.zip files are stored in IndexedDB for faster access.
+     * The ESI file ("SOMANET_CiA_402.xml" or "SOMANET_CiA_402.xml.zip") is never read from the device, see {@link getEsiFromIndexedDB}.
      */
     getDeviceFile(props, requestTimeout, messageId) {
         return this.resolveDeviceAddress(props).pipe((0, operators_1.mergeMap)((deviceAddress) => {
-            if ((props.name === 'SOMANET_CiA_402.xml' || props.name === 'SOMANET_CiA_402.xml.zip') &&
-                // @ts-ignore
-                typeof window !== 'undefined' &&
-                // @ts-ignore
-                window.indexedDB) {
-                return this.getParameterValue(deviceAddress, 0x100a, 0x00).pipe((0, operators_1.mergeMap)((firmwareVersion) => {
-                    return (0, rxjs_1.from)(this.mmcidb.open()).pipe((0, operators_1.mergeMap)(() => this.mmcidb.getEsi(firmwareVersion)), (0, operators_1.mergeMap)((data) => {
-                        if (data) {
-                            const status = {
-                                request: 'succeeded',
-                                name: props.name,
-                                deviceAddress,
-                                content: data,
-                                success: {
-                                    code: types_1.MotionMasterMessage.Status.DeviceFile.Success.Code.UNSPECIFIED,
-                                    message: 'ESI file successfully retrieved from IndexedDB.',
-                                },
-                                messageId,
-                            };
-                            return (0, rxjs_1.of)(status);
-                        }
-                        else {
-                            return this.getDeviceFileUsingResolvedDeviceAddress(deviceAddress, props, requestTimeout, messageId).pipe((0, rxjs_1.tap)((status) => {
-                                if (status.content) {
-                                    this.mmcidb.putEsi(firmwareVersion, new Uint8Array(status.content));
-                                }
-                            }));
-                        }
-                    }));
-                }), (0, operators_1.catchError)((err) => {
-                    console.error('Failed to retrieve and cache ESI file from IndexedDB:', err);
-                    return this.getDeviceFileUsingResolvedDeviceAddress(deviceAddress, props, requestTimeout, messageId);
-                }));
+            if (props.name === firmware_esi_1.esiFilename || props.name === firmware_esi_1.esiZipFilename) {
+                return this.getEsiFromIndexedDB(deviceAddress, props.name, messageId);
             }
-            else {
-                return this.getDeviceFileUsingResolvedDeviceAddress(deviceAddress, props, requestTimeout, messageId);
+            return this.getDeviceFileUsingResolvedDeviceAddress(deviceAddress, props, requestTimeout, messageId);
+        }));
+    }
+    /**
+     * Returns the ESI file cached in IndexedDB under the firmware version the device reports in 0x100A:00.
+     *
+     * The ESI file is never read from the device. Firmware installation no longer writes it to the device (see
+     * {@link installFirmwareAndCacheEsi}), and Motion Master does not remove a skipped file, so the file on the device may
+     * belong to an older firmware. Neither the file nor its ESI revision tells which firmware it belongs to.
+     * Caching it under the installed version would hide the correct ESI file for good.
+     *
+     * The ESI file gets into IndexedDB only from a firmware package: at firmware installation, see
+     * {@link cacheEsiFromFirmwarePackage}, or when a user loads it from a package in OBLAC Drives.
+     *
+     * Returns a failed status with the NOT_FOUND error code when the ESI file is not cached for the installed firmware,
+     * or when there is no IndexedDB, as outside the browser. Returns a failed status with the FAILED error code when the
+     * firmware version or IndexedDB can't be read.
+     */
+    getEsiFromIndexedDB(deviceAddress, name, messageId) {
+        const failed = (code, message) => ({
+            request: 'failed',
+            name,
+            deviceAddress,
+            error: { code, message },
+            messageId,
+        });
+        if (!globalThis.indexedDB) {
+            return (0, rxjs_1.of)(failed(types_1.MotionMasterMessage.Status.DeviceFile.Error.Code.NOT_FOUND, 'The ESI file is not read from the device, and there is no IndexedDB to read it from.'));
+        }
+        return this.getParameterValue(deviceAddress, 0x100a, 0x00).pipe((0, operators_1.mergeMap)((firmwareVersion) => (0, rxjs_1.from)(this.mmcidb.open().then(() => this.mmcidb.getEsi(firmwareVersion))).pipe((0, operators_1.map)((data) => {
+            if (data) {
+                return {
+                    request: 'succeeded',
+                    name,
+                    deviceAddress,
+                    content: data,
+                    success: {
+                        code: types_1.MotionMasterMessage.Status.DeviceFile.Success.Code.UNSPECIFIED,
+                        message: 'ESI file successfully retrieved from IndexedDB.',
+                    },
+                    messageId,
+                };
             }
+            return failed(types_1.MotionMasterMessage.Status.DeviceFile.Error.Code.NOT_FOUND, `The ESI file for firmware ${firmwareVersion} is not cached. The ESI file is not read from the device.`);
+        }))), (0, operators_1.catchError)((err) => {
+            console.error('Failed to retrieve the ESI file from IndexedDB:', err);
+            const reason = err instanceof Error ? err.message : String(err);
+            return (0, rxjs_1.of)(failed(types_1.MotionMasterMessage.Status.DeviceFile.Error.Code.FAILED, `Failed to retrieve the ESI file from IndexedDB: ${reason}`));
         }));
     }
     getDeviceFileUsingResolvedDeviceAddress(deviceAddress, props, requestTimeout, messageId) {
@@ -507,8 +521,7 @@ class MotionMasterReqResClient {
      * Extracts the ESI file (SOMANET_CiA_402.xml) from a firmware package and stores its unzipped content in
      * IndexedDB, keyed by the given firmware version.
      *
-     * This is the install-time counterpart to the read-time caching in {@link getDeviceFile}: once the ESI is
-     * cached here, OBLAC can resolve it from IndexedDB without reading it back from the drive. This is what
+     * IndexedDB is the only source of the ESI file: {@link getDeviceFile} never reads it from the drive. This is what
      * allows the ESI file (SOMANET_CiA_402.xml.zip) to be skipped during firmware installation, which avoids
      * slow and unreliable FoE transfers and works around devices (e.g. NetX) that reject writing that file.
      *
@@ -542,17 +555,18 @@ class MotionMasterReqResClient {
      *   user-overridable: when `props.skipFiles` is provided it is passed through unchanged, so a caller can choose to
      *   still write the ESI by omitting it from that list.
      * - Extracts the ESI from the package and stores it in IndexedDB keyed by firmware version (see
-     *   {@link cacheEsiFromFirmwarePackage}) *before* the installation starts, so it can be resolved locally by
-     *   {@link getDeviceFile}. It must be cached up front because, with the ESI skipped on the drive, Motion Master
-     *   will try to read it back right after installation. This caching happens regardless of whether the ESI is
-     *   also written to the drive. A caching failure is logged but does not prevent installation.
+     *   {@link cacheEsiFromFirmwarePackage}) *before* the installation starts, so {@link getDeviceFile} can return it
+     *   as soon as the installation ends. IndexedDB is the only source of the ESI file: {@link getDeviceFile} never
+     *   reads it from the drive, even when the ESI is also written there. A caching failure is logged but does not
+     *   prevent installation; the ESI file is then not found until a user loads it from the package (Load ESI in
+     *   OBLAC Drives).
      *
      * @param firmwareVersion - The firmware version to key the cached ESI by; this must match the value reported by
      *                          the device parameter 0x100a:00 after installation, which {@link getDeviceFile} uses.
      *                          For OBLAC firmware packages this is the version encoded in the package filename, see
      *                          {@link extractFirmwareVersionFromFirmwarePackageFilename}. When it cannot be determined
      *                          (e.g. an arbitrary package with an unrecognized filename), pass an empty value to skip
-     *                          caching; the read path then falls back to the online source.
+     *                          caching; the ESI file is then not found unless it was cached before.
      */
     installFirmwareAndCacheEsi(firmwareVersion, props, requestTimeout, messageId) {
         var _a;
@@ -3367,7 +3381,7 @@ class MotionMasterReqResClient {
         // @ts-ignore
         return this.runOsCommandAndWriteFsBuffer(deviceRef, command, content, commandTimeout, responsePollingInterval).pipe((0, operators_1.last)(), (0, operators_1.map)((response) => {
             if (response.request !== 'succeeded') {
-                throw new Error('Login to SMM for parameter download failed.');
+                throw new Error(`Login to SMM for parameter download failed: ${(0, os_command_1.describeOsCommandFailure)(response)}.`);
             }
         }));
     }
@@ -3395,7 +3409,7 @@ class MotionMasterReqResClient {
         // @ts-ignore
         return this.runOsCommandAndWriteFsBuffer(deviceRef, command, content, commandTimeout, responsePollingInterval).pipe((0, operators_1.last)(), (0, operators_1.map)((response) => {
             if (response.request !== 'succeeded') {
-                throw new Error('Login to SMM for software update failed.');
+                throw new Error(`Login to SMM for software update failed: ${(0, os_command_1.describeOsCommandFailure)(response)}.`);
             }
         }));
     }
@@ -3415,7 +3429,7 @@ class MotionMasterReqResClient {
         const command = (0, os_command_1.createSmmAcyclicHandlerOsCommand)(os_command_1.SmmAcyclicHandlerSubcommandId.LOGOUT);
         return this.runOsCommand(deviceRef, command, commandTimeout, responsePollingInterval).pipe((0, operators_1.last)(), (0, operators_1.map)((response) => {
             if (response.request !== 'succeeded') {
-                throw new Error('Logout from SMM failed.');
+                throw new Error(`Logout from SMM failed: ${(0, os_command_1.describeOsCommandFailure)(response)}.`);
             }
         }));
     }
@@ -3440,25 +3454,84 @@ class MotionMasterReqResClient {
     /**
      * Changes the SMM password for the specified device.
      *
+     * The sequence is: write `<newPassword><oldPassword>` to the fs-buffer and run CHANGE_PASSWORD. If, and only if, the
+     * SMM accepts the change, log out from the SMM, trigger an SMM restart (unless `triggerRestart` is false) and then
+     * wait `rebootDelay` milliseconds before completing, so the next SMM command a caller issues does not land in the
+     * reboot.
+     *
+     * The logout has to come before the restart. When the SMM is restarted while the session is still open, it stores
+     * neither the new nor the old password, although it accepted the change, and only the master password gets in again.
+     * After an accepted change the session is therefore closed; log in again with the new password to continue.
+     *
      * @param deviceRef - A reference to the target device.
      * @param oldPassword - The current SMM password.
-     * @param newPassword - The new password to set for the SMM.
-     * @param commandTimeout - The timeout in milliseconds for the command to complete.
+     * @param newPassword - The new password to set for the SMM, 4 to 24 printable ASCII characters.
+     * @param commandTimeout - The timeout in milliseconds for the CHANGE_PASSWORD command. On firmware below 5.2.0 it also
+     *   covers the FoE write of the fs-buffer, because the buffer is written before the command is issued. If it runs out
+     *   while the SMM is still storing the password, the client gives up, the SMM is not restarted, and the result of the
+     *   change is unknown. Defaults to 12000: the drive gives up on the SMM after 10 s, so do not set it lower, and do not
+     *   retry after a timeout, the SMM may still be running the change.
      * @param responsePollingInterval - The interval in milliseconds between polling for the response.
-     *
-     * @throws {Error} If the password change attempt fails.
+     * @param triggerRestart - Whether to restart the SMM after an accepted change and the logout. Defaults to true. The
+     *   firmware requires a restart after a password change, so pass false only if you restart the SMM yourself (with
+     *   {@link triggerSmmRestart}) before issuing any other SMM command. The logout happens either way, so your restart
+     *   comes after it.
+     * @param rebootDelay - How long to wait after the restart command completes, in milliseconds, before the observable
+     *   completes. Defaults to 3000, the `SMM_REBOOT_DELAY` the firmware test reference uses. Ignored when
+     *   `triggerRestart` is false.
+     *
+     * @throws {Error} If a password is not 1 (old) or 4 (new) to 24 printable ASCII characters, if the SMM rejects the
+     *   change (the SMM is then not restarted and the session stays open), if the logout after an accepted change fails
+     *   (the SMM is then not restarted), or if the restart fails.
      *
      * @remarks
-     * A prior successful login is required before changing the password.
-     * The new password must be at least 4 characters long.
+     * Completion means the SMM accepted the change. It does not prove that the SMM stored the intended password; only a
+     * login with the new password does.
      *
-     * This function sends an acyclic command to update the password. If successful, it triggers an SMM restart.
+     * Rules a caller has to follow, because the SMM and the drive do not enforce them for you:
+     *
+     * - A login for parameter download must be open. A login fails while a session is already open, so log out first:
+     *   use {@link reloginToSmmForParameterDownload}. The SMM closes a session after 5 minutes.
+     * - The OS command object (0x1023) and the fs-buffer are a single slot per device. Nothing else may issue OS commands
+     *   to the same device during the sequence: no second script, no Motion Master Console on the OS Commands page, no
+     *   other tool. Issue SMM functions one at a time and wait for each to complete.
+     * - When the SMM rejects the change, the response does not say why: a wrong old password, a missing or expired
+     *   session and an SMM that is still booting all produce the same "the SMM rejected the request (status 2)".
      */
-    changeSmmPassword(deviceRef, oldPassword, newPassword, commandTimeout = 10000, responsePollingInterval = 500) {
-        const command = (0, os_command_1.createSmmAcyclicHandlerOsCommand)(os_command_1.SmmAcyclicHandlerSubcommandId.CHANGE_PASSWORD);
-        const content = (0, smm_1.packSmmChangePassword)(newPassword, oldPassword);
-        // @ts-ignore
-        return this.runOsCommandAndWriteFsBuffer(deviceRef, command, content, commandTimeout, responsePollingInterval).pipe((0, operators_1.last)(), (0, operators_1.mergeMap)(() => this.triggerSmmRestart(deviceRef)));
+    changeSmmPassword(deviceRef, oldPassword, newPassword, commandTimeout = 12000, responsePollingInterval = 500, triggerRestart = true, rebootDelay = 3000) {
+        return (0, rxjs_1.defer)(() => {
+            (0, smm_1.assertValidSmmPassword)(oldPassword, 'Old password');
+            (0, smm_1.assertValidSmmPassword)(newPassword, 'New password', smm_1.SMM_PASSWORD_MIN_LENGTH);
+            const command = (0, os_command_1.createSmmAcyclicHandlerOsCommand)(os_command_1.SmmAcyclicHandlerSubcommandId.CHANGE_PASSWORD);
+            const content = (0, smm_1.packSmmChangePassword)(newPassword, oldPassword);
+            // @ts-ignore
+            return this.runOsCommandAndWriteFsBuffer(deviceRef, command, content, commandTimeout, responsePollingInterval);
+        }).pipe((0, operators_1.last)(), (0, operators_1.concatMap)((response) => {
+            if (response.request !== 'succeeded') {
+                throw new Error(`Changing SMM password failed: ${(0, os_command_1.describeOsCommandFailure)(response)}. The password was not changed and the SMM was not restarted.`);
+            }
+            // Log out before the restart. A restart while the session is still open makes the SMM store neither the new
+            // nor the old password, although it accepted the change (reproduced on firmware v5.6.6, issue #185).
+            const logout$ = this.logoutFromSmm(deviceRef).pipe((0, operators_1.catchError)((err) => (0, rxjs_1.throwError)(() => {
+                var _a;
+                return new Error(`The SMM accepted the password change, but the logout failed, so the SMM was not restarted. Log out and restart the SMM before using the new password. ${(_a = err === null || err === void 0 ? void 0 : err.message) !== null && _a !== void 0 ? _a : err}`);
+            })), (0, operators_1.last)(null, undefined));
+            if (!triggerRestart) {
+                return logout$;
+            }
+            return logout$.pipe((0, operators_1.concatMap)(() => this.triggerSmmRestart(deviceRef).pipe((0, operators_1.catchError)((err) => (0, rxjs_1.throwError)(() => { var _a; return new Error(`The SMM accepted the password change, but the restart failed. ${(_a = err === null || err === void 0 ? void 0 : err.message) !== null && _a !== void 0 ? _a : err}`); })), (0, operators_1.last)(null, undefined))), (0, operators_1.concatMap)(() => (0, rxjs_1.timer)(rebootDelay)));
+        }), (0, operators_1.last)(null, undefined), (0, operators_1.map)(() => undefined));
+    }
+    /**
+     * Runs an SMM sequence and then logs out from the SMM, on completion and on error alike.
+     *
+     * Unlike a `finalize(() => logout.subscribe())`, the logout is part of the returned observable: the result is
+     * delivered only after the logout has finished, so a caller's next SMM command cannot run alongside it on the
+     * device's single OS command slot. A failing logout does not replace the sequence's own result or error.
+     */
+    logoutFromSmmAfter(deviceRef, sequence$) {
+        const logout$ = (0, rxjs_1.defer)(() => this.logoutFromSmm(deviceRef)).pipe((0, operators_1.catchError)(() => rxjs_1.EMPTY), (0, operators_1.filter)(() => false));
+        return (0, rxjs_1.concat)(sequence$.pipe((0, operators_1.catchError)((err) => (0, rxjs_1.concat)(logout$, (0, rxjs_1.throwError)(() => err)))), logout$);
     }
     /**
      * Triggers an SMM restart for the specified device.
@@ -3479,7 +3552,7 @@ class MotionMasterReqResClient {
         const command = (0, os_command_1.createSmmAcyclicHandlerOsCommand)(os_command_1.SmmAcyclicHandlerSubcommandId.TRIGGER_RESTART);
         return this.runOsCommand(deviceRef, command, commandTimeout, responsePollingInterval).pipe((0, operators_1.last)(), (0, operators_1.map)((response) => {
             if (response.request !== 'succeeded') {
-                throw new Error('Triggering SMM restart failed.');
+                throw new Error(`Triggering SMM restart failed: ${(0, os_command_1.describeOsCommandFailure)(response)}.`);
             }
         }));
     }
@@ -3499,7 +3572,7 @@ class MotionMasterReqResClient {
         const command = (0, os_command_1.createSmmAcyclicHandlerOsCommand)(os_command_1.SmmAcyclicHandlerSubcommandId.IO_FAILURE_ACKNOWLEDGE);
         return this.runOsCommand(deviceRef, command, commandTimeout, responsePollingInterval).pipe((0, operators_1.last)(), (0, operators_1.map)((response) => {
             if (response.request !== 'succeeded') {
-                throw new Error('Acknowledging I/O failure on SMM failed.');
+                throw new Error(`Acknowledging I/O failure on SMM failed: ${(0, os_command_1.describeOsCommandFailure)(response)}.`);
             }
         }));
     }
@@ -3516,7 +3589,7 @@ class MotionMasterReqResClient {
         const command = (0, os_command_1.createSmmAcyclicHandlerConfigureSoftwareUpdateOsCommand)(fileSize);
         return this.runOsCommand(deviceRef, command, 10000, 100).pipe((0, operators_1.last)(), (0, operators_1.map)((response) => {
             if (response.request !== 'succeeded') {
-                throw new Error('Configuring SMM software update failed.');
+                throw new Error(`Configuring SMM software update failed: ${(0, os_command_1.describeOsCommandFailure)(response)}.`);
             }
         }));
     }
@@ -3551,45 +3624,94 @@ class MotionMasterReqResClient {
      * The commands execute only when subscribed to, ensuring a strict sequence.
      */
     updateSmmSoftware(deviceRef, username, password, buffer, crc, chunkSize = 1000, commandTimeout = 30000, responsePollingInterval = 1000, fsBufferReadWriteTimeout = 120000) {
+        return this.updateSmmSoftwareWithProgress(deviceRef, username, password, buffer, crc, chunkSize, commandTimeout, responsePollingInterval, fsBufferReadWriteTimeout).pipe((0, operators_1.last)(), (0, operators_1.map)(() => undefined));
+    }
+    /**
+     * Performs a complete SMM software update like {@link updateSmmSoftware}, reporting progress as it goes.
+     *
+     * A {@link SmmSoftwareUpdateProgress} value is emitted when each stage starts, once per transmitted chunk,
+     * and a final `done` value after the SMM restart has been triggered. Use it to show the user what the
+     * update is doing; transmitting a large software file can take many minutes.
+     *
+     * Parameters are the same as for {@link updateSmmSoftware}.
+     *
+     * @throws {Error} If `buffer` is empty or `chunkSize` is not a positive integer. Nothing is sent to the device then.
+     * @throws {Error} If any step in the software update process fails.
+     */
+    updateSmmSoftwareWithProgress(deviceRef, username, password, buffer, crc, chunkSize = 1000, commandTimeout = 30000, responsePollingInterval = 1000, fsBufferReadWriteTimeout = 120000) {
         const fileSize = buffer.byteLength;
-        // Build the sequence of observables that perform each step of the update process.
+        // A NaN chunk size (e.g. from a disabled form control) would otherwise skip every chunk
+        // and finalize an update with no software transmitted.
+        if (!Number.isInteger(chunkSize) || chunkSize <= 0) {
+            return (0, rxjs_1.throwError)(() => new Error(`Invalid SMM software update chunk size: ${chunkSize}. It must be a positive integer.`));
+        }
+        if (fileSize === 0) {
+            return (0, rxjs_1.throwError)(() => new Error('The SMM software file is empty.'));
+        }
+        const chunks = Math.ceil(fileSize / chunkSize); // Total number of chunks to send.
+        // Reports the stage, then runs its work. Deferred, so each step starts only after the previous one completes.
+        const step = (stage, work, chunk = 0) => (0, rxjs_1.concat)((0, rxjs_1.of)({ stage, chunk, chunks }), (0, rxjs_1.defer)(work).pipe((0, operators_1.ignoreElements)()));
         const observables = [
             // Step 1: Ensure any existing session is logged out before starting the update.
-            (0, rxjs_1.defer)(() => this.logoutFromSmm(deviceRef)),
+            step('logout', () => this.logoutFromSmm(deviceRef)),
             // Step 2: Log in to the device specifically for software update permissions.
-            (0, rxjs_1.defer)(() => this.loginToSmmForSoftwareUpdate(deviceRef, username, password)),
+            step('login', () => this.loginToSmmForSoftwareUpdate(deviceRef, username, password)),
             // Step 3: Inform the device about the incoming file size for proper setup.
-            (0, rxjs_1.defer)(() => this.configureSmmSoftwareUpdate(deviceRef, fileSize)),
+            step('configure', () => this.configureSmmSoftwareUpdate(deviceRef, fileSize)),
         ];
-        const n = Math.ceil(fileSize / chunkSize); // Total number of chunks to send.
         // Step 4: Transmit the update file chunk-by-chunk.
         const transmitSoftwareCommand = (0, os_command_1.createSmmAcyclicHandlerOsCommand)(os_command_1.SmmAcyclicHandlerSubcommandId.TRANSMIT_SOFTWARE);
-        for (let i = 0; i < n; i++) {
+        for (let i = 0; i < chunks; i++) {
             const start = i * chunkSize;
-            const end = start + chunkSize;
-            const fsBufferContent = buffer.slice(start, end);
-            observables.push((0, rxjs_1.defer)(() => this.runOsCommandAndWriteFsBuffer(deviceRef, transmitSoftwareCommand, fsBufferContent, commandTimeout, responsePollingInterval, false, fsBufferReadWriteTimeout).pipe((0, operators_1.last)(), // Only consider the final response of the command.
+            const fsBufferContent = buffer.slice(start, start + chunkSize);
+            observables.push(step('transmit', () => this.runOsCommandAndWriteFsBuffer(deviceRef, transmitSoftwareCommand, fsBufferContent, commandTimeout, responsePollingInterval, false, fsBufferReadWriteTimeout).pipe((0, operators_1.last)(), // Only consider the final response of the command.
             (0, operators_1.map)((response) => {
                 if (response.request !== 'succeeded') {
-                    throw new Error(`Transmitting SMM software chunk ${i + 1}/${n} failed.`);
+                    throw new Error(`Transmitting SMM software chunk ${i + 1}/${chunks} failed: ${(0, os_command_1.describeOsCommandFailure)(response)}.`);
                 }
-            }) // Interpret the response success.
-            )));
+            })), i + 1));
         }
-        // Step 5: Pack the CRC value and prepare the finalize command.
+        // Step 5: Send the CRC to validate data integrity and finalize the update.
         const packedCrc = (0, smm_1.packSmmSoftwareUpdateCrc)(crc);
         const finalizeSoftwareUpdateCommand = (0, os_command_1.createSmmAcyclicHandlerOsCommand)(os_command_1.SmmAcyclicHandlerSubcommandId.FINALIZE_SOFTWARE_UPDATE);
-        // Step 6: Send the CRC to validate data integrity.
-        observables.push((0, rxjs_1.defer)(() => 
+        observables.push(step('finalize', () => 
         // @ts-ignore
         this.runOsCommandAndWriteFsBuffer(deviceRef, finalizeSoftwareUpdateCommand, packedCrc).pipe((0, operators_1.last)(), (0, operators_1.map)((response) => {
             if (response.request !== 'succeeded') {
-                throw new Error('Finalizing SMM software update failed.');
+                throw new Error(`Finalizing SMM software update failed: ${(0, os_command_1.describeOsCommandFailure)(response)}. Check that the CRC matches the software file.`);
             }
-        }))), 
-        // Step 7: Trigger a restart so the new software takes effect.
-        (0, rxjs_1.defer)(() => this.triggerSmmRestart(deviceRef)));
-        return (0, rxjs_1.concat)(...observables).pipe((0, operators_1.last)());
+        })), chunks), 
+        // Step 6: Trigger a restart so the new software takes effect.
+        step('restart', () => this.triggerSmmRestart(deviceRef), chunks), (0, rxjs_1.of)({ stage: 'done', chunk: chunks, chunks }));
+        return (0, rxjs_1.concat)(...observables);
+    }
+    /**
+     * Waits until the SMM reports the expected software version.
+     *
+     * After an SMM software update the SMM restarts and boots the new software, which can take around 30 s.
+     * Reads may fail or return the previous version during that time, so the version is polled until it
+     * matches or the timeout expires.
+     *
+     * @param deviceRef - Reference to the target device.
+     * @param expectedVersion - The expected SMM software version, bitwise encoded (e.g. 25344 for v99.0).
+     * @param timeout - (Optional) How long to wait, in ms. Defaults to 90,000 ms.
+     * @param pollingInterval - (Optional) Delay between reads, in ms. Defaults to 2000 ms.
+     *
+     * @throws {Error} If the SMM does not report the expected version within `timeout`.
+     */
+    waitForSmmFirmwareVersion(deviceRef, expectedVersion, timeout = 90000, pollingInterval = 2000) {
+        let lastVersion;
+        let lastError;
+        const read$ = (0, rxjs_1.defer)(() => this.readSmmFirmwareVersionAsNumber(deviceRef)).pipe((0, rxjs_1.tap)((version) => (lastVersion = version)), (0, operators_1.catchError)((err) => {
+            lastError = err;
+            return rxjs_1.EMPTY;
+        }));
+        return read$.pipe((0, operators_1.repeat)({ delay: () => (lastVersion === expectedVersion ? rxjs_1.EMPTY : (0, rxjs_1.timer)(pollingInterval)) }), (0, operators_1.filter)((version) => version === expectedVersion), (0, operators_1.take)(1), (0, operators_1.map)(() => undefined), (0, operators_1.takeUntil)((0, rxjs_1.timer)(timeout).pipe((0, operators_1.mergeMap)(() => {
+            const reported = lastVersion !== undefined
+                ? `it reports v${(0, smm_1.bitwiseDecodeNumberVersion)(lastVersion)}`
+                : `reading the version failed: ${lastError instanceof Error ? lastError.message : String(lastError)}`;
+            return (0, rxjs_1.throwError)(() => new Error(`SMM did not report software v${(0, smm_1.bitwiseDecodeNumberVersion)(expectedVersion)} within ${timeout / 1000} s after the update; ${reported}.`));
+        }))));
     }
     /**
      * Resolves whether an automated SMM software update is allowed for the specified device.
@@ -3601,7 +3723,8 @@ class MotionMasterReqResClient {
      *
      * The automation is only permitted when **all** of the following conditions are met:
      * - The device is a recognized Somanet product (`isValidProduct`).
-     * - The device belongs to the Circulo product family (`isCirculo`).
+     * - The device belongs to the Circulo product family (`isCirculo`). ACTILINK-JD / JD Duo devices are judged
+     *   by the underlying Circulo from their hardware description, see {@link resolveEncoderProductId}.
      * - The binary is encrypted (`isBinaryEncrypted`).
      * - The binary targets one of the supported SMM versions — v1.4 (260) or v2.56 (568) (`isAllowedBinaryVersion`).
      * - If targeting v2.56, the device SoC firmware version is ≥ 5.5.0 (`canInstallV256`).
@@ -3616,7 +3739,7 @@ class MotionMasterReqResClient {
      *
      * @returns A promise that resolves to an {@link SmmAutomatedUpdate} object containing:
      * - `isValidProduct` — Whether the device maps to a known Somanet product.
-     * - `isCirculo` — Whether the device belongs to the Circulo product family.
+     * - `isCirculo` — Whether the device is a Circulo or a Circulo-based ACTILINK-JD / JD Duo.
      * - `isCirculo7` — Whether the device is a Circulo 7.
      * - `isCirculo9` — Whether the device is a Circulo 9.
      * - `isDeviceLw1` — Whether the device SMM firmware is below v1.3 (version < 259).
@@ -3630,10 +3753,11 @@ class MotionMasterReqResClient {
      * - `binaryVersion` — The target SMM version encoded in the binary header.
      */
     resolveSmmAutomatedUpdateConditions(deviceRef, buffer) {
-        var _a, _b;
+        var _a, _b, _c;
         return tslib_1.__awaiter(this, void 0, void 0, function* () {
             const device = yield (0, rxjs_1.lastValueFrom)(this.resolveDevice(deviceRef));
-            const product = (0, product_1.findSomanetProductById)(device === null || device === void 0 ? void 0 : device.serialNumber);
+            // ACTILINK-JD / JD Duo wrap a Circulo; judge the product by the underlying Circulo device.
+            const product = (0, product_1.findSomanetProductById)((0, product_1.resolveEncoderProductId)((_a = device === null || device === void 0 ? void 0 : device.hardwareDescription) !== null && _a !== void 0 ? _a : device === null || device === void 0 ? void 0 : device.serialNumber));
             const isValidProduct = !!product;
             // v1.4 (no safe torque), v2.56 (safe torque)
             const allowedTargetSmmVersions = [260, 568];
@@ -3663,7 +3787,7 @@ class MotionMasterReqResClient {
             const binaryHeader = (0, smm_1.parseSmmBinaryHeaders)(buffer);
             const binaryInformation = (0, smm_1.getInformationFromSmmFirmwareVersion)(binaryHeader.swVersion);
             // Allow installation of smm v2.56 only if device SoC firmware version is >=5.5.0
-            const canInstallV256 = binaryHeader.swVersion === 568 ? semver.gte((_a = semver.coerce(deviceFirmwareVersion)) !== null && _a !== void 0 ? _a : '0.0.0', '5.5.0') : true;
+            const canInstallV256 = binaryHeader.swVersion === 568 ? semver.gte((_b = semver.coerce(deviceFirmwareVersion)) !== null && _b !== void 0 ? _b : '0.0.0', '5.5.0') : true;
             const isCirculo = product.family === 'Circulo';
             const isDeviceLw1 = deviceSmmVersion < 259; // <v1.3
             const isV990 = deviceSmmVersion === 25344;
@@ -3673,7 +3797,7 @@ class MotionMasterReqResClient {
             const isAllowedBinaryVersion = allowedTargetSmmVersions.includes(binaryInformation.version);
             const isCirculo7 = isCirculo && product.group === 'Circulo 7';
             const isCirculo9 = isCirculo && product.group === 'Circulo 9';
-            const deviceSupportsStreaming = semver.gte((_b = semver.coerce(deviceFirmwareVersion)) !== null && _b !== void 0 ? _b : '0.0.0', '5.2.0');
+            const deviceSupportsStreaming = semver.gte((_c = semver.coerce(deviceFirmwareVersion)) !== null && _c !== void 0 ? _c : '0.0.0', '5.2.0');
             const isAutomationAllowed = isCirculo &&
                 isBinaryEncrypted &&
                 isAllowedBinaryVersion &&
@@ -3701,7 +3825,8 @@ class MotionMasterReqResClient {
         });
     }
     /**
-     * Performs an automated, multi-step SMM software update to an encrypted firmware version on a Circulo device.
+     * Performs an automated, multi-step SMM software update to an encrypted firmware version on a Circulo device,
+     * or a Circulo-based ACTILINK-JD / JD Duo (judged by the underlying Circulo).
      *
      * Before installing the target binary, this method evaluates the device state by calling
      * {@link resolveSmmAutomatedUpdateConditions}. Based on the result, it determines which
@@ -3715,20 +3840,29 @@ class MotionMasterReqResClient {
      * - **v99.0 + Circulo 9**: v77.1 → target
      * - **v77.0 or v77.1**: target only
      *
-     * If the device does not support streaming, `commandTimeout` is automatically extended to 420,000 ms.
+     * After each installation the SMM restarts. The next step starts only once the SMM reports the
+     * version that was just installed (see {@link waitForSmmFirmwareVersion}), so a failed or
+     * unfinished installation stops the sequence with an error instead of continuing blindly.
+     *
+     * Transfer settings that are not given are resolved from the device firmware with
+     * {@link resolveSmmSoftwareUpdateTimings}. On firmware without fs-buffer streaming (< v5.2.0),
+     * `chunkSize` is always 1000 and `commandTimeout` is at least 420,000 ms.
      *
      * @param deviceRef - Reference to the target device.
      * @param username - Username used for SMM authentication.
      * @param password - Password used for SMM authentication.
      * @param buffer - The target encrypted firmware binary as a `Uint8Array`.
      * @param crc - CRC32 checksum of the target firmware binary for integrity verification.
-     * @param chunkSize - (Optional) Size of each data chunk transmitted per step, in bytes. Defaults to 1000.
-     * @param commandTimeout - (Optional) Timeout for each OS command in ms. Automatically overridden to 420,000 ms
-     *                         if the device does not support streaming. Defaults to 30,000 ms.
+     * @param chunkSize - (Optional) Size of each data chunk transmitted per step, in bytes.
+     *                    Defaults to 1,000,000 with streaming (one command per file) and 1000 without.
+     * @param commandTimeout - (Optional) Timeout for each OS command in ms.
+     *                         Defaults to 180,000 ms with streaming and 420,000 ms without.
      * @param responsePollingInterval - (Optional) Polling interval for command responses in ms. Defaults to 1000 ms.
-     * @param fsBufferReadWriteTimeout - (Optional) Timeout for fs-buffer read/write operations in ms. Defaults to 120,000 ms.
+     * @param fsBufferReadWriteTimeout - (Optional) Timeout for fs-buffer read/write operations in ms.
+     *                                   Defaults to 150,000 ms with streaming and 5000 ms without.
      *
-     * @returns An `Observable<void>` that completes when the full installation sequence finishes successfully.
+     * @returns An `Observable` of {@link SmmAutomatedUpdateProgress} that reports each step and stage,
+     *          and completes when the full installation sequence finishes successfully.
      *
      * @throws {Error} With message `'Unknown product. Cannot perform SMM software update.'` if the device
      *                 serial number does not map to a known Somanet product.
@@ -3736,104 +3870,88 @@ class MotionMasterReqResClient {
      *                 e.g. the device is not a Circulo, the binary is not encrypted, the target version is
      *                 unsupported, the SoC firmware is below v5.5.0 (for SMM v2.56), or the device is
      *                 already on SMM v1.3+.
-     * @throws {Error} If any individual firmware installation step fails during execution.
+     * @throws {Error} If any installation step fails, or the SMM does not report the installed version afterwards.
      */
-    updateSmmSoftwareToEncrypted(deviceRef, username, password, buffer, crc, chunkSize = 1000, commandTimeout = 30000, responsePollingInterval = 1000, fsBufferReadWriteTimeout = 120000) {
-        return new rxjs_1.Observable((subscriber) => {
-            (() => tslib_1.__awaiter(this, void 0, void 0, function* () {
-                /**
-                 * We must wrap the whole anonymous function body in try/catch so the subscriber (in `catch`)
-                 * knows when the error happens. Otherwise, the application will "explode" when the error occurs.
-                 *
-                 * Observable function is synchronous. When the error occurs, it will handle it via `error: (err) => {}`
-                 * function. Here, that is not the case. The anonymous function is asynchronous and will update the
-                 * subscriber only when we tell it to do so via `subscriber.<method>`. Error handling from the outside
-                 * will not pick-up the errors from here as this is "fire-and-forget" type of function.
-                 *
-                 * @example
-                 *
-                 * ```typescript
-                 * asyncHandler(async (req, res, next) => {
-                 *  somePromiseThatRejects().then(...)   // ← no await, no .catch()
-                 *  // or a setTimeout, event emitter, etc.
-                 *
-                 *  // handler finishes immediately
-                  })
-                 */
-                try {
-                    const automatedInstall = yield this.resolveSmmAutomatedUpdateConditions(deviceRef, buffer);
-                    if (!automatedInstall.isValidProduct) {
-                        subscriber.error(new Error('Unknown product. Cannot perform SMM software update.'));
-                        return;
-                    }
-                    let observables = [];
-                    if (automatedInstall.isAutomationAllowed) {
-                        const v990crc = 0xd1a3bb72;
-                        const v990Buffer = yield Promise.resolve().then(() => tslib_1.__importStar(require('./smm/40701_DEBUG_Update_V99.0'))).then((m) => Uint8Array.from(atob(m.smmBinaryV990), (c, _) => { var _a; return (_a = c.codePointAt(0)) !== null && _a !== void 0 ? _a : 0; }));
-                        const v770crc = 0xe290a20a;
-                        const v770Buffer = yield Promise.resolve().then(() => tslib_1.__importStar(require('./smm/40701_DEBUG_Update_V77.0'))).then((m) => Uint8Array.from(atob(m.smmBinaryV770), (c, _) => { var _a; return (_a = c.codePointAt(0)) !== null && _a !== void 0 ? _a : 0; }));
-                        const v771crc = 0xa4a11125;
-                        const v771Buffer = yield Promise.resolve().then(() => tslib_1.__importStar(require('./smm/40701_DEBUG_Update_V77.1'))).then((m) => Uint8Array.from(atob(m.smmBinaryV771), (c, _) => { var _a; return (_a = c.codePointAt(0)) !== null && _a !== void 0 ? _a : 0; }));
-                        const v990$ = (0, rxjs_1.defer)(() => this.updateSmmSoftware(deviceRef, username, password, new Uint8Array(v990Buffer), v990crc, chunkSize, commandTimeout, responsePollingInterval, fsBufferReadWriteTimeout));
-                        const v770$ = (0, rxjs_1.defer)(() => this.updateSmmSoftware(deviceRef, username, password, new Uint8Array(v770Buffer), v770crc, chunkSize, commandTimeout, responsePollingInterval, fsBufferReadWriteTimeout));
-                        const v771$ = (0, rxjs_1.defer)(() => this.updateSmmSoftware(deviceRef, username, password, new Uint8Array(v771Buffer), v771crc, chunkSize, commandTimeout, responsePollingInterval, fsBufferReadWriteTimeout));
-                        const userVersion$ = (0, rxjs_1.defer)(() => this.updateSmmSoftware(deviceRef, username, password, buffer, crc, chunkSize, commandTimeout, responsePollingInterval, fsBufferReadWriteTimeout));
-                        if (automatedInstall.isDeviceLw1) {
-                            if (automatedInstall.isCirculo7) {
-                                observables = [v990$, v770$, userVersion$];
-                            }
-                            else if (automatedInstall.isCirculo9) {
-                                observables = [v990$, v771$, userVersion$];
-                            }
-                        }
-                        else if (automatedInstall.isV990) {
-                            if (automatedInstall.isCirculo7) {
-                                observables = [v770$, userVersion$];
-                            }
-                            else if (automatedInstall.isCirculo9) {
-                                observables = [v771$, userVersion$];
-                            }
-                        }
-                        else if (automatedInstall.isV770 || automatedInstall.isV771) {
-                            observables = [userVersion$];
-                        }
-                        (0, rxjs_1.concat)(...observables).subscribe({
-                            next: () => {
-                                subscriber.next();
-                            },
-                            error: (err) => {
-                                subscriber.error(err);
-                            },
-                            complete: () => {
-                                subscriber.complete();
-                            },
-                        });
-                    }
-                    else {
-                        const reasons = [];
-                        if (!automatedInstall.isCirculo) {
-                            reasons.push('The device is not part of the Circulo family.');
-                        }
-                        if (!automatedInstall.isDeviceLw1) {
-                            reasons.push('The device SMM software version is not lower than 1.3.');
-                        }
-                        if (!automatedInstall.isBinaryEncrypted) {
-                            reasons.push('The SMM binary is not encrypted.');
-                        }
-                        if (!automatedInstall.isAllowedBinaryVersion) {
-                            reasons.push('The target SMM software version is not supported for encrypted update.');
-                        }
-                        if (!automatedInstall.canInstallV256) {
-                            reasons.push('The device firmware must be minimum v5.5.0 for installing SMM v2.56.');
-                        }
-                        subscriber.error(new Error(`The following conditions are not met for SMM software automated update: ${reasons.join(' ')}`));
-                    }
+    updateSmmSoftwareToEncrypted(deviceRef, username, password, buffer, crc, chunkSize, commandTimeout, responsePollingInterval = 1000, fsBufferReadWriteTimeout) {
+        return (0, rxjs_1.defer)(() => (0, rxjs_1.from)(this.resolveSmmAutomatedUpdateConditions(deviceRef, buffer))).pipe((0, operators_1.mergeMap)((conditions) => {
+            if (!conditions.isValidProduct) {
+                throw new Error('Unknown product. Cannot perform SMM software update.');
+            }
+            if (!conditions.isAutomationAllowed) {
+                const reasons = [];
+                if (!conditions.isCirculo) {
+                    reasons.push('The device is not a Circulo or a Circulo-based ACTILINK-JD.');
                 }
-                catch (err) {
-                    subscriber.error(err);
+                if (!conditions.isDeviceLw1 && !conditions.isV990 && !conditions.isV770 && !conditions.isV771) {
+                    reasons.push('The device SMM software version is not lower than 1.3.');
                 }
-            }))();
-        });
+                if (!conditions.isBinaryEncrypted) {
+                    reasons.push('The SMM binary is not encrypted.');
+                }
+                if (!conditions.isAllowedBinaryVersion) {
+                    reasons.push('The target SMM software version is not supported for encrypted update.');
+                }
+                if (!conditions.canInstallV256) {
+                    reasons.push('The device firmware must be minimum v5.5.0 for installing SMM v2.56.');
+                }
+                throw new Error(`The following conditions are not met for SMM software automated update: ${reasons.join(' ')}`);
+            }
+            const timings = (0, smm_1.resolveSmmSoftwareUpdateTimings)(conditions.deviceSupportsStreaming);
+            const transfer = conditions.deviceSupportsStreaming
+                ? {
+                    chunkSize: chunkSize !== null && chunkSize !== void 0 ? chunkSize : timings.chunkSize,
+                    commandTimeout: commandTimeout !== null && commandTimeout !== void 0 ? commandTimeout : timings.commandTimeout,
+                    fsBufferReadWriteTimeout: fsBufferReadWriteTimeout !== null && fsBufferReadWriteTimeout !== void 0 ? fsBufferReadWriteTimeout : timings.fsBufferReadWriteTimeout,
+                }
+                : {
+                    // Without streaming the fs-buffer is written before each command, which only works with 1000-byte chunks.
+                    chunkSize: timings.chunkSize,
+                    commandTimeout: Math.max(commandTimeout !== null && commandTimeout !== void 0 ? commandTimeout : 0, timings.commandTimeout),
+                    fsBufferReadWriteTimeout: fsBufferReadWriteTimeout !== null && fsBufferReadWriteTimeout !== void 0 ? fsBufferReadWriteTimeout : timings.fsBufferReadWriteTimeout,
+                };
+            const decode = (base64) => Uint8Array.from(atob(base64), (c) => { var _a; return (_a = c.codePointAt(0)) !== null && _a !== void 0 ? _a : 0; });
+            const v990 = {
+                version: 25344,
+                load: () => Promise.resolve().then(() => tslib_1.__importStar(require('./smm/40701_DEBUG_Update_V99.0'))).then((m) => ({
+                    buffer: decode(m.smmBinaryV990),
+                    crc: 0xd1a3bb72,
+                })),
+            };
+            const v770 = {
+                version: 19712,
+                load: () => Promise.resolve().then(() => tslib_1.__importStar(require('./smm/40701_DEBUG_Update_V77.0'))).then((m) => ({
+                    buffer: decode(m.smmBinaryV770),
+                    crc: 0xe290a20a,
+                })),
+            };
+            const v771 = {
+                version: 19713,
+                load: () => Promise.resolve().then(() => tslib_1.__importStar(require('./smm/40701_DEBUG_Update_V77.1'))).then((m) => ({
+                    buffer: decode(m.smmBinaryV771),
+                    crc: 0xa4a11125,
+                })),
+            };
+            const target = { version: conditions.binaryVersion, load: () => Promise.resolve({ buffer, crc }) };
+            const intermediate = conditions.isCirculo7 ? v770 : conditions.isCirculo9 ? v771 : undefined;
+            let plan = [];
+            if (conditions.isV770 || conditions.isV771) {
+                plan = [target];
+            }
+            else if (intermediate && conditions.isV990) {
+                plan = [intermediate, target];
+            }
+            else if (intermediate && conditions.isDeviceLw1) {
+                plan = [v990, intermediate, target];
+            }
+            if (plan.length === 0) {
+                throw new Error('Cannot determine the SMM update path: the device is neither a Circulo 7 nor a Circulo 9.');
+            }
+            const steps = plan.length;
+            return (0, rxjs_1.concat)(...plan.map(({ version, load }, i) => {
+                const progress = { step: i + 1, steps, version };
+                return (0, rxjs_1.concat)((0, rxjs_1.defer)(() => (0, rxjs_1.from)(load())).pipe((0, operators_1.mergeMap)((software) => this.updateSmmSoftwareWithProgress(deviceRef, username, password, software.buffer, software.crc, transfer.chunkSize, transfer.commandTimeout, responsePollingInterval, transfer.fsBufferReadWriteTimeout)), (0, operators_1.map)((install) => (Object.assign(Object.assign({}, progress), { stage: 'install', install })))), (0, rxjs_1.of)(Object.assign(Object.assign({}, progress), { stage: 'verify' })), (0, rxjs_1.defer)(() => this.waitForSmmFirmwareVersion(deviceRef, version)).pipe((0, operators_1.ignoreElements)()), (0, rxjs_1.of)(Object.assign(Object.assign({}, progress), { stage: 'installed' })));
+            }));
+        }));
     }
     /**
      * Transmits SMM parameters to the specified device.
@@ -3862,7 +3980,7 @@ class MotionMasterReqResClient {
             // @ts-ignore
             content, commandTimeout, responsePollingInterval).pipe((0, operators_1.last)(), (0, operators_1.map)((response) => {
                 if (response.request !== 'succeeded') {
-                    throw new Error('Transmitting SMM parameters failed.');
+                    throw new Error(`Transmitting SMM parameters failed: ${(0, os_command_1.describeOsCommandFailure)(response)}.`);
                 }
             }));
         }));
@@ -3925,7 +4043,7 @@ class MotionMasterReqResClient {
             const command = (0, os_command_1.createSmmAcyclicHandlerOsCommand)(os_command_1.SmmAcyclicHandlerSubcommandId.VERIFY_PARAMETERS);
             return this.runOsCommandAndWriteFsBuffer(deviceRef, command, content, commandTimeout, responsePollingInterval).pipe((0, operators_1.last)(), (0, operators_1.map)((response) => {
                 if (response.request !== 'succeeded') {
-                    throw new Error('Verifying SMM parameters failed.');
+                    throw new Error(`Verifying SMM parameters failed: ${(0, os_command_1.describeOsCommandFailure)(response)}.`);
                 }
             }));
         }));
@@ -3990,7 +4108,7 @@ class MotionMasterReqResClient {
         const command = (0, os_command_1.createSmmAcyclicHandlerOsCommand)(os_command_1.SmmAcyclicHandlerSubcommandId.VALIDATE_CONFIGURATION);
         return this.runOsCommandAndWriteFsBuffer(deviceRef, command, content, commandTimeout, responsePollingInterval).pipe((0, operators_1.last)(), (0, operators_1.map)((response) => {
             if (response.request !== 'succeeded') {
-                throw new Error('Validating SMM configuration failed.');
+                throw new Error(`Validating SMM configuration failed: ${(0, os_command_1.describeOsCommandFailure)(response)}.`);
             }
         }));
     }
@@ -4454,7 +4572,7 @@ class MotionMasterReqResClient {
         // Fail lambda to handle errors in a consistent way.
         const fail = (message) => (0, rxjs_1.throwError)(() => new Error(message));
         // Resolve the SMM parameter structure version for getting the correct SMM OD.
-        return this.resolveSmmParameterStructureVersion(deviceRef).pipe((0, operators_1.concatMap)((parameterStructureVersion) => {
+        const sequence$ = this.resolveSmmParameterStructureVersion(deviceRef).pipe((0, operators_1.concatMap)((parameterStructureVersion) => {
             const smmOd = (0, smm_1.resolveSmmOd)(parameterStructureVersion);
             // Group SMM safety parameters by their 'group' property,
             // then for each group, map the SMM OD parameters to the matching
@@ -4509,9 +4627,9 @@ class MotionMasterReqResClient {
                     }));
                 }));
             }));
-        }), (0, operators_1.finalize)(() => {
-            this.logoutFromSmm(deviceRef).subscribe();
         }));
+        // Log out at the end, on success and on failure, before the result is delivered.
+        return this.logoutFromSmmAfter(deviceRef, sequence$);
     }
     /**
      * Executes a forward call by sending the provided data, then parses the JSON response.