new lists, write lists to files instead of catching stdout

Author: maximko

.github/workflows/mullvad-socks.yml

@@ -27,17 +27,22 @@ jobs:
         git config user.email "${{ github.actor }}@users.noreply.github.com"
         git checkout list
         git pull
+        rm *.txt
+        echo "TAG_NAME=$(date +"%Y-%m-%dT%H-%M-%S")" >> $GITHUB_ENV
 
-    - name: Generate list
+    - name: Download and install script dependencies
       run: |
+        wget https://github.com/P3TERX/GeoLite.mmdb/raw/download/GeoLite2-City.mmdb
         pip3 install -r requirements.txt
-        python3 mullvad-socks-list.py > repo/mullvad-socks-list.txt
-        echo "TAG_NAME=$(date +"%Y-%m-%d_%H-%M-%S")" >> $GITHUB_ENV
+
+    - name: Generate list
+      run: |
+        python3 mullvad-socks-list.py
 
     - name: Push result to "list" branch
       run: |
         cd repo
-        git add mullvad-socks-list.txt
+        git add .
         git commit -m "${{ env.TAG_NAME }}"
         git push -u origin list
 
@@ -48,7 +53,7 @@ jobs:
       with:
         tag_name: ${{ env.TAG_NAME }}
         body: ${{ env.TAG_NAME }}
-        files: repo/mullvad-socks-list.txt
+        files: repo/*
 
     - name: Remove old Releases
       uses: dev-drprasad/delete-older-releases@v0.2.0

README.md

@@ -1,8 +1,12 @@
 # Mullvad socks proxy list
 [![Publish mullvad-socks-list.txt](https://github.com/maximko/mullvad-socks-list/actions/workflows/mullvad-socks.yml/badge.svg)](https://github.com/maximko/mullvad-socks-list/actions/workflows/mullvad-socks.yml)
 
-[LINK TO ACTUAL LIST](https://github.com/maximko/mullvad-socks-list/blob/list/mullvad-socks-list.txt) [[RAW](https://raw.githubusercontent.com/maximko/mullvad-socks-list/list/mullvad-socks-list.txt)]
+[ALL ACTIVE SOCKS DETAILED LIST](https://raw.githubusercontent.com/maximko/mullvad-socks-list/list/mullvad-socks-list.txt)
 
-This is a list of socks5 proxy servers usable in mullvad vpn network, as well as the script that generates this list. The script runs every day by github actions and pushes result to [list branch](https://github.com/maximko/mullvad-socks-list/tree/list).
+[Socks and ipv4_in list](https://raw.githubusercontent.com/maximko/mullvad-socks-list/list/socks-ipv4_in-list.txt)
+
+[Socks and timezone list](https://raw.githubusercontent.com/maximko/mullvad-socks-list/list/socks-timezone-list.txt)
+
+These are lists of socks5 proxy servers usable in mullvad vpn network, as well as the script that generates these lists. The script runs every day by github actions and pushes result to [list branch](https://github.com/maximko/mullvad-socks-list/tree/list).
 
 Please note that all socks dns names are resolved and this is a purpose of this project.

mullvad-socks-list.py

@@ -6,6 +6,7 @@
 from datetime import datetime,timezone
 from threading import Thread
 from queue import Queue
+import geoip2.database
 
 def resolver(queue, resolved, failed):
     resolver = pydig.Resolver(nameservers=['1.1.1.1'])
@@ -26,20 +27,31 @@ def resolver(queue, resolved, failed):
         #print("Left to resolve:", queue.qsize(), end="\r")
         queue.task_done()
 
+geoip2_reader = geoip2.database.Reader("GeoLite2-City.mmdb")
+
+def ip_to_timezone(ipv4):
+    global geoip2_reader
+    try:
+        response = geoip2_reader.city(ipv4)
+        timezone = response.location.time_zone
+        if timezone:
+            return timezone
+        else:
+            return None
+    except:
+        return None
+
 queue = Queue()
 resolved = {}
 failed = {}
 
-now_utc = datetime.now(timezone.utc)
-print('Date:', now_utc.strftime('%Y-%m-%d %H-%M-%S %Z'))
-
 r = requests.get('https://api.mullvad.net/www/relays/wireguard/').json()
 
 for host in r:
     if host['socks_name'] is not None and host['active']:
         queue.put(host['socks_name'])
 
-print("Total active proxies:", queue.qsize())
+total_proxies = queue.qsize()
 threads = []
 for i in range(0, 3):
     threads.append(Thread(target=resolver, args=(queue,resolved,failed), daemon=True))
@@ -48,48 +60,79 @@ def resolver(queue, resolved, failed):
 queue.join()
 
 good = PrettyTable()
-good.field_names = ["flag", "country", "city", "socks", "ip", "speed", "multihop", "owned", "provider", "hostname"]
+good.field_names = ["flag", "country", "city", "socks5", "ipv4", "ipv6", "speed", "multihop", "owned", "provider", "stboot", "hostname"]
 good.align = 'l'
 good.border = False
 
 bad = PrettyTable()
-bad.field_names = ["flag", "country", "city", "socks", "ip", "speed", "multihop", "owned", "provider", "hostname"]
+bad.field_names = ["flag", "country", "city", "socks5", "ipv4", "ipv6", "speed", "multihop", "owned", "provider", "stboot", "hostname"]
 bad.align = 'l'
 bad.border = False
 
+socks_ipv4_list = []
+socks_timezone_list = []
+
 for host in r:
     if host['socks_name'] is not None and host['active']:
+
         fl = flag.flag(host['country_code'])
         owned = '✔️' if host['owned'] else '❌'
+        stboot = '✔️' if host['stboot'] else '❌'
+
         if host['socks_name'] in resolved:
             socks_addr = resolved[host['socks_name']]
             good.add_row([fl,
                 host['country_name'],
                 host['city_name'],
                 socks_addr,
                 host['ipv4_addr_in'],
+                host['ipv6_addr_in'],
                 host['network_port_speed'],
                 host['multihop_port'],
                 owned,
                 host['provider'],
+                stboot,
                 host['hostname'],
             ])
+
+            # socks and ipv4 list
+            socks_ipv4_list.append('%s %s' % (socks_addr, host['ipv4_addr_in']))
+
+            # socks and timezone list
+            ip_timezone = ip_to_timezone(host['ipv4_addr_in'])
+            if ip_timezone:
+                socks_timezone_list.append(f'{socks_addr} {ip_timezone}')
+
         elif host['socks_name'] in failed:
             bad.add_row([fl,
                 host['country_name'],
                 host['city_name'],
                 host['socks_name'],
                 host['ipv4_addr_in'],
+                host['ipv6_addr_in'],
                 host['network_port_speed'],
                 host['multihop_port'],
                 owned,
                 host['provider'],
+                stboot,
                 host['hostname'],
             ])
         else:
             break
 
-print(good)
-if len(failed) > 0:
-    print('Failed to resovle:')
-    print(bad)
+with open('repo/mullvad-socks-list.txt', 'a') as file:
+    now_utc = datetime.now(timezone.utc)
+    file.write('Date: %s\n' % now_utc.strftime('%Y-%m-%d %H-%M-%S %Z'))
+    file.write('Total active proxies: %s\n' % total_proxies)
+    file.write(good.get_string()+ '\n')
+    if len(failed) > 0:
+        file.write('Failed to resovle:\n')
+        file.write(bad.get_string() + '\n')
+
+with open('repo/socks-ipv4_in-list.txt', 'a') as file:
+    for item in socks_ipv4_list:
+        file.write("%s\n" % item)
+
+with open('repo/socks-timezone-list.txt', 'a') as file:
+    for item in socks_timezone_list:
+        file.write("%s\n" % item)

requirements.txt

@@ -1,5 +1,5 @@
 emoji_country_flag==1.3.1
-flag==0.1.1
 prettytable==3.3.0
 pydig==0.4.0
 requests==2.28.1
+geoip2==4.6.0