Rewrite magic client

internal/exec/exec.go

@@ -5,6 +5,11 @@ import (
 	"encoding/hex"
 	"errors"
 	"fmt"
+	"os"
+	"os/exec"
+	"sync"
+	"time"
+
 	"github.com/AlexxIT/go2rtc/internal/app"
 	"github.com/AlexxIT/go2rtc/internal/rtsp"
 	"github.com/AlexxIT/go2rtc/internal/streams"
@@ -13,10 +18,6 @@ import (
 	pkg "github.com/AlexxIT/go2rtc/pkg/rtsp"
 	"github.com/AlexxIT/go2rtc/pkg/shell"
 	"github.com/rs/zerolog"
-	"os"
-	"os/exec"
-	"sync"
-	"time"
 )
 
 func Init() {
@@ -82,15 +83,7 @@ func handlePipe(url string, cmd *exec.Cmd) (core.Producer, error) {
 		return nil, err
 	}
 
-	client := magic.NewClient(r)
-	if err = client.Probe(); err != nil {
-		return nil, err
-	}
-
-	client.Desc = "exec active producer"
-	client.URL = url
-
-	return client, nil
+	return magic.Open(r)
 }
 
 func handleRTSP(url, path string, cmd *exec.Cmd) (core.Producer, error) {

internal/http/http.go

@@ -6,7 +6,6 @@ import (
 	"net/http"
 	"net/url"
 	"strings"
-	"time"
 
 	"github.com/AlexxIT/go2rtc/internal/streams"
 	"github.com/AlexxIT/go2rtc/pkg/core"
@@ -67,14 +66,11 @@ func handleHTTP(url string) (core.Producer, error) {
 	default: // "video/mpeg":
 	}
 
-	client := magic.NewClient(res.Body)
-	if err = client.Probe(); err != nil {
+	client, err := magic.Open(res.Body)
+	if err != nil {
 		return nil, err
 	}
 
-	client.Desc = "HTTP active producer"
-	client.URL = url
-
 	return client, nil
 }
 
@@ -84,18 +80,10 @@ func handleTCP(rawURL string) (core.Producer, error) {
 		return nil, err
 	}
 
-	conn, err := net.DialTimeout("tcp", u.Host, time.Second*3)
+	conn, err := net.DialTimeout("tcp", u.Host, core.ConnDialTimeout)
 	if err != nil {
 		return nil, err
 	}
 
-	client := magic.NewClient(conn)
-	if err = client.Probe(); err != nil {
-		return nil, err
-	}
-
-	client.Desc = "TCP active producer"
-	client.URL = rawURL
-
-	return client, nil
+	return magic.Open(conn)
 }