From 430e0fce8568484a7331d05fac65fd5f0efd7b2e Mon Sep 17 00:00:00 2001
From: Book-reader <thevoid@outlook.co.nz>
Date: Thu, 4 Sep 2025 21:35:20 +1200
Subject: [PATCH] reenable bing & google services in dockerfile, fix
 bingservice crash when proxies file is empty

---
 .gitignore              |  1 +
 bingservice/src/main.rs |  2 +-
 docker-compose.yml      | 49 ++++++++++++++++++++++-------------------
 3 files changed, 28 insertions(+), 24 deletions(-)

diff --git a/.gitignore b/.gitignore
index 344be0a..33daff8 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,3 +4,4 @@
 database
 database.bak
 .env
+proxies.txt
diff --git a/bingservice/src/main.rs b/bingservice/src/main.rs
index e8223fd..5fce86a 100644
--- a/bingservice/src/main.rs
+++ b/bingservice/src/main.rs
@@ -34,7 +34,7 @@ pub static PROXIES: Lazy<Vec<Proxy>> = Lazy::new(|| {
         let contents = std::fs::read_to_string(proxy_file);
         let mut proxies = vec![];
 
-        for line in contents.expect("FAILED TO READ FILE").lines() {
+        for line in contents.expect("FAILED TO READ FILE").lines().filter(|l| l.len() > 0) {
             proxies.push(Proxy::from_str(line).expect("INVALID PROXY"));
         }
 
diff --git a/docker-compose.yml b/docker-compose.yml
index 73cc7b1..d8d370d 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -46,28 +46,31 @@ services:
 #       dockerfile: Dockerfile.vorebot
 #     image: asklyphe/vorebot
 
-#   bingservice:
-#     restart: unless-stopped
-#     networks:
-#       - lyphenet
-#       - outer
-#     env_file: ".env"
-#     depends_on:
-#       - nats
-#     build:
-#       dockerfile: Dockerfile.bingservice
-#     image: asklyphe/bingservice
-#   googleservice:
-#     restart: unless-stopped
-#     networks:
-#       - lyphenet
-#     env_file: ".env"
-#     depends_on:
-#       - nats
-#       - bingservice
-#     build:
-#       dockerfile: Dockerfile.googleservice
-#     image: asklyphe/googleservice
+  bingservice:
+    restart: unless-stopped
+    networks:
+      - lyphenet
+      - outer
+    env_file: ".env"
+    depends_on:
+      - nats
+    build:
+      dockerfile: Dockerfile.bingservice
+    volumes:
+      - ./proxies.txt:/data/proxies.txt
+    image: asklyphe/bingservice
+  googleservice:
+    restart: unless-stopped
+    networks:
+      - lyphenet
+      - outer
+    env_file: ".env"
+    depends_on:
+      - nats
+      - bingservice
+    build:
+      dockerfile: Dockerfile.googleservice
+    image: asklyphe/googleservice
 
   nats:
     restart: unless-stopped
@@ -104,9 +107,9 @@ services:
       - "1235:81"
 
 networks:
+  outer:
   lyphenet:
     internal: true
-  outer:
 
 volumes:
   frontend_data: