Dev #2

Merged
Mboehmlaender merged 25 commits from dev into master 2025-09-25 09:27:00 +00:00
5 changed files with 139 additions and 167 deletions
Showing only changes of commit d49605001e - Show all commits
+25 -23
View File
@@ -15,61 +15,49 @@ const __dirname = path.dirname(__filename);
const app = express(); const app = express();
app.use(express.json()); app.use(express.json());
// Statische Frontend-Dateien ausliefern
app.use(express.static(path.join(__dirname, 'public'))); app.use(express.static(path.join(__dirname, 'public')));
// SPA-Fallback für React-Router
app.get('*', (req, res, next) => { app.get('*', (req, res, next) => {
if (req.path.startsWith('/api')) return next(); if (req.path.startsWith('/api')) return next();
res.sendFile(path.join(__dirname, 'public', 'index.html')); res.sendFile(path.join(__dirname, 'public', 'index.html'));
}); });
// Backend-Port fix
const PORT = 4001; const PORT = 4001;
// Endpoint-ID aus der env
const ENDPOINT_ID = Number(process.env.PORTAINER_ENDPOINT_ID); const ENDPOINT_ID = Number(process.env.PORTAINER_ENDPOINT_ID);
// HTTPS Agent für Self-Signed-Zertifikate
const agent = new https.Agent({ rejectUnauthorized: false }); const agent = new https.Agent({ rejectUnauthorized: false });
// Axios-Instance für Portainer
const axiosInstance = axios.create({ const axiosInstance = axios.create({
httpsAgent: agent, httpsAgent: agent,
headers: { "X-API-Key": process.env.PORTAINER_API_KEY }, headers: { "X-API-Key": process.env.PORTAINER_API_KEY },
baseURL: process.env.PORTAINER_URL, baseURL: process.env.PORTAINER_URL,
}); });
// In-Memory Redeploy-Status
const redeployingStacks = {}; const redeployingStacks = {};
// HTTP Server + Socket.IO
const server = http.createServer(app); const server = http.createServer(app);
const io = new Server(server, { cors: { origin: "*" } }); const io = new Server(server, { cors: { origin: "*" } });
io.on("connection", (socket) => { io.on("connection", (socket) => {
console.log("Client verbunden:", socket.id); console.log(`🔌 [Socket] Client verbunden: ${socket.id}`);
}); });
const broadcastRedeployStatus = (stackId, status) => { const broadcastRedeployStatus = (stackId, status) => {
redeployingStacks[stackId] = status; redeployingStacks[stackId] = status;
io.emit("redeployStatus", { stackId, status }); io.emit("redeployStatus", { stackId, status });
console.log(`🔄 [RedeployStatus] Stack ${stackId} ist jetzt ${status ? "im Redeploy" : "fertig"}`);
}; };
// --- API Endpoints --- // --- API Endpoints ---
app.get('/api/stacks', async (req, res) => { app.get('/api/stacks', async (req, res) => {
console.log("️ [API] GET /api/stacks: Abruf gestartet");
try { try {
const stacksRes = await axiosInstance.get('/api/stacks'); const stacksRes = await axiosInstance.get('/api/stacks');
// Filter nach Endpoint-ID
const filteredStacks = stacksRes.data.filter(stack => stack.EndpointId === ENDPOINT_ID); const filteredStacks = stacksRes.data.filter(stack => stack.EndpointId === ENDPOINT_ID);
// Deduplication nach Name: nur einmal pro Name
const uniqueStacksMap = {}; const uniqueStacksMap = {};
filteredStacks.forEach(stack => { filteredStacks.forEach(stack => {
if (!uniqueStacksMap[stack.Name]) { if (!uniqueStacksMap[stack.Name]) uniqueStacksMap[stack.Name] = stack;
uniqueStacksMap[stack.Name] = stack;
}
}); });
const uniqueStacks = Object.values(uniqueStacksMap); const uniqueStacks = Object.values(uniqueStacksMap);
@@ -80,36 +68,46 @@ app.get('/api/stacks', async (req, res) => {
`/api/stacks/${stack.Id}/images_status?refresh=true` `/api/stacks/${stack.Id}/images_status?refresh=true`
); );
const statusEmoji = statusRes.data.Status === 'outdated' ? '⚠️' : '✅'; const statusEmoji = statusRes.data.Status === 'outdated' ? '⚠️' : '✅';
return { ...stack, updateStatus: statusEmoji, redeploying: redeployingStacks[stack.Id] || false }; return {
} catch { ...stack,
updateStatus: statusEmoji,
redeploying: redeployingStacks[stack.Id] || false
};
} catch (err) {
console.error(`❌ Fehler beim Abrufen des Status für Stack ${stack.Id}:`, err.message);
return { ...stack, updateStatus: '❌', redeploying: redeployingStacks[stack.Id] || false }; return { ...stack, updateStatus: '❌', redeploying: redeployingStacks[stack.Id] || false };
} }
}) })
); );
stacksWithStatus.sort((a, b) => a.Name.localeCompare(b.Name)); stacksWithStatus.sort((a, b) => a.Name.localeCompare(b.Name));
console.log(`✅ GET /api/stacks: Abruf erfolgreich, ${stacksWithStatus.length} Stacks geladen`);
res.json(stacksWithStatus); res.json(stacksWithStatus);
} catch (err) { } catch (err) {
console.error(`❌ Fehler beim Abrufen der Stacks:`, err.message);
res.status(500).json({ error: err.message }); res.status(500).json({ error: err.message });
} }
}); });
app.put('/api/stacks/:id/redeploy', async (req, res) => { app.put('/api/stacks/:id/redeploy', async (req, res) => {
const { id } = req.params; const { id } = req.params;
console.log(`🔄 PUT /api/stacks/${id}/redeploy: Redeploy gestartet`);
try { try {
broadcastRedeployStatus(id, true); broadcastRedeployStatus(id, true);
const stackRes = await axiosInstance.get(`/api/stacks/${id}`); const stackRes = await axiosInstance.get(`/api/stacks/${id}`);
const stack = stackRes.data; const stack = stackRes.data;
// Prüfen, ob Stack zum konfigurierten Endpoint gehört
if (stack.EndpointId !== ENDPOINT_ID) { if (stack.EndpointId !== ENDPOINT_ID) {
throw new Error(`Stack gehört nicht zum Endpoint ${ENDPOINT_ID}`); throw new Error(`Stack gehört nicht zum Endpoint ${ENDPOINT_ID}`);
} }
if (stack.Type === 1) { if (stack.Type === 1) {
console.log(`🔄 [Redeploy] Git Stack "${stack.Name}" (${id}) wird redeployed`);
await axiosInstance.put(`/api/stacks/${id}/git/redeploy?endpointId=${stack.EndpointId}`); await axiosInstance.put(`/api/stacks/${id}/git/redeploy?endpointId=${stack.EndpointId}`);
} else if (stack.Type === 2) { } else if (stack.Type === 2) {
console.log(`🔄 [Redeploy] Compose Stack "${stack.Name}" (${id}) wird redeployed`);
const fileRes = await axiosInstance.get(`/api/stacks/${id}/file`); const fileRes = await axiosInstance.get(`/api/stacks/${id}/file`);
const stackFileContent = fileRes.data?.StackFileContent; const stackFileContent = fileRes.data?.StackFileContent;
if (!stackFileContent) throw new Error("Stack file konnte nicht geladen werden"); if (!stackFileContent) throw new Error("Stack file konnte nicht geladen werden");
@@ -119,10 +117,13 @@ app.put('/api/stacks/:id/redeploy', async (req, res) => {
const imageName = services[serviceName].image; const imageName = services[serviceName].image;
if (!imageName) continue; if (!imageName) continue;
try { try {
console.log(`🖼️ Pulling image "${imageName}" für Service "${serviceName}"`);
await axiosInstance.post( await axiosInstance.post(
`/api/endpoints/${stack.EndpointId}/docker/images/create?fromImage=${encodeURIComponent(imageName)}` `/api/endpoints/${stack.EndpointId}/docker/images/create?fromImage=${encodeURIComponent(imageName)}`
); );
} catch {} } catch (err) {
console.error(`❌ Fehler beim Pulling von Image "${imageName}":`, err.message);
}
} }
await axiosInstance.put(`/api/stacks/${id}`, await axiosInstance.put(`/api/stacks/${id}`,
@@ -132,14 +133,15 @@ app.put('/api/stacks/:id/redeploy', async (req, res) => {
} }
broadcastRedeployStatus(id, false); broadcastRedeployStatus(id, false);
console.log(`✅ PUT /api/stacks/${id}/redeploy: Redeploy erfolgreich abgeschlossen`);
res.json({ success: true, message: 'Stack redeployed' }); res.json({ success: true, message: 'Stack redeployed' });
} catch (err) { } catch (err) {
broadcastRedeployStatus(id, false); broadcastRedeployStatus(id, false);
console.error(`❌ Fehler beim Redeploy von Stack ${id}:`, err.message);
res.status(500).json({ error: err.message }); res.status(500).json({ error: err.message });
} }
}); });
// Server starten
server.listen(PORT, '0.0.0.0', () => { server.listen(PORT, '0.0.0.0', () => {
console.log(`Backend läuft auf Port ${PORT}`); console.log(`🚀 Backend läuft auf Port ${PORT}`);
}); });
+32 -39
View File
@@ -15,32 +15,28 @@ const __dirname = path.dirname(__filename);
const app = express(); const app = express();
app.use(express.json()); app.use(express.json());
// Statische Frontend-Dateien ausliefern // Statische Dateien
app.use(express.static(path.join(__dirname, 'public'))); app.use(express.static(path.join(__dirname, 'public')));
// SPA-Fallback für React-Router // SPA-Fallback
app.get('*', (req, res, next) => { app.get('*', (req, res, next) => {
if (req.path.startsWith('/api')) return next(); if (req.path.startsWith('/api')) return next();
res.sendFile(path.join(__dirname, 'public', 'index.html')); res.sendFile(path.join(__dirname, 'public', 'index.html'));
}); });
// Backend-Port fix
const PORT = 4001; const PORT = 4001;
// Endpoint-ID aus der env
const ENDPOINT_ID = Number(process.env.PORTAINER_ENDPOINT_ID); const ENDPOINT_ID = Number(process.env.PORTAINER_ENDPOINT_ID);
// HTTPS Agent für Self-Signed-Zertifikate // HTTPS Agent
const agent = new https.Agent({ rejectUnauthorized: false }); const agent = new https.Agent({ rejectUnauthorized: false });
// Axios-Instance für Portainer // Axios für Portainer
const axiosInstance = axios.create({ const axiosInstance = axios.create({
httpsAgent: agent, httpsAgent: agent,
headers: { "X-API-Key": process.env.PORTAINER_API_KEY }, headers: { "X-API-Key": process.env.PORTAINER_API_KEY },
baseURL: process.env.PORTAINER_URL, baseURL: process.env.PORTAINER_URL,
}); });
// In-Memory Redeploy-Status
const redeployingStacks = {}; const redeployingStacks = {};
// HTTP Server + Socket.IO // HTTP Server + Socket.IO
@@ -48,29 +44,27 @@ const server = http.createServer(app);
const io = new Server(server, { cors: { origin: "*" } }); const io = new Server(server, { cors: { origin: "*" } });
io.on("connection", (socket) => { io.on("connection", (socket) => {
console.log("🔌 Client verbunden:", socket.id); console.log(`🔌 [Socket] Client verbunden: ${socket.id}`);
}); });
const broadcastRedeployStatus = (stackId, status) => { const broadcastRedeployStatus = (stackId, status) => {
redeployingStacks[stackId] = status; redeployingStacks[stackId] = status;
io.emit("redeployStatus", { stackId, status }); io.emit("redeployStatus", { stackId, status });
console.log(`🔄 [RedeployStatus] Stack ${stackId} ist jetzt ${status ? "im Redeploy" : "fertig"}`);
}; };
// --- API Endpoints --- // --- API Endpoints ---
app.get('/api/stacks', async (req, res) => {
try {
console.log("📦 Stacks werden von Portainer abgefragt …");
const stacksRes = await axiosInstance.get('/api/stacks');
// Filter nach Endpoint-ID // Stacks abrufen
app.get('/api/stacks', async (req, res) => {
console.log("️ [API] GET /api/stacks: Abruf gestartet");
try {
const stacksRes = await axiosInstance.get('/api/stacks');
const filteredStacks = stacksRes.data.filter(stack => stack.EndpointId === ENDPOINT_ID); const filteredStacks = stacksRes.data.filter(stack => stack.EndpointId === ENDPOINT_ID);
// Deduplication nach Name
const uniqueStacksMap = {}; const uniqueStacksMap = {};
filteredStacks.forEach(stack => { filteredStacks.forEach(stack => {
if (!uniqueStacksMap[stack.Name]) { if (!uniqueStacksMap[stack.Name]) uniqueStacksMap[stack.Name] = stack;
uniqueStacksMap[stack.Name] = stack;
}
}); });
const uniqueStacks = Object.values(uniqueStacksMap); const uniqueStacks = Object.values(uniqueStacksMap);
@@ -81,43 +75,45 @@ app.get('/api/stacks', async (req, res) => {
`/api/stacks/${stack.Id}/images_status?refresh=true` `/api/stacks/${stack.Id}/images_status?refresh=true`
); );
const statusEmoji = statusRes.data.Status === 'outdated' ? '⚠️' : '✅'; const statusEmoji = statusRes.data.Status === 'outdated' ? '⚠️' : '✅';
return { ...stack, updateStatus: statusEmoji, redeploying: redeployingStacks[stack.Id] || false }; return {
} catch { ...stack,
updateStatus: statusEmoji,
redeploying: redeployingStacks[stack.Id] || false
};
} catch (err) {
console.error(`❌ [API] Fehler beim Abrufen Status Stack ${stack.Id}:`, err.message);
return { ...stack, updateStatus: '❌', redeploying: redeployingStacks[stack.Id] || false }; return { ...stack, updateStatus: '❌', redeploying: redeployingStacks[stack.Id] || false };
} }
}) })
); );
stacksWithStatus.sort((a, b) => a.Name.localeCompare(b.Name)); stacksWithStatus.sort((a, b) => a.Name.localeCompare(b.Name));
console.log(`✅ [API] GET /api/stacks: Abruf erfolgreich, ${stacksWithStatus.length} Stacks geladen`);
res.json(stacksWithStatus); res.json(stacksWithStatus);
} catch (err) { } catch (err) {
console.error("❌ Fehler beim Laden der Stacks:", err.message); console.error(`❌ [API] Fehler beim Abrufen der Stacks:`, err.message);
res.status(500).json({ error: err.message }); res.status(500).json({ error: err.message });
} }
}); });
// Stack redeployen
app.put('/api/stacks/:id/redeploy', async (req, res) => { app.put('/api/stacks/:id/redeploy', async (req, res) => {
const { id } = req.params; const { id } = req.params;
const startTime = Date.now(); console.log(`🔄 [API] PUT /api/stacks/${id}/redeploy: Redeploy gestartet`);
try { try {
console.log(`🟢 Redeploy gestartet für Stack ${id} …`);
broadcastRedeployStatus(id, true); broadcastRedeployStatus(id, true);
const stackRes = await axiosInstance.get(`/api/stacks/${id}`); const stackRes = await axiosInstance.get(`/api/stacks/${id}`);
const stack = stackRes.data; const stack = stackRes.data;
// Prüfen, ob Stack zum konfigurierten Endpoint gehört if (stack.EndpointId !== ENDPOINT_ID) throw new Error(`Stack gehört nicht zum Endpoint ${ENDPOINT_ID}`);
if (stack.EndpointId !== ENDPOINT_ID) {
throw new Error(`Stack gehört nicht zum Endpoint ${ENDPOINT_ID}`);
}
if (stack.Type === 1) { if (stack.Type === 1) {
console.log(`📂 Git-Stack erkannt (${stack.Name}) → Git-Redeploy`); console.log(`🔄 [Redeploy] Git Stack "${stack.Name}" (${id}) wird redeployed`);
await axiosInstance.put(`/api/stacks/${id}/git/redeploy?endpointId=${stack.EndpointId}`); await axiosInstance.put(`/api/stacks/${id}/git/redeploy?endpointId=${stack.EndpointId}`);
} else if (stack.Type === 2) { } else if (stack.Type === 2) {
console.log(`🐳 Docker-Compose-Stack erkannt (${stack.Name}) → Images pullen & neu deployen`); console.log(`🔄 [Redeploy] Compose Stack "${stack.Name}" (${id}) wird redeployed`);
const fileRes = await axiosInstance.get(`/api/stacks/${id}/file`); const fileRes = await axiosInstance.get(`/api/stacks/${id}/file`);
const stackFileContent = fileRes.data?.StackFileContent; const stackFileContent = fileRes.data?.StackFileContent;
if (!stackFileContent) throw new Error("Stack file konnte nicht geladen werden"); if (!stackFileContent) throw new Error("Stack file konnte nicht geladen werden");
@@ -127,35 +123,32 @@ app.put('/api/stacks/:id/redeploy', async (req, res) => {
const imageName = services[serviceName].image; const imageName = services[serviceName].image;
if (!imageName) continue; if (!imageName) continue;
try { try {
console.log(` Pulling image: ${imageName}`); console.log(`🖼 [Redeploy] Pulling image "${imageName}" für Service "${serviceName}"`);
await axiosInstance.post( await axiosInstance.post(
`/api/endpoints/${stack.EndpointId}/docker/images/create?fromImage=${encodeURIComponent(imageName)}` `/api/endpoints/${stack.EndpointId}/docker/images/create?fromImage=${encodeURIComponent(imageName)}`
); );
} catch (err) { } catch (err) {
console.warn(`⚠️ Konnte Image ${imageName} nicht pullen:`, err.message); console.error(`❌ [Redeploy] Fehler beim Pulling von Image "${imageName}":`, err.message);
} }
} }
await axiosInstance.put( await axiosInstance.put(`/api/stacks/${id}`,
`/api/stacks/${id}`,
{ StackFileContent: stackFileContent, Prune: false, PullImage: true }, { StackFileContent: stackFileContent, Prune: false, PullImage: true },
{ params: { endpointId: stack.EndpointId } } { params: { endpointId: stack.EndpointId } }
); );
} }
const duration = ((Date.now() - startTime) / 1000).toFixed(1);
console.log(`✅ Redeploy erfolgreich abgeschlossen für Stack ${id} (${stack.Name}) in ${duration}s`);
broadcastRedeployStatus(id, false); broadcastRedeployStatus(id, false);
console.log(`✅ [API] PUT /api/stacks/${id}/redeploy: Redeploy erfolgreich abgeschlossen`);
res.json({ success: true, message: 'Stack redeployed' }); res.json({ success: true, message: 'Stack redeployed' });
} catch (err) { } catch (err) {
console.error(`❌ Redeploy-Fehler für Stack ${id}:`, err.message);
broadcastRedeployStatus(id, false); broadcastRedeployStatus(id, false);
console.error(`❌ [API] Fehler beim Redeploy von Stack ${id}:`, err.message);
res.status(500).json({ error: err.message }); res.status(500).json({ error: err.message });
} }
}); });
// Server starten // Server starten
server.listen(PORT, '0.0.0.0', () => { server.listen(PORT, '0.0.0.0', () => {
console.log(`🚀 Backend läuft auf Port ${PORT}`); console.log(`🚀 [Server] Backend läuft auf Port ${PORT}`);
}); });
+26 -23
View File
@@ -6,37 +6,40 @@ export default function Stacks() {
const [stacks, setStacks] = useState([]); const [stacks, setStacks] = useState([]);
const [loading, setLoading] = useState(true); const [loading, setLoading] = useState(true);
const [error, setError] = useState(""); const [error, setError] = useState("");
const [redeploying, setRedeploying] = useState({});
// WebSocket initialisieren
useEffect(() => { useEffect(() => {
const socket = io("/"); const socket = io("/", { transports: ["websocket"] });
console.log("Socket connected"); console.log("🔌 Socket connected");
socket.on("redeployStatus", async ({ stackId, status }) => { socket.on("redeployStatus", async ({ stackId, status }) => {
setRedeploying(prev => ({ ...prev, [stackId]: status })); console.log(`🔄 Stack ${stackId} Redeploy Status: ${status ? "running" : "finished"}`);
// Wenn Redeploy beendet, Stack-Status neu laden
if (!status) { if (!status) {
// Status nach Redeploy neu vom Server holen
try { try {
const res = await axios.get("/api/stacks"); const res = await axios.get("/api/stacks");
const sortedStacks = res.data.sort((a, b) => a.Name.localeCompare(b.Name)); setStacks(res.data.sort((a, b) => a.Name.localeCompare(b.Name)));
setStacks(sortedStacks);
} catch (err) { } catch (err) {
console.error("Fehler beim Aktualisieren des Status nach Redeploy:", err); console.error("Fehler beim Aktualisieren nach Redeploy:", err);
} }
} else {
// UI direkt auf redeploying setzen
setStacks(prev =>
prev.map(stack =>
stack.Id === stackId ? { ...stack, redeploying: true } : stack
)
);
} }
}); });
return () => socket.disconnect(); return () => socket.disconnect();
}, []); }, []);
// Stacks initial laden
const fetchStacks = async () => { const fetchStacks = async () => {
setLoading(true);
try { try {
const res = await axios.get("/api/stacks"); const res = await axios.get("/api/stacks");
const sortedStacks = res.data.sort((a, b) => a.Name.localeCompare(b.Name)); setStacks(res.data.map(stack => ({ ...stack, redeploying: stack.redeploying || false })));
setStacks(sortedStacks);
} catch (err) { } catch (err) {
console.error("❌ Fehler beim Abrufen der Stacks:", err); console.error("❌ Fehler beim Abrufen der Stacks:", err);
setError("Fehler beim Laden der Stacks"); setError("Fehler beim Laden der Stacks");
@@ -49,15 +52,19 @@ export default function Stacks() {
fetchStacks(); fetchStacks();
}, []); }, []);
// Redeploy eines Stacks
const handleRedeploy = async (stackId) => { const handleRedeploy = async (stackId) => {
setRedeploying(prev => ({ ...prev, [stackId]: true })); setStacks(prev =>
prev.map(stack => stack.Id === stackId ? { ...stack, redeploying: true } : stack)
);
try { try {
await axios.put(`/api/stacks/${stackId}/redeploy`); await axios.put(`/api/stacks/${stackId}/redeploy`);
// Socket.IO Event aktualisiert Status automatisch
} catch (err) { } catch (err) {
console.error("❌ Fehler beim Redeploy:", err); console.error("❌ Fehler beim Redeploy:", err);
setRedeploying(prev => ({ ...prev, [stackId]: false })); setStacks(prev =>
prev.map(stack => stack.Id === stackId ? { ...stack, redeploying: false } : stack)
);
} }
}; };
@@ -67,8 +74,7 @@ export default function Stacks() {
return ( return (
<div className="grid grid-cols-1 md:grid-cols-2 gap-6 p-6"> <div className="grid grid-cols-1 md:grid-cols-2 gap-6 p-6">
{stacks.map(stack => { {stacks.map(stack => {
const isRedeploying = redeploying[stack.Id] || false; const isRedeploying = stack.redeploying;
const isUpToDate = stack.updateStatus === "✅";
return ( return (
<div <div
@@ -77,29 +83,26 @@ export default function Stacks() {
${isRedeploying ? "bg-gray-700 cursor-not-allowed" : "bg-gray-800 hover:bg-gray-700"}`} ${isRedeploying ? "bg-gray-700 cursor-not-allowed" : "bg-gray-800 hover:bg-gray-700"}`}
> >
<div className="flex items-center space-x-4"> <div className="flex items-center space-x-4">
{/* Status Indicator */}
<div className={`w-12 h-12 flex items-center justify-center rounded-full <div className={`w-12 h-12 flex items-center justify-center rounded-full
${stack.updateStatus === "✅" ? "bg-green-500" : ${stack.updateStatus === "✅" ? "bg-green-500" :
stack.updateStatus === "⚠️" ? "bg-yellow-500" : stack.updateStatus === "⚠️" ? "bg-yellow-500" :
"bg-red-500"}`} "bg-red-500"}`}
> />
</div>
<div> <div>
<p className="text-lg font-semibold text-white">{stack.Name}</p> <p className="text-lg font-semibold text-white">{stack.Name}</p>
<p className="text-sm text-gray-400">ID: {stack.Id}</p> <p className="text-sm text-gray-400">ID: {stack.Id}</p>
</div> </div>
</div> </div>
{!isUpToDate && (
<button <button
onClick={() => handleRedeploy(stack.Id)} onClick={() => handleRedeploy(stack.Id)}
disabled={isRedeploying} disabled={isRedeploying}
className={`px-5 py-2 rounded-lg font-medium transition className={`px-5 py-2 rounded-lg font-medium transition
${isRedeploying ? "bg-orange-500 cursor-not-allowed" : "bg-blue-500 hover:bg-blue-600"}`} ${isRedeploying ? "bg-orange-500 cursor-not-allowed" :
"bg-blue-500 hover:bg-blue-600"}`}
> >
{isRedeploying ? "Redeploying" : "Redeploy"} {isRedeploying ? "Redeploying" : "Redeploy"}
</button> </button>
)}
</div> </div>
); );
})} })}
+35 -65
View File
@@ -6,59 +6,36 @@ export default function Stacks() {
const [stacks, setStacks] = useState([]); const [stacks, setStacks] = useState([]);
const [loading, setLoading] = useState(true); const [loading, setLoading] = useState(true);
const [error, setError] = useState(""); const [error, setError] = useState("");
// Map: { [stackId]: boolean }
const [redeploying, setRedeploying] = useState({});
// ------------------------- // Socket.IO initialisieren (Proxy leitet /socket.io an Backend)
// WebSocket: connect + events
// -------------------------
useEffect(() => { useEffect(() => {
// wenn Frontend und Backend auf verschiedenen Hosts/Ports laufen: const socket = io("/", { transports: ["websocket"] });
// const socket = io("http://localhost:4001"); console.log("🔌 Socket connected");
const socket = io(); // gleiche Origin (Express static) -> passt normalerweise
socket.on("connect", () => console.log("Socket connected:", socket.id));
socket.on("redeployStatus", async ({ stackId, status }) => { socket.on("redeployStatus", ({ stackId, status }) => {
// sofort den lokalen map-state setzen (optimistisch) console.log(`🔄 Stack ${stackId} Redeploy Status: ${status ? "running" : "finished"}`);
setRedeploying(prev => ({ ...prev, [stackId]: status })); setStacks(prevStacks =>
prevStacks.map(stack =>
// Wenn der Redeploy zu false geht, holen wir die aktuellen Stacks (aktualisieren UI) stack.Id === stackId
if (!status) { ? { ...stack, redeploying: status, updateStatus: status ? stack.updateStatus : "✅" }
try { : stack
const res = await axios.get("/api/stacks"); )
const sortedStacks = res.data.sort((a, b) => a.Name.localeCompare(b.Name)); );
setStacks(sortedStacks);
// Map aus API-Daten aufbauen (wichtig für F5 / Konsistenz)
const map = {};
sortedStacks.forEach(s => { map[s.Id] = !!s.redeploying; });
setRedeploying(map);
} catch (err) {
console.error("Fehler beim Aktualisieren des Status nach Redeploy:", err);
}
}
}); });
return () => { return () => socket.disconnect();
socket.off("redeployStatus");
socket.disconnect();
};
}, []); }, []);
// ------------------------- // Stacks initial laden
// Initiale Stacks laden (auch setzt redeploying map)
// -------------------------
const fetchStacks = async () => { const fetchStacks = async () => {
setLoading(true); setLoading(true);
try { try {
const res = await axios.get("/api/stacks"); const res = await axios.get("/api/stacks");
const sortedStacks = res.data.sort((a, b) => a.Name.localeCompare(b.Name)); setStacks(
setStacks(sortedStacks); res.data
.sort((a, b) => a.Name.localeCompare(b.Name))
// Wichtig: redeploying-Map aus API-Daten setzen, damit F5 den echten Zustand zeigt .map(stack => ({ ...stack, redeploying: stack.redeploying || false }))
const map = {}; );
sortedStacks.forEach(s => { map[s.Id] = !!s.redeploying; });
setRedeploying(map);
} catch (err) { } catch (err) {
console.error("❌ Fehler beim Abrufen der Stacks:", err); console.error("❌ Fehler beim Abrufen der Stacks:", err);
setError("Fehler beim Laden der Stacks"); setError("Fehler beim Laden der Stacks");
@@ -71,43 +48,40 @@ export default function Stacks() {
fetchStacks(); fetchStacks();
}, []); }, []);
// ------------------------- // Redeploy starten
// Redeploy Trigger
// -------------------------
const handleRedeploy = async (stackId) => { const handleRedeploy = async (stackId) => {
// sofort UI-Feedback // Sofort UI auf redeploying setzen
setRedeploying(prev => ({ ...prev, [stackId]: true })); setStacks(prev =>
prev.map(stack => stack.Id === stackId ? { ...stack, redeploying: true } : stack)
);
try { try {
await axios.put(`/api/stacks/${stackId}/redeploy`); await axios.put(`/api/stacks/${stackId}/redeploy`);
// kein sofortiges setRedeploying(false) Backend sendet das finale Event // Backend sendet Socket-Event → UI aktualisiert automatisch
} catch (err) { } catch (err) {
console.error("❌ Fehler beim Redeploy:", err); console.error("❌ Fehler beim Redeploy:", err);
// Fehlerfall: wieder auf false setzen damit UI nicht hängen bleibt setStacks(prev =>
setRedeploying(prev => ({ ...prev, [stackId]: false })); prev.map(stack => stack.Id === stackId ? { ...stack, redeploying: false } : stack)
);
} }
}; };
// -------------------------
// Render
// -------------------------
if (loading) return <p className="text-gray-400">Lade Stacks...</p>; if (loading) return <p className="text-gray-400">Lade Stacks...</p>;
if (error) return <p className="text-red-400">{error}</p>; if (error) return <p className="text-red-400">{error}</p>;
return ( return (
<div className="grid grid-cols-1 md:grid-cols-2 gap-6 p-6"> <div className="grid grid-cols-1 md:grid-cols-2 gap-6 p-6">
{stacks.map(stack => { {stacks.map(stack => {
const isRedeploying = Boolean(redeploying[stack.Id]); const isRedeploying = stack.redeploying;
return ( return (
<div <div
key={stack.Id} key={stack.Id}
// wenn redeploying -> "gedämpfter" Container (sichtbar deaktiviert)
className={`flex justify-between items-center p-5 rounded-xl shadow-lg transition className={`flex justify-between items-center p-5 rounded-xl shadow-lg transition
${isRedeploying ? "bg-gray-700 opacity-60" : "bg-gray-800 hover:bg-gray-700"}`} ${isRedeploying ? "bg-gray-700 cursor-not-allowed" : "bg-gray-800 hover:bg-gray-700"}`}
aria-disabled={isRedeploying}
> >
<div className="flex items-center space-x-4"> <div className="flex items-center space-x-4">
{/* Status Indicator */}
<div className={`w-12 h-12 flex items-center justify-center rounded-full <div className={`w-12 h-12 flex items-center justify-center rounded-full
${stack.updateStatus === "✅" ? "bg-green-500" : ${stack.updateStatus === "✅" ? "bg-green-500" :
stack.updateStatus === "⚠️" ? "bg-yellow-500" : stack.updateStatus === "⚠️" ? "bg-yellow-500" :
@@ -119,23 +93,19 @@ export default function Stacks() {
</div> </div>
</div> </div>
{/* Button ist jetzt immer sichtbar */} {/* Redeploy Button */}
<button <button
onClick={() => handleRedeploy(stack.Id)} onClick={() => handleRedeploy(stack.Id)}
disabled={isRedeploying} disabled={isRedeploying}
className={`px-5 py-2 rounded-lg font-medium transition className={`px-5 py-2 rounded-lg font-medium transition
${isRedeploying ${isRedeploying ? "bg-orange-500 cursor-not-allowed" :
? "bg-orange-500 cursor-not-allowed" "bg-blue-500 hover:bg-blue-600"}`}
: "bg-blue-500 hover:bg-blue-600"}`}
// Browser-Default Disabled-Opacity überschreiben
style={isRedeploying ? { opacity: 1 } : {}}
> >
{isRedeploying ? "Redeploying" : "Redeploy"} {isRedeploying ? "Redeploying" : "Redeploy"}
</button> </button>
</div> </div>
); );
})} })}
{stacks.length === 0 && <p className="text-gray-400">Keine Stacks gefunden.</p>} {stacks.length === 0 && <p className="text-gray-400">Keine Stacks gefunden.</p>}
</div> </div>
); );
+14 -10
View File
@@ -1,17 +1,21 @@
import { defineConfig } from "vite"; import { defineConfig } from 'vite';
import react from "@vitejs/plugin-react"; import react from '@vitejs/plugin-react';
export default defineConfig({ export default defineConfig({
plugins: [react()], plugins: [react()],
server: { server: {
host: true, host: true, // Hört auf allen Netzwerk-Interfaces, kein localhost notwendig
port: 5173, port: 5173, // optional, Standardport für Vite
proxy: { proxy: {
"/api": { '/api': {
target: "http://127.0.0.1:4001", // dein Backend target: 'http://127.0.0.1:4001', // Backend lokal auf Port 4001
changeOrigin: true, changeOrigin: true
},
},
allowedHosts: "all",
}, },
'/socket.io': {
target: 'http://127.0.0.1:4001', // WebSocket-Verbindungen über Proxy weiterleiten
ws: true,
changeOrigin: true
}
}
}
}); });