feat: migrate icon download from axios to fetch with enhanced timeout and error handling

Author: tw93

bin/helpers/merge.ts

@@ -8,7 +8,7 @@ import {
   generateIdentifierSafeName,
   getSafeAppName,
 } from '@/utils/name';
-import { PakeAppOptions, PlatformMap } from '@/types';
+import { PakeAppOptions, PlatformMap, WindowConfig } from '@/types';
 import { tauriConfigDirectory, npmDirectory } from '@/utils/dir';
 
 export async function mergeConfig(
@@ -81,7 +81,7 @@ export async function mergeConfig(
 
   const platformHideOnClose = hideOnClose ?? platform === 'darwin';
 
-  const tauriConfWindowOptions = {
+  const tauriConfWindowOptions: Partial<WindowConfig> = {
     width,
     height,
     fullscreen,
@@ -94,7 +94,7 @@ export async function mergeConfig(
     disabled_web_shortcuts: disabledWebShortcuts,
     hide_on_close: platformHideOnClose,
     incognito: incognito,
-    title: title || null,
+    title: title,
     enable_wasm: wasm,
     enable_drag_drop: enableDragDrop,
     start_to_tray: startToTray && showSystemTray,

bin/options/icon.ts

@@ -1,5 +1,4 @@
 import path from 'path';
-import axios from 'axios';
 import fsExtra from 'fs-extra';
 import chalk from 'chalk';
 import { dir } from 'tmp-promise';
@@ -456,27 +455,46 @@ export async function downloadIcon(
   showSpinner = true,
   customTimeout?: number,
 ): Promise<string | null> {
+  const controller = new AbortController();
+  const timeoutId = setTimeout(() => {
+    controller.abort();
+  }, customTimeout || 10000);
+
   try {
-    const response = await axios.get(iconUrl, {
-      responseType: 'arraybuffer',
-      timeout: customTimeout || 10000,
+    const response = await fetch(iconUrl, {
+      signal: controller.signal,
     });
 
-    const iconData = response.data;
-    if (!iconData || iconData.byteLength < ICON_CONFIG.minFileSize) return null;
+    clearTimeout(timeoutId);
+
+    if (!response.ok) {
+        if (response.status === 404 && !showSpinner) {
+            return null;
+        }
+        throw new Error(`HTTP ${response.status} ${response.statusText}`);
+    }
 
-    const fileDetails = await fileTypeFromBuffer(iconData);
+    const arrayBuffer = await response.arrayBuffer();
+
+    if (!arrayBuffer || arrayBuffer.byteLength < ICON_CONFIG.minFileSize) return null;
+
+    const fileDetails = await fileTypeFromBuffer(arrayBuffer);
     if (
       !fileDetails ||
       !ICON_CONFIG.supportedFormats.includes(fileDetails.ext as any)
     ) {
       return null;
     }
 
-    return await saveIconFile(iconData, fileDetails.ext);
+    return await saveIconFile(arrayBuffer, fileDetails.ext);
   } catch (error: unknown) {
-    if (showSpinner && !((error as any).response?.status === 404)) {
-      logger.error('Icon download failed!', error);
+    clearTimeout(timeoutId);
+    if (showSpinner) {
+      if (error instanceof Error && error.name === 'AbortError') {
+         logger.error('Icon download timed out!');
+      } else {
+         logger.error('Icon download failed!', error instanceof Error ? error.message : String(error));
+      }
     }
     return null;
   }

bin/types.ts

@@ -119,3 +119,44 @@ export interface PakeCliOptions {
 export interface PakeAppOptions extends PakeCliOptions {
   identifier: string;
 }
+
+export interface PlatformSpecific<T> {
+  macos: T;
+  linux: T;
+  windows: T;
+}
+
+export interface WindowConfig {
+  url: string;
+  hide_title_bar: boolean;
+  fullscreen: boolean;
+  maximize: boolean;
+  width: number;
+  height: number;
+  resizable: boolean;
+  url_type: string;
+  always_on_top: boolean;
+  dark_mode: boolean;
+  disabled_web_shortcuts: boolean;
+  activation_shortcut: string;
+  hide_on_close: boolean;
+  incognito: boolean;
+  title?: string;
+  enable_wasm: boolean;
+  enable_drag_drop: boolean;
+  start_to_tray: boolean;
+  force_internal_navigation: boolean;
+  zoom: number;
+  min_width: number;
+  min_height: number;
+  ignore_certificate_errors: boolean;
+}
+
+export interface PakeConfig {
+  windows: WindowConfig[];
+  user_agent: PlatformSpecific<string>;
+  system_tray: PlatformSpecific<boolean>;
+  system_tray_path: string;
+  proxy_url: string;
+  multi_instance: boolean;
+}

dist/cli.js

@@ -14,7 +14,6 @@ import http from 'http';
 import { promisify } from 'util';
 import fs from 'fs';
 import updateNotifier from 'update-notifier';
-import axios from 'axios';
 import { dir } from 'tmp-promise';
 import { fileTypeFromBuffer } from 'file-type';
 import icongen from 'icon-gen';
@@ -385,7 +384,7 @@ async function mergeConfig(url, options, tauriConf) {
         disabled_web_shortcuts: disabledWebShortcuts,
         hide_on_close: platformHideOnClose,
         incognito: incognito,
-        title: title || null,
+        title: title,
         enable_wasm: wasm,
         enable_drag_drop: enableDragDrop,
         start_to_tray: startToTray && showSystemTray,
@@ -1302,7 +1301,6 @@ var license = "MIT";
 var dependencies = {
 	"@tauri-apps/api": "^2.9.0",
 	"@tauri-apps/cli": "^2.9.0",
-	axios: "^1.12.2",
 	chalk: "^5.6.2",
 	commander: "^12.1.0",
 	execa: "^9.6.0",
@@ -1705,24 +1703,40 @@ async function tryGetFavicon(url, appName) {
  * Downloads icon from URL
  */
 async function downloadIcon(iconUrl, showSpinner = true, customTimeout) {
+    const controller = new AbortController();
+    const timeoutId = setTimeout(() => {
+        controller.abort();
+    }, customTimeout || 10000);
     try {
-        const response = await axios.get(iconUrl, {
-            responseType: 'arraybuffer',
-            timeout: customTimeout || 10000,
+        const response = await fetch(iconUrl, {
+            signal: controller.signal,
         });
-        const iconData = response.data;
-        if (!iconData || iconData.byteLength < ICON_CONFIG.minFileSize)
+        clearTimeout(timeoutId);
+        if (!response.ok) {
+            if (response.status === 404 && !showSpinner) {
+                return null;
+            }
+            throw new Error(`HTTP ${response.status} ${response.statusText}`);
+        }
+        const arrayBuffer = await response.arrayBuffer();
+        if (!arrayBuffer || arrayBuffer.byteLength < ICON_CONFIG.minFileSize)
             return null;
-        const fileDetails = await fileTypeFromBuffer(iconData);
+        const fileDetails = await fileTypeFromBuffer(arrayBuffer);
         if (!fileDetails ||
             !ICON_CONFIG.supportedFormats.includes(fileDetails.ext)) {
             return null;
         }
-        return await saveIconFile(iconData, fileDetails.ext);
+        return await saveIconFile(arrayBuffer, fileDetails.ext);
     }
     catch (error) {
-        if (showSpinner && !(error.response?.status === 404)) {
-            logger.error('Icon download failed!', error);
+        clearTimeout(timeoutId);
+        if (showSpinner) {
+            if (error instanceof Error && error.name === 'AbortError') {
+                logger.error('Icon download timed out!');
+            }
+            else {
+                logger.error('Icon download failed!', error instanceof Error ? error.message : String(error));
+            }
         }
         return null;
     }

package.json

@@ -52,7 +52,6 @@
   "dependencies": {
     "@tauri-apps/api": "^2.9.0",
     "@tauri-apps/cli": "^2.9.0",
-    "axios": "^1.12.2",
     "chalk": "^5.6.2",
     "commander": "^12.1.0",
     "execa": "^9.6.0",