refactor: use parseAndExtractFirmware in controller and node handlers

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>

Author: raman325

src/lib/controller/message_handler.ts

@@ -4,7 +4,6 @@ import {
   InclusionOptions,
   InclusionStrategy,
   ReplaceNodeOptions,
-  extractFirmware,
   ExclusionStrategy,
   ExclusionOptions,
   AssociationCheckResult,
@@ -33,7 +32,7 @@ import { ControllerResultTypes } from "./outgoing_message.js";
 import {
   firmwareUpdateOutgoingMessage,
   getFirmwareUpdateOptions,
-  parseFirmwareFile,
+  parseAndExtractFirmware,
 } from "../common.js";
 import { inclusionUserCallbacks } from "../inclusion_user_callbacks.js";
 import { MessageHandler } from "../message_handler.js";
@@ -390,12 +389,11 @@ export class ControllerMessageHandler implements MessageHandler {
       }
       case ControllerCommand.firmwareUpdateOTW: {
         const file = Buffer.from(message.file, "base64");
-        const parsed = parseFirmwareFile(
+        const { data } = await parseAndExtractFirmware(
           message.filename,
           file,
           message.fileFormat,
         );
-        const { data } = await extractFirmware(parsed.rawData, parsed.format);
         const result = await this.driver.firmwareUpdateOTW(data);
         return firmwareUpdateOutgoingMessage(result, this.client.schemaVersion);
       }

src/lib/node/message_handler.ts

@@ -6,7 +6,6 @@ import {
 import {
   CommandClasses,
   ConfigurationMetadata,
-  extractFirmware,
   Firmware,
 } from "@zwave-js/core";
 import { NodeNotFoundError, UnknownCommandError } from "../error.js";
@@ -18,7 +17,7 @@ import { NodeResultTypes } from "./outgoing_message.js";
 import {
   firmwareUpdateOutgoingMessage,
   getRawConfigParameterValue,
-  parseFirmwareFile,
+  parseAndExtractFirmware,
   setRawConfigParameterValue,
   setValueOutgoingMessage,
 } from "../common.js";
@@ -74,12 +73,11 @@ export class NodeMessageHandler implements MessageHandler {
       }
       case NodeCommand.beginFirmwareUpdate: {
         const firmwareFile = Buffer.from(message.firmwareFile, "base64");
-        const parsed = parseFirmwareFile(
+        const firmware = await parseAndExtractFirmware(
           message.firmwareFilename,
           firmwareFile,
           message.firmwareFileFormat,
         );
-        const firmware = await extractFirmware(parsed.rawData, parsed.format);
         // Defer to the target provided in the message when available
         firmware.firmwareTarget = message.target ?? firmware.firmwareTarget;
         const result = await node.updateFirmware([firmware]);
@@ -89,12 +87,11 @@ export class NodeMessageHandler implements MessageHandler {
         const updates: Firmware[] = [];
         for (const update of message.updates) {
           const file = Buffer.from(update.file, "base64");
-          const parsed = parseFirmwareFile(
+          const firmware = await parseAndExtractFirmware(
             update.filename,
             file,
             update.fileFormat,
           );
-          const firmware = await extractFirmware(parsed.rawData, parsed.format);
           // Defer to the target provided in the message when available
           firmware.firmwareTarget =
             update.firmwareTarget ?? firmware.firmwareTarget;