apps/plugin-hdl
1
0
Fork 0
mirror of https://github.com/Monibuca/plugin-hdl.git synced 2025-10-05 08:47:00 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

对于远程连接返回非200时不再重连

Browse Source
This commit is contained in:
dexter
2022-12-31 22:01:59 +08:00
parent 7357cd8913
commit 1d6b18c48d
2 changed files with 36 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
main.go
View File

@@ -26,29 +26,36 @@ type HDLConfig struct {
func (c *HDLConfig) OnEvent(event any) {
switch v := event.(type) {
case FirstConfig:
if c.PullOnStart {
for streamPath, url := range c.PullList {
if err := HDLPlugin.Pull(streamPath, url, NewHDLPuller(), false); err != nil {
for streamPath, url := range c.PullOnStart {
if err := HDLPlugin.Pull(streamPath, url, NewHDLPuller(), 0); err != nil {
HDLPlugin.Error("pull", zap.String("streamPath", streamPath), zap.String("url", url), zap.Error(err))
}
}
}
case *Stream: //按需拉流
if c.PullOnSubscribe {
for streamPath, url := range c.PullList {
for streamPath, url := range c.PullOnSub {
if streamPath == v.Path {
if err := HDLPlugin.Pull(streamPath, url, NewHDLPuller(), false); err != nil {
if err := HDLPlugin.Pull(streamPath, url, NewHDLPuller(), 0); err != nil {
HDLPlugin.Error("pull", zap.String("streamPath", streamPath), zap.String("url", url), zap.Error(err))
}
break
}
}
}
}
func str2number(s string) int {
switch s {
case "1":
return 1
case "2":
return 2
default:
return 0
}
}
func (c *HDLConfig) API_Pull(rw http.ResponseWriter, r *http.Request) {
err := HDLPlugin.Pull(r.URL.Query().Get("streamPath"), r.URL.Query().Get("target"), NewHDLPuller(), r.URL.Query().Has("save"))
err := HDLPlugin.Pull(r.URL.Query().Get("streamPath"), r.URL.Query().Get("target"), NewHDLPuller(), str2number(r.URL.Query().Get("save")))
if err != nil {
http.Error(rw, err.Error(), http.StatusBadRequest)
} else {
@@ -135,8 +142,6 @@ func (c *HDLConfig) ServeHTTP(w http.ResponseWriter, r *http.Request) {
if r.URL.RawQuery != "" {
streamPath += "?" + r.URL.RawQuery
}
w.Header().Set("Content-Type", "video/x-flv")
w.Header().Set("Transfer-Encoding", "identity")
sub := &HDLSubscriber{}
sub.ID = r.RemoteAddr
sub.SetParentCtx(r.Context())
@@ -144,11 +149,15 @@ func (c *HDLConfig) ServeHTTP(w http.ResponseWriter, r *http.Request) {
if err := HDLPlugin.Subscribe(streamPath, sub); err != nil {
http.Error(w, err.Error(), http.StatusBadRequest)
} else {
w.Header().Set("Content-Type", "video/x-flv")
w.Header().Set("Transfer-Encoding", "identity")
w.WriteHeader(http.StatusOK)
if hijacker, ok := w.(http.Hijacker); ok && c.WriteTimeout > 0 {
conn, _, _ := hijacker.Hijack()
conn.SetWriteDeadline(time.Now().Add(time.Second * time.Duration(c.WriteTimeout)))
sub.SetIO(conn)
} else {
w.(http.Flusher).Flush()
}
sub.WriteFlvHeader()
sub.PlayBlock(SUBTYPE_FLV)

15
pull.go
View File

@@ -30,6 +30,9 @@ func (puller *HDLPuller) Connect() (err error) {
if strings.HasPrefix(puller.RemoteURL, "http") {
var res *http.Response
if res, err = http.Get(puller.RemoteURL); err == nil {
if res.StatusCode != http.StatusOK {
return io.EOF
}
puller.SetIO(res.Body)
}
} else {
@@ -38,14 +41,17 @@ func (puller *HDLPuller) Connect() (err error) {
puller.SetIO(res)
}
}
if err != nil {
HDLPlugin.Error("connect", zap.Error(err))
}
if err == nil {
head := puller.buf.SubBuf(0, len(codec.FLVHeader))
_, err = io.ReadFull(puller, head)
if _, err = io.ReadFull(puller, head); err == nil {
if head[0] != 'F' || head[1] != 'L' || head[2] != 'V' {
err = codec.ErrInvalidFLV
}
}
}
if err != nil {
HDLPlugin.Error("connect", zap.Error(err))
}
return
}
@@ -71,6 +77,7 @@ func (puller *HDLPuller) Pull() (err error) {
return
}
puller.absTS = offsetTs + (timestamp - startTs)
// println(t, puller.absTS)
switch t {
case codec.FLV_TAG_TYPE_AUDIO:
puller.WriteAVCCAudio(puller.absTS, payload)