NOISSUE - Fix MQTT WebSocket path (#115)

* fix mqtt websocket route

Signed-off-by: Arvindh <arvindh91@gmail.com>

* fix mqtt ws example clients

Signed-off-by: Arvindh <arvindh91@gmail.com>

---------

Signed-off-by: Arvindh <arvindh91@gmail.com>

Author: arvindh123

examples/client/websocket/with_mtls/main.go

@@ -11,7 +11,7 @@ import (
 )
 
 var (
-	brokerAddress = "wss://localhost:8085/mqtt"
+	brokerAddress = "wss://localhost:8085/mgate-ws"
 	topic         = "test/topic"
 	payload       = "Hello mGate"
 	certFile      = "ssl/certs/client.crt"

examples/client/websocket/with_tls/main.go

@@ -11,7 +11,7 @@ import (
 )
 
 var (
-	brokerAddress = "wss://localhost:8084"
+	brokerAddress = "wss://localhost:8084/mgate-ws"
 	topic         = "test/topic"
 	payload       = "Hello mGate"
 	certFile      = ""

examples/client/websocket/without_tls/main.go

@@ -11,7 +11,7 @@ import (
 )
 
 var (
-	brokerAddress = "ws://localhost:8083"
+	brokerAddress = "ws://localhost:8083/mgate-ws"
 	topic         = "test/topic"
 	payload       = "Hello mGate"
 )

pkg/mqtt/websocket/websocket.go

@@ -16,7 +16,6 @@ import (
 	"github.com/absmach/mgate"
 	"github.com/absmach/mgate/pkg/session"
 	mptls "github.com/absmach/mgate/pkg/tls"
-	"github.com/absmach/mgate/pkg/transport"
 	"github.com/gorilla/websocket"
 	"golang.org/x/sync/errgroup"
 )
@@ -53,13 +52,10 @@ var upgrader = websocket.Upgrader{
 }
 
 func (p Proxy) ServeHTTP(w http.ResponseWriter, r *http.Request) {
-	if !strings.HasPrefix(r.URL.Path, transport.AddSuffixSlash(p.config.PathPrefix+p.config.TargetPath)) {
+	if !strings.HasPrefix(r.URL.Path, p.config.PathPrefix) {
 		http.NotFound(w, r)
 		return
 	}
-
-	r.URL.Path = strings.TrimPrefix(r.URL.Path, p.config.PathPrefix)
-
 	cconn, err := upgrader.Upgrade(w, r, nil)
 	if err != nil {
 		p.logger.Error("Error upgrading connection", slog.Any("error", err))
@@ -80,7 +76,8 @@ func (p Proxy) pass(in *websocket.Conn) {
 	dialer := &websocket.Dialer{
 		Subprotocols: []string{"mqtt"},
 	}
-	target := fmt.Sprintf("%s://%s:%s", p.config.TargetProtocol, p.config.TargetHost, p.config.TargetPath)
+
+	target := fmt.Sprintf("%s://%s:%s%s", p.config.TargetProtocol, p.config.TargetHost, p.config.TargetPort, p.config.TargetPath)
 
 	srv, _, err := dialer.Dial(target, nil)
 	if err != nil {
@@ -122,7 +119,7 @@ func (p Proxy) Listen(ctx context.Context) error {
 
 	mux := http.NewServeMux()
 
-	mux.Handle(transport.AddSuffixSlash(p.config.PathPrefix), p)
+	mux.Handle(p.config.PathPrefix, p)
 	server.Handler = mux
 
 	g.Go(func() error {