From d952950a6cbb882ff1e6127ecb2b8f7fb3ac4418 Mon Sep 17 00:00:00 2001
From: SovereigntyIsNotFreedom <SovereigntyIsNotFreedom@nowhere.moe>
Date: Sat, 22 Mar 2025 19:24:03 +0000
Subject: [PATCH] issue #36 - env variables: added the dotenv module and fixed
 requirements.txt

Since the .env file will be igonred you need to create a .env file in the root of the project. here are my variables TOR_HOST=socks5h://127.0.0.1 TOR_PORT=9050 WEBSOCKET_PORT=3030
---
 .gitignore               |  3 ++-
 SimpleX/main.py          |  8 +++++++-
 requirements.txt         |  2 ++
 scripts/lantern.py       | 12 +++++++++---
 scripts/uptimechecker.py | 11 +++++++++--
 5 files changed, 29 insertions(+), 7 deletions(-)

diff --git a/.gitignore b/.gitignore
index 811092d..73b66b1 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,5 @@
 .git
 www/participants/**
 scripts/__pycache__/**
-
+.env
+env/
\ No newline at end of file
diff --git a/SimpleX/main.py b/SimpleX/main.py
index e8caff1..60e2421 100644
--- a/SimpleX/main.py
+++ b/SimpleX/main.py
@@ -1,14 +1,20 @@
 from websockets.sync.client import connect
+from dotenv import load_dotenv
+
 import json
 import random
+import os
 
+load_dotenv()
 
+websocket_port = os.environ.get("WEBSOCKET_PORT")
+print(websocket_port)
 
 def is_simplex_link_valid(simplex_link: str) -> bool:
     """
     Connects to the group using the `simplex_link`. If the response contains error False will be returned else True.
     """
-    with connect("ws://localhost:3030") as websocket:
+    with connect(f"ws://localhost:{websocket_port}") as websocket:
         query = f"/c incognito {simplex_link}"
         command = {
             'corrId': f"id{random.randint(0,999999)}",
diff --git a/requirements.txt b/requirements.txt
index af698b3..cbf4a08 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -10,3 +10,5 @@ requests==2.32.3
 six==1.17.0
 tzdata==2025.1
 urllib3==2.3.0
+python-dotenv==1.0.1
+websockets==15.0.1
diff --git a/scripts/lantern.py b/scripts/lantern.py
index d36d1c0..15bc385 100644
--- a/scripts/lantern.py
+++ b/scripts/lantern.py
@@ -1,4 +1,5 @@
 from utils import *
+from dotenv import load_dotenv
 
 import os, pwd
 import pandas as pd
@@ -8,12 +9,17 @@ import time
 import urllib
 import sys
 
+load_dotenv()
+
+tor_host = os.environ.get("TOR_HOST")
+tor_port = os.environ.get("TOR_PORT")
+
 
 def main():
     #os.system('clear')
     proxies = {
-        'http': 'socks5h://127.0.0.1:9050',
-        'https': 'socks5h://127.0.0.1:9050'
+        'http': f'{tor_host}:{tor_port}',
+        'https': f'{tor_host}:{tor_port}'
     }
 
     rootpath='/srv/darknet-lantern/'
@@ -33,7 +39,7 @@ def main():
 		    # check if the directory exists
             if not os.path.isdir(participantdir):
 			    #if not, create it
-                print("Official participan ",line.strip() , "'s directory doesnt exist, creating it")
+                print("Official participant ",line.strip() , "'s directory doesnt exist, creating it")
                 os.makedirs(participantdir)
 
 
diff --git a/scripts/uptimechecker.py b/scripts/uptimechecker.py
index d1b929e..00d1a41 100644
--- a/scripts/uptimechecker.py
+++ b/scripts/uptimechecker.py
@@ -1,3 +1,5 @@
+from dotenv import load_dotenv
+
 import os,re,pwd
 import csv
 import requests
@@ -5,6 +7,11 @@ import json
 import pandas as pd
 import glob
 
+load_dotenv()
+
+tor_host = os.environ.get("TOR_HOST")
+tor_port = os.environ.get("TOR_PORT")
+
 #apt install python3-pandas python3-requests python3-socks
 
 def main():
@@ -36,8 +43,8 @@ def main():
 			return False
 	
 	proxies = {
-		'http': 'socks5h://127.0.0.1:9050',
-		'https': 'socks5h://127.0.0.1:9050'
+		'http': f'{tor_host}:{tor_port}',
+		'https': f'{tor_host}:{tor_port}'
 	}
 	
 	instancepath=rootpath+'www/participants/'+instance+'/'