fixbug:只有在TCP模式a=setup才需要设置

.github/workflows/dotnet.yml

@@ -0,0 +1,28 @@
+# This workflow will build a .NET project
+# For more information see: https://docs.github.com/en/actions/automating-builds-and-tests/building-and-testing-net
+
+name: .NET
+
+on:
+  push:
+    branches: [ "master" ]
+  pull_request:
+    branches: [ "master" ]
+
+jobs:
+  build:
+
+    runs-on: ubuntu-latest
+
+    steps:
+    - uses: actions/checkout@v3
+    - name: Setup .NET
+      uses: actions/setup-dotnet@v3
+      with:
+        dotnet-version: 6.0.x
+    - name: Restore dependencies
+      run: dotnet restore
+    - name: Build
+      run: dotnet build --no-restore
+    - name: Test
+      run: dotnet test --no-build --verbosity normal

.gitignore

@@ -24,3 +24,6 @@ ehthumbs.db
 Thumbs.db
 .DS_Store
 */.DS_Store
+.vscode/**
+.vs/**
+*.csproj.user

AKStreamKeeper/AKStreamKeeper.csproj

@@ -1,17 +1,9 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
 
     <PropertyGroup>
-        <TargetFramework>net6.0</TargetFramework>
-        <LangVersion>default</LangVersion>
-    </PropertyGroup>
-
-    <PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">
-      <DocumentationFile>bin\Debug\net6.0\AKStreamKeeper.xml</DocumentationFile>
-      <DebugType>portable</DebugType>
-    </PropertyGroup>
-
-    <PropertyGroup Condition=" '$(Configuration)' == 'Release' ">
-      <DocumentationFile>bin\Debug\net5.0\AKStreamKeeper.xml</DocumentationFile>
+      <TargetFramework>net6.0</TargetFramework>
+      <LangVersion>default</LangVersion>
+      <GenerateDocumentationFile>True</GenerateDocumentationFile>
     </PropertyGroup>
 
     <ItemGroup>
@@ -21,9 +13,15 @@
     </ItemGroup>
 
     <ItemGroup>
-      <PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="6.0.8" />
-      <PackageReference Include="Swashbuckle.AspNetCore" Version="6.4.0" />
-      <PackageReference Include="Swashbuckle.AspNetCore.Annotations" Version="6.4.0" />
+      <PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="6.0.20" />
+      <PackageReference Include="Swashbuckle.AspNetCore" Version="6.5.0" />
+      <PackageReference Include="Swashbuckle.AspNetCore.Annotations" Version="6.5.0" />
+    </ItemGroup>
+
+    <ItemGroup>
+      <None Update="Config\logconfig.xml">
+        <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+      </None>
     </ItemGroup>
 
 

AKStreamKeeper/AutoTask/DiskUseableChecker.cs

@@ -0,0 +1,55 @@
+using System;
+using System.Runtime.InteropServices;
+using System.Threading;
+using LibCommon;
+
+namespace AKStreamKeeper.AutoTask;
+
+public class DiskUseableChecker
+{
+    public DiskUseableChecker()
+    {
+        if (Common.AkStreamKeeperConfig.CheckLinuxDiskMount == true &&
+            RuntimeInformation.IsOSPlatform(OSPlatform.Linux) &&
+            Common.AkStreamKeeperConfig.CustomRecordPathList != null &&
+            Common.AkStreamKeeperConfig.CustomRecordPathList.Count > 0)
+        {
+            new Thread(new ThreadStart(delegate
+            {
+                try
+                {
+                    Checker();
+                }
+                catch
+                {
+                }
+            })).Start();
+        }
+    }
+
+    private void Checker()
+    {
+        while (true)
+        {
+            try
+            {
+                lock (Common.DisksUseable)
+                {
+                    Common.DisksUseable.Clear();
+                    foreach (var path in Common.AkStreamKeeperConfig
+                                 .CustomRecordPathList)
+                    {
+                        var ret = UtilsHelper.DirAreMounttedAndWriteableForLinux(path);
+                        Common.DisksUseable.Add(path, ret);
+                    }
+                }
+            }
+            catch (Exception ex)
+            {
+                GCommon.Logger.Error($"[{Common.LoggerHead}]->执行磁盘挂载检测时出现异常->{ex.Message}\r\n{ex.StackTrace}");
+            }
+
+            Thread.Sleep(5000);
+        }
+    }
+}

AKStreamKeeper/Common.cs

@@ -35,6 +35,8 @@ public static class Common
         private static DateTime _sendDataTick = DateTime.Now;
         private static ulong _timerCount = 0;
         private static string _oldMediaServerId = "";
+        private static Dictionary<string, int> _disksUseable = new Dictionary<string, int>();
+        private static DiskUseableChecker _diskUseableChecker;
 
         public static string OldMediaServerId
         {
@@ -79,6 +81,15 @@ public static Timer PerFormanceInfoTimer
 
         public static MediaServerInstance MediaServerInstance;
 
+        /// <summary>
+        /// 挂载的硬盘是否可用
+        /// </summary>
+        public static Dictionary<string, int> DisksUseable
+        {
+            get => _disksUseable;
+            set => _disksUseable = value;
+        }
+
         static Common()
         {
 #if (DEBUG)
@@ -546,6 +557,7 @@ private static bool ReadConfig(out ResponseStruct rs)
                 KeeperPerformanceInfo = _keeperSystemInfo.GetSystemInfoObject();
             }
 
+
             if (!File.Exists(_configPath))
             {
                 //创建文件 
@@ -570,6 +582,7 @@ private static bool ReadConfig(out ResponseStruct rs)
                             var text = File.ReadAllText("/etc/hostname").Trim().ToLower();
                             if (text.Contains("gdn") || text.Contains("guardian") || text.Contains("rasp"))
                             {
+                                _akStreamKeeperConfig.CheckLinuxDiskMount = true;
                                 _akStreamKeeperConfig.RecordSec = 120;
                                 var _jsonText = JsonHelper.ToJson(_akStreamKeeperConfig, Formatting.Indented);
                                 if (!string.IsNullOrEmpty(_jsonText))
@@ -742,6 +755,22 @@ private static void OnTimedEvent(object source, ElapsedEventArgs e)
                 tmpKeepAlive.MediaServerIsRunning = MediaServerInstance.IsRunning;
                 tmpKeepAlive.Version = Version;
                 tmpKeepAlive.ZlmBuildDateTime = MediaServerInstance.ZlmBuildDateTime;
+                tmpKeepAlive.CutMergeFilePath = _akStreamKeeperConfig.CutMergeFilePath;
+                lock (DisksUseable)
+                {
+                    if (DisksUseable != null && DisksUseable.Count > 0)
+                    {
+                        tmpKeepAlive.DisksUseable = new Dictionary<string, int>();
+                        foreach (var dic in DisksUseable)
+                        {
+                            tmpKeepAlive.DisksUseable.Add(dic.Key, dic.Value);
+                        }
+                    }
+                    else
+                    {
+                        tmpKeepAlive.DisksUseable = null;
+                    }
+                }
 
                 string reqData = JsonHelper.ToJson(tmpKeepAlive, Formatting.Indented);
 
@@ -806,6 +835,8 @@ public static void Init()
                 _configPath = GCommon.OutConfigPath + "AKStreamKeeper.json";
             }
 
+            _configPath = UtilsHelper.FindPreferredConfigFile(_configPath); //查找优先使用的配置文件
+
             GCommon.Logger.Info(
                 $"[{LoggerHead}]->Let's Go...");
             GCommon.Logger.Info(
@@ -853,6 +884,7 @@ public static void Init()
                 $"[{LoggerHead}]->流媒体服务器启动成功->进程ID:{MediaServerInstance.GetPid()}");
 
             AutoRtpPortClean = new AutoRtpPortClean(); //启动不使用rtp端口自动清理
+            _diskUseableChecker = new DiskUseableChecker(); //启动磁盘挂载监控
 
             if (!string.IsNullOrEmpty(AkStreamKeeperConfig.CutMergeFilePath))
             {

AKStreamKeeper/Config/AKStreamKeeper.json

@@ -1,9 +1,9 @@
 {
-  "IpV4Address": "192.168.2.94",
+  "IpV4Address": "127.0.0.1",
   "IpV6Address": "fe80::8:807:2143:28a1%5",
-  "Candidate":"192.168.2.94",
+  "Candidate":"127.0.0.1",
   "WebApiPort": 6880,
-  "MediaServerPath": "/Users/qiuzhouwei/SourceTemp/ZLMediaKit/release/darwin/Debug/MediaServer",
+  "MediaServerPath": "/Users/qiuzhouwei/Sources/ZLMediaKit/release/darwin/Debug/MediaServer",
   "AkStreamWebRegisterUrl": "http://127.0.0.1:5800/MediaServer/WebHook/MediaServerKeepAlive",
   "CutMergeFilePath": "/Users/qiuzhouwei/Downloads/CutMergeFile",
   "CustomRecordPathList": [
@@ -15,10 +15,13 @@
   "MinSendRtpPort": 20002,
   "MaxSendRtpPort": 20200,
   "RandomPort": false,
-  "FFmpegPath": "/usr/local/bin/ffmpeg",
-  "AccessKey": "O7O4S089-PGDW6HTM-T4CV6K74-V6RIP1I6-9300G54F-Z03TI40Q",
+  "FFmpegPath": "/opt/homebrew/bin/ffmpeg",
+  "AccessKey": "047I4WS1-U51UBO6W-1J4BT21P-MF17IT99-92J8WIHU-944Q4KIW",
   "RtpPortCdTime": 3600,
   "HttpClientTimeoutSec": 5,
-  "DisableShell": true,
-  "ZLMediakitSSLFilePath": "./sslfiles/"
+  "DisableShell": false,
+  "CheckLinuxDiskMount": false,
+  "ZLMediakitSSLFilePath": "./sslfiles/",
+  "ListenIp": "127.0.0.1",
+  "EnableRtspAuth": true
 }

AKStreamKeeper/Config/logconfig.xml

@@ -21,7 +21,7 @@
 
         <!-- Setup the root category, add the appenders and set the default level -->
         <root>
-            <level value="INFO" />
+            <level value="ALL" />
             <appender-ref ref="ConsoleAppender" />
             <appender-ref ref="RollingLogFileAppender" />
         </root>

AKStreamKeeper/Controllers/ApiServiceController.cs

@@ -10,6 +10,9 @@
 
 namespace AKStreamKeeper.Controllers
 {
+    /// <summary>
+    /// 流媒体服务器相关接口
+    /// </summary>
     [Log]
     [AuthVerify]
     [ApiController]

AKStreamKeeper/Controllers/CutMergeServiceController.cs

@@ -8,6 +8,9 @@
 
 namespace AKStreamKeeper.Controllers
 {
+    /// <summary>
+    /// 裁剪与合并视频相关接口
+    /// </summary>
     [Log]
     [AuthVerify]
     [ApiController]