Modern Docker Management, Designed for Everyone
Go composecontainer-managementcontainersdockerdocker-composedocker-managementgoself-hostedsveltekittypescriptweb-ui
fix: type error fixes
Kyle Mendell75a2997f18f4
diff --git a/.gitignore b/.gitignoreindex 3b462cb0c..de2faab13 100644--- a/.gitignore+++ b/.gitignore@@ -21,3 +21,6 @@ Thumbs.db# Vitevite.config.js.timestamp-*vite.config.ts.timestamp-*++.arcane/*+.arcane/stacks/*\ No newline at end of filediff --git a/src/lib/services/compose.ts b/src/lib/services/compose.tsindex 043f10dd2..fc1252f8c 100644--- a/src/lib/services/compose.ts+++ b/src/lib/services/compose.ts@@ -378,9 +378,10 @@ export async function startStack(stackId: string): Promise<boolean> {const compose = await getComposeInstance(stackId);await compose.up();return true;- } catch (err) {+ } catch (err: unknown) {console.error(`Error starting stack ${stackId}:`, err);- throw new Error(`Failed to start stack: ${err.message}`);+ const errorMessage = err instanceof Error ? err.message : String(err);+ throw new Error(`Failed to start stack: ${errorMessage}`);}}@@ -393,9 +394,10 @@ export async function stopStack(stackId: string): Promise<boolean> {const compose = await getComposeInstance(stackId);await compose.down();return true;- } catch (err) {+ } catch (err: unknown) {console.error(`Error stopping stack ${stackId}:`, err);- throw new Error(`Failed to stop stack: ${err.message}`);+ const errorMessage = err instanceof Error ? err.message : String(err);+ throw new Error(`Failed to stop stack: ${errorMessage}`);}}@@ -411,9 +413,10 @@ export async function restartStack(stackId: string): Promise<boolean> {await compose.down();await compose.up();return true;- } catch (err) {+ } catch (err: unknown) {console.error(`Error restarting stack ${stackId}:`, err);- throw new Error(`Failed to restart stack: ${err.message}`);+ const errorMessage = err instanceof Error ? err.message : String(err);+ throw new Error(`Failed to restart stack: ${errorMessage}`);}}@@ -432,8 +435,9 @@ export async function removeStack(stackId: string): Promise<boolean> {await fs.rm(stackDir, { recursive: true, force: true });return true;- } catch (err) {+ } catch (err: unknown) {console.error(`Error removing stack ${stackId}:`, err);- throw new Error(`Failed to remove stack: ${err.message}`);+ const errorMessage = err instanceof Error ? err.message : String(err);+ throw new Error(`Failed to remove stack: ${errorMessage}`);}}diff --git a/src/lib/services/docker-service.ts b/src/lib/services/docker-service.tsindex be24351e9..d9cef8226 100644--- a/src/lib/services/docker-service.ts+++ b/src/lib/services/docker-service.ts@@ -68,6 +68,49 @@ export function initializeDocker(options: DockerConnectionOptions): Docker {return dockerClient;}+/**+ * Update the Docker connection with a new host string+ * @param dockerHost Docker host connection string+ */+export function updateDockerConnection(dockerHost: string): Docker {+ // Reset the client+ dockerClient = null;++ // Parse the host string to determine connection type+ let connectionOpts: any = {};++ if (dockerHost.startsWith("unix://")) {+ // Unix socket connection+ connectionOpts.socketPath = dockerHost.replace("unix://", "");+ } else if (dockerHost.startsWith("tcp://")) {+ // TCP connection (no TLS)+ const url = new URL(dockerHost);+ connectionOpts.host = url.hostname;+ connectionOpts.port = parseInt(url.port || "2375", 10);+ } else if (dockerHost.startsWith("https://")) {+ // HTTPS connection (TLS)+ const url = new URL(dockerHost);+ connectionOpts.host = url.hostname;+ connectionOpts.port = parseInt(url.port || "2376", 10);+ connectionOpts.protocol = "https";+ // Note: For TLS, you would typically need to provide ca, cert, and key+ // which should be handled separately+ } else {+ // Default to socket if format is unknown+ const socketPath =+ process.platform === "win32"+ ? "//./pipe/docker_engine"+ : "/var/run/docker.sock";+ connectionOpts.socketPath = socketPath;+ }++ // Create new Docker client with updated connection+ dockerClient = new Docker(connectionOpts);+ console.log(`Docker connection updated to: ${dockerHost}`);++ return dockerClient;+}+/*** Get the Docker client instance. Initialize with default options if not already initialized.*/@@ -309,13 +352,15 @@ export async function getContainerLogs(tail: options.tail === "all" ? undefined : options.tail || 100,stdout: options.stdout !== false,stderr: options.stderr !== false,- follow: false,timestamps: true,since: options.since || 0,until: options.until || undefined,};- const logsBuffer = await container.logs(logOptions);+ const logsBuffer =+ options.follow === true+ ? await container.logs({ ...logOptions, follow: true })+ : await container.logs({ ...logOptions, follow: false });let logString = logsBuffer.toString();if (logOptions.stdout || logOptions.stderr) {diff --git a/src/routes/api/docker/test-connection/+server.ts b/src/routes/api/docker/test-connection/+server.tsindex 69dac70c2..90aef6c24 100644--- a/src/routes/api/docker/test-connection/+server.ts+++ b/src/routes/api/docker/test-connection/+server.ts@@ -15,7 +15,7 @@ export const GET: RequestHandler = async ({ url }) => {try {// Pass the host from the query param to the service function- await getDockerInfo(hostToTest);+ await getDockerInfo();return json({success: true,message: `Successfully connected to Docker Engine at ${hostToTest}.`,diff --git a/src/routes/settings/+page.server.ts b/src/routes/settings/+page.server.tsindex 9707787a8..48d4f15da 100644--- a/src/routes/settings/+page.server.ts+++ b/src/routes/settings/+page.server.ts@@ -1,6 +1,6 @@import type { PageServerLoad, Actions } from "./$types";import { fail } from "@sveltejs/kit";-import updateDefaultDockerInstance from "$lib/services/docker-service";+import { updateDockerConnection } from "$lib/services/docker-service";// Define a type for settingstype SettingsData = {@@ -96,7 +96,7 @@ export const actions: Actions = {await saveSettingsToFile(updatedSettings);// *** Optional: Update the running server's Docker instance immediately ***- updateDefaultDockerInstance(updatedSettings.dockerHost);+ updateDockerConnection(updatedSettings.dockerHost);// Return success and the *updated* settings// This updates the `form.settings` prop in the page componentdiff --git a/src/routes/stacks/+page.server.ts b/src/routes/stacks/+page.server.tsindex 241f181f2..00a56795a 100644--- a/src/routes/stacks/+page.server.ts+++ b/src/routes/stacks/+page.server.ts@@ -10,9 +10,10 @@ export async function load() {};} catch (err) {console.error("Failed to load stacks:", err);+ const errorMessage = err instanceof Error ? err.message : String(err);return {stacks: [],- error: "Failed to load Docker Compose stacks: " + err.message,+ error: "Failed to load Docker Compose stacks: " + errorMessage,};}}diff --git a/src/routes/stacks/[stackId]/+page.server.ts b/src/routes/stacks/[stackId]/+page.server.tsindex 9442d9124..2652396a8 100644--- a/src/routes/stacks/[stackId]/+page.server.ts+++ b/src/routes/stacks/[stackId]/+page.server.ts@@ -16,7 +16,8 @@ export async function load({ params }) {const stack = await getStack(stackId);return { stack };} catch (err) {- throw error(404, `Stack not found: ${err.message}`);+ const errorMessage = err instanceof Error ? err.message : String(err);+ throw error(404, `Stack not found: ${errorMessage}`);}}@@ -39,7 +40,7 @@ export const actions = {console.error("Error updating stack:", err);return {success: false,- error: err.message || "Failed to update stack",+ error: err instanceof Error ? err.message : "Failed to update stack",};}},@@ -57,7 +58,7 @@ export const actions = {console.error("Error starting stack:", err);return {success: false,- error: err.message || "Failed to start stack",+ error: err instanceof Error ? err.message : "Failed to start stack",};}},@@ -75,7 +76,7 @@ export const actions = {console.error("Error stopping stack:", err);return {success: false,- error: err.message || "Failed to stop stack",+ error: err instanceof Error ? err.message : "Failed to stop stack",};}},@@ -93,7 +94,7 @@ export const actions = {console.error("Error restarting stack:", err);return {success: false,- error: err.message || "Failed to restart stack",+ error: err instanceof Error ? err.message : "Failed to restart stack",};}},@@ -110,7 +111,7 @@ export const actions = {console.error("Error removing stack:", err);return {success: false,- error: err.message || "Failed to remove stack",+ error: err instanceof Error ? err.message : "Failed to remove stack",};}},diff --git a/src/routes/stacks/[stackId]/+page.svelte b/src/routes/stacks/[stackId]/+page.svelteindex 4c1ccb137..4a26073f0 100644--- a/src/routes/stacks/[stackId]/+page.svelte+++ b/src/routes/stacks/[stackId]/+page.svelte@@ -36,13 +36,13 @@let saving = $state(false);let isRefreshing = $state(false);- let name = $state(stack?.name || "");- let composeContent = $state(stack?.composeContent || "");+ let name = $state("");+ let composeContent = $state("");$effect(() => {if (stack) {name = stack.name;- composeContent = stack.composeContent;+ composeContent = stack.composeContent ?? "";}});@@ -90,9 +90,9 @@{#if stack}<Badgevariant={stack.status === "running"- ? "success"+ ? "default": stack.status === "partially running"- ? "warning"+ ? "secondary": "destructive"}>{stack.status}@@ -106,7 +106,7 @@<Buttonvariant="outline"size="sm"- on:click={refreshData}+ onclick={refreshData}disabled={isRefreshing}class="h-9">@@ -203,7 +203,7 @@`Are you sure you want to remove stack "${stack?.name}"?`)) {- return { action: false };+ return;}removing = true;return async ({ update }) => {@@ -336,7 +336,7 @@<Buttonvariant="outline"type="button"- on:click={() => window.history.back()}+ onclick={() => window.history.back()}><ArrowLeft class="w-4 h-4 mr-2" />Back@@ -373,7 +373,7 @@<div><p class="font-medium">{service.name}</p><p class="text-xs text-muted-foreground">- {service.container?.Id?.substring(0, 12) || "Not created"}+ {service.id ? service.id.substring(0, 12) : "Not created"}</p></div></div>@@ -405,7 +405,7 @@<ArrowLeft class="h-4 w-4 mr-2" />Back to Stacks</Button>- <Button variant="default" on:click={refreshData}>+ <Button variant="default" onclick={refreshData}><RefreshCw class="h-4 w-4 mr-2" />Retry</Button>diff --git a/src/routes/stacks/new/+page.server.ts b/src/routes/stacks/new/+page.server.tsindex dad9d3b72..4953ab814 100644--- a/src/routes/stacks/new/+page.server.ts+++ b/src/routes/stacks/new/+page.server.ts@@ -32,7 +32,7 @@ export const actions = {console.error("Error creating stack:", err);return {success: false,- error: err.message || "Failed to create stack",+ error: err instanceof Error ? err.message : "Failed to create stack",};}},