refactor custom json

sibalma · Apr 17, 2023 · 1c8ae4e · 1c8ae4e
1 parent 4620d8a
commit 1c8ae4e
Show file tree

Hide file tree

Showing 12 changed files with 126 additions and 79 deletions.
diff --git a/db/ConfigBuilder.cpp b/db/ConfigBuilder.cpp
@@ -12,6 +12,27 @@
 
 namespace NekoRay {
 
+    void MergeJson(const QJsonObject &custom, QJsonObject &outbound) {
+        // 合并
+        if (custom.isEmpty()) return;
+        for (const auto &key: custom.keys()) {
+            if (outbound.contains(key)) {
+                auto v = custom[key];
+                auto v_orig = outbound[key];
+                if (v.isObject() && v_orig.isObject()) { // isObject 则合并？
+                    auto vo = v.toObject();
+                    QJsonObject vo_orig = v_orig.toObject();
+                    MergeJson(vo, vo_orig);
+                    outbound[key] = vo_orig;
+                } else {
+                    outbound[key] = v;
+                }
+            } else {
+                outbound[key] = custom[key];
+            }
+        }
+    }
+
     // Common
 
     QSharedPointer<BuildConfigResult> BuildConfig(const QSharedPointer<ProxyEntity> &ent, bool forTest, bool forExport) {
@@ -33,6 +54,9 @@ namespace NekoRay {
             }
         }
 
+        // apply custom config
+        MergeJson(QString2QJsonObject(ent->bean->custom_config), result->coreConfig);
+
         // hook.js
         if (result->error.isEmpty() && !forTest) {
             auto source = qjs::ReadHookJS();
@@ -86,27 +110,6 @@ namespace NekoRay {
         return chainTagOut;
     }
 
-    void ApplyCustomOutboundJsonSettings(const QJsonObject &custom, QJsonObject &outbound) {
-        // 合并
-        if (custom.isEmpty()) return;
-        for (const auto &key: custom.keys()) {
-            if (outbound.contains(key)) {
-                auto v = custom[key];
-                auto v_orig = outbound[key];
-                if (v.isObject() && v_orig.isObject()) { // isObject 则合并？
-                    auto vo = v.toObject();
-                    QJsonObject vo_orig = v_orig.toObject();
-                    ApplyCustomOutboundJsonSettings(vo, vo_orig);
-                    outbound[key] = vo_orig;
-                } else {
-                    outbound[key] = v;
-                }
-            } else {
-                outbound[key] = custom[key];
-            }
-        }
-    }
-
 #define DOMAIN_USER_RULE                                                             \
     for (const auto &line: SplitLinesSkipSharp(dataStore->routing->proxy_domain)) {  \
         if (dataStore->dns_routing) status->domainListDNSRemote += line;             \
@@ -603,10 +606,7 @@ namespace NekoRay {
             }
 
             // apply custom outbound settings
-            auto custom_item = ent->bean->_get("custom");
-            if (custom_item != nullptr) {
-                ApplyCustomOutboundJsonSettings(QString2QJsonObject(*((QString *) custom_item->ptr)), outbound);
-            }
+            MergeJson(QString2QJsonObject(ent->bean->custom_outbound), outbound);
 
             // Bypass Lookup for the first profile
             auto serverAddress = ent->bean->serverAddress;

diff --git a/fmt/AbstractBean.cpp b/fmt/AbstractBean.cpp
@@ -11,6 +11,8 @@ namespace NekoRay::fmt {
         _add(new configItem("name", &name, itemType::string));
         _add(new configItem("addr", &serverAddress, itemType::string));
         _add(new configItem("port", &serverPort, itemType::integer));
+        _add(new configItem("c_cfg", &custom_config, itemType::string));
+        _add(new configItem("c_out", &custom_outbound, itemType::string));
     }
 
     QString AbstractBean::ToNekorayShareLink(const QString &type) {

diff --git a/fmt/AbstractBean.hpp b/fmt/AbstractBean.hpp
@@ -24,10 +24,14 @@ namespace NekoRay::fmt {
     class AbstractBean : public JsonStore {
     public:
         int version;
+
         QString name = "";
         QString serverAddress = "127.0.0.1";
         int serverPort = 1080;
 
+        QString custom_config = "";
+        QString custom_outbound = "";
+
         explicit AbstractBean(int version);
 
         //

diff --git a/fmt/ShadowSocksBean.hpp b/fmt/ShadowSocksBean.hpp
@@ -11,14 +11,12 @@ namespace NekoRay::fmt {
         QString plugin = "";
 
         QSharedPointer<V2rayStreamSettings> stream = QSharedPointer<V2rayStreamSettings>(new V2rayStreamSettings());
-        QString custom = "";
 
         ShadowSocksBean() : AbstractBean(0) {
             _add(new configItem("method", &method, itemType::string));
             _add(new configItem("pass", &password, itemType::string));
             _add(new configItem("plugin", &plugin, itemType::string));
             _add(new configItem("stream", dynamic_cast<JsonStore *>(stream.get()), itemType::jsonStore));
-            _add(new configItem("custom", &custom, itemType::string));
         };
 
         QString DisplayType() override { return "Shadowsocks"; };

diff --git a/fmt/SocksHttpBean.hpp b/fmt/SocksHttpBean.hpp
@@ -15,15 +15,13 @@ namespace NekoRay::fmt {
         QString password = "";
 
         QSharedPointer<V2rayStreamSettings> stream = QSharedPointer<V2rayStreamSettings>(new V2rayStreamSettings());
-        QString custom = "";
 
         explicit SocksHttpBean(int _socks_http_type) : AbstractBean(0) {
             this->socks_http_type = _socks_http_type;
             _add(new configItem("v", &socks_http_type, itemType::integer));
             _add(new configItem("username", &username, itemType::string));
             _add(new configItem("password", &password, itemType::string));
             _add(new configItem("stream", dynamic_cast<JsonStore *>(stream.get()), itemType::jsonStore));
-            _add(new configItem("custom", &custom, itemType::string));
         };
 
         QString DisplayType() override { return socks_http_type == type_HTTP ? "HTTP" : "Socks"; };

diff --git a/fmt/TrojanVLESSBean.hpp b/fmt/TrojanVLESSBean.hpp
@@ -14,14 +14,12 @@ namespace NekoRay::fmt {
         QString flow = "";
 
         QSharedPointer<V2rayStreamSettings> stream = QSharedPointer<V2rayStreamSettings>(new V2rayStreamSettings());
-        QString custom = "";
 
         explicit TrojanVLESSBean(int _proxy_type) : AbstractBean(0) {
             proxy_type = _proxy_type;
             _add(new configItem("pass", &password, itemType::string));
             _add(new configItem("flow", &flow, itemType::string));
             _add(new configItem("stream", dynamic_cast<JsonStore *>(stream.get()), itemType::jsonStore));
-            _add(new configItem("custom", &custom, itemType::string));
         };
 
         QString DisplayType() override { return proxy_type == proxy_VLESS ? "VLESS" : "Trojan"; };

diff --git a/fmt/VMessBean.hpp b/fmt/VMessBean.hpp
@@ -11,14 +11,12 @@ namespace NekoRay::fmt {
         QString security = "auto";
 
         QSharedPointer<V2rayStreamSettings> stream = QSharedPointer<V2rayStreamSettings>(new V2rayStreamSettings());
-        QString custom = "";
 
         VMessBean() : AbstractBean(0) {
             _add(new configItem("id", &uuid, itemType::string));
             _add(new configItem("aid", &aid, itemType::integer));
             _add(new configItem("sec", &security, itemType::string));
             _add(new configItem("stream", dynamic_cast<JsonStore *>(stream.get()), itemType::jsonStore));
-            _add(new configItem("custom", &custom, itemType::string));
         };
 
         QString DisplayType() override { return "VMess"; };

diff --git a/translations/fa_IR.ts b/translations/fa_IR.ts
@@ -329,10 +329,6 @@ For NekoBox, this rewrites the underlying(localhost) DNS in VPN mode, normal mod
         <source>Name</source>
         <translation>اسم</translation>
     </message>
-    <message>
-        <source>Custom Json Settings</source>
-        <translation>تنظیمات JSON سفارشی</translation>
-    </message>
     <message>
         <source>Settings</source>
         <translation>تنظیمات</translation>
@@ -421,6 +417,14 @@ For NekoBox, this rewrites the underlying(localhost) DNS in VPN mode, normal mod
         <source>Custom (%1 config)</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Custom Outbound Settings</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Custom Config Settings</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>DialogFirstSetup</name>

diff --git a/translations/zh_CN.ts b/translations/zh_CN.ts
@@ -369,10 +369,6 @@ For NekoBox, this rewrites the underlying(localhost) DNS in VPN mode, normal mod
         <source>Certificate</source>
         <translation>证书</translation>
     </message>
-    <message>
-        <source>Custom Json Settings</source>
-        <translation>自定义 JSON 设置</translation>
-    </message>
     <message>
         <source>Not set</source>
         <translation>未设置</translation>
@@ -413,6 +409,14 @@ For NekoBox, this rewrites the underlying(localhost) DNS in VPN mode, normal mod
         <source>Custom (%1 config)</source>
         <translation>自定义 (%1 完整配置)</translation>
     </message>
+    <message>
+        <source>Custom Outbound Settings</source>
+        <translation>自定义出站 JSON 设置</translation>
+    </message>
+    <message>
+        <source>Custom Config Settings</source>
+        <translation>自定义配置 JSON 设置</translation>
+    </message>
 </context>
 <context>
     <name>DialogFirstSetup</name>

diff --git a/ui/edit/dialog_edit_profile.cpp b/ui/edit/dialog_edit_profile.cpp
@@ -229,13 +229,22 @@ void DialogEditProfile::typeSelected(const QString &newType) {
     }
 
     // left: custom
-    auto custom_item = ent->bean->_get("custom");
-    if (custom_item != nullptr) {
-        ui->custom_box->setVisible(true);
-        CACHE.custom = *((QString *) custom_item->ptr);
-    } else {
-        ui->custom_box->setVisible(false);
+    CACHE.custom_config = ent->bean->custom_config;
+    CACHE.custom_outbound = ent->bean->custom_outbound;
+    bool show_custom_config = true;
+    bool show_custom_outbound = true;
+    if (type == "chain") {
+        show_custom_outbound = false;
+    } else if (type == "custom") {
+        if (customType == "internal") {
+            show_custom_outbound = false;
+        } else if (customType == "internal-full") {
+            show_custom_outbound = false;
+            show_custom_config = false;
+        }
     }
+    ui->custom_box->setVisible(show_custom_outbound);
+    ui->custom_global_box->setVisible(show_custom_config);
 
     // 左边 bean
     auto old = ui->bean->layout()->itemAt(0)->widget();
@@ -342,10 +351,8 @@ void DialogEditProfile::accept() {
     }
 
     // cached custom
-    auto custom_item = ent->bean->_get("custom");
-    if (custom_item != nullptr) {
-        *((QString *) custom_item->ptr) = CACHE.custom;
-    }
+    ent->bean->custom_outbound = CACHE.custom_outbound;
+    ent->bean->custom_config = CACHE.custom_config;
 
     // finish
     QStringList msg = {"accept"};
@@ -372,10 +379,15 @@ void DialogEditProfile::editor_cache_updated_impl() {
     } else {
         ui->certificate_edit->setText(tr("Already set"));
     }
-    if (CACHE.custom.isEmpty()) {
-        ui->custom_edit->setText(tr("Not set"));
+    if (CACHE.custom_outbound.isEmpty()) {
+        ui->custom_outbound_edit->setText(tr("Not set"));
+    } else {
+        ui->custom_outbound_edit->setText(tr("Already set"));
+    }
+    if (CACHE.custom_config.isEmpty()) {
+        ui->custom_config_edit->setText(tr("Not set"));
     } else {
-        ui->custom_edit->setText(tr("Already set"));
+        ui->custom_config_edit->setText(tr("Already set"));
     }
 
     // CACHE macro
@@ -388,8 +400,13 @@ void DialogEditProfile::editor_cache_updated_impl() {
     }
 }
 
-void DialogEditProfile::on_custom_edit_clicked() {
-    C_EDIT_JSON_ALLOW_EMPTY(custom)
+void DialogEditProfile::on_custom_outbound_edit_clicked() {
+    C_EDIT_JSON_ALLOW_EMPTY(custom_outbound)
+    editor_cache_updated_impl();
+}
+
+void DialogEditProfile::on_custom_config_edit_clicked() {
+    C_EDIT_JSON_ALLOW_EMPTY(custom_config)
     editor_cache_updated_impl();
 }
 

diff --git a/ui/edit/dialog_edit_profile.h b/ui/edit/dialog_edit_profile.h
@@ -23,7 +23,9 @@ public slots:
 
 private slots:
 
-    void on_custom_edit_clicked();
+    void on_custom_outbound_edit_clicked();
+
+    void on_custom_config_edit_clicked();
 
     void on_certificate_edit_clicked();
 
@@ -40,7 +42,8 @@ private slots:
     QString network_title_base;
 
     struct {
-        QString custom;
+        QString custom_outbound;
+        QString custom_config;
         QString certificate;
     } CACHE;
 

diff --git a/ui/edit/dialog_edit_profile.ui b/ui/edit/dialog_edit_profile.ui
@@ -116,26 +116,46 @@
        </widget>
       </item>
       <item>
-       <widget class="QGroupBox" name="custom_box">
-        <property name="sizePolicy">
-         <sizepolicy hsizetype="Preferred" vsizetype="Maximum">
-          <horstretch>0</horstretch>
-          <verstretch>0</verstretch>
-         </sizepolicy>
-        </property>
-        <property name="title">
-         <string>Custom Json Settings</string>
-        </property>
-        <layout class="QVBoxLayout" name="verticalLayout_5">
-         <item>
-          <widget class="QPushButton" name="custom_edit">
-           <property name="text">
-            <string notr="true">Edit</string>
-           </property>
-          </widget>
-         </item>
-        </layout>
-       </widget>
+       <layout class="QHBoxLayout" name="horizontalLayout_2">
+        <item>
+         <widget class="QGroupBox" name="custom_box">
+          <property name="sizePolicy">
+           <sizepolicy hsizetype="Preferred" vsizetype="Maximum">
+            <horstretch>0</horstretch>
+            <verstretch>0</verstretch>
+           </sizepolicy>
+          </property>
+          <property name="title">
+           <string>Custom Outbound Settings</string>
+          </property>
+          <layout class="QVBoxLayout" name="verticalLayout_5">
+           <item>
+            <widget class="QPushButton" name="custom_outbound_edit">
+             <property name="text">
+              <string notr="true">Edit</string>
+             </property>
+            </widget>
+           </item>
+          </layout>
+         </widget>
+        </item>
+        <item>
+         <widget class="QGroupBox" name="custom_global_box">
+          <property name="title">
+           <string>Custom Config Settings</string>
+          </property>
+          <layout class="QHBoxLayout" name="horizontalLayout_3">
+           <item>
+            <widget class="QPushButton" name="custom_config_edit">
+             <property name="text">
+              <string notr="true">Edit</string>
+             </property>
+            </widget>
+           </item>
+          </layout>
+         </widget>
+        </item>
+       </layout>
       </item>
       <item>
        <widget class="QDialogButtonBox" name="buttonBox">
@@ -566,7 +586,8 @@ security (QUIC)</string>
   <tabstop>name</tabstop>
   <tabstop>address</tabstop>
   <tabstop>port</tabstop>
-  <tabstop>custom_edit</tabstop>
+  <tabstop>custom_outbound_edit</tabstop>
+  <tabstop>custom_config_edit</tabstop>
   <tabstop>network</tabstop>
   <tabstop>security</tabstop>
   <tabstop>packet_encoding</tabstop>