store WIP for rebase

Author: kiel-apple

src/darwin/Framework/CHIP/MTRDeviceController_XPC.h

@@ -19,7 +19,7 @@
 
 NS_ASSUME_NONNULL_BEGIN
 
-@interface MTRDeviceController_XPC : MTRDeviceController
+@interface MTRDeviceController_XPC : MTRDeviceController<NSXPCListenerDelegate> // temporarily XPCListenerDelegate
 
 @end
 

src/darwin/Framework/CHIP/MTRDeviceController_XPC.mm

@@ -15,14 +15,56 @@
  */
 
 #import "MTRDeviceController_XPC.h"
+#import "MTRXPCServiceProtocol.h"
 #import "MTRLogging_Internal.h"
+#import "MTRDeviceController_Internal.h"
 
 @interface MTRDeviceController_XPC ()
-@property (nonatomic, strong) NSXPCConnection * xpcConnection;
+@property (retain, readwrite) NSXPCConnection * xpcConnection;
+@property (retain, readwrite) id<MTRXPCServiceProtocol> xpcRemoteObjectProxy;
+
+// testing only
+@property (retain, readwrite) NSXPCListener * testListener;
+
+@end
+
+@implementation MTRDeviceController_XPC (TestXPCListener)
+
 @end
 
 @implementation MTRDeviceController_XPC
 
+- (id)initWithTestXPCListener {
+    // TODO:  update with well-known service name
+//    self.xpcConnection = [[NSXPCConnection alloc] initWithServiceName:@"wellknown"];
+
+    // testing mode
+    self.testListener = [NSXPCListener anonymousListener];
+    [self.testListener setDelegate:self];
+    [self.testListener resume];
+    NSXPCConnection * xpcConnection = [[NSXPCConnection alloc] initWithListenerEndpoint:self.testListener.endpoint];
+
+    return [self initWithXPCConnection:xpcConnection];
+}
+
+- (id)initWithXPCConnection:(NSXPCConnection *)newConnection
+{
+//    if (!(self = [super initForSubclasses])) {
+//        return nil;
+//    }
+
+    self.xpcConnection.remoteObjectInterface = [NSXPCInterface interfaceWithProtocol:@protocol(MTRXPCServiceProtocol)];
+    self.xpcRemoteObjectProxy = self.xpcConnection.remoteObjectProxy;
+    [self.xpcConnection resume];
+
+    // ping and meaning of life just as a test
+    [self.xpcRemoteObjectProxy ping];
+    NSNumber * lifeMeaning = [self.xpcRemoteObjectProxy synchronouslyGetMeaningOfLife];
+    NSLog(@"meaning of life appears to be %@", lifeMeaning);
+
+    return self;
+}
+
 - (nullable instancetype)initWithParameters:(MTRDeviceControllerAbstractParameters *)parameters
                                       error:(NSError * __autoreleasing *)error 
 {
@@ -35,21 +77,8 @@ - (BOOL)setupCommissioningSessionWithPayload:(MTRSetupPayload *)payload
                                    newNodeID:(NSNumber *)newNodeID
                                        error:(NSError * __autoreleasing *)error
 {
-    // xpc things obviously! kmo 14 aug 2024 12h35
-    // transform async work to sync work
-
-    MTR_LOG_ERROR("unimplemented method %s called", __PRETTY_FUNCTION__);
-    return false;
-}
-
-typedef void (^BoolReplyBlock)(bool);
-- (void)_xpc_setupCommissioningSessionWithPayload:(MTRSetupPayload *)payload
-                                        newNodeID:(NSNumber *)newNodeID
-                                            error:(NSError * __autoreleasing *)error
-                                            reply:(BoolReplyBlock)reply
-{
-    MTR_LOG_ERROR("unimplemented XPC method %s called", __PRETTY_FUNCTION__);
-    reply(false);
+    MTR_LOG_DEBUG("called XPC stub %s", __PRETTY_FUNCTION__);
+    return [self.xpcRemoteObjectProxy setupCommissioningSessionWithPayload:payload newNodeID:newNodeID error:error];
 }
 
 @end

src/darwin/Framework/CHIP/MTRXPCService.mm

@@ -33,9 +33,21 @@ - (void)ping
     MTR_LOG_DEBUG("PONG! %s", __PRETTY_FUNCTION__);
 }
 
-- (void)getMeaningOfLifeWithReplyBlock:(MTRXPCServiceIntReplyBlock)reply
+- (nonnull NSNumber *)synchronouslyGetMeaningOfLife { 
+    return @(42);
+}
+
+- (void)getMeaningOfLifeWithReplyBlock:(nonnull MTRXPCServiceIntReplyBlock)reply
 {
     reply(42);
 }
 
+- (BOOL)setupCommissioningSessionWithPayload:(MTRSetupPayload *)payload
+                                   newNodeID:(NSNumber *)newNodeID
+                                       error:(NSError * __autoreleasing *)error
+{
+    // temporary stub implementation
+    return false;
+}
+
 @end

src/darwin/Framework/CHIP/MTRXPCServiceProtocol.h

@@ -25,14 +25,21 @@ typedef void (^MTRXPCServiceBoolReplyBlock)(BOOL);
 
 @protocol MTRXPCServiceProtocol <NSObject>
 - (void)ping;
+- (NSNumber *)synchronouslyGetMeaningOfLife;
 - (void)getMeaningOfLifeWithReplyBlock:(MTRXPCServiceIntReplyBlock)reply;
 
-// these real methods will be optional for now, but not when we are done building here.
-@optional
-- (void)setupCommissioningSessionWithPayload:(MTRSetupPayload *)payload
-newNodeID:(NSNumber *)newNodeID
-error:(NSError * __autoreleasing *)error
-reply:(MTRXPCServiceBoolReplyBlock)reply;
+// temporary inclusion
+- (BOOL)setupCommissioningSessionWithPayload:(MTRSetupPayload *)payload
+                                   newNodeID:(NSNumber *)newNodeID
+                                       error:(NSError * __autoreleasing *)error;
+
+@end
+
+@protocol MTRXPCServiceDeviceControllerProtocol <NSObject>
+
+- (BOOL)setupCommissioningSessionWithPayload:(MTRSetupPayload *)payload
+                                   newNodeID:(NSNumber *)newNodeID
+                                       error:(NSError * __autoreleasing *)error;
 
 @end
 

src/darwin/Framework/CHIPTests/MTRXPCServiceTestsDummyService.m

@@ -30,4 +30,14 @@ - (void)getMeaningOfLifeWithReplyBlock:(MTRXPCServiceIntReplyBlock)reply
     reply(42);
 }
 
+- (BOOL)setupCommissioningSessionWithPayload:(nonnull MTRSetupPayload *)payload newNodeID:(nonnull NSNumber *)newNodeID error:(NSError *__autoreleasing  _Nullable * _Nullable)error { 
+    return false;
+}
+
+
+- (nonnull NSNumber *)synchronouslyGetMeaningOfLife { 
+    return @42;
+}
+
+
 @end

src/darwin/Framework/Matter.xcodeproj/project.pbxproj

@@ -302,6 +302,7 @@
 		99AECC802798A57F00B6355B /* MTRCommissioningParameters.mm in Sources */ = {isa = PBXBuildFile; fileRef = 99AECC7F2798A57E00B6355B /* MTRCommissioningParameters.mm */; };
 		99C65E10267282F1003402F6 /* MTRControllerTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 99C65E0F267282F1003402F6 /* MTRControllerTests.m */; };
 		99D466E12798936D0089A18F /* MTRCommissioningParameters.h in Headers */ = {isa = PBXBuildFile; fileRef = 99D466E02798936D0089A18F /* MTRCommissioningParameters.h */; settings = {ATTRIBUTES = (Public, ); }; };
+		9B4143812C6E662300B86FBD /* MTRXPCServiceTestsDummyService.m in Sources */ = {isa = PBXBuildFile; fileRef = 9BC0649B2C6C152E00996FEF /* MTRXPCServiceTestsDummyService.m */; };
 		9BC064942C6BCB6F00996FEF /* MTRXPCService.h in Headers */ = {isa = PBXBuildFile; fileRef = 9BC064922C6BCB6F00996FEF /* MTRXPCService.h */; };
 		9BC064952C6BCB6F00996FEF /* MTRXPCService.mm in Sources */ = {isa = PBXBuildFile; fileRef = 9BC064932C6BCB6F00996FEF /* MTRXPCService.mm */; };
 		9BC064972C6BCBAE00996FEF /* MTRXPCServiceProtocol.h in Headers */ = {isa = PBXBuildFile; fileRef = 9BC064962C6BCBAE00996FEF /* MTRXPCServiceProtocol.h */; settings = {ATTRIBUTES = (Private, ); }; };
@@ -2016,6 +2017,7 @@
 				5ACDDD7D27CD16D200EFD68A /* MTRClusterStateCacheContainer.mm in Sources */,
 				75B3269E2BCDB9EA00E17C4E /* MTRDeviceConnectivityMonitor.mm in Sources */,
 				513DDB8A2761F6F900DAA01A /* MTRAttributeTLVValueDecoder.mm in Sources */,
+				9B4143812C6E662300B86FBD /* MTRXPCServiceTestsDummyService.m in Sources */,
 				5117DD3829A931AE00FFA1AA /* MTROperationalBrowser.mm in Sources */,
 				514C79F02B62ADDA00DD6D7B /* descriptor.cpp in Sources */,
 				3D843757294AD25A0070D20A /* MTRCertificateInfo.mm in Sources */,