Merge remote-tracking branch 'origin/master' into LOC_3186_mac_support

AdityaHirapara · AdityaHirapara · commit 3a7071760c8e · 2022-11-30T15:35:09.000+05:30
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -33,8 +33,27 @@ jobs:
       run: dotnet test BrowserStackLocalIntegrationTests --no-build -p:Configuration=Release
     - name: Pack NuGet Package
       run: msbuild BrowserStackLocal -t:pack -p:Configuration=Release
+    - name: Setup nuget
+      uses: nuget/setup-nuget@v1
+      with:
+        nuget-api-key: ${{ secrets.NUGET_API_KEY }}
+        nuget-version: '5.x'
+    - name: Create PFX certificate
+      id: createPfx
+      shell: pwsh
+      env:
+        PFX_CONTENT: ${{ secrets.BASE64_PFX_CONTENT }}
+      run: |
+        $pfxPath = Join-Path -Path $env:RUNNER_TEMP -ChildPath "cert.pfx";
+        $encodedBytes = [System.Convert]::FromBase64String($env:PFX_CONTENT);
+        Set-Content $pfxPath -Value $encodedBytes -AsByteStream;
+        Write-Output "::set-output name=PFX_PATH::$pfxPath";
+    - name: Sign Nuget Package
+      run: nuget sign .\BrowserStackLocal\bin\Release\*.nupkg -certificatePath "${{  steps.createPfx.outputs.PFX_PATH }}" -certificatePassword "${{secrets.CERT_PASSWORD}}" -Timestamper "http://timestamp.comodoca.com"
     - name: Save artifact
       uses: actions/upload-artifact@v2
       with:
         name: BrowserStackLocal.nupkg
         path: .\BrowserStackLocal\BrowserStackLocal\bin\Release\*.nupkg
+    - name: Push package to Nuget Repository
+      run: nuget push **\*.nupkg -Source 'https://api.nuget.org/v3/index.json' -ApiKey ${{secrets.NUGET_API_KEY}}
diff --git a/BrowserStackLocal/Backup/BrowserStackLocal.sln b/BrowserStackLocal/Backup/BrowserStackLocal.sln
@@ -0,0 +1,34 @@
+﻿
+Microsoft Visual Studio Solution File, Format Version 12.00
+# Visual Studio 14
+VisualStudioVersion = 14.0.23107.0
+MinimumVisualStudioVersion = 10.0.40219.1
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BrowserStackLocal", "BrowserStackLocal\BrowserStackLocal.csproj", "{F58E1C9A-5910-4DA8-B531-9F4A6B0AE8C8}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BrowserStackLocal Unit Tests", "BrowserStackLocal Unit Tests\BrowserStackLocal Unit Tests.csproj", "{FF1ABB6F-4A2C-48F4-B4DB-47DAD566D2F9}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BrowserStackLocalIntegrationTests", "BrowserStackLocalIntegrationTests\BrowserStackLocalIntegrationTests.csproj", "{01FFB287-C79A-4476-AEDB-EE8DE80EB3B3}"
+EndProject
+Global
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|Any CPU = Debug|Any CPU
+		Release|Any CPU = Release|Any CPU
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{F58E1C9A-5910-4DA8-B531-9F4A6B0AE8C8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{F58E1C9A-5910-4DA8-B531-9F4A6B0AE8C8}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{F58E1C9A-5910-4DA8-B531-9F4A6B0AE8C8}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{F58E1C9A-5910-4DA8-B531-9F4A6B0AE8C8}.Release|Any CPU.Build.0 = Release|Any CPU
+		{FF1ABB6F-4A2C-48F4-B4DB-47DAD566D2F9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{FF1ABB6F-4A2C-48F4-B4DB-47DAD566D2F9}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{FF1ABB6F-4A2C-48F4-B4DB-47DAD566D2F9}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{FF1ABB6F-4A2C-48F4-B4DB-47DAD566D2F9}.Release|Any CPU.Build.0 = Release|Any CPU
+		{01FFB287-C79A-4476-AEDB-EE8DE80EB3B3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{01FFB287-C79A-4476-AEDB-EE8DE80EB3B3}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{01FFB287-C79A-4476-AEDB-EE8DE80EB3B3}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{01FFB287-C79A-4476-AEDB-EE8DE80EB3B3}.Release|Any CPU.Build.0 = Release|Any CPU
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
+EndGlobal
diff --git a/BrowserStackLocal/BrowserStackLocal.sln b/BrowserStackLocal/BrowserStackLocal.sln
@@ -1,13 +1,16 @@
 ﻿
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 14
-VisualStudioVersion = 14.0.23107.0
+# Visual Studio Version 17
+VisualStudioVersion = 17.1.32414.318
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BrowserStackLocal", "BrowserStackLocal\BrowserStackLocal.csproj", "{F58E1C9A-5910-4DA8-B531-9F4A6B0AE8C8}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BrowserStackLocal", "BrowserStackLocal\BrowserStackLocal.csproj", "{F58E1C9A-5910-4DA8-B531-9F4A6B0AE8C8}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BrowserStackLocal Unit Tests", "BrowserStackLocal Unit Tests\BrowserStackLocal Unit Tests.csproj", "{FF1ABB6F-4A2C-48F4-B4DB-47DAD566D2F9}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BrowserStackLocal Unit Tests", "BrowserStackLocal Unit Tests\BrowserStackLocal Unit Tests.csproj", "{FF1ABB6F-4A2C-48F4-B4DB-47DAD566D2F9}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BrowserStackLocalIntegrationTests", "BrowserStackLocalIntegrationTests\BrowserStackLocalIntegrationTests.csproj", "{01FFB287-C79A-4476-AEDB-EE8DE80EB3B3}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BrowserStackLocalIntegrationTests", "BrowserStackLocalIntegrationTests\BrowserStackLocalIntegrationTests.csproj", "{01FFB287-C79A-4476-AEDB-EE8DE80EB3B3}"
+	ProjectSection(ProjectDependencies) = postProject
+		{F58E1C9A-5910-4DA8-B531-9F4A6B0AE8C8} = {F58E1C9A-5910-4DA8-B531-9F4A6B0AE8C8}
+	EndProjectSection
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -31,4 +34,7 @@ Global
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
+	GlobalSection(ExtensibilityGlobals) = postSolution
+		SolutionGuid = {3019DB30-CCF5-4543-B787-FCBBD97B21C8}
+	EndGlobalSection
 EndGlobal
diff --git a/BrowserStackLocal/BrowserStackLocal/BrowserStackLocal.csproj b/BrowserStackLocal/BrowserStackLocal/BrowserStackLocal.csproj
@@ -7,8 +7,9 @@
     <Title>BrowserStackLocal</Title>
     <Product>BrowserStackLocal</Product>
     <Description>C# Bindings for BrowserStack Local</Description>
-    <Version>2.0.0.0</Version>
-    <FileVersion>2.0.0.0</FileVersion>
+    <Version>2.1.0</Version>
+    <AssemblyVersion>2.1.0</AssemblyVersion>
+    <FileVersion>2.1.0</FileVersion>
     <Authors>BrowserStack</Authors>
     <Company>BrowserStack</Company>
     <Copyright>Copyright ©  2016</Copyright>
diff --git a/BrowserStackLocal/BrowserStackLocal/BrowserStackTunnel.cs b/BrowserStackLocal/BrowserStackLocal/BrowserStackTunnel.cs
@@ -26,10 +26,10 @@ public class BrowserStackTunnel : IDisposable
       Directory.GetCurrentDirectory(),
       Path.GetTempPath() };
 
-    int basePathsIndex = -1;
+    public int basePathsIndex = -1;
     protected string binaryAbsolute = "";
     protected string binaryArguments = "";
-    
+
     protected StringBuilder output;
     public LocalState localState;
     protected string logFilePath = "";
@@ -147,7 +147,7 @@ public virtual void Run(string accessKey, string folder, string logFilePath, str
       {
         File.WriteAllText(logFilePath, string.Empty);
       }
-      RunProcess(arguments, processType); 
+      RunProcess(arguments, processType);
     }
 
     private void RunProcess(string arguments, string processType)
@@ -172,14 +172,40 @@ private void RunProcess(string arguments, string processType)
         if (e.Data != null)
         {
           JObject binaryOutput = null;
-          try {
+          try
+          {
             binaryOutput = JObject.Parse(e.Data);
-          } catch (Exception) {
+          }
+          catch (Exception)
+          {
+            SetTunnelState(LocalState.Error);
             throw new Exception($"Error while parsing JSON {e.Data}");
           }
-          if(binaryOutput.GetValue("state") != null && !binaryOutput.GetValue("state").ToString().ToLower().Equals("connected"))
+
+          JToken connectionState = binaryOutput.GetValue("state");
+          if (connectionState != null)
+          {
+            if (connectionState.ToString().ToLower().Equals("connected"))
+            {
+              SetTunnelState(LocalState.Connected);
+            }
+            else if (connectionState.ToString().ToLower().Equals("disconnected"))
+            {
+              SetTunnelState(LocalState.Disconnected);
+            }
+            else
+            {
+              SetTunnelState(LocalState.Error);
+              throw new Exception("Error while executing BrowserStackLocal " + processType + " " + e.Data);
+            }
+          }
+          else
           {
-            throw new Exception("Eror while executing BrowserStackLocal " + processType + " " + e.Data);
+            JToken message = binaryOutput.GetValue("message");
+            if (message != null && message.Type == JTokenType.String && message.ToString() == "BrowserStackLocal stopped successfully")
+            {
+              SetTunnelState(LocalState.Disconnected);
+            }
           }
         }
       });
@@ -196,13 +222,19 @@ private void RunProcess(string arguments, string processType)
       process.BeginOutputReadLine();
       process.BeginErrorReadLine();
 
-      TunnelStateChanged(LocalState.Idle, LocalState.Connecting);
-      AppDomain.CurrentDomain.ProcessExit += new EventHandler((s, e) => Kill());
+      SetTunnelState(LocalState.Connecting);
+      AppDomain.CurrentDomain.ProcessExit += new EventHandler((s, e) =>
+      {
+        Kill();
+      });
 
       process.WaitForExit();
     }
 
-    private void TunnelStateChanged(LocalState prevState, LocalState state) { }
+    private void SetTunnelState(LocalState newState)
+    {
+      localState = newState;
+    }
 
     public bool IsConnected()
     {
@@ -216,13 +248,13 @@ public void Kill()
         process.Close();
         process.Kill();
         process = null;
-        localState = LocalState.Disconnected;
+        SetTunnelState(LocalState.Disconnected);
       }
     }
 
     public void Dispose()
     {
-      if(process != null)
+      if (process != null)
       {
         Kill();
       }
diff --git a/BrowserStackLocal/BrowserStackLocal/Local.cs b/BrowserStackLocal/BrowserStackLocal/Local.cs
@@ -2,6 +2,7 @@
 using System.Collections.Generic;
 using System.IO;
 using System.Text.RegularExpressions;
+using System.Reflection;
 
 namespace BrowserStack
 {
@@ -12,6 +13,8 @@ public class Local
     private string customLogPath = "";
     private string argumentString = "";
     private string customBinaryPath = "";
+    private string bindingVersion = "";
+        
     protected BrowserStackTunnel tunnel = null;
     private static KeyValuePair<string, string> emptyStringPair = new KeyValuePair<string, string>();
 
@@ -63,7 +66,11 @@ private void addArgs(string key, string value)
       {
 
       }
-      else
+      else if (key.Equals("source"))
+      {
+
+      }
+    else
       {
         result = valueCommands.Find(pair => pair.Key == key);
         if (!result.Equals(emptyStringPair))
@@ -92,13 +99,56 @@ private void addArgs(string key, string value)
         }
       }
     }
-    
+
+    public static string GetVersionString(string pVersionString)
+    {
+      string tVersion = "Unknown";
+      string[] aVersion;
+
+      if (string.IsNullOrEmpty(pVersionString)) { return tVersion; }
+      aVersion = pVersionString.Split('.');
+      if (aVersion.Length > 0) { tVersion = aVersion[0]; }
+      if (aVersion.Length > 1) { tVersion += "." + aVersion[1]; }
+      if (aVersion.Length > 2) { tVersion += "." + aVersion[2].PadLeft(4, '0'); }
+      if (aVersion.Length > 3) { tVersion += "." + aVersion[3].PadLeft(4, '0'); }
+
+      return tVersion;
+    }
+    public static Assembly GetAssemblyEmbedded(string pAssemblyDisplayName)
+    {
+       Assembly tMyAssembly = null;
+
+       if (string.IsNullOrEmpty(pAssemblyDisplayName)) { return tMyAssembly; }
+       try 
+       {
+          tMyAssembly = Assembly.Load(pAssemblyDisplayName);
+       }
+       catch (Exception ex)
+       {
+          string m = ex.Message;
+          Console.Error.WriteLine(m);
+       }
+       return tMyAssembly;
+    }
+    public static string GetVersionStringFromAssemblyEmbedded(string pAssemblyDisplayName)
+    {
+       string tVersion = "Unknown";
+       Assembly tMyAssembly = null;
+
+       tMyAssembly = GetAssemblyEmbedded(pAssemblyDisplayName);
+       if (tMyAssembly == null) { return tVersion; }
+       tVersion = GetVersionString(tMyAssembly.GetName().Version.ToString());
+       return tVersion;
+    }
+
     public Local()
     {
-      tunnel = new BrowserStackTunnel();
+       bindingVersion = GetVersionStringFromAssemblyEmbedded("BrowserStackLocal");
+       tunnel = new BrowserStackTunnel();
     }
     public void start(List<KeyValuePair<string, string>> options)
     {
+      tunnel.basePathsIndex = -1;
       foreach (KeyValuePair<string, string> pair in options)
       {
         string key = pair.Key;
@@ -111,7 +161,7 @@ public void start(List<KeyValuePair<string, string>> options)
         accessKey = Environment.GetEnvironmentVariable("BROWSERSTACK_ACCESS_KEY");
         if (accessKey == null || accessKey.Trim().Length == 0)
         {
-          throw new Exception("BROWSERSTACK_ACCESS_KEY cannot be empty. "+
+          throw new Exception("BROWSERSTACK_ACCESS_KEY cannot be empty. " +
             "Specify one by adding key to options or adding to the environment variable BROWSERSTACK_ACCESS_KEY.");
         }
         Regex.Replace(this.accessKey, @"\s+", "");
@@ -123,20 +173,30 @@ public void start(List<KeyValuePair<string, string>> options)
       }
 
       argumentString += "-logFile \"" + customLogPath + "\" ";
+      argumentString += "--source \"c-sharp:" + bindingVersion + "\" ";
       tunnel.addBinaryPath(customBinaryPath);
       tunnel.addBinaryArguments(argumentString);
-      while (true) {
+      while (true)
+      {
         bool except = false;
-        try {
+        try
+        {
           tunnel.Run(accessKey, folder, customLogPath, "start");
-        } catch (Exception)
+        }
+        catch (System.ComponentModel.Win32Exception)
         {
           except = true;
         }
+        catch (Exception e)
+        {
+          except = true;
+          Console.WriteLine(e.ToString());
+        }
         if (except)
         {
           tunnel.fallbackPaths();
-        } else
+        }
+        else
         {
           break;
         }
diff --git a/README.md b/README.md
@@ -1,6 +1,6 @@
 # browserstack-local-csharp
 
-[![Build Status](https://travis-ci.org/browserstack/browserstack-local-csharp.svg?branch=master)](https://travis-ci.org/browserstack/browserstack-local-csharp)
+[![.NET package CI](https://github.com/browserstack/browserstack-local-csharp/actions/workflows/ci.yml/badge.svg)](https://github.com/browserstack/browserstack-local-csharp/actions/workflows/ci.yml)
 
 C# bindings for BrowserStack Local.
 

-Original file line number
+Diff line change
     <Title>BrowserStackLocalTitle>
     <Product>BrowserStackLocalProduct>
     <Description>C# Bindings for BrowserStack LocalDescription>
 -    <Version>2.0.0.0Version>
 -    <FileVersion>2.0.0.0FileVersion>
 +    <Version>2.1.0Version>
 +    <AssemblyVersion>2.1.0AssemblyVersion>
 +    <FileVersion>2.1.0FileVersion>
     <Authors>BrowserStackAuthors>
     <Company>BrowserStackCompany>
     <Copyright>Copyright ©  2016Copyright>