feat(proto): add TapSelector RPC and Selector message

Driver interface in Go already exposes TapSelector for selector-based
taps; mirror that in the proto so maestro can resolve selectors
sidecar-side rather than forcing Go to walk the hierarchy first.

proto/driverpb/driver.pb.go

@@ -205,6 +205,50 @@ func (x *Text) GetValue() string {
 	return ""
 }
 
+type Selector struct {
+	state         protoimpl.MessageState `protogen:"open.v1"`
+	Value         string                 `protobuf:"bytes,1,opt,name=value,proto3" json:"value,omitempty"`
+	unknownFields protoimpl.UnknownFields
+	sizeCache     protoimpl.SizeCache
+}
+
+func (x *Selector) Reset() {
+	*x = Selector{}
+	mi := &file_driverpb_driver_proto_msgTypes[4]
+	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+	ms.StoreMessageInfo(mi)
+}
+
+func (x *Selector) String() string {
+	return protoimpl.X.MessageStringOf(x)
+}
+
+func (*Selector) ProtoMessage() {}
+
+func (x *Selector) ProtoReflect() protoreflect.Message {
+	mi := &file_driverpb_driver_proto_msgTypes[4]
+	if x != nil {
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		if ms.LoadMessageInfo() == nil {
+			ms.StoreMessageInfo(mi)
+		}
+		return ms
+	}
+	return mi.MessageOf(x)
+}
+
+// Deprecated: Use Selector.ProtoReflect.Descriptor instead.
+func (*Selector) Descriptor() ([]byte, []int) {
+	return file_driverpb_driver_proto_rawDescGZIP(), []int{4}
+}
+
+func (x *Selector) GetValue() string {
+	if x != nil {
+		return x.Value
+	}
+	return ""
+}
+
 type Image struct {
 	state         protoimpl.MessageState `protogen:"open.v1"`
 	Png           []byte                 `protobuf:"bytes,1,opt,name=png,proto3" json:"png,omitempty"`
@@ -216,7 +260,7 @@ type Image struct {
 
 func (x *Image) Reset() {
 	*x = Image{}
-	mi := &file_driverpb_driver_proto_msgTypes[4]
+	mi := &file_driverpb_driver_proto_msgTypes[5]
 	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 	ms.StoreMessageInfo(mi)
 }
@@ -228,7 +272,7 @@ func (x *Image) String() string {
 func (*Image) ProtoMessage() {}
 
 func (x *Image) ProtoReflect() protoreflect.Message {
-	mi := &file_driverpb_driver_proto_msgTypes[4]
+	mi := &file_driverpb_driver_proto_msgTypes[5]
 	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -241,7 +285,7 @@ func (x *Image) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use Image.ProtoReflect.Descriptor instead.
 func (*Image) Descriptor() ([]byte, []int) {
-	return file_driverpb_driver_proto_rawDescGZIP(), []int{4}
+	return file_driverpb_driver_proto_rawDescGZIP(), []int{5}
 }
 
 func (x *Image) GetPng() []byte {
@@ -274,7 +318,7 @@ type HierarchyJSON struct {
 
 func (x *HierarchyJSON) Reset() {
 	*x = HierarchyJSON{}
-	mi := &file_driverpb_driver_proto_msgTypes[5]
+	mi := &file_driverpb_driver_proto_msgTypes[6]
 	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 	ms.StoreMessageInfo(mi)
 }
@@ -286,7 +330,7 @@ func (x *HierarchyJSON) String() string {
 func (*HierarchyJSON) ProtoMessage() {}
 
 func (x *HierarchyJSON) ProtoReflect() protoreflect.Message {
-	mi := &file_driverpb_driver_proto_msgTypes[5]
+	mi := &file_driverpb_driver_proto_msgTypes[6]
 	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -299,7 +343,7 @@ func (x *HierarchyJSON) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use HierarchyJSON.ProtoReflect.Descriptor instead.
 func (*HierarchyJSON) Descriptor() ([]byte, []int) {
-	return file_driverpb_driver_proto_rawDescGZIP(), []int{5}
+	return file_driverpb_driver_proto_rawDescGZIP(), []int{6}
 }
 
 func (x *HierarchyJSON) GetJson() string {
@@ -318,7 +362,7 @@ type Duration struct {
 
 func (x *Duration) Reset() {
 	*x = Duration{}
-	mi := &file_driverpb_driver_proto_msgTypes[6]
+	mi := &file_driverpb_driver_proto_msgTypes[7]
 	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 	ms.StoreMessageInfo(mi)
 }
@@ -330,7 +374,7 @@ func (x *Duration) String() string {
 func (*Duration) ProtoMessage() {}
 
 func (x *Duration) ProtoReflect() protoreflect.Message {
-	mi := &file_driverpb_driver_proto_msgTypes[6]
+	mi := &file_driverpb_driver_proto_msgTypes[7]
 	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -343,7 +387,7 @@ func (x *Duration) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use Duration.ProtoReflect.Descriptor instead.
 func (*Duration) Descriptor() ([]byte, []int) {
-	return file_driverpb_driver_proto_rawDescGZIP(), []int{6}
+	return file_driverpb_driver_proto_rawDescGZIP(), []int{7}
 }
 
 func (x *Duration) GetMillis() int64 {
@@ -364,7 +408,7 @@ type HealthStatus struct {
 
 func (x *HealthStatus) Reset() {
 	*x = HealthStatus{}
-	mi := &file_driverpb_driver_proto_msgTypes[7]
+	mi := &file_driverpb_driver_proto_msgTypes[8]
 	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 	ms.StoreMessageInfo(mi)
 }
@@ -376,7 +420,7 @@ func (x *HealthStatus) String() string {
 func (*HealthStatus) ProtoMessage() {}
 
 func (x *HealthStatus) ProtoReflect() protoreflect.Message {
-	mi := &file_driverpb_driver_proto_msgTypes[7]
+	mi := &file_driverpb_driver_proto_msgTypes[8]
 	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -389,7 +433,7 @@ func (x *HealthStatus) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use HealthStatus.ProtoReflect.Descriptor instead.
 func (*HealthStatus) Descriptor() ([]byte, []int) {
-	return file_driverpb_driver_proto_rawDescGZIP(), []int{7}
+	return file_driverpb_driver_proto_rawDescGZIP(), []int{8}
 }
 
 func (x *HealthStatus) GetReady() bool {
@@ -427,6 +471,8 @@ const file_driverpb_driver_proto_rawDesc = "" +
 	"\x01x\x18\x01 \x01(\x05R\x01x\x12\f\n" +
 	"\x01y\x18\x02 \x01(\x05R\x01y\"\x1c\n" +
 	"\x04Text\x12\x14\n" +
+	"\x05value\x18\x01 \x01(\tR\x05value\" \n" +
+	"\bSelector\x12\x14\n" +
 	"\x05value\x18\x01 \x01(\tR\x05value\"G\n" +
 	"\x05Image\x12\x10\n" +
 	"\x03png\x18\x01 \x01(\fR\x03png\x12\x14\n" +
@@ -439,11 +485,12 @@ const file_driverpb_driver_proto_rawDesc = "" +
 	"\fHealthStatus\x12\x14\n" +
 	"\x05ready\x18\x01 \x01(\bR\x05ready\x12\x18\n" +
 	"\aversion\x18\x02 \x01(\tR\aversion\x12\x1a\n" +
-	"\bplatform\x18\x03 \x01(\tR\bplatform2\xf0\x03\n" +
+	"\bplatform\x18\x03 \x01(\tR\bplatform2\xb0\x04\n" +
 	"\x06Driver\x12>\n" +
 	"\x06Launch\x12\x1d.uatu.driver.v1.LaunchRequest\x1a\x15.uatu.driver.v1.Empty\x129\n" +
 	"\tTerminate\x12\x15.uatu.driver.v1.Empty\x1a\x15.uatu.driver.v1.Empty\x123\n" +
-	"\x03Tap\x12\x15.uatu.driver.v1.Point\x1a\x15.uatu.driver.v1.Empty\x128\n" +
+	"\x03Tap\x12\x15.uatu.driver.v1.Point\x1a\x15.uatu.driver.v1.Empty\x12>\n" +
+	"\vTapSelector\x12\x18.uatu.driver.v1.Selector\x1a\x15.uatu.driver.v1.Empty\x128\n" +
 	"\tInputText\x12\x14.uatu.driver.v1.Text\x1a\x15.uatu.driver.v1.Empty\x12:\n" +
 	"\n" +
 	"Screenshot\x12\x15.uatu.driver.v1.Empty\x1a\x15.uatu.driver.v1.Image\x12A\n" +
@@ -464,36 +511,39 @@ func file_driverpb_driver_proto_rawDescGZIP() []byte {
 	return file_driverpb_driver_proto_rawDescData
 }
 
-var file_driverpb_driver_proto_msgTypes = make([]protoimpl.MessageInfo, 8)
+var file_driverpb_driver_proto_msgTypes = make([]protoimpl.MessageInfo, 9)
 var file_driverpb_driver_proto_goTypes = []any{
 	(*Empty)(nil),         // 0: uatu.driver.v1.Empty
 	(*LaunchRequest)(nil), // 1: uatu.driver.v1.LaunchRequest
 	(*Point)(nil),         // 2: uatu.driver.v1.Point
 	(*Text)(nil),          // 3: uatu.driver.v1.Text
-	(*Image)(nil),         // 4: uatu.driver.v1.Image
+	(*Selector)(nil),      // 4: uatu.driver.v1.Selector
-	(*HierarchyJSON)(nil), // 5: uatu.driver.v1.HierarchyJSON
+	(*Image)(nil),         // 5: uatu.driver.v1.Image
-	(*Duration)(nil),      // 6: uatu.driver.v1.Duration
+	(*HierarchyJSON)(nil), // 6: uatu.driver.v1.HierarchyJSON
-	(*HealthStatus)(nil),  // 7: uatu.driver.v1.HealthStatus
+	(*Duration)(nil),      // 7: uatu.driver.v1.Duration
+	(*HealthStatus)(nil),  // 8: uatu.driver.v1.HealthStatus
 }
 var file_driverpb_driver_proto_depIdxs = []int32{
 	1, // 0: uatu.driver.v1.Driver.Launch:input_type -> uatu.driver.v1.LaunchRequest
 	0, // 1: uatu.driver.v1.Driver.Terminate:input_type -> uatu.driver.v1.Empty
 	2, // 2: uatu.driver.v1.Driver.Tap:input_type -> uatu.driver.v1.Point
-	3, // 3: uatu.driver.v1.Driver.InputText:input_type -> uatu.driver.v1.Text
+	4, // 3: uatu.driver.v1.Driver.TapSelector:input_type -> uatu.driver.v1.Selector
-	0, // 4: uatu.driver.v1.Driver.Screenshot:input_type -> uatu.driver.v1.Empty
+	3, // 4: uatu.driver.v1.Driver.InputText:input_type -> uatu.driver.v1.Text
-	0, // 5: uatu.driver.v1.Driver.Hierarchy:input_type -> uatu.driver.v1.Empty
+	0, // 5: uatu.driver.v1.Driver.Screenshot:input_type -> uatu.driver.v1.Empty
-	6, // 6: uatu.driver.v1.Driver.WaitForIdle:input_type -> uatu.driver.v1.Duration
+	0, // 6: uatu.driver.v1.Driver.Hierarchy:input_type -> uatu.driver.v1.Empty
-	0, // 7: uatu.driver.v1.Driver.Health:input_type -> uatu.driver.v1.Empty
+	7, // 7: uatu.driver.v1.Driver.WaitForIdle:input_type -> uatu.driver.v1.Duration
-	0, // 8: uatu.driver.v1.Driver.Launch:output_type -> uatu.driver.v1.Empty
+	0, // 8: uatu.driver.v1.Driver.Health:input_type -> uatu.driver.v1.Empty
-	0, // 9: uatu.driver.v1.Driver.Terminate:output_type -> uatu.driver.v1.Empty
+	0, // 9: uatu.driver.v1.Driver.Launch:output_type -> uatu.driver.v1.Empty
-	0, // 10: uatu.driver.v1.Driver.Tap:output_type -> uatu.driver.v1.Empty
+	0, // 10: uatu.driver.v1.Driver.Terminate:output_type -> uatu.driver.v1.Empty
-	0, // 11: uatu.driver.v1.Driver.InputText:output_type -> uatu.driver.v1.Empty
+	0, // 11: uatu.driver.v1.Driver.Tap:output_type -> uatu.driver.v1.Empty
-	4, // 12: uatu.driver.v1.Driver.Screenshot:output_type -> uatu.driver.v1.Image
+	0, // 12: uatu.driver.v1.Driver.TapSelector:output_type -> uatu.driver.v1.Empty
-	5, // 13: uatu.driver.v1.Driver.Hierarchy:output_type -> uatu.driver.v1.HierarchyJSON
+	0, // 13: uatu.driver.v1.Driver.InputText:output_type -> uatu.driver.v1.Empty
-	0, // 14: uatu.driver.v1.Driver.WaitForIdle:output_type -> uatu.driver.v1.Empty
+	5, // 14: uatu.driver.v1.Driver.Screenshot:output_type -> uatu.driver.v1.Image
-	7, // 15: uatu.driver.v1.Driver.Health:output_type -> uatu.driver.v1.HealthStatus
+	6, // 15: uatu.driver.v1.Driver.Hierarchy:output_type -> uatu.driver.v1.HierarchyJSON
-	8, // [8:16] is the sub-list for method output_type
+	0, // 16: uatu.driver.v1.Driver.WaitForIdle:output_type -> uatu.driver.v1.Empty
-	0, // [0:8] is the sub-list for method input_type
+	8, // 17: uatu.driver.v1.Driver.Health:output_type -> uatu.driver.v1.HealthStatus
+	9, // [9:18] is the sub-list for method output_type
+	0, // [0:9] is the sub-list for method input_type
 	0, // [0:0] is the sub-list for extension type_name
 	0, // [0:0] is the sub-list for extension extendee
 	0, // [0:0] is the sub-list for field type_name
@@ -510,7 +560,7 @@ func file_driverpb_driver_proto_init() {
 			GoPackagePath: reflect.TypeOf(x{}).PkgPath(),
 			RawDescriptor: unsafe.Slice(unsafe.StringData(file_driverpb_driver_proto_rawDesc), len(file_driverpb_driver_proto_rawDesc)),
 			NumEnums:      0,
-			NumMessages:   8,
+			NumMessages:   9,
 			NumExtensions: 0,
 			NumServices:   1,
 		},

proto/driverpb/driver.proto

@@ -11,6 +11,7 @@ service Driver {
   rpc Terminate(Empty) returns (Empty);
 
   rpc Tap(Point) returns (Empty);
+  rpc TapSelector(Selector) returns (Empty);
   rpc InputText(Text) returns (Empty);
 
   rpc Screenshot(Empty) returns (Image);
@@ -36,6 +37,10 @@ message Text {
   string value = 1;
 }
 
+message Selector {
+  string value = 1;
+}
+
 message Image {
   bytes png = 1;
   int32 width = 2;

proto/driverpb/driver_grpc.pb.go

@@ -22,6 +22,7 @@ const (
 	Driver_Launch_FullMethodName      = "/uatu.driver.v1.Driver/Launch"
 	Driver_Terminate_FullMethodName   = "/uatu.driver.v1.Driver/Terminate"
 	Driver_Tap_FullMethodName         = "/uatu.driver.v1.Driver/Tap"
+	Driver_TapSelector_FullMethodName = "/uatu.driver.v1.Driver/TapSelector"
 	Driver_InputText_FullMethodName   = "/uatu.driver.v1.Driver/InputText"
 	Driver_Screenshot_FullMethodName  = "/uatu.driver.v1.Driver/Screenshot"
 	Driver_Hierarchy_FullMethodName   = "/uatu.driver.v1.Driver/Hierarchy"
@@ -36,6 +37,7 @@ type DriverClient interface {
 	Launch(ctx context.Context, in *LaunchRequest, opts ...grpc.CallOption) (*Empty, error)
 	Terminate(ctx context.Context, in *Empty, opts ...grpc.CallOption) (*Empty, error)
 	Tap(ctx context.Context, in *Point, opts ...grpc.CallOption) (*Empty, error)
+	TapSelector(ctx context.Context, in *Selector, opts ...grpc.CallOption) (*Empty, error)
 	InputText(ctx context.Context, in *Text, opts ...grpc.CallOption) (*Empty, error)
 	Screenshot(ctx context.Context, in *Empty, opts ...grpc.CallOption) (*Image, error)
 	Hierarchy(ctx context.Context, in *Empty, opts ...grpc.CallOption) (*HierarchyJSON, error)
@@ -81,6 +83,16 @@ func (c *driverClient) Tap(ctx context.Context, in *Point, opts ...grpc.CallOpti
 	return out, nil
 }
 
+func (c *driverClient) TapSelector(ctx context.Context, in *Selector, opts ...grpc.CallOption) (*Empty, error) {
+	cOpts := append([]grpc.CallOption{grpc.StaticMethod()}, opts...)
+	out := new(Empty)
+	err := c.cc.Invoke(ctx, Driver_TapSelector_FullMethodName, in, out, cOpts...)
+	if err != nil {
+		return nil, err
+	}
+	return out, nil
+}
+
 func (c *driverClient) InputText(ctx context.Context, in *Text, opts ...grpc.CallOption) (*Empty, error) {
 	cOpts := append([]grpc.CallOption{grpc.StaticMethod()}, opts...)
 	out := new(Empty)
@@ -138,6 +150,7 @@ type DriverServer interface {
 	Launch(context.Context, *LaunchRequest) (*Empty, error)
 	Terminate(context.Context, *Empty) (*Empty, error)
 	Tap(context.Context, *Point) (*Empty, error)
+	TapSelector(context.Context, *Selector) (*Empty, error)
 	InputText(context.Context, *Text) (*Empty, error)
 	Screenshot(context.Context, *Empty) (*Image, error)
 	Hierarchy(context.Context, *Empty) (*HierarchyJSON, error)
@@ -162,6 +175,9 @@ func (UnimplementedDriverServer) Terminate(context.Context, *Empty) (*Empty, err
 func (UnimplementedDriverServer) Tap(context.Context, *Point) (*Empty, error) {
 	return nil, status.Error(codes.Unimplemented, "method Tap not implemented")
 }
+func (UnimplementedDriverServer) TapSelector(context.Context, *Selector) (*Empty, error) {
+	return nil, status.Error(codes.Unimplemented, "method TapSelector not implemented")
+}
 func (UnimplementedDriverServer) InputText(context.Context, *Text) (*Empty, error) {
 	return nil, status.Error(codes.Unimplemented, "method InputText not implemented")
 }
@@ -252,6 +268,24 @@ func _Driver_Tap_Handler(srv interface{}, ctx context.Context, dec func(interfac
 	return interceptor(ctx, in, info, handler)
 }
 
+func _Driver_TapSelector_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
+	in := new(Selector)
+	if err := dec(in); err != nil {
+		return nil, err
+	}
+	if interceptor == nil {
+		return srv.(DriverServer).TapSelector(ctx, in)
+	}
+	info := &grpc.UnaryServerInfo{
+		Server:     srv,
+		FullMethod: Driver_TapSelector_FullMethodName,
+	}
+	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
+		return srv.(DriverServer).TapSelector(ctx, req.(*Selector))
+	}
+	return interceptor(ctx, in, info, handler)
+}
+
 func _Driver_InputText_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
 	in := new(Text)
 	if err := dec(in); err != nil {
@@ -361,6 +395,10 @@ var Driver_ServiceDesc = grpc.ServiceDesc{
 			MethodName: "Tap",
 			Handler:    _Driver_Tap_Handler,
 		},
+		{
+			MethodName: "TapSelector",
+			Handler:    _Driver_TapSelector_Handler,
+		},
 		{
 			MethodName: "InputText",
 			Handler:    _Driver_InputText_Handler,