feat: add publish type

api.go

@@ -38,6 +38,9 @@ func (s *Server) SysInfo(context.Context, *emptypb.Empty) (res *pb.SysInfoRespon
 		}
 	}
 	res = &pb.SysInfoResponse{
+		Code:    0,
+		Message: "success",
+		Data: &pb.SysInfoData{
 			Version:   Version,
 			LocalIP:   localIP,
 			StartTime: timestamppb.New(s.StartTime),
@@ -45,9 +48,10 @@ func (s *Server) SysInfo(context.Context, *emptypb.Empty) (res *pb.SysInfoRespon
 			Os:        runtime.GOOS,
 			Arch:      runtime.GOARCH,
 			Cpus:      int32(runtime.NumCPU()),
+		},
 	}
 	for p := range s.Plugins.Range {
-		res.Plugins = append(res.Plugins, &pb.PluginInfo{
+		res.Data.Plugins = append(res.Data.Plugins, &pb.PluginInfo{
 			Name:     p.Meta.Name,
 			Version:  p.Meta.Version,
 			Disabled: p.Disabled,
@@ -102,7 +106,7 @@ func (s *Server) getStreamInfo(pub *Publisher) (res *pb.StreamInfoResponse, err
 		State:       int32(pub.State),
 		StartTime:   timestamppb.New(pub.StartTime),
 		Subscribers: int32(pub.Subscribers.Length),
-		Type:        pub.Plugin.Meta.Name,
+		PluginName:  pub.Plugin.Meta.Name,
 	}
 
 	if t := pub.AudioTrack.AVTrack; t != nil {
@@ -390,7 +394,7 @@ func (s *Server) StreamList(_ context.Context, req *pb.StreamListRequest) (res *
 			}
 			streams = append(streams, info)
 		}
-		res = &pb.StreamListResponse{List: streams, Total: int32(s.Streams.Length), PageNum: req.PageNum, PageSize: req.PageSize}
+		res = &pb.StreamListResponse{Data: streams, Total: int32(s.Streams.Length), PageNum: req.PageNum, PageSize: req.PageSize}
 		return nil
 	})
 	return

example/default/main.go

@@ -5,6 +5,7 @@ import (
 	"flag"
 
 	"m7s.live/pro"
+	_ "m7s.live/pro/plugin/admin"
 	_ "m7s.live/pro/plugin/console"
 	_ "m7s.live/pro/plugin/debug"
 	_ "m7s.live/pro/plugin/flv"

pb/global.proto

@@ -184,7 +184,7 @@ message PluginInfo {
   bool disabled = 3;
 }
 
-message SysInfoResponse {
+message SysInfoData  {
   google.protobuf.Timestamp startTime = 1;
   string localIP = 2;
   string version = 3;
@@ -195,6 +195,12 @@ message SysInfoResponse {
   repeated PluginInfo plugins = 8;
 }
 
+message SysInfoResponse {
+  int32 code = 1;
+  string message = 2;
+  SysInfoData data = 3;
+}
+
 message TaskTreeResponse {
   uint32 id = 1;
   uint32 type = 2;
@@ -212,10 +218,12 @@ message StreamListRequest {
 }
 
 message StreamListResponse {
-  int32 total = 1;
-  int32 pageNum = 2;
-  int32 pageSize = 3;
-  repeated StreamInfoResponse list = 4;
+  int32 code = 1;
+  string message = 2;
+  int32 total = 3;
+  int32 pageNum = 4;
+  int32 pageSize = 5;
+  repeated StreamInfoResponse data = 6;
 }
 
 message StreamWaitListResponse {
@@ -233,8 +241,9 @@ message StreamInfoResponse {
   AudioTrackInfo audioTrack = 4;
   VideoTrackInfo videoTrack = 5;
   google.protobuf.Timestamp startTime = 6;
-  string type = 7;
-  string meta = 8;
+  string pluginName = 7;
+  string type = 8;
+  string meta = 9;
 }
 
 message Wrap {

plugin/admin/index.go

@@ -6,7 +6,7 @@ import (
 	"os"
 	"time"
 
-	"m7s.live/m7s/v5"
+	m7s "m7s.live/pro"
 )
 
 type AdminPlugin struct {

plugin/flv/index.go

@@ -6,7 +6,7 @@ import (
 	"strings"
 	"time"
 
-	"m7s.live/pro"
+	m7s "m7s.live/pro"
 
 	"m7s.live/pro/pkg/task"
 	. "m7s.live/pro/plugin/flv/pkg"
@@ -24,31 +24,13 @@ var _ = m7s.InstallPlugin[FLVPlugin](defaultConfig, NewPuller, NewRecorder)
 
 func (plugin *FLVPlugin) ServeHTTP(w http.ResponseWriter, r *http.Request) {
 	streamPath := strings.TrimSuffix(strings.TrimPrefix(r.URL.Path, "/"), ".flv")
-	//query := r.URL.Query()
-	//speedStr := query.Get("speed")
-	//speed, err := strconv.ParseFloat(speedStr, 64)
 	var err error
 	defer func() {
 		if err != nil {
 			http.Error(w, err.Error(), http.StatusBadRequest)
 		}
 	}()
-	//if err != nil {
-	//	speed = 1
-	//}
-	//if startTime, err := util.TimeQueryParse(query.Get("start")); err == nil {
-	//	var vod Vod
-	//	if err = vod.Init(startTime, filepath.Join(plugin.Path, streamPath)); err != nil {
-	//		http.Error(w, err.Error(), http.StatusBadRequest)
-	//		return
-	//	}
-	//	vod.Writer = w
-	//	vod.SetSpeed(speed)
-	//	plugin.Info("vod start", "streamPath", streamPath, "startTime", startTime, "speed", speed)
-	//	err = vod.Run(r.Context())
-	//	plugin.Info("vod done", "streamPath", streamPath, "err", err)
-	//	return
-	//}
+	var conn net.Conn
 	var live Live
 	if r.URL.RawQuery != "" {
 		streamPath += "?" + r.URL.RawQuery
@@ -57,7 +39,6 @@ func (plugin *FLVPlugin) ServeHTTP(w http.ResponseWriter, r *http.Request) {
 	if err != nil {
 		return
 	}
-	var conn net.Conn
 	conn, err = live.Subscriber.CheckWebSocket(w, r)
 	if err != nil {
 		return

plugin/gb28181/api.go

@@ -104,6 +104,7 @@ func (gb *GB28181Plugin) api_ps_replay(w http.ResponseWriter, r *http.Request) {
 		}
 		var pub *m7s.Publisher
 		if pub, err = gb.Publish(gb.Context, streamPath); err == nil {
+			pub.Type = m7s.PublishTypeReplay
 			go gb.replayPS(pub, f)
 			util.ReturnOK(w, r)
 		} else {

plugin/gb28181/dialog.go

@@ -35,6 +35,9 @@ func (d *Dialog) Start() (err error) {
 	if err != nil {
 		return
 	}
+	if !d.IsLive() {
+		d.pullCtx.Publisher.Type = m7s.PublishTypeVod
+	}
 	sss := strings.Split(d.pullCtx.RemoteURL, "/")
 	deviceId, channelId := sss[0], sss[1]
 	if len(sss) == 2 {

plugin/mp4/pkg/pull-recorder.go

@@ -33,6 +33,7 @@ func NewPuller(conf config.Pull) m7s.IPuller {
 func (p *RecordReader) Run() (err error) {
 	pullJob := &p.PullJob
 	publisher := pullJob.Publisher
+	publisher.Type = m7s.PublishTypeVod
 	allocator := util.NewScalableMemoryAllocator(1 << 10)
 	var ts, tsOffset int64
 	defer allocator.Recycle()

publisher.go

@@ -27,6 +27,14 @@ const (
 	PublisherStateDisposed
 )
 
+const (
+	PublishTypePull      = "pull"
+	PublishTypeServer    = "server"
+	PublishTypeVod       = "vod"
+	PublishTypeTransform = "transform"
+	PublishTypeReplay    = "replay"
+)
+
 const threshold = 10 * time.Millisecond
 
 type SpeedControl struct {
@@ -157,6 +165,7 @@ func (p *Publisher) GetKey() string {
 // createPublisher -> Start -> WriteAudio/WriteVideo -> Dispose
 func createPublisher(p *Plugin, streamPath string, conf config.Publish) (publisher *Publisher) {
 	publisher = &Publisher{Publish: conf}
+	publisher.Type = PublishTypeServer
 	publisher.ID = task.GetNextTaskID()
 	publisher.Plugin = p
 	publisher.TimeoutTimer = time.NewTimer(p.config.PublishTimeout)

puller.go

@@ -131,6 +131,7 @@ func (p *PullJob) Publish() (err error) {
 		streamPath += "?" + p.Args.Encode()
 	}
 	p.Publisher, err = p.Plugin.PublishWithConfig(p.puller.GetTask().Context, streamPath, *p.publishConfig)
+	p.Publisher.Type = PublishTypePull
 	if err == nil && p.conf.MaxRetry != 0 {
 		p.Publisher.OnDispose(func() {
 			if p.Publisher.StopReasonIs(pkg.ErrPublishDelayCloseTimeout) {

server.go

@@ -393,15 +393,16 @@ func (s *Server) OnSubscribe(streamPath string, args url.Values) {
 }
 
 func (s *Server) ServeHTTP(w http.ResponseWriter, r *http.Request) {
-	if r.URL.Path == "/favicon.ico" {
-		http.ServeFile(w, r, "favicon.ico")
-		return
-	}
-	_, _ = fmt.Fprintf(w, "visit:%s\nMonibuca Engine %s StartTime:%s\n", r.URL.Path, Version, s.StartTime)
-	for plugin := range s.Plugins.Range {
-		_, _ = fmt.Fprintf(w, "Plugin %s Version:%s\n", plugin.Meta.Name, plugin.Meta.Version)
-	}
-	for _, api := range s.apiList {
-		_, _ = fmt.Fprintf(w, "%s\n", api)
-	}
+	http.Redirect(w, r, "/admin", http.StatusPermanentRedirect)
+	// if r.URL.Path == "/favicon.ico" {
+	// 	http.ServeFile(w, r, "favicon.ico")
+	// 	return
+	// }
+	// _, _ = fmt.Fprintf(w, "visit:%s\nMonibuca Engine %s StartTime:%s\n", r.URL.Path, Version, s.StartTime)
+	// for plugin := range s.Plugins.Range {
+	// 	_, _ = fmt.Fprintf(w, "Plugin %s Version:%s\n", plugin.Meta.Name, plugin.Meta.Version)
+	// }
+	// for _, api := range s.apiList {
+	// 	_, _ = fmt.Fprintf(w, "%s\n", api)
+	// }
 }

subscriber.go

@@ -26,6 +26,7 @@ var Owner task.TaskContextKey = "owner"
 type PubSubBase struct {
 	task.Job
 	Plugin       *Plugin
+	Type         string
 	StreamPath   string
 	Args         url.Values
 	TimeoutTimer *time.Timer

transformer.go

@@ -77,6 +77,7 @@ func (p *TransformJob) Subscribe() (err error) {
 
 func (p *TransformJob) Publish(streamPath string) (err error) {
 	p.Publisher, err = p.Plugin.Publish(context.WithValue(p.Transformer, Owner, p.Transformer), streamPath)
+	p.Publisher.Type = PublishTypeTransform
 	return
 }