logicdn 1.0.469 → 1.0.473

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

@@ -1,228 +1,231 @@
-import os
-import io
-import sys
-import time
-import json
-import shutil
-import random
-import subprocess
-from datetime import datetime
-from urllib.parse import urlsplit
-from concurrent.futures import ThreadPoolExecutor
-
-import requests
-from PIL import Image
-
-TIME_OUT = 20
-MAX_TRY = 3
-POOL_SIZE = 5
-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 = ['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,
-                     'X-Forwarded-For': '2606:4700::6810:85e5, 112.88.0.1, 162.158.0.1'},
-            proxies={'http': PROXY, 'https': PROXY},
-            **args
-        )
-
-    """                 
-    msg = str(e)
-    if msg.find('get local issuer certificate') > -1:
-        return True
-    elif msg.find('certificate has expired') > -1:
-        return fail()
-    elif msg.find('sslv3 alert handshake failure') > -1:
-        return fail()
-    elif msg.find('Connection reset by peer') > -1:
-        return fail()
-    elif msg.find('length mismatch') > -1:
-        return fail()
-    elif msg.find('doesn\'t match') > -1:
-        return fail()
-    elif msg.find('Temporary failure in name resolution') > -1:
-        return fail()
-    elif msg.find('No address associated with hostname') > -1:
-        return fail()
-    elif msg.find('Name or service not known') > -1:
-        return fail()
-    elif msg.find('getaddrinfo failed') > -1:
-        return fail()
-    print(e) 
-    """
-    @staticmethod
-    def try_your_best(fn, fail):
-        for _ in range(MAX_TRY):
-            try:
-                return fn()
-            except Exception as e:
-                msg = str(e)
-                if msg.find('get local issuer certificate') > -1:
-                    return True
-                # print(msg)
-                time.sleep(random.randint(5, 7))
-                pass
-
-        return fail()
-
-    @staticmethod
-    def save_image(friend):
-        requests.packages.urllib3.disable_warnings()
-        link = friend['link']
-        identity = urlsplit(link).netloc
-
-        def save():
-            resp = FriendLinkDoctor.get(friend['avatar'], verify=False)
-
-            path = urlsplit(friend['avatar']).path
-            if path.find('.') > 0:
-                suffix = path.split('.')[-1]
-            else:
-                suffix = resp.headers.get('content-type').split('/')[-1]
-                if suffix == 'jpeg':
-                    suffix = 'jpg'
-
-            name = f'{IMG_PATH}/{identity}.{suffix}'
-            img = Image.open(io.BytesIO(resp.content))
-            img.thumbnail((200, 200))
-            width, height = img.size   # Get dimensions
-
-            if width != height:
-                new_width = min(width, height)
-                left = round((width - new_width)/2)
-                top = round((height - new_width)/2)
-                x_right = round(width - new_width) - left
-                x_bottom = round(height - new_width) - top
-                right = width - x_right
-                bottom = height - x_bottom
-
-                # Crop the center of the image
-                img = img.crop((left, top, right, bottom))
-
-            img.save(name)
-            friend['avatar'] = name
-
-        def fail():
-            for img in os.listdir(IMG_PATH):
-                if img.find(identity) > -1:
-                    friend['avatar'] = f'{IMG_PATH}/{img}'
-                    print(f'failure, using cached file: {link}')
-                    return
-            print(f'failure: {link}')
-
-        FriendLinkDoctor.try_your_best(save, fail)
-        return friend
-
-    @staticmethod
-    def is_online(url):
-        url_404 = f'{url}/not-exists/be4b3658-2045-4468-8530-cc11c2145849'
-        error_text = 'www.beian.miit.gov.cn/state/outPortal/loginPortal.action'
-
-        def fail():
-            print(f'offline: {url}')
-            return False
-
-        def req():
-            if FriendLinkDoctor.get(url_404).text.find(error_text) == -1:
-                return True
-            return fail()
-
-        return FriendLinkDoctor.try_your_best(req, fail)
-
-    def save_config(self, results):
-        if self.init:
-            def retrieve_online_date(friend, old_result):
-                old_friend = list(
-                    filter(lambda old_friend: old_friend['link'] == friend['link'], old_result))
-                if len(old_friend) == 1 and 'lastOnlineDate' in old_friend[0]:
-                    friend['lastOnlineDate'] = old_friend[0]['lastOnlineDate']
-                return friend
-
-            with open(CONF_CACHED_PATH, mode='r', encoding='utf-8') as f:
-                old_result = json.load(f)
-                results = list(map(lambda friend: retrieve_online_date(
-                    friend, old_result), results))
-
-        with open(CONF_CACHED_PATH, mode='w', encoding='utf-8') as f:
-            json.dump(
-                results,
-                f,
-                ensure_ascii=False,
-                sort_keys=True,
-                indent=2
-            )
-
-    def concurrent_task(self, fn):
-        futures, pool = [], ThreadPoolExecutor(POOL_SIZE)
-        for friend in self.friends:
-            futures.append(pool.submit(fn, friend))
-
-        results = []
-        for future in futures:
-            results.append(future.result())
-
-        self.save_config(results)
-
-        return results
-
-    def check_boby(self):
-        def check(friend):
-            for host in WHITE_LIST:
-                if friend['link'].find(host) > 0:
-                    friend['lastOnlineDate'] = TODAY
-                    friend['untracked'] = True
-                    return friend
-
-            if self.is_online(friend['link']):
-                friend['lastOnlineDate'] = TODAY
-            return friend
-
-        return self.concurrent_task(check)
-
-    def get_images(self):
-        if os.path.exists(IMG_PATH):
-            shutil.copytree(IMG_PATH, IMG_PATH + '_copied')
-            # shutil.rmtree(IMG_PATH)
-        else:
-            os.mkdir(IMG_PATH)
-
-        self.concurrent_task(self.save_image)
-
-
-if __name__ == '__main__':
-    if len(sys.argv) != 1 and sys.argv[1] == 'init':
-        FriendLinkDoctor(init=True).get_images()
-    else:
-        FriendLinkDoctor().check_boby()
+import os
+import io
+import sys
+import time
+import json
+import shutil
+import random
+import subprocess
+from datetime import datetime
+from urllib.parse import urlsplit
+from concurrent.futures import ThreadPoolExecutor
+
+import requests
+from PIL import Image
+
+TIME_OUT = 20
+MAX_TRY = 3
+POOL_SIZE = 5
+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 = ['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/data/np'
+NP_URI = 'https://github.com/vcheckzen/normalize-http-proxy/raw/main/dist/np_linux_amd64'
+
+
+class FriendLinkDoctor:
+    def __init__(self, init=False):
+        if sys.platform.startswith('linux'):
+            # os.system('ls -l')
+            os.system(f'curl -s -o {NP_PATH} -L {NP_URI}')
+            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()
+            os.system(f'rm -f {NP_PATH}')
+            # self.proxy_process.kill()
+
+    @staticmethod
+    def get(url, **args):
+        return requests.get(
+            url,
+            timeout=TIME_OUT,
+            headers={'User-Agent': USER_AGENT,
+                     'X-Forwarded-For': '2606:4700::6810:85e5, 112.88.0.1, 162.158.0.1'},
+            proxies={'http': PROXY, 'https': PROXY},
+            **args
+        )
+
+    """                 
+    msg = str(e)
+    if msg.find('get local issuer certificate') > -1:
+        return True
+    elif msg.find('certificate has expired') > -1:
+        return fail()
+    elif msg.find('sslv3 alert handshake failure') > -1:
+        return fail()
+    elif msg.find('Connection reset by peer') > -1:
+        return fail()
+    elif msg.find('length mismatch') > -1:
+        return fail()
+    elif msg.find('doesn\'t match') > -1:
+        return fail()
+    elif msg.find('Temporary failure in name resolution') > -1:
+        return fail()
+    elif msg.find('No address associated with hostname') > -1:
+        return fail()
+    elif msg.find('Name or service not known') > -1:
+        return fail()
+    elif msg.find('getaddrinfo failed') > -1:
+        return fail()
+    print(e) 
+    """
+    @staticmethod
+    def try_your_best(fn, fail):
+        for _ in range(MAX_TRY):
+            try:
+                return fn()
+            except Exception as e:
+                msg = str(e)
+                if msg.find('get local issuer certificate') > -1:
+                    return True
+                # print(msg)
+                time.sleep(random.randint(5, 7))
+                pass
+
+        return fail()
+
+    @staticmethod
+    def save_image(friend):
+        requests.packages.urllib3.disable_warnings()
+        link = friend['link']
+        identity = urlsplit(link).netloc
+
+        def save():
+            resp = FriendLinkDoctor.get(friend['avatar'], verify=False)
+
+            path = urlsplit(friend['avatar']).path
+            if path.find('.') > 0:
+                suffix = path.split('.')[-1]
+            else:
+                suffix = resp.headers.get('content-type').split('/')[-1]
+                if suffix == 'jpeg':
+                    suffix = 'jpg'
+
+            name = f'{IMG_PATH}/{identity}.{suffix}'
+            img = Image.open(io.BytesIO(resp.content))
+            img.thumbnail((200, 200))
+            width, height = img.size   # Get dimensions
+
+            if width != height:
+                new_width = min(width, height)
+                left = round((width - new_width)/2)
+                top = round((height - new_width)/2)
+                x_right = round(width - new_width) - left
+                x_bottom = round(height - new_width) - top
+                right = width - x_right
+                bottom = height - x_bottom
+
+                # Crop the center of the image
+                img = img.crop((left, top, right, bottom))
+
+            img.save(name)
+            friend['avatar'] = name
+
+        def fail():
+            for img in os.listdir(IMG_PATH):
+                if img.find(identity) > -1:
+                    friend['avatar'] = f'{IMG_PATH}/{img}'
+                    print(f'failure, using cached file: {link}')
+                    return
+            print(f'failure: {link}')
+
+        FriendLinkDoctor.try_your_best(save, fail)
+        return friend
+
+    @staticmethod
+    def is_online(url):
+        url_404 = f'{url}/not-exists/be4b3658-2045-4468-8530-cc11c2145849'
+        error_text = 'www.beian.miit.gov.cn/state/outPortal/loginPortal.action'
+
+        def fail():
+            print(f'offline: {url}')
+            return False
+
+        def req():
+            if FriendLinkDoctor.get(url_404).text.find(error_text) == -1:
+                return True
+            return fail()
+
+        return FriendLinkDoctor.try_your_best(req, fail)
+
+    def save_config(self, results):
+        if self.init:
+            def retrieve_online_date(friend, old_result):
+                old_friend = list(
+                    filter(lambda old_friend: old_friend['link'] == friend['link'], old_result))
+                if len(old_friend) == 1 and 'lastOnlineDate' in old_friend[0]:
+                    friend['lastOnlineDate'] = old_friend[0]['lastOnlineDate']
+                return friend
+
+            with open(CONF_CACHED_PATH, mode='r', encoding='utf-8') as f:
+                old_result = json.load(f)
+                results = list(map(lambda friend: retrieve_online_date(
+                    friend, old_result), results))
+
+        with open(CONF_CACHED_PATH, mode='w', encoding='utf-8') as f:
+            json.dump(
+                results,
+                f,
+                ensure_ascii=False,
+                sort_keys=True,
+                indent=2
+            )
+
+    def concurrent_task(self, fn):
+        futures, pool = [], ThreadPoolExecutor(POOL_SIZE)
+        for friend in self.friends:
+            futures.append(pool.submit(fn, friend))
+
+        results = []
+        for future in futures:
+            results.append(future.result())
+
+        self.save_config(results)
+
+        return results
+
+    def check_boby(self):
+        def check(friend):
+            for host in WHITE_LIST:
+                if friend['link'].find(host) > 0:
+                    friend['lastOnlineDate'] = TODAY
+                    friend['untracked'] = True
+                    return friend
+
+            if self.is_online(friend['link']):
+                friend['lastOnlineDate'] = TODAY
+            return friend
+
+        return self.concurrent_task(check)
+
+    def get_images(self):
+        if os.path.exists(IMG_PATH):
+            shutil.copytree(IMG_PATH, IMG_PATH + '_copied')
+            # shutil.rmtree(IMG_PATH)
+        else:
+            os.mkdir(IMG_PATH)
+
+        self.concurrent_task(self.save_image)
+
+
+if __name__ == '__main__':
+    if len(sys.argv) != 1 and sys.argv[1] == 'init':
+        FriendLinkDoctor(init=True).get_images()
+    else:
+        FriendLinkDoctor().check_boby()

package/package.json

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

package/logi.im/usr/themes/Mirages/css/7.10.2/OwO.custom.min.css

@@ -1 +0,0 @@
-/*! OwO.custom.css */.gradient-background{background:linear-gradient(-45deg, #EE7752, #E73C7E, #23A6D5, #23D5AB);background-size:1000% 1000%;-webkit-animation:Gradient 90s linear infinite;-moz-animation:Gradient 90s linear infinite;animation:Gradient 90s linear infinite}@-webkit-keyframes Gradient{0%{background-position:0 50%}50%{background-position:100% 50%}100%{background-position:0 50%}}@-moz-keyframes Gradient{0%{background-position:0 50%}50%{background-position:100% 50%}100%{background-position:0 50%}}@keyframes Gradient{0%{background-position:0 50%}50%{background-position:100% 50%}100%{background-position:0 50%}}.OwO{position:relative;user-select:none;margin-top:10px;display:block}.OwO#owo-vditor{position:absolute;margin-top:1px;margin-left:5px}body.vditor-mode-fullscreen .OwO#owo-vditor{left:0;top:0}.OwO:hover .OwO-logo{color:#ccc}.OwO.OwO-open .OwO-logo{border-radius:4px 4px 0 0;border-bottom:none;color:#ccc}.OwO.OwO-open .OwO-body{display:block}.OwO.OwO-up .OwO-body{top:inherit;bottom:21px;border-radius:4px 4px 4px 0}.OwO.OwO-up .OwO-body .OwO-bar .OwO-packages li:nth-child(1){border-radius:0}.OwO.OwO-up.OwO-open .OwO-logo{border:1px solid #ddd;border-radius:0 0 4px 4px;border-top:none}.OwO .OwO-logo{position:relative;display:inline-block;color:#999;border:2px solid #777;border-radius:4px;font-size:13px;padding:2px 5px;cursor:pointer;height:22px;box-sizing:border-box;z-index:2;line-height:16px}body.theme-white .OwO .OwO-logo{color:#777;border-color:#ececec}body.theme-dark .OwO .OwO-logo{border-color:#555}body.theme-dark.dark-mode .OwO .OwO-logo{border-color:#777}.OwO .OwO-logo:hover span{display:inline-block}.OwO#owo-vditor .OwO-logo{display:none}.OwO .OwO-body{display:none;position:absolute;width:400px;background:#2c2a2a;border:2px solid #777;z-index:9999;top:21px;border-radius:0 4px 4px 4px;white-space:normal;-webkit-overflow-scrolling:touch}body.theme-dark .OwO .OwO-body{border-color:#555}body.theme-dark.dark-mode .OwO .OwO-body{border-color:#777}.OwO .OwO-body .OwO-items{user-select:none;display:none;padding:10px;margin:0;overflow:auto;font-size:0}.OwO .OwO-body .OwO-items .OwO-item{list-style-type:none;background:rgba(255,255,255,0.04);padding:5px 10px;border-radius:5px;display:inline-block;font-size:12px;line-height:14px;margin:0 10px 12px 0;cursor:pointer;transition:.3s}.OwO .OwO-body .OwO-items .OwO-item:hover{background:rgba(255,255,255,0.12);transform:scale(1.2)}.OwO .OwO-body .OwO-items-emoji .OwO-item{font-size:20px;line-height:19px}.OwO .OwO-body .OwO-items-image .OwO-item{max-width:calc(25% - 10px);box-sizing:border-box}.OwO .OwO-body .OwO-items-image .OwO-item img{max-width:100%}.OwO .OwO-body .OwO-items-show{display:block}.OwO .OwO-body .OwO-bar{width:100%;height:30px;border-top:2px solid #555;background:#2c2a2a;border-radius:0 0 4px 4px;color:#ccc;overflow-y:hidden}.OwO .OwO-body .OwO-bar .OwO-packages{margin:0;padding:0;font-size:0}.OwO .OwO-body .OwO-bar .OwO-packages li{list-style-type:none;display:inline-block;line-height:30px;font-size:14px;padding:0 10px;cursor:pointer;margin-right:3px}.OwO .OwO-body .OwO-bar .OwO-packages li:nth-child(1){border-radius:0 0 0 3px}.OwO .OwO-body .OwO-bar .OwO-packages li:hover{background:rgba(255,255,255,0.12)}.OwO .OwO-body .OwO-bar .OwO-packages .OwO-package-active{background:rgba(255,255,255,0.12);transition:.3s}.OwO#owo-vditor .OwO-body{min-width:350px;top:35px}body.vditor-mode-fullscreen .OwO#owo-vditor .OwO-body{position:fixed}body.OwO-open #body{overflow-y:inherit;overflow-x:hidden}body.theme-white .OwO:hover .OwO-logo{color:#444}body.theme-white .OwO .OwO-body{background:#fff;border-color:#ececec}body.theme-white .OwO .OwO-body .OwO-items .OwO-item{background:#f7f7f7}body.theme-white .OwO .OwO-body .OwO-items .OwO-item:hover{background:#eee}body.theme-white .OwO .OwO-body .OwO-bar{border-top-color:#ececec;background:#fff;color:#444}body.theme-white .OwO .OwO-body .OwO-bar .OwO-packages li:hover{background:#eee}body.theme-white .OwO .OwO-body .OwO-bar .OwO-packages .OwO-package-active{background:#eee}body.theme-white.theme-sunset .OwO-logo{border-color:#d6d0c2}body.theme-white.theme-sunset .OwO-body{background:#FFF8EB;border-color:#d6d0c2}body.theme-white.theme-sunset .OwO-body .OwO-items .OwO-item{background:#F8F1E4}body.theme-white.theme-sunset .OwO-body .OwO-items .OwO-item:hover{background:#e7e0d3}body.theme-white.theme-sunset .OwO-body .OwO-bar{background:#FFF8EB;border-top-color:#d6d0c2}body.theme-white.theme-sunset .OwO-body .OwO-bar .OwO-packages li:hover{background:#F8F1E4}body.theme-white.theme-sunset .OwO-body .OwO-bar .OwO-packages .OwO-package-active{background:#F8F1E4}