feat(telemetry): implement USB, Thunderbolt, and PCI peripherals provider (fixes #20 )

feat(telemetry): implement AppleSmartBattery health telemetry provider (fixes #17 )
2026-09-08 12:48:30 +01:00 · 2026-09-08 12:46:22 +01:00
8 changed files with 714 additions and 0 deletions
@@ -12,10 +12,12 @@
 		1879A3DCF6E305D7F2CD472E /* CoreFoundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 2345555FF9780B02A90CC7A9 /* CoreFoundation.framework */; };
 		1B15F48F6B19E9EA4556ECD5 /* MMStorageTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 78325870C7CD8312AECA2236 /* MMStorageTests.swift */; };
 		1B3F1C8ABF0ADFAA290FF6F6 /* MMSMCParser.m in Sources */ = {isa = PBXBuildFile; fileRef = 375AA781A2AA0A20B119C7B7 /* MMSMCParser.m */; };
+		22CA7351A745F7837E487051 /* MMPeripheralsTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = D1486E1512594482380CB492 /* MMPeripheralsTests.swift */; };
 		2C0F7AB93691ED8AA86FBCF0 /* MMProcessDetailInspector.m in Sources */ = {isa = PBXBuildFile; fileRef = 52E641F8A664D456518EDBA4 /* MMProcessDetailInspector.m */; };
 		3BA6709B727B1AAC6C4310B5 /* MMProcessDetailsTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7187632FF63B3B0D07FE9194 /* MMProcessDetailsTests.swift */; };
 		3C0AC14F803C813287D8A663 /* IOKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 007F48A5A599AB4E8D216D16 /* IOKit.framework */; };
 		4419FE7554489B23976E2970 /* MMCPULoadProvider.m in Sources */ = {isa = PBXBuildFile; fileRef = D68FC8100D08DB6202F46339 /* MMCPULoadProvider.m */; };
+		4752C49841375B88194F7635 /* MMPeripheralsProvider.m in Sources */ = {isa = PBXBuildFile; fileRef = 2E6A10A13A49E22E51862895 /* MMPeripheralsProvider.m */; };
 		4C1A92F4DEF4C824976115C2 /* MMNetworkSocketsTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 374B1BF631CC4738CB52CA3B /* MMNetworkSocketsTests.swift */; };
 		57BA02AE1CE24DBD02BD03A4 /* MMComponentThermalTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = B288C7402E2C00E75F8CD016 /* MMComponentThermalTests.swift */; };
 		5D31906EA986E2BA92E86FA8 /* MMNetworkBandwidthTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 27C612287333D757C92A076A /* MMNetworkBandwidthTests.swift */; };
@@ -27,6 +29,7 @@
 		87818E46CEA5145A8215D0E3 /* MMCPUThermalTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0F2BD3777A674DC4EB442890 /* MMCPUThermalTests.swift */; };
 		87A9E18362486D0D385BBC4A /* MMCPUThermalProvider.m in Sources */ = {isa = PBXBuildFile; fileRef = 62C377EFD025D6A6B5563E77 /* MMCPUThermalProvider.m */; };
 		88387CDAE2AC1CC74EF89B57 /* MacMonitorApp.swift in Sources */ = {isa = PBXBuildFile; fileRef = ADEA6BD38BA8D887B1DB64A9 /* MacMonitorApp.swift */; };
+		8EDDC2171C55B6E7FC999DAB /* MMBatteryTelemetryProvider.m in Sources */ = {isa = PBXBuildFile; fileRef = 9C92D0D2B62B3081ECCA9920 /* MMBatteryTelemetryProvider.m */; };
 		901EF4853E785A2856E54BC9 /* MMKernelTelemetryTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = DE40072F9A1F9DBD1C48A3B1 /* MMKernelTelemetryTests.swift */; };
 		925245C5B5F8D8DA3C89C4BA /* MMComponentThermalProvider.m in Sources */ = {isa = PBXBuildFile; fileRef = C65F5835516BC2A65BCE25D2 /* MMComponentThermalProvider.m */; };
 		93EF83FE087C6DEAAE3EC0CC /* MMProcessTelemetryProvider.m in Sources */ = {isa = PBXBuildFile; fileRef = 728C692778909D2B7451C07B /* MMProcessTelemetryProvider.m */; };
@@ -40,6 +43,7 @@
 		ACC914C61AB3762EB0C40513 /* MMLoadAverageTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7EB05C092C94C3972727AAA7 /* MMLoadAverageTests.swift */; };
 		AE3C28BDC3CEF40A9E8F2B20 /* MMGPUTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 80A0F723121CDF9597316F58 /* MMGPUTests.swift */; };
 		B9C2D6574E808B517BA34C83 /* MMMemoryTelemetryProvider.m in Sources */ = {isa = PBXBuildFile; fileRef = 991AEEAF262F3C6BE930BC77 /* MMMemoryTelemetryProvider.m */; };
+		BC487DB86227F09CB0603894 /* MMBatteryTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = B0EB61D811D989279BCBE478 /* MMBatteryTests.swift */; };
 		CD91FC663B19DA1FEA3D49D7 /* MMAppleSMCClient.m in Sources */ = {isa = PBXBuildFile; fileRef = 5555436CD3CB8A73F5D6504F /* MMAppleSMCClient.m */; };
 		E3CCE93A7D4D1EB0187D3E52 /* MMNetworkBandwidthProvider.m in Sources */ = {isa = PBXBuildFile; fileRef = C539AEA27C794C6F428EA875 /* MMNetworkBandwidthProvider.m */; };
 		E6F2F695B8D3E7045967C082 /* MMFanTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 336CEE35A745F3C7E9F70F43 /* MMFanTests.swift */; };
@@ -72,6 +76,8 @@
 		2345555FF9780B02A90CC7A9 /* CoreFoundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreFoundation.framework; path = System/Library/Frameworks/CoreFoundation.framework; sourceTree = SDKROOT; };
 		27C612287333D757C92A076A /* MMNetworkBandwidthTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MMNetworkBandwidthTests.swift; sourceTree = "<group>"; };
 		2C55E977DBFBE7FF04621608 /* MMLoadAverageProvider.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MMLoadAverageProvider.h; sourceTree = "<group>"; };
+		2DC6E55C9D3F646A1C62133D /* MMBatteryTelemetryProvider.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MMBatteryTelemetryProvider.h; sourceTree = "<group>"; };
+		2E6A10A13A49E22E51862895 /* MMPeripheralsProvider.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = MMPeripheralsProvider.m; sourceTree = "<group>"; };
 		2EC3EDFCD5C50CB352FCED87 /* MacMonitorTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MacMonitorTests.swift; sourceTree = "<group>"; };
 		32340166F6100A08105308D3 /* MMTelemetryCoordinator.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MMTelemetryCoordinator.h; sourceTree = "<group>"; };
 		336CEE35A745F3C7E9F70F43 /* MMFanTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MMFanTests.swift; sourceTree = "<group>"; };
@@ -101,15 +107,19 @@
 		8FBB436F3D9472194D8C6EDD /* MMSMCDefines.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MMSMCDefines.h; sourceTree = "<group>"; };
 		940D608A1AF80F75584E744E /* MMSMCTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MMSMCTests.swift; sourceTree = "<group>"; };
 		991AEEAF262F3C6BE930BC77 /* MMMemoryTelemetryProvider.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = MMMemoryTelemetryProvider.m; sourceTree = "<group>"; };
+		9C92D0D2B62B3081ECCA9920 /* MMBatteryTelemetryProvider.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = MMBatteryTelemetryProvider.m; sourceTree = "<group>"; };
 		9DC54CCE276F93D5AF0A0C28 /* MMGPUTelemetryProvider.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MMGPUTelemetryProvider.h; sourceTree = "<group>"; };
 		ADEA6BD38BA8D887B1DB64A9 /* MacMonitorApp.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MacMonitorApp.swift; sourceTree = "<group>"; };
 		AFA681E2464EA78CC19B54E0 /* MMDiskIOProvider.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MMDiskIOProvider.h; sourceTree = "<group>"; };
+		B0EB61D811D989279BCBE478 /* MMBatteryTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MMBatteryTests.swift; sourceTree = "<group>"; };
 		B288C7402E2C00E75F8CD016 /* MMComponentThermalTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MMComponentThermalTests.swift; sourceTree = "<group>"; };
 		B5F2256DF514DD737306302B /* MMLoadAverageProvider.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = MMLoadAverageProvider.m; sourceTree = "<group>"; };
 		C539AEA27C794C6F428EA875 /* MMNetworkBandwidthProvider.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = MMNetworkBandwidthProvider.m; sourceTree = "<group>"; };
 		C65F5835516BC2A65BCE25D2 /* MMComponentThermalProvider.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = MMComponentThermalProvider.m; sourceTree = "<group>"; };
 		C9ED8F75E082D4F8AC2FF2F5 /* MMFanTelemetryProvider.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = MMFanTelemetryProvider.m; sourceTree = "<group>"; };
 		CBA91906CA8B7936CC82A36B /* MMPowerTelemetryProvider.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MMPowerTelemetryProvider.h; sourceTree = "<group>"; };
+		CDE2777944B8F12EC7D2EAB5 /* MMPeripheralsProvider.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MMPeripheralsProvider.h; sourceTree = "<group>"; };
+		D1486E1512594482380CB492 /* MMPeripheralsTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MMPeripheralsTests.swift; sourceTree = "<group>"; };
 		D48698681374BD25B980C000 /* MMPowerTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MMPowerTests.swift; sourceTree = "<group>"; };
 		D61AB99733A4AA52459BA7C4 /* MMGPUTelemetryProvider.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = MMGPUTelemetryProvider.m; sourceTree = "<group>"; };
 		D68FC8100D08DB6202F46339 /* MMCPULoadProvider.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = MMCPULoadProvider.m; sourceTree = "<group>"; };
@@ -188,6 +198,15 @@
 			path = Core;
 			sourceTree = "<group>";
 		};
+		65251E6B5694734BAAF1C1F1 /* Peripherals */ = {
+			isa = PBXGroup;
+			children = (
+				CDE2777944B8F12EC7D2EAB5 /* MMPeripheralsProvider.h */,
+				2E6A10A13A49E22E51862895 /* MMPeripheralsProvider.m */,
+			);
+			path = Peripherals;
+			sourceTree = "<group>";
+		};
 		78383CED205BCA772701AE48 /* CPU */ = {
 			isa = PBXGroup;
 			children = (
@@ -211,6 +230,8 @@
 		8B31CE7F9319FEC373E6CDC6 /* Power */ = {
 			isa = PBXGroup;
 			children = (
+				2DC6E55C9D3F646A1C62133D /* MMBatteryTelemetryProvider.h */,
+				9C92D0D2B62B3081ECCA9920 /* MMBatteryTelemetryProvider.m */,
 				CBA91906CA8B7936CC82A36B /* MMPowerTelemetryProvider.h */,
 				02F5FDE260999C39E978D849 /* MMPowerTelemetryProvider.m */,
 			);
@@ -226,6 +247,7 @@
 				CA2F30473D63EC64CBD65437 /* Kernel */,
 				EE2F5EFC9DC33CEDA79A131F /* Memory */,
 				901D54FEAB6E9D6E787E599D /* Network */,
+				65251E6B5694734BAAF1C1F1 /* Peripherals */,
 				8B31CE7F9319FEC373E6CDC6 /* Power */,
 				8719744C366432DD7C2B9644 /* Process */,
 				B6EB3F6545276C40212C2992 /* Storage */,
@@ -296,6 +318,7 @@
 			isa = PBXGroup;
 			children = (
 				2EC3EDFCD5C50CB352FCED87 /* MacMonitorTests.swift */,
+				B0EB61D811D989279BCBE478 /* MMBatteryTests.swift */,
 				B288C7402E2C00E75F8CD016 /* MMComponentThermalTests.swift */,
 				4CE92B1A8D7FDBB6499448E1 /* MMCPULoadTests.swift */,
 				0F2BD3777A674DC4EB442890 /* MMCPUThermalTests.swift */,
@@ -307,6 +330,7 @@
 				099DCF7EF03A58ADA40A94A1 /* MMMemoryTests.swift */,
 				27C612287333D757C92A076A /* MMNetworkBandwidthTests.swift */,
 				374B1BF631CC4738CB52CA3B /* MMNetworkSocketsTests.swift */,
+				D1486E1512594482380CB492 /* MMPeripheralsTests.swift */,
 				D48698681374BD25B980C000 /* MMPowerTests.swift */,
 				7187632FF63B3B0D07FE9194 /* MMProcessDetailsTests.swift */,
 				52471E871E5CC1E444318070 /* MMProcessTests.swift */,
@@ -450,6 +474,7 @@
 			isa = PBXSourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
+				BC487DB86227F09CB0603894 /* MMBatteryTests.swift in Sources */,
 				160334CC765E091A7CBE21AA /* MMCPULoadTests.swift in Sources */,
 				87818E46CEA5145A8215D0E3 /* MMCPUThermalTests.swift in Sources */,
 				57BA02AE1CE24DBD02BD03A4 /* MMComponentThermalTests.swift in Sources */,
@@ -461,6 +486,7 @@
 				6201FD599FED061F6C736E8B /* MMMemoryTests.swift in Sources */,
 				5D31906EA986E2BA92E86FA8 /* MMNetworkBandwidthTests.swift in Sources */,
 				4C1A92F4DEF4C824976115C2 /* MMNetworkSocketsTests.swift in Sources */,
+				22CA7351A745F7837E487051 /* MMPeripheralsTests.swift in Sources */,
 				9B5C651AD2AF7DE2738F0C44 /* MMPowerTests.swift in Sources */,
 				3BA6709B727B1AAC6C4310B5 /* MMProcessDetailsTests.swift in Sources */,
 				7C9AE2ADAED52E593B52F3AE /* MMProcessTests.swift in Sources */,
@@ -476,6 +502,7 @@
 			files = (
 				A9FCAEC0BF27A419DB148C4A /* ContentView.swift in Sources */,
 				CD91FC663B19DA1FEA3D49D7 /* MMAppleSMCClient.m in Sources */,
+				8EDDC2171C55B6E7FC999DAB /* MMBatteryTelemetryProvider.m in Sources */,
 				4419FE7554489B23976E2970 /* MMCPULoadProvider.m in Sources */,
 				87A9E18362486D0D385BBC4A /* MMCPUThermalProvider.m in Sources */,
 				925245C5B5F8D8DA3C89C4BA /* MMComponentThermalProvider.m in Sources */,
@@ -487,6 +514,7 @@
 				B9C2D6574E808B517BA34C83 /* MMMemoryTelemetryProvider.m in Sources */,
 				E3CCE93A7D4D1EB0187D3E52 /* MMNetworkBandwidthProvider.m in Sources */,
 				A599E974E56F0B8D94A7E480 /* MMNetworkSocketsProvider.m in Sources */,
+				4752C49841375B88194F7635 /* MMPeripheralsProvider.m in Sources */,
 				0A7117B3B7CC7112F2527574 /* MMPowerTelemetryProvider.m in Sources */,
 				2C0F7AB93691ED8AA86FBCF0 /* MMProcessDetailInspector.m in Sources */,
 				93EF83FE087C6DEAAE3EC0CC /* MMProcessTelemetryProvider.m in Sources */,
@@ -27,5 +27,7 @@
 #import "MMProcessTelemetryProvider.h"
 #import "MMProcessDetailInspector.h"
 #import "MMGPUTelemetryProvider.h"
+#import "MMBatteryTelemetryProvider.h"
+#import "MMPeripheralsProvider.h"

 #endif /* MacMonitor_Bridging_Header_h */
@@ -0,0 +1,45 @@
+//
+//  MMPeripheralsProvider.h
+//  MacMonitor
+//
+//  Telemetry provider enumerating connected USB, Thunderbolt, and PCI peripheral devices via IOKit.
+//
+
+#import <Foundation/Foundation.h>
+#import "MMTelemetryProvider.h"
+
+NS_ASSUME_NONNULL_BEGIN
+
+typedef NS_ENUM(NSInteger, MMPeripheralBusType) {
+    MMPeripheralBusTypeUSB,
+    MMPeripheralBusTypeThunderbolt,
+    MMPeripheralBusTypePCI
+};
+
+@interface MMPeripheralDevice : NSObject
+
+@property (nonatomic, copy) NSString *name;
+@property (nonatomic, assign) MMPeripheralBusType busType;
+@property (nonatomic, copy) NSString *vendorName;
+@property (nonatomic, assign) uint32_t vendorID;
+@property (nonatomic, assign) uint32_t productID;
+@property (nonatomic, copy, nullable) NSString *serialNumber;
+@property (nonatomic, copy, nullable) NSString *deviceClass;
+@property (nonatomic, assign) uint64_t locationID;
+@property (nonatomic, assign) BOOL isBuiltIn;
+
+- (NSDictionary<NSString *, id> *)toDictionary;
+
+@end
+
+@interface MMPeripheralsProvider : NSObject <MMTelemetryProvider>
+
+- (instancetype)init;
+
+ (NSArray<MMPeripheralDevice *> *)sampleUSBDevices;
+ (NSArray<MMPeripheralDevice *> *)sampleThunderboltDevices;
+ (NSArray<MMPeripheralDevice *> *)samplePCIDevices;
+
+@end
+
+NS_ASSUME_NONNULL_END
@@ -0,0 +1,255 @@
+//
+//  MMPeripheralsProvider.m
+//  MacMonitor
+//
+//  Telemetry provider enumerating connected USB, Thunderbolt, and PCI peripheral devices via IOKit.
+//
+
+#import "MMPeripheralsProvider.h"
+#import <IOKit/IOKitLib.h>
+
+@implementation MMPeripheralDevice
+
+- (NSDictionary<NSString *, id> *)toDictionary {
+    NSString *busStr = @"USB";
+    if (self.busType == MMPeripheralBusTypeThunderbolt) {
+        busStr = @"Thunderbolt";
+    } else if (self.busType == MMPeripheralBusTypePCI) {
+        busStr = @"PCI";
+    }
+    
+    return @{
+        @"name": self.name ?: @"Unknown Device",
+        @"busType": busStr,
+        @"vendorName": self.vendorName ?: @"Unknown",
+        @"vendorID": @(self.vendorID),
+        @"productID": @(self.productID),
+        @"serialNumber": self.serialNumber ?: @"",
+        @"deviceClass": self.deviceClass ?: @"",
+        @"locationID": @(self.locationID),
+        @"isBuiltIn": @(self.isBuiltIn)
+    };
+}
+
+@end
+
+@implementation MMPeripheralsProvider
+
+- (instancetype)init {
+    self = [super init];
+    return self;
+}
+
+- (MMTelemetryDomain)domain {
+    return MMTelemetryDomainPeripherals;
+}
+
+- (NSString *)providerIdentifier {
+    return @"com.i3omb.macmonitor.telemetry.peripherals";
+}
+
+- (BOOL)isAvailable {
+    return YES;
+}
+
+ (NSArray<MMPeripheralDevice *> *)sampleUSBDevices {
+    NSMutableArray<MMPeripheralDevice *> *devices = [NSMutableArray array];
+    
+    // Query both IOUSBHostDevice (macOS modern) and IOUSBDevice (legacy/fallback)
+    const char *classes[] = { "IOUSBHostDevice", "IOUSBDevice" };
+    NSMutableSet<NSNumber *> *seenRegistryIDs = [NSMutableSet set];
+    
+    for (int i = 0; i < 2; i++) {
+        CFMutableDictionaryRef matching = IOServiceMatching(classes[i]);
+        if (!matching) continue;
+        
+        io_iterator_t iterator = IO_OBJECT_NULL;
+        kern_return_t kr = IOServiceGetMatchingServices(kIOMainPortDefault, matching, &iterator);
+        if (kr != KERN_SUCCESS || iterator == IO_OBJECT_NULL) continue;
+        
+        io_service_t service = IO_OBJECT_NULL;
+        while ((service = IOIteratorNext(iterator)) != IO_OBJECT_NULL) {
+            uint64_t regID = 0;
+            IORegistryEntryGetRegistryEntryID(service, &regID);
+            if ([seenRegistryIDs containsObject:@(regID)]) {
+                IOObjectRelease(service);
+                continue;
+            }
+            [seenRegistryIDs addObject:@(regID)];
+            
+            CFMutableDictionaryRef props = NULL;
+            if (IORegistryEntryCreateCFProperties(service, &props, kCFAllocatorDefault, 0) == KERN_SUCCESS && props) {
+                NSDictionary *dict = (__bridge NSDictionary *)props;
+                
+                NSString *name = dict[@"USB Product Name"] ?: (dict[@"kUSBProductString"] ?: dict[@"IOName"]);
+                if (!name || name.length == 0) {
+                    name = @"USB Device";
+                }
+                
+                NSString *vendor = dict[@"USB Vendor Name"] ?: (dict[@"kUSBVendorString"] ?: @"");
+                uint32_t vendorID = [dict[@"idVendor"] unsignedIntValue];
+                uint32_t productID = [dict[@"idProduct"] unsignedIntValue];
+                NSString *serial = dict[@"USB Serial Number"] ?: dict[@"kUSBSerialNumberString"];
+                uint64_t locID = [dict[@"locationID"] unsignedLongLongValue];
+                
+                BOOL builtIn = NO;
+                if (dict[@"Built-In"]) {
+                    builtIn = [dict[@"Built-In"] boolValue];
+                } else if ([dict[@"non-removable"] isKindOfClass:[NSString class]]) {
+                    builtIn = [dict[@"non-removable"] isEqualToString:@"yes"];
+                }
+                
+                MMPeripheralDevice *dev = [[MMPeripheralDevice alloc] init];
+                dev.name = name;
+                dev.busType = MMPeripheralBusTypeUSB;
+                dev.vendorName = vendor;
+                dev.vendorID = vendorID;
+                dev.productID = productID;
+                dev.serialNumber = serial;
+                dev.locationID = locID;
+                dev.isBuiltIn = builtIn;
+                
+                [devices addObject:dev];
+                CFRelease(props);
+            }
+            IOObjectRelease(service);
+        }
+        IOObjectRelease(iterator);
+    }
+    
+    return devices;
+}
+
+ (NSArray<MMPeripheralDevice *> *)sampleThunderboltDevices {
+    NSMutableArray<MMPeripheralDevice *> *devices = [NSMutableArray array];
+    
+    CFMutableDictionaryRef matching = IOServiceMatching("IOThunderboltDevice");
+    if (!matching) return devices;
+    
+    io_iterator_t iterator = IO_OBJECT_NULL;
+    kern_return_t kr = IOServiceGetMatchingServices(kIOMainPortDefault, matching, &iterator);
+    if (kr != KERN_SUCCESS || iterator == IO_OBJECT_NULL) return devices;
+    
+    io_service_t service = IO_OBJECT_NULL;
+    while ((service = IOIteratorNext(iterator)) != IO_OBJECT_NULL) {
+        CFMutableDictionaryRef props = NULL;
+        if (IORegistryEntryCreateCFProperties(service, &props, kCFAllocatorDefault, 0) == KERN_SUCCESS && props) {
+            NSDictionary *dict = (__bridge NSDictionary *)props;
+            
+            NSString *name = dict[@"Device Name"] ?: dict[@"IOName"];
+            if (!name) name = @"Thunderbolt Device";
+            
+            NSString *vendor = dict[@"Vendor Name"] ?: @"";
+            uint32_t vendorID = [dict[@"Vendor ID"] unsignedIntValue];
+            uint32_t productID = [dict[@"Device ID"] unsignedIntValue];
+            
+            MMPeripheralDevice *dev = [[MMPeripheralDevice alloc] init];
+            dev.name = name;
+            dev.busType = MMPeripheralBusTypeThunderbolt;
+            dev.vendorName = vendor;
+            dev.vendorID = vendorID;
+            dev.productID = productID;
+            dev.isBuiltIn = NO;
+            
+            [devices addObject:dev];
+            CFRelease(props);
+        }
+        IOObjectRelease(service);
+    }
+    IOObjectRelease(iterator);
+    return devices;
+}
+
+static uint32_t ParseDataUInt32(NSData *data) {
+    if (![data isKindOfClass:[NSData class]] || data.length == 0) return 0;
+    uint32_t val = 0;
+    size_t copyLen = MIN(sizeof(val), data.length);
+    memcpy(&val, data.bytes, copyLen);
+    return val;
+}
+
+ (NSArray<MMPeripheralDevice *> *)samplePCIDevices {
+    NSMutableArray<MMPeripheralDevice *> *devices = [NSMutableArray array];
+    
+    CFMutableDictionaryRef matching = IOServiceMatching("IOPCIDevice");
+    if (!matching) return devices;
+    
+    io_iterator_t iterator = IO_OBJECT_NULL;
+    kern_return_t kr = IOServiceGetMatchingServices(kIOMainPortDefault, matching, &iterator);
+    if (kr != KERN_SUCCESS || iterator == IO_OBJECT_NULL) return devices;
+    
+    io_service_t service = IO_OBJECT_NULL;
+    while ((service = IOIteratorNext(iterator)) != IO_OBJECT_NULL) {
+        CFMutableDictionaryRef props = NULL;
+        if (IORegistryEntryCreateCFProperties(service, &props, kCFAllocatorDefault, 0) == KERN_SUCCESS && props) {
+            NSDictionary *dict = (__bridge NSDictionary *)props;
+            
+            NSString *name = nil;
+            if ([dict[@"model"] isKindOfClass:[NSData class]]) {
+                name = [[NSString alloc] initWithData:dict[@"model"] encoding:NSUTF8StringEncoding];
+                name = [name stringByTrimmingCharactersInSet:[NSCharacterSet controlCharacterSet]];
+            }
+            if (!name || name.length == 0) {
+                name = dict[@"IOName"];
+            }
+            if (!name || name.length == 0) {
+                name = @"PCI Device";
+            }
+            
+            uint32_t vendorID = 0;
+            if ([dict[@"vendor-id"] isKindOfClass:[NSData class]]) {
+                vendorID = ParseDataUInt32(dict[@"vendor-id"]);
+            }
+            
+            uint32_t deviceID = 0;
+            if ([dict[@"device-id"] isKindOfClass:[NSData class]]) {
+                deviceID = ParseDataUInt32(dict[@"device-id"]);
+            }
+            
+            MMPeripheralDevice *dev = [[MMPeripheralDevice alloc] init];
+            dev.name = name;
+            dev.busType = MMPeripheralBusTypePCI;
+            dev.vendorID = vendorID;
+            dev.productID = deviceID;
+            dev.isBuiltIn = YES;
+            
+            [devices addObject:dev];
+            CFRelease(props);
+        }
+        IOObjectRelease(service);
+    }
+    IOObjectRelease(iterator);
+    return devices;
+}
+
+- (nullable NSDictionary<NSString *, id> *)sampleTelemetryWithError:(NSError **)error {
+    NSArray<MMPeripheralDevice *> *usb = [MMPeripheralsProvider sampleUSBDevices];
+    NSArray<MMPeripheralDevice *> *tb = [MMPeripheralsProvider sampleThunderboltDevices];
+    NSArray<MMPeripheralDevice *> *pci = [MMPeripheralsProvider samplePCIDevices];
+    
+    NSMutableArray<NSDictionary<NSString *, id> *> *usbList = [NSMutableArray arrayWithCapacity:usb.count];
+    for (MMPeripheralDevice *d in usb) {
+        [usbList addObject:[d toDictionary]];
+    }
+    
+    NSMutableArray<NSDictionary<NSString *, id> *> *tbList = [NSMutableArray arrayWithCapacity:tb.count];
+    for (MMPeripheralDevice *d in tb) {
+        [tbList addObject:[d toDictionary]];
+    }
+    
+    NSMutableArray<NSDictionary<NSString *, id> *> *pciList = [NSMutableArray arrayWithCapacity:pci.count];
+    for (MMPeripheralDevice *d in pci) {
+        [pciList addObject:[d toDictionary]];
+    }
+    
+    NSUInteger totalCount = usb.count + tb.count + pci.count;
+    
+    return @{
+        @"totalDeviceCount": @(totalCount),
+        @"usbDevices": usbList,
+        @"thunderboltDevices": tbList,
+        @"pciDevices": pciList
+    };
+}
+
+@end
@@ -0,0 +1,23 @@
+//
+//  MMBatteryTelemetryProvider.h
+//  MacMonitor
+//
+//  Telemetry provider for AppleSmartBattery health, cycle count, capacity, and adapter info.
+//
+
+#import <Foundation/Foundation.h>
+#import "MMTelemetryProvider.h"
+
+NS_ASSUME_NONNULL_BEGIN
+
+@interface MMBatteryTelemetryProvider : NSObject <MMTelemetryProvider>
+
+@property (nonatomic, readonly) BOOL hasBattery;
+
+- (instancetype)init;
+
+ (NSDictionary<NSString *, id> *)calculateBatteryHealthWithProperties:(nullable NSDictionary<NSString *, id> *)rawProps;
+
+@end
+
+NS_ASSUME_NONNULL_END
@@ -0,0 +1,179 @@
+//
+//  MMBatteryTelemetryProvider.m
+//  MacMonitor
+//
+//  Telemetry provider for AppleSmartBattery health, cycle count, capacity, and adapter info.
+//
+
+#import "MMBatteryTelemetryProvider.h"
+#import <IOKit/IOKitLib.h>
+#import <IOKit/ps/IOPowerSources.h>
+#import <IOKit/ps/IOPSKeys.h>
+
+@implementation MMBatteryTelemetryProvider
+
+- (instancetype)init {
+    self = [super init];
+    return self;
+}
+
+- (MMTelemetryDomain)domain {
+    return MMTelemetryDomainPower;
+}
+
+- (NSString *)providerIdentifier {
+    return @"com.i3omb.macmonitor.telemetry.battery";
+}
+
+- (BOOL)isAvailable {
+    io_service_t service = IOServiceGetMatchingService(kIOMainPortDefault, IOServiceMatching("AppleSmartBattery"));
+    if (service != IO_OBJECT_NULL) {
+        IOObjectRelease(service);
+        return YES;
+    }
+    return NO;
+}
+
+- (BOOL)hasBattery {
+    return [self isAvailable];
+}
+
+ (NSDictionary<NSString *, id> *)calculateBatteryHealthWithProperties:(nullable NSDictionary<NSString *, id> *)rawProps {
+    if (!rawProps || rawProps.count == 0) {
+        return @{
+            @"hasBattery": @(NO),
+            @"installed": @(NO),
+            @"healthCondition": @"No Battery",
+            @"healthPercent": @(0.0),
+            @"cycleCount": @(0),
+            @"designCycleCount": @(0),
+            @"currentCapacity": @(0),
+            @"maxCapacity": @(0),
+            @"designCapacity": @(0),
+            @"temperature": @(0.0),
+            @"voltage": @(0.0),
+            @"amperage": @(0.0),
+            @"watts": @(0.0),
+            @"isCharging": @(NO),
+            @"isCharged": @(NO),
+            @"externalConnected": @(NO),
+            @"timeRemainingMinutes": @(-1),
+            @"manufacturer": @"N/A",
+            @"serial": @"N/A",
+            @"deviceName": @"N/A"
+        };
+    }
+
+    BOOL installed = [rawProps[@"BatteryInstalled"] boolValue];
+    NSInteger cycleCount = [rawProps[@"CycleCount"] integerValue];
+    NSInteger designCycleCount = rawProps[@"DesignCycleCount9C"] ? [rawProps[@"DesignCycleCount9C"] integerValue] : 1000;
+    
+    NSInteger currentCapacity = [rawProps[@"CurrentCapacity"] integerValue];
+    NSInteger maxCapacity = [rawProps[@"MaxCapacity"] integerValue];
+    
+    // DesignCapacity might be at top level or inside BatteryData
+    NSInteger designCapacity = [rawProps[@"DesignCapacity"] integerValue];
+    if (designCapacity <= 0 && [rawProps[@"BatteryData"] isKindOfClass:[NSDictionary class]]) {
+        designCapacity = [rawProps[@"BatteryData"][@"DesignCapacity"] integerValue];
+    }
+    
+    // Health percentage = (MaxCapacity / DesignCapacity) * 100.0
+    double healthPercent = 0.0;
+    if (designCapacity > 0) {
+        healthPercent = ((double)maxCapacity / (double)designCapacity) * 100.0;
+        if (healthPercent > 100.0) healthPercent = 100.0;
+    } else if (maxCapacity > 0) {
+        healthPercent = 100.0;
+    }
+    
+    // Health condition evaluation
+    NSString *condition = @"Normal";
+    BOOL permanentFailure = [rawProps[@"PermanentFailureStatus"] integerValue] != 0;
+    if (permanentFailure) {
+        condition = @"Permanent Failure";
+    } else if (healthPercent < 70.0 || (designCycleCount > 0 && cycleCount > designCycleCount)) {
+        condition = @"Service Recommended";
+    } else if (healthPercent < 80.0) {
+        condition = @"Fair";
+    } else {
+        condition = @"Normal";
+    }
+    
+    // Temperature: AppleSmartBattery returns in units of 0.01 deg C or 0.1 deg C (e.g. 3151 = 31.51 deg C)
+    double rawTemp = [rawProps[@"Temperature"] doubleValue];
+    double tempC = rawTemp > 1000.0 ? (rawTemp / 100.0) : (rawTemp > 100.0 ? rawTemp / 10.0 : rawTemp);
+    
+    double voltage = [rawProps[@"Voltage"] doubleValue] / 1000.0; // mV -> V
+    
+    // Amperage can be signed 64-bit stored as unsigned in dict
+    int64_t rawAmp = [rawProps[@"InstantAmperage"] longLongValue];
+    if (rawAmp == 0) {
+        rawAmp = [rawProps[@"Amperage"] longLongValue];
+    }
+    int32_t signedAmp = (int32_t)rawAmp; // standard cast from uint32/uint64 representation
+    double amperage = ((double)signedAmp) / 1000.0; // mA -> A
+    double watts = fabs(voltage * amperage);
+    
+    BOOL isCharging = [rawProps[@"IsCharging"] boolValue];
+    BOOL fullyCharged = [rawProps[@"FullyCharged"] boolValue];
+    BOOL externalConnected = [rawProps[@"ExternalConnected"] boolValue];
+    NSInteger timeRemaining = [rawProps[@"TimeRemaining"] integerValue];
+    if (timeRemaining == 65535) {
+        timeRemaining = -1;
+    }
+    
+    NSString *manufacturer = rawProps[@"Manufacturer"] ?: @"Apple";
+    NSString *serial = rawProps[@"Serial"] ?: @"";
+    NSString *deviceName = rawProps[@"DeviceName"] ?: @"";
+    
+    // Power adapter details
+    NSDictionary *adapterDetails = [rawProps[@"AdapterDetails"] isKindOfClass:[NSDictionary class]] ? rawProps[@"AdapterDetails"] : nil;
+    NSInteger adapterWatts = 0;
+    if (adapterDetails && adapterDetails[@"Watts"]) {
+        adapterWatts = [adapterDetails[@"Watts"] integerValue];
+    }
+    
+    return @{
+        @"hasBattery": @(YES),
+        @"installed": @(installed),
+        @"healthCondition": condition,
+        @"healthPercent": @(round(healthPercent * 10.0) / 10.0),
+        @"cycleCount": @(cycleCount),
+        @"designCycleCount": @(designCycleCount),
+        @"currentCapacity": @(currentCapacity),
+        @"maxCapacity": @(maxCapacity),
+        @"designCapacity": @(designCapacity),
+        @"temperature": @(round(tempC * 10.0) / 10.0),
+        @"voltage": @(round(voltage * 100.0) / 100.0),
+        @"amperage": @(round(amperage * 100.0) / 100.0),
+        @"watts": @(round(watts * 10.0) / 10.0),
+        @"isCharging": @(isCharging),
+        @"isCharged": @(fullyCharged),
+        @"externalConnected": @(externalConnected),
+        @"timeRemainingMinutes": @(timeRemaining),
+        @"manufacturer": manufacturer,
+        @"serial": serial,
+        @"deviceName": deviceName,
+        @"adapterWatts": @(adapterWatts)
+    };
+}
+
+- (nullable NSDictionary<NSString *, id> *)sampleTelemetryWithError:(NSError **)error {
+    io_service_t service = IOServiceGetMatchingService(kIOMainPortDefault, IOServiceMatching("AppleSmartBattery"));
+    if (service == IO_OBJECT_NULL) {
+        return [MMBatteryTelemetryProvider calculateBatteryHealthWithProperties:nil];
+    }
+    
+    CFMutableDictionaryRef props = NULL;
+    kern_return_t kr = IORegistryEntryCreateCFProperties(service, &props, kCFAllocatorDefault, 0);
+    IOObjectRelease(service);
+    
+    if (kr != KERN_SUCCESS || !props) {
+        return [MMBatteryTelemetryProvider calculateBatteryHealthWithProperties:nil];
+    }
+    
+    NSDictionary *dict = (__bridge_transfer NSDictionary *)props;
+    return [MMBatteryTelemetryProvider calculateBatteryHealthWithProperties:dict];
+}
+
+@end
@@ -0,0 +1,109 @@
+//
+//  MMBatteryTests.swift
+//  MacMonitorTests
+//
+//  Unit and integration tests for MMBatteryTelemetryProvider.
+//
+
+import XCTest
+@testable import MacMonitor
+
+final class MMBatteryTests: XCTestCase {
+    var provider: MMBatteryTelemetryProvider!
+
+    override func setUp() {
+        super.setUp()
+        provider = MMBatteryTelemetryProvider()
+    }
+
+    override func tearDown() {
+        provider = nil
+        super.tearDown()
+    }
+
+    func testDomainAndIdentifier() {
+        XCTAssertEqual(provider.domain, .power)
+        XCTAssertEqual(provider.providerIdentifier, "com.i3omb.macmonitor.telemetry.battery")
+    }
+
+    func testCalculateBatteryHealthWithSimulatedNormalBattery() {
+        let raw: [String: Any] = [
+            "BatteryInstalled": true,
+            "CycleCount": 250,
+            "DesignCycleCount9C": 1000,
+            "CurrentCapacity": 3000,
+            "MaxCapacity": 4000,
+            "DesignCapacity": 4400,
+            "Temperature": 3150, // 31.5 C
+            "Voltage": 11100, // 11.1 V
+            "Amperage": -1500, // -1.5 A
+            "IsCharging": false,
+            "FullyCharged": false,
+            "ExternalConnected": false,
+            "TimeRemaining": 120,
+            "Manufacturer": "SMP",
+            "Serial": "TEST123456",
+            "DeviceName": "bq20z451"
+        ]
+
+        let health = MMBatteryTelemetryProvider.calculateBatteryHealth(withProperties: raw)
+        XCTAssertEqual(health["hasBattery"] as? Bool, true)
+        XCTAssertEqual(health["installed"] as? Bool, true)
+        XCTAssertEqual(health["healthCondition"] as? String, "Normal")
+        
+        let healthPercent = (health["healthPercent"] as? Double) ?? 0.0
+        XCTAssertEqual(healthPercent, 90.9, accuracy: 0.1)
+        XCTAssertEqual(health["cycleCount"] as? Int, 250)
+        XCTAssertEqual(health["designCycleCount"] as? Int, 1000)
+        XCTAssertEqual(health["temperature"] as? Double, 31.5)
+        let watts = (health["watts"] as? Double) ?? 0.0
+        XCTAssertEqual(watts, 16.7, accuracy: 0.2)
+        XCTAssertEqual(health["manufacturer"] as? String, "SMP")
+    }
+
+    func testCalculateBatteryHealthWithServiceRecommended() {
+        let raw: [String: Any] = [
+            "BatteryInstalled": true,
+            "CycleCount": 1100,
+            "DesignCycleCount9C": 1000,
+            "CurrentCapacity": 1500,
+            "MaxCapacity": 2500,
+            "DesignCapacity": 4400, // ~56.8% health
+            "Temperature": 3200,
+            "Voltage": 10800,
+            "Amperage": -1000,
+            "IsCharging": false,
+            "FullyCharged": false,
+            "ExternalConnected": false,
+            "TimeRemaining": 90,
+            "Manufacturer": "Apple"
+        ]
+
+        let health = MMBatteryTelemetryProvider.calculateBatteryHealth(withProperties: raw)
+        XCTAssertEqual(health["healthCondition"] as? String, "Service Recommended")
+        let healthPercent = (health["healthPercent"] as? Double) ?? 0.0
+        XCTAssertLessThan(healthPercent, 70.0)
+    }
+
+    func testCalculateBatteryHealthWithNil() {
+        let health = MMBatteryTelemetryProvider.calculateBatteryHealth(withProperties: nil)
+        XCTAssertEqual(health["hasBattery"] as? Bool, false)
+        XCTAssertEqual(health["installed"] as? Bool, false)
+        XCTAssertEqual(health["healthCondition"] as? String, "No Battery")
+    }
+
+    func testLiveSampleBattery() {
+        do {
+            let sample = try provider.sampleTelemetry()
+            XCTAssertNotNil(sample)
+            if provider.hasBattery {
+                XCTAssertEqual(sample["hasBattery"] as? Bool, true)
+                XCTAssertNotNil(sample["cycleCount"])
+                XCTAssertNotNil(sample["healthPercent"])
+                XCTAssertNotNil(sample["healthCondition"])
+            }
+        } catch {
+            XCTFail("sampleTelemetry threw error: \(error)")
+        }
+    }
+}
@@ -0,0 +1,73 @@
+//
+//  MMPeripheralsTests.swift
+//  MacMonitorTests
+//
+//  Unit and integration tests for MMPeripheralsProvider.
+//
+
+import XCTest
+@testable import MacMonitor
+
+final class MMPeripheralsTests: XCTestCase {
+    var provider: MMPeripheralsProvider!
+
+    override func setUp() {
+        super.setUp()
+        provider = MMPeripheralsProvider()
+    }
+
+    override func tearDown() {
+        provider = nil
+        super.tearDown()
+    }
+
+    func testDomainAndIdentifier() {
+        XCTAssertEqual(provider.domain, .peripherals)
+        XCTAssertEqual(provider.providerIdentifier, "com.i3omb.macmonitor.telemetry.peripherals")
+        XCTAssertTrue(provider.isAvailable)
+    }
+
+    func testSamplePeripheralsLive() {
+        do {
+            let sample = try provider.sampleTelemetry()
+            XCTAssertNotNil(sample)
+            
+            let total = sample["totalDeviceCount"] as? Int ?? 0
+            XCTAssertGreaterThan(total, 0, "Host system should have at least 1 PCI/USB device")
+            
+            let pci = sample["pciDevices"] as? [[String: Any]] ?? []
+            XCTAssertGreaterThan(pci.count, 0, "Intel Mac should have PCI devices (host bridge, GPU, etc.)")
+            
+            if let firstPCI = pci.first {
+                XCTAssertNotNil(firstPCI["name"])
+                XCTAssertEqual(firstPCI["busType"] as? String, "PCI")
+            }
+            
+            let usb = sample["usbDevices"] as? [[String: Any]] ?? []
+            for dev in usb {
+                XCTAssertEqual(dev["busType"] as? String, "USB")
+                XCTAssertNotNil(dev["name"])
+            }
+        } catch {
+            XCTFail("sampleTelemetry threw error: \(error)")
+        }
+    }
+
+    func testPeripheralDeviceModel() {
+        let dev = MMPeripheralDevice()
+        dev.name = "Magic Trackpad"
+        dev.busType = .USB
+        dev.vendorName = "Apple Inc."
+        dev.vendorID = 0x05ac
+        dev.productID = 0x0265
+        dev.isBuiltIn = false
+        
+        let dict = dev.toDictionary()
+        XCTAssertEqual(dict["name"] as? String, "Magic Trackpad")
+        XCTAssertEqual(dict["busType"] as? String, "USB")
+        XCTAssertEqual(dict["vendorName"] as? String, "Apple Inc.")
+        XCTAssertEqual(dict["vendorID"] as? UInt32, 0x05ac)
+        XCTAssertEqual(dict["productID"] as? UInt32, 0x0265)
+        XCTAssertEqual(dict["isBuiltIn"] as? Bool, false)
+    }
+}
Author	SHA1	Message	Date
gronod	3224558ac4	feat(telemetry): implement USB, Thunderbolt, and PCI peripherals provider (fixes #20 ) MacMonitor CI/CD Pipeline / Build & Test (Intel x86_64) (push) Canceled after 0s Details	2026-09-08 12:48:30 +01:00
gronod	6c34cf3c86	feat(telemetry): implement AppleSmartBattery health telemetry provider (fixes #17 ) MacMonitor CI/CD Pipeline / Build & Test (Intel x86_64) (push) Canceled after 0s Details	2026-09-08 12:46:22 +01:00