@nghiavuive/random-image 1.2.0 → 1.2.1

package/dist/cli.js

@@ -204,9 +204,9 @@ var RandomImage = class {
       });
       const writer = fs.createWriteStream(fullPath);
       response.data.pipe(writer);
-      return new Promise((resolve2, reject) => {
+      return new Promise((resolve3, reject) => {
         writer.on("finish", () => {
-          resolve2(fullPath);
+          resolve3(fullPath);
         });
         writer.on("error", (err) => {
           fs.unlink(fullPath, () => {
@@ -244,101 +244,220 @@ var RandomImage = class {
 };
 
 // src/cli.ts
+var import_chalk3 = __toESM(require("chalk"));
+
+// src/cli/env-loader.ts
 var path2 = __toESM(require("path"));
 var dotenv = __toESM(require("dotenv"));
 var fs2 = __toESM(require("fs"));
-var possibleEnvPaths = [
-  path2.resolve(process.cwd(), ".env"),
-  // Current working directory
-  path2.resolve(__dirname, ".env"),
-  // Same directory as the CLI script (dist/)
-  path2.resolve(__dirname, "..", ".env")
-  // Parent directory (root of project)
-];
-for (const envPath of possibleEnvPaths) {
-  if (fs2.existsSync(envPath)) {
-    dotenv.config({ path: envPath });
-    console.log(`Loaded environment from: ${envPath}`);
-    break;
+function loadEnvironment() {
+  const possibleEnvPaths = [
+    path2.resolve(process.cwd(), ".env"),
+    // Current working directory
+    path2.resolve(__dirname, ".env"),
+    // Same directory as the CLI script (dist/)
+    path2.resolve(__dirname, "..", ".env")
+    // Parent directory (root of project)
+  ];
+  for (const envPath of possibleEnvPaths) {
+    if (fs2.existsSync(envPath)) {
+      dotenv.config({ path: envPath });
+      break;
+    }
+  }
+}
+function getApiKeys() {
+  return {
+    unsplash: process.env.UNSPLASH_KEY,
+    pexels: process.env.PEXELS_KEY,
+    pixabay: process.env.PIXABAY_KEY
+  };
+}
+
+// src/cli/display.ts
+var import_chalk = __toESM(require("chalk"));
+var import_boxen = __toESM(require("boxen"));
+function displayError(message) {
+  console.error(import_chalk.default.red(`
+\u274C ${message}`));
+}
+function displayInfo(message) {
+  console.log(import_chalk.default.blue(`
+\u2139\uFE0F  ${message}`));
+}
+function displayImageInfo(image, providerName) {
+  const content = [
+    `${import_chalk.default.bold("\u{1F3A8} Provider:")} ${import_chalk.default.cyan(providerName)}`,
+    `${import_chalk.default.bold("\u{1F4D0} Size:")} ${import_chalk.default.yellow(`${image.width}x${image.height}`)}`,
+    `${import_chalk.default.bold("\u{1F464} Author:")} ${import_chalk.default.magenta(image.author)}`,
+    image.authorUrl ? `${import_chalk.default.bold("\u{1F517} Author URL:")} ${import_chalk.default.gray(image.authorUrl)}` : "",
+    `${import_chalk.default.bold("\u{1F310} Original:")} ${import_chalk.default.gray(image.originalUrl)}`,
+    `${import_chalk.default.bold("\u{1F4F7} Image URL:")} ${import_chalk.default.gray(image.url)}`
+  ].filter(Boolean).join("\n");
+  console.log("\n" + (0, import_boxen.default)(content, {
+    padding: 1,
+    margin: 1,
+    borderStyle: "round",
+    borderColor: "green",
+    title: "\u{1F5BC}\uFE0F  Image Details",
+    titleAlignment: "center"
+  }));
+}
+function displayDownloadSuccess(filePath) {
+  const content = `${import_chalk.default.bold("\u{1F4C1} Saved to:")} ${import_chalk.default.cyan(filePath)}`;
+  console.log("\n" + (0, import_boxen.default)(content, {
+    padding: 1,
+    margin: 1,
+    borderStyle: "round",
+    borderColor: "blue",
+    title: "\u{1F4BE} Download Complete",
+    titleAlignment: "center"
+  }));
+}
+
+// src/cli/provider-manager.ts
+function selectRandomProvider(providers) {
+  const availableProviders = Object.entries(providers).filter(([_, key]) => key).map(([name]) => name);
+  if (availableProviders.length === 0) {
+    return null;
+  }
+  return availableProviders[Math.floor(Math.random() * availableProviders.length)];
+}
+function createProvider(providerName, apiKey) {
+  switch (providerName) {
+    case "unsplash":
+      return new UnsplashProvider(apiKey);
+    case "pexels":
+      return new PexelsProvider(apiKey);
+    case "pixabay":
+      return new PixabayProvider(apiKey);
+    default:
+      return null;
+  }
+}
+function getProviderInstance(providerName, providers) {
+  const name = providerName.toLowerCase();
+  const apiKey = providers[name];
+  if (!apiKey) {
+    displayError(`API key for ${providerName} not found.`);
+    console.log(`Please set ${providerName.toUpperCase()}_KEY environment variable.
+`);
+    return null;
+  }
+  const provider = createProvider(name, apiKey);
+  if (!provider) {
+    displayError(`Unknown provider "${providerName}"`);
+    console.log("Available providers: unsplash, pexels, pixabay, random\n");
+    return null;
   }
+  return { provider, name };
 }
+
+// src/cli/options-builder.ts
+function buildFetchOptions(options) {
+  const fetchOptions = {};
+  if (options.query) fetchOptions.query = options.query;
+  if (options.width) fetchOptions.width = options.width;
+  if (options.height) fetchOptions.height = options.height;
+  if (options.quality) fetchOptions.quality = options.quality;
+  if (options.orientation) fetchOptions.orientation = options.orientation;
+  return fetchOptions;
+}
+function buildDownloadOptions(options) {
+  const downloadOptions = {
+    overwrite: options.overwrite,
+    keepOriginalName: options.keepOriginalName
+  };
+  if (options.filename) {
+    downloadOptions.filename = options.filename;
+  }
+  return downloadOptions;
+}
+function getDownloadPath(options) {
+  return typeof options.download === "string" ? options.download : "./downloads";
+}
+
+// src/cli/actions.ts
+var import_ora = __toESM(require("ora"));
+var import_chalk2 = __toESM(require("chalk"));
+var path3 = __toESM(require("path"));
+async function fetchImage(fetcher, providerName, fetchOptions) {
+  const spinner = (0, import_ora.default)({
+    text: import_chalk2.default.cyan("\u{1F50D} Searching for the perfect image..."),
+    spinner: "dots"
+  }).start();
+  try {
+    const image = await fetcher.getRandom(fetchOptions);
+    spinner.succeed(import_chalk2.default.green("\u2728 Image found!"));
+    return image;
+  } catch (error) {
+    spinner.fail(import_chalk2.default.red("Failed to fetch image"));
+    throw error;
+  }
+}
+async function downloadImage(fetcher, image, downloadPath, downloadOptions) {
+  const resolvedPath = path3.resolve(downloadPath);
+  displayInfo(`Downloading to: ${import_chalk2.default.cyan(resolvedPath)}`);
+  const spinner = (0, import_ora.default)({
+    text: import_chalk2.default.cyan("\u{1F4BE} Downloading image..."),
+    spinner: "dots"
+  }).start();
+  try {
+    const filePath = await fetcher.download(image, downloadPath, downloadOptions);
+    spinner.succeed(import_chalk2.default.green("\u{1F4E6} Download complete!"));
+    return filePath;
+  } catch (error) {
+    spinner.fail(import_chalk2.default.red("Download failed"));
+    throw error;
+  }
+}
+
+// src/cli.ts
+loadEnvironment();
 var program = new import_commander.Command();
-program.name("random-image").description("CLI tool to fetch random images from various providers").version("1.2.0");
-program.command("fetch").description("Fetch a random image from image providers").option("-q, --query <search>", "Search query for the image").option("-w, --width <number>", "Width of the image", parseInt).option("-h, --height <number>", "Height of the image", parseInt).option("--quality <number>", "Quality of the image (0-100)", parseInt).option("--orientation <type>", "Image orientation (landscape or portrait)").option("-p, --provider <name>", "Provider to use (unsplash, pexels, pixabay, or random)", "random").option("-d, --download [path]", "Download the image to specified directory (default: ./downloads)").option("--filename <name>", "Custom filename for downloaded image").option("--overwrite", "Overwrite existing files", false).option("--no-keep-original-name", "Generate random UUID filename instead of keeping original").action(async (options) => {
+program.name("random-image").description("\u{1F3A8} CLI tool to fetch random images from various providers").version("1.2.0");
+program.command("fetch").description("\u{1F5BC}\uFE0F  Fetch a random image from image providers").option("-q, --query <search>", "Search query for the image").option("-w, --width <number>", "Width of the image", parseInt).option("-h, --height <number>", "Height of the image", parseInt).option("--quality <number>", "Quality of the image (0-100)", parseInt).option("--orientation <type>", "Image orientation (landscape or portrait)").option("-p, --provider <name>", "Provider to use (unsplash, pexels, pixabay, or random)", "random").option("-d, --download [path]", "Download the image to specified directory (default: ./downloads)").option("--filename <name>", "Custom filename for downloaded image").option("--overwrite", "Overwrite existing files", false).option("--no-keep-original-name", "Generate random UUID filename instead of keeping original").action(async (options) => {
   try {
-    const providers = {
-      unsplash: process.env.UNSPLASH_KEY,
-      pexels: process.env.PEXELS_KEY,
-      pixabay: process.env.PIXABAY_KEY
-    };
+    const providers = getApiKeys();
     let providerName = options.provider.toLowerCase();
     if (providerName === "random") {
-      const availableProviders = Object.entries(providers).filter(([_, key]) => key).map(([name]) => name);
-      if (availableProviders.length === 0) {
-        console.error("Error: No API keys found in environment variables.");
-        console.error("Please set at least one of: UNSPLASH_KEY, PEXELS_KEY, PIXABAY_KEY");
+      const selectedProvider = selectRandomProvider(providers);
+      if (!selectedProvider) {
+        displayError("No API keys found in environment variables.");
+        console.log(import_chalk3.default.yellow("\n\u{1F4A1} Please set at least one of:"));
+        console.log(import_chalk3.default.cyan("   \u2022 UNSPLASH_KEY"));
+        console.log(import_chalk3.default.cyan("   \u2022 PEXELS_KEY"));
+        console.log(import_chalk3.default.cyan("   \u2022 PIXABAY_KEY\n"));
         process.exit(1);
       }
-      providerName = availableProviders[Math.floor(Math.random() * availableProviders.length)];
-      console.log(`Using random provider: ${providerName}`);
+      providerName = selectedProvider;
+      displayInfo(`Using random provider: ${import_chalk3.default.bold(providerName)}`);
     }
-    let provider;
-    const apiKey = providers[providerName];
-    if (!apiKey) {
-      console.error(`Error: API key for ${providerName} not found.`);
-      console.error(`Please set ${providerName.toUpperCase()}_KEY environment variable.`);
+    const result = getProviderInstance(providerName, providers);
+    if (!result) {
       process.exit(1);
     }
-    switch (providerName) {
-      case "unsplash":
-        provider = new UnsplashProvider(apiKey);
-        break;
-      case "pexels":
-        provider = new PexelsProvider(apiKey);
-        break;
-      case "pixabay":
-        provider = new PixabayProvider(apiKey);
-        break;
-      default:
-        console.error(`Error: Unknown provider "${providerName}"`);
-        console.error("Available providers: unsplash, pexels, pixabay, random");
-        process.exit(1);
-    }
+    const { provider, name } = result;
     const fetcher = new RandomImage(provider);
-    const fetchOptions = {};
-    if (options.query) fetchOptions.query = options.query;
-    if (options.width) fetchOptions.width = options.width;
-    if (options.height) fetchOptions.height = options.height;
-    if (options.quality) fetchOptions.quality = options.quality;
-    if (options.orientation) fetchOptions.orientation = options.orientation;
-    console.log("Fetching random image...");
-    const image = await fetcher.getRandom(fetchOptions);
-    console.log("\n\u2713 Image fetched successfully!");
-    console.log(`  URL: ${image.url}`);
-    console.log(`  Size: ${image.width}x${image.height}`);
-    console.log(`  Author: ${image.author}`);
-    if (image.authorUrl) console.log(`  Author URL: ${image.authorUrl}`);
-    console.log(`  Original: ${image.originalUrl}`);
+    const fetchOptions = buildFetchOptions(options);
+    const image = await fetchImage(fetcher, name, fetchOptions);
+    displayImageInfo(image, name);
     if (options.download !== void 0) {
-      const downloadPath = typeof options.download === "string" ? options.download : "./downloads";
-      console.log(`
-Downloading to ${path2.resolve(downloadPath)}...`);
-      const downloadOptions = {
-        overwrite: options.overwrite,
-        keepOriginalName: options.keepOriginalName
-      };
-      if (options.filename) {
-        downloadOptions.filename = options.filename;
-      }
-      const filePath = await fetcher.download(image, downloadPath, downloadOptions);
-      console.log(`\u2713 Downloaded: ${filePath}`);
+      const downloadPath = getDownloadPath(options);
+      const downloadOptions = buildDownloadOptions(options);
+      const filePath = await downloadImage(
+        fetcher,
+        image,
+        downloadPath,
+        downloadOptions
+      );
+      displayDownloadSuccess(filePath);
     }
   } catch (error) {
     if (error instanceof Error) {
-      console.error(`
-Error: ${error.message}`);
+      displayError(error.message);
     } else {
-      console.error("\nAn unexpected error occurred");
+      displayError("An unexpected error occurred");
     }
     process.exit(1);
   }

package/dist/cli.mjs

@@ -214,9 +214,9 @@ var init_image_fetcher = __esm({
           });
           const writer = fs.createWriteStream(fullPath);
           response.data.pipe(writer);
-          return new Promise((resolve, reject) => {
+          return new Promise((resolve3, reject) => {
             writer.on("finish", () => {
-              resolve(fullPath);
+              resolve3(fullPath);
             });
             writer.on("error", (err) => {
               fs.unlink(fullPath, () => {
@@ -267,106 +267,256 @@ var init_index = __esm({
   }
 });
 
-// src/cli.ts
-import { Command } from "commander";
+// src/cli/env-loader.ts
 import * as path2 from "path";
 import * as dotenv from "dotenv";
 import * as fs2 from "fs";
+function loadEnvironment() {
+  const possibleEnvPaths = [
+    path2.resolve(process.cwd(), ".env"),
+    // Current working directory
+    path2.resolve(__dirname, ".env"),
+    // Same directory as the CLI script (dist/)
+    path2.resolve(__dirname, "..", ".env")
+    // Parent directory (root of project)
+  ];
+  for (const envPath of possibleEnvPaths) {
+    if (fs2.existsSync(envPath)) {
+      dotenv.config({ path: envPath });
+      break;
+    }
+  }
+}
+function getApiKeys() {
+  return {
+    unsplash: process.env.UNSPLASH_KEY,
+    pexels: process.env.PEXELS_KEY,
+    pixabay: process.env.PIXABAY_KEY
+  };
+}
+var init_env_loader = __esm({
+  "src/cli/env-loader.ts"() {
+    "use strict";
+  }
+});
+
+// src/cli/display.ts
+import chalk from "chalk";
+import boxen from "boxen";
+function displayError(message) {
+  console.error(chalk.red(`
+\u274C ${message}`));
+}
+function displayInfo(message) {
+  console.log(chalk.blue(`
+\u2139\uFE0F  ${message}`));
+}
+function displayImageInfo(image, providerName) {
+  const content = [
+    `${chalk.bold("\u{1F3A8} Provider:")} ${chalk.cyan(providerName)}`,
+    `${chalk.bold("\u{1F4D0} Size:")} ${chalk.yellow(`${image.width}x${image.height}`)}`,
+    `${chalk.bold("\u{1F464} Author:")} ${chalk.magenta(image.author)}`,
+    image.authorUrl ? `${chalk.bold("\u{1F517} Author URL:")} ${chalk.gray(image.authorUrl)}` : "",
+    `${chalk.bold("\u{1F310} Original:")} ${chalk.gray(image.originalUrl)}`,
+    `${chalk.bold("\u{1F4F7} Image URL:")} ${chalk.gray(image.url)}`
+  ].filter(Boolean).join("\n");
+  console.log("\n" + boxen(content, {
+    padding: 1,
+    margin: 1,
+    borderStyle: "round",
+    borderColor: "green",
+    title: "\u{1F5BC}\uFE0F  Image Details",
+    titleAlignment: "center"
+  }));
+}
+function displayDownloadSuccess(filePath) {
+  const content = `${chalk.bold("\u{1F4C1} Saved to:")} ${chalk.cyan(filePath)}`;
+  console.log("\n" + boxen(content, {
+    padding: 1,
+    margin: 1,
+    borderStyle: "round",
+    borderColor: "blue",
+    title: "\u{1F4BE} Download Complete",
+    titleAlignment: "center"
+  }));
+}
+var init_display = __esm({
+  "src/cli/display.ts"() {
+    "use strict";
+  }
+});
+
+// src/cli/provider-manager.ts
+function selectRandomProvider(providers) {
+  const availableProviders = Object.entries(providers).filter(([_, key]) => key).map(([name]) => name);
+  if (availableProviders.length === 0) {
+    return null;
+  }
+  return availableProviders[Math.floor(Math.random() * availableProviders.length)];
+}
+function createProvider(providerName, apiKey) {
+  switch (providerName) {
+    case "unsplash":
+      return new UnsplashProvider(apiKey);
+    case "pexels":
+      return new PexelsProvider(apiKey);
+    case "pixabay":
+      return new PixabayProvider(apiKey);
+    default:
+      return null;
+  }
+}
+function getProviderInstance(providerName, providers) {
+  const name = providerName.toLowerCase();
+  const apiKey = providers[name];
+  if (!apiKey) {
+    displayError(`API key for ${providerName} not found.`);
+    console.log(`Please set ${providerName.toUpperCase()}_KEY environment variable.
+`);
+    return null;
+  }
+  const provider = createProvider(name, apiKey);
+  if (!provider) {
+    displayError(`Unknown provider "${providerName}"`);
+    console.log("Available providers: unsplash, pexels, pixabay, random\n");
+    return null;
+  }
+  return { provider, name };
+}
+var init_provider_manager = __esm({
+  "src/cli/provider-manager.ts"() {
+    "use strict";
+    init_index();
+    init_display();
+  }
+});
+
+// src/cli/options-builder.ts
+function buildFetchOptions(options) {
+  const fetchOptions = {};
+  if (options.query) fetchOptions.query = options.query;
+  if (options.width) fetchOptions.width = options.width;
+  if (options.height) fetchOptions.height = options.height;
+  if (options.quality) fetchOptions.quality = options.quality;
+  if (options.orientation) fetchOptions.orientation = options.orientation;
+  return fetchOptions;
+}
+function buildDownloadOptions(options) {
+  const downloadOptions = {
+    overwrite: options.overwrite,
+    keepOriginalName: options.keepOriginalName
+  };
+  if (options.filename) {
+    downloadOptions.filename = options.filename;
+  }
+  return downloadOptions;
+}
+function getDownloadPath(options) {
+  return typeof options.download === "string" ? options.download : "./downloads";
+}
+var init_options_builder = __esm({
+  "src/cli/options-builder.ts"() {
+    "use strict";
+  }
+});
+
+// src/cli/actions.ts
+import ora from "ora";
+import chalk2 from "chalk";
+import * as path3 from "path";
+async function fetchImage(fetcher, providerName, fetchOptions) {
+  const spinner = ora({
+    text: chalk2.cyan("\u{1F50D} Searching for the perfect image..."),
+    spinner: "dots"
+  }).start();
+  try {
+    const image = await fetcher.getRandom(fetchOptions);
+    spinner.succeed(chalk2.green("\u2728 Image found!"));
+    return image;
+  } catch (error) {
+    spinner.fail(chalk2.red("Failed to fetch image"));
+    throw error;
+  }
+}
+async function downloadImage(fetcher, image, downloadPath, downloadOptions) {
+  const resolvedPath = path3.resolve(downloadPath);
+  displayInfo(`Downloading to: ${chalk2.cyan(resolvedPath)}`);
+  const spinner = ora({
+    text: chalk2.cyan("\u{1F4BE} Downloading image..."),
+    spinner: "dots"
+  }).start();
+  try {
+    const filePath = await fetcher.download(image, downloadPath, downloadOptions);
+    spinner.succeed(chalk2.green("\u{1F4E6} Download complete!"));
+    return filePath;
+  } catch (error) {
+    spinner.fail(chalk2.red("Download failed"));
+    throw error;
+  }
+}
+var init_actions = __esm({
+  "src/cli/actions.ts"() {
+    "use strict";
+    init_display();
+  }
+});
+
+// src/cli.ts
+import { Command } from "commander";
+import chalk3 from "chalk";
 var require_cli = __commonJS({
   "src/cli.ts"() {
     init_index();
-    var possibleEnvPaths = [
-      path2.resolve(process.cwd(), ".env"),
-      // Current working directory
-      path2.resolve(__dirname, ".env"),
-      // Same directory as the CLI script (dist/)
-      path2.resolve(__dirname, "..", ".env")
-      // Parent directory (root of project)
-    ];
-    for (const envPath of possibleEnvPaths) {
-      if (fs2.existsSync(envPath)) {
-        dotenv.config({ path: envPath });
-        console.log(`Loaded environment from: ${envPath}`);
-        break;
-      }
-    }
+    init_env_loader();
+    init_display();
+    init_provider_manager();
+    init_options_builder();
+    init_actions();
+    loadEnvironment();
     var program = new Command();
-    program.name("random-image").description("CLI tool to fetch random images from various providers").version("1.2.0");
-    program.command("fetch").description("Fetch a random image from image providers").option("-q, --query <search>", "Search query for the image").option("-w, --width <number>", "Width of the image", parseInt).option("-h, --height <number>", "Height of the image", parseInt).option("--quality <number>", "Quality of the image (0-100)", parseInt).option("--orientation <type>", "Image orientation (landscape or portrait)").option("-p, --provider <name>", "Provider to use (unsplash, pexels, pixabay, or random)", "random").option("-d, --download [path]", "Download the image to specified directory (default: ./downloads)").option("--filename <name>", "Custom filename for downloaded image").option("--overwrite", "Overwrite existing files", false).option("--no-keep-original-name", "Generate random UUID filename instead of keeping original").action(async (options) => {
+    program.name("random-image").description("\u{1F3A8} CLI tool to fetch random images from various providers").version("1.2.0");
+    program.command("fetch").description("\u{1F5BC}\uFE0F  Fetch a random image from image providers").option("-q, --query <search>", "Search query for the image").option("-w, --width <number>", "Width of the image", parseInt).option("-h, --height <number>", "Height of the image", parseInt).option("--quality <number>", "Quality of the image (0-100)", parseInt).option("--orientation <type>", "Image orientation (landscape or portrait)").option("-p, --provider <name>", "Provider to use (unsplash, pexels, pixabay, or random)", "random").option("-d, --download [path]", "Download the image to specified directory (default: ./downloads)").option("--filename <name>", "Custom filename for downloaded image").option("--overwrite", "Overwrite existing files", false).option("--no-keep-original-name", "Generate random UUID filename instead of keeping original").action(async (options) => {
       try {
-        const providers = {
-          unsplash: process.env.UNSPLASH_KEY,
-          pexels: process.env.PEXELS_KEY,
-          pixabay: process.env.PIXABAY_KEY
-        };
+        const providers = getApiKeys();
         let providerName = options.provider.toLowerCase();
         if (providerName === "random") {
-          const availableProviders = Object.entries(providers).filter(([_, key]) => key).map(([name]) => name);
-          if (availableProviders.length === 0) {
-            console.error("Error: No API keys found in environment variables.");
-            console.error("Please set at least one of: UNSPLASH_KEY, PEXELS_KEY, PIXABAY_KEY");
+          const selectedProvider = selectRandomProvider(providers);
+          if (!selectedProvider) {
+            displayError("No API keys found in environment variables.");
+            console.log(chalk3.yellow("\n\u{1F4A1} Please set at least one of:"));
+            console.log(chalk3.cyan("   \u2022 UNSPLASH_KEY"));
+            console.log(chalk3.cyan("   \u2022 PEXELS_KEY"));
+            console.log(chalk3.cyan("   \u2022 PIXABAY_KEY\n"));
             process.exit(1);
           }
-          providerName = availableProviders[Math.floor(Math.random() * availableProviders.length)];
-          console.log(`Using random provider: ${providerName}`);
+          providerName = selectedProvider;
+          displayInfo(`Using random provider: ${chalk3.bold(providerName)}`);
         }
-        let provider;
-        const apiKey = providers[providerName];
-        if (!apiKey) {
-          console.error(`Error: API key for ${providerName} not found.`);
-          console.error(`Please set ${providerName.toUpperCase()}_KEY environment variable.`);
+        const result = getProviderInstance(providerName, providers);
+        if (!result) {
           process.exit(1);
         }
-        switch (providerName) {
-          case "unsplash":
-            provider = new UnsplashProvider(apiKey);
-            break;
-          case "pexels":
-            provider = new PexelsProvider(apiKey);
-            break;
-          case "pixabay":
-            provider = new PixabayProvider(apiKey);
-            break;
-          default:
-            console.error(`Error: Unknown provider "${providerName}"`);
-            console.error("Available providers: unsplash, pexels, pixabay, random");
-            process.exit(1);
-        }
+        const { provider, name } = result;
         const fetcher = new RandomImage(provider);
-        const fetchOptions = {};
-        if (options.query) fetchOptions.query = options.query;
-        if (options.width) fetchOptions.width = options.width;
-        if (options.height) fetchOptions.height = options.height;
-        if (options.quality) fetchOptions.quality = options.quality;
-        if (options.orientation) fetchOptions.orientation = options.orientation;
-        console.log("Fetching random image...");
-        const image = await fetcher.getRandom(fetchOptions);
-        console.log("\n\u2713 Image fetched successfully!");
-        console.log(`  URL: ${image.url}`);
-        console.log(`  Size: ${image.width}x${image.height}`);
-        console.log(`  Author: ${image.author}`);
-        if (image.authorUrl) console.log(`  Author URL: ${image.authorUrl}`);
-        console.log(`  Original: ${image.originalUrl}`);
+        const fetchOptions = buildFetchOptions(options);
+        const image = await fetchImage(fetcher, name, fetchOptions);
+        displayImageInfo(image, name);
         if (options.download !== void 0) {
-          const downloadPath = typeof options.download === "string" ? options.download : "./downloads";
-          console.log(`
-Downloading to ${path2.resolve(downloadPath)}...`);
-          const downloadOptions = {
-            overwrite: options.overwrite,
-            keepOriginalName: options.keepOriginalName
-          };
-          if (options.filename) {
-            downloadOptions.filename = options.filename;
-          }
-          const filePath = await fetcher.download(image, downloadPath, downloadOptions);
-          console.log(`\u2713 Downloaded: ${filePath}`);
+          const downloadPath = getDownloadPath(options);
+          const downloadOptions = buildDownloadOptions(options);
+          const filePath = await downloadImage(
+            fetcher,
+            image,
+            downloadPath,
+            downloadOptions
+          );
+          displayDownloadSuccess(filePath);
         }
       } catch (error) {
         if (error instanceof Error) {
-          console.error(`
-Error: ${error.message}`);
+          displayError(error.message);
         } else {
-          console.error("\nAn unexpected error occurred");
+          displayError("An unexpected error occurred");
         }
         process.exit(1);
       }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nghiavuive/random-image",
-  "version": "1.2.0",
+  "version": "1.2.1",
   "description": "Fetch random images from Unsplash, Pexels, and Pixabay with CLI support",
   "main": "./dist/index.js",
   "module": "./dist/index.mjs",
@@ -38,8 +38,11 @@
   },
   "dependencies": {
     "axios": "^1.13.4",
+    "boxen": "^8.0.1",
+    "chalk": "^5.6.2",
     "commander": "^12.1.0",
     "dotenv": "^17.2.3",
+    "ora": "^9.1.0",
     "uuid": "^13.0.0"
   },
   "bin": {