@muhammedaksam/easiarr 0.4.3 → 0.5.1

package/src/ui/screens/ApiKeyViewer.ts

@@ -6,7 +6,8 @@ import { parse as parseYaml } from "yaml"
 import { createPageLayout } from "../components/PageLayout"
 import { EasiarrConfig, AppDefinition } from "../../config/schema"
 import { getApp } from "../../apps/registry"
-import { updateEnv } from "../../utils/env"
+import { updateEnv, readEnvSync } from "../../utils/env"
+import { PortainerApiClient } from "../../api/portainer-api"
 
 /** Generate a random 32-character hex API key */
 function generateApiKey(): string {
@@ -103,12 +104,18 @@ function updateIniValue(content: string, section: string, updates: Record<string
 
 type KeyStatus = "found" | "missing" | "error" | "generated"
 
+interface PortainerCredentials {
+  apiKey: string
+  password?: string // Only set if padded (different from global)
+}
+
 export class ApiKeyViewer extends BoxRenderable {
   private config: EasiarrConfig
   private keys: Array<{ appId: string; app: string; key: string; status: KeyStatus }> = []
   private keyHandler!: (key: KeyEvent) => void
   private cliRenderer: CliRenderer
   private statusText: TextRenderable | null = null
+  private portainerCredentials: PortainerCredentials | null = null
 
   constructor(renderer: CliRenderer, config: EasiarrConfig, onBack: () => void) {
     super(renderer, {
@@ -131,6 +138,12 @@ export class ApiKeyViewer extends BoxRenderable {
     for (const appConfig of this.config.apps) {
       if (!appConfig.enabled) continue
 
+      // Handle Portainer separately (uses API, not config file)
+      if (appConfig.id === "portainer") {
+        this.scanPortainer(appConfig.port || 9000)
+        continue
+      }
+
       const appDef = getApp(appConfig.id)
       if (!appDef || !appDef.apiKeyMeta) continue
 
@@ -160,6 +173,41 @@ export class ApiKeyViewer extends BoxRenderable {
     }
   }
 
+  private scanPortainer(_port: number) {
+    const env = readEnvSync()
+    const existingApiKey = env["API_KEY_PORTAINER"]
+
+    if (existingApiKey) {
+      this.keys.push({
+        appId: "portainer",
+        app: "Portainer",
+        key: existingApiKey,
+        status: "found",
+      })
+      return
+    }
+
+    // Will attempt to initialize/login when saving
+    const globalPassword = env["GLOBAL_PASSWORD"]
+    if (!globalPassword) {
+      this.keys.push({
+        appId: "portainer",
+        app: "Portainer",
+        key: "No GLOBAL_PASSWORD set in .env",
+        status: "missing",
+      })
+      return
+    }
+
+    // Add pending entry - actual API call happens on save
+    this.keys.push({
+      appId: "portainer",
+      app: "Portainer",
+      key: "Press S to generate API key",
+      status: "missing",
+    })
+  }
+
   private extractApiKey(
     appDef: AppDefinition,
     content: string,
@@ -235,7 +283,12 @@ export class ApiKeyViewer extends BoxRenderable {
     const { container, content } = createPageLayout(this.cliRenderer, {
       title: "API Key Extractor",
       stepInfo: "Found Keys",
-      footerHint: hasFoundKeys ? "S Save to .env  Esc/Enter Return" : "Esc/Enter: Return",
+      footerHint: hasFoundKeys
+        ? [
+            { type: "key", key: "S", value: "Save to .env" },
+            { type: "key", key: "Esc/Enter", value: "Return" },
+          ]
+        : [{ type: "key", key: "Esc/Enter", value: "Return" }],
     })
     this.add(container)
 
@@ -333,20 +386,47 @@ export class ApiKeyViewer extends BoxRenderable {
 
   private async saveToEnv() {
     const foundKeys = this.keys.filter((k) => k.status === "found" || k.status === "generated")
-    if (foundKeys.length === 0) return
 
     try {
       // Build updates object with API keys
       const updates: Record<string, string> = {}
+
       for (const k of foundKeys) {
-        updates[`API_KEY_${k.appId.toUpperCase()}`] = k.key
+        if (k.appId !== "portainer") {
+          updates[`API_KEY_${k.appId.toUpperCase()}`] = k.key
+        }
+      }
+
+      // Handle Portainer separately - need to call API
+      const portainerEntry = this.keys.find((k) => k.appId === "portainer")
+      if (portainerEntry && portainerEntry.status === "missing") {
+        await this.initializePortainer(updates)
+      } else if (portainerEntry && portainerEntry.status === "found") {
+        updates["API_KEY_PORTAINER"] = portainerEntry.key
+      }
+
+      // Save Portainer credentials if we have them
+      if (this.portainerCredentials) {
+        updates["API_KEY_PORTAINER"] = this.portainerCredentials.apiKey
+        if (this.portainerCredentials.password) {
+          updates["PORTAINER_PASSWORD"] = this.portainerCredentials.password
+        }
+      }
+
+      if (Object.keys(updates).length === 0) {
+        if (this.statusText) {
+          this.statusText.content = "No keys to save"
+          this.statusText.fg = "#f1fa8c"
+        }
+        return
       }
 
       await updateEnv(updates)
 
       // Update status
       if (this.statusText) {
-        this.statusText.content = `✓ Saved ${foundKeys.length} API key(s) to .env`
+        const count = Object.keys(updates).length
+        this.statusText.content = `✓ Saved ${count} key(s) to .env`
       }
     } catch (e) {
       if (this.statusText) {
@@ -355,4 +435,65 @@ export class ApiKeyViewer extends BoxRenderable {
       }
     }
   }
+
+  private async initializePortainer(_updates: Record<string, string>) {
+    const env = readEnvSync()
+    const globalUsername = env["GLOBAL_USERNAME"] || "admin"
+    const globalPassword = env["GLOBAL_PASSWORD"]
+
+    if (!globalPassword) return
+
+    const portainerConfig = this.config.apps.find((a) => a.id === "portainer" && a.enabled)
+    if (!portainerConfig) return
+
+    const port = portainerConfig.port || 9000
+    const client = new PortainerApiClient("localhost", port)
+
+    try {
+      // Check if reachable
+      const healthy = await client.isHealthy()
+      if (!healthy) {
+        if (this.statusText) {
+          this.statusText.content = "Portainer not reachable"
+          this.statusText.fg = "#f1fa8c"
+        }
+        return
+      }
+
+      // Try to initialize or login
+      const result = await client.initializeAdmin(globalUsername, globalPassword)
+
+      if (result) {
+        // New initialization
+        const apiKey = await client.generateApiKey(result.actualPassword, "easiarr-api-key")
+        this.portainerCredentials = {
+          apiKey,
+          password: result.passwordWasPadded ? result.actualPassword : undefined,
+        }
+
+        // Update the display
+        const portainerEntry = this.keys.find((k) => k.appId === "portainer")
+        if (portainerEntry) {
+          portainerEntry.key = apiKey
+          portainerEntry.status = "generated"
+        }
+      } else {
+        // Already initialized, try login
+        await client.login(globalUsername, globalPassword)
+        const apiKey = await client.generateApiKey(globalPassword, "easiarr-api-key")
+        this.portainerCredentials = { apiKey }
+
+        const portainerEntry = this.keys.find((k) => k.appId === "portainer")
+        if (portainerEntry) {
+          portainerEntry.key = apiKey
+          portainerEntry.status = "generated"
+        }
+      }
+    } catch (e) {
+      if (this.statusText) {
+        this.statusText.content = `Portainer error: ${e}`
+        this.statusText.fg = "#ff5555"
+      }
+    }
+  }
 }

package/src/ui/screens/AppConfigurator.ts

@@ -95,7 +95,12 @@ export class AppConfigurator extends BoxRenderable {
     const { container, content } = createPageLayout(this.cliRenderer, {
       title: "Configure Apps",
       stepInfo: "Global Credentials",
-      footerHint: "Tab Cycle Fields/Shortcuts  O Override  Enter Continue  Esc Skip",
+      footerHint: [
+        { type: "key", key: "Tab", value: "Cycle Fields/Shortcuts" },
+        { type: "key", key: "O", value: "Override" },
+        { type: "key", key: "Enter", value: "Continue" },
+        { type: "key", key: "Esc", value: "Skip" },
+      ],
     })
     this.pageContainer = container
     this.add(container)
@@ -358,7 +363,7 @@ export class AppConfigurator extends BoxRenderable {
     const { container, content } = createPageLayout(this.cliRenderer, {
       title: "Configure Apps",
       stepInfo: "Setting up root folders",
-      footerHint: "Please wait...",
+      footerHint: [{ type: "text", value: "Please wait..." }],
     })
     this.pageContainer = container
     this.contentBox = content
@@ -427,7 +432,10 @@ export class AppConfigurator extends BoxRenderable {
     const { container, content } = createPageLayout(this.cliRenderer, {
       title: "Configure Apps",
       stepInfo: "qBittorrent Credentials",
-      footerHint: "Enter credentials from qBittorrent WebUI  Esc Skip",
+      footerHint: [
+        { type: "text", value: "Enter credentials from qBittorrent WebUI" },
+        { type: "key", key: "Esc", value: "Skip" },
+      ],
     })
     this.pageContainer = container
     this.add(container)
@@ -483,7 +491,10 @@ export class AppConfigurator extends BoxRenderable {
     const { container, content } = createPageLayout(this.cliRenderer, {
       title: "Configure Apps",
       stepInfo: "SABnzbd Credentials",
-      footerHint: "Enter API key from SABnzbd Config → General  Esc Skip",
+      footerHint: [
+        { type: "text", value: "Enter API key from SABnzbd Config → General" },
+        { type: "key", key: "Esc", value: "Skip" },
+      ],
     })
     this.pageContainer = container
     this.add(container)
@@ -615,7 +626,7 @@ export class AppConfigurator extends BoxRenderable {
     const { container, content } = createPageLayout(this.cliRenderer, {
       title: "Configure Apps",
       stepInfo: "Complete",
-      footerHint: "Press any key to return",
+      footerHint: [{ type: "text", value: "Press any key to return" }],
     })
     this.add(container)
 

package/src/ui/screens/AppManager.ts

@@ -54,7 +54,12 @@ export class AppManager {
     const { container: page, content } = createPageLayout(this.renderer as CliRenderer, {
       title: "Manage Apps",
       stepInfo: "Toggle apps linked to your configuration",
-      footerHint: "←→ Tab  Enter Toggle  s Save  q Back",
+      footerHint: [
+        { type: "key", key: "←→", value: "Tab" },
+        { type: "key", key: "Enter", value: "Toggle" },
+        { type: "key", key: "s", value: "Save" },
+        { type: "key", key: "q", value: "Back" },
+      ],
     })
     this.page = page
 

package/src/ui/screens/ContainerControl.ts

@@ -47,7 +47,10 @@ export class ContainerControl {
     const { container: page, content } = createPageLayout(this.renderer as CliRenderer, {
       title: "Container Control",
       stepInfo: finalStepInfo,
-      footerHint: "Enter Select/Action  q Back",
+      footerHint: [
+        { type: "key", key: "Enter", value: "Select/Action" },
+        { type: "key", key: "q", value: "Back" },
+      ],
     })
 
     if (!dockerOk) {

package/src/ui/screens/FullAutoSetup.ts

@@ -9,10 +9,11 @@ import type { EasiarrConfig } from "../../config/schema"
 import { ArrApiClient, type AddRootFolderOptions } from "../../api/arr-api"
 import { ProwlarrClient, type ArrAppType } from "../../api/prowlarr-api"
 import { QBittorrentClient, type QBittorrentCategory } from "../../api/qbittorrent-api"
+import { PortainerApiClient } from "../../api/portainer-api"
 import { getApp } from "../../apps/registry"
 // import type { AppId } from "../../config/schema"
 import { getCategoriesForApps } from "../../utils/categories"
-import { readEnvSync } from "../../utils/env"
+import { readEnvSync, updateEnv } from "../../utils/env"
 import { debugLog } from "../../utils/debug"
 
 interface SetupStep {
@@ -47,7 +48,10 @@ export class FullAutoSetup extends BoxRenderable {
     const { container: pageContainer, content: contentBox } = createPageLayout(cliRenderer, {
       title: "Full Auto Setup",
       stepInfo: "Configure all services automatically",
-      footerHint: "Enter Start/Continue  Esc Back",
+      footerHint: [
+        { type: "key", key: "Enter", value: "Start/Continue" },
+        { type: "key", key: "Esc", value: "Back" },
+      ],
     })
     super(cliRenderer, { width: "100%", height: "100%" })
     this.add(pageContainer)
@@ -74,6 +78,7 @@ export class FullAutoSetup extends BoxRenderable {
       { name: "Prowlarr Apps", status: "pending" },
       { name: "FlareSolverr", status: "pending" },
       { name: "qBittorrent", status: "pending" },
+      { name: "Portainer", status: "pending" },
     ]
   }
 
@@ -119,6 +124,9 @@ export class FullAutoSetup extends BoxRenderable {
     // Step 5: qBittorrent
     await this.setupQBittorrent()
 
+    // Step 6: Portainer
+    await this.setupPortainer()
+
     this.isRunning = false
     this.isDone = true
     this.refreshContent()
@@ -327,6 +335,74 @@ export class FullAutoSetup extends BoxRenderable {
     this.refreshContent()
   }
 
+  private async setupPortainer(): Promise<void> {
+    this.updateStep("Portainer", "running")
+    this.refreshContent()
+
+    const portainerConfig = this.config.apps.find((a) => a.id === "portainer" && a.enabled)
+    if (!portainerConfig) {
+      this.updateStep("Portainer", "skipped", "Not enabled")
+      this.refreshContent()
+      return
+    }
+
+    if (!this.globalPassword) {
+      this.updateStep("Portainer", "skipped", "No GLOBAL_PASSWORD set")
+      this.refreshContent()
+      return
+    }
+
+    try {
+      const port = portainerConfig.port || 9000
+      const client = new PortainerApiClient("localhost", port)
+
+      // Check if we can reach Portainer
+      const healthy = await client.isHealthy()
+      if (!healthy) {
+        this.updateStep("Portainer", "skipped", "Not reachable yet")
+        this.refreshContent()
+        return
+      }
+
+      // Initialize admin user (auto-pads password if needed)
+      const result = await client.initializeAdmin(this.globalUsername, this.globalPassword)
+
+      if (result) {
+        // Generate API key and save to .env
+        const apiKey = await client.generateApiKey(result.actualPassword, "easiarr-api-key")
+
+        const envUpdates: Record<string, string> = {
+          API_KEY_PORTAINER: apiKey,
+        }
+
+        // Save password if it was padded (different from global)
+        if (result.passwordWasPadded) {
+          envUpdates.PORTAINER_PASSWORD = result.actualPassword
+        }
+
+        await updateEnv(envUpdates)
+        this.updateStep("Portainer", "success", "Admin + API key created")
+      } else {
+        // Already initialized, try to login and get API key if we don't have one
+        if (!this.env["API_KEY_PORTAINER"]) {
+          try {
+            await client.login(this.globalUsername, this.globalPassword)
+            const apiKey = await client.generateApiKey(this.globalPassword, "easiarr-api-key")
+            await updateEnv({ API_KEY_PORTAINER: apiKey })
+            this.updateStep("Portainer", "success", "API key generated")
+          } catch {
+            this.updateStep("Portainer", "skipped", "Already initialized")
+          }
+        } else {
+          this.updateStep("Portainer", "skipped", "Already configured")
+        }
+      }
+    } catch (e) {
+      this.updateStep("Portainer", "error", `${e}`)
+    }
+    this.refreshContent()
+  }
+
   private updateStep(name: string, status: SetupStep["status"], message?: string): void {
     const step = this.steps.find((s) => s.name === name)
     if (step) {

package/src/ui/screens/MainMenu.ts

@@ -15,6 +15,7 @@ import { TRaSHProfileSetup } from "./TRaSHProfileSetup"
 import { ProwlarrSetup } from "./ProwlarrSetup"
 import { QBittorrentSetup } from "./QBittorrentSetup"
 import { FullAutoSetup } from "./FullAutoSetup"
+import { MonitorDashboard } from "./MonitorDashboard"
 
 export class MainMenu {
   private renderer: RenderContext
@@ -37,7 +38,7 @@ export class MainMenu {
     const { container: page, content } = createPageLayout(this.renderer as CliRenderer, {
       title: "Main Menu",
       stepInfo: "Docker Compose Generator for *arr Ecosystem",
-      footerHint: "Enter Select  Ctrl+C Exit",
+      footerHint: [{ type: "key", key: "Enter", value: "Select" }],
     })
     this.page = page
 
@@ -82,7 +83,7 @@ export class MainMenu {
     this.menu = new SelectRenderable(this.renderer, {
       id: "main-menu-select",
       width: "100%",
-      height: 10,
+      flexGrow: 1,
       options: [
         {
           name: "📦 Manage Apps",
@@ -124,6 +125,10 @@ export class MainMenu {
           name: "🚀 Full Auto Setup",
           description: "Run all configurations (Auth, Root Folders, Prowlarr, etc.)",
         },
+        {
+          name: "📊 Monitor Dashboard",
+          description: "Configure app health monitoring",
+        },
         { name: "❌ Exit", description: "Close easiarr" },
       ],
     })
@@ -211,7 +216,18 @@ export class MainMenu {
           this.container.add(autoSetup)
           break
         }
-        case 10:
+        case 10: {
+          // Monitor Dashboard
+          this.menu.blur()
+          this.page.visible = false
+          const monitor = new MonitorDashboard(this.renderer as CliRenderer, this.config, () => {
+            this.page.visible = true
+            this.menu.focus()
+          })
+          this.container.add(monitor)
+          break
+        }
+        case 11:
           process.exit(0)
           break
       }