logicdn 1.0.395 → 1.0.399

package/logi.im/api/biz/friend.py

@@ -5,6 +5,7 @@ import time
 import json
 import shutil
 import random
+import subprocess
 from datetime import datetime
 from urllib.parse import urlsplit
 from concurrent.futures import ThreadPoolExecutor
@@ -14,30 +15,48 @@ from PIL import Image
 
 TIME_OUT = 20
 MAX_TRY = 3
+POOL_SIZE = 7
+PROXY = 'http://127.0.0.1:8888'
 USER_AGENT = 'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/91.0.4472.77 Safari/537.36'
-WHITE_LIST = ['imwen.cn', 'dianr.cn', 'noheart.cn',
-              'get233.com', 'zpblogs.cn', 'ax127.fun', 'xdym11235.com']
+# WHITE_LIST = ['imwen.cn', 'dianr.cn', 'noheart.cn',
+#               'get233.com', 'zpblogs.cn', 'ax127.fun', 'xdym11235.com']
+WHITE_LIST = ['cnblogs.com']
 TODAY = datetime.today().strftime('%Y-%m-%d')
 
 CONF_PATH = 'asset/data/friends.json'
 CONF_CACHED_PATH = 'asset/data/friends-cached.json'
 IMG_PATH = 'asset/img'
+NP_PATH = 'asset/bin/np'
 
 
 class FriendLinkDoctor:
     def __init__(self, init=False):
+        if sys.platform.startswith('linux'):
+            # os.system('ls -l')
+            os.system(f'chmod +x {NP_PATH}')
+            self.proxy_process = subprocess.Popen([NP_PATH, "baidu"])
+            os.system('curl -s -o /dev/null -x ' +
+                      PROXY + ' http://www.baidu.com')
+
         self.init = init
         conf = CONF_PATH if init else CONF_CACHED_PATH
 
         with open(conf, mode='r', encoding='utf-8') as f:
             self.friends = json.load(f)
 
+    def __del__(self):
+        if sys.platform.startswith('linux'):
+            self.proxy_process.terminate()
+            # self.proxy_process.kill()
+
     @staticmethod
     def get(url, **args):
         return requests.get(
             url,
             timeout=TIME_OUT,
-            headers={"User-Agent": USER_AGENT},
+            headers={'User-Agent': USER_AGENT,
+                     'X-Forwarded-For': '103.21.244.100'},
+            proxies={'http': PROXY, 'https': PROXY},
             **args
         )
 
@@ -154,7 +173,7 @@ class FriendLinkDoctor:
             )
 
     def concurrent_task(self, fn):
-        futures, pool = [], ThreadPoolExecutor(5)
+        futures, pool = [], ThreadPoolExecutor(POOL_SIZE)
         for friend in self.friends:
             futures.append(pool.submit(fn, friend))
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "logicdn",
-  "version": "1.0.395",
+  "version": "1.0.399",
   "description": "Static CDN for Personal Use",
   "main": "index.mjs",
   "repository": {