From 91ddd03c190117018c08c9a6bfdd3ea78da0809c Mon Sep 17 00:00:00 2001
From: pggiroro <pg830616@163.com>
Date: Sat, 17 May 2025 21:51:03 +0800
Subject: [PATCH] fix: Modify the regular expression matching for playing the
 stream path in the GB28181 module.

---
 example/default/config.yaml |  4 ++-
 plugin/gb28181/index.go     | 58 ++++---------------------------------
 2 files changed, 8 insertions(+), 54 deletions(-)

diff --git a/example/default/config.yaml b/example/default/config.yaml
index 49f7f40..1943ab8 100755
--- a/example/default/config.yaml
+++ b/example/default/config.yaml
@@ -19,7 +19,9 @@ gb28181:
   #   live/test: dump/34020000001320000001
   onsub:
     pull:
-      .* : $0
+      ^\d{20}/\d{20}$: $0
+      ^gb_\d+/(.+)$: $1
+#      .* : $0
 mp4:
   # enable: false
   # publish:
diff --git a/plugin/gb28181/index.go b/plugin/gb28181/index.go
index b08855f..3b79a8e 100644
--- a/plugin/gb28181/index.go
+++ b/plugin/gb28181/index.go
@@ -42,7 +42,7 @@ type GB28181Plugin struct {
 	pb.UnimplementedApiServer
 	m7s.Plugin
 	Serial         string `default:"34020000002000000001" desc:"sip 服务 id"` //sip 服务器 id, 默认 34020000002000000001
-	Realm          string `default:"3402000000" desc:"sip 服务域"`             //sip 服务器域，默认 3402000000
+	Realm          string `default:"3402000000" desc:"sip 服务域"`            //sip 服务器域，默认 3402000000
 	Password       string
 	Sip            SipConfig
 	MediaPort      util.Range[uint16] `default:"10001-20000" desc:"媒体端口范围"` //媒体端口范围
@@ -747,7 +747,7 @@ func (gb *GB28181Plugin) RecoverDevice(d *Device, req *sip.Request) {
 			if sourceIPParse.IsPrivate() { // 源IP是内网IP
 				myWanIP = myLanIP // 使用内网IP作为外网IP
 			}
-		} else { // 目标地址是IP
+		} else {                           // 目标地址是IP
 			if sourceIPParse.IsPrivate() { // 源IP是内网IP
 				myLanIP, myWanIP = myIP, myIP // 使用目标IP作为内外网IP
 			}
@@ -851,7 +851,7 @@ func (gb *GB28181Plugin) StoreDevice(deviceid string, req *sip.Request) (d *Devi
 			if sourceIPParse.IsPrivate() { // 源IP是内网IP
 				myWanIP = myLanIP // 使用内网IP作为外网IP
 			}
-		} else { // 目标地址是IP
+		} else {                           // 目标地址是IP
 			if sourceIPParse.IsPrivate() { // 源IP是内网IP
 				myLanIP, myWanIP = myIP, myIP // 使用目标IP作为内外网IP
 			}
@@ -984,62 +984,14 @@ func (gb *GB28181Plugin) GetPullableList() []string {
 	return slices.Collect(func(yield func(string) bool) {
 		for d := range gb.devices.Range {
 			for c := range d.channels.Range {
-				originalPath := fmt.Sprintf("%s/%s", d.DeviceId, c.ChannelID)
-
-				// 遍历配置中的正则表达式
-				pathGenerated := false
-				for reg, _ := range gb.GetCommonConf().OnSub.Pull {
-					regStr := reg.String()
-
-					// 尝试从正则表达式生成符合规则的路径
-					if generatedPath, ok := generatePathFromRegex(regStr, originalPath); ok {
-						if !yield(generatedPath) {
-							return
-						}
-						pathGenerated = true
-					}
-				}
-
-				// 如果没有生成任何符合规则的路径，则使用原始路径
-				if !pathGenerated {
-					if !yield(originalPath) {
-						return
-					}
+				if c.Status == gb28181.ChannelOnStatus {
+					yield(fmt.Sprintf("%s/%s", d.DeviceId, c.ChannelID))
 				}
 			}
 		}
 	})
 }
 
-// generatePathFromRegex 通过分析正则表达式生成符合规则的路径
-// 返回生成的路径和是否成功生成
-func generatePathFromRegex(regexStr string, originalPath string) (string, bool) {
-	// 确保正则表达式以^开头，$结尾
-	if !strings.HasPrefix(regexStr, "^") || !strings.HasSuffix(regexStr, "$") {
-		return "", false
-	}
-
-	// 移除^和$
-	pattern := regexStr[1 : len(regexStr)-1]
-
-	// 检查是否包含捕获组 (.+)
-	if !strings.Contains(pattern, "(.+)") {
-		return "", false
-	}
-
-	// 替换捕获组 (.+) 为原始路径
-	result := strings.Replace(pattern, "(.+)", originalPath, 1)
-
-	// 替换 \d+ 为随机数
-	if strings.Contains(result, "\\d+") {
-		// 生成一个随机数，例如当前时间戳的后三位
-		randomNum := fmt.Sprintf("%d", time.Now().Unix()%1000)
-		result = strings.Replace(result, "\\d+", randomNum, 1)
-	}
-
-	return result, true
-}
-
 //type PSServer struct {
 //	task.Task
 //	*rtp2.TCP