Fix PHP packages: escape FPM cgroup for extension install/remove (v1.21.9)

Same root cause as the multi-php fix — dpkg triggers restart php-fpm
during apt-get install/remove of extensions, killing the PHP worker
mid-request. Now runs apt inside systemd-run --scope with async
status polling, matching the multi-php pattern.

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>

Author: Tux82

api/packages.php

@@ -100,18 +100,21 @@ function getInstalledExtensions(string $ver): array
 
         $pkg  = "php{$ver}-{$ext}";
         $flag = ($action === 'install') ? 'install' : 'remove';
-        $cmd  = "DEBIAN_FRONTEND=noninteractive sudo /usr/bin/apt-get {$flag} -y " . escapeshellarg($pkg) . " 2>&1";
-        exec($cmd, $lines, $rc);
-        $output = implode("\n", $lines);
-
-        if ($rc !== 0) {
-            echo json_encode(['success' => false, 'error' => "apt-get failed (exit {$rc})", 'output' => $output]); break;
-        }
-
-        echo json_encode(['success' => true, 'output' => $output]);
-        // Flush response before restarting FPM — restart kills the panel worker
-        if (function_exists('fastcgi_finish_request')) fastcgi_finish_request();
-        Shell::systemctl('restart', "php{$ver}-fpm");
+        $statusFile = "/var/www/inetpanel/storage/pkg_{$flag}_{$ver}_{$ext}";
+        // Run in a systemd scope so dpkg triggers restarting php-fpm won't kill this
+        $aptCmd = "DEBIAN_FRONTEND=noninteractive apt-get {$flag} -y " . escapeshellarg($pkg);
+        $wrapper = "echo running > " . escapeshellarg($statusFile)
+            . " && chown www-data:www-data " . escapeshellarg($statusFile)
+            . " && chmod 0666 " . escapeshellarg($statusFile)
+            . " && RESULT=\$({$aptCmd} 2>&1); RC=\$?;"
+            . " dpkg --configure -a < /dev/null 2>/dev/null || true;"
+            . " if [ \$RC -ne 0 ]; then echo \"error\" > " . escapeshellarg($statusFile)
+            . "; echo \"\$RESULT\" >> " . escapeshellarg($statusFile) . "; exit 1; fi;"
+            . " rm -f " . escapeshellarg($statusFile) . ";"
+            . " systemctl restart php{$ver}-fpm 2>/dev/null";
+        $cmd = "sudo systemd-run --scope --quiet bash -c " . escapeshellarg($wrapper) . " >> /var/www/inetpanel/storage/pkg.log 2>&1 &";
+        exec($cmd);
+        echo json_encode(['success' => true, 'output' => 'started', 'status_file' => basename($statusFile)]);
         break;
 
     case 'installed_versions':
@@ -126,6 +129,26 @@ function getInstalledExtensions(string $ver): array
         echo json_encode(['success' => true, 'data' => $result]);
         break;
 
+    case 'pkg_status':
+        $file = basename(trim($_GET['file'] ?? ''));
+        if (!$file || !preg_match('/^pkg_(install|remove)_[\d.]+_\w+$/', $file)) {
+            echo json_encode(['status' => 'done']); break;
+        }
+        $path = "/var/www/inetpanel/storage/{$file}";
+        if (!file_exists($path)) {
+            echo json_encode(['status' => 'done']); break;
+        }
+        $st = trim(file_get_contents($path));
+        if ($st === 'running') {
+            echo json_encode(['status' => 'running']);
+        } elseif (str_starts_with($st, 'error')) {
+            echo json_encode(['status' => 'error', 'message' => substr($st, 6)]);
+            @unlink($path);
+        } else {
+            echo json_encode(['status' => 'done']);
+        }
+        break;
+
     default:
         echo json_encode(['success' => false, 'error' => 'Unknown action.']);
 }

src/php_packages.php

@@ -142,26 +142,57 @@ function renderPackages(packages, ver) {
 }
 
 function togglePkg(ver, ext, action) {
-    const modal = new bootstrap.Modal(document.getElementById('pkgModal'));
-    document.getElementById('pkg-modal-title').textContent = `${action === 'install' ? 'Installing' : 'Removing'} php${ver}-${ext}…`;
-    document.getElementById('pkg-modal-msg').textContent = 'Please wait…';
-    modal.show();
     const fd = new FormData();
     fd.append('action', action);
     fd.append('version', ver);
     fd.append('extension', ext);
     fetch('/api/packages', { method: 'POST', body: fd })
         .then(r => r.json())
         .then(data => {
-            modal.hide();
-            if (data.success) {
+            if (!data.success) {
+                showAlert(data.error || `${action} failed.`, 'danger');
+                return;
+            }
+            // If API returned synchronously (e.g. opcache already loaded)
+            if (!data.status_file) {
                 showAlert(`php${ver}-${ext} ${action}ed successfully.`);
                 loadPackages(ver);
-            } else {
-                showAlert(data.error || `${action} failed.`, 'danger');
+                return;
             }
+            // Async operation — show modal and poll status file via list action
+            const modal = new bootstrap.Modal(document.getElementById('pkgModal'));
+            document.getElementById('pkg-modal-title').textContent = `${action === 'install' ? 'Installing' : 'Removing'} php${ver}-${ext}…`;
+            document.getElementById('pkg-modal-msg').textContent = 'This may take a moment…';
+            modal.show();
+            let attempts = 0;
+            const poll = setInterval(() => {
+                attempts++;
+                fetch(`/api/packages?action=pkg_status&file=${encodeURIComponent(data.status_file)}`)
+                    .then(r => r.ok ? r.json() : null)
+                    .then(d => {
+                        if (!d) return;
+                        if (d.status === 'error') {
+                            clearInterval(poll);
+                            modal.hide();
+                            showAlert(`php${ver}-${ext} ${action} failed: ${d.message || 'Unknown error'}`, 'danger');
+                            return;
+                        }
+                        if (d.status === 'done') {
+                            clearInterval(poll);
+                            modal.hide();
+                            showAlert(`php${ver}-${ext} ${action}ed successfully.`);
+                            loadPackages(ver);
+                        }
+                    })
+                    .catch(() => {});
+                if (attempts > 40) {
+                    clearInterval(poll);
+                    modal.hide();
+                    showAlert(`php${ver}-${ext} ${action} timed out. Check logs and reload.`, 'warning');
+                }
+            }, 2000);
         })
-        .catch(() => { modal.hide(); showAlert('Request failed.', 'danger'); });
+        .catch(() => { showAlert('Request failed.', 'danger'); });
 }
 
 document.getElementById('load-pkgs-btn').addEventListener('click', function () {