Add adoption online check, DTO validation, remove dead schema, fix lastSeen null

1. Add isCoordinatorOnline check to adoptDevice: adoption now fails
   early with a validation error if the coordinator is offline,
   preventing creation of Smart Panel devices from stale cached
   registry entries that are not currently reachable.

2. Add @isdefined to ReqZhAdoptDeviceDto and ReqZhPermitJoinDto:
   sending {} or omitting the data field now returns a structured
   validation error instead of a 500 TypeError from dereferencing
   undefined body.data.

3. Remove unused ZigbeeHerdsmanDeviceAddSimpleFormSchema and its
   inferred type IZigbeeHerdsmanDeviceAddSimpleForm — neither was
   used outside their own definition files.

4. Fix devices with lastSeen=null staying online forever: the
   connectivity checker was skipping these devices entirely, leaving
   them reported as online indefinitely (registered with
   available=true but never entering timeout evaluation). Now treats
   lastSeen=null as offline.

Config schema camelCase issue confirmed invalid (4th time) —
snakeToCamel transform in transformConfigPluginResponse handles it.

https://claude.ai/code/session_014bjB9Cn1WKASNLBeCuSbom

Author: claude

apps/admin/src/plugins/devices-zigbee-herdsman/schemas/devices.schemas.ts

@@ -1,23 +1,5 @@
-import { z } from 'zod';
-
 import { DeviceAddFormSchema, DeviceEditFormSchema } from '../../../modules/devices';
-import { DevicesModuleDeviceCategory } from '../../../openapi.constants';
 
 export const ZigbeeHerdsmanDeviceAddFormSchema = DeviceAddFormSchema;
 
 export const ZigbeeHerdsmanDeviceEditFormSchema = DeviceEditFormSchema;
-
-export const ZigbeeHerdsmanDeviceAddSimpleFormSchema = z.object({
-	id: z.string().uuid(),
-	type: z.string(),
-	ieeeAddress: z.string().min(1),
-	name: z.string().min(1),
-	category: z.nativeEnum(DevicesModuleDeviceCategory),
-	description: z
-		.string()
-		.trim()
-		.transform((val) => (val === '' ? null : val))
-		.nullable()
-		.optional(),
-	enabled: z.boolean().default(true),
-});

apps/admin/src/plugins/devices-zigbee-herdsman/schemas/devices.types.ts

@@ -1,11 +1,6 @@
 import type { z } from 'zod';
 
-import type {
-	ZigbeeHerdsmanDeviceAddFormSchema,
-	ZigbeeHerdsmanDeviceAddSimpleFormSchema,
-	ZigbeeHerdsmanDeviceEditFormSchema,
-} from './devices.schemas';
+import type { ZigbeeHerdsmanDeviceAddFormSchema, ZigbeeHerdsmanDeviceEditFormSchema } from './devices.schemas';
 
 export type IZigbeeHerdsmanDeviceAddForm = z.infer<typeof ZigbeeHerdsmanDeviceAddFormSchema>;
 export type IZigbeeHerdsmanDeviceEditForm = z.infer<typeof ZigbeeHerdsmanDeviceEditFormSchema>;
-export type IZigbeeHerdsmanDeviceAddSimpleForm = z.infer<typeof ZigbeeHerdsmanDeviceAddSimpleFormSchema>;

apps/backend/src/plugins/devices-zigbee-herdsman/dto/mapping-preview.dto.ts

@@ -1,5 +1,16 @@
 import { Expose, Type } from 'class-transformer';
-import { IsArray, IsBoolean, IsEnum, IsInt, IsOptional, IsString, Max, Min, ValidateNested } from 'class-validator';
+import {
+	IsArray,
+	IsBoolean,
+	IsDefined,
+	IsEnum,
+	IsInt,
+	IsOptional,
+	IsString,
+	Max,
+	Min,
+	ValidateNested,
+} from 'class-validator';
 
 import { ApiProperty, ApiPropertyOptional, ApiSchema } from '@nestjs/swagger';
 
@@ -226,6 +237,7 @@ export class ReqZhMappingPreviewDto {
 export class ReqZhAdoptDeviceDto {
 	@ApiProperty({ description: 'Device adoption request data', type: () => ZhAdoptDeviceRequestDto })
 	@Expose()
+	@IsDefined({ message: '[{"field":"data","reason":"Request body must contain a data property."}]' })
 	@ValidateNested()
 	@Type(() => ZhAdoptDeviceRequestDto)
 	data: ZhAdoptDeviceRequestDto;
@@ -235,6 +247,7 @@ export class ReqZhAdoptDeviceDto {
 export class ReqZhPermitJoinDto {
 	@ApiProperty({ description: 'Permit join request data', type: () => ZhPermitJoinRequestDto })
 	@Expose()
+	@IsDefined({ message: '[{"field":"data","reason":"Request body must contain a data property."}]' })
 	@ValidateNested()
 	@Type(() => ZhPermitJoinRequestDto)
 	data: ZhPermitJoinRequestDto;

apps/backend/src/plugins/devices-zigbee-herdsman/services/device-adoption.service.ts

@@ -58,6 +58,11 @@ export class ZhDeviceAdoptionService {
 	async adoptDevice(request: ZhAdoptDeviceRequestDto): Promise<ZigbeeHerdsmanDeviceEntity> {
 		this.logger.debug(`Adopting device ieeeAddress=${request.ieeeAddress}`);
 
+		// Verify coordinator is online — don't adopt from stale cached data
+		if (!this.zigbeeHerdsmanService.isCoordinatorOnline()) {
+			throw new DevicesZigbeeHerdsmanValidationException('Cannot adopt device: Zigbee coordinator is offline');
+		}
+
 		// Verify device exists on network
 		const discovered = this.zigbeeHerdsmanService.getDiscoveredDevice(request.ieeeAddress);
 		if (!discovered) {

apps/backend/src/plugins/devices-zigbee-herdsman/services/device-connectivity.service.ts

@@ -72,19 +72,23 @@ export class ZhDeviceConnectivityService implements OnModuleDestroy {
 			const updates: { ieeeAddress: string; online: boolean }[] = [];
 
 			for (const discovered of discoveredDevices) {
+				let isOnline: boolean;
+
 				if (!discovered.lastSeen) {
-					continue;
+					// Device was registered with available=true but has never sent a message.
+					// Treat as offline — it should report in before we consider it reachable.
+					isOnline = false;
+				} else {
+					const isBattery = discovered.powerSource?.toLowerCase().includes('battery');
+					const timeout = isBattery ? batteryTimeout : mainsTimeout;
+					const elapsed = (now - discovered.lastSeen.getTime()) / 1000;
+					isOnline = elapsed < timeout;
 				}
 
-				const isBattery = discovered.powerSource?.toLowerCase().includes('battery');
-				const timeout = isBattery ? batteryTimeout : mainsTimeout;
-				const elapsed = (now - discovered.lastSeen.getTime()) / 1000;
-				const isOnline = elapsed < timeout;
-
 				const lastWritten = this.lastDbState.get(discovered.ieeeAddress);
 				if (lastWritten !== isOnline) {
 					if (!isOnline) {
-						this.logger.debug(`Device ${discovered.ieeeAddress} went offline (last seen ${Math.round(elapsed)}s ago)`);
+						this.logger.debug(`Device ${discovered.ieeeAddress} went offline`);
 					} else {
 						this.logger.debug(`Device ${discovered.ieeeAddress} came back online`);
 					}