Update samy.ps1

This commit is contained in:
2025-12-05 15:07:05 -05:00
parent c4108c880b
commit a4f41f809b

View File

@@ -1324,23 +1324,59 @@ $jsContent
} }
function Send-JSON { function Send-JSON {
param($Context, $Object) [CmdletBinding()]
param(
$Context,
$Object
)
if (-not $Context -or -not $Context.Response) { if (-not $Context -or -not $Context.Response) {
return return
} }
# If caller gave us $null, reply with an empty array instead of blowing up try {
# 🔹 Normalize $Object so we never feed $null to GetBytes
if ($null -eq $Object) { if ($null -eq $Object) {
$Object = @() Write-LogHybrid "Send-JSON called with `$null object; returning empty JSON array." Warning Printers -LogToEvent
$json = '[]'
}
else {
# If ConvertTo-Json fails, force an empty array string instead of bubbling $null
try {
$json = $Object | ConvertTo-Json -Depth 5 -ErrorAction Stop
}
catch {
Write-LogHybrid "Send-JSON serialization failed: $($_.Exception.Message); returning empty JSON array." Error Printers -LogToEvent
$json = '[]'
}
} }
$json = $Object | ConvertTo-Json -Depth 5 # 🔹 Final safety: ensure we always pass a *string* to GetBytes
$json = [string]$json
$bytes = [Text.Encoding]::UTF8.GetBytes($json) $bytes = [Text.Encoding]::UTF8.GetBytes($json)
$Context.Response.ContentType = 'application/json' $Context.Response.ContentType = 'application/json'
$Context.Response.ContentLength64 = $bytes.Length $Context.Response.ContentLength64 = $bytes.Length
$Context.Response.OutputStream.Write($bytes, 0, $bytes.Length) $Context.Response.OutputStream.Write($bytes, 0, $bytes.Length)
$Context.Response.OutputStream.Close() $Context.Response.OutputStream.Close()
} }
catch {
# Last-resort error handling don't let the whole request crash
Write-LogHybrid "Send-JSON fatal error: $($_.Exception.Message)" Error Printers -LogToEvent
try {
$fallback = '[]'
$bytes = [Text.Encoding]::UTF8.GetBytes($fallback)
$Context.Response.ContentType = 'application/json'
$Context.Response.ContentLength64 = $bytes.Length
$Context.Response.OutputStream.Write($bytes, 0, $bytes.Length)
$Context.Response.OutputStream.Close()
}
catch {
# If even this fails, just give up silently we've already logged it.
}
}
}
#endregion HTTP responder helpers #endregion HTTP responder helpers
function Invoke-TasksCompleted { function Invoke-TasksCompleted {