Merge pull request #96 from muhammedaksam/develop

Refactor setup architecture and improve code maintainability

Author: muhammedaksam

.prettierrc

@@ -0,0 +1,24 @@
+/** @type {import("prettier").Config} */
+const config = {
+  semi: false,
+  singleQuote: false,
+  tabWidth: 2,
+  trailingComma: "es5",
+  printWidth: 100,
+  plugins: ["@ianvs/prettier-plugin-sort-imports"],
+  importOrder: [
+    "<TYPES>",
+    "^node:(.*)$",
+    "",
+    "<THIRD_PARTY_MODULES>",
+    "",
+    "<TYPES>^[.|..|~]",
+    "^~/(.*)$",
+    "^[../]",
+    "^[./]",
+  ],
+  importOrderParserPlugins: ["typescript"],
+  importOrderTypeScriptVersion: "5.0.0",
+}
+
+export default config

.prettierrc.js

@@ -23,7 +23,7 @@ A terminal-based wizard that helps you set up Radarr, Sonarr, Prowlarr, and othe
 - 🎮 **Container Control** - Start, stop, and restart containers directly from the TUI
 - 📋 **Container Logs Viewer** - View and save Docker container logs from the TUI
 - ⚙️ **App Management** - Add or remove apps from your stack with ease
-- 💾 **Persistent Configuration** - Settings saved to `~/.easiarr/config.json`
+- 💾 **Persistent Configuration** - Settings saved to `$XDG_CONFIG_HOME/easiarr/config.json`
 - 🔀 **Reverse Proxy** - Traefik or Caddy support with automatic SSL
 - 🖥️ **Unraid Support** - Automatic OS detection and compatibility
 
@@ -163,10 +163,10 @@ The wizard will automatically:
 
 ## Configuration
 
-easiarr stores its configuration in `~/.easiarr/`:
+easiarr stores its configuration in `$XDG_CONFIG_HOME/easiarr/`:
 
 ```bash
-~/.easiarr/
+$XDG_CONFIG_HOME/easiarr/
 ├── config.json          # Your easiarr configuration
 ├── docker-compose.yml   # Generated Docker Compose file
 └── backups/             # Configuration backups

README.md

@@ -32,7 +32,7 @@ If you discover a security vulnerability in easiarr, please report it responsibl
 easiarr stores sensitive information in `.env` files. Always:
 
 - Never commit `.env` files to version control
-- Set restrictive file permissions: `chmod 600 ~/.easiarr/.env`
+- Set restrictive file permissions: `chmod 600 $XDG_CONFIG_HOME/easiarr/.env`
 - Use strong, unique passwords for each service
 - Regularly rotate API keys and credentials
 

SECURITY.md

@@ -1,6 +1,7 @@
 import eslint from "@eslint/js"
-import tseslint from "typescript-eslint"
+import importPlugin from "eslint-plugin-import"
 import { defineConfig, globalIgnores } from "eslint/config"
+import tseslint from "typescript-eslint"
 
 export default defineConfig([
   globalIgnores(["dist/", "node_modules/"]),
@@ -11,6 +12,7 @@ export default defineConfig([
     plugins: {
       js: eslint,
       "@typescript-eslint": tseslint.plugin,
+      import: importPlugin,
     },
     extends: [eslint.configs.recommended, ...tseslint.configs.recommended],
     languageOptions: {
@@ -27,6 +29,9 @@ export default defineConfig([
       "@typescript-eslint/explicit-function-return-type": "off",
       "@typescript-eslint/no-non-null-assertion": "off",
 
+      // Import ordering
+      "import/consistent-type-specifier-style": ["error", "prefer-top-level"],
+
       // General
       "no-console": "off",
       "prefer-const": "error",

bun.lock

@@ -12,6 +12,7 @@ module.exports = {
   },
   extensionsToTreatAsEsm: [".ts"],
   moduleNameMapper: {
+    "^~/(.*)$": "<rootDir>/src/$1",
     "^(\\.{1,2}/.*)\\.js$": "$1",
   },
 }

eslint.config.ts

@@ -1,6 +1,6 @@
 {
   "name": "@muhammedaksam/easiarr",
-  "version": "1.3.5",
+  "version": "1.4.0",
   "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",
@@ -51,23 +51,25 @@
     "start": "bun run src/index.ts"
   },
   "devDependencies": {
-    "@eslint/js": "^9.39.2",
+    "@eslint/js": "^10.0.1",
+    "@ianvs/prettier-plugin-sort-imports": "^4.7.1",
     "@types/bcrypt": "^6.0.0",
     "@types/bun": "latest",
     "@types/jest": "^30.0.0",
-    "@types/node": "^25.0.10",
-    "eslint": "^9.39.2",
+    "@types/node": "^25.2.3",
+    "eslint": "^10.0.0",
+    "eslint-plugin-import": "^2.32.0",
     "jest": "^30.2.0",
     "jiti": "^2.6.1",
     "prettier": "^3.8.1",
     "ts-jest": "^29.4.6",
-    "typescript-eslint": "^8.54.0"
+    "typescript-eslint": "^8.55.0"
   },
   "peerDependencies": {
     "typescript": "^5.9.3"
   },
   "dependencies": {
-    "@opentui/core": "^0.1.75",
+    "@opentui/core": "^0.1.79",
     "bcrypt": "^6.0.0",
     "socket.io-client": "^4.8.3",
     "yaml": "^2.8.2"

jest.config.cjs

@@ -3,7 +3,11 @@
  * Interacts with Radarr, Sonarr, Lidarr, Readarr, Whisparr APIs
  */
 
-import { debugLog } from "../utils/debug"
+import type { NamingConfig } from "./naming-config"
+import type { AppId } from "~/config/schema"
+import { getCategoryFieldName, getCategoryForApp } from "~/utils/categories"
+import { debugLog } from "~/utils/debug"
+import { TRASH_NAMING_CONFIG } from "./naming-config"
 
 // Types for Root Folder API
 export interface RootFolder {
@@ -44,10 +48,6 @@ export interface RemotePathMapping {
   localPath: string
 }
 
-import type { AppId } from "../config/schema"
-import { getCategoryForApp, getCategoryFieldName } from "../utils/categories"
-import { TRASH_NAMING_CONFIG, type NamingConfig } from "./naming-config"
-
 // qBittorrent download client config
 export function createQBittorrentConfig(
   host: string,
@@ -82,7 +82,12 @@ export function createQBittorrentConfig(
 }
 
 // SABnzbd download client config
-export function createSABnzbdConfig(host: string, port: number, apiKey: string, appId?: AppId): DownloadClientConfig {
+export function createSABnzbdConfig(
+  host: string,
+  port: number,
+  apiKey: string,
+  appId?: AppId
+): DownloadClientConfig {
   const category = appId ? getCategoryForApp(appId) : "default"
   const categoryField = appId ? getCategoryFieldName(appId) : "category"
 
@@ -214,7 +219,11 @@ export class ArrApiClient {
     return this.request<HostConfig>("/config/host")
   }
 
-  async updateHostConfig(username: string, password: string, override = false): Promise<HostConfig | null> {
+  async updateHostConfig(
+    username: string,
+    password: string,
+    override = false
+  ): Promise<HostConfig | null> {
     // First get current config to preserve all other settings
     const currentConfig = await this.getHostConfig()
 
@@ -293,11 +302,15 @@ export class ArrApiClient {
       // 3. Update configuration
       await this.updateNamingConfig(newConfig)
     } catch (e) {
-      throw new Error(`Failed to configure naming: ${e}`)
+      throw new Error(`Failed to configure naming: ${e}`, { cause: e })
     }
   }
 
-  async addRemotePathMapping(host: string, remotePath: string, localPath: string): Promise<RemotePathMapping> {
+  async addRemotePathMapping(
+    host: string,
+    remotePath: string,
+    localPath: string
+  ): Promise<RemotePathMapping> {
     return this.request<RemotePathMapping>("/remotepathmapping", {
       method: "POST",
       body: JSON.stringify({ host, remotePath, localPath }),

package.json

@@ -3,7 +3,7 @@
  * Interfaces for auto-setup capability metadata and clients
  */
 
-import type { AppId } from "../config/schema"
+import type { AppId } from "~/config/schema"
 
 /**
  * Describes an app's auto-setup capability