This commit is contained in:
Rob Emery 2025-01-02 10:46:00 +00:00
parent e8ebf06831
commit 82da33a9ed

View File

@ -1,6 +1,7 @@
package dlna package dlna
import ( import (
"bytes"
"context" "context"
"crypto/md5" "crypto/md5"
"encoding/xml" "encoding/xml"
@ -10,9 +11,11 @@ import (
"net" "net"
"net/http" "net/http"
"net/url" "net/url"
"strconv"
"strings" "strings"
"time" "time"
dms_dlna "github.com/anacrolix/dms/dlna"
"github.com/anacrolix/dms/soap" "github.com/anacrolix/dms/soap"
"github.com/anacrolix/dms/ssdp" "github.com/anacrolix/dms/ssdp"
"github.com/anacrolix/dms/upnp" "github.com/anacrolix/dms/upnp"
@ -88,7 +91,7 @@ func New(ds model.DataStore, broker events.Broker) *DLNAServer {
r.Handle("/static/", http.StripPrefix("/static/", r.Handle("/static/", http.StripPrefix("/static/",
withHeader("Cache-Control", "public, max-age=86400", withHeader("Cache-Control", "public, max-age=86400",
http.FileServer(data.Assets)))) http.FileServer(http.Dir("/tmp"))))) //TODO
//s.handler = logging(withHeader("Server", serverField, r)) //s.handler = logging(withHeader("Server", serverField, r))
@ -254,15 +257,9 @@ func isAppropriatelyConfigured(intf net.Interface) bool {
} }
func (s *SSDPServer) resourceHandler(w http.ResponseWriter, r *http.Request) { func (s *SSDPServer) resourceHandler(w http.ResponseWriter, r *http.Request) {
remotePath := r.URL.Path //remotePath := r.URL.Path
node, err := s.vfs.Stat(r.URL.Path) w.Header().Set("Content-Length", strconv.FormatInt(1024, 10)) //TODO
if err != nil {
http.NotFound(w, r)
return
}
w.Header().Set("Content-Length", strconv.FormatInt(node.Size(), 10))
// add some DLNA specific headers // add some DLNA specific headers
if r.Header.Get("getContentFeatures.dlna.org") != "" { if r.Header.Get("getContentFeatures.dlna.org") != "" {
@ -272,17 +269,64 @@ func (s *SSDPServer) resourceHandler(w http.ResponseWriter, r *http.Request) {
} }
w.Header().Set("transferMode.dlna.org", "Streaming") w.Header().Set("transferMode.dlna.org", "Streaming")
file := node.(*vfs.File) //http.ServeContent(w, r, remotePath, time.Now(), in)
in, err := file.Open(os.O_RDONLY) }
func (s *SSDPServer) rootDescHandler(w http.ResponseWriter, r *http.Request) {
buffer := new(bytes.Buffer)
w.Header().Set("content-type", `text/xml; charset="utf-8"`)
w.Header().Set("cache-control", "private, max-age=60")
w.Header().Set("content-length", strconv.FormatInt(int64(buffer.Len()), 10))
buffer.WriteTo(w)
}
// Handle a service control HTTP request.
func (s *SSDPServer) serviceControlHandler(w http.ResponseWriter, r *http.Request) {
soapActionString := r.Header.Get("SOAPACTION")
soapAction, err := upnp.ParseActionHTTPHeader(soapActionString)
if err != nil { if err != nil {
serveError(node, w, "Could not open resource", err) serveError(s, w, "Could not parse SOAPACTION header", err)
return
}
var env soap.Envelope
if err := xml.NewDecoder(r.Body).Decode(&env); err != nil {
serveError(s, w, "Could not parse SOAP request body", err)
return return
} }
defer fs.CheckClose(in, &err)
http.ServeContent(w, r, remotePath, node.ModTime(), in) w.Header().Set("Content-Type", `text/xml; charset="utf-8"`)
w.Header().Set("Ext", "")
soapRespXML, code := func() ([]byte, int) {
respArgs, err := s.soapActionResponse(soapAction, env.Body.Action, r)
if err != nil {
fmt.Printf("Error invoking %v: %v", soapAction, err)
upnpErr := upnp.ConvertError(err)
return mustMarshalXML(soap.NewFault("UPnPError", upnpErr)), http.StatusInternalServerError
}
return marshalSOAPResponse(soapAction, respArgs), http.StatusOK
}()
bodyStr := fmt.Sprintf(`<?xml version="1.0" encoding="utf-8" standalone="yes"?><s:Envelope xmlns:s="http://schemas.xmlsoap.org/soap/envelope/" s:encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"><s:Body>%s</s:Body></s:Envelope>`, soapRespXML)
w.WriteHeader(code)
if _, err := w.Write([]byte(bodyStr)); err != nil {
fmt.Printf("Error writing response: %v", err)
}
} }
// Handle a SOAP request and return the response arguments or UPnP error.
func (s *SSDPServer) soapActionResponse(sa upnp.SoapAction, actionRequestXML []byte, r *http.Request) (map[string]string, error) {
service, ok := s.services[sa.Type]
if !ok {
// TODO: What's the invalid service error?
return nil, upnp.Errorf(upnp.InvalidActionErrorCode, "Invalid service: %s", sa.Type)
}
return service.Handle(sa.Action, actionRequestXML, r)
}
func didlLite(chardata string) string { func didlLite(chardata string) string {
return `<DIDL-Lite` + return `<DIDL-Lite` +
` xmlns:dc="http://purl.org/dc/elements/1.1/"` + ` xmlns:dc="http://purl.org/dc/elements/1.1/"` +
@ -322,3 +366,17 @@ func makeDeviceUUID(unique string) string {
buf := h.Sum(nil) buf := h.Sum(nil)
return upnp.FormatUUID(buf) return upnp.FormatUUID(buf)
} }
// HTTP handler that sets headers.
func withHeader(name string, value string, next http.Handler) http.Handler {
return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
w.Header().Set(name, value)
next.ServeHTTP(w, r)
})
}
// serveError returns an http.StatusInternalServerError and logs the error
func serveError(what interface{}, w http.ResponseWriter, text string, err error) {
http.Error(w, text+".", http.StatusInternalServerError)
}