fix: 等待时间下限不一致

SereinDev · Jan 6, 2025 · 54a1de4 · 54a1de4
1 parent e7b4f14
commit 54a1de4
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 5 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -1,6 +1,5 @@
 FROM mcr.microsoft.com/dotnet/sdk:8.0 AS build
 
-WORKDIR /src
 COPY . .
 
 ARG TARGETARCH
@@ -9,7 +8,7 @@ RUN dotnet publish src/Serein.Cli -a $TARGETARCH -c Release -o /app/bin
 WORKDIR /app/bin
 ENV DOTNET_EnableWriteXorExecute=0
 
-RUN echo "#!/bin/sh \r\n/app/bin/Serein.Cli" > /app/bin/serein-entrypoint.sh
+COPY ./src/Scripts/serein-entrypoint.sh /app/bin/serein-entrypoint.sh
 RUN chmod +x /app/bin/serein-entrypoint.sh
 
 ENTRYPOINT [ "/app/bin/serein-entrypoint.sh" ]
diff --git a/src/Scripts/serein-entrypoint.sh b/src/Scripts/serein-entrypoint.sh
@@ -0,0 +1,3 @@
+#!/bin/sh
+
+./Serein.Cli
diff --git a/src/Serein.Core/Services/Plugins/EventDispatcher.cs b/src/Serein.Core/Services/Plugins/EventDispatcher.cs
@@ -63,7 +63,9 @@ internal bool Dispatch(Event @event, params object[] args)
         }
 
         cancellationTokenSource.Cancel();
-        return !tasks.Where((task) => task.IsCompleted).Any((task) => !task.Result);
+
+        var completedTasks = tasks.Where(task => task.IsCompleted);
+        return !completedTasks.Any() || completedTasks.All(task => task.Result);
     }
 
     private void DispatchToJsPlugins(

diff --git a/src/Serein.Plus/Pages/Settings/AppSettingPage.xaml b/src/Serein.Plus/Pages/Settings/AppSettingPage.xaml
@@ -32,9 +32,9 @@
                 HorizontalAlignment="Left"
                 ui:ControlHelper.Header="事件最大等待时间 (ms)"
                 LostFocus="OnPropertyChanged"
-                Minimum="-1"
+                Minimum="0"
                 SpinButtonPlacementMode="Compact"
-                ToolTip="超出此时间返回的结果将被忽略；设置成-1可禁用等待"
+                ToolTip="超出此时间返回的结果将被忽略；设置成0可禁用等待"
                 Value="{Binding Value.Application.PluginEventMaxWaitingTime}" />
             <TextBox
                 ui:ControlHelper.Header="JS插件全局加载的程序集"