From 38751f83febe1a72c8de6275844d0a6748d85755 Mon Sep 17 00:00:00 2001
From: Viren070 <viren070@protonmail.com>
Date: Sun, 20 Apr 2025 20:04:55 +0100
Subject: [PATCH] fix: remove default values for FORCE_COMET_* env vars

---
 packages/utils/src/settings.ts |  6 +++---
 packages/wrappers/src/comet.ts | 14 +++++++++-----
 2 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/packages/utils/src/settings.ts b/packages/utils/src/settings.ts
index 5cd06b79..f6df24dc 100644
--- a/packages/utils/src/settings.ts
+++ b/packages/utils/src/settings.ts
@@ -109,13 +109,13 @@ export class Settings {
     : ['dmm_public_hash_shares_only'];
   public static readonly FORCE_COMET_HOSTNAME = process.env.FORCE_COMET_HOSTNAME
     ? process.env.FORCE_COMET_HOSTNAME
-    : 'comet.elfhosted.com';
+    : null;
   public static readonly FORCE_COMET_PORT = process.env.FORCE_COMET_PORT
     ? process.env.FORCE_COMET_PORT
-    : '';
+    : null;
   public static readonly FORCE_COMET_PROTOCOL = process.env.FORCE_COMET_PROTOCOL
     ? process.env.FORCE_COMET_PROTOCOL
-    : 'https';
+    : null;
   public static readonly DEFAULT_COMET_TIMEOUT = process.env
     .DEFAULT_COMET_TIMEOUT
     ? parseInt(process.env.DEFAULT_COMET_TIMEOUT)
diff --git a/packages/wrappers/src/comet.ts b/packages/wrappers/src/comet.ts
index 0bd8ed63..376d1c85 100644
--- a/packages/wrappers/src/comet.ts
+++ b/packages/wrappers/src/comet.ts
@@ -32,12 +32,16 @@ export class Comet extends BaseWrapper {
     const parsedStream = super.parseStream(stream);
     if (stream.url && parsedStream.type === 'stream') {
       parsedStream.result.filename = stream.description?.split('\n')[0];
-      // force COMET_FORCE_HOSTNAME if provided
-      if (Settings.FORCE_COMET_HOSTNAME) {
+      if (
+        Settings.FORCE_COMET_HOSTNAME ||
+        Settings.FORCE_COMET_PORT ||
+        Settings.FORCE_COMET_PROTOCOL
+      ) {
+        // modify the URL according to settings, needed when using a local URL for requests but a public stream URL is needed.
         const url = new URL(stream.url);
-        url.hostname = Settings.FORCE_COMET_HOSTNAME;
-        url.port = Settings.FORCE_COMET_PORT;
-        url.protocol = Settings.FORCE_COMET_PROTOCOL;
+        url.protocol = Settings.FORCE_COMET_PROTOCOL || url.protocol;
+        url.hostname = Settings.FORCE_COMET_HOSTNAME || url.hostname;
+        url.port = Settings.FORCE_COMET_PORT || url.port;
         parsedStream.result.url = url.toString();
       }
     }