@muhammedaksam/easiarr 0.8.5 → 0.9.1

package/src/ui/screens/FullAutoSetup.ts

@@ -12,6 +12,9 @@ import { QBittorrentClient, type QBittorrentCategory } from "../../api/qbittorre
 import { PortainerApiClient } from "../../api/portainer-api"
 import { JellyfinClient } from "../../api/jellyfin-api"
 import { JellyseerrClient } from "../../api/jellyseerr-api"
+import { CloudflareApi, setupCloudflaredTunnel } from "../../api/cloudflare-api"
+import { saveConfig } from "../../config"
+import { saveCompose } from "../../compose"
 import { getApp } from "../../apps/registry"
 // import type { AppId } from "../../config/schema"
 import { getCategoriesForApps } from "../../utils/categories"
@@ -85,6 +88,7 @@ export class FullAutoSetup extends BoxRenderable {
       { name: "Portainer", status: "pending" },
       { name: "Jellyfin", status: "pending" },
       { name: "Jellyseerr", status: "pending" },
+      { name: "Cloudflare Tunnel", status: "pending" },
     ]
   }
 
@@ -139,6 +143,9 @@ export class FullAutoSetup extends BoxRenderable {
     // Step 8: Jellyseerr
     await this.setupJellyseerr()
 
+    // Step 9: Cloudflare Tunnel
+    await this.setupCloudflare()
+
     this.isRunning = false
     this.isDone = true
     this.refreshContent()
@@ -556,6 +563,71 @@ export class FullAutoSetup extends BoxRenderable {
     this.refreshContent()
   }
 
+  private async setupCloudflare(): Promise<void> {
+    this.updateStep("Cloudflare Tunnel", "running")
+    this.refreshContent()
+
+    const cloudflaredConfig = this.config.apps.find((a) => a.id === "cloudflared" && a.enabled)
+    if (!cloudflaredConfig) {
+      this.updateStep("Cloudflare Tunnel", "skipped", "Not enabled")
+      this.refreshContent()
+      return
+    }
+
+    const apiToken = this.env["CLOUDFLARE_API_TOKEN"]
+    if (!apiToken) {
+      this.updateStep("Cloudflare Tunnel", "skipped", "No CLOUDFLARE_API_TOKEN in .env")
+      this.refreshContent()
+      return
+    }
+
+    const domain = this.env["CLOUDFLARE_DNS_ZONE"] || this.config.traefik?.domain
+    if (!domain) {
+      this.updateStep("Cloudflare Tunnel", "skipped", "No domain configured")
+      this.refreshContent()
+      return
+    }
+
+    try {
+      // Create/update tunnel
+      const result = await setupCloudflaredTunnel(apiToken, domain, "easiarr")
+
+      // Save tunnel token to .env
+      await updateEnv({
+        CLOUDFLARE_TUNNEL_TOKEN: result.tunnelToken,
+        CLOUDFLARE_DNS_ZONE: domain,
+      })
+
+      // Update config
+      if (this.config.traefik) {
+        this.config.traefik.domain = domain
+        this.config.traefik.entrypoint = "web"
+      }
+      this.config.updatedAt = new Date().toISOString()
+      await saveConfig(this.config)
+      await saveCompose(this.config)
+
+      // Optional: Set up Cloudflare Access if email is available
+      // Check CLOUDFLARE_ACCESS_EMAIL first, then fall back to EMAIL_GLOBAL
+      const accessEmail = this.env["CLOUDFLARE_ACCESS_EMAIL"] || this.env["EMAIL_GLOBAL"]
+      if (accessEmail) {
+        try {
+          const api = new CloudflareApi(apiToken)
+          await api.setupAccessProtection(domain, [accessEmail], "easiarr")
+          this.updateStep("Cloudflare Tunnel", "success", `Tunnel + Access for ${accessEmail}`)
+        } catch {
+          // Access setup failed, but tunnel is still working
+          this.updateStep("Cloudflare Tunnel", "success", "Tunnel created (Access failed)")
+        }
+      } else {
+        this.updateStep("Cloudflare Tunnel", "success", "Tunnel created")
+      }
+    } catch (e) {
+      this.updateStep("Cloudflare Tunnel", "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

@@ -21,6 +21,8 @@ import { MonitorDashboard } from "./MonitorDashboard"
 import { HomepageSetup } from "./HomepageSetup"
 import { JellyfinSetup } from "./JellyfinSetup"
 import { JellyseerrSetup } from "./JellyseerrSetup"
+import { SettingsScreen } from "./SettingsScreen"
+import { CloudflaredSetup } from "./CloudflaredSetup"
 
 type MenuItem = { name: string; description: string; action: () => void | Promise<void> }
 
@@ -57,6 +59,11 @@ export class MainMenu {
       description: "Add, remove, or configure apps",
       action: () => this.app.navigateTo("appManager"),
     })
+    items.push({
+      name: "⚙️  Settings",
+      description: "Edit Traefik, VPN, and system configuration",
+      action: () => this.showScreen(SettingsScreen),
+    })
     items.push({
       name: "🐳 Container Control",
       description: "Start, stop, restart containers",
@@ -140,13 +147,21 @@ export class MainMenu {
         action: () => this.showScreen(JellyseerrSetup),
       })
     }
+    if (this.isAppEnabled("cloudflared") || this.isAppEnabled("traefik")) {
+      items.push({
+        name: "☁️ Cloudflare Tunnel",
+        description: "Setup or configure Cloudflare Tunnel via API",
+        action: () => this.showScreen(CloudflaredSetup),
+      })
+    }
     // Bookmark generation options
-    const generateAndOpenBookmarks = async (useLocalUrls: boolean) => {
-      await saveBookmarks(this.config, useLocalUrls)
+    const generateAndOpenBookmarks = async (type: "local" | "remote") => {
+      await saveBookmarks(this.config, type)
       // Open in browser if easiarr service is enabled
       if (this.isAppEnabled("easiarr")) {
         const port = this.config.apps.find((a) => a.id === "easiarr")?.port ?? 3010
-        await openUrl(`http://localhost:${port}/bookmarks.html`)
+        const filename = type === "remote" ? "bookmarks-remote.html" : "bookmarks-local.html"
+        await openUrl(`http://localhost:${port}/${filename}`)
       }
     }
 
@@ -154,18 +169,18 @@ export class MainMenu {
       items.push({
         name: "📑 Bookmarks (Local URLs)",
         description: "Generate bookmarks using localhost addresses",
-        action: async () => generateAndOpenBookmarks(true),
+        action: async () => generateAndOpenBookmarks("local"),
       })
       items.push({
         name: "📑 Bookmarks (Traefik URLs)",
         description: `Generate bookmarks using ${this.config.traefik.domain} addresses`,
-        action: async () => generateAndOpenBookmarks(false),
+        action: async () => generateAndOpenBookmarks("remote"),
       })
     } else {
       items.push({
         name: "📑 Generate Bookmarks",
         description: "Create browser-importable bookmarks file",
-        action: async () => generateAndOpenBookmarks(true),
+        action: async () => generateAndOpenBookmarks("local"),
       })
     }
 

package/src/ui/screens/QuickSetup.ts

@@ -56,7 +56,7 @@ export class QuickSetup {
   // Traefik config
   private traefikEnabled: boolean = false
   private traefikDomain: string = "CLOUDFLARE_DNS_ZONE"
-  private traefikEntrypoint: string = "websecure"
+  private traefikEntrypoint: string = "web"
   private traefikMiddlewares: string[] = []
 
   constructor(renderer: CliRenderer, container: BoxRenderable, app: App) {
@@ -732,7 +732,7 @@ export class QuickSetup {
     content.add(
       new TextRenderable(this.renderer, {
         id: "traefik-entrypoint-label",
-        content: "Entrypoint (e.g., websecure, secureweb):",
+        content: "Entrypoint (e.g., web, websecure):",
         fg: "#aaaaaa",
       })
     )
@@ -740,7 +740,7 @@ export class QuickSetup {
     const entrypointInput = new InputRenderable(this.renderer, {
       id: "traefik-entrypoint-input",
       width: "100%",
-      placeholder: "websecure",
+      placeholder: "web",
       backgroundColor: "#2a2a3e",
       textColor: "#ffffff",
       focusedBackgroundColor: "#3a3a4e",
@@ -798,7 +798,7 @@ export class QuickSetup {
       // Save traefik config
       this.traefikEnabled = true
       this.traefikDomain = domainInput.value || "${CLOUDFLARE_DNS_ZONE}"
-      this.traefikEntrypoint = entrypointInput.value || "websecure"
+      this.traefikEntrypoint = entrypointInput.value || "web"
       this.traefikMiddlewares = middlewareInput.value
         ? middlewareInput.value
             .split(",")