From 9413d6588d83e62f8572541c29bc9063e7307e76 Mon Sep 17 00:00:00 2001
From: Boki <boki@stare.gg>
Date: Thu, 19 Jun 2025 23:57:20 -0400
Subject: [PATCH] small fixes

---
 apps/data-service/src/index.ts                   | 16 ++++++++++++++--
 .../src/providers/webshare.provider.ts           |  3 +++
 libs/config/config/default.json                  |  4 ++++
 libs/queue/src/queue.ts                          |  4 +++-
 4 files changed, 24 insertions(+), 3 deletions(-)

diff --git a/apps/data-service/src/index.ts b/apps/data-service/src/index.ts
index 19a89fd..917db16 100644
--- a/apps/data-service/src/index.ts
+++ b/apps/data-service/src/index.ts
@@ -147,16 +147,28 @@ async function initializeServices() {
             ...(scheduledJob.payload || {}),
           };
           
+          // Build job options from scheduled job config
+          const jobOptions = {
+            priority: scheduledJob.priority,
+            delay: scheduledJob.delay,
+            repeat: {
+              immediately: scheduledJob.immediately,
+            },
+          };
+          
           await queue.addScheduledJob(
             scheduledJob.operation,
             jobData,
-            scheduledJob.cronPattern
+            scheduledJob.cronPattern,
+            jobOptions
           );
           totalScheduledJobs++;
           logger.info('Scheduled job created', {
             handler: handlerName,
             operation: scheduledJob.operation,
-            cronPattern: scheduledJob.cronPattern
+            cronPattern: scheduledJob.cronPattern,
+            immediately: scheduledJob.immediately,
+            priority: scheduledJob.priority
           });
         }
       }
diff --git a/apps/data-service/src/providers/webshare.provider.ts b/apps/data-service/src/providers/webshare.provider.ts
index 6dcfb8f..6360b06 100644
--- a/apps/data-service/src/providers/webshare.provider.ts
+++ b/apps/data-service/src/providers/webshare.provider.ts
@@ -95,6 +95,7 @@ export const webShareProvider = {
 
 async function fetchProxiesFromWebShare(): Promise<string[] | null> {
   try {
+    // Try environment variables first, then fall back to config
     const apiKey = process.env.WEBSHARE_API_KEY;
     const apiUrl = process.env.WEBSHARE_API_URL;
 
@@ -102,6 +103,8 @@ async function fetchProxiesFromWebShare(): Promise<string[] | null> {
       logger.error('Missing WebShare configuration', {
         hasApiKey: !!apiKey,
         hasApiUrl: !!apiUrl,
+        envApiKey: process.env.WEBSHARE_API_KEY?.substring(0, 10) + '...',
+        envApiUrl: process.env.WEBSHARE_API_URL,
       });
       return null;
     }
diff --git a/libs/config/config/default.json b/libs/config/config/default.json
index 3a3c184..1b7310d 100644
--- a/libs/config/config/default.json
+++ b/libs/config/config/default.json
@@ -86,5 +86,9 @@
     "proxy": {
       "enabled": false
     }
+  },
+  "webshare": {
+    "apiKey": "",
+    "apiUrl": "https://proxy.webshare.io/api/v2/"
   }
 }
\ No newline at end of file
diff --git a/libs/queue/src/queue.ts b/libs/queue/src/queue.ts
index fa59123..78bbd1a 100644
--- a/libs/queue/src/queue.ts
+++ b/libs/queue/src/queue.ts
@@ -109,6 +109,7 @@ export class Queue {
         pattern: cronPattern,
         // Use job name as repeat key to prevent duplicates
         key: `${this.queueName}:${name}`,
+        ...options.repeat,
       },
     };
     
@@ -116,7 +117,8 @@ export class Queue {
       queueName: this.queueName, 
       jobName: name, 
       cronPattern,
-      repeatKey: scheduledOptions.repeat?.key
+      repeatKey: scheduledOptions.repeat?.key,
+      immediately: scheduledOptions.repeat?.immediately
     });
     
     return await this.bullQueue.add(name, data, scheduledOptions);