ubersearch 1.7.0 → 1.7.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ubersearch",
-  "version": "1.7.0",
+  "version": "1.7.1",
   "module": "src/index.ts",
   "type": "module",
   "bin": {

package/providers/searxng/.env.example

@@ -2,7 +2,7 @@
 # Copy this file to .env and update values
 
 # Secret key for SearXNG (generate with: openssl rand -hex 32)
-SEARXNG_SECRET_KEY=your-secret-key-here
+SEARXNG_SECRET=your-secret-key-here
 
 # API key for ubersearch integration
 # Generate with: openssl rand -hex 16

package/src/bootstrap/container.ts

@@ -9,6 +9,7 @@ import type { EngineConfig, UberSearchConfig } from "../config/types";
 import { type Container, container } from "../core/container";
 import { CreditManager } from "../core/credits";
 import { FileCreditStateProvider } from "../core/credits/FileCreditStateProvider";
+import { getErrorMessage } from "../core/errorUtils";
 import { createLogger } from "../core/logger";
 import { UberSearchOrchestrator } from "../core/orchestrator";
 import type { SearchProvider } from "../core/provider";
@@ -103,8 +104,8 @@ export async function bootstrapContainer(
         registry.register(provider);
         log.debug(`Registered provider: ${engineConfig.id}`);
       } catch (error) {
-        const errorMsg = error instanceof Error ? error.message : String(error);
-        log.debug(`Failed to register provider ${engineConfig.id}: ${errorMsg}`);
+        const errorMsg = getErrorMessage(error);
+        log.warn(`Failed to register provider ${engineConfig.id}: ${errorMsg}`);
         failedProviders.push(engineConfig.id);
       }
     }

package/src/cli.ts

@@ -6,10 +6,11 @@
  */
 
 import { bootstrapContainer } from "./bootstrap/container";
+import { getErrorMessage } from "./core/errorUtils";
 import type { ProviderRegistry } from "./core/provider";
 import { ServiceKeys } from "./core/serviceKeys";
 import { serve as serveMcp } from "./mcp-server";
-import { isLifecycleProvider } from "./plugin/types.js";
+import { isLifecycleProvider } from "./plugin/types";
 import type { UberSearchOutput } from "./tool/interface";
 import { getCreditStatus, uberSearch } from "./tool/uberSearchTool";
 
@@ -102,12 +103,6 @@ if (args[0] === "health") {
   process.exit(0);
 }
 
-// MCP server command
-if (args[0] === "mcp") {
-  await serveMcp();
-  process.exit(0);
-}
-
 // Parse options
 const options = {
   json: args.includes("--json"),
@@ -214,7 +209,7 @@ async function main() {
       printHumanReadable(result);
     }
   } catch (error) {
-    console.error("Search failed:", error instanceof Error ? error.message : String(error));
+    console.error("Search failed:", getErrorMessage(error));
     process.exit(1);
   }
 }
@@ -333,7 +328,7 @@ async function runHealthChecks(configPath?: string) {
           });
           console.log(`✓ ${engineId.padEnd(15)} Healthy`);
         } catch (error) {
-          const message = error instanceof Error ? error.message : String(error);
+          const message = getErrorMessage(error);
           results.push({
             engineId,
             status: "unhealthy",
@@ -367,7 +362,7 @@ async function runHealthChecks(configPath?: string) {
 
     console.log();
   } catch (error) {
-    console.error("Health check failed:", error instanceof Error ? error.message : String(error));
+    console.error("Health check failed:", getErrorMessage(error));
     process.exit(1);
   }
 }
@@ -403,10 +398,7 @@ async function showCredits(configPath?: string) {
 
     console.log();
   } catch (error) {
-    console.error(
-      "Failed to load credits:",
-      error instanceof Error ? error.message : String(error),
-    );
+    console.error("Failed to load credits:", getErrorMessage(error));
     process.exit(1);
   }
 }

package/src/config/load.ts

@@ -14,6 +14,7 @@
 import { existsSync, readFileSync } from "node:fs";
 import { homedir } from "node:os";
 import { dirname, isAbsolute, join } from "node:path";
+import { getErrorMessage } from "../core/errorUtils";
 import { getBundledSearxngComposePath } from "../core/paths";
 import { PluginRegistry, registerBuiltInPlugins } from "../plugin";
 import type { ConfigFactory, ExtendedSearchConfig } from "./defineConfig";
@@ -89,7 +90,10 @@ async function loadTypeScriptConfig(path: string): Promise<ExtendedSearchConfig>
     const configOrFactory = module.default ?? module.config;
 
     if (!configOrFactory) {
-      throw new Error(`Config file must export a default configuration or named 'config' export`);
+      throw new Error(
+        `Config file at ${path} must export a config object as 'default' or 'config'. ` +
+          `Found exports: ${Object.keys(module).join(", ") || "none"}`,
+      );
     }
 
     // Handle factory functions (async config)
@@ -99,9 +103,7 @@ async function loadTypeScriptConfig(path: string): Promise<ExtendedSearchConfig>
 
     return configOrFactory as ExtendedSearchConfig;
   } catch (error) {
-    throw new Error(
-      `Failed to load TypeScript config from ${path}: ${error instanceof Error ? error.message : String(error)}`,
-    );
+    throw new Error(`Failed to load TypeScript config from ${path}: ${getErrorMessage(error)}`);
   }
 }
 
@@ -201,12 +203,11 @@ function getDefaultConfig(): ExtendedSearchConfig {
     type: "searchxng",
     enabled: true,
     displayName: "SearXNG (Local)",
-    apiKeyEnv: "SEARXNG_API_KEY",
     endpoint: "http://localhost:8888/search",
     composeFile,
     containerName: "searxng",
     healthEndpoint: "http://localhost:8888/healthz",
-    defaultLimit: 15,
+    defaultLimit: 10,
     monthlyQuota: 10000,
     creditCostPerSearch: 0,
     lowCreditThresholdPercent: 80,
@@ -225,7 +226,7 @@ function getDefaultConfig(): ExtendedSearchConfig {
       displayName: "Brave Search",
       apiKeyEnv: "BRAVE_API_KEY",
       endpoint: "https://api.search.brave.com/res/v1/web/search",
-      defaultLimit: 15,
+      defaultLimit: 10,
       monthlyQuota: 2000,
       creditCostPerSearch: 1,
       lowCreditThresholdPercent: 80,
@@ -284,9 +285,7 @@ export async function loadConfig(
           rawConfig = loadJsonConfig(path);
         }
       } catch (error) {
-        throw new Error(
-          `Failed to load config file at ${path}: ${error instanceof Error ? error.message : String(error)}`,
-        );
+        throw new Error(`Failed to load config file at ${path}: ${getErrorMessage(error)}`);
       }
 
       // Resolve relative paths (like composeFile) to absolute paths
@@ -359,9 +358,7 @@ export function loadConfigSync(
       try {
         rawConfig = loadJsonConfig(path);
       } catch (error) {
-        throw new Error(
-          `Failed to parse config file at ${path}: ${error instanceof Error ? error.message : String(error)}`,
-        );
+        throw new Error(`Failed to parse config file at ${path}: ${getErrorMessage(error)}`);
       }
 
       // Resolve relative paths (like composeFile) to absolute paths

package/src/config/validation.ts

@@ -73,7 +73,28 @@ export const UberSearchConfigSchema = z
       })
       .optional(),
   })
-  .passthrough();
+  .passthrough()
+  .refine(
+    (config) => {
+      const ids = config.engines.map((e: { id: string }) => e.id);
+      return new Set(ids).size === ids.length;
+    },
+    {
+      message: "Duplicate engine IDs found in engines array",
+    },
+  )
+  .refine(
+    (config) => {
+      if (!config.defaultEngineOrder) {
+        return true;
+      }
+      const engineIds = new Set(config.engines.map((e: { id: string }) => e.id));
+      return config.defaultEngineOrder.every((id: string) => engineIds.has(id));
+    },
+    {
+      message: "defaultEngineOrder contains engine IDs not defined in engines array",
+    },
+  );
 
 // CLI input schema
 export const CliInputSchema = z.object({

package/src/core/credits/FileCreditStateProvider.ts

@@ -112,7 +112,7 @@ export class FileCreditStateProvider implements CreditStateProvider {
       // Write file using Bun's async API
       await Bun.write(this.statePath, JSON.stringify(state, null, 2));
     } catch (error) {
-      log.warn(`Failed to save credit state to ${this.statePath}:`, error);
+      log.error(`Failed to save credit state to ${this.statePath}:`, error);
     }
   }
 

package/src/core/docker/dockerComposeHelper.ts

@@ -6,7 +6,7 @@
 
 import { execFile } from "node:child_process";
 import { existsSync, readFileSync, writeFileSync } from "node:fs";
-import { join } from "node:path";
+import { dirname, join } from "node:path";
 import { promisify } from "node:util";
 import { getSearxngPaths } from "../paths";
 
@@ -30,7 +30,8 @@ function getSearxngSecret(configDir: string): string {
   }
 
   // Generate a new secret using crypto
-  const secret = [...Array(64)].map(() => Math.floor(Math.random() * 16).toString(16)).join("");
+  const bytes = crypto.getRandomValues(new Uint8Array(32));
+  const secret = [...bytes].map((b) => b.toString(16).padStart(2, "0")).join("");
   try {
     writeFileSync(secretFile, secret, { mode: 0o600 });
   } catch {
@@ -69,7 +70,9 @@ export class DockerComposeHelper {
         cwd,
         timeout,
         env: {
-          ...process.env,
+          PATH: process.env.PATH,
+          HOME: process.env.HOME,
+          DOCKER_HOST: process.env.DOCKER_HOST,
           SEARXNG_CONFIG: configDir,
           SEARXNG_DATA: dataDir,
           SEARXNG_SECRET: getSearxngSecret(configDir),
@@ -105,7 +108,7 @@ export class DockerComposeHelper {
    * Get directory containing compose file
    */
   private getComposeDir(): string {
-    return require("node:path").dirname(this.composeFile);
+    return dirname(this.composeFile);
   }
 
   /**
@@ -173,13 +176,19 @@ export class DockerComposeHelper {
   async isRunning(service?: string, options?: DockerComposeOptions): Promise<boolean> {
     try {
       const output = await this.ps(options);
+      const lines = output.split("\n").filter((l) => l.trim());
 
       if (service) {
-        return output.includes(service) && !output.includes("Exit");
+        return lines.some((line) => {
+          const lower = line.toLowerCase();
+          return (
+            lower.includes(service.toLowerCase()) && /\bup\b/i.test(line) && !/exit/i.test(line)
+          );
+        });
       }
 
       // Check if any services are running
-      return output.includes("Up");
+      return lines.some((line) => /\bup\b/i.test(line));
     } catch (_error) {
       return false;
     }

package/src/core/docker/dockerLifecycleManager.ts

@@ -20,6 +20,7 @@
  * ```
  */
 
+import { getErrorMessage } from "../errorUtils";
 import { createLogger } from "../logger";
 import { bootstrapSearxngConfig } from "../paths";
 import { DockerComposeHelper } from "./dockerComposeHelper";
@@ -71,7 +72,7 @@ export class DockerLifecycleManager {
       }
 
       this.initPromise = this.performInit().catch((error) => {
-        const message = error instanceof Error ? error.message : String(error);
+        const message = getErrorMessage(error);
         log.debug("Initialization failed:", message);
         this.initialized = false;
         throw error;
@@ -88,11 +89,19 @@ export class DockerLifecycleManager {
     timeoutMs: number,
     operation: string,
   ): Promise<T> {
+    let timeoutId: ReturnType<typeof setTimeout> | undefined;
     const timeoutPromise = new Promise<never>((_, reject) => {
-      setTimeout(() => reject(new Error(`${operation} timed out after ${timeoutMs}ms`)), timeoutMs);
+      timeoutId = setTimeout(
+        () => reject(new Error(`${operation} timed out after ${timeoutMs}ms`)),
+        timeoutMs,
+      );
     });
 
-    return Promise.race([promise, timeoutPromise]);
+    try {
+      return await Promise.race([promise, timeoutPromise]);
+    } finally {
+      clearTimeout(timeoutId);
+    }
   }
 
   private async performInit(): Promise<void> {
@@ -141,7 +150,7 @@ export class DockerLifecycleManager {
 
       this.initialized = true;
     } catch (error) {
-      const message = error instanceof Error ? error.message : String(error);
+      const message = getErrorMessage(error);
       log.debug("Failed to start container:", message);
       throw error;
     } finally {
@@ -171,8 +180,11 @@ export class DockerLifecycleManager {
         if (response.ok) {
           return true;
         }
-      } catch {
-        // Health endpoint failed, fall through to Docker check
+        log.debug(`Health endpoint returned non-ok status: ${response.status}`);
+      } catch (error) {
+        const msg = getErrorMessage(error);
+        log.debug(`Health endpoint check failed: ${msg}`);
+        // Fall through to Docker status check
       } finally {
         clearTimeout(timeoutId);
       }
@@ -243,7 +255,7 @@ export class DockerLifecycleManager {
       );
       log.debug("Container stopped.");
     } catch (error) {
-      const message = error instanceof Error ? error.message : String(error);
+      const message = getErrorMessage(error);
       log.debug("Failed to stop container:", message);
       // Don't throw on shutdown errors
     }
@@ -306,7 +318,7 @@ export class DockerLifecycleManager {
         const projectRoot = this.config.projectRoot || process.cwd();
         await this.dockerHelper.ps({ cwd: projectRoot });
       } catch (error: unknown) {
-        const message = error instanceof Error ? error.message : String(error);
+        const message = getErrorMessage(error);
         if (message.includes("config")) {
           errors.push(`Invalid compose file: ${message}`);
         }
@@ -357,7 +369,7 @@ export class DockerLifecycleManager {
         cwd: projectRoot,
       });
     } catch (error) {
-      const message = error instanceof Error ? error.message : String(error);
+      const message = getErrorMessage(error);
       log.debug("Error checking if container is running:", message);
       return false;
     }

package/src/core/errorUtils.ts

@@ -0,0 +1,6 @@
+/**
+ * Safely extracts an error message from an unknown error value.
+ */
+export function getErrorMessage(error: unknown): string {
+  return error instanceof Error ? error.message : String(error);
+}

package/src/core/orchestrator.ts

@@ -7,32 +7,11 @@
 import type { UberSearchConfig } from "../config/types";
 import type { CreditManager, CreditSnapshot } from "./credits";
 import type { ProviderRegistry } from "./provider";
-import type { StrategyContext } from "./strategy/ISearchStrategy";
+import type { EngineAttempt, StrategyContext, UberSearchOptions } from "./strategy/ISearchStrategy";
 import { StrategyFactory } from "./strategy/StrategyFactory";
 import type { EngineId, SearchResultItem } from "./types";
 
-export interface UberSearchOptions {
-  /** Override the default engine order */
-  engineOrderOverride?: EngineId[];
-
-  /** Maximum results per provider */
-  limit?: number;
-
-  /** Include raw provider responses */
-  includeRaw?: boolean;
-
-  /** Search strategy */
-  strategy?: "all" | "first-success";
-
-  /** SearXNG categories to search (e.g., ["general", "it", "science"]) */
-  categories?: string[];
-}
-
-export interface EngineAttempt {
-  engineId: EngineId;
-  success: boolean;
-  reason?: string;
-}
+export type { UberSearchOptions, EngineAttempt };
 
 export interface OrchestratorResult {
   /** Original query */
@@ -89,11 +68,6 @@ export class UberSearchOrchestrator {
     // Execute strategy
     const { results, attempts } = await strategy.execute(query, order, options, context);
 
-    // For 'all' strategy, sort results by score (descending)
-    if (strategyName === "all") {
-      results.sort((a, b) => (b.score ?? 0) - (a.score ?? 0));
-    }
-
     // Get credit snapshots
     const credits = this.credits.listSnapshots();
 

package/src/core/paths.ts

@@ -5,7 +5,7 @@
  * https://specifications.freedesktop.org/basedir-spec/basedir-spec-latest.html
  */
 
-import { copyFileSync, existsSync, mkdirSync } from "node:fs";
+import { existsSync, mkdirSync, readFileSync, writeFileSync } from "node:fs";
 import { homedir } from "node:os";
 import { dirname, join, resolve } from "node:path";
 import { fileURLToPath } from "node:url";
@@ -170,11 +170,6 @@ export function bootstrapSearxngConfig(): boolean {
   const { configDir } = getSearxngPaths();
   const targetSettings = join(configDir, "settings.yml");
 
-  // If settings already exist, don't overwrite
-  if (existsSync(targetSettings)) {
-    return false;
-  }
-
   const defaultSettings = getDefaultSettingsPath();
 
   // If default settings don't exist, we can't bootstrap
@@ -186,12 +181,16 @@ export function bootstrapSearxngConfig(): boolean {
     return false;
   }
 
-  // Copy default settings to XDG config dir
+  // Use exclusive flag to prevent TOCTOU race and avoid overwriting
   try {
-    copyFileSync(defaultSettings, targetSettings);
+    const content = readFileSync(defaultSettings);
+    writeFileSync(targetSettings, content, { flag: "wx" });
     console.log(`[SearXNG] Bootstrapped default config to ${targetSettings}`);
     return true;
   } catch (error) {
+    if ((error as NodeJS.ErrnoException)?.code === "EEXIST") {
+      return false; // File already exists, no action needed
+    }
     console.error(`[SearXNG] Failed to bootstrap config:`, error);
     return false;
   }

package/src/core/provider.ts

@@ -23,20 +23,7 @@ export interface SearchProvider {
   getMissingConfigMessage(): string;
 }
 
-/**
- * Interface for providers that manage lifecycle (init, healthcheck, shutdown)
- */
-export interface ILifecycleProvider {
-  init(): Promise<void>;
-  healthcheck(): Promise<boolean>;
-  shutdown(): Promise<void>;
-  validateConfig(): Promise<{
-    valid: boolean;
-    errors: string[];
-    warnings: string[];
-  }>;
-  isLifecycleManaged(): boolean;
-}
+export type { ILifecycleProvider } from "./provider/ILifecycleProvider";
 
 /**
  * Registry to manage all available providers

package/src/core/retry.ts

@@ -0,0 +1,102 @@
+/**
+ * Retry Logic for Provider Operations
+ *
+ * Provides exponential backoff retry functionality for resilient
+ * provider operations
+ */
+
+import type { EngineId } from "./types";
+import { SearchError } from "./types";
+
+/**
+ * Retry configuration
+ */
+export interface RetryConfig {
+  /** Maximum number of retry attempts */
+  maxAttempts?: number;
+
+  /** Initial delay between retries in milliseconds */
+  initialDelayMs?: number;
+
+  /** Multiplier for exponential backoff */
+  backoffMultiplier?: number;
+
+  /** Maximum delay between retries in milliseconds */
+  maxDelayMs?: number;
+
+  /** Whether to retry on specific error types */
+  retryableErrors?: Array<"network_error" | "api_error" | "rate_limit" | "no_results" | "timeout">;
+}
+
+/**
+ * Default retry configuration
+ */
+export const DEFAULT_RETRY_CONFIG: Required<RetryConfig> = {
+  maxAttempts: 3,
+  initialDelayMs: 1000,
+  backoffMultiplier: 2,
+  maxDelayMs: 10000,
+  retryableErrors: ["network_error", "api_error", "rate_limit", "no_results"],
+};
+
+/**
+ * Execute a function with retry logic and exponential backoff
+ *
+ * @param engineId - Engine ID for error messages
+ * @param fn - Function to execute with retry logic
+ * @param config - Retry configuration
+ * @returns Result of the function
+ * @throws SearchError if all retry attempts fail
+ */
+export async function withRetry<T>(
+  engineId: EngineId,
+  fn: () => Promise<T>,
+  config: RetryConfig = {},
+): Promise<T> {
+  // Skip retries in test environment to avoid timeouts
+  if (process.env.DISABLE_RETRY === "true") {
+    return fn();
+  }
+
+  const {
+    maxAttempts = DEFAULT_RETRY_CONFIG.maxAttempts,
+    initialDelayMs = DEFAULT_RETRY_CONFIG.initialDelayMs,
+    backoffMultiplier = DEFAULT_RETRY_CONFIG.backoffMultiplier,
+    maxDelayMs = DEFAULT_RETRY_CONFIG.maxDelayMs,
+    retryableErrors = DEFAULT_RETRY_CONFIG.retryableErrors,
+  } = config;
+
+  let lastError: unknown;
+  let delay = initialDelayMs;
+
+  for (let attempt = 1; attempt <= maxAttempts; attempt++) {
+    try {
+      return await fn();
+    } catch (error) {
+      lastError = error;
+
+      if (!(error instanceof SearchError)) {
+        throw error;
+      }
+
+      const shouldRetry = retryableErrors.includes(
+        error.reason as "network_error" | "api_error" | "rate_limit" | "no_results",
+      );
+
+      if (!shouldRetry || attempt >= maxAttempts) {
+        throw error;
+      }
+
+      const nextDelay = Math.min(delay * backoffMultiplier, maxDelayMs);
+
+      console.warn(
+        `[${engineId}] Attempt ${attempt}/${maxAttempts} failed: ${error.message}. Retrying in ${nextDelay}ms...`,
+      );
+
+      await new Promise((resolve) => setTimeout(resolve, nextDelay));
+      delay = nextDelay;
+    }
+  }
+
+  throw lastError;
+}