From 6fb54da4bf99f85fd5114743584c1044eb5dcea3 Mon Sep 17 00:00:00 2001 From: Klesti Selimaj Date: Sat, 14 Feb 2026 16:47:34 +0100 Subject: [PATCH] Temporarily using root port as node port --- src/lib/dockship/deploy.ts | 14 +++++---- src/lib/dockship/docker.ts | 59 +++++++++++++++++++++---------------- src/lib/dockship/metrics.ts | 4 +-- src/lib/dockship/node.ts | 4 +-- 4 files changed, 47 insertions(+), 34 deletions(-) diff --git a/src/lib/dockship/deploy.ts b/src/lib/dockship/deploy.ts index 0ba8a02..ba194fa 100644 --- a/src/lib/dockship/deploy.ts +++ b/src/lib/dockship/deploy.ts @@ -16,9 +16,13 @@ export async function getDeployments(): Promise< nodes.map( async (n) => await ( - await axios.post(`http://${n.ip}:3000/api/get-deployments`, apps, { - headers: { Authorization: `ApiKey ${n.key}` }, - }) + await axios.post( + `http://${n.ip}:${process.env.PORT}/api/get-deployments`, + apps, + { + headers: { Authorization: `ApiKey ${n.key}` }, + }, + ) ).data.deployments.map((d: any) => ({ ...d, nodeId: n.node_id })), ), ) @@ -42,7 +46,7 @@ export async function deployApp( const deployId = await ( await axios.post( - `http://${node.ip}:3000/api/deploy`, + `http://${node.ip}:${process.env.PORT}/api/deploy`, { name, app, ports }, { headers: { Authorization: `ApiKey ${node.key}` }, @@ -67,7 +71,7 @@ export async function toggleDeployment( nodes.map( async (node) => await axios.put( - `http://${node.ip}:3000/api/deploy`, + `http://${node.ip}:${process.env.PORT}/api/deploy`, { deployId, action }, { headers: { Authorization: `ApiKey ${node.key}` }, diff --git a/src/lib/dockship/docker.ts b/src/lib/dockship/docker.ts index a827927..d0feb42 100644 --- a/src/lib/dockship/docker.ts +++ b/src/lib/dockship/docker.ts @@ -11,18 +11,21 @@ export async function getDocker(nodes: Node[]): Promise { return await Promise.all( nodes.map(async (node) => { const data = await ( - await axios.get(`http://${node.ip}:3000/api/container/`, { - headers: { Authorization: `ApiKey ${node.key}` }, - }) + await axios.get( + `http://${node.ip}:${process.env.PORT}/api/container/`, + { + headers: { Authorization: `ApiKey ${node.key}` }, + }, + ) ).data; return { ...node, containers: data.containers, version: data.version }; - }) + }), ); } export async function getContainerStats( - containerId: string + containerId: string, ): Promise { const nodes = await getNodes(); @@ -31,12 +34,15 @@ export async function getContainerStats( nodes.map( async (n) => await ( - await axios.get(`http://${n.ip}:3000/api/container/stats`, { - headers: { Authorization: `ApiKey ${n.key}` }, - params: { containerId }, - }) - ).data?.stats - ) + await axios.get( + `http://${n.ip}:${process.env.PORT}/api/container/stats`, + { + headers: { Authorization: `ApiKey ${n.key}` }, + params: { containerId }, + }, + ) + ).data?.stats, + ), ) ).find((s) => s); } @@ -48,14 +54,14 @@ export async function startContainer(containerId: string) { async (n) => await ( await axios.post( - `http://${n.ip}:3000/api/container/start`, + `http://${n.ip}:${process.env.PORT}/api/container/start`, { containerId }, { headers: { Authorization: `ApiKey ${n.key}` }, params: { containerId }, - } + }, ) - ).data + ).data, ); } @@ -65,11 +71,14 @@ export async function stopContainer(containerId: string) { nodes.forEach( async (n) => await ( - await axios.delete(`http://${n.ip}:3000/api/container/start`, { - headers: { Authorization: `ApiKey ${n.key}` }, - params: { containerId }, - }) - ).data + await axios.delete( + `http://${n.ip}:${process.env.PORT}/api/container/start`, + { + headers: { Authorization: `ApiKey ${n.key}` }, + params: { containerId }, + }, + ) + ).data, ); } @@ -79,11 +88,11 @@ export async function removeContainer(containerId: string) { nodes.forEach( async (n) => await ( - await axios.delete(`http://${n.ip}:3000/api/container`, { + await axios.delete(`http://${n.ip}:${process.env.PORT}/api/container`, { headers: { Authorization: `ApiKey ${n.key}` }, params: { containerId }, }) - ).data + ).data, ); } @@ -95,16 +104,16 @@ export async function getAllContainerLogs(): Promise { nodes.map( async (n) => await ( - await axios.get(`http://${n.ip}:3000/api/logs`, { + await axios.get(`http://${n.ip}:${process.env.PORT}/api/logs`, { headers: { Authorization: `ApiKey ${n.key}` }, }) - ).data - ) + ).data, + ), ) ) .flat() .sort( (a, b) => - new Date(a.timestamp).getTime() - new Date(b.timestamp).getTime() + new Date(a.timestamp).getTime() - new Date(b.timestamp).getTime(), ); } diff --git a/src/lib/dockship/metrics.ts b/src/lib/dockship/metrics.ts index afddb07..fdfd7e0 100644 --- a/src/lib/dockship/metrics.ts +++ b/src/lib/dockship/metrics.ts @@ -33,7 +33,7 @@ export async function getMetrics(): Promise< acc.out += m.out; return acc; }, - { cpu: 0, memory: 0, in: 0, out: 0 } + { cpu: 0, memory: 0, in: 0, out: 0 }, ); averaged.push({ @@ -58,7 +58,7 @@ export async function getNodeMetrics(node: Node): Promise< }[] > { const data = await ( - await axios.get(`http://${node.ip}:3000/api/metrics`, { + await axios.get(`http://${node.ip}:${process.env.PORT}/api/metrics`, { headers: { Authorization: `ApiKey ${node.key}` }, }) ).data; diff --git a/src/lib/dockship/node.ts b/src/lib/dockship/node.ts index 80dfbaa..f2fc8fb 100644 --- a/src/lib/dockship/node.ts +++ b/src/lib/dockship/node.ts @@ -26,7 +26,7 @@ export async function getLiveNodes(): Promise<(NodeLiveData & Node)[]> { nodes.map(async (node) => ({ ...node, liveData: await ( - await axios.get(`http://${node.ip}:3000/api/status`, { + await axios.get(`http://${node.ip}:${process.env.PORT}/api/status`, { headers: { Authorization: `ApiKey ${node.key}` }, }) ).data.liveData, @@ -38,7 +38,7 @@ export async function authNode(ip: string, key: string) { if (await verifySession()) return; const data = await ( - await axios.get(`http://${ip}:3000/api/auth`, { + await axios.get(`http://${ip}:${process.env.PORT}/api/auth`, { headers: { Authorization: `ApiKey ${key}` }, }) ).data;