Merge pull request #42 from KelvinTegelaar/dev

[pull] dev from KelvinTegelaar:dev

Author: pull[bot]

Modules/CIPPCore/Public/Entrypoints/Orchestrator Functions/Start-CIPPOrchestrator.ps1

@@ -33,6 +33,32 @@ function Start-CIPPOrchestrator {
 
         [switch]$CallerIsQueueTrigger
     )
+
+    # ─── CIPPNG runtime: push batch directly to OrchestratorService ───
+    if ($env:CIPPNG -eq 'true' -and $InputObject) {
+        $OrchestratorName = $InputObject.OrchestratorName ?? 'UnnamedOrchestrator'
+        $BatchJson = ConvertTo-Json -InputObject @($InputObject.Batch) -Depth 10 -Compress
+
+        $PostExecFunctionName = $null
+        $PostExecParametersJson = $null
+        if ($InputObject.PostExecution) {
+            $PostExecFunctionName = $InputObject.PostExecution.FunctionName
+            if ($InputObject.PostExecution.Parameters) {
+                $PostExecParametersJson = $InputObject.PostExecution.Parameters | ConvertTo-Json -Depth 10 -Compress
+            }
+        }
+
+        Write-Information "CIPP-NG: Queuing orchestrator '$OrchestratorName' ($($InputObject.Batch.Count) tasks$(if ($PostExecFunctionName) { ", PostExec: $PostExecFunctionName" }))"
+        [CIPPASP.Services.OrchestratorBridge]::QueueOrchestration(
+            $OrchestratorName,
+            $BatchJson,
+            4,
+            $PostExecFunctionName,
+            $PostExecParametersJson
+        )
+        return "CIPPNG-$OrchestratorName"
+    }
+
     $OrchestratorTable = Get-CippTable -TableName 'CippOrchestratorInput'
     $BatchTable = Get-CippTable -TableName 'CippOrchestratorBatch'
 

Modules/CIPPCore/Public/GraphHelper/Add-CippQueueMessage.ps1

@@ -29,6 +29,13 @@ function Add-CippQueueMessage {
     }
 
     try {
+        if ($env:CIPPNG -eq 'true') {
+            $ParametersJson = $Parameters | ConvertTo-Json -Depth 10 -Compress
+            [CIPPASP.Services.QueueBridge]::Enqueue($Cmdlet, $ParametersJson)
+            Write-Information "CIPP-NG: Queued $Cmdlet for background execution"
+            return $true
+        }
+
         Push-OutputBinding -Name QueueItem -Value $QueueMessage
         Write-Information "Queued $Cmdlet for execution"
         return $true