Add new session timeout feature

aristotelos · aristotelos · commit ad6a4d442f80 · 2024-04-17T13:14:27.000+02:00
Cleanup unused sessions after the `appium:newCommandTimeout` interval
(default 60 seconds).
diff --git a/README.md b/README.md
@@ -28,6 +28,7 @@ The following capabilities are supported:
 | appium:appArguments                | Application arguments string, for example `/?`.                                                                                                                                                                                                                            |
 | appium:appTopLevelWindow           | The hexadecimal handle of an existing application top level window to attach to, for example `0x12345` (should be of string type). Either this capability, `appTopLevelWindowTitleMatch` or `app` must be provided on session startup.                                     | `0xC0B46`                                           |
 | appium:appTopLevelWindowTitleMatch | The title of an existing application top level window to attach to, for example `My App Window Title` (should be of string type). Either this capability, `appTopLevelWindow` or `app` must be provided on session startup.                                                | `My App Window Title` or `My App Window Title - .*` |
+| appium:newCommandTimeout           | The number of seconds the to wait for clients to send commands before deciding that the client has gone away and the session should shut down. Default one minute (60).                                                                                                    | `120`                                               |
 
 ## Getting Started
 
diff --git a/src/FlaUI.WebDriver.UITests/SessionTests.cs b/src/FlaUI.WebDriver.UITests/SessionTests.cs
@@ -135,5 +135,56 @@ public void GetTitle_Default_IsSupported()
 
             Assert.That(title, Is.EqualTo("FlaUI WPF Test App"));
         }
+
+        [Test, Explicit("Takes too long (one minute)")]
+        public void NewCommandTimeout_DefaultValue_OneMinute()
+        {
+            var driverOptions = FlaUIDriverOptions.TestApp();
+            using var driver = new RemoteWebDriver(WebDriverFixture.WebDriverUrl, driverOptions);
+
+            System.Threading.Thread.Sleep(TimeSpan.FromSeconds(60) + WebDriverFixture.SessionCleanupInterval*2);
+
+            Assert.That(() => driver.Title, Throws.TypeOf<WebDriverException>().With.Message.Matches("No active session with ID '.*'"));
+        }
+
+        [Test]
+        public void NewCommandTimeout_Expired_EndsSession()
+        {
+            var driverOptions = FlaUIDriverOptions.TestApp();
+            driverOptions.AddAdditionalOption("appium:newCommandTimeout", 1);
+            using var driver = new RemoteWebDriver(WebDriverFixture.WebDriverUrl, driverOptions);
+
+            System.Threading.Thread.Sleep(TimeSpan.FromSeconds(1) + WebDriverFixture.SessionCleanupInterval * 2);
+
+            Assert.That(() => driver.Title, Throws.TypeOf<WebDriverException>().With.Message.Matches("No active session with ID '.*'"));
+        }
+
+        [Test]
+        public void NewCommandTimeout_ReceivedCommandsBeforeExpiry_DoesNotEndSession()
+        {
+            var driverOptions = FlaUIDriverOptions.TestApp();
+            driverOptions.AddAdditionalOption("appium:newCommandTimeout", WebDriverFixture.SessionCleanupInterval.TotalSeconds * 4);
+            using var driver = new RemoteWebDriver(WebDriverFixture.WebDriverUrl, driverOptions);
+
+            System.Threading.Thread.Sleep(WebDriverFixture.SessionCleanupInterval * 2);
+            _ = driver.Title;
+            System.Threading.Thread.Sleep(WebDriverFixture.SessionCleanupInterval * 2);
+            _ = driver.Title;
+            System.Threading.Thread.Sleep(WebDriverFixture.SessionCleanupInterval * 2);
+
+            Assert.That(() => driver.Title, Throws.Nothing);
+        }
+
+        [Test]
+        public void NewCommandTimeout_NotExpired_DoesNotEndSession()
+        {
+            var driverOptions = FlaUIDriverOptions.TestApp();
+            driverOptions.AddAdditionalOption("appium:newCommandTimeout", 240);
+            using var driver = new RemoteWebDriver(WebDriverFixture.WebDriverUrl, driverOptions);
+
+            System.Threading.Thread.Sleep(WebDriverFixture.SessionCleanupInterval * 2);
+
+            Assert.That(() => driver.Title, Throws.Nothing);
+        }
     }
 }
diff --git a/src/FlaUI.WebDriver.UITests/WebDriverFixture.cs b/src/FlaUI.WebDriver.UITests/WebDriverFixture.cs
@@ -9,7 +9,8 @@ namespace FlaUI.WebDriver.UITests
     [SetUpFixture]
     public class WebDriverFixture
     {
-        public static readonly Uri WebDriverUrl = new Uri("http://localhost:9723/");
+        public static readonly Uri WebDriverUrl = new Uri("http://localhost:4723/");
+        public static readonly TimeSpan SessionCleanupInterval = TimeSpan.FromSeconds(1);
 
         private Process _webDriverProcess;
 
@@ -20,7 +21,7 @@ public void Setup()
             Directory.SetCurrentDirectory(assemblyDir);
 
             string webDriverPath = Path.Combine(Directory.GetCurrentDirectory(), "FlaUI.WebDriver.exe");
-            var webDriverArguments = $"--urls={WebDriverUrl}";
+            var webDriverArguments = $"--urls={WebDriverUrl} --SessionCleanup:SchedulingIntervalSeconds={SessionCleanupInterval.TotalSeconds}";
             var webDriverProcessStartInfo = new ProcessStartInfo(webDriverPath, webDriverArguments)
             {
                 RedirectStandardError = true,
diff --git a/src/FlaUI.WebDriver/Controllers/ActionsController.cs b/src/FlaUI.WebDriver/Controllers/ActionsController.cs
@@ -333,6 +333,7 @@ private Session GetSession(string sessionId)
             {
                 throw WebDriverResponseException.SessionNotFound(sessionId);
             }
+            session.SetLastCommandTimeToNow();
             return session;
         }
     }
diff --git a/src/FlaUI.WebDriver/Controllers/ElementController.cs b/src/FlaUI.WebDriver/Controllers/ElementController.cs
@@ -219,6 +219,7 @@ private Session GetSession(string sessionId)
             {
                 throw WebDriverResponseException.SessionNotFound(sessionId);
             }
+            session.SetLastCommandTimeToNow();
             return session;
         }
     }
diff --git a/src/FlaUI.WebDriver/Controllers/ExecuteController.cs b/src/FlaUI.WebDriver/Controllers/ExecuteController.cs
@@ -78,6 +78,7 @@ private Session GetSession(string sessionId)
             {
                 throw WebDriverResponseException.SessionNotFound(sessionId);
             }
+            session.SetLastCommandTimeToNow();
             return session;
         }
     }
diff --git a/src/FlaUI.WebDriver/Controllers/FindElementsController.cs b/src/FlaUI.WebDriver/Controllers/FindElementsController.cs
@@ -210,6 +210,7 @@ private Session GetSession(string sessionId)
             {
                 throw WebDriverResponseException.SessionNotFound(sessionId);
             }
+            session.SetLastCommandTimeToNow();
             return session;
         }
     }
diff --git a/src/FlaUI.WebDriver/Controllers/ScreenshotController.cs b/src/FlaUI.WebDriver/Controllers/ScreenshotController.cs
@@ -75,6 +75,7 @@ private Session GetSession(string sessionId)
             {
                 throw WebDriverResponseException.SessionNotFound(sessionId);
             }
+            session.SetLastCommandTimeToNow();
             return session;
         }
     }
diff --git a/src/FlaUI.WebDriver/Controllers/SessionController.cs b/src/FlaUI.WebDriver/Controllers/SessionController.cs
@@ -29,7 +29,7 @@ public async Task<ActionResult> CreateNewSession([FromBody] CreateSessionRequest
         {
             var possibleCapabilities = GetPossibleCapabilities(request);
             var matchingCapabilities = possibleCapabilities.Where(
-                capabilities => capabilities.TryGetValue("platformName", out var platformName) && platformName.ToLowerInvariant() == "windows"
+                capabilities => capabilities.TryGetValue("platformName", out var platformName) && platformName.GetString()?.ToLowerInvariant() == "windows"
             );
 
             Core.Application? app;
@@ -44,16 +44,16 @@ public async Task<ActionResult> CreateNewSession([FromBody] CreateSessionRequest
             }
             if (capabilities.TryGetValue("appium:app", out var appPath))
             {
-                if (appPath == "Root")
+                if (appPath.GetString() == "Root")
                 {
                     app = null;
                 }
                 else
                 {
-                    capabilities.TryGetValue("appium:appArguments", out var appArguments);
+                    bool hasArguments = capabilities.TryGetValue("appium:appArguments", out var appArguments);
                     try
                     {
-                        var processStartInfo = new ProcessStartInfo(appPath, appArguments ?? "");
+                        var processStartInfo = new ProcessStartInfo(appPath.GetString()!, hasArguments ? appArguments.GetString()! : "");
                         app = Core.Application.Launch(processStartInfo);
                     }
                     catch(Exception e)
@@ -64,19 +64,23 @@ public async Task<ActionResult> CreateNewSession([FromBody] CreateSessionRequest
             }
             else if(capabilities.TryGetValue("appium:appTopLevelWindow", out var appTopLevelWindowString))
             {
-                Process process = GetProcessByMainWindowHandle(appTopLevelWindowString);
+                Process process = GetProcessByMainWindowHandle(appTopLevelWindowString.GetString()!);
                 app = Core.Application.Attach(process);
             }
             else if (capabilities.TryGetValue("appium:appTopLevelWindowTitleMatch", out var appTopLevelWindowTitleMatch))
             {
-                Process? process = GetProcessByMainWindowTitle(appTopLevelWindowTitleMatch);
+                Process? process = GetProcessByMainWindowTitle(appTopLevelWindowTitleMatch.GetString()!);
                 app = Core.Application.Attach(process);
             }
             else
             {
                 throw WebDriverResponseException.InvalidArgument("One of appium:app, appium:appTopLevelWindow or appium:appTopLevelWindowTitleMatch must be passed as a capability");
             }
             var session = new Session(app);
+            if(capabilities.TryGetValue("appium:newCommandTimeout", out var newCommandTimeout))
+            {
+                session.NewCommandTimeout = TimeSpan.FromSeconds(newCommandTimeout.GetDouble());
+            }
             _sessionRepository.Add(session);
             _logger.LogInformation("Created session with ID {SessionId} and capabilities {Capabilities}", session.SessionId, capabilities);
             return await Task.FromResult(WebDriverResult.Success(new CreateSessionResponse()
@@ -132,14 +136,14 @@ private static Process GetProcessByMainWindowHandle(string appTopLevelWindowStri
             return process;
         }
 
-        private static IEnumerable<Dictionary<string, string>> GetPossibleCapabilities(CreateSessionRequest request)
+        private static IEnumerable<Dictionary<string, JsonElement>> GetPossibleCapabilities(CreateSessionRequest request)
         {
-            var requiredCapabilities = request.Capabilities.AlwaysMatch ?? new Dictionary<string, string>();
-            var allFirstMatchCapabilities = request.Capabilities.FirstMatch ?? new List<Dictionary<string, string>>(new[] { new Dictionary<string, string>() });
+            var requiredCapabilities = request.Capabilities.AlwaysMatch ?? new Dictionary<string, JsonElement>();
+            var allFirstMatchCapabilities = request.Capabilities.FirstMatch ?? new List<Dictionary<string, JsonElement>>(new[] { new Dictionary<string, JsonElement>() });
             return allFirstMatchCapabilities.Select(firstMatchCapabilities => MergeCapabilities(firstMatchCapabilities, requiredCapabilities));
         }
 
-        private static Dictionary<string, string> MergeCapabilities(Dictionary<string, string> firstMatchCapabilities, Dictionary<string, string> requiredCapabilities)
+        private static Dictionary<string, JsonElement> MergeCapabilities(Dictionary<string, JsonElement> firstMatchCapabilities, Dictionary<string, JsonElement> requiredCapabilities)
         {
             var duplicateKeys = firstMatchCapabilities.Keys.Intersect(requiredCapabilities.Keys);
             if (duplicateKeys.Any())
@@ -176,6 +180,7 @@ private Session GetSession(string sessionId)
             {
                 throw WebDriverResponseException.SessionNotFound(sessionId);
             }
+            session.SetLastCommandTimeToNow();
             return session;
         }
     }
diff --git a/src/FlaUI.WebDriver/Controllers/TimeoutsController.cs b/src/FlaUI.WebDriver/Controllers/TimeoutsController.cs
@@ -42,6 +42,7 @@ private Session GetSession(string sessionId)
             {
                 throw WebDriverResponseException.SessionNotFound(sessionId);
             }
+            session.SetLastCommandTimeToNow();
             return session;
         }
     }
diff --git a/src/FlaUI.WebDriver/Controllers/WindowController.cs b/src/FlaUI.WebDriver/Controllers/WindowController.cs
@@ -172,6 +172,7 @@ private Session GetSession(string sessionId)
             {
                 throw WebDriverResponseException.SessionNotFound(sessionId);
             }
+            session.SetLastCommandTimeToNow();
             return session;
         }
     }
diff --git a/src/FlaUI.WebDriver/ISessionRepository.cs b/src/FlaUI.WebDriver/ISessionRepository.cs
@@ -5,5 +5,6 @@ public interface ISessionRepository
         void Add(Session session);
         void Delete(Session session);
         Session? FindById(string sessionId);
+        List<Session> FindTimedOut();
     }
 }
diff --git a/src/FlaUI.WebDriver/Models/Capabilities.cs b/src/FlaUI.WebDriver/Models/Capabilities.cs
@@ -1,10 +1,11 @@
 ﻿using System.Collections.Generic;
+using System.Text.Json;
 
 namespace FlaUI.WebDriver.Models
 {
     public class Capabilities
     {
-        public Dictionary<string, string>? AlwaysMatch { get; set; }
-        public List<Dictionary<string, string>>? FirstMatch { get; set; }
+        public Dictionary<string, JsonElement>? AlwaysMatch { get; set; }
+        public List<Dictionary<string, JsonElement>>? FirstMatch { get; set; }
     }
 }
diff --git a/src/FlaUI.WebDriver/Models/CreateSessionResponse.cs b/src/FlaUI.WebDriver/Models/CreateSessionResponse.cs
@@ -1,10 +1,11 @@
 ﻿using System.Collections.Generic;
+using System.Text.Json;
 
 namespace FlaUI.WebDriver.Models
 {
     public class CreateSessionResponse
     {
         public string SessionId { get; set; } = null!;
-        public Dictionary<string, string> Capabilities { get; set; } = new Dictionary<string, string>();
+        public Dictionary<string, JsonElement> Capabilities { get; set; } = new Dictionary<string, JsonElement>();
     }
 }
diff --git a/src/FlaUI.WebDriver/Program.cs b/src/FlaUI.WebDriver/Program.cs
@@ -15,6 +15,10 @@
     c.SwaggerDoc("v1", new OpenApiInfo { Title = "FlaUI.WebDriver", Version = "v1" });
 });
 
+builder.Services.Configure<SessionCleanupOptions>(
+    builder.Configuration.GetSection(SessionCleanupOptions.OptionsSectionName));
+builder.Services.AddHostedService<SessionCleanupService>();
+
 var app = builder.Build();
 
 // Configure the HTTP request pipeline.
diff --git a/src/FlaUI.WebDriver/Properties/launchSettings.json b/src/FlaUI.WebDriver/Properties/launchSettings.json
@@ -1,23 +1,14 @@
-﻿{
-  "$schema": "https://json.schemastore.org/launchsettings.json",
-  "iisSettings": {
-    "windowsAuthentication": false,
-    "anonymousAuthentication": true,
-    "iisExpress": {
-      "applicationUrl": "http://localhost:26539",
-      "sslPort": 0
-    }
-  },
+{
   "profiles": {
     "FlaUI.WebDriver": {
       "commandName": "Project",
-      "dotnetRunMessages": true,
-      "launchBrowser": false,
+      "commandLineArgs": "--urls=http://localhost:4723/",
       "launchUrl": "swagger",
-      "applicationUrl": "http://localhost:4723",
       "environmentVariables": {
         "ASPNETCORE_ENVIRONMENT": "Development"
-      }
+      },
+      "dotnetRunMessages": true,
+      "applicationUrl": "http://localhost:4723"
     },
     "IIS Express": {
       "commandName": "IISExpress",
@@ -27,5 +18,14 @@
         "ASPNETCORE_ENVIRONMENT": "Development"
       }
     }
+  },
+  "$schema": "https://json.schemastore.org/launchsettings.json",
+  "iisSettings": {
+    "windowsAuthentication": false,
+    "anonymousAuthentication": true,
+    "iisExpress": {
+      "applicationUrl": "http://localhost:26539",
+      "sslPort": 0
+    }
   }
-}
+}
diff --git a/src/FlaUI.WebDriver/Session.cs b/src/FlaUI.WebDriver/Session.cs
@@ -66,6 +66,16 @@ public string CurrentWindowHandle
             }
         }
 
+        public bool IsTimedOut => (DateTime.UtcNow - LastNewCommandTimeUtc) > NewCommandTimeout;
+
+        public TimeSpan NewCommandTimeout { get; internal set; } = TimeSpan.FromSeconds(60);
+        public DateTime LastNewCommandTimeUtc { get; internal set; } = DateTime.UtcNow;
+
+        public void SetLastCommandTimeToNow()
+        {
+            LastNewCommandTimeUtc = DateTime.UtcNow;
+        }
+
         public KnownElement GetOrAddKnownElement(AutomationElement element)
         {
             var result = KnownElementsByElementReference.Values.FirstOrDefault(knownElement => knownElement.Element.Equals(element));
diff --git a/src/FlaUI.WebDriver/SessionCleanupOptions.cs b/src/FlaUI.WebDriver/SessionCleanupOptions.cs
@@ -0,0 +1,9 @@
+﻿namespace FlaUI.WebDriver
+{
+    public class SessionCleanupOptions
+    {
+        public const string OptionsSectionName = "SessionCleanup";
+
+        public double SchedulingIntervalSeconds { get; set; } = 60;
+    }
+}
diff --git a/src/FlaUI.WebDriver/SessionCleanupService.cs b/src/FlaUI.WebDriver/SessionCleanupService.cs
diff --git a/src/FlaUI.WebDriver/SessionRepository.cs b/src/FlaUI.WebDriver/SessionRepository.cs
diff --git a/src/FlaUI.WebDriver/appsettings.json b/src/FlaUI.WebDriver/appsettings.json

Original file line number	Diff line number	Diff line change
`@@ -333,6 +333,7 @@ private Session GetSession(string sessionId)`
`333`	`333`	`{`
`334`	`334`	`throw WebDriverResponseException.SessionNotFound(sessionId);`
`335`	`335`	`}`
	`336`	`+ session.SetLastCommandTimeToNow();`
`336`	`337`	`return session;`
`337`	`338`	`}`
`338`	`339`	`}`
Original file line number	Diff line number	Diff line change
`@@ -219,6 +219,7 @@ private Session GetSession(string sessionId)`
`219`	`219`	`{`
`220`	`220`	`throw WebDriverResponseException.SessionNotFound(sessionId);`
`221`	`221`	`}`
	`222`	`+ session.SetLastCommandTimeToNow();`
`222`	`223`	`return session;`
`223`	`224`	`}`
`224`	`225`	`}`
Original file line number	Diff line number	Diff line change
`@@ -78,6 +78,7 @@ private Session GetSession(string sessionId)`
`78`	`78`	`{`
`79`	`79`	`throw WebDriverResponseException.SessionNotFound(sessionId);`
`80`	`80`	`}`
	`81`	`+ session.SetLastCommandTimeToNow();`
`81`	`82`	`return session;`
`82`	`83`	`}`
`83`	`84`	`}`
Original file line number	Diff line number	Diff line change
`@@ -210,6 +210,7 @@ private Session GetSession(string sessionId)`
`210`	`210`	`{`
`211`	`211`	`throw WebDriverResponseException.SessionNotFound(sessionId);`
`212`	`212`	`}`
	`213`	`+ session.SetLastCommandTimeToNow();`
`213`	`214`	`return session;`
`214`	`215`	`}`
`215`	`216`	`}`
Original file line number	Diff line number	Diff line change
`@@ -75,6 +75,7 @@ private Session GetSession(string sessionId)`
`75`	`75`	`{`
`76`	`76`	`throw WebDriverResponseException.SessionNotFound(sessionId);`
`77`	`77`	`}`
	`78`	`+ session.SetLastCommandTimeToNow();`
`78`	`79`	`return session;`
`79`	`80`	`}`
`80`	`81`	`}`
Original file line number	Diff line number	Diff line change
`@@ -29,7 +29,7 @@ public async Task<ActionResult> CreateNewSession([FromBody] CreateSessionRequest`
`29`	`29`	`{`
`30`	`30`	`var possibleCapabilities = GetPossibleCapabilities(request);`
`31`	`31`	`var matchingCapabilities = possibleCapabilities.Where(`
`32`		`- capabilities => capabilities.TryGetValue("platformName", out var platformName) && platformName.ToLowerInvariant() == "windows"`
	`32`	`+ capabilities => capabilities.TryGetValue("platformName", out var platformName) && platformName.GetString()?.ToLowerInvariant() == "windows"`
`33`	`33`	`);`
`34`	`34`
`35`	`35`	`Core.Application? app;`
`@@ -44,16 +44,16 @@ public async Task<ActionResult> CreateNewSession([FromBody] CreateSessionRequest`
`44`	`44`	`}`
`45`	`45`	`if (capabilities.TryGetValue("appium:app", out var appPath))`
`46`	`46`	`{`
`47`		`- if (appPath == "Root")`
	`47`	`+ if (appPath.GetString() == "Root")`
`48`	`48`	`{`
`49`	`49`	`app = null;`
`50`	`50`	`}`
`51`	`51`	`else`
`52`	`52`	`{`
`53`		`- capabilities.TryGetValue("appium:appArguments", out var appArguments);`
	`53`	`+ bool hasArguments = capabilities.TryGetValue("appium:appArguments", out var appArguments);`
`54`	`54`	`try`
`55`	`55`	`{`
`56`		`- var processStartInfo = new ProcessStartInfo(appPath, appArguments ?? "");`
	`56`	`+ var processStartInfo = new ProcessStartInfo(appPath.GetString()!, hasArguments ? appArguments.GetString()! : "");`
`57`	`57`	`app = Core.Application.Launch(processStartInfo);`
`58`	`58`	`}`
`59`	`59`	`catch(Exception e)`
`@@ -64,19 +64,23 @@ public async Task<ActionResult> CreateNewSession([FromBody] CreateSessionRequest`
`64`	`64`	`}`
`65`	`65`	`else if(capabilities.TryGetValue("appium:appTopLevelWindow", out var appTopLevelWindowString))`
`66`	`66`	`{`
`67`		`- Process process = GetProcessByMainWindowHandle(appTopLevelWindowString);`
	`67`	`+ Process process = GetProcessByMainWindowHandle(appTopLevelWindowString.GetString()!);`
`68`	`68`	`app = Core.Application.Attach(process);`
`69`	`69`	`}`
`70`	`70`	`else if (capabilities.TryGetValue("appium:appTopLevelWindowTitleMatch", out var appTopLevelWindowTitleMatch))`
`71`	`71`	`{`
`72`		`- Process? process = GetProcessByMainWindowTitle(appTopLevelWindowTitleMatch);`
	`72`	`+ Process? process = GetProcessByMainWindowTitle(appTopLevelWindowTitleMatch.GetString()!);`
`73`	`73`	`app = Core.Application.Attach(process);`
`74`	`74`	`}`
`75`	`75`	`else`
`76`	`76`	`{`
`77`	`77`	`throw WebDriverResponseException.InvalidArgument("One of appium:app, appium:appTopLevelWindow or appium:appTopLevelWindowTitleMatch must be passed as a capability");`
`78`	`78`	`}`
`79`	`79`	`var session = new Session(app);`
	`80`	`+ if(capabilities.TryGetValue("appium:newCommandTimeout", out var newCommandTimeout))`
	`81`	`+ {`
	`82`	`+ session.NewCommandTimeout = TimeSpan.FromSeconds(newCommandTimeout.GetDouble());`
	`83`	`+ }`
`80`	`84`	`_sessionRepository.Add(session);`
`81`	`85`	`_logger.LogInformation("Created session with ID {SessionId} and capabilities {Capabilities}", session.SessionId, capabilities);`
`82`	`86`	`return await Task.FromResult(WebDriverResult.Success(new CreateSessionResponse()`
`@@ -132,14 +136,14 @@ private static Process GetProcessByMainWindowHandle(string appTopLevelWindowStri`
`132`	`136`	`return process;`
`133`	`137`	`}`
`134`	`138`
`135`		`- private static IEnumerable<Dictionary<string, string>> GetPossibleCapabilities(CreateSessionRequest request)`
	`139`	`+ private static IEnumerable<Dictionary<string, JsonElement>> GetPossibleCapabilities(CreateSessionRequest request)`
`136`	`140`	`{`
`137`		`- var requiredCapabilities = request.Capabilities.AlwaysMatch ?? new Dictionary<string, string>();`
`138`		`- var allFirstMatchCapabilities = request.Capabilities.FirstMatch ?? new List<Dictionary<string, string>>(new[] { new Dictionary<string, string>() });`
	`141`	`+ var requiredCapabilities = request.Capabilities.AlwaysMatch ?? new Dictionary<string, JsonElement>();`
	`142`	`+ var allFirstMatchCapabilities = request.Capabilities.FirstMatch ?? new List<Dictionary<string, JsonElement>>(new[] { new Dictionary<string, JsonElement>() });`
`139`	`143`	`return allFirstMatchCapabilities.Select(firstMatchCapabilities => MergeCapabilities(firstMatchCapabilities, requiredCapabilities));`
`140`	`144`	`}`
`141`	`145`
`142`		`- private static Dictionary<string, string> MergeCapabilities(Dictionary<string, string> firstMatchCapabilities, Dictionary<string, string> requiredCapabilities)`
	`146`	`+ private static Dictionary<string, JsonElement> MergeCapabilities(Dictionary<string, JsonElement> firstMatchCapabilities, Dictionary<string, JsonElement> requiredCapabilities)`
`143`	`147`	`{`
`144`	`148`	`var duplicateKeys = firstMatchCapabilities.Keys.Intersect(requiredCapabilities.Keys);`
`145`	`149`	`if (duplicateKeys.Any())`
`@@ -176,6 +180,7 @@ private Session GetSession(string sessionId)`
`176`	`180`	`{`
`177`	`181`	`throw WebDriverResponseException.SessionNotFound(sessionId);`
`178`	`182`	`}`
	`183`	`+ session.SetLastCommandTimeToNow();`
`179`	`184`	`return session;`
`180`	`185`	`}`
`181`	`186`	`}`
Original file line number	Diff line number	Diff line change
`@@ -42,6 +42,7 @@ private Session GetSession(string sessionId)`
`42`	`42`	`{`
`43`	`43`	`throw WebDriverResponseException.SessionNotFound(sessionId);`
`44`	`44`	`}`
	`45`	`+ session.SetLastCommandTimeToNow();`
`45`	`46`	`return session;`
`46`	`47`	`}`
`47`	`48`	`}`