remove cancel and use better alternative close and Submit Data

2024-10-01 08:20:30 +02:00
parent 5df3c5bc59
commit 9cc2b014f2
7 changed files with 53 additions and 240 deletions
--- 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())
--- 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<!proto.hiddifyrpc.ExtensionActionResult>|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<!proto.hiddifyrpc.ExtensionActionResult>}
 *     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<string, string>} metadata User defined
- *     call metadata
- * @param {function(?grpc.web.RpcError, ?proto.hiddifyrpc.ExtensionActionResult)}
- *     callback The callback function(error, response)
- * @return {!grpc.web.ClientReadableStream<!proto.hiddifyrpc.ExtensionActionResult>|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<string, string>=} metadata User defined
- *     call metadata
- * @return {!Promise<!proto.hiddifyrpc.ExtensionActionResult>}
- *     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);
 };


--- 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<!proto.hiddifyrpc.ExtensionActionResult>|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<!proto.hiddifyrpc.ExtensionActionResult>}
 *     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<string, string>} metadata User defined
- *     call metadata
- * @param {function(?grpc.web.RpcError, ?proto.hiddifyrpc.ExtensionActionResult)}
- *     callback The callback function(error, response)
- * @return {!grpc.web.ClientReadableStream<!proto.hiddifyrpc.ExtensionActionResult>|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<string, string>=} metadata User defined
- *     call metadata
- * @return {!Promise<!proto.hiddifyrpc.ExtensionActionResult>}
- *     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);
 };


--- 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
 		}
 	}