also allow for current clientId=data.clientId

rjvrijn · Oct 18, 2021 · 46c8bcf · 46c8bcf
1 parent 2e3945b
commit 46c8bcf
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/src/Private/PodeServer.ps1 b/src/Private/PodeServer.ps1
@@ -356,6 +356,7 @@ function Start-PodeWebServer
                                 Name = $null
                             }
                             Route = $null
+                            ClientId = $context.WebSocket.ClientId
                             Timestamp = $context.Timestamp
                             Streamed = $true
                         }

diff --git a/src/Public/Responses.ps1 b/src/Public/Responses.ps1
@@ -1455,13 +1455,13 @@ function Send-PodeSignal
             $Path = $SignalEvent.Data.ClientId
         }
 
-        if (($Mode -ieq 'Auto') -and ($SignalEvent.Data.Direct)) {
+        if (($Mode -ieq 'Auto') -and ($SignalEvent.Data.Direct -or ($SignalEvent.ClientId -ieq $SignalEvent.Data.ClientId))) {
             $Mode = 'Direct'
         }
     }
 
     # broadcast or direct?
-    if ($Mode -iin @('Auto', 'Broadcast')) { # $broadcast) {
+    if ($Mode -iin @('Auto', 'Broadcast')) {
         $PodeContext.Server.WebSockets.Listener.AddServerSignal($Value, $Path, $ClientId)
     }
     else {