Use sendCommand in NoOperationCC

src/lib/commandclass/NoOperationCC.ts

@@ -1,4 +1,3 @@
-import { SendDataRequest } from "../controller/SendDataMessages";
 import { MessagePriority } from "../message/Constants";
 import type { Message } from "../message/Message";
 import { CCAPI } from "./API";
@@ -17,27 +16,25 @@ import { isCommandClassContainer } from "./ICommandClassContainer";
 @API(CommandClasses["No Operation"])
 export class NoOperationCCAPI extends CCAPI {
 	public async send(): Promise<void> {
-		const request = new SendDataRequest(this.driver, {
-			command: new NoOperationCC(this.driver, {
+		await this.driver.sendCommand(
+			new NoOperationCC(this.driver, {
 				nodeId: this.endpoint.nodeId,
 				endpoint: this.endpoint.index,
 			}),
-		});
-		// Don't retry sending ping packets
-		request.maxSendAttempts = 1;
-		// set the priority manually, as SendData can be Application level too
-		await this.driver.sendMessage<SendDataRequest>(request, {
-			priority: MessagePriority.NodeQuery,
-		});
+			{
+				// Don't retry sending ping packets
+				maxSendAttempts: 1,
+				// set the priority manually, as SendData can be Application level too
+				priority: MessagePriority.NodeQuery,
+			},
+		);
 	}
 }
 
 @commandClass(CommandClasses["No Operation"])
 @implementedVersion(1)
 export class NoOperationCC extends CommandClass {
 	declare ccCommand: undefined;
-	// Force singlecast
-	declare nodeId: number;
 }
 
 /** Tests if a given message is a ping */

src/lib/driver/Driver.ts

@@ -183,6 +183,11 @@ export interface SendMessageOptions {
 	supportCheck?: boolean;
 }
 
+export interface SendCommandOptions extends SendMessageOptions {
+	/** How many times the driver should try to send the message. Defaults to `MAX_SEND_ATTEMPTS` */
+	maxSendAttempts?: number;
+}
+
 export type SupervisionUpdateHandler = (
 	status: SupervisionStatus,
 	remainingDuration?: Duration,
@@ -1629,7 +1634,7 @@ ${handlers.length} left`,
 	// wotan-disable-next-line no-misused-generics
 	public async sendCommand<TResponse extends CommandClass = CommandClass>(
 		command: CommandClass,
-		options: SendMessageOptions = {},
+		options: SendCommandOptions = {},
 	): Promise<TResponse | undefined> {
 		let msg: Message;
 		if (command.isSinglecast()) {
@@ -1642,6 +1647,9 @@ ${handlers.length} left`,
 				ZWaveErrorCodes.Argument_Invalid,
 			);
 		}
+		// Specify the number of send attempts for the request
+		msg.maxSendAttempts = options.maxSendAttempts;
+
 		const resp = await this.sendMessage(msg, options);
 		if (isCommandClassContainer(resp)) {
 			return resp.command as TResponse;