👌 IMPROVE: 导出RTMP插件

amf.go

@@ -97,14 +97,14 @@ func (amf *AMF) decodeObject() (obj AMFValue) {
 	case AMF0_OBJECT:
 		return amf.readObject()
 	case AMF0_MOVIECLIP:
-		plugin.Error("This type is not supported and is reserved for future use.(AMF0_MOVIECLIP)")
+		RTMPPlugin.Error("This type is not supported and is reserved for future use.(AMF0_MOVIECLIP)")
 	case AMF0_NULL:
 		return amf.readNull()
 	case AMF0_UNDEFINED:
 		amf.ReadByte()
 		return Undefined
 	case AMF0_REFERENCE:
-		plugin.Error("reference-type.(AMF0_REFERENCE)")
+		RTMPPlugin.Error("reference-type.(AMF0_REFERENCE)")
 	case AMF0_ECMA_ARRAY:
 		return amf.readECMAArray()
 	case AMF0_END_OBJECT:
@@ -118,15 +118,15 @@ func (amf *AMF) decodeObject() (obj AMFValue) {
 		AMF0_XML_DOCUMENT:
 		return amf.readLongString()
 	case AMF0_UNSUPPORTED:
-		plugin.Error("If a type cannot be serialized a special unsupported marker can be used in place of the type.(AMF0_UNSUPPORTED)")
+		RTMPPlugin.Error("If a type cannot be serialized a special unsupported marker can be used in place of the type.(AMF0_UNSUPPORTED)")
 	case AMF0_RECORDSET:
-		plugin.Error("This type is not supported and is reserved for future use.(AMF0_RECORDSET)")
+		RTMPPlugin.Error("This type is not supported and is reserved for future use.(AMF0_RECORDSET)")
 	case AMF0_TYPED_OBJECT:
-		plugin.Error("If a strongly typed object has an alias registered for its class then the type name will also be serialized. Typed objects are considered complex types and reoccurring instances can be sent by reference.(AMF0_TYPED_OBJECT)")
+		RTMPPlugin.Error("If a strongly typed object has an alias registered for its class then the type name will also be serialized. Typed objects are considered complex types and reoccurring instances can be sent by reference.(AMF0_TYPED_OBJECT)")
 	case AMF0_AVMPLUS_OBJECT:
-		plugin.Error("AMF0_AVMPLUS_OBJECT")
+		RTMPPlugin.Error("AMF0_AVMPLUS_OBJECT")
 	default:
-		plugin.Error("Unsupported type", zap.Uint8("type", t))
+		RTMPPlugin.Error("Unsupported type", zap.Uint8("type", t))
 	}
 	return nil
 }

client.go

@@ -15,7 +15,7 @@ import (
 func NewRTMPClient(addr string) (client *NetConnection, err error) {
 	u, err := url.Parse(addr)
 	if err != nil {
-		plugin.Error("connect url parse", zap.Error(err))
+		RTMPPlugin.Error("connect url parse", zap.Error(err))
 		return nil, err
 	}
 	if strings.Count(u.Host, ":") == 0 {
@@ -23,7 +23,7 @@ func NewRTMPClient(addr string) (client *NetConnection, err error) {
 	}
 	conn, err := net.Dial("tcp", u.Host)
 	if err != nil {
-		plugin.Error("dial tcp", zap.String("host", u.Host), zap.Error(err))
+		RTMPPlugin.Error("dial tcp", zap.String("host", u.Host), zap.Error(err))
 		return nil, err
 	}
 	client = &NetConnection{
@@ -38,7 +38,7 @@ func NewRTMPClient(addr string) (client *NetConnection, err error) {
 	}
 	err = client.ClientHandshake()
 	if err != nil {
-		plugin.Error("handshake", zap.Error(err))
+		RTMPPlugin.Error("handshake", zap.Error(err))
 		return nil, err
 	}
 	ps := strings.Split(u.Path, "/")
@@ -82,7 +82,7 @@ type RTMPPusher struct {
 
 func (pusher *RTMPPusher) Connect() (err error) {
 	pusher.NetConnection, err = NewRTMPClient(pusher.RemoteURL)
-	plugin.Info("connect", zap.String("remoteURL", pusher.RemoteURL))
+	RTMPPlugin.Info("connect", zap.String("remoteURL", pusher.RemoteURL))
 	return
 }
 
@@ -134,7 +134,7 @@ type RTMPPuller struct {
 
 func (puller *RTMPPuller) Connect() (err error) {
 	puller.NetConnection, err = NewRTMPClient(puller.RemoteURL)
-	plugin.Info("connect", zap.String("remoteURL", puller.RemoteURL))
+	RTMPPlugin.Info("connect", zap.String("remoteURL", puller.RemoteURL))
 	return
 }
 

main.go

@@ -2,6 +2,7 @@ package rtmp
 
 import (
 	"context"
+	"net/http"
 
 	"go.uber.org/zap"
 	. "m7s.live/engine/v4"
@@ -22,28 +23,28 @@ func (c *RTMPConfig) OnEvent(event any) {
 	switch v := event.(type) {
 	case FirstConfig:
 		if c.ListenAddr != "" {
-			plugin.Info("server rtmp start at", zap.String("listen addr", c.ListenAddr))
-			go c.Listen(plugin, c)
+			RTMPPlugin.Info("server rtmp start at", zap.String("listen addr", c.ListenAddr))
+			go c.Listen(RTMPPlugin, c)
 		}
 		if c.PullOnStart {
 			for streamPath, url := range c.PullList {
-				if err := plugin.Pull(streamPath, url, new(RTMPPuller), false); err != nil {
-					plugin.Error("pull", zap.String("streamPath", streamPath), zap.String("url", url), zap.Error(err))
+				if err := RTMPPlugin.Pull(streamPath, url, new(RTMPPuller), false); err != nil {
+					RTMPPlugin.Error("pull", zap.String("streamPath", streamPath), zap.String("url", url), zap.Error(err))
 				}
 			}
 		}
 	case config.Config:
-		plugin.CancelFunc()
+		RTMPPlugin.CancelFunc()
 		if c.ListenAddr != "" {
-			plugin.Context, plugin.CancelFunc = context.WithCancel(Engine)
-			plugin.Info("server rtmp start at", zap.String("listen addr", c.ListenAddr))
-			go c.Listen(plugin, c)
+			RTMPPlugin.Context, RTMPPlugin.CancelFunc = context.WithCancel(Engine)
+			RTMPPlugin.Info("server rtmp start at", zap.String("listen addr", c.ListenAddr))
+			go c.Listen(RTMPPlugin, c)
 		}
 	case SEpublish:
 		for streamPath, url := range c.PushList {
 			if streamPath == v.Stream.Path {
-				if err := plugin.Push(streamPath, url, new(RTMPPusher), false); err != nil {
-					plugin.Error("push", zap.String("streamPath", streamPath), zap.String("url", url), zap.Error(err))
+				if err := RTMPPlugin.Push(streamPath, url, new(RTMPPusher), false); err != nil {
+					RTMPPlugin.Error("push", zap.String("streamPath", streamPath), zap.String("url", url), zap.Error(err))
 				}
 			}
 		}
@@ -51,8 +52,8 @@ func (c *RTMPConfig) OnEvent(event any) {
 		if c.PullOnSubscribe {
 			for streamPath, url := range c.PullList {
 				if streamPath == v.Path {
-					if err := plugin.Pull(streamPath, url, new(RTMPPuller), false); err != nil {
-						plugin.Error("pull", zap.String("streamPath", streamPath), zap.String("url", url), zap.Error(err))
+					if err := RTMPPlugin.Pull(streamPath, url, new(RTMPPuller), false); err != nil {
+						RTMPPlugin.Error("pull", zap.String("streamPath", streamPath), zap.String("url", url), zap.Error(err))
 					}
 					break
 				}
@@ -65,4 +66,22 @@ var conf = &RTMPConfig{
 	ChunkSize: 4096,
 	TCP:       config.TCP{ListenAddr: ":1935"},
 }
-var plugin = InstallPlugin(conf)
+var RTMPPlugin = InstallPlugin(conf)
+
+func (*RTMPConfig) API_Pull(rw http.ResponseWriter, r *http.Request) {
+	err := RTMPPlugin.Pull(r.URL.Query().Get("streamPath"), r.URL.Query().Get("target"), new(RTMPPuller), r.URL.Query().Has("save"))
+	if err != nil {
+		http.Error(rw, err.Error(), http.StatusBadRequest)
+	} else {
+		rw.Write([]byte("ok"))
+	}
+}
+
+func (*RTMPConfig) API_Push(rw http.ResponseWriter, r *http.Request) {
+	err := RTMPPlugin.Push(r.URL.Query().Get("streamPath"), r.URL.Query().Get("target"), new(RTMPPusher), r.URL.Query().Has("save"))
+	if err != nil {
+		http.Error(rw, err.Error(), http.StatusBadRequest)
+	} else {
+		rw.Write([]byte("ok"))
+	}
+}

msg.go

@@ -310,11 +310,11 @@ func decodeCommandAMF0(chunk *Chunk) {
 		codef := zap.String("code", response.Infomation["code"].(string))
 		switch response.Infomation["level"] {
 		case Level_Status:
-			plugin.Info("_result :", codef)
+			RTMPPlugin.Info("_result :", codef)
 		case Level_Warning:
-			plugin.Warn("_result :", codef)
+			RTMPPlugin.Warn("_result :", codef)
 		case Level_Error:
-			plugin.Error("_result :", codef)
+			RTMPPlugin.Error("_result :", codef)
 		}
 		if strings.HasPrefix(response.Infomation["code"].(string), "NetStream.Publish") {
 			chunk.MsgData = &ResponsePublishMessage{
@@ -335,7 +335,7 @@ func decodeCommandAMF0(chunk *Chunk) {
 		}
 	case "FCPublish", "FCUnpublish":
 	default:
-		plugin.Info("decode command amf0 ", zap.String("cmd", cmd))
+		RTMPPlugin.Info("decode command amf0 ", zap.String("cmd", cmd))
 	}
 }
 

server.go

@@ -52,7 +52,7 @@ func (config *RTMPConfig) ServeTCP(conn *net.TCPConn) {
 	defer cancel()
 	/* Handshake */
 	if err := nc.Handshake(); err != nil {
-		plugin.Error("handshake", zap.Error(err))
+		RTMPPlugin.Error("handshake", zap.Error(err))
 		return
 	}
 	for {
@@ -66,7 +66,7 @@ func (config *RTMPConfig) ServeTCP(conn *net.TCPConn) {
 					break
 				}
 				cmd := msg.MsgData.(Commander).GetCommand()
-				plugin.Debug("recv cmd", zap.String("commandName", cmd.CommandName), zap.Uint32("streamID", msg.MessageStreamID))
+				RTMPPlugin.Debug("recv cmd", zap.String("commandName", cmd.CommandName), zap.Uint32("streamID", msg.MessageStreamID))
 				switch cmd := msg.MsgData.(type) {
 				case *CallMessage: //connect
 					app := cmd.Object["app"]                       // 客户端要连接到的服务应用名
@@ -75,7 +75,7 @@ func (config *RTMPConfig) ServeTCP(conn *net.TCPConn) {
 						nc.objectEncoding = objectEncoding.(float64)
 					}
 					nc.appName = app.(string)
-					plugin.Info("connect", zap.String("appName", nc.appName), zap.Float64("objectEncoding", nc.objectEncoding))
+					RTMPPlugin.Info("connect", zap.String("appName", nc.appName), zap.Float64("objectEncoding", nc.objectEncoding))
 					err = nc.SendMessage(RTMP_MSG_ACK_SIZE, Uint32Message(512<<10))
 					nc.writeChunkSize = config.ChunkSize
 					err = nc.SendMessage(RTMP_MSG_CHUNK_SIZE, Uint32Message(config.ChunkSize))
@@ -101,7 +101,7 @@ func (config *RTMPConfig) ServeTCP(conn *net.TCPConn) {
 					err = nc.SendMessage(RTMP_MSG_AMF0_COMMAND, m)
 				case *CommandMessage: // "createStream"
 					streamId := atomic.AddUint32(&gstreamid, 1)
-					plugin.Info("createStream:", zap.Uint32("streamId", streamId))
+					RTMPPlugin.Info("createStream:", zap.Uint32("streamId", streamId))
 					nc.ResponseCreateStream(cmd.TransactionId, streamId)
 				case *CURDStreamMessage:
 					if stream, ok := receivers[cmd.StreamId]; ok {
@@ -133,7 +133,7 @@ func (config *RTMPConfig) ServeTCP(conn *net.TCPConn) {
 					if !config.KeepAlive {
 						receiver.SetIO(conn)
 					}
-					if plugin.Publish(nc.appName+"/"+cmd.PublishingName, receiver) == nil {
+					if RTMPPlugin.Publish(nc.appName+"/"+cmd.PublishingName, receiver) == nil {
 						receivers[cmd.StreamId] = receiver
 						receiver.absTs = make(map[uint32]uint32)
 						receiver.Begin()
@@ -153,7 +153,7 @@ func (config *RTMPConfig) ServeTCP(conn *net.TCPConn) {
 						sender.SetIO(conn)
 					}
 					sender.ID = fmt.Sprintf("%s|%d", conn.RemoteAddr().String(), sender.StreamID)
-					if plugin.Subscribe(streamPath, sender) != nil {
+					if RTMPPlugin.Subscribe(streamPath, sender) != nil {
 						sender.Response(cmd.TransactionId, NetStream_Play_Failed, Level_Error)
 					} else {
 						senders[sender.StreamID] = sender