hiddifypanel 8.0.0.dev27__tar.gz → 8.0.0.dev28__tar.gz

{hiddifypanel-8.0.0.dev27 → hiddifypanel-8.0.0.dev28}/HISTORY.md

@@ -5,6 +5,10 @@
 
 #### New
 
+* Add auto sub. 
+
+* Add report analyser. 
+
 * Add ssh keys to the backup. 
 
 * Add ability to change reality keys. 

{hiddifypanel-8.0.0.dev27 → hiddifypanel-8.0.0.dev28}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: hiddifypanel
-Version: 8.0.0.dev27
+Version: 8.0.0.dev28
 Summary: hiddifypanel multi proxy panel
 Home-page: https://github.com/hiddify/hiddify-config/
 Author: hiddify

hiddifypanel-8.0.0.dev28/hiddifypanel/VERSION

@@ -0,0 +1 @@
+8.0.0.dev28

{hiddifypanel-8.0.0.dev27 → hiddifypanel-8.0.0.dev28}/hiddifypanel/VERSION.py

@@ -1,3 +1,3 @@
-__version__='8.0.0.dev27'
+__version__='8.0.0.dev28'
 from datetime import datetime
 __release_date__= datetime.strptime('2023-08-10','%Y-%m-%d')

hiddifypanel-8.0.0.dev28/hiddifypanel/models/report.py

@@ -0,0 +1,41 @@
+from sqlalchemy_serializer import SerializerMixin
+from flask import Flask, flash, request
+from flask_sqlalchemy import SQLAlchemy
+from flask_admin import Admin
+from flask_admin.contrib.sqla import ModelView
+from wtforms import SelectMultipleField
+from urllib.parse import urlparse
+from .config_enum import ConfigEnum, ConfigCategory
+from .config import hconfig
+
+from sqlalchemy.orm import backref
+
+from flask import Markup
+from dateutil import relativedelta
+from hiddifypanel.panel.database import db
+
+import enum
+import datetime
+import uuid as uuid_mod
+from enum import auto
+from strenum import StrEnum
+
+
+class Report(db.Model, SerializerMixin):
+    id = db.Column(db.Integer, primary_key=True, autoincrement=True)
+    user_id = db.Column(db.Integer, db.ForeignKey('user.id'), default=0, nullable=False)
+    asn_id = db.Column(db.String(200), nullable=False, unique=False)
+    city = db.Column(db.String(200))
+    country = db.Column(db.String(200))
+    latitude = Column(Float,)
+    longitude = Column(Float, )
+    accuracy_radius = Column(Float, )
+    
+    date = db.Column(db.DateTime, nullable=False, default=datetime.datetime.min)
+    details = db.relationship('ReportDetail', cascade="all,delete", backref='report',    lazy='dynamic',)
+
+
+class ReportDetail(db.Model, SerializerMixin):
+    report_id = db.Column(db.Integer, db.ForeignKey('report.id'), primary_key=True, )
+    proxy_id = db.Column(db.Integer, db.ForeignKey('proxy.id'), primary_key=True, )
+    ping = db.Column(db.Integer, default=-1)

{hiddifypanel-8.0.0.dev27 → hiddifypanel-8.0.0.dev28}/hiddifypanel/panel/clean_ip.py

@@ -34,6 +34,7 @@ apt.ircf.space		APT
 try:
     ipasn = maxminddb.open_database('GeoLite2-ASN.mmdb') if os.path.exists('GeoLite2-ASN.mmdb') else {}
     ipcountry = maxminddb.open_database('GeoLite2-Country.mmdb') if os.path.exists('GeoLite2-Country.mmdb') else {}
+    ipcity = maxminddb.open_database('GeoLite2-City.mmdb') if os.path.exists('GeoLite2-City.mmdb') else {}
 except Exception as e:
     print("Error can not load maxminddb", file=sys.stderr)
     ipasn = {}
@@ -63,14 +64,37 @@ asn_map = {
 
 def get_asn_short_name(user_ip=None):
     user_ip = user_ip or get_real_user_ip()
-    asnres = ipasn.get(user_ip) if ipasn else {'autonomous_system_number': 'unknown'}
-    asn = f"{asnres.get('autonomous_system_number','unknown')}" if asnres else "unknown"
-    return asn_map.get(asn, "unknown")
+    try:
+        asn_id = get_asn_id(user_ip)
+        return asn_map.get(asn_id, "unknown")
+    except:
+        return "unknown"
 
 
-def get_country(user_ip=None):
+def get_asn_id(user_ip=None):
     user_ip = user_ip or get_real_user_ip()
-    return (ipcountry.get(user_ip) or {}).get('country', {}).get('iso_code', 'unknown')
+    try:
+        asnres = ipasn.get(user_ip)
+        return asnres['autonomous_system_number']
+    except:
+        return "unknown"
+
+
+def get_country(user_ip=None):
+    try:
+        user_ip = user_ip or get_real_user_ip()
+        return (ipcountry.get(user_ip) or {}).get('country', {}).get('iso_code', 'unknown')
+    except:
+        return 'unknown'
+
+
+def get_city(user_ip=None):
+    try:
+        user_ip = user_ip or get_real_user_ip()
+        res = ipcity.get(user_ip)
+        return {'city': res.get('city').get('name'), 'latitude': res.get('latitude'), 'longitude': res.get('longitude'), 'accuracy_radius': res.get('accuracy_radius')}
+    except:
+        return 'unknown'
 
 
 def get_real_user_ip_debug(user_ip=None):

{hiddifypanel-8.0.0.dev27 → hiddifypanel-8.0.0.dev28}/hiddifypanel/panel/user/user.py

@@ -35,6 +35,13 @@ class UserView(FlaskView):
     #     user_agent =  user_agents.parse(request.user_agent.string)
 
     #     return render_template('home/multi.html',**c,ua=user_agent)
+    @route('/auto')
+    def auto_sub(self):
+        if re.match('^([Cc]lash-verge|[Cc]lash-?[Mm]eta)', request.user_agent.string):
+            return self.clash_config(meta_or_normal="meta")
+        elif re.match('^([Cc]lash|[Ss]tash)', user_agent):
+            return self.clash_config(meta_or_normal="normal")
+        return self.all_configs(base64=True)
 
     @route('/new/')
     @route('/new')
@@ -59,6 +66,40 @@ class UserView(FlaskView):
 
         return resp
 
+    @route('/report', methods=["POST"])
+    def report(self):
+        data = request.get_json()
+        user_ip = clean_ip.get_real_user_ip()
+        report = Report()
+        report.asn_id = clean_ip.get_asn_id(user_ip)
+        report.country = clean_ip.get_country(user_ip)
+
+        city_info = clean_ip.get_city(user_ip)
+        report.city = city_info['name']
+        report.latitude = city_info['latitude']
+        report.longitude = city_info['longitude']
+        report.accuracy_radius = city_info['accuracy_radius']
+
+        report.date = datetime.datetime.now()
+        sub_update_time = data['sub_update_time']
+        sub_url = data['sub_url']
+
+        db.session.add(report)
+        db.session.commit()
+        proxy_map = {p.name: p.id for p in Proxy.query.all()}
+
+        for name, ping in data['pings']:
+            detail = ReportDetail()
+            detail.report_id = report.id
+            detail.proxy_id = proxy_map.get(name, -1)
+            del proxy_map[name]
+            if detail.proxy_id < 0:
+                print("Error. Proxy not found!")
+                continue
+            detail.ping = ping
+            db.session.add(detail)
+        db.session.commit()
+
     @route('/clash/<typ>.yml', methods=["GET", "HEAD"])
     @route('/clash/<meta_or_normal>/<typ>.yml', methods=["GET", "HEAD"])
     def clash_config(self, meta_or_normal="normal", typ="all.yml"):
@@ -82,13 +123,14 @@ class UserView(FlaskView):
         if request.method == 'HEAD':
             resp = ""
         else:
-            resp = render_template('singbox_config.json', **c, host_keys=hiddify.get_hostkeys(True), ssh_client_version=hiddify.get_ssh_client_version(user),ssh_ip=hiddify.get_ip(4), base64=False)
+            resp = render_template('singbox_config.json', **c, host_keys=hiddify.get_hostkeys(True),
+                                   ssh_client_version=hiddify.get_ssh_client_version(user), ssh_ip=hiddify.get_ip(4), base64=False)
         return add_headers(resp, c)
 
     @route('/all.txt', methods=["GET", "HEAD"])
-    def all_configs(self):
+    def all_configs(self, base64=False):
         mode = "new"  # request.args.get("mode")
-        base64 = request.args.get("base64", "").lower() == "true"
+        base64 = base64 or request.args.get("base64", "").lower() == "true"
         c = get_common_data(g.user_uuid, mode)
         # response.content_type = 'text/plain';
         if request.method == 'HEAD':

{hiddifypanel-8.0.0.dev27 → hiddifypanel-8.0.0.dev28}/hiddifypanel/translations/en/LC_MESSAGES/messages.po

@@ -3,8 +3,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: HiddifyPanel\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-08-10 10:08+0200\n"
-"PO-Revision-Date: 2023-08-07 00:34-0500\n"
+"POT-Creation-Date: 2023-08-10 20:37+0200\n"
+"PO-Revision-Date: 2023-08-10 03:09-0500\n"
 "Last-Translator: hidden u\n"
 "Language-Team: English (USA)\n"
 "Language: en_US\n"
@@ -15,12 +15,12 @@ msgstr ""
 "Generated-By: Babel 2.12.1\n"
 
 # | msgid "This Domain does not exist in the Panel !"
-#: hiddifypanel/models/domain.py:134 hiddifypanel/panel/user/user.py:165
+#: hiddifypanel/models/domain.py:134 hiddifypanel/panel/user/user.py:207
 msgid "This domain does not exist in the panel!"
 msgstr "This Domain does not exist in the Panel !"
 
 # | msgid "Error In Auto CDN IP! It Can Not Be Find, Please Contact Admin"
-#: hiddifypanel/panel/clean_ip.py:103
+#: hiddifypanel/panel/clean_ip.py:127
 msgid "Error! auto cdn ip can not be find, please contact admin."
 msgstr "Error In Auto CDN IP! It Can Not Be Find, Please Contact Admin"
 

{hiddifypanel-8.0.0.dev27 → hiddifypanel-8.0.0.dev28}/hiddifypanel/translations/fa/LC_MESSAGES/messages.po

@@ -3,8 +3,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version:  HiddifyPanel\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-08-10 10:08+0200\n"
-"PO-Revision-Date: 2023-08-07 00:34-0500\n"
+"POT-Creation-Date: 2023-08-10 20:37+0200\n"
+"PO-Revision-Date: 2023-08-10 03:09-0500\n"
 "Last-Translator: hidden u\n"
 "Language: fa\n"
 "Language-Team: Persian\n"
@@ -15,13 +15,13 @@ msgstr ""
 "Generated-By: Babel 2.12.1\n"
 
 # | msgid "This Domain does not exist in the Panel !"
-#: hiddifypanel/models/domain.py:134 hiddifypanel/panel/user/user.py:165
+#: hiddifypanel/models/domain.py:134 hiddifypanel/panel/user/user.py:207
 msgid "This domain does not exist in the panel!"
 msgstr "این دامنه در پنل وجود ندارد!"
 
 # | msgid ""
 # | "Error In Auto CDN IP! It Can Not Be Find, Please Contact Admin"
-#: hiddifypanel/panel/clean_ip.py:103
+#: hiddifypanel/panel/clean_ip.py:127
 msgid "Error! auto cdn ip can not be find, please contact admin."
 msgstr "خطا! آی پی اتوماتیک نتوانست پیدا شود. لطفا با مدیر تماس بگیرید"
 

{hiddifypanel-8.0.0.dev27 → hiddifypanel-8.0.0.dev28}/hiddifypanel/translations/pt/LC_MESSAGES/messages.po

@@ -3,8 +3,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version:  HiddifyPT\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-08-10 10:08+0200\n"
-"PO-Revision-Date: 2023-08-07 00:34-0500\n"
+"POT-Creation-Date: 2023-08-10 20:37+0200\n"
+"PO-Revision-Date: 2023-08-10 03:09-0500\n"
 "Last-Translator: lymanrudni\n"
 "Language: pt\n"
 "Language-Team: Portuguese\n"
@@ -15,13 +15,13 @@ msgstr ""
 "Generated-By: Babel 2.12.1\n"
 
 # | msgid "This Domain does not exist in the Panel !"
-#: hiddifypanel/models/domain.py:134 hiddifypanel/panel/user/user.py:165
+#: hiddifypanel/models/domain.py:134 hiddifypanel/panel/user/user.py:207
 msgid "This domain does not exist in the panel!"
 msgstr "Este Domínio não existe no Painel!"
 
 # | msgid ""
 # | "Error In Auto CDN IP! It Can Not Be Find, Please Contact Admin"
-#: hiddifypanel/panel/clean_ip.py:103
+#: hiddifypanel/panel/clean_ip.py:127
 #, fuzzy
 msgid "Error! auto cdn ip can not be find, please contact admin."
 msgstr ""

{hiddifypanel-8.0.0.dev27 → hiddifypanel-8.0.0.dev28}/hiddifypanel/translations/zh/LC_MESSAGES/messages.po

@@ -3,8 +3,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version:  HiddifyPanel\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-08-10 10:08+0200\n"
-"PO-Revision-Date: 2023-08-07 00:34-0500\n"
+"POT-Creation-Date: 2023-08-10 20:37+0200\n"
+"PO-Revision-Date: 2023-08-10 03:09-0500\n"
 "Last-Translator: hidden u\n"
 "Language: zh\n"
 "Language-Team: Chinese\n"
@@ -15,14 +15,14 @@ msgstr ""
 "Generated-By: Babel 2.12.1\n"
 
 # | msgid "This Domain does not exist in the Panel !"
-#: hiddifypanel/models/domain.py:134 hiddifypanel/panel/user/user.py:165
+#: hiddifypanel/models/domain.py:134 hiddifypanel/panel/user/user.py:207
 #, fuzzy
 msgid "This domain does not exist in the panel!"
 msgstr "该域名在面板中不存在！"
 
 # | msgid ""
 # | "Error In Auto CDN IP! It Can Not Be Find, Please Contact Admin"
-#: hiddifypanel/panel/clean_ip.py:103
+#: hiddifypanel/panel/clean_ip.py:127
 #, fuzzy
 msgid "Error! auto cdn ip can not be find, please contact admin."
 msgstr "自动 CDN IP 错误！找不到，请联系管理员。"

{hiddifypanel-8.0.0.dev27 → hiddifypanel-8.0.0.dev28}/hiddifypanel.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: hiddifypanel
-Version: 8.0.0.dev27
+Version: 8.0.0.dev28
 Summary: hiddifypanel multi proxy panel
 Home-page: https://github.com/hiddify/hiddify-config/
 Author: hiddify

{hiddifypanel-8.0.0.dev27 → hiddifypanel-8.0.0.dev28}/hiddifypanel.egg-info/SOURCES.txt

@@ -31,6 +31,7 @@ hiddifypanel/models/config_enum.py
 hiddifypanel/models/domain.py
 hiddifypanel/models/parent_domain.py
 hiddifypanel/models/proxy.py
+hiddifypanel/models/report.py
 hiddifypanel/models/usage.py
 hiddifypanel/models/user.py
 hiddifypanel/panel/__init__.py

hiddifypanel-8.0.0.dev27/hiddifypanel/VERSION

@@ -1 +0,0 @@
-8.0.0.dev27