Skip to content

Commit

Permalink
remove cancel and use better alternative close and Submit Data
Browse files Browse the repository at this point in the history
  • Loading branch information
@hiddify-com
hiddify-com committed Oct 1, 2024
1 parent 5df3c5b commit 9cc2b01
Show file tree
Hide file tree
Showing 7 changed files with 53 additions and 240 deletions.
25 changes: 3 additions & 22 deletions extension/extension_host.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand All @@ -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,
Expand All @@ -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())
Expand Down
77 changes: 8 additions & 69 deletions extension/html/rpc.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand All @@ -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);
};

Expand All @@ -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);
};


Expand Down
77 changes: 8 additions & 69 deletions extension/html/rpc/extension_grpc_web_pb.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand All @@ -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);
};

Expand All @@ -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);
};


Expand Down
2 changes: 1 addition & 1 deletion extension/interface.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
}
}
Expand Down
45 changes: 19 additions & 26 deletions hiddifyrpc/extension.pb.go
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 1 addition & 2 deletions hiddifyrpc/extension.proto
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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) {}
}
Expand Down
Loading

0 comments on commit 9cc2b01

Please sign in to comment.