From 61cadc6feb0c49667a3276ddd4ede23663c162a2 Mon Sep 17 00:00:00 2001 From: Shulhan Date: Fri, 9 Apr 2021 19:47:21 +0700 Subject: all: wrap the websocket Run response inside the EndpointResponse Any response from the trunks API must have the following format, { "code": , "message": , "data": } --- trunks.go | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/trunks.go b/trunks.go index 4a1ebc9..8952b5c 100644 --- a/trunks.go +++ b/trunks.go @@ -451,7 +451,16 @@ func (trunks *Trunks) apiTargetRunWebSocket(epr *libhttp.EndpointRequest) ([]byt req.mergeWebSocketTarget(trunks.Env, origTarget, origWsTarget) - return req.WebSocketTarget.Run(req) + res, err := req.WebSocketTarget.Run(req) + if err != nil { + return nil, errInternal(err) + } + + epres := libhttp.EndpointResponse{} + epres.Code = http.StatusOK + epres.Data = res + + return json.Marshal(&epres) } func (trunks *Trunks) apiTargets(epr *libhttp.EndpointRequest) (resbody []byte, err error) { -- cgit v1.3