diff --git a/extension/extension_host.go b/extension/extension_host.go index d6d5d82e..15fed019 100644 --- a/extension/extension_host.go +++ b/extension/extension_host.go @@ -91,7 +91,7 @@ func (e ExtensionHostService) SubmitForm(ctx context.Context, req *pb.SendExtens }, nil } -func (e ExtensionHostService) Cancel(ctx context.Context, req *pb.ExtensionRequest) (*pb.ExtensionActionResult, error) { +func (e ExtensionHostService) Close(ctx context.Context, req *pb.ExtensionRequest) (*pb.ExtensionActionResult, error) { extension, err := getExtension(req.GetExtensionId()) if err != nil { log.Println(err) @@ -101,26 +101,7 @@ func (e ExtensionHostService) Cancel(ctx context.Context, req *pb.ExtensionReque Message: err.Error(), }, err } - (*extension).Cancel() - - return &pb.ExtensionActionResult{ - ExtensionId: req.ExtensionId, - Code: pb.ResponseCode_OK, - Message: "Success", - }, nil -} - -func (e ExtensionHostService) Stop(ctx context.Context, req *pb.ExtensionRequest) (*pb.ExtensionActionResult, error) { - extension, err := getExtension(req.GetExtensionId()) - if err != nil { - log.Println(err) - return &pb.ExtensionActionResult{ - ExtensionId: req.ExtensionId, - Code: pb.ResponseCode_FAILED, - Message: err.Error(), - }, err - } - (*extension).Stop() + (*extension).Close() (*extension).StoreData() return &pb.ExtensionActionResult{ ExtensionId: req.ExtensionId, @@ -133,7 +114,7 @@ func (e ExtensionHostService) EditExtension(ctx context.Context, req *pb.EditExt if !req.Enable { extension, _ := getExtension(req.GetExtensionId()) if extension != nil { - (*extension).Stop() + (*extension).Close() (*extension).StoreData() } delete(enabledExtensionsMap, req.GetExtensionId()) diff --git a/extension/html/rpc.js b/extension/html/rpc.js index bbee42ea..8619fa4e 100644 --- a/extension/html/rpc.js +++ b/extension/html/rpc.js @@ -1092,8 +1092,8 @@ proto.hiddifyrpc.ExtensionHostServicePromiseClient.prototype.submitForm = * !proto.hiddifyrpc.ExtensionRequest, * !proto.hiddifyrpc.ExtensionActionResult>} */ -const methodDescriptor_ExtensionHostService_Cancel = new grpc.web.MethodDescriptor( - '/hiddifyrpc.ExtensionHostService/Cancel', +const methodDescriptor_ExtensionHostService_Close = new grpc.web.MethodDescriptor( + '/hiddifyrpc.ExtensionHostService/Close', grpc.web.MethodType.UNARY, proto.hiddifyrpc.ExtensionRequest, proto.hiddifyrpc.ExtensionActionResult, @@ -1118,13 +1118,13 @@ const methodDescriptor_ExtensionHostService_Cancel = new grpc.web.MethodDescript * @return {!grpc.web.ClientReadableStream|undefined} * The XHR Node Readable Stream */ -proto.hiddifyrpc.ExtensionHostServiceClient.prototype.cancel = +proto.hiddifyrpc.ExtensionHostServiceClient.prototype.close = function(request, metadata, callback) { return this.client_.rpcCall(this.hostname_ + - '/hiddifyrpc.ExtensionHostService/Cancel', + '/hiddifyrpc.ExtensionHostService/Close', request, metadata || {}, - methodDescriptor_ExtensionHostService_Cancel, + methodDescriptor_ExtensionHostService_Close, callback); }; @@ -1137,74 +1137,13 @@ proto.hiddifyrpc.ExtensionHostServiceClient.prototype.cancel = * @return {!Promise} * Promise that resolves to the response */ -proto.hiddifyrpc.ExtensionHostServicePromiseClient.prototype.cancel = +proto.hiddifyrpc.ExtensionHostServicePromiseClient.prototype.close = function(request, metadata) { return this.client_.unaryCall(this.hostname_ + - '/hiddifyrpc.ExtensionHostService/Cancel', + '/hiddifyrpc.ExtensionHostService/Close', request, metadata || {}, - methodDescriptor_ExtensionHostService_Cancel); -}; - - -/** - * @const - * @type {!grpc.web.MethodDescriptor< - * !proto.hiddifyrpc.ExtensionRequest, - * !proto.hiddifyrpc.ExtensionActionResult>} - */ -const methodDescriptor_ExtensionHostService_Stop = new grpc.web.MethodDescriptor( - '/hiddifyrpc.ExtensionHostService/Stop', - grpc.web.MethodType.UNARY, - proto.hiddifyrpc.ExtensionRequest, - proto.hiddifyrpc.ExtensionActionResult, - /** - * @param {!proto.hiddifyrpc.ExtensionRequest} request - * @return {!Uint8Array} - */ - function(request) { - return request.serializeBinary(); - }, - proto.hiddifyrpc.ExtensionActionResult.deserializeBinary -); - - -/** - * @param {!proto.hiddifyrpc.ExtensionRequest} request The - * request proto - * @param {?Object} metadata User defined - * call metadata - * @param {function(?grpc.web.RpcError, ?proto.hiddifyrpc.ExtensionActionResult)} - * callback The callback function(error, response) - * @return {!grpc.web.ClientReadableStream|undefined} - * The XHR Node Readable Stream - */ -proto.hiddifyrpc.ExtensionHostServiceClient.prototype.stop = - function(request, metadata, callback) { - return this.client_.rpcCall(this.hostname_ + - '/hiddifyrpc.ExtensionHostService/Stop', - request, - metadata || {}, - methodDescriptor_ExtensionHostService_Stop, - callback); -}; - - -/** - * @param {!proto.hiddifyrpc.ExtensionRequest} request The - * request proto - * @param {?Object=} metadata User defined - * call metadata - * @return {!Promise} - * Promise that resolves to the response - */ -proto.hiddifyrpc.ExtensionHostServicePromiseClient.prototype.stop = - function(request, metadata) { - return this.client_.unaryCall(this.hostname_ + - '/hiddifyrpc.ExtensionHostService/Stop', - request, - metadata || {}, - methodDescriptor_ExtensionHostService_Stop); + methodDescriptor_ExtensionHostService_Close); }; diff --git a/extension/html/rpc/extension_grpc_web_pb.js b/extension/html/rpc/extension_grpc_web_pb.js index 37c037ca..16d808c6 100644 --- a/extension/html/rpc/extension_grpc_web_pb.js +++ b/extension/html/rpc/extension_grpc_web_pb.js @@ -321,8 +321,8 @@ proto.hiddifyrpc.ExtensionHostServicePromiseClient.prototype.submitForm = * !proto.hiddifyrpc.ExtensionRequest, * !proto.hiddifyrpc.ExtensionActionResult>} */ -const methodDescriptor_ExtensionHostService_Cancel = new grpc.web.MethodDescriptor( - '/hiddifyrpc.ExtensionHostService/Cancel', +const methodDescriptor_ExtensionHostService_Close = new grpc.web.MethodDescriptor( + '/hiddifyrpc.ExtensionHostService/Close', grpc.web.MethodType.UNARY, proto.hiddifyrpc.ExtensionRequest, proto.hiddifyrpc.ExtensionActionResult, @@ -347,13 +347,13 @@ const methodDescriptor_ExtensionHostService_Cancel = new grpc.web.MethodDescript * @return {!grpc.web.ClientReadableStream|undefined} * The XHR Node Readable Stream */ -proto.hiddifyrpc.ExtensionHostServiceClient.prototype.cancel = +proto.hiddifyrpc.ExtensionHostServiceClient.prototype.close = function(request, metadata, callback) { return this.client_.rpcCall(this.hostname_ + - '/hiddifyrpc.ExtensionHostService/Cancel', + '/hiddifyrpc.ExtensionHostService/Close', request, metadata || {}, - methodDescriptor_ExtensionHostService_Cancel, + methodDescriptor_ExtensionHostService_Close, callback); }; @@ -366,74 +366,13 @@ proto.hiddifyrpc.ExtensionHostServiceClient.prototype.cancel = * @return {!Promise} * Promise that resolves to the response */ -proto.hiddifyrpc.ExtensionHostServicePromiseClient.prototype.cancel = +proto.hiddifyrpc.ExtensionHostServicePromiseClient.prototype.close = function(request, metadata) { return this.client_.unaryCall(this.hostname_ + - '/hiddifyrpc.ExtensionHostService/Cancel', + '/hiddifyrpc.ExtensionHostService/Close', request, metadata || {}, - methodDescriptor_ExtensionHostService_Cancel); -}; - - -/** - * @const - * @type {!grpc.web.MethodDescriptor< - * !proto.hiddifyrpc.ExtensionRequest, - * !proto.hiddifyrpc.ExtensionActionResult>} - */ -const methodDescriptor_ExtensionHostService_Stop = new grpc.web.MethodDescriptor( - '/hiddifyrpc.ExtensionHostService/Stop', - grpc.web.MethodType.UNARY, - proto.hiddifyrpc.ExtensionRequest, - proto.hiddifyrpc.ExtensionActionResult, - /** - * @param {!proto.hiddifyrpc.ExtensionRequest} request - * @return {!Uint8Array} - */ - function(request) { - return request.serializeBinary(); - }, - proto.hiddifyrpc.ExtensionActionResult.deserializeBinary -); - - -/** - * @param {!proto.hiddifyrpc.ExtensionRequest} request The - * request proto - * @param {?Object} metadata User defined - * call metadata - * @param {function(?grpc.web.RpcError, ?proto.hiddifyrpc.ExtensionActionResult)} - * callback The callback function(error, response) - * @return {!grpc.web.ClientReadableStream|undefined} - * The XHR Node Readable Stream - */ -proto.hiddifyrpc.ExtensionHostServiceClient.prototype.stop = - function(request, metadata, callback) { - return this.client_.rpcCall(this.hostname_ + - '/hiddifyrpc.ExtensionHostService/Stop', - request, - metadata || {}, - methodDescriptor_ExtensionHostService_Stop, - callback); -}; - - -/** - * @param {!proto.hiddifyrpc.ExtensionRequest} request The - * request proto - * @param {?Object=} metadata User defined - * call metadata - * @return {!Promise} - * Promise that resolves to the response - */ -proto.hiddifyrpc.ExtensionHostServicePromiseClient.prototype.stop = - function(request, metadata) { - return this.client_.unaryCall(this.hostname_ + - '/hiddifyrpc.ExtensionHostService/Stop', - request, - metadata || {}, - methodDescriptor_ExtensionHostService_Stop); + methodDescriptor_ExtensionHostService_Close); }; diff --git a/extension/interface.go b/extension/interface.go index 98839d34..a34681eb 100644 --- a/extension/interface.go +++ b/extension/interface.go @@ -83,7 +83,7 @@ func (s *extensionService) Start() error { func (s *extensionService) Close() error { for _, extension := range enabledExtensionsMap { - if err := (*extension).Stop(); err != nil { + if err := (*extension).Close(); err != nil { return err } } diff --git a/hiddifyrpc/extension.pb.go b/hiddifyrpc/extension.pb.go index 9f52a000..9af07cdb 100644 --- a/hiddifyrpc/extension.pb.go +++ b/hiddifyrpc/extension.pb.go @@ -557,7 +557,7 @@ var file_extension_proto_rawDesc = []byte{ 0x54, 0x48, 0x49, 0x4e, 0x47, 0x10, 0x00, 0x12, 0x0d, 0x0a, 0x09, 0x55, 0x50, 0x44, 0x41, 0x54, 0x45, 0x5f, 0x55, 0x49, 0x10, 0x01, 0x12, 0x0f, 0x0a, 0x0b, 0x53, 0x48, 0x4f, 0x57, 0x5f, 0x44, 0x49, 0x41, 0x4c, 0x4f, 0x47, 0x10, 0x02, 0x12, 0x07, 0x0a, 0x03, 0x45, 0x4e, 0x44, 0x10, 0x03, - 0x32, 0xb9, 0x04, 0x0a, 0x14, 0x45, 0x78, 0x74, 0x65, 0x6e, 0x73, 0x69, 0x6f, 0x6e, 0x48, 0x6f, + 0x32, 0xed, 0x03, 0x0a, 0x14, 0x45, 0x78, 0x74, 0x65, 0x6e, 0x73, 0x69, 0x6f, 0x6e, 0x48, 0x6f, 0x73, 0x74, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x12, 0x40, 0x0a, 0x0e, 0x4c, 0x69, 0x73, 0x74, 0x45, 0x78, 0x74, 0x65, 0x6e, 0x73, 0x69, 0x6f, 0x6e, 0x73, 0x12, 0x11, 0x2e, 0x68, 0x69, 0x64, 0x64, 0x69, 0x66, 0x79, 0x72, 0x70, 0x63, 0x2e, 0x45, 0x6d, 0x70, 0x74, 0x79, 0x1a, 0x19, @@ -578,23 +578,18 @@ var file_extension_proto_rawDesc = []byte{ 0x78, 0x74, 0x65, 0x6e, 0x73, 0x69, 0x6f, 0x6e, 0x44, 0x61, 0x74, 0x61, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x21, 0x2e, 0x68, 0x69, 0x64, 0x64, 0x69, 0x66, 0x79, 0x72, 0x70, 0x63, 0x2e, 0x45, 0x78, 0x74, 0x65, 0x6e, 0x73, 0x69, 0x6f, 0x6e, 0x41, 0x63, 0x74, 0x69, 0x6f, 0x6e, - 0x52, 0x65, 0x73, 0x75, 0x6c, 0x74, 0x22, 0x00, 0x12, 0x4b, 0x0a, 0x06, 0x43, 0x61, 0x6e, 0x63, - 0x65, 0x6c, 0x12, 0x1c, 0x2e, 0x68, 0x69, 0x64, 0x64, 0x69, 0x66, 0x79, 0x72, 0x70, 0x63, 0x2e, - 0x45, 0x78, 0x74, 0x65, 0x6e, 0x73, 0x69, 0x6f, 0x6e, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, - 0x1a, 0x21, 0x2e, 0x68, 0x69, 0x64, 0x64, 0x69, 0x66, 0x79, 0x72, 0x70, 0x63, 0x2e, 0x45, 0x78, - 0x74, 0x65, 0x6e, 0x73, 0x69, 0x6f, 0x6e, 0x41, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x65, 0x73, - 0x75, 0x6c, 0x74, 0x22, 0x00, 0x12, 0x49, 0x0a, 0x04, 0x53, 0x74, 0x6f, 0x70, 0x12, 0x1c, 0x2e, + 0x52, 0x65, 0x73, 0x75, 0x6c, 0x74, 0x22, 0x00, 0x12, 0x4a, 0x0a, 0x05, 0x43, 0x6c, 0x6f, 0x73, + 0x65, 0x12, 0x1c, 0x2e, 0x68, 0x69, 0x64, 0x64, 0x69, 0x66, 0x79, 0x72, 0x70, 0x63, 0x2e, 0x45, + 0x78, 0x74, 0x65, 0x6e, 0x73, 0x69, 0x6f, 0x6e, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, + 0x21, 0x2e, 0x68, 0x69, 0x64, 0x64, 0x69, 0x66, 0x79, 0x72, 0x70, 0x63, 0x2e, 0x45, 0x78, 0x74, + 0x65, 0x6e, 0x73, 0x69, 0x6f, 0x6e, 0x41, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x65, 0x73, 0x75, + 0x6c, 0x74, 0x22, 0x00, 0x12, 0x4a, 0x0a, 0x05, 0x47, 0x65, 0x74, 0x55, 0x49, 0x12, 0x1c, 0x2e, 0x68, 0x69, 0x64, 0x64, 0x69, 0x66, 0x79, 0x72, 0x70, 0x63, 0x2e, 0x45, 0x78, 0x74, 0x65, 0x6e, 0x73, 0x69, 0x6f, 0x6e, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x21, 0x2e, 0x68, 0x69, 0x64, 0x64, 0x69, 0x66, 0x79, 0x72, 0x70, 0x63, 0x2e, 0x45, 0x78, 0x74, 0x65, 0x6e, 0x73, 0x69, 0x6f, 0x6e, 0x41, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x65, 0x73, 0x75, 0x6c, 0x74, 0x22, 0x00, - 0x12, 0x4a, 0x0a, 0x05, 0x47, 0x65, 0x74, 0x55, 0x49, 0x12, 0x1c, 0x2e, 0x68, 0x69, 0x64, 0x64, - 0x69, 0x66, 0x79, 0x72, 0x70, 0x63, 0x2e, 0x45, 0x78, 0x74, 0x65, 0x6e, 0x73, 0x69, 0x6f, 0x6e, - 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x21, 0x2e, 0x68, 0x69, 0x64, 0x64, 0x69, 0x66, - 0x79, 0x72, 0x70, 0x63, 0x2e, 0x45, 0x78, 0x74, 0x65, 0x6e, 0x73, 0x69, 0x6f, 0x6e, 0x41, 0x63, - 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x65, 0x73, 0x75, 0x6c, 0x74, 0x22, 0x00, 0x42, 0x0e, 0x5a, 0x0c, - 0x2e, 0x2f, 0x68, 0x69, 0x64, 0x64, 0x69, 0x66, 0x79, 0x72, 0x70, 0x63, 0x62, 0x06, 0x70, 0x72, - 0x6f, 0x74, 0x6f, 0x33, + 0x42, 0x0e, 0x5a, 0x0c, 0x2e, 0x2f, 0x68, 0x69, 0x64, 0x64, 0x69, 0x66, 0x79, 0x72, 0x70, 0x63, + 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, } var ( @@ -635,18 +630,16 @@ var file_extension_proto_depIdxs = []int32{ 5, // 6: hiddifyrpc.ExtensionHostService.Connect:input_type -> hiddifyrpc.ExtensionRequest 3, // 7: hiddifyrpc.ExtensionHostService.EditExtension:input_type -> hiddifyrpc.EditExtensionRequest 6, // 8: hiddifyrpc.ExtensionHostService.SubmitForm:input_type -> hiddifyrpc.SendExtensionDataRequest - 5, // 9: hiddifyrpc.ExtensionHostService.Cancel:input_type -> hiddifyrpc.ExtensionRequest - 5, // 10: hiddifyrpc.ExtensionHostService.Stop:input_type -> hiddifyrpc.ExtensionRequest - 5, // 11: hiddifyrpc.ExtensionHostService.GetUI:input_type -> hiddifyrpc.ExtensionRequest - 2, // 12: hiddifyrpc.ExtensionHostService.ListExtensions:output_type -> hiddifyrpc.ExtensionList - 7, // 13: hiddifyrpc.ExtensionHostService.Connect:output_type -> hiddifyrpc.ExtensionResponse - 1, // 14: hiddifyrpc.ExtensionHostService.EditExtension:output_type -> hiddifyrpc.ExtensionActionResult - 1, // 15: hiddifyrpc.ExtensionHostService.SubmitForm:output_type -> hiddifyrpc.ExtensionActionResult - 1, // 16: hiddifyrpc.ExtensionHostService.Cancel:output_type -> hiddifyrpc.ExtensionActionResult - 1, // 17: hiddifyrpc.ExtensionHostService.Stop:output_type -> hiddifyrpc.ExtensionActionResult - 1, // 18: hiddifyrpc.ExtensionHostService.GetUI:output_type -> hiddifyrpc.ExtensionActionResult - 12, // [12:19] is the sub-list for method output_type - 5, // [5:12] is the sub-list for method input_type + 5, // 9: hiddifyrpc.ExtensionHostService.Close:input_type -> hiddifyrpc.ExtensionRequest + 5, // 10: hiddifyrpc.ExtensionHostService.GetUI:input_type -> hiddifyrpc.ExtensionRequest + 2, // 11: hiddifyrpc.ExtensionHostService.ListExtensions:output_type -> hiddifyrpc.ExtensionList + 7, // 12: hiddifyrpc.ExtensionHostService.Connect:output_type -> hiddifyrpc.ExtensionResponse + 1, // 13: hiddifyrpc.ExtensionHostService.EditExtension:output_type -> hiddifyrpc.ExtensionActionResult + 1, // 14: hiddifyrpc.ExtensionHostService.SubmitForm:output_type -> hiddifyrpc.ExtensionActionResult + 1, // 15: hiddifyrpc.ExtensionHostService.Close:output_type -> hiddifyrpc.ExtensionActionResult + 1, // 16: hiddifyrpc.ExtensionHostService.GetUI:output_type -> hiddifyrpc.ExtensionActionResult + 11, // [11:17] is the sub-list for method output_type + 5, // [5:11] is the sub-list for method input_type 5, // [5:5] is the sub-list for extension type_name 5, // [5:5] is the sub-list for extension extendee 0, // [0:5] is the sub-list for field type_name diff --git a/hiddifyrpc/extension.proto b/hiddifyrpc/extension.proto index 35f40859..2bbb175b 100644 --- a/hiddifyrpc/extension.proto +++ b/hiddifyrpc/extension.proto @@ -11,8 +11,7 @@ service ExtensionHostService { rpc Connect (ExtensionRequest) returns (stream ExtensionResponse) {} rpc EditExtension (EditExtensionRequest) returns (ExtensionActionResult) {} rpc SubmitForm (SendExtensionDataRequest) returns (ExtensionActionResult) {} - rpc Cancel (ExtensionRequest) returns (ExtensionActionResult) {} - rpc Stop (ExtensionRequest) returns (ExtensionActionResult) {} + rpc Close (ExtensionRequest) returns (ExtensionActionResult) {} rpc GetUI (ExtensionRequest) returns (ExtensionActionResult) {} } diff --git a/hiddifyrpc/extension_grpc.pb.go b/hiddifyrpc/extension_grpc.pb.go index 720b0b49..847d9923 100644 --- a/hiddifyrpc/extension_grpc.pb.go +++ b/hiddifyrpc/extension_grpc.pb.go @@ -23,8 +23,7 @@ const ( ExtensionHostService_Connect_FullMethodName = "/hiddifyrpc.ExtensionHostService/Connect" ExtensionHostService_EditExtension_FullMethodName = "/hiddifyrpc.ExtensionHostService/EditExtension" ExtensionHostService_SubmitForm_FullMethodName = "/hiddifyrpc.ExtensionHostService/SubmitForm" - ExtensionHostService_Cancel_FullMethodName = "/hiddifyrpc.ExtensionHostService/Cancel" - ExtensionHostService_Stop_FullMethodName = "/hiddifyrpc.ExtensionHostService/Stop" + ExtensionHostService_Close_FullMethodName = "/hiddifyrpc.ExtensionHostService/Close" ExtensionHostService_GetUI_FullMethodName = "/hiddifyrpc.ExtensionHostService/GetUI" ) @@ -36,8 +35,7 @@ type ExtensionHostServiceClient interface { Connect(ctx context.Context, in *ExtensionRequest, opts ...grpc.CallOption) (grpc.ServerStreamingClient[ExtensionResponse], error) EditExtension(ctx context.Context, in *EditExtensionRequest, opts ...grpc.CallOption) (*ExtensionActionResult, error) SubmitForm(ctx context.Context, in *SendExtensionDataRequest, opts ...grpc.CallOption) (*ExtensionActionResult, error) - Cancel(ctx context.Context, in *ExtensionRequest, opts ...grpc.CallOption) (*ExtensionActionResult, error) - Stop(ctx context.Context, in *ExtensionRequest, opts ...grpc.CallOption) (*ExtensionActionResult, error) + Close(ctx context.Context, in *ExtensionRequest, opts ...grpc.CallOption) (*ExtensionActionResult, error) GetUI(ctx context.Context, in *ExtensionRequest, opts ...grpc.CallOption) (*ExtensionActionResult, error) } @@ -98,20 +96,10 @@ func (c *extensionHostServiceClient) SubmitForm(ctx context.Context, in *SendExt return out, nil } -func (c *extensionHostServiceClient) Cancel(ctx context.Context, in *ExtensionRequest, opts ...grpc.CallOption) (*ExtensionActionResult, error) { +func (c *extensionHostServiceClient) Close(ctx context.Context, in *ExtensionRequest, opts ...grpc.CallOption) (*ExtensionActionResult, error) { cOpts := append([]grpc.CallOption{grpc.StaticMethod()}, opts...) out := new(ExtensionActionResult) - err := c.cc.Invoke(ctx, ExtensionHostService_Cancel_FullMethodName, in, out, cOpts...) - if err != nil { - return nil, err - } - return out, nil -} - -func (c *extensionHostServiceClient) Stop(ctx context.Context, in *ExtensionRequest, opts ...grpc.CallOption) (*ExtensionActionResult, error) { - cOpts := append([]grpc.CallOption{grpc.StaticMethod()}, opts...) - out := new(ExtensionActionResult) - err := c.cc.Invoke(ctx, ExtensionHostService_Stop_FullMethodName, in, out, cOpts...) + err := c.cc.Invoke(ctx, ExtensionHostService_Close_FullMethodName, in, out, cOpts...) if err != nil { return nil, err } @@ -136,8 +124,7 @@ type ExtensionHostServiceServer interface { Connect(*ExtensionRequest, grpc.ServerStreamingServer[ExtensionResponse]) error EditExtension(context.Context, *EditExtensionRequest) (*ExtensionActionResult, error) SubmitForm(context.Context, *SendExtensionDataRequest) (*ExtensionActionResult, error) - Cancel(context.Context, *ExtensionRequest) (*ExtensionActionResult, error) - Stop(context.Context, *ExtensionRequest) (*ExtensionActionResult, error) + Close(context.Context, *ExtensionRequest) (*ExtensionActionResult, error) GetUI(context.Context, *ExtensionRequest) (*ExtensionActionResult, error) mustEmbedUnimplementedExtensionHostServiceServer() } @@ -161,11 +148,8 @@ func (UnimplementedExtensionHostServiceServer) EditExtension(context.Context, *E func (UnimplementedExtensionHostServiceServer) SubmitForm(context.Context, *SendExtensionDataRequest) (*ExtensionActionResult, error) { return nil, status.Errorf(codes.Unimplemented, "method SubmitForm not implemented") } -func (UnimplementedExtensionHostServiceServer) Cancel(context.Context, *ExtensionRequest) (*ExtensionActionResult, error) { - return nil, status.Errorf(codes.Unimplemented, "method Cancel not implemented") -} -func (UnimplementedExtensionHostServiceServer) Stop(context.Context, *ExtensionRequest) (*ExtensionActionResult, error) { - return nil, status.Errorf(codes.Unimplemented, "method Stop not implemented") +func (UnimplementedExtensionHostServiceServer) Close(context.Context, *ExtensionRequest) (*ExtensionActionResult, error) { + return nil, status.Errorf(codes.Unimplemented, "method Close not implemented") } func (UnimplementedExtensionHostServiceServer) GetUI(context.Context, *ExtensionRequest) (*ExtensionActionResult, error) { return nil, status.Errorf(codes.Unimplemented, "method GetUI not implemented") @@ -256,38 +240,20 @@ func _ExtensionHostService_SubmitForm_Handler(srv interface{}, ctx context.Conte return interceptor(ctx, in, info, handler) } -func _ExtensionHostService_Cancel_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { +func _ExtensionHostService_Close_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { in := new(ExtensionRequest) if err := dec(in); err != nil { return nil, err } if interceptor == nil { - return srv.(ExtensionHostServiceServer).Cancel(ctx, in) + return srv.(ExtensionHostServiceServer).Close(ctx, in) } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: ExtensionHostService_Cancel_FullMethodName, + FullMethod: ExtensionHostService_Close_FullMethodName, } handler := func(ctx context.Context, req interface{}) (interface{}, error) { - return srv.(ExtensionHostServiceServer).Cancel(ctx, req.(*ExtensionRequest)) - } - return interceptor(ctx, in, info, handler) -} - -func _ExtensionHostService_Stop_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { - in := new(ExtensionRequest) - if err := dec(in); err != nil { - return nil, err - } - if interceptor == nil { - return srv.(ExtensionHostServiceServer).Stop(ctx, in) - } - info := &grpc.UnaryServerInfo{ - Server: srv, - FullMethod: ExtensionHostService_Stop_FullMethodName, - } - handler := func(ctx context.Context, req interface{}) (interface{}, error) { - return srv.(ExtensionHostServiceServer).Stop(ctx, req.(*ExtensionRequest)) + return srv.(ExtensionHostServiceServer).Close(ctx, req.(*ExtensionRequest)) } return interceptor(ctx, in, info, handler) } @@ -330,12 +296,8 @@ var ExtensionHostService_ServiceDesc = grpc.ServiceDesc{ Handler: _ExtensionHostService_SubmitForm_Handler, }, { - MethodName: "Cancel", - Handler: _ExtensionHostService_Cancel_Handler, - }, - { - MethodName: "Stop", - Handler: _ExtensionHostService_Stop_Handler, + MethodName: "Close", + Handler: _ExtensionHostService_Close_Handler, }, { MethodName: "GetUI",