small fixes

apps/data-service/src/index.ts

@@ -251,5 +251,4 @@ startServer().catch(error => {
 
 logger.info('Data service startup initiated');
 
-// Export queue manager for providers
-export { queueManager };
+// Queue manager is available via QueueManager.getInstance() singleton pattern

apps/data-service/src/providers/ib.tasks.ts

@@ -108,7 +108,7 @@ export async function fetchSession(): Promise<Record<string, string> | undefined
   }
 }
 
-export async function fetchExchanges(sessionHeaders: Record<string, string>): Promise<unknown> {
+export async function fetchExchanges(sessionHeaders: Record<string, string>): Promise<unknown[] | null> {
   try {
     logger.info('🔍 Fetching exchanges with session headers...');
 
@@ -170,7 +170,7 @@ export async function fetchExchanges(sessionHeaders: Record<string, string>): Pr
 }
 
 // Fetch symbols from IB using the session headers
-export async function fetchSymbols(sessionHeaders: Record<string, string>): Promise<unknown> {
+export async function fetchSymbols(sessionHeaders: Record<string, string>): Promise<unknown[] | null> {
   try {
     logger.info('🔍 Fetching symbols with session headers...');
     // Configure the proxy
@@ -275,6 +275,8 @@ export async function fetchSymbols(sessionHeaders: Record<string, string>): Prom
     logger.info('Saved IB symbols to DB', {
       totalSymbols: symbols.length,
     });
+
+    return symbols;
     // logger.info('📤 Making request to exchange API...', {
     //   url: exchangeUrl,
     //   headerCount: Object.keys(requestHeaders).length,

apps/data-service/src/providers/proxy.tasks.ts

@@ -1,6 +1,8 @@
 import { createCache, type CacheProvider } from '@stock-bot/cache';
+import { getDatabaseConfig } from '@stock-bot/config';
 import { HttpClient, ProxyInfo } from '@stock-bot/http';
 import { getLogger } from '@stock-bot/logger';
+import { QueueManager } from '@stock-bot/queue';
 
 // Type definitions
 export interface ProxySource {
@@ -177,7 +179,9 @@ export async function initializeProxyResources(waitForCache = false): Promise<vo
   }
 
   logger = getLogger('proxy-tasks');
+  const databaseConfig = getDatabaseConfig();
   cache = createCache({
+    redisConfig: databaseConfig.dragonfly,
     keyPrefix: 'proxy:',
     ttl: PROXY_CONFIG.CACHE_TTL,
     enableMetrics: true,
@@ -309,10 +313,7 @@ async function updateProxyInCache(proxy: ProxyInfo, isWorking: boolean): Promise
 
 // Individual task functions
 export async function queueProxyFetch(): Promise<string> {
-  const { queueManager } = await import('../index');
-  if (!queueManager) {
-    throw new Error('Queue manager not initialized');
-  }
+  const queueManager = QueueManager.getInstance();
   const queue = queueManager.getQueue('proxy');
   const job = await queue.add('proxy-fetch', {
     handler: 'proxy',
@@ -327,10 +328,7 @@ export async function queueProxyFetch(): Promise<string> {
 }
 
 export async function queueProxyCheck(proxies: ProxyInfo[]): Promise<string> {
-  const { queueManager } = await import('../index');
-  if (!queueManager) {
-    throw new Error('Queue manager not initialized');
-  }
+  const queueManager = QueueManager.getInstance();
   const queue = queueManager.getQueue('proxy');
   const job = await queue.add('proxy-check', {
     handler: 'proxy',

apps/data-service/src/providers/qm.tasks.ts

@@ -1,6 +1,7 @@
 import { getRandomUserAgent } from '@stock-bot/http';
 import { getLogger } from '@stock-bot/logger';
 import { getMongoDBClient } from '@stock-bot/mongodb-client';
+import { QueueManager } from '@stock-bot/queue';
 import { getProxy } from './webshare.provider';
 
 // Shared instances (module-scoped, not global)
@@ -171,10 +172,7 @@ async function createAlphabetJobs(
   maxDepth: number
 ): Promise<{ success: boolean; symbolsFound: number; jobsCreated: number }> {
   try {
-    const { queueManager } = await import('../index');
-    if (!queueManager) {
-      throw new Error('Queue manager not initialized');
-    }
+    const queueManager = QueueManager.getInstance();
     const queue = queueManager.getQueue('qm');
     let jobsCreated = 0;
 
@@ -242,10 +240,7 @@ async function searchAndSpawnJobs(
 
     // If we have 50+ symbols and haven't reached max depth, spawn sub-jobs
     if (symbolCount >= 50 && depth < maxDepth) {
-      const { queueManager } = await import('../index');
-      if (!queueManager) {
-        throw new Error('Queue manager not initialized');
-      }
+      const queueManager = QueueManager.getInstance();
       const queue = queueManager.getQueue('qm');
 
       logger.info(`Spawning sub-jobs for prefix "${prefix}" (${symbolCount} >= 50 symbols)`);

apps/data-service/src/providers/webshare.provider.ts

@@ -2,7 +2,11 @@
  * WebShare Provider for proxy management
  */
 import { getLogger } from '@stock-bot/logger';
-import { handlerRegistry, createJobHandler, type HandlerConfigWithSchedule } from '@stock-bot/queue';
+import {
+  createJobHandler,
+  handlerRegistry,
+  type HandlerConfigWithSchedule,
+} from '@stock-bot/queue';
 
 const logger = getLogger('webshare-provider');
 
@@ -18,7 +22,7 @@ export function getProxy(): string | null {
 
   const proxy = proxies[currentProxyIndex];
   currentProxyIndex = (currentProxyIndex + 1) % proxies.length;
-  return proxy;
+  return proxy ?? null;
 }
 
 // Initialize and register the WebShare provider
@@ -97,7 +101,7 @@ async function fetchProxiesFromWebShare(): Promise<string[] | null> {
     // Get configuration from config system
     const { getConfig } = await import('@stock-bot/config');
     const config = getConfig();
-    
+
     // Get configuration from config system
     const apiKey = config.webshare?.apiKey;
     const apiUrl = config.webshare?.apiUrl;

apps/data-service/src/routes/market-data.routes.ts

@@ -3,7 +3,7 @@
  */
 import { Hono } from 'hono';
 import { getLogger } from '@stock-bot/logger';
-import { processItems, queueManager } from '../index';
+import { processItems, QueueManager } from '@stock-bot/queue';
 
 const logger = getLogger('market-data-routes');
 
@@ -16,9 +16,10 @@ marketDataRoutes.get('/api/live/:symbol', async c => {
 
   try {
     // Queue job for live data using Yahoo provider
-    const job = await queueManager.add('market-data-live', {
-      type: 'market-data-live',
-      provider: 'yahoo-finance',
+    const queueManager = QueueManager.getInstance();
+    const queue = queueManager.getQueue('yahoo-finance');
+    const job = await queue.add('live-data', {
+      handler: 'yahoo-finance',
       operation: 'live-data',
       payload: { symbol },
     });
@@ -46,9 +47,10 @@ marketDataRoutes.get('/api/historical/:symbol', async c => {
     const toDate = to ? new Date(to) : new Date(); // Now
 
     // Queue job for historical data using Yahoo provider
-    const job = await queueManager.add('market-data-historical', {
-      type: 'market-data-historical',
-      provider: 'yahoo-finance',
+    const queueManager = QueueManager.getInstance();
+    const queue = queueManager.getQueue('yahoo-finance');
+    const job = await queue.add('historical-data', {
+      handler: 'yahoo-finance',
       operation: 'historical-data',
       payload: {
         symbol,
@@ -94,13 +96,13 @@ marketDataRoutes.post('/api/process-symbols', async c => {
       useBatching,
     });
 
-    const result = await processItems(symbols, queueManager, {
+    const result = await processItems(symbols, provider, {
+      handler: provider,
+      operation,
       totalDelayHours,
       useBatching,
       batchSize,
       priority: 2,
-      provider,
-      operation,
       retries: 2,
       removeOnComplete: 5,
       removeOnFail: 10,