more XPC structure

Author: kiel-apple

src/darwin/Framework/CHIP/MTRDevice+XPC.h

@@ -15,6 +15,8 @@
  *    limitations under the License.
  */
 
+#import <Foundation/Foundation.h>
+
 #import <Matter/Matter.h>
 
 NS_ASSUME_NONNULL_BEGIN
@@ -33,14 +35,21 @@ typedef void (^MTRDeviceXPCServerAttributeReadResult)(NSDictionary<NSString *, i
                              params:(MTRReadParams * _Nullable)params
                       resultHandler:(MTRDeviceXPCServerAttributeReadResult)resultHandler;
 
-// TODO:  more methods! kmo 26 jul 2924 10h28
+// TODO:  more methods! kmo 26 jul 2024 10h28
+
+@end
+
+@protocol MTRDeviceXPCClientProtocol <NSObject>
+
+// TODO:  more methods! kmo 26 jul 2024 10h28
 
 @end
 
 
 @interface MTRDevice (XPC)
 
-+ (NSXPCInterface *)xpcInterfaceForServerProtocol MTR_UNSTABLE_API;
++ (NSXPCInterface *)xpcInterfaceForServerProtocol;
++ (NSXPCInterface *)xpcInterfaceForClientProtocol;
 
 @end
 

src/darwin/Framework/CHIP/MTRDevice+XPC.m

@@ -15,16 +15,46 @@
  *    limitations under the License.
  */
 
-#import <Foundation/Foundation.h>
 #import "MTRDevice+XPC.h"
+#import <Foundation/Foundation.h>
 
 NS_ASSUME_NONNULL_BEGIN
 
+// this is objective-C++ so it doesn't work in this objective-C file.  maybe
+// the file should be objective-C++ anyways?
+// kmo 28 jul 2024 18h52
+//static NSSet * GetMTRDeviceXPCAllowedClasses()
+//{
+//    static NSSet * const sMTRDeviceXPCAllowedClasses = [NSSet setWithArray:@[
+//        [NSString class], [NSNumber class], [NSData class], [NSArray class], [NSDictionary class], [NSError class]
+//    ]];
+//    return sMTRDeviceXPCAllowedClasses;
+//}
+
 @implementation MTRDevice (XPC)
 
 
-+ (NSXPCInterface *)xpcInterfaceForServerProtocol  {
++ (NSXPCInterface *)xpcInterfaceForServerProtocol {
+    // TODO:  allowed data types kmo 28 jul 2024 17h51
     NSXPCInterface * xpcInterface = [NSXPCInterface interfaceWithProtocol:@protocol(MTRDeviceXPCServerProtocol)];
+    
+    NSSet * const sMTRDeviceXPCAllowedClasses = [NSSet setWithArray:@[
+        [NSString class], [NSNumber class], [NSData class], [NSArray class], [NSDictionary class], [NSError class]
+    ]];
+
+    [xpcInterface setClasses:sMTRDeviceXPCAllowedClasses
+                 forSelector:@selector(readAttributeWithEndpointID:clusterID:attributeID:params:resultHandler:)
+               argumentIndex:0
+                     ofReply:YES];
+
+    return xpcInterface;
+}
+
++ (NSXPCInterface *)xpcInterfaceForClientProtocol {
+    // TODO:  allowed data types kmo 28 jul 2024 17h53
+
+    
+    NSXPCInterface * xpcInterface = [NSXPCInterface interfaceWithProtocol:@protocol(MTRDeviceXPCClientProtocol)];
     return xpcInterface;
 }
 

src/darwin/Framework/CHIP/Matter.h

@@ -38,6 +38,7 @@
 #import <Matter/MTRCommissioningParameters.h>
 #import <Matter/MTRDefines.h>
 #import <Matter/MTRDevice.h>
+#import <Matter/MTRDevice+XPC.h>
 #import <Matter/MTRDeviceAttestationDelegate.h>
 #import <Matter/MTRDeviceAttestationInfo.h>
 #import <Matter/MTRDeviceController+XPC.h>

src/darwin/Framework/CHIPTests/MTRDeviceXPCTests.m

@@ -15,40 +15,54 @@
  *    limitations under the License.
  */
 
-#import <XCTest/XCTest.h>
 #import <Matter/Matter.h>
 
-@interface MTRDeviceXPCTests : XCTestCase
+#import <XCTest/XCTest.h>
+
+@interface MTRDeviceXPCTests<NSXPCListenerDelegate> : XCTestCase
 @property (nonatomic, readonly, strong) NSXPCInterface * serviceInterface;
 @property (nonatomic, readonly, strong) NSXPCInterface * clientInterface;
 @property (nonatomic, readonly, strong) NSXPCListener * xpcListener;
 @end
 
 @implementation MTRDeviceXPCTests
 
+
+// NSXPCListener
+
+- (BOOL)listener:(NSXPCListener *)listener shouldAcceptNewConnection:(NSXPCConnection *)newConnection
+{
+    return true;
+}
 - (instancetype)init
 {
     _serviceInterface = [MTRDevice xpcInterfaceForServerProtocol];
+    _clientInterface = [MTRDevice xpcInterfaceForClientProtocol];
+    return self;
 }
 
 - (void)setUp {
-    // Put setup code here. This method is called before the invocation of each test method in the class.
+    self.continueAfterFailure = NO;
+
+    _xpcListener = [NSXPCListener anonymousListener];
+    _xpcListener.delegate = (id<NSXPCListenerDelegate>)self;
+    _serviceInterface = [MTRDevice xpcInterfaceForServerProtocol];
+    _clientInterface = [MTRDevice xpcInterfaceForClientProtocol];
+
+    [_xpcListener resume];
+    // TODO:  create remote MTRDevice?
 }
 
 - (void)tearDown {
     // Put teardown code here. This method is called after the invocation of each test method in the class.
+    [_xpcListener suspend];
+    _xpcListener = nil;
 }
 
 - (void)testExample {
     // This is an example of a functional test case.
     // Use XCTAssert and related functions to verify your tests produce the correct results.
-}
-
-- (void)testPerformanceExample {
-    // This is an example of a performance test case.
-    [self measureBlock:^{
-        // Put the code you want to measure the time of here.
-    }];
+    
 }
 
 @end