Fix for #198 start-polaris throwing error (#200)

* Fix for #198 start-polaris throwing error

* Getting rid of the odd beforeAll

* Server shouldn't be stopped

* Restored accidentally removed test

Author: Tiberriver256

Public/Start-Polaris.ps1

@@ -74,6 +74,7 @@ function Start-Polaris {
     )
 
     if ( -not $Polaris) {
+        Write-Verbose 'No Polaris found. Creating new.'
         CreateNewPolarisIfNeeded
         $Polaris = $Script:Polaris
     }
@@ -82,6 +83,11 @@ function Start-Polaris {
         Use-PolarisJsonBodyParserMiddleware -Polaris $Polaris
     }
 
+    Write-Verbose "Starting polaris listening"
+    Write-Verbose "   Port: $Port"
+    Write-Verbose "   Https.IsPreset: $($Https.IsPresent)"
+    Write-Verbose "   Auth: $Auth"
+    Write-Verbose "   HostName: $HostName"
     $Polaris.Start( $Port, $Https.IsPresent, $Auth, $HostName)
 
     return $Polaris

Tests/unit/PolarisServer.Tests.ps1

@@ -7,31 +7,30 @@ Import-Module -Name $PSScriptRoot\..\..\Polaris.psd1
 
 Describe "Test webserver use" {
 
-    BeforeAll {
-
-        $IsUnix = $PSVersionTable.Platform -eq "Unix"
+    Context "Test starting and stopping of the server" {
 
-        $Port = Get-Random -Minimum 8000 -Maximum 8999
+        It "Should allow starting and stopping the server" {
+            $Port = Get-Random -Minimum 8000 -Maximum 8999
+            $Polaris = Start-Polaris -Port $Port
+            Stop-Polaris
+            $Polaris.Listener.IsListening | Should Be $false
 
-        # Start the app
-        $Polaris = Start-Polaris -Port $Port -MinRunspaces 1 -MaxRunspaces 5 # all params are optional
+            $Polaris = Start-Polaris -Port $Port
+            $Polaris.Listener.IsListening | Should be $true
+        }
 
-    }
+        It "Should allow running Start-Polaris multiple times without error" {
+            $Port = Get-Random -Minimum 8000 -Maximum 8999
+            $Polaris = Start-Polaris -Port $Port
+            $Polaris.Listener.IsListening | Should Be $true
 
-    Context "Test starting and stopping of the server" {
-        BeforeAll {
-            if (-not $IsUnix) {
-                Stop-Polaris
-                $Polaris = Get-Polaris
-                $Polaris.Listener.IsListening | Should Be $false
-
-                $Polaris = Start-Polaris -Port 9998
-                $Polaris.Listener.IsListening | Should be $true
-            }
+            $Polaris = Start-Polaris -Port $Port
+            $Polaris.Listener.IsListening | Should be $true
         }
 
         It "Allows a custom logger" {
-            $Polaris = Get-Polaris
+            $Port = Get-Random -Minimum 8000 -Maximum 8999
+            $Polaris = Start-Polaris -Port $Port
             $Polaris.Logger = {
                 param($Word)
                 $Word | Out-File "TestDrive:\test.log" -NoNewline

lib/Polaris.Class.ps1

@@ -234,17 +234,30 @@ class Polaris {
         [string]$HostName
     ) {
         $this.StopServer = $false
-        $this.InitListener($Port, $Https, $Auth, $HostName)
-        $this.Listener.BeginGetContext($this.ContextHandler, $this)
+        if($this.Listener -eq $null) {
+            Write-Debug "Creating new listener"
+            $this.InitListener($Port, $Https, $Auth, $HostName)
+            $this.Listener.BeginGetContext($this.ContextHandler, $this)
+        } else {
+            Write-Debug "Listener object already created"
+            if($this.Listener.IsListening){
+                Write-Debug "Listener is already in a listening state. Doing nothing"
+            } else {
+                Write-Debug "Listener object exists but has shut down. Reinitializing..."
+                $this.Stop()
+                $this.InitListener($Port, $Https, $Auth, $HostName)
+                $this.Listener.BeginGetContext($this.ContextHandler, $this)
+            }
+        }
     }
 
     [void] Stop () {
         $this.StopServer = $true
         $this.Listener.Close()
         $this.Listener.Dispose()
         $this.Log("Server Stopped.")
-
     }
+
     [void] InitListener (
         [int]$Port,
         [bool]$Https,