Merge pull request #670 from immense/hotfix/fix-run-script

Fix running scripts.
immense · Jun 24, 2023 · d982d5e · d982d5e
2 parents 402d5b0 + 65f61ee
commit d982d5e
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 2 deletions.
diff --git a/Server/Components/Scripts/RunScript.razor.cs b/Server/Components/Scripts/RunScript.razor.cs
@@ -123,7 +123,7 @@ private async Task ExecuteScript()
 
             var filteredDevices = DataService.FilterDeviceIDsByUserPermission(deviceIds.ToArray(), User);
 
-            var onlineDevices = ServiceSessionCache.GetConnectionIdsByDeviceIds(filteredDevices);
+            var onlineDevices = ServiceSessionCache.FilterDevicesByOnlineStatus(filteredDevices, true);
 
             var scriptRun = new ScriptRun()
             {

diff --git a/Server/Services/AgentHubSessionCache.cs b/Server/Services/AgentHubSessionCache.cs
@@ -9,6 +9,8 @@ namespace Remotely.Server.Services
     public interface IAgentHubSessionCache
     {
         void AddOrUpdateByConnectionId(string connectionId, Device device);
+        IEnumerable<string> FilterDevicesByOnlineStatus(IEnumerable<string> deviceIds, bool isOnline);
+
         ICollection<Device> GetAllDevices();
         IEnumerable<string> GetConnectionIdsByDeviceIds(IEnumerable<string> deviceIds);
         bool TryGetByDeviceId(string deviceId, out Device device);
@@ -28,6 +30,18 @@ public void AddOrUpdateByConnectionId(string connectionId, Device device)
             _deviceIdToConnectionIdLookup.AddOrUpdate(device.ID, connectionId, (k, v) => connectionId);
         }
 
+        public IEnumerable<string> FilterDevicesByOnlineStatus(IEnumerable<string> deviceIds, bool isOnline)
+        {
+            foreach (var deviceId in deviceIds)
+            {
+                var result = TryGetConnectionId(deviceId, out _);
+                if (result == isOnline)
+                {
+                    yield return deviceId;
+                }
+            }
+        }
+
         public ICollection<Device> GetAllDevices() => _connectionIdToDeviceLookup.Values;
 
         public IEnumerable<string> GetConnectionIdsByDeviceIds(IEnumerable<string> deviceIds)

diff --git a/Server/Services/ScriptScheduleDispatcher.cs b/Server/Services/ScriptScheduleDispatcher.cs
@@ -85,7 +85,7 @@ public async Task DispatchPendingScriptRuns()
                             .Distinct()
                             .ToArray();
 
-                        var onlineDevices = _serviceSessionCache.GetConnectionIdsByDeviceIds(deviceIds);
+                        var onlineDevices = _serviceSessionCache.FilterDevicesByOnlineStatus(deviceIds, true);
 
                         if (schedule.RunOnNextConnect)
                         {