Merge branch 'main' into clean_beep

# Conflicts:
#	internal/routes/wait.go

internal/middleware/bgm.go

@@ -3,9 +3,7 @@ package middleware
 import (
 	"game-driver/internal/schema"
 	"game-driver/leaf"
-	"game-driver/pkg/audio"
 	"game-driver/pkg/utils"
-	"github.com/gopxl/beep/v2/speaker"
 	"go.uber.org/zap"
 	"sync"
 )
@@ -30,30 +28,30 @@ func PlayBgm() leaf.HandlerFunc {
 			// 发送结束信号
 			defer close(a)
 
-			wait.Add(1)
+			//wait.Add(1)
-			go func() {
+			//go func() {
-				defer wait.Done()
+			//	defer wait.Done()
-
+			//
-				zap.S().Infoln("开始播放背景音乐")
+			//	zap.S().Infoln("开始播放背景音乐")
-				defer zap.S().Infoln("结束背景音乐播放")
+			//	defer zap.S().Infoln("结束背景音乐播放")
-
+			//
-				ctrl, closer, e := audio.PlayBgmMP3(bgm)
+			//	ctrl, closer, e := audio.PlayBgmMP3(bgm)
-				defer closer()
+			//	defer closer()
-				if e != nil {
+			//	if e != nil {
-					zap.S().Errorln("播放背景音乐异常:", e)
+			//		zap.S().Errorln("播放背景音乐异常:", e)
-					return
+			//		return
-				}
+			//	}
-
+			//
-				select {
+			//	select {
-				case <-a:
+			//	case <-a:
-					{
+			//		{
-						speaker.Lock()
+			//			speaker.Lock()
-						ctrl.Streamer = nil
+			//			ctrl.Streamer = nil
-						speaker.Unlock()
+			//			speaker.Unlock()
-						return
+			//			return
-					}
+			//		}
-				}
+			//	}
-			}()
+			//}()
 		} else {
 			zap.S().Infoln("未解析到背景音乐")
 		}

internal/routes/wait.go

@@ -0,0 +1,240 @@
+package routes
+
+import (
+	"game-driver/internal/middleware"
+	"game-driver/internal/schema"
+	"game-driver/leaf"
+	"game-driver/pkg/relay"
+	"game-driver/pkg/tts"
+	"game-driver/pkg/utils"
+	"game-driver/pkg/video"
+	"go.uber.org/zap"
+	"sync"
+	"time"
+)
+
+func timerAction(timestamp int64) <-chan struct{} {
+	a := make(chan struct{})
+
+	go func() {
+		if timestamp == 0 {
+			close(a)
+		} else {
+			<-time.After(time.Until(time.Unix(timestamp, 0)))
+			close(a)
+		}
+	}()
+
+	return a
+}
+
+func WaitAction(c *leaf.Context) {
+	payload := leaf.Value[*schema.WaitModel](c, middleware.PayloadJSONKey)
+
+	if payload.Start != 0 && payload.End != 0 && time.Unix(payload.Start, 0).After(time.Unix(payload.End, 0)) {
+		zap.S().Infoln("开始时间大于结束时间")
+		return
+	}
+
+	if payload.End != 0 {
+		cancel := leaf.WithDeadline(c, time.Unix(payload.End, 0))
+		defer cancel()
+	}
+
+	select {
+	case <-c.Done():
+	case <-timerAction(payload.Start):
+		// 等待组
+		var wait sync.WaitGroup
+		defer wait.Wait()
+		for _, item := range payload.Items {
+			switch item.Type {
+			case schema.WaitAudio:
+				// 执行音乐播放
+				wait.Add(1)
+				go func() {
+					defer wait.Done()
+					audioAction(c, item, payload.TimeModel)
+				}()
+			case schema.WaitTTS:
+				// 执行TTS播放
+				wait.Add(1)
+				go func() {
+					defer wait.Done()
+					ttsAction(c, item, payload.TimeModel)
+				}()
+			case schema.WaitRelay:
+				// 执行继电器供电
+				wait.Add(1)
+				go func() {
+					defer wait.Done()
+					relayAction(c, item, payload.TimeModel)
+				}()
+			case schema.WaitVideo:
+				// 执行视频播放
+				wait.Add(1)
+				go func() {
+					defer wait.Done()
+					videoAction(c, item, payload.TimeModel)
+				}()
+			case schema.WaitWeb:
+			default:
+				zap.S().Infof("不支持的类型: %d\n", item.Type)
+			}
+		}
+	}
+}
+
+func audioAction(c *leaf.Context, item schema.WaitItemModel, root schema.TimeModel) {
+	if item.Start != 0 && time.Unix(item.Start, 0).Before(time.Unix(root.Start, 0)) {
+		zap.S().Infoln("开始时间小于根任务开始时间")
+		return
+	}
+
+	if item.End != 0 {
+		cancel := leaf.WithDeadline(c, time.Unix(item.End, 0))
+		defer cancel()
+	}
+
+	_, err := utils.LinkAudio(item.Data)
+	if err != nil {
+		zap.S().Errorln("音频数据获取异常: ", err)
+		return
+	}
+
+	select {
+	case <-c.Done():
+	case <-timerAction(item.Start):
+		{
+			zap.S().Infoln("播放待机音乐")
+			defer zap.S().Infoln("结束待机音乐")
+
+			//ctrl, closer, e := audio.PlayBgmMP3(data)
+			//defer closer()
+			//if e != nil {
+			//	zap.S().Errorln("播放待机音乐异常", e)
+			//	return
+			//}
+			//
+			//select {
+			//case <-c.Done():
+			//	{
+			//		speaker.Lock()
+			//		ctrl.Streamer = nil
+			//		speaker.Unlock()
+			//	}
+			//}
+		}
+	}
+}
+
+func ttsAction(c *leaf.Context, item schema.WaitItemModel, root schema.TimeModel) {
+	if item.Start != 0 && time.Unix(item.Start, 0).Before(time.Unix(root.Start, 0)) {
+		zap.S().Infoln("开始时间小于根任务开始时间")
+		return
+	}
+
+	if item.End != 0 {
+		cancel := leaf.WithDeadline(c, time.Unix(item.End, 0))
+		defer cancel()
+	}
+
+	_, err := tts.DefaultTTS.Get(item.Data)
+	if err != nil {
+		zap.S().Errorln("语音合成异常: ", err)
+		return
+	}
+
+	select {
+	case <-c.Done():
+	case <-timerAction(item.Start):
+		{
+			zap.S().Infoln("循环播放待机 TTS 语音")
+			defer zap.S().Infoln("结束待机 TTS 语音")
+
+			for {
+				//audio.PlayWav(c, reader)
+				select {
+				case <-c.Done():
+					return
+				case <-time.After(time.Duration(item.Interval) * time.Second):
+				}
+			}
+		}
+	}
+}
+
+func relayAction(c *leaf.Context, item schema.WaitItemModel, root schema.TimeModel) {
+	if item.Start != 0 && time.Unix(item.Start, 0).Before(time.Unix(root.Start, 0)) {
+		zap.S().Infoln("开始时间小于根任务开始时间")
+		return
+	}
+
+	if item.End != 0 {
+		cancel := leaf.WithDeadline(c, time.Unix(item.End, 0))
+		defer cancel()
+	}
+
+	r, err := relay.New(item.Data)
+	if err != nil {
+		zap.S().Errorln("继电器初始化异常: ", err)
+		return
+	}
+	defer r.Close()
+
+	select {
+	case <-c.Done():
+	case <-timerAction(item.Start):
+		{
+			zap.S().Infoln("待机继电器供电")
+			defer zap.S().Infoln("待机继电器断电")
+
+			r.On(0)
+			<-c.Done()
+			r.Off(0)
+		}
+	}
+}
+
+func videoAction(c *leaf.Context, item schema.WaitItemModel, root schema.TimeModel) {
+	if item.Start != 0 && time.Unix(item.Start, 0).Before(time.Unix(root.Start, 0)) {
+		zap.S().Infoln("开始时间小于根任务开始时间")
+		return
+	}
+
+	if item.End != 0 {
+		cancel := leaf.WithDeadline(c, time.Unix(item.End, 0))
+		defer cancel()
+	}
+
+	local, err := utils.LinkVideo(item.Data)
+	if err != nil {
+		zap.S().Errorln("视频文件获取异常: ", err)
+		return
+	}
+
+	select {
+	case <-c.Done():
+	case <-timerAction(item.Start):
+		{
+			zap.S().Infoln("循环播放待机视频")
+			defer zap.S().Infoln("结束待机视频")
+
+			utils.BlankOpen()
+			defer utils.BlankClose()
+
+			for {
+				err := video.Play(c, local)
+				if err != nil {
+					zap.S().Infof("视频播放异常: %s", err)
+					return
+				}
+				select {
+				case <-c.Done():
+					return
+				case <-time.After(time.Duration(item.Interval) * time.Second):
+				}
+			}
+		}
+	}
+}

pkg/audio/play.go

@@ -8,16 +8,15 @@ import (
 	"github.com/gopxl/beep/v2/wav"
 	"go.uber.org/zap"
 	"io"
-	"time"
 )
 
 var DefaultSampleRate = beep.SampleRate(44100)
 
 func init() {
-	err := speaker.Init(DefaultSampleRate, DefaultSampleRate.N(time.Second/10))
+	//err := speaker.Init(DefaultSampleRate, DefaultSampleRate.N(time.Second/10))
-	if err != nil {
+	//if err != nil {
-		panic("扬声器初始化异常: " + err.Error())
+	//	panic("扬声器初始化异常: " + err.Error())
-	}
+	//}
 	zap.S().Infoln("扬声器初始化完成")
 }
 

pkg/tts/aliyun.go

@@ -6,7 +6,6 @@ import (
 	"fmt"
 	"game-driver/config"
 	"game-driver/leaf"
-	"game-driver/pkg/audio"
 	"game-driver/pkg/errorsx"
 	"go.uber.org/zap"
 	"io"
@@ -47,7 +46,7 @@ func (tts *AliTTS) Sound(text string) {
 	}
 	buf, err := tts.Get(text)
 	if err == nil && buf != nil {
-		audio.PlayWav(tts.ctx, buf)
+		//audio.PlayWav(tts.ctx, buf)
 	} else {
 		zap.S().Errorln("AliTTS 请求异常: ", err)
 	}