feat: enhance media service capabilities and add comprehensive tests
- Implemented methods to retrieve media service capabilities and video encoder configuration options. - Added new types for media service capabilities, video encoder options, and audio configurations. - Introduced unit tests for media service operations, including GetProfiles, GetProfile, and GetStreamURI, ensuring proper functionality and response validation. - Improved error handling and response parsing in media-related methods.
This commit is contained in:
@@ -3,7 +3,9 @@ package onvif
|
||||
import (
|
||||
"context"
|
||||
"crypto/md5"
|
||||
"crypto/rand"
|
||||
"crypto/tls"
|
||||
"encoding/hex"
|
||||
"fmt"
|
||||
"io"
|
||||
"net"
|
||||
@@ -14,6 +16,20 @@ import (
|
||||
"time"
|
||||
)
|
||||
|
||||
// Default client configuration constants
|
||||
const (
|
||||
// DefaultTimeout is the default HTTP client timeout
|
||||
DefaultTimeout = 30 * time.Second
|
||||
// DefaultIdleConnTimeout is the default idle connection timeout
|
||||
DefaultIdleConnTimeout = 90 * time.Second
|
||||
// DefaultMaxIdleConns is the default maximum idle connections
|
||||
DefaultMaxIdleConns = 10
|
||||
// DefaultMaxIdleConnsPerHost is the default maximum idle connections per host
|
||||
DefaultMaxIdleConnsPerHost = 5
|
||||
// NonceSize is the size of the nonce for digest authentication
|
||||
NonceSize = 16
|
||||
)
|
||||
|
||||
// Client represents an ONVIF client for communicating with IP cameras
|
||||
type Client struct {
|
||||
endpoint string
|
||||
@@ -82,11 +98,11 @@ func NewClient(endpoint string, opts ...ClientOption) (*Client, error) {
|
||||
client := &Client{
|
||||
endpoint: normalizedEndpoint,
|
||||
httpClient: &http.Client{
|
||||
Timeout: 30 * time.Second,
|
||||
Timeout: DefaultTimeout,
|
||||
Transport: &http.Transport{
|
||||
MaxIdleConns: 10,
|
||||
MaxIdleConnsPerHost: 5,
|
||||
IdleConnTimeout: 90 * time.Second,
|
||||
MaxIdleConns: DefaultMaxIdleConns,
|
||||
MaxIdleConnsPerHost: DefaultMaxIdleConnsPerHost,
|
||||
IdleConnTimeout: DefaultIdleConnTimeout,
|
||||
},
|
||||
// Don't follow redirects automatically
|
||||
// This prevents http:// from being silently upgraded to https://
|
||||
@@ -277,24 +293,21 @@ func (c *Client) downloadWithBasicAuth(ctx context.Context, downloadURL string)
|
||||
bodyStr = bodyStr[:200] + "..."
|
||||
}
|
||||
|
||||
// Base error message for programmatic use
|
||||
errorMsg := fmt.Sprintf("download failed with status code %d", resp.StatusCode)
|
||||
|
||||
// Add structured error details
|
||||
switch resp.StatusCode {
|
||||
case http.StatusUnauthorized:
|
||||
errorMsg += "\n ❌ Authentication failed (401 Unauthorized)"
|
||||
errorMsg += "\n 💡 Basic auth failed; trying digest auth..."
|
||||
errorMsg += ": authentication failed (401 Unauthorized); basic auth failed, trying digest auth"
|
||||
case http.StatusForbidden:
|
||||
errorMsg += "\n ❌ Access denied (403 Forbidden)"
|
||||
errorMsg += "\n 💡 User may not have permission to download snapshots"
|
||||
errorMsg += "\n 💡 Check camera user role/permissions"
|
||||
errorMsg += ": access denied (403 Forbidden); user may not have permission to download snapshots"
|
||||
case http.StatusNotFound:
|
||||
errorMsg += "\n ❌ Snapshot URI not found (404)"
|
||||
errorMsg += "\n 💡 Camera may have revoked the URI"
|
||||
errorMsg += "\n 💡 Try getting a fresh snapshot URI"
|
||||
errorMsg += ": snapshot URI not found (404); camera may have revoked the URI, try getting a fresh snapshot URI"
|
||||
}
|
||||
|
||||
if bodyStr != "" && resp.StatusCode != http.StatusOK {
|
||||
errorMsg += fmt.Sprintf("\n 📝 Response: %s", bodyStr)
|
||||
if bodyStr != "" {
|
||||
errorMsg += fmt.Sprintf("; response: %s", bodyStr)
|
||||
}
|
||||
|
||||
return nil, fmt.Errorf("%s", errorMsg)
|
||||
@@ -317,12 +330,12 @@ func (c *Client) downloadWithDigestAuth(ctx context.Context, downloadURL string)
|
||||
// Create a custom transport with digest auth
|
||||
tr := &http.Transport{
|
||||
Dial: (&net.Dialer{
|
||||
Timeout: 30 * time.Second,
|
||||
KeepAlive: 30 * time.Second,
|
||||
Timeout: DefaultTimeout,
|
||||
KeepAlive: DefaultTimeout,
|
||||
}).Dial,
|
||||
MaxIdleConns: 10,
|
||||
MaxIdleConnsPerHost: 5,
|
||||
IdleConnTimeout: 90 * time.Second,
|
||||
MaxIdleConns: DefaultMaxIdleConns,
|
||||
MaxIdleConnsPerHost: DefaultMaxIdleConnsPerHost,
|
||||
IdleConnTimeout: DefaultIdleConnTimeout,
|
||||
}
|
||||
|
||||
// Create a custom HTTP client for digest auth
|
||||
@@ -332,7 +345,7 @@ func (c *Client) downloadWithDigestAuth(ctx context.Context, downloadURL string)
|
||||
username: c.username,
|
||||
password: c.password,
|
||||
},
|
||||
Timeout: 30 * time.Second,
|
||||
Timeout: DefaultTimeout,
|
||||
}
|
||||
|
||||
req, err := http.NewRequestWithContext(ctx, "GET", downloadURL, nil)
|
||||
@@ -360,20 +373,15 @@ func (c *Client) downloadWithDigestAuth(ctx context.Context, downloadURL string)
|
||||
|
||||
switch resp.StatusCode {
|
||||
case http.StatusUnauthorized:
|
||||
errorMsg += "\n ❌ Digest authentication failed (401 Unauthorized)"
|
||||
errorMsg += "\n 💡 Check camera credentials (username/password)"
|
||||
errorMsg += "\n 💡 Try accessing the snapshot URL manually:"
|
||||
errorMsg += fmt.Sprintf("\n curl --digest -u username:password '%s'", downloadURL)
|
||||
errorMsg += ": digest authentication failed (401 Unauthorized); check camera credentials (username/password)"
|
||||
case http.StatusForbidden:
|
||||
errorMsg += "\n ❌ Access denied (403 Forbidden)"
|
||||
errorMsg += "\n 💡 User may not have permission to download snapshots"
|
||||
errorMsg += ": access denied (403 Forbidden); user may not have permission to download snapshots"
|
||||
case http.StatusNotFound:
|
||||
errorMsg += "\n ❌ Snapshot URI not found (404)"
|
||||
errorMsg += "\n 💡 Try getting a fresh snapshot URI"
|
||||
errorMsg += ": snapshot URI not found (404); try getting a fresh snapshot URI"
|
||||
}
|
||||
|
||||
if bodyStr != "" {
|
||||
errorMsg += fmt.Sprintf("\n 📝 Response: %s", bodyStr)
|
||||
errorMsg += fmt.Sprintf("; response: %s", bodyStr)
|
||||
}
|
||||
|
||||
return nil, fmt.Errorf("%s", errorMsg)
|
||||
@@ -493,7 +501,12 @@ func md5sum(s string) interface{} {
|
||||
return h.Sum(nil)
|
||||
}
|
||||
|
||||
// generateNonce generates a cryptographically secure random nonce for digest authentication
|
||||
func generateNonce() string {
|
||||
// Generate a simple nonce
|
||||
return fmt.Sprintf("%d", time.Now().UnixNano())
|
||||
bytes := make([]byte, NonceSize)
|
||||
if _, err := rand.Read(bytes); err != nil {
|
||||
// Fallback to time-based nonce if crypto/rand fails (shouldn't happen)
|
||||
return fmt.Sprintf("%d", time.Now().UnixNano())
|
||||
}
|
||||
return hex.EncodeToString(bytes)
|
||||
}
|
||||
|
||||
+505
@@ -2,7 +2,9 @@ package onvif
|
||||
|
||||
import (
|
||||
"context"
|
||||
"encoding/hex"
|
||||
"fmt"
|
||||
"net"
|
||||
"net/http"
|
||||
"net/http/httptest"
|
||||
"net/url"
|
||||
@@ -794,3 +796,506 @@ func TestInitializeWithLocalhostURLs(t *testing.T) {
|
||||
t.Errorf("Imaging endpoint still contains 0.0.0.0: %v", client.imagingEndpoint)
|
||||
}
|
||||
}
|
||||
|
||||
// TestDownloadFileWithBasicAuth tests DownloadFile with basic authentication
|
||||
func TestDownloadFileWithBasicAuth(t *testing.T) {
|
||||
// Create a mock server that requires basic auth
|
||||
server := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
|
||||
username, password, ok := r.BasicAuth()
|
||||
if !ok || username != "admin" || password != "password" {
|
||||
w.WriteHeader(http.StatusUnauthorized)
|
||||
return
|
||||
}
|
||||
w.Header().Set("Content-Type", "image/jpeg")
|
||||
w.WriteHeader(http.StatusOK)
|
||||
_, _ = w.Write([]byte("fake image data"))
|
||||
}))
|
||||
defer server.Close()
|
||||
|
||||
client, err := NewClient(
|
||||
server.URL,
|
||||
WithCredentials("admin", "password"),
|
||||
)
|
||||
if err != nil {
|
||||
t.Fatalf("NewClient() failed: %v", err)
|
||||
}
|
||||
|
||||
ctx := context.Background()
|
||||
data, err := client.DownloadFile(ctx, server.URL)
|
||||
if err != nil {
|
||||
t.Fatalf("DownloadFile() failed: %v", err)
|
||||
}
|
||||
|
||||
if string(data) != "fake image data" {
|
||||
t.Errorf("DownloadFile() = %q, want %q", string(data), "fake image data")
|
||||
}
|
||||
}
|
||||
|
||||
// TestDownloadFileWithDigestAuth tests DownloadFile with digest authentication
|
||||
func TestDownloadFileWithDigestAuth(t *testing.T) {
|
||||
nonce := "test-nonce-12345"
|
||||
realm := "test-realm"
|
||||
opaque := "test-opaque"
|
||||
|
||||
// Create a mock server that requires digest auth
|
||||
server := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
|
||||
authHeader := r.Header.Get("Authorization")
|
||||
if authHeader == "" || !strings.HasPrefix(authHeader, "Digest ") {
|
||||
// First request - return 401 with digest challenge
|
||||
w.Header().Set("WWW-Authenticate", fmt.Sprintf(
|
||||
`Digest realm="%s", nonce="%s", opaque="%s", qop="auth"`,
|
||||
realm, nonce, opaque))
|
||||
w.WriteHeader(http.StatusUnauthorized)
|
||||
return
|
||||
}
|
||||
// Second request with auth - accept it
|
||||
w.Header().Set("Content-Type", "image/jpeg")
|
||||
w.WriteHeader(http.StatusOK)
|
||||
_, _ = w.Write([]byte("fake image data with digest"))
|
||||
}))
|
||||
defer server.Close()
|
||||
|
||||
client, err := NewClient(
|
||||
server.URL,
|
||||
WithCredentials("admin", "password"),
|
||||
)
|
||||
if err != nil {
|
||||
t.Fatalf("NewClient() failed: %v", err)
|
||||
}
|
||||
|
||||
ctx := context.Background()
|
||||
data, err := client.DownloadFile(ctx, server.URL)
|
||||
if err != nil {
|
||||
t.Fatalf("DownloadFile() failed: %v", err)
|
||||
}
|
||||
|
||||
if string(data) != "fake image data with digest" {
|
||||
t.Errorf("DownloadFile() = %q, want %q", string(data), "fake image data with digest")
|
||||
}
|
||||
}
|
||||
|
||||
// TestDownloadFileUnauthorized tests DownloadFile with invalid credentials
|
||||
func TestDownloadFileUnauthorized(t *testing.T) {
|
||||
server := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
|
||||
w.WriteHeader(http.StatusUnauthorized)
|
||||
}))
|
||||
defer server.Close()
|
||||
|
||||
client, err := NewClient(
|
||||
server.URL,
|
||||
WithCredentials("wrong", "wrong"),
|
||||
)
|
||||
if err != nil {
|
||||
t.Fatalf("NewClient() failed: %v", err)
|
||||
}
|
||||
|
||||
ctx := context.Background()
|
||||
_, err = client.DownloadFile(ctx, server.URL)
|
||||
if err == nil {
|
||||
t.Error("DownloadFile() expected error for unauthorized request")
|
||||
}
|
||||
if !strings.Contains(err.Error(), "401") {
|
||||
t.Errorf("Expected 401 error, got: %v", err)
|
||||
}
|
||||
}
|
||||
|
||||
// TestDownloadFileNotFound tests DownloadFile with 404 response
|
||||
func TestDownloadFileNotFound(t *testing.T) {
|
||||
server := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
|
||||
w.WriteHeader(http.StatusNotFound)
|
||||
_, _ = w.Write([]byte("not found"))
|
||||
}))
|
||||
defer server.Close()
|
||||
|
||||
client, err := NewClient(server.URL)
|
||||
if err != nil {
|
||||
t.Fatalf("NewClient() failed: %v", err)
|
||||
}
|
||||
|
||||
ctx := context.Background()
|
||||
_, err = client.DownloadFile(ctx, server.URL)
|
||||
if err == nil {
|
||||
t.Error("DownloadFile() expected error for 404 response")
|
||||
}
|
||||
if !strings.Contains(err.Error(), "404") {
|
||||
t.Errorf("Expected 404 error, got: %v", err)
|
||||
}
|
||||
}
|
||||
|
||||
// TestDownloadFileForbidden tests DownloadFile with 403 response
|
||||
func TestDownloadFileForbidden(t *testing.T) {
|
||||
server := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
|
||||
w.WriteHeader(http.StatusForbidden)
|
||||
}))
|
||||
defer server.Close()
|
||||
|
||||
client, err := NewClient(server.URL)
|
||||
if err != nil {
|
||||
t.Fatalf("NewClient() failed: %v", err)
|
||||
}
|
||||
|
||||
ctx := context.Background()
|
||||
_, err = client.DownloadFile(ctx, server.URL)
|
||||
if err == nil {
|
||||
t.Error("DownloadFile() expected error for 403 response")
|
||||
}
|
||||
if !strings.Contains(err.Error(), "403") {
|
||||
t.Errorf("Expected 403 error, got: %v", err)
|
||||
}
|
||||
}
|
||||
|
||||
// TestDownloadFileNetworkError tests DownloadFile with network error
|
||||
func TestDownloadFileNetworkError(t *testing.T) {
|
||||
client, err := NewClient("http://192.168.999.999/onvif")
|
||||
if err != nil {
|
||||
t.Fatalf("NewClient() failed: %v", err)
|
||||
}
|
||||
|
||||
ctx, cancel := context.WithTimeout(context.Background(), 100*time.Millisecond)
|
||||
defer cancel()
|
||||
|
||||
_, err = client.DownloadFile(ctx, "http://192.168.999.999/nonexistent")
|
||||
if err == nil {
|
||||
t.Error("DownloadFile() expected error for network failure")
|
||||
}
|
||||
}
|
||||
|
||||
// TestDigestAuthTransport tests the digest authentication transport
|
||||
func TestDigestAuthTransport(t *testing.T) {
|
||||
nonce := "test-nonce"
|
||||
realm := "test-realm"
|
||||
opaque := "test-opaque"
|
||||
|
||||
server := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
|
||||
authHeader := r.Header.Get("Authorization")
|
||||
if authHeader == "" || !strings.HasPrefix(authHeader, "Digest ") {
|
||||
w.Header().Set("WWW-Authenticate", fmt.Sprintf(
|
||||
`Digest realm="%s", nonce="%s", opaque="%s", qop="auth"`,
|
||||
realm, nonce, opaque))
|
||||
w.WriteHeader(http.StatusUnauthorized)
|
||||
return
|
||||
}
|
||||
// Verify digest auth header contains required fields
|
||||
if !strings.Contains(authHeader, `username="admin"`) {
|
||||
t.Error("Digest auth header missing username")
|
||||
}
|
||||
if !strings.Contains(authHeader, `realm="`+realm+`"`) {
|
||||
t.Error("Digest auth header missing realm")
|
||||
}
|
||||
if !strings.Contains(authHeader, `nonce="`+nonce+`"`) {
|
||||
t.Error("Digest auth header missing nonce")
|
||||
}
|
||||
w.WriteHeader(http.StatusOK)
|
||||
_, _ = w.Write([]byte("success"))
|
||||
}))
|
||||
defer server.Close()
|
||||
|
||||
tr := &http.Transport{
|
||||
Dial: (&net.Dialer{
|
||||
Timeout: DefaultTimeout,
|
||||
KeepAlive: DefaultTimeout,
|
||||
}).Dial,
|
||||
}
|
||||
|
||||
digestClient := &http.Client{
|
||||
Transport: &digestAuthTransport{
|
||||
transport: tr,
|
||||
username: "admin",
|
||||
password: "password",
|
||||
},
|
||||
Timeout: DefaultTimeout,
|
||||
}
|
||||
|
||||
req, err := http.NewRequest("GET", server.URL, nil)
|
||||
if err != nil {
|
||||
t.Fatalf("NewRequest() failed: %v", err)
|
||||
}
|
||||
|
||||
resp, err := digestClient.Do(req)
|
||||
if err != nil {
|
||||
t.Fatalf("Do() failed: %v", err)
|
||||
}
|
||||
defer func() { _ = resp.Body.Close() }()
|
||||
|
||||
if resp.StatusCode != http.StatusOK {
|
||||
t.Errorf("Expected 200, got %d", resp.StatusCode)
|
||||
}
|
||||
}
|
||||
|
||||
// TestExtractParam tests the extractParam helper function
|
||||
func TestExtractParam(t *testing.T) {
|
||||
tests := []struct {
|
||||
name string
|
||||
authHeader string
|
||||
param string
|
||||
expected string
|
||||
}{
|
||||
{
|
||||
name: "extract realm",
|
||||
authHeader: `Digest realm="test-realm", nonce="123"`,
|
||||
param: "realm",
|
||||
expected: "test-realm",
|
||||
},
|
||||
{
|
||||
name: "extract nonce",
|
||||
authHeader: `Digest realm="test", nonce="abc123"`,
|
||||
param: "nonce",
|
||||
expected: "abc123",
|
||||
},
|
||||
{
|
||||
name: "extract qop",
|
||||
authHeader: `Digest realm="test", qop="auth"`,
|
||||
param: "qop",
|
||||
expected: "auth",
|
||||
},
|
||||
{
|
||||
name: "missing param",
|
||||
authHeader: `Digest realm="test"`,
|
||||
param: "nonce",
|
||||
expected: "",
|
||||
},
|
||||
{
|
||||
name: "empty header",
|
||||
authHeader: "",
|
||||
param: "realm",
|
||||
expected: "",
|
||||
},
|
||||
}
|
||||
|
||||
for _, tt := range tests {
|
||||
t.Run(tt.name, func(t *testing.T) {
|
||||
result := extractParam(tt.authHeader, tt.param)
|
||||
if result != tt.expected {
|
||||
t.Errorf("extractParam() = %q, want %q", result, tt.expected)
|
||||
}
|
||||
})
|
||||
}
|
||||
}
|
||||
|
||||
// TestGenerateNonce tests nonce generation
|
||||
func TestGenerateNonce(t *testing.T) {
|
||||
// Generate multiple nonces and verify they're different and valid hex
|
||||
nonces := make(map[string]bool)
|
||||
for i := 0; i < 10; i++ {
|
||||
nonce := generateNonce()
|
||||
if len(nonce) != NonceSize*2 { // hex encoding doubles the length
|
||||
t.Errorf("generateNonce() length = %d, want %d", len(nonce), NonceSize*2)
|
||||
}
|
||||
// Verify it's valid hex
|
||||
_, err := hex.DecodeString(nonce)
|
||||
if err != nil {
|
||||
t.Errorf("generateNonce() returned invalid hex: %v", err)
|
||||
}
|
||||
nonces[nonce] = true
|
||||
}
|
||||
|
||||
// Verify nonces are unique (very unlikely to collide with crypto/rand)
|
||||
if len(nonces) < 10 {
|
||||
t.Error("generateNonce() generated duplicate nonces")
|
||||
}
|
||||
}
|
||||
|
||||
// TestMd5Hash tests MD5 hash function
|
||||
func TestMd5Hash(t *testing.T) {
|
||||
tests := []struct {
|
||||
name string
|
||||
input string
|
||||
expected string // Expected MD5 hash in hex
|
||||
}{
|
||||
{
|
||||
name: "empty string",
|
||||
input: "",
|
||||
expected: "d41d8cd98f00b204e9800998ecf8427e",
|
||||
},
|
||||
{
|
||||
name: "simple string",
|
||||
input: "test",
|
||||
expected: "098f6bcd4621d373cade4e832627b4f6",
|
||||
},
|
||||
}
|
||||
|
||||
for _, tt := range tests {
|
||||
t.Run(tt.name, func(t *testing.T) {
|
||||
result := md5Hash(tt.input)
|
||||
if result != tt.expected {
|
||||
t.Errorf("md5Hash(%q) = %q, want %q", tt.input, result, tt.expected)
|
||||
}
|
||||
})
|
||||
}
|
||||
}
|
||||
|
||||
// TestErrorTypes tests error type checking
|
||||
func TestErrorTypes(t *testing.T) {
|
||||
t.Run("IsONVIFError with ONVIFError", func(t *testing.T) {
|
||||
err := NewONVIFError("Sender", "InvalidArgs", "test message")
|
||||
if !IsONVIFError(err) {
|
||||
t.Error("IsONVIFError() returned false for ONVIFError")
|
||||
}
|
||||
})
|
||||
|
||||
t.Run("IsONVIFError with regular error", func(t *testing.T) {
|
||||
err := fmt.Errorf("regular error")
|
||||
if IsONVIFError(err) {
|
||||
t.Error("IsONVIFError() returned true for regular error")
|
||||
}
|
||||
})
|
||||
|
||||
t.Run("IsONVIFError with wrapped ONVIFError", func(t *testing.T) {
|
||||
onvifErr := NewONVIFError("Sender", "InvalidArgs", "test")
|
||||
wrappedErr := fmt.Errorf("wrapped: %w", onvifErr)
|
||||
if !IsONVIFError(wrappedErr) {
|
||||
t.Error("IsONVIFError() returned false for wrapped ONVIFError")
|
||||
}
|
||||
})
|
||||
}
|
||||
|
||||
// TestClientConcurrency tests concurrent access to client
|
||||
func TestClientConcurrency(t *testing.T) {
|
||||
client, err := NewClient("http://192.168.1.100/onvif")
|
||||
if err != nil {
|
||||
t.Fatalf("NewClient() failed: %v", err)
|
||||
}
|
||||
|
||||
// Test concurrent credential access
|
||||
done := make(chan bool)
|
||||
for i := 0; i < 10; i++ {
|
||||
go func(id int) {
|
||||
client.SetCredentials(fmt.Sprintf("user%d", id), "pass")
|
||||
user, pass := client.GetCredentials()
|
||||
if user == "" || pass == "" {
|
||||
t.Error("Concurrent credential access failed")
|
||||
}
|
||||
done <- true
|
||||
}(i)
|
||||
}
|
||||
|
||||
// Wait for all goroutines
|
||||
for i := 0; i < 10; i++ {
|
||||
<-done
|
||||
}
|
||||
}
|
||||
|
||||
// TestNormalizeEndpointErrorCases tests error cases for normalizeEndpoint
|
||||
func TestNormalizeEndpointErrorCases(t *testing.T) {
|
||||
tests := []struct {
|
||||
name string
|
||||
input string
|
||||
wantErr bool
|
||||
}{
|
||||
{
|
||||
name: "empty string",
|
||||
input: "",
|
||||
wantErr: true,
|
||||
},
|
||||
{
|
||||
name: "invalid URL",
|
||||
input: "://invalid",
|
||||
wantErr: false, // normalizeEndpoint treats this as IP without scheme
|
||||
},
|
||||
{
|
||||
name: "URL with empty host",
|
||||
input: "http:///path",
|
||||
wantErr: true,
|
||||
},
|
||||
}
|
||||
|
||||
for _, tt := range tests {
|
||||
t.Run(tt.name, func(t *testing.T) {
|
||||
_, err := normalizeEndpoint(tt.input)
|
||||
if (err != nil) != tt.wantErr {
|
||||
t.Errorf("normalizeEndpoint() error = %v, wantErr %v", err, tt.wantErr)
|
||||
}
|
||||
})
|
||||
}
|
||||
}
|
||||
|
||||
// TestFixLocalhostURLEdgeCases tests edge cases for fixLocalhostURL
|
||||
func TestFixLocalhostURLEdgeCases(t *testing.T) {
|
||||
tests := []struct {
|
||||
name string
|
||||
clientURL string
|
||||
serviceURL string
|
||||
expectedURL string
|
||||
}{
|
||||
{
|
||||
name: "invalid service URL",
|
||||
clientURL: "http://192.168.1.100/onvif",
|
||||
serviceURL: "://invalid",
|
||||
expectedURL: "://invalid", // Should return original on parse error
|
||||
},
|
||||
{
|
||||
name: "invalid client URL",
|
||||
clientURL: "://invalid",
|
||||
serviceURL: "http://localhost/path",
|
||||
expectedURL: "http://localhost/path", // Should return original on parse error
|
||||
},
|
||||
{
|
||||
name: "service URL with query params",
|
||||
clientURL: "http://192.168.1.100/onvif",
|
||||
serviceURL: "http://localhost/path?param=value",
|
||||
expectedURL: "http://192.168.1.100/path?param=value",
|
||||
},
|
||||
}
|
||||
|
||||
for _, tt := range tests {
|
||||
t.Run(tt.name, func(t *testing.T) {
|
||||
client := &Client{
|
||||
endpoint: tt.clientURL,
|
||||
}
|
||||
|
||||
result := client.fixLocalhostURL(tt.serviceURL)
|
||||
if result != tt.expectedURL {
|
||||
t.Errorf("fixLocalhostURL() = %q, want %q", result, tt.expectedURL)
|
||||
}
|
||||
})
|
||||
}
|
||||
}
|
||||
|
||||
// TestWithInsecureSkipVerify tests the WithInsecureSkipVerify option
|
||||
func TestWithInsecureSkipVerify(t *testing.T) {
|
||||
client, err := NewClient(
|
||||
"https://192.168.1.100/onvif",
|
||||
WithInsecureSkipVerify(),
|
||||
)
|
||||
if err != nil {
|
||||
t.Fatalf("NewClient() failed: %v", err)
|
||||
}
|
||||
|
||||
transport, ok := client.httpClient.Transport.(*http.Transport)
|
||||
if !ok {
|
||||
t.Fatal("Transport is not *http.Transport")
|
||||
}
|
||||
|
||||
if transport.TLSClientConfig == nil {
|
||||
t.Error("TLSClientConfig is nil")
|
||||
} else if !transport.TLSClientConfig.InsecureSkipVerify {
|
||||
t.Error("InsecureSkipVerify is not set")
|
||||
}
|
||||
}
|
||||
|
||||
// TestDownloadFileContextCancellation tests context cancellation
|
||||
func TestDownloadFileContextCancellation(t *testing.T) {
|
||||
// Create a slow server
|
||||
server := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
|
||||
time.Sleep(2 * time.Second)
|
||||
w.WriteHeader(http.StatusOK)
|
||||
_, _ = w.Write([]byte("data"))
|
||||
}))
|
||||
defer server.Close()
|
||||
|
||||
client, err := NewClient(server.URL)
|
||||
if err != nil {
|
||||
t.Fatalf("NewClient() failed: %v", err)
|
||||
}
|
||||
|
||||
ctx, cancel := context.WithTimeout(context.Background(), 100*time.Millisecond)
|
||||
defer cancel()
|
||||
|
||||
_, err = client.DownloadFile(ctx, server.URL)
|
||||
if err == nil {
|
||||
t.Error("DownloadFile() expected error for cancelled context")
|
||||
}
|
||||
if !strings.Contains(err.Error(), "context deadline exceeded") && !strings.Contains(err.Error(), "context canceled") {
|
||||
t.Errorf("Expected context error, got: %v", err)
|
||||
}
|
||||
}
|
||||
+1490
File diff suppressed because it is too large
Load Diff
@@ -322,6 +322,107 @@ type FilterType struct {
|
||||
// ProfileExtension represents profile extension
|
||||
type ProfileExtension struct{}
|
||||
|
||||
// MediaServiceCapabilities represents media service capabilities
|
||||
type MediaServiceCapabilities struct {
|
||||
SnapshotUri bool
|
||||
Rotation bool
|
||||
VideoSourceMode bool
|
||||
OSD bool
|
||||
TemporaryOSDText bool
|
||||
EXICompression bool
|
||||
MaximumNumberOfProfiles int
|
||||
RTPMulticast bool
|
||||
RTP_TCP bool
|
||||
RTP_RTSP_TCP bool
|
||||
}
|
||||
|
||||
// VideoEncoderConfigurationOptions represents available options for video encoder configuration
|
||||
type VideoEncoderConfigurationOptions struct {
|
||||
QualityRange *FloatRange
|
||||
JPEG *JPEGOptions
|
||||
H264 *H264Options
|
||||
}
|
||||
|
||||
// JPEGOptions represents JPEG encoder options
|
||||
type JPEGOptions struct {
|
||||
ResolutionsAvailable []*VideoResolution
|
||||
FrameRateRange *FloatRange
|
||||
EncodingIntervalRange *IntRange
|
||||
}
|
||||
|
||||
// H264Options represents H264 encoder options
|
||||
type H264Options struct {
|
||||
ResolutionsAvailable []*VideoResolution
|
||||
GovLengthRange *IntRange
|
||||
FrameRateRange *FloatRange
|
||||
EncodingIntervalRange *IntRange
|
||||
H264ProfilesSupported []string
|
||||
}
|
||||
|
||||
// VideoSourceMode represents a video source mode
|
||||
type VideoSourceMode struct {
|
||||
Token string
|
||||
Enabled bool
|
||||
Resolution *VideoResolution
|
||||
}
|
||||
|
||||
// OSDConfiguration represents OSD (On-Screen Display) configuration
|
||||
type OSDConfiguration struct {
|
||||
Token string
|
||||
// Additional fields can be added based on ONVIF spec
|
||||
}
|
||||
|
||||
// AudioEncoderConfigurationOptions represents available options for audio encoder configuration
|
||||
type AudioEncoderConfigurationOptions struct {
|
||||
EncodingOptions []string
|
||||
BitrateList []int
|
||||
SampleRateList []int
|
||||
}
|
||||
|
||||
// MetadataConfigurationOptions represents available options for metadata configuration
|
||||
type MetadataConfigurationOptions struct {
|
||||
PTZStatusFilterOptions *PTZFilter
|
||||
}
|
||||
|
||||
// AudioOutputConfiguration represents audio output configuration
|
||||
type AudioOutputConfiguration struct {
|
||||
Token string
|
||||
Name string
|
||||
UseCount int
|
||||
OutputToken string
|
||||
}
|
||||
|
||||
// AudioOutputConfigurationOptions represents available options for audio output configuration
|
||||
type AudioOutputConfigurationOptions struct {
|
||||
OutputTokensAvailable []string
|
||||
}
|
||||
|
||||
// AudioDecoderConfigurationOptions represents available options for audio decoder configuration
|
||||
type AudioDecoderConfigurationOptions struct {
|
||||
AACDecOptions *AudioDecoderOptions
|
||||
G711DecOptions *AudioDecoderOptions
|
||||
G726DecOptions *AudioDecoderOptions
|
||||
}
|
||||
|
||||
// AudioDecoderOptions represents audio decoder options
|
||||
type AudioDecoderOptions struct {
|
||||
BitrateList []int
|
||||
SampleRateList []int
|
||||
}
|
||||
|
||||
// GuaranteedNumberOfVideoEncoderInstances represents guaranteed number of video encoder instances
|
||||
type GuaranteedNumberOfVideoEncoderInstances struct {
|
||||
TotalNumber int
|
||||
JPEG int
|
||||
H264 int
|
||||
MPEG4 int
|
||||
}
|
||||
|
||||
// OSDConfigurationOptions represents available options for OSD configuration
|
||||
type OSDConfigurationOptions struct {
|
||||
MaximumNumberOfOSDs int
|
||||
}
|
||||
|
||||
// StreamSetup represents stream setup parameters
|
||||
type StreamSetup struct {
|
||||
Stream string // RTP-Unicast, RTP-Multicast
|
||||
|
||||
Reference in New Issue
Block a user