Merge pull request #308 from JustHumanz/pilot-commands

Add pilot commands
JustHumanz · May 17, 2022 · 020bc76 · 020bc76
2 parents a86b441 + dc4e736
commit 020bc76
Show file tree

Hide file tree

Showing 18 changed files with 203 additions and 63 deletions.
diff --git a/pkg/engine/engine.go b/pkg/engine/engine.go
@@ -745,3 +745,21 @@ func UnMarshalPayload(Payload []byte) []database.Group {
 	}
 	return agency
 }
+
+func GetHostname() string {
+	hostname, err := os.Hostname()
+	if err != nil {
+		log.Fatal(err)
+	}
+
+	return hostname
+}
+
+func LowerCaseURI(h http.Handler) http.Handler {
+	fn := func(w http.ResponseWriter, r *http.Request) {
+		r.URL.Path = strings.ToLower(r.URL.Path)
+		h.ServeHTTP(w, r)
+	}
+
+	return http.HandlerFunc(fn)
+}
diff --git a/service/fanart/bilibili/bilibili.go b/service/fanart/bilibili/bilibili.go
@@ -91,12 +91,14 @@ type checkBlJob struct {
 
 func ReqRunningJob(client pilot.PilotServiceClient) {
 	Bili := &checkBlJob{}
+	hostname := engine.GetHostname()
 
 	for {
 		res, err := client.RequestRunJobsOfService(context.Background(), &pilot.ServiceMessage{
 			Service:     ServiceName,
 			Message:     "Request",
 			ServiceUUID: ServiceUUID,
+			Hostname:    hostname,
 		})
 		if err != nil {
 			log.Error(err)

diff --git a/service/fanart/pixiv/pixiv.go b/service/fanart/pixiv/pixiv.go
@@ -403,12 +403,14 @@ type checkPxJob struct {
 
 func ReqRunningJob(client pilot.PilotServiceClient) {
 	Pix := &checkPxJob{}
+	hostname := engine.GetHostname()
 
 	for {
 		res, err := client.RequestRunJobsOfService(context.Background(), &pilot.ServiceMessage{
 			Service:     ServiceName,
 			Message:     "Request",
 			ServiceUUID: ServiceUUID,
+			Hostname:    hostname,
 		})
 		if err != nil {
 			log.Error(err)

diff --git a/service/fanart/twitter/twitter.go b/service/fanart/twitter/twitter.go
@@ -88,13 +88,15 @@ func main() {
 
 func ReqRunningJob(client pilot.PilotServiceClient) {
 	Twit := &checkTwJob{}
+	hostname := engine.GetHostname()
 
 	for {
 
 		res, err := client.RequestRunJobsOfService(context.Background(), &pilot.ServiceMessage{
 			Service:     ServiceName,
 			Message:     "Request",
 			ServiceUUID: ServiceUUID,
+			Hostname:    hostname,
 		})
 		if err != nil {
 			log.Error(err)

diff --git a/service/frontend/runner.go b/service/frontend/runner.go
@@ -72,6 +72,8 @@ func main() {
 
 	configfile.InitConf()
 
+	hostname := engine.GetHostname()
+
 	go func() {
 		for {
 			log.WithFields(log.Fields{
@@ -83,6 +85,7 @@ func main() {
 				Service:     ServiceName,
 				Message:     "Request",
 				ServiceUUID: ServiceUUID,
+				Hostname:    hostname,
 			})
 			if err != nil {
 				log.Error(err)

diff --git a/service/livestream/bilibili/live/live.go b/service/livestream/bilibili/live/live.go
@@ -74,13 +74,15 @@ type checkBlLiveeJob struct {
 
 func ReqRunningJob(client pilot.PilotServiceClient) {
 	Bili := &checkBlLiveeJob{}
+	hostname := engine.GetHostname()
 
 	for {
 
 		res, err := client.RequestRunJobsOfService(context.Background(), &pilot.ServiceMessage{
 			Service:     ServiceName,
 			Message:     "Request",
 			ServiceUUID: ServiceUUID,
+			Hostname:    hostname,
 		})
 		if err != nil {
 			log.Error(err)

diff --git a/service/livestream/bilibili/space/space.go b/service/livestream/bilibili/space/space.go
@@ -100,12 +100,15 @@ func ReqRunningJob(client pilot.PilotServiceClient) {
 		VideoIDTMP: make(map[string]string),
 	}
 
+	hostname := engine.GetHostname()
+
 	for {
 
 		res, err := client.RequestRunJobsOfService(context.Background(), &pilot.ServiceMessage{
 			Service:     ServiceName,
 			Message:     "Request",
 			ServiceUUID: ServiceUUID,
+			Hostname:    hostname,
 		})
 		if err != nil {
 			log.Error(err)

diff --git a/service/livestream/twitch/twitch.go b/service/livestream/twitch/twitch.go
@@ -88,12 +88,14 @@ type checkTwcJob struct {
 
 func ReqRunningJob(client pilot.PilotServiceClient) {
 	Twitch := &checkTwcJob{}
+	hostname := engine.GetHostname()
 
 	for {
 		res, err := client.RequestRunJobsOfService(context.Background(), &pilot.ServiceMessage{
 			Service:     ServiceName,
 			Message:     "Request",
 			ServiceUUID: ServiceUUID,
+			Hostname:    hostname,
 		})
 		if err != nil {
 			log.Error(err)

diff --git a/service/livestream/youtube/checker/youtube.go b/service/livestream/youtube/checker/youtube.go
@@ -82,6 +82,9 @@ func ReqRunningJob(client pilot.PilotServiceClient) {
 		Counter: 1,
 		Update:  true,
 	}
+
+	hostname := engine.GetHostname()
+
 	for {
 
 		if YoutubeChecker.Counter == 15 {
@@ -95,6 +98,7 @@ func ReqRunningJob(client pilot.PilotServiceClient) {
 					Service:     ServiceName,
 					Message:     "Update",
 					ServiceUUID: ServiceUUID,
+					Hostname:    hostname,
 				})
 				if err != nil {
 					log.Error(err)
@@ -105,6 +109,7 @@ func ReqRunningJob(client pilot.PilotServiceClient) {
 					Service:     ServiceName,
 					Message:     "New",
 					ServiceUUID: ServiceUUID,
+					Hostname:    hostname,
 				})
 				if err != nil {
 					log.Error(err)

diff --git a/service/livestream/youtube/counter/counter.go b/service/livestream/youtube/counter/counter.go
@@ -88,12 +88,16 @@ func ReqRunningJob(client pilot.PilotServiceClient) {
 	YoutubeCounter := &checkYtJob{
 		CekCounter: make(map[string]bool),
 	}
+
+	hostname := engine.GetHostname()
+
 	for {
 
 		res, err := client.RequestRunJobsOfService(context.Background(), &pilot.ServiceMessage{
 			Service:     ServiceName,
 			Message:     "Request",
 			ServiceUUID: ServiceUUID,
+			Hostname:    hostname,
 		})
 
 		if err != nil {

diff --git a/service/migrate/main.go b/service/migrate/main.go
@@ -49,10 +49,12 @@ type NewVtuber struct {
 }
 
 func RequestPay(Message string) {
+	hostname := engine.GetHostname()
 	res, err := gRCPconn.GetBotPayload(context.Background(), &pilot.ServiceMessage{
 		Message:     Message,
 		Service:     "Migrate",
 		ServiceUUID: ServiceUUID,
+		Hostname:    hostname,
 	})
 	if err != nil {
 		log.Fatalf("Error when request payload: %s", err)

diff --git a/service/pilot/Dockerfile b/service/pilot/Dockerfile
@@ -3,5 +3,5 @@ FROM $BASE_IMAGE as base
 
 FROM alpine
 COPY --from=base /app/Go-Simp/bin/pilot /pilot
-EXPOSE 9000
+EXPOSE 9000 8080 8181
 CMD ["./pilot"]
diff --git a/service/pilot/grpc/grpc.go b/service/pilot/grpc/grpc.go
@@ -78,9 +78,17 @@ type Service struct {
 }
 
 type UnitService struct {
-	UUID    string
-	Counter int
-	Payload []database.Group
+	UUID     string
+	Counter  int
+	Payload  []database.Group
+	Metadata UnitMetadata
+}
+
+type UnitMetadata struct {
+	UUID       string
+	Hostname   string
+	Length     int
+	AgencyList []string
 }
 
 type Server struct {
@@ -167,9 +175,11 @@ func (s *Service) RemapPayload() {
 		AgencyCount := 0
 		for _, v := range s.Unit {
 			AgencyCount += len(v.Payload)
+			v.Metadata.Length = len(v.Payload)
+			v.Metadata.AgencyList = v.GetAgencyList()
 		}
 
-		if AgencyCount < 29 {
+		if AgencyCount < 29 && AgencyCount != 0 {
 			log.Fatal("Agency payload less than 29, len ", AgencyCount)
 		}
 	}
@@ -223,6 +233,10 @@ func (s *Server) RequestRunJobsOfService(ctx context.Context, in *ServiceMessage
 					in.ServiceUUID,
 					1,
 					nil,
+					UnitMetadata{
+						Hostname: in.Hostname,
+						UUID:     in.ServiceUUID,
+					},
 				})
 
 				v.RemapPayload()
@@ -481,11 +495,12 @@ func (s *Server) HeartBeat(in *ServiceMessage, stream PilotService_HeartBeatServ
 							ReportDeadService(err.Error(), in.Service)
 							return err
 						}
-						time.Sleep(5 * time.Second)
+						time.Sleep(1 * time.Second)
 					}
 				}
 			}
 		}
+		time.Sleep(5 * time.Second)
 	}
 }
 

diff --git a/service/pilot/grpc/grpc.pb.go b/service/pilot/grpc/grpc.pb.go
diff --git a/service/pilot/grpc/grpc.proto b/service/pilot/grpc/grpc.proto
@@ -14,6 +14,7 @@ message ServiceMessage {
     string Message = 1;
     string Service = 2;
     string ServiceUUID = 3;
+    string Hostname = 4;
 }