Merge pull request #13 from Zacgoose/copilot/investigate-me-endpoint-issues

Optimize HTTP function loading by splitting Standards into separate module with lazy-loading

Author: Zacgoose

.github/workflows/dev_api.yml

@@ -26,6 +26,83 @@ jobs:
         with:
           persist-credentials: false
 
+      - name: Setup PowerShell module cache
+        id: cacher
+        uses: actions/cache@v3
+        with:
+          path: "~/.local/share/powershell/Modules"
+          key: ${{ runner.os }}-ModuleBuilder
+
+      - name: Install ModuleBuilder
+        if: steps.cacher.outputs.cache-hit != 'true'
+        shell: pwsh
+        run: |
+          Set-PSRepository PSGallery -InstallationPolicy Trusted
+          Install-Module ModuleBuilder -AllowClobber -Force
+
+      - name: Build CIPPCore Module
+        shell: pwsh
+        run: |
+          $ModulePath = Join-Path $env:GITHUB_WORKSPACE "Modules/CIPPCore"
+          $OutputPath = Join-Path $env:GITHUB_WORKSPACE "Output"
+
+          Write-Host "Building module from: $ModulePath"
+          Write-Host "Output directory: $OutputPath"
+
+          # Build the module using ModuleBuilder
+          Build-Module -SourcePath $ModulePath -OutputDirectory $OutputPath -Verbose
+
+          # Replace the source module with the built module
+          Remove-Item -Path $ModulePath -Recurse -Force
+          Copy-Item -Path (Join-Path $OutputPath "CIPPCore") -Destination $ModulePath -Recurse -Force
+
+          Write-Host "Module built and replaced successfully"
+
+          # Clean up output directory
+          Remove-Item -Path $OutputPath -Recurse -Force
+
+      - name: Build CippExtensions Module
+        shell: pwsh
+        run: |
+          $ModulePath = Join-Path $env:GITHUB_WORKSPACE "Modules/CippExtensions"
+          $OutputPath = Join-Path $env:GITHUB_WORKSPACE "Output"
+
+          Write-Host "Building module from: $ModulePath"
+          Write-Host "Output directory: $OutputPath"
+
+          # Build the module using ModuleBuilder
+          Build-Module -SourcePath $ModulePath -OutputDirectory $OutputPath -Verbose
+
+          # Replace the source module with the built module
+          Remove-Item -Path $ModulePath -Recurse -Force
+          Copy-Item -Path (Join-Path $OutputPath "CippExtensions") -Destination $ModulePath -Recurse -Force
+
+          Write-Host "Module built and replaced successfully"
+
+          # Clean up output directory
+          Remove-Item -Path $OutputPath -Recurse -Force
+
+      - name: Build CIPPStandardsAlerts Module
+        shell: pwsh
+        run: |
+          $ModulePath = Join-Path $env:GITHUB_WORKSPACE "Modules/CIPPStandardsAlerts"
+          $OutputPath = Join-Path $env:GITHUB_WORKSPACE "Output"
+
+          Write-Host "Building module from: $ModulePath"
+          Write-Host "Output directory: $OutputPath"
+
+          # Build the module using ModuleBuilder
+          Build-Module -SourcePath $ModulePath -OutputDirectory $OutputPath -Verbose
+
+          # Replace the source module with the built module
+          Remove-Item -Path $ModulePath -Recurse -Force
+          Copy-Item -Path (Join-Path $OutputPath "CIPPStandardsAlerts") -Destination $ModulePath -Recurse -Force
+
+          Write-Host "Module built and replaced successfully"
+
+          # Clean up output directory
+          Remove-Item -Path $OutputPath -Recurse -Force
+
       - name: Login to Azure
         uses: azure/login@v2
         with:

Modules/CIPPCore/CIPPCore.psm1

@@ -1,6 +1,7 @@
 # ModuleBuilder will concatenate all function files into this module
 # This block is only used when running from source (not built)
 if (Test-Path (Join-Path $PSScriptRoot 'Public')) {
+    # Load Public and Private functions
     $Public = @(Get-ChildItem -Path (Join-Path $PSScriptRoot 'Public\*.ps1') -Recurse -ErrorAction SilentlyContinue)
     $Private = @(Get-ChildItem -Path (Join-Path $PSScriptRoot 'Private\*.ps1') -Recurse -ErrorAction SilentlyContinue)
     $Functions = $Public + $Private

Modules/CIPPCore/Public/Authentication/Test-CIPPAccess.ps1

@@ -12,45 +12,15 @@ function Test-CIPPAccess {
     # Get function help
     $FunctionName = 'Invoke-{0}' -f $Request.Params.CIPPEndpoint
 
-    $SwPermissions = [System.Diagnostics.Stopwatch]::StartNew()
-    if (-not $global:CIPPFunctionPermissions) {
-        $CIPPCoreModule = Get-Module -Name CIPPCore
-        if ($CIPPCoreModule) {
-            $PermissionsFileJson = Join-Path $CIPPCoreModule.ModuleBase 'lib' 'data' 'function-permissions.json'
-            
-            if (Test-Path $PermissionsFileJson) {
-                try {
-                    $jsonData = Get-Content -Path $PermissionsFileJson -Raw | ConvertFrom-Json -AsHashtable
-                    $global:CIPPFunctionPermissions = [System.Collections.Hashtable]::new([StringComparer]::OrdinalIgnoreCase)
-                    foreach ($key in $jsonData.Keys) {
-                        $global:CIPPFunctionPermissions[$key] = $jsonData[$key]
-                    }
-                    Write-Information "Loaded $($global:CIPPFunctionPermissions.Count) function permissions from JSON cache"
-                } catch {
-                    Write-Warning "Failed to load function permissions from JSON: $($_.Exception.Message)"
-                }
-            }
-        }
-    }
-    $SwPermissions.Stop()
-    $AccessTimings['FunctionPermissions'] = $SwPermissions.Elapsed.TotalMilliseconds
-
     if ($FunctionName -ne 'Invoke-me') {
         $swHelp = [System.Diagnostics.Stopwatch]::StartNew()
-        if ($global:CIPPFunctionPermissions -and $global:CIPPFunctionPermissions.ContainsKey($FunctionName)) {
-            $PermissionData = $global:CIPPFunctionPermissions[$FunctionName]
-            $APIRole = $PermissionData['Role']
-            $Functionality = $PermissionData['Functionality']
-            Write-Information "Loaded function permission data from cache for '$FunctionName': Role='$APIRole', Functionality='$Functionality'"
-        } else {
-            try {
-                $Help = Get-Help $FunctionName -ErrorAction Stop
-                $APIRole = $Help.Role
-                $Functionality = $Help.Functionality
-                Write-Information "Loaded function permission data via Get-Help for '$FunctionName': Role='$APIRole', Functionality='$Functionality'"
-            } catch {
-                Write-Warning "Function '$FunctionName' not found"
-            }
+        try {
+            $Help = Get-Help $FunctionName -ErrorAction Stop
+            $APIRole = $Help.Role
+            $Functionality = $Help.Functionality
+            Write-Debug "Loaded function permission data via Get-Help for '$FunctionName': Role='$APIRole', Functionality='$Functionality'"
+        } catch {
+            Write-Warning "Function '$FunctionName' not found"
         }
         $swHelp.Stop()
         $AccessTimings['GetHelp'] = $swHelp.Elapsed.TotalMilliseconds

Modules/CIPPHTTP/CIPPHTTP.psd1

@@ -0,0 +1,17 @@
+# ModuleBuilder will concatenate all function files into this module
+# This block is only used when running from source (not built)
+if (Test-Path (Join-Path $PSScriptRoot 'Public')) {
+    # Load Public and Private functions
+    $Public = @(Get-ChildItem -Path (Join-Path $PSScriptRoot 'Public\*.ps1') -Recurse -ErrorAction SilentlyContinue)
+    $Private = @(Get-ChildItem -Path (Join-Path $PSScriptRoot 'Private\*.ps1') -Recurse -ErrorAction SilentlyContinue)
+    $Functions = $Public + $Private
+    foreach ($import in @($Functions)) {
+        try {
+            . $import.FullName
+        } catch {
+            Write-Error -Message "Failed to import function $($import.FullName): $_"
+        }
+    }
+
+    Export-ModuleMember -Function $Public.BaseName
+}