@muhammedaksam/easiarr 0.7.7 → 0.7.8

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@muhammedaksam/easiarr",
-  "version": "0.7.7",
+  "version": "0.7.8",
   "description": "TUI tool for generating docker-compose files for the *arr media ecosystem with 41 apps, TRaSH Guides best practices, VPN routing, and Traefik reverse proxy support",
   "module": "src/index.ts",
   "type": "module",

package/src/api/portainer-api.ts

@@ -64,11 +64,22 @@ export interface PortainerApiKeyResponse {
 export class PortainerApiClient {
   private baseUrl: string
   private jwtToken: string | null = null
+  private apiKey: string | null = null
 
   constructor(host: string, port: number) {
     this.baseUrl = `http://${host}:${port}`
   }
 
+  /**
+   * Set API key for authentication (alternative to JWT login)
+   * @param apiKey - The Portainer API key (e.g., ptr_xxx)
+   */
+  setApiKey(key: string): void {
+    if (key) {
+      this.apiKey = key
+    }
+  }
+
   private async request<T>(endpoint: string, options: RequestInit = {}): Promise<T> {
     const url = `${this.baseUrl}/api${endpoint}`
     const headers: Record<string, string> = {
@@ -76,8 +87,10 @@ export class PortainerApiClient {
       ...(options.headers as Record<string, string>),
     }
 
-    // Add JWT token if authenticated
-    if (this.jwtToken) {
+    // Add authentication - prefer API key, fallback to JWT
+    if (this.apiKey) {
+      headers["X-API-Key"] = this.apiKey
+    } else if (this.jwtToken) {
       headers["Authorization"] = `Bearer ${this.jwtToken}`
     }
 
@@ -240,6 +253,40 @@ export class PortainerApiClient {
     return this.request<PortainerEndpoint[]>("/endpoints")
   }
 
+  /**
+   * Get the local Docker socket environment ID.
+   * Finds the first endpoint that uses unix:///var/run/docker.sock or is named "local".
+   * @returns The environment ID or null if not found
+   */
+  async getLocalEnvironmentId(): Promise<number | null> {
+    try {
+      const endpoints = await this.getEndpoints()
+
+      // First, try to find one using Docker socket
+      const socketEndpoint = endpoints.find(
+        (e) => e.URL === "unix:///var/run/docker.sock" || e.URL.includes("docker.sock")
+      )
+      if (socketEndpoint) {
+        return socketEndpoint.Id
+      }
+
+      // Fallback: find one named "local"
+      const localEndpoint = endpoints.find((e) => e.Name.toLowerCase() === "local")
+      if (localEndpoint) {
+        return localEndpoint.Id
+      }
+
+      // Last resort: return the first endpoint if any exist
+      if (endpoints.length > 0) {
+        return endpoints[0].Id
+      }
+
+      return null
+    } catch {
+      return null
+    }
+  }
+
   /**
    * Get all containers for an endpoint
    */

package/src/config/homepage-config.ts

@@ -10,7 +10,8 @@ import type { EasiarrConfig, AppCategory } from "./schema"
 import { APP_CATEGORIES } from "./schema"
 import { getApp } from "../apps/registry"
 import { CATEGORY_ORDER } from "../apps/categories"
-import { readEnvSync, getLocalIp } from "../utils/env"
+import { readEnvSync, getLocalIp, updateEnv } from "../utils/env"
+import { PortainerApiClient } from "../api/portainer-api"
 
 /**
  * Get the Homepage config directory path
@@ -95,8 +96,27 @@ export async function generateServicesYaml(config: EasiarrConfig): Promise<strin
       }
 
       if (appDef.id === "portainer") {
-        // Default to environment 1 (local)
-        service.widget.env = env["PORTAINER_ENV"] ?? "1"
+        // Try to auto-detect Portainer environment ID
+        // User can override with PORTAINER_ENV in .env file
+        if (env["PORTAINER_ENV"]) {
+          service.widget.env = env["PORTAINER_ENV"]
+        } else {
+          // Auto-detect from Portainer API
+          const portainerPort = appConfig.port ?? appDef.defaultPort
+          const portainerClient = new PortainerApiClient(localIp, portainerPort)
+          const apiKey = env["API_KEY_PORTAINER"]
+          if (apiKey) {
+            portainerClient.setApiKey(apiKey)
+          }
+          const localEnvId = await portainerClient.getLocalEnvironmentId()
+          const envIdStr = localEnvId?.toString() ?? "1"
+          service.widget.env = envIdStr
+
+          // Persist the detected env ID to .env for future use
+          if (localEnvId) {
+            await updateEnv({ PORTAINER_ENV: envIdStr })
+          }
+        }
       }
 
       // Add any custom widget fields