Optimize request ua

Change android icon

Optimize dashboard

.github/workflows/build.yml

@@ -15,12 +15,38 @@ jobs:
             os: ubuntu-latest
           - platform: windows
             os: windows-latest
+            arch: amd64
           - platform: linux
             os: ubuntu-latest
+            arch: amd64
           - platform: macos
             os: macos-13
+            arch: amd64
+          - platform: macos
+            os: macos-latest
+            arch: arm64
 
     steps:
+      - name: Setup Mingw64
+        if: startsWith(matrix.platform,'windows')
+        uses: msys2/setup-msys2@v2
+        with:
+          msystem: mingw64
+          install: mingw-w64-x86_64-gcc
+          update: true
+
+
+      - name: Set Mingw64 Env
+        if: startsWith(matrix.platform,'windows')
+        run: |
+          echo "${{ runner.temp }}\msys64\mingw64\bin" | Out-File -FilePath $env:GITHUB_PATH -Encoding utf8 -Append
+
+      - name: Check Matrix
+        run: |
+          echo "Running on ${{ matrix.os }}"
+          echo "Arch: ${{ runner.arch }}"
+          gcc --version
+
       - name: Checkout
         uses: actions/checkout@v4
         with:
@@ -46,10 +72,10 @@ jobs:
         if: startsWith(matrix.platform,'android')
         run: |
           echo "${{ secrets.KEYSTORE }}" | base64 --decode > android/app/keystore.jks
-          echo "keyAlias=${{ secrets.KEY_ALIAS }}" >> android/local.properties    
+          echo "keyAlias=${{ secrets.KEY_ALIAS }}" >> android/local.properties
           echo "storePassword=${{ secrets.STORE_PASSWORD }}" >> android/local.properties
           echo "keyPassword=${{ secrets.KEY_PASSWORD }}" >> android/local.properties
-          
+
 
       - name: Setup Go
         uses: actions/setup-go@v5
@@ -69,19 +95,19 @@ jobs:
         run: flutter pub get
 
       - name: Setup
-        run: |
-          dart setup.dart ${{ matrix.platform }}
+        run: dart setup.dart ${{ matrix.platform }} ${{ matrix.arch && format('--arch {0}', matrix.arch) }}
 
       - name: Upload
         uses: actions/upload-artifact@v4
         with:
-          name: artifact-${{ matrix.platform }}
+          name: artifact-${{ matrix.platform }}${{ matrix.arch && format('-{0}', matrix.arch) }}
           path: ./dist
           retention-days: 1
           overwrite: true
 
 
   upload-release:
+    if: ${{ !contains(github.ref, '+') }}
     permissions: write-all
     needs: [ build ]
     runs-on: ubuntu-latest

.gitignore

@@ -31,6 +31,7 @@ migrate_working_dir/
 .pub-cache/
 .pub/
 /build/
+/dist/
 
 # Symbolication related
 app.*.symbols
@@ -44,6 +45,7 @@ app.*.map.json
 /android/app/release
 
 
+
 #libclash
 /libclash/
 

.gitmodules

@@ -5,4 +5,4 @@
 [submodule "plugins/flutter_distributor"]
 	path = plugins/flutter_distributor
 	url = git@github.com:chen08209/flutter_distributor.git
-	branch = main
+	branch = FlClash

LICENSE

@@ -0,0 +1,674 @@
+                    GNU GENERAL PUBLIC LICENSE
+                       Version 3, 29 June 2007
+
+ Copyright (C) 2007 Free Software Foundation, Inc. <https://fsf.org/>
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+                            Preamble
+
+  The GNU General Public License is a free, copyleft license for
+software and other kinds of works.
+
+  The licenses for most software and other practical works are designed
+to take away your freedom to share and change the works.  By contrast,
+the GNU General Public License is intended to guarantee your freedom to
+share and change all versions of a program--to make sure it remains free
+software for all its users.  We, the Free Software Foundation, use the
+GNU General Public License for most of our software; it applies also to
+any other work released this way by its authors.  You can apply it to
+your programs, too.
+
+  When we speak of free software, we are referring to freedom, not
+price.  Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+them if you wish), that you receive source code or can get it if you
+want it, that you can change the software or use pieces of it in new
+free programs, and that you know you can do these things.
+
+  To protect your rights, we need to prevent others from denying you
+these rights or asking you to surrender the rights.  Therefore, you have
+certain responsibilities if you distribute copies of the software, or if
+you modify it: responsibilities to respect the freedom of others.
+
+  For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must pass on to the recipients the same
+freedoms that you received.  You must make sure that they, too, receive
+or can get the source code.  And you must show them these terms so they
+know their rights.
+
+  Developers that use the GNU GPL protect your rights with two steps:
+(1) assert copyright on the software, and (2) offer you this License
+giving you legal permission to copy, distribute and/or modify it.
+
+  For the developers' and authors' protection, the GPL clearly explains
+that there is no warranty for this free software.  For both users' and
+authors' sake, the GPL requires that modified versions be marked as
+changed, so that their problems will not be attributed erroneously to
+authors of previous versions.
+
+  Some devices are designed to deny users access to install or run
+modified versions of the software inside them, although the manufacturer
+can do so.  This is fundamentally incompatible with the aim of
+protecting users' freedom to change the software.  The systematic
+pattern of such abuse occurs in the area of products for individuals to
+use, which is precisely where it is most unacceptable.  Therefore, we
+have designed this version of the GPL to prohibit the practice for those
+products.  If such problems arise substantially in other domains, we
+stand ready to extend this provision to those domains in future versions
+of the GPL, as needed to protect the freedom of users.
+
+  Finally, every program is threatened constantly by software patents.
+States should not allow patents to restrict development and use of
+software on general-purpose computers, but in those that do, we wish to
+avoid the special danger that patents applied to a free program could
+make it effectively proprietary.  To prevent this, the GPL assures that
+patents cannot be used to render the program non-free.
+
+  The precise terms and conditions for copying, distribution and
+modification follow.
+
+                       TERMS AND CONDITIONS
+
+  0. Definitions.
+
+  "This License" refers to version 3 of the GNU General Public License.
+
+  "Copyright" also means copyright-like laws that apply to other kinds of
+works, such as semiconductor masks.
+
+  "The Program" refers to any copyrightable work licensed under this
+License.  Each licensee is addressed as "you".  "Licensees" and
+"recipients" may be individuals or organizations.
+
+  To "modify" a work means to copy from or adapt all or part of the work
+in a fashion requiring copyright permission, other than the making of an
+exact copy.  The resulting work is called a "modified version" of the
+earlier work or a work "based on" the earlier work.
+
+  A "covered work" means either the unmodified Program or a work based
+on the Program.
+
+  To "propagate" a work means to do anything with it that, without
+permission, would make you directly or secondarily liable for
+infringement under applicable copyright law, except executing it on a
+computer or modifying a private copy.  Propagation includes copying,
+distribution (with or without modification), making available to the
+public, and in some countries other activities as well.
+
+  To "convey" a work means any kind of propagation that enables other
+parties to make or receive copies.  Mere interaction with a user through
+a computer network, with no transfer of a copy, is not conveying.
+
+  An interactive user interface displays "Appropriate Legal Notices"
+to the extent that it includes a convenient and prominently visible
+feature that (1) displays an appropriate copyright notice, and (2)
+tells the user that there is no warranty for the work (except to the
+extent that warranties are provided), that licensees may convey the
+work under this License, and how to view a copy of this License.  If
+the interface presents a list of user commands or options, such as a
+menu, a prominent item in the list meets this criterion.
+
+  1. Source Code.
+
+  The "source code" for a work means the preferred form of the work
+for making modifications to it.  "Object code" means any non-source
+form of a work.
+
+  A "Standard Interface" means an interface that either is an official
+standard defined by a recognized standards body, or, in the case of
+interfaces specified for a particular programming language, one that
+is widely used among developers working in that language.
+
+  The "System Libraries" of an executable work include anything, other
+than the work as a whole, that (a) is included in the normal form of
+packaging a Major Component, but which is not part of that Major
+Component, and (b) serves only to enable use of the work with that
+Major Component, or to implement a Standard Interface for which an
+implementation is available to the public in source code form.  A
+"Major Component", in this context, means a major essential component
+(kernel, window system, and so on) of the specific operating system
+(if any) on which the executable work runs, or a compiler used to
+produce the work, or an object code interpreter used to run it.
+
+  The "Corresponding Source" for a work in object code form means all
+the source code needed to generate, install, and (for an executable
+work) run the object code and to modify the work, including scripts to
+control those activities.  However, it does not include the work's
+System Libraries, or general-purpose tools or generally available free
+programs which are used unmodified in performing those activities but
+which are not part of the work.  For example, Corresponding Source
+includes interface definition files associated with source files for
+the work, and the source code for shared libraries and dynamically
+linked subprograms that the work is specifically designed to require,
+such as by intimate data communication or control flow between those
+subprograms and other parts of the work.
+
+  The Corresponding Source need not include anything that users
+can regenerate automatically from other parts of the Corresponding
+Source.
+
+  The Corresponding Source for a work in source code form is that
+same work.
+
+  2. Basic Permissions.
+
+  All rights granted under this License are granted for the term of
+copyright on the Program, and are irrevocable provided the stated
+conditions are met.  This License explicitly affirms your unlimited
+permission to run the unmodified Program.  The output from running a
+covered work is covered by this License only if the output, given its
+content, constitutes a covered work.  This License acknowledges your
+rights of fair use or other equivalent, as provided by copyright law.
+
+  You may make, run and propagate covered works that you do not
+convey, without conditions so long as your license otherwise remains
+in force.  You may convey covered works to others for the sole purpose
+of having them make modifications exclusively for you, or provide you
+with facilities for running those works, provided that you comply with
+the terms of this License in conveying all material for which you do
+not control copyright.  Those thus making or running the covered works
+for you must do so exclusively on your behalf, under your direction
+and control, on terms that prohibit them from making any copies of
+your copyrighted material outside their relationship with you.
+
+  Conveying under any other circumstances is permitted solely under
+the conditions stated below.  Sublicensing is not allowed; section 10
+makes it unnecessary.
+
+  3. Protecting Users' Legal Rights From Anti-Circumvention Law.
+
+  No covered work shall be deemed part of an effective technological
+measure under any applicable law fulfilling obligations under article
+11 of the WIPO copyright treaty adopted on 20 December 1996, or
+similar laws prohibiting or restricting circumvention of such
+measures.
+
+  When you convey a covered work, you waive any legal power to forbid
+circumvention of technological measures to the extent such circumvention
+is effected by exercising rights under this License with respect to
+the covered work, and you disclaim any intention to limit operation or
+modification of the work as a means of enforcing, against the work's
+users, your or third parties' legal rights to forbid circumvention of
+technological measures.
+
+  4. Conveying Verbatim Copies.
+
+  You may convey verbatim copies of the Program's source code as you
+receive it, in any medium, provided that you conspicuously and
+appropriately publish on each copy an appropriate copyright notice;
+keep intact all notices stating that this License and any
+non-permissive terms added in accord with section 7 apply to the code;
+keep intact all notices of the absence of any warranty; and give all
+recipients a copy of this License along with the Program.
+
+  You may charge any price or no price for each copy that you convey,
+and you may offer support or warranty protection for a fee.
+
+  5. Conveying Modified Source Versions.
+
+  You may convey a work based on the Program, or the modifications to
+produce it from the Program, in the form of source code under the
+terms of section 4, provided that you also meet all of these conditions:
+
+    a) The work must carry prominent notices stating that you modified
+    it, and giving a relevant date.
+
+    b) The work must carry prominent notices stating that it is
+    released under this License and any conditions added under section
+    7.  This requirement modifies the requirement in section 4 to
+    "keep intact all notices".
+
+    c) You must license the entire work, as a whole, under this
+    License to anyone who comes into possession of a copy.  This
+    License will therefore apply, along with any applicable section 7
+    additional terms, to the whole of the work, and all its parts,
+    regardless of how they are packaged.  This License gives no
+    permission to license the work in any other way, but it does not
+    invalidate such permission if you have separately received it.
+
+    d) If the work has interactive user interfaces, each must display
+    Appropriate Legal Notices; however, if the Program has interactive
+    interfaces that do not display Appropriate Legal Notices, your
+    work need not make them do so.
+
+  A compilation of a covered work with other separate and independent
+works, which are not by their nature extensions of the covered work,
+and which are not combined with it such as to form a larger program,
+in or on a volume of a storage or distribution medium, is called an
+"aggregate" if the compilation and its resulting copyright are not
+used to limit the access or legal rights of the compilation's users
+beyond what the individual works permit.  Inclusion of a covered work
+in an aggregate does not cause this License to apply to the other
+parts of the aggregate.
+
+  6. Conveying Non-Source Forms.
+
+  You may convey a covered work in object code form under the terms
+of sections 4 and 5, provided that you also convey the
+machine-readable Corresponding Source under the terms of this License,
+in one of these ways:
+
+    a) Convey the object code in, or embodied in, a physical product
+    (including a physical distribution medium), accompanied by the
+    Corresponding Source fixed on a durable physical medium
+    customarily used for software interchange.
+
+    b) Convey the object code in, or embodied in, a physical product
+    (including a physical distribution medium), accompanied by a
+    written offer, valid for at least three years and valid for as
+    long as you offer spare parts or customer support for that product
+    model, to give anyone who possesses the object code either (1) a
+    copy of the Corresponding Source for all the software in the
+    product that is covered by this License, on a durable physical
+    medium customarily used for software interchange, for a price no
+    more than your reasonable cost of physically performing this
+    conveying of source, or (2) access to copy the
+    Corresponding Source from a network server at no charge.
+
+    c) Convey individual copies of the object code with a copy of the
+    written offer to provide the Corresponding Source.  This
+    alternative is allowed only occasionally and noncommercially, and
+    only if you received the object code with such an offer, in accord
+    with subsection 6b.
+
+    d) Convey the object code by offering access from a designated
+    place (gratis or for a charge), and offer equivalent access to the
+    Corresponding Source in the same way through the same place at no
+    further charge.  You need not require recipients to copy the
+    Corresponding Source along with the object code.  If the place to
+    copy the object code is a network server, the Corresponding Source
+    may be on a different server (operated by you or a third party)
+    that supports equivalent copying facilities, provided you maintain
+    clear directions next to the object code saying where to find the
+    Corresponding Source.  Regardless of what server hosts the
+    Corresponding Source, you remain obligated to ensure that it is
+    available for as long as needed to satisfy these requirements.
+
+    e) Convey the object code using peer-to-peer transmission, provided
+    you inform other peers where the object code and Corresponding
+    Source of the work are being offered to the general public at no
+    charge under subsection 6d.
+
+  A separable portion of the object code, whose source code is excluded
+from the Corresponding Source as a System Library, need not be
+included in conveying the object code work.
+
+  A "User Product" is either (1) a "consumer product", which means any
+tangible personal property which is normally used for personal, family,
+or household purposes, or (2) anything designed or sold for incorporation
+into a dwelling.  In determining whether a product is a consumer product,
+doubtful cases shall be resolved in favor of coverage.  For a particular
+product received by a particular user, "normally used" refers to a
+typical or common use of that class of product, regardless of the status
+of the particular user or of the way in which the particular user
+actually uses, or expects or is expected to use, the product.  A product
+is a consumer product regardless of whether the product has substantial
+commercial, industrial or non-consumer uses, unless such uses represent
+the only significant mode of use of the product.
+
+  "Installation Information" for a User Product means any methods,
+procedures, authorization keys, or other information required to install
+and execute modified versions of a covered work in that User Product from
+a modified version of its Corresponding Source.  The information must
+suffice to ensure that the continued functioning of the modified object
+code is in no case prevented or interfered with solely because
+modification has been made.
+
+  If you convey an object code work under this section in, or with, or
+specifically for use in, a User Product, and the conveying occurs as
+part of a transaction in which the right of possession and use of the
+User Product is transferred to the recipient in perpetuity or for a
+fixed term (regardless of how the transaction is characterized), the
+Corresponding Source conveyed under this section must be accompanied
+by the Installation Information.  But this requirement does not apply
+if neither you nor any third party retains the ability to install
+modified object code on the User Product (for example, the work has
+been installed in ROM).
+
+  The requirement to provide Installation Information does not include a
+requirement to continue to provide support service, warranty, or updates
+for a work that has been modified or installed by the recipient, or for
+the User Product in which it has been modified or installed.  Access to a
+network may be denied when the modification itself materially and
+adversely affects the operation of the network or violates the rules and
+protocols for communication across the network.
+
+  Corresponding Source conveyed, and Installation Information provided,
+in accord with this section must be in a format that is publicly
+documented (and with an implementation available to the public in
+source code form), and must require no special password or key for
+unpacking, reading or copying.
+
+  7. Additional Terms.
+
+  "Additional permissions" are terms that supplement the terms of this
+License by making exceptions from one or more of its conditions.
+Additional permissions that are applicable to the entire Program shall
+be treated as though they were included in this License, to the extent
+that they are valid under applicable law.  If additional permissions
+apply only to part of the Program, that part may be used separately
+under those permissions, but the entire Program remains governed by
+this License without regard to the additional permissions.
+
+  When you convey a copy of a covered work, you may at your option
+remove any additional permissions from that copy, or from any part of
+it.  (Additional permissions may be written to require their own
+removal in certain cases when you modify the work.)  You may place
+additional permissions on material, added by you to a covered work,
+for which you have or can give appropriate copyright permission.
+
+  Notwithstanding any other provision of this License, for material you
+add to a covered work, you may (if authorized by the copyright holders of
+that material) supplement the terms of this License with terms:
+
+    a) Disclaiming warranty or limiting liability differently from the
+    terms of sections 15 and 16 of this License; or
+
+    b) Requiring preservation of specified reasonable legal notices or
+    author attributions in that material or in the Appropriate Legal
+    Notices displayed by works containing it; or
+
+    c) Prohibiting misrepresentation of the origin of that material, or
+    requiring that modified versions of such material be marked in
+    reasonable ways as different from the original version; or
+
+    d) Limiting the use for publicity purposes of names of licensors or
+    authors of the material; or
+
+    e) Declining to grant rights under trademark law for use of some
+    trade names, trademarks, or service marks; or
+
+    f) Requiring indemnification of licensors and authors of that
+    material by anyone who conveys the material (or modified versions of
+    it) with contractual assumptions of liability to the recipient, for
+    any liability that these contractual assumptions directly impose on
+    those licensors and authors.
+
+  All other non-permissive additional terms are considered "further
+restrictions" within the meaning of section 10.  If the Program as you
+received it, or any part of it, contains a notice stating that it is
+governed by this License along with a term that is a further
+restriction, you may remove that term.  If a license document contains
+a further restriction but permits relicensing or conveying under this
+License, you may add to a covered work material governed by the terms
+of that license document, provided that the further restriction does
+not survive such relicensing or conveying.
+
+  If you add terms to a covered work in accord with this section, you
+must place, in the relevant source files, a statement of the
+additional terms that apply to those files, or a notice indicating
+where to find the applicable terms.
+
+  Additional terms, permissive or non-permissive, may be stated in the
+form of a separately written license, or stated as exceptions;
+the above requirements apply either way.
+
+  8. Termination.
+
+  You may not propagate or modify a covered work except as expressly
+provided under this License.  Any attempt otherwise to propagate or
+modify it is void, and will automatically terminate your rights under
+this License (including any patent licenses granted under the third
+paragraph of section 11).
+
+  However, if you cease all violation of this License, then your
+license from a particular copyright holder is reinstated (a)
+provisionally, unless and until the copyright holder explicitly and
+finally terminates your license, and (b) permanently, if the copyright
+holder fails to notify you of the violation by some reasonable means
+prior to 60 days after the cessation.
+
+  Moreover, your license from a particular copyright holder is
+reinstated permanently if the copyright holder notifies you of the
+violation by some reasonable means, this is the first time you have
+received notice of violation of this License (for any work) from that
+copyright holder, and you cure the violation prior to 30 days after
+your receipt of the notice.
+
+  Termination of your rights under this section does not terminate the
+licenses of parties who have received copies or rights from you under
+this License.  If your rights have been terminated and not permanently
+reinstated, you do not qualify to receive new licenses for the same
+material under section 10.
+
+  9. Acceptance Not Required for Having Copies.
+
+  You are not required to accept this License in order to receive or
+run a copy of the Program.  Ancillary propagation of a covered work
+occurring solely as a consequence of using peer-to-peer transmission
+to receive a copy likewise does not require acceptance.  However,
+nothing other than this License grants you permission to propagate or
+modify any covered work.  These actions infringe copyright if you do
+not accept this License.  Therefore, by modifying or propagating a
+covered work, you indicate your acceptance of this License to do so.
+
+  10. Automatic Licensing of Downstream Recipients.
+
+  Each time you convey a covered work, the recipient automatically
+receives a license from the original licensors, to run, modify and
+propagate that work, subject to this License.  You are not responsible
+for enforcing compliance by third parties with this License.
+
+  An "entity transaction" is a transaction transferring control of an
+organization, or substantially all assets of one, or subdividing an
+organization, or merging organizations.  If propagation of a covered
+work results from an entity transaction, each party to that
+transaction who receives a copy of the work also receives whatever
+licenses to the work the party's predecessor in interest had or could
+give under the previous paragraph, plus a right to possession of the
+Corresponding Source of the work from the predecessor in interest, if
+the predecessor has it or can get it with reasonable efforts.
+
+  You may not impose any further restrictions on the exercise of the
+rights granted or affirmed under this License.  For example, you may
+not impose a license fee, royalty, or other charge for exercise of
+rights granted under this License, and you may not initiate litigation
+(including a cross-claim or counterclaim in a lawsuit) alleging that
+any patent claim is infringed by making, using, selling, offering for
+sale, or importing the Program or any portion of it.
+
+  11. Patents.
+
+  A "contributor" is a copyright holder who authorizes use under this
+License of the Program or a work on which the Program is based.  The
+work thus licensed is called the contributor's "contributor version".
+
+  A contributor's "essential patent claims" are all patent claims
+owned or controlled by the contributor, whether already acquired or
+hereafter acquired, that would be infringed by some manner, permitted
+by this License, of making, using, or selling its contributor version,
+but do not include claims that would be infringed only as a
+consequence of further modification of the contributor version.  For
+purposes of this definition, "control" includes the right to grant
+patent sublicenses in a manner consistent with the requirements of
+this License.
+
+  Each contributor grants you a non-exclusive, worldwide, royalty-free
+patent license under the contributor's essential patent claims, to
+make, use, sell, offer for sale, import and otherwise run, modify and
+propagate the contents of its contributor version.
+
+  In the following three paragraphs, a "patent license" is any express
+agreement or commitment, however denominated, not to enforce a patent
+(such as an express permission to practice a patent or covenant not to
+sue for patent infringement).  To "grant" such a patent license to a
+party means to make such an agreement or commitment not to enforce a
+patent against the party.
+
+  If you convey a covered work, knowingly relying on a patent license,
+and the Corresponding Source of the work is not available for anyone
+to copy, free of charge and under the terms of this License, through a
+publicly available network server or other readily accessible means,
+then you must either (1) cause the Corresponding Source to be so
+available, or (2) arrange to deprive yourself of the benefit of the
+patent license for this particular work, or (3) arrange, in a manner
+consistent with the requirements of this License, to extend the patent
+license to downstream recipients.  "Knowingly relying" means you have
+actual knowledge that, but for the patent license, your conveying the
+covered work in a country, or your recipient's use of the covered work
+in a country, would infringe one or more identifiable patents in that
+country that you have reason to believe are valid.
+
+  If, pursuant to or in connection with a single transaction or
+arrangement, you convey, or propagate by procuring conveyance of, a
+covered work, and grant a patent license to some of the parties
+receiving the covered work authorizing them to use, propagate, modify
+or convey a specific copy of the covered work, then the patent license
+you grant is automatically extended to all recipients of the covered
+work and works based on it.
+
+  A patent license is "discriminatory" if it does not include within
+the scope of its coverage, prohibits the exercise of, or is
+conditioned on the non-exercise of one or more of the rights that are
+specifically granted under this License.  You may not convey a covered
+work if you are a party to an arrangement with a third party that is
+in the business of distributing software, under which you make payment
+to the third party based on the extent of your activity of conveying
+the work, and under which the third party grants, to any of the
+parties who would receive the covered work from you, a discriminatory
+patent license (a) in connection with copies of the covered work
+conveyed by you (or copies made from those copies), or (b) primarily
+for and in connection with specific products or compilations that
+contain the covered work, unless you entered into that arrangement,
+or that patent license was granted, prior to 28 March 2007.
+
+  Nothing in this License shall be construed as excluding or limiting
+any implied license or other defenses to infringement that may
+otherwise be available to you under applicable patent law.
+
+  12. No Surrender of Others' Freedom.
+
+  If conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License.  If you cannot convey a
+covered work so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you may
+not convey it at all.  For example, if you agree to terms that obligate you
+to collect a royalty for further conveying from those to whom you convey
+the Program, the only way you could satisfy both those terms and this
+License would be to refrain entirely from conveying the Program.
+
+  13. Use with the GNU Affero General Public License.
+
+  Notwithstanding any other provision of this License, you have
+permission to link or combine any covered work with a work licensed
+under version 3 of the GNU Affero General Public License into a single
+combined work, and to convey the resulting work.  The terms of this
+License will continue to apply to the part which is the covered work,
+but the special requirements of the GNU Affero General Public License,
+section 13, concerning interaction through a network will apply to the
+combination as such.
+
+  14. Revised Versions of this License.
+
+  The Free Software Foundation may publish revised and/or new versions of
+the GNU General Public License from time to time.  Such new versions will
+be similar in spirit to the present version, but may differ in detail to
+address new problems or concerns.
+
+  Each version is given a distinguishing version number.  If the
+Program specifies that a certain numbered version of the GNU General
+Public License "or any later version" applies to it, you have the
+option of following the terms and conditions either of that numbered
+version or of any later version published by the Free Software
+Foundation.  If the Program does not specify a version number of the
+GNU General Public License, you may choose any version ever published
+by the Free Software Foundation.
+
+  If the Program specifies that a proxy can decide which future
+versions of the GNU General Public License can be used, that proxy's
+public statement of acceptance of a version permanently authorizes you
+to choose that version for the Program.
+
+  Later license versions may give you additional or different
+permissions.  However, no additional obligations are imposed on any
+author or copyright holder as a result of your choosing to follow a
+later version.
+
+  15. Disclaimer of Warranty.
+
+  THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
+APPLICABLE LAW.  EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
+HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
+OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
+THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
+IS WITH YOU.  SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
+ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
+
+  16. Limitation of Liability.
+
+  IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
+THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
+GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
+USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
+DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
+PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
+EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
+SUCH DAMAGES.
+
+  17. Interpretation of Sections 15 and 16.
+
+  If the disclaimer of warranty and limitation of liability provided
+above cannot be given local legal effect according to their terms,
+reviewing courts shall apply local law that most closely approximates
+an absolute waiver of all civil liability in connection with the
+Program, unless a warranty or assumption of liability accompanies a
+copy of the Program in return for a fee.
+
+                     END OF TERMS AND CONDITIONS
+
+            How to Apply These Terms to Your New Programs
+
+  If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these terms.
+
+  To do so, attach the following notices to the program.  It is safest
+to attach them to the start of each source file to most effectively
+state the exclusion of warranty; and each file should have at least
+the "copyright" line and a pointer to where the full notice is found.
+
+    <one line to give the program's name and a brief idea of what it does.>
+    Copyright (C) <year>  <name of author>
+
+    This program is free software: you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program.  If not, see <https://www.gnu.org/licenses/>.
+
+Also add information on how to contact you by electronic and paper mail.
+
+  If the program does terminal interaction, make it output a short
+notice like this when it starts in an interactive mode:
+
+    <program>  Copyright (C) <year>  <name of author>
+    This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
+    This is free software, and you are welcome to redistribute it
+    under certain conditions; type `show c' for details.
+
+The hypothetical commands `show w' and `show c' should show the appropriate
+parts of the General Public License.  Of course, your program's commands
+might be different; for a GUI interface, you would use an "about box".
+
+  You should also get your employer (if you work as a programmer) or school,
+if any, to sign a "copyright disclaimer" for the program, if necessary.
+For more information on this, and how to apply and follow the GNU GPL, see
+<https://www.gnu.org/licenses/>.
+
+  The GNU General Public License does not permit incorporating your program
+into proprietary programs.  If your program is a subroutine library, you
+may consider it more useful to permit linking proprietary applications with
+the library.  If this is what you want to do, use the GNU Lesser General
+Public License instead of this License.  But first, please read
+<https://www.gnu.org/licenses/why-not-lgpl.html>.

README.md

@@ -6,6 +6,14 @@
 
 ## FlClash
 
+<p style="text-align: left;">
+    <img alt="stars" src="https://img.shields.io/github/stars/chen08209/FlClash?style=flat-square&logo=github"/>
+    <img alt="downloads" src="https://img.shields.io/github/downloads/chen08209/FlClash/total"/>
+    <a href="LICENSE">
+        <img alt="license" src="https://img.shields.io/github/license/chen08209/FlClash"/>
+    </a>
+</p>
+
 A multi-platform proxy client based on ClashMeta, simple and easy to use, open-source and ad-free.
 
 on Desktop:
@@ -26,6 +34,8 @@ on Mobile:
 
 💡 Based on Material You Design, [Surfboard](https://github.com/getsurfboard/surfboard)-like UI
 
+☁️ Supports data sync via WebDAV
+
 ✨ Support subscription link, Dark mode
 
 ## Contact
@@ -88,4 +98,14 @@ on Mobile:
            ```
            
 
-    
+    
+
+## Star
+
+The easiest way to support developers is to click on the star (⭐) at the top of the page.
+
+<p style="text-align: center;">
+    <a href="https://api.star-history.com/svg?repos=chen08209/FlClash&Date">
+        <img alt="start" width=50% src="https://api.star-history.com/svg?repos=chen08209/FlClash&Date"/>
+    </a>
+</p>

README_zh_CN.md

@@ -6,6 +6,14 @@
 
 ## FlClash
 
+<p style="text-align: left;">
+    <img alt="stars" src="https://img.shields.io/github/stars/chen08209/FlClash?style=flat-square&logo=github"/>
+    <img alt="downloads" src="https://img.shields.io/github/downloads/chen08209/FlClash/total"/>
+    <a href="LICENSE">
+        <img alt="license" src="https://img.shields.io/github/license/chen08209/FlClash"/>
+    </a>
+</p>
+
 基于ClashMeta的多平台代理客户端，简单易用，开源无广告。
 
 on Desktop:
@@ -26,6 +34,8 @@ on Mobile:
 
 💡 基本 Material You 设计, 类[Surfboard](https://github.com/getsurfboard/surfboard)用户界面
 
+☁️ 支持通过WebDAV同步数据
+
 ✨ 支持一键导入订阅, 深色模式
 
 ## Contact
@@ -85,4 +95,14 @@ on Mobile:
 
            ```bash
              dart .\setup.dart	
-           ```
+           ```
+
+## Star History
+
+支持开发者的最简单方式是点击页面顶部的星标（⭐）。
+
+<p style="text-align: center;">
+    <a href="https://api.star-history.com/svg?repos=chen08209/FlClash&Date">
+        <img alt="start" width=50% src="https://api.star-history.com/svg?repos=chen08209/FlClash&Date"/>
+    </a>
+</p>

android/app/src/main/AndroidManifest.xml

@@ -1,9 +1,6 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools">
 
-    <uses-feature
-            android:name="android.software.leanback"
-            android:required="false" />
     <uses-feature
             android:name="android.hardware.touchscreen"
             android:required="false" />
@@ -17,14 +14,19 @@
     <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
     <uses-permission android:name="android.permission.CHANGE_NETWORK_STATE" />
-    <uses-permission android:name="android.permission.FOREGROUND_SERVICE_SPECIAL_USE" />
-    <uses-permission android:name="android.permission.QUERY_ALL_PACKAGES" tools:ignore="QueryAllPackagesPermission"/>
+    <uses-permission android:name="android.permission.FOREGROUND_SERVICE_SPECIAL_USE"
+        tools:ignore="SystemPermissionTypo" />
+    <uses-permission android:name="android.permission.QUERY_ALL_PACKAGES"
+        tools:ignore="QueryAllPackagesPermission" />
 
     <application
         android:name="${applicationName}"
         android:icon="@mipmap/ic_launcher"
         android:networkSecurityConfig="@xml/network_security_config"
-        android:label="FlClash">
+        android:extractNativeLibs="true"
+        android:enableOnBackInvokedCallback="true"
+        android:label="FlClash"
+        tools:targetApi="tiramisu">
         <activity
             android:name="com.follow.clash.MainActivity"
             android:configChanges="orientation|keyboardHidden|keyboard|screenSize|smallestScreenSize|locale|layoutDirection|fontScale|screenLayout|density|uiMode"
@@ -73,7 +75,8 @@
         <service
             android:name=".services.FlClashTileService"
             android:exported="true"
-            android:icon="@drawable/tile_icon"
+            android:icon="@drawable/ic_stat_name"
+            android:foregroundServiceType="specialUse"
             android:label="FlClash"
             android:permission="android.permission.BIND_QUICK_SETTINGS_TILE">
             <intent-filter>

android/app/src/main/kotlin/com/follow/clash/GlobalState.kt

@@ -1,9 +1,16 @@
 package com.follow.clash
 
+import android.content.Context
+import android.util.Log
 import androidx.lifecycle.MutableLiveData
+import com.follow.clash.plugins.AppPlugin
+import com.follow.clash.plugins.ProxyPlugin
 import com.follow.clash.plugins.TilePlugin
+import io.flutter.FlutterInjector
 import io.flutter.embedding.engine.FlutterEngine
-import java.util.Date
+import io.flutter.embedding.engine.dart.DartExecutor
+import java.util.concurrent.locks.ReentrantLock
+import kotlin.concurrent.withLock
 
 enum class RunState {
     START,
@@ -11,13 +18,48 @@ enum class RunState {
     STOP
 }
 
-class GlobalState {
-    companion object {
-        val runState: MutableLiveData<RunState> = MutableLiveData<RunState>(RunState.STOP)
-        var runTime: Date? = null
-        var flutterEngine: FlutterEngine? = null
-        fun getCurrentTilePlugin(): TilePlugin? =
-            flutterEngine?.plugins?.get(TilePlugin::class.java) as TilePlugin?
+
+object GlobalState {
+
+    private val lock = ReentrantLock()
+
+    val runState: MutableLiveData<RunState> = MutableLiveData<RunState>(RunState.STOP)
+    var flutterEngine: FlutterEngine? = null
+    private var serviceEngine: FlutterEngine? = null
+
+    fun getCurrentAppPlugin(): AppPlugin? {
+        val currentEngine = if (flutterEngine != null) flutterEngine else serviceEngine
+        return currentEngine?.plugins?.get(AppPlugin::class.java) as AppPlugin?
+    }
+
+    fun getCurrentTitlePlugin(): TilePlugin? {
+        val currentEngine = if (flutterEngine != null) flutterEngine else serviceEngine
+        return currentEngine?.plugins?.get(TilePlugin::class.java) as TilePlugin?
+    }
+
+    fun destroyServiceEngine() {
+        serviceEngine?.destroy()
+        serviceEngine = null
+    }
+
+    fun initServiceEngine(context: Context) {
+        if (serviceEngine != null) return
+        lock.withLock {
+            destroyServiceEngine()
+            serviceEngine = FlutterEngine(context)
+            serviceEngine?.plugins?.add(ProxyPlugin())
+            serviceEngine?.plugins?.add(AppPlugin())
+            serviceEngine?.plugins?.add(TilePlugin())
+            val vpnService = DartExecutor.DartEntrypoint(
+                FlutterInjector.instance().flutterLoader().findAppBundlePath(),
+                "vpnService"
+            )
+            serviceEngine?.dartExecutor?.executeDartEntrypoint(
+                vpnService,
+            )
+
+            Log.e("FlClashVpnService", "initServiceEngine ===>")
+        }
     }
 }
 

android/app/src/main/kotlin/com/follow/clash/MainActivity.kt

@@ -10,7 +10,6 @@ import io.flutter.embedding.engine.FlutterEngine
 class MainActivity : FlutterActivity() {
 
     override fun configureFlutterEngine(flutterEngine: FlutterEngine) {
-        GlobalState.flutterEngine?.destroy()
         super.configureFlutterEngine(flutterEngine)
         flutterEngine.plugins.add(AppPlugin())
         flutterEngine.plugins.add(ProxyPlugin())

android/app/src/main/kotlin/com/follow/clash/extensions/Drawable.kt

@@ -1,17 +1,18 @@
 package com.follow.clash.extensions
 
-import java.net.InetSocketAddress
-
 import android.graphics.Bitmap
 import android.graphics.drawable.Drawable
 import android.system.OsConstants.IPPROTO_TCP
 import android.system.OsConstants.IPPROTO_UDP
 import android.util.Base64
+import java.net.URL
 import androidx.core.graphics.drawable.toBitmap
 import com.follow.clash.models.Metadata
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.withContext
 import java.io.ByteArrayOutputStream
+import java.net.InetAddress
+import java.net.InetSocketAddress
 
 
 suspend fun Drawable.getBase64(): String {
@@ -29,3 +30,8 @@ fun Metadata.getProtocol(): Int? {
     if (network.startsWith("udp")) return IPPROTO_UDP
     return null
 }
+
+fun String.getInetSocketAddress(): InetSocketAddress {
+    val url = URL("https://$this")
+    return InetSocketAddress(InetAddress.getByName(url.host), url.port)
+}

android/app/src/main/kotlin/com/follow/clash/models/Process.kt

@@ -1,11 +1,15 @@
 package com.follow.clash.models
 
+data class Process(
+    val id: Int,
+    val metadata: Metadata,
+)
+
 data class Metadata(
     val network: String,
     val sourceIP: String,
     val sourcePort: Int,
     val destinationIP: String,
     val destinationPort: Int,
-    val remoteDestination: String,
     val host: String
 )

android/app/src/main/kotlin/com/follow/clash/models/Props.kt

@@ -10,3 +10,9 @@ data class AccessControl(
     val acceptList: List<String>,
     val rejectList: List<String>,
 )
+
+data class Props(
+    val accessControl: AccessControl?,
+    val allowBypass: Boolean?,
+    val systemProxy: Boolean?,
+)

android/app/src/main/kotlin/com/follow/clash/plugins/AppPlugin.kt

@@ -2,24 +2,27 @@ package com.follow.clash.plugins
 
 import android.Manifest
 import android.app.Activity
+import android.app.ActivityManager
 import android.content.Context
 import android.content.pm.ApplicationInfo
 import android.content.pm.PackageManager
 import android.net.ConnectivityManager
 import android.os.Build
 import android.widget.Toast
-import androidx.annotation.RequiresApi
+import androidx.core.content.ContextCompat.getSystemService
 import androidx.core.content.getSystemService
+import com.follow.clash.GlobalState
 import com.follow.clash.extensions.getBase64
 import com.follow.clash.extensions.getProtocol
-import com.follow.clash.models.Metadata
 import com.follow.clash.models.Package
+import com.follow.clash.models.Process
 import com.google.gson.Gson
 import io.flutter.embedding.engine.plugins.FlutterPlugin
 import io.flutter.embedding.engine.plugins.activity.ActivityAware
 import io.flutter.embedding.engine.plugins.activity.ActivityPluginBinding
 import io.flutter.plugin.common.MethodCall
 import io.flutter.plugin.common.MethodChannel
+import io.flutter.plugin.common.MethodChannel.Result
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.cancel
@@ -27,6 +30,7 @@ import kotlinx.coroutines.launch
 import kotlinx.coroutines.withContext
 import java.net.InetSocketAddress
 
+
 class AppPlugin : FlutterPlugin, MethodChannel.MethodCallHandler, ActivityAware {
 
     private var activity: Activity? = null
@@ -44,31 +48,41 @@ class AppPlugin : FlutterPlugin, MethodChannel.MethodCallHandler, ActivityAware
     private val iconMap = mutableMapOf<String, String?>()
 
     override fun onAttachedToEngine(flutterPluginBinding: FlutterPlugin.FlutterPluginBinding) {
+        scope = CoroutineScope(Dispatchers.Default)
         context = flutterPluginBinding.applicationContext;
         channel = MethodChannel(flutterPluginBinding.binaryMessenger, "app")
         channel.setMethodCallHandler(this)
+
     }
 
     override fun onDetachedFromEngine(binding: FlutterPlugin.FlutterPluginBinding) {
         channel.setMethodCallHandler(null)
+        scope.cancel()
     }
 
     private fun tip(message: String?) {
-        if (toast != null) {
-            toast!!.cancel()
+        if(GlobalState.flutterEngine == null){
+            if (toast != null) {
+                toast!!.cancel()
+            }
+            toast = Toast.makeText(context, message, Toast.LENGTH_SHORT)
+            toast!!.show()
         }
-        toast = Toast.makeText(context, message, Toast.LENGTH_SHORT)
-        toast!!.show()
     }
 
-    @RequiresApi(Build.VERSION_CODES.Q)
-    override fun onMethodCall(call: MethodCall, result: MethodChannel.Result) {
+    override fun onMethodCall(call: MethodCall, result: Result) {
         when (call.method) {
             "moveTaskToBack" -> {
                 activity?.moveTaskToBack(true)
                 result.success(true);
             }
 
+            "updateExcludeFromRecents" -> {
+                val value = call.argument<Boolean>("value")
+                updateExcludeFromRecents(value)
+                result.success(true);
+            }
+
             "getPackages" -> {
                 scope.launch {
                     result.success(getPackages())
@@ -78,21 +92,34 @@ class AppPlugin : FlutterPlugin, MethodChannel.MethodCallHandler, ActivityAware
             "getPackageIcon" -> {
                 scope.launch {
                     val packageName = call.argument<String>("packageName")
-                    if (packageName != null) {
-                        result.success(getPackageIcon(packageName))
-                    } else {
+                    if (packageName == null) {
                         result.success(null)
+                        return@launch
+                    }
+                    val packageIcon = getPackageIcon(packageName)
+                    packageIcon.let {
+                        if (it != null) {
+                            result.success(it)
+                            return@launch
+                        }
+                        if (iconMap["default"] == null) {
+                            iconMap["default"] =
+                                context?.packageManager?.defaultActivityIcon?.getBase64()
+                        }
+                        result.success(iconMap["default"])
+                        return@launch
                     }
                 }
             }
 
-            "getPackageName" -> {
+            "resolverProcess" -> {
                 val data = call.argument<String>("data")
-                val metadata =
+                val process =
                     if (data != null) Gson().fromJson(
                         data,
-                        Metadata::class.java
+                        Process::class.java
                     ) else null
+                val metadata = process?.metadata
                 val protocol = metadata?.getProtocol()
                 if (protocol == null) {
                     result.success(null)
@@ -100,17 +127,27 @@ class AppPlugin : FlutterPlugin, MethodChannel.MethodCallHandler, ActivityAware
                 }
                 scope.launch {
                     withContext(Dispatchers.Default) {
-                        if (context == null) result.success(null)
-                        val source = InetSocketAddress(metadata.sourceIP, metadata.sourcePort)
-                        val target = InetSocketAddress(
-                            metadata.host.ifEmpty { metadata.destinationIP },
-                            metadata.destinationPort
-                        )
+                        if (Build.VERSION.SDK_INT < Build.VERSION_CODES.Q) {
+                            result.success(null)
+                            return@withContext
+                        }
+                        if (context == null) {
+                            result.success(null)
+                            return@withContext
+                        }
                         if (connectivity == null) {
                             connectivity = context!!.getSystemService<ConnectivityManager>()
                         }
-                        val uid =
-                            connectivity?.getConnectionOwnerUid(protocol, source, target)
+                        val src = InetSocketAddress(metadata.sourceIP, metadata.sourcePort)
+                        val dst = InetSocketAddress(
+                            metadata.destinationIP.ifEmpty { metadata.host },
+                            metadata.destinationPort
+                        )
+                        val uid = try {
+                            connectivity?.getConnectionOwnerUid(protocol, src, dst)
+                        } catch (_: Exception) {
+                            null
+                        }
                         if (uid == null || uid == -1) {
                             result.success(null)
                             return@withContext
@@ -125,7 +162,6 @@ class AppPlugin : FlutterPlugin, MethodChannel.MethodCallHandler, ActivityAware
                 val message = call.argument<String>("message")
                 tip(message)
                 result.success(true)
-
             }
 
             else -> {
@@ -134,16 +170,39 @@ class AppPlugin : FlutterPlugin, MethodChannel.MethodCallHandler, ActivityAware
         }
     }
 
+    private fun updateExcludeFromRecents(value: Boolean?) {
+        if (context == null) return
+        val am = getSystemService(context!!, ActivityManager::class.java)
+        val task = am?.appTasks?.firstOrNull {
+            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
+                it.taskInfo.taskId == activity?.taskId
+            } else {
+                it.taskInfo.id == activity?.taskId
+            }
+        }
+
+        when (value) {
+            true -> task?.setExcludeFromRecents(value)
+            false -> task?.setExcludeFromRecents(value)
+            null -> task?.setExcludeFromRecents(false)
+        }
+    }
+
     private suspend fun getPackageIcon(packageName: String): String? {
         val packageManager = context?.packageManager
         if (iconMap[packageName] == null) {
-            iconMap[packageName] = packageManager?.getApplicationIcon(packageName)?.getBase64()
+            iconMap[packageName] = try {
+                packageManager?.getApplicationIcon(packageName)?.getBase64()
+            } catch (_: Exception) {
+                null
+            }
+
         }
         return iconMap[packageName]
     }
 
     private suspend fun getPackages(): String {
-        return withContext(Dispatchers.Default){
+        return withContext(Dispatchers.Default) {
             val packageManager = context?.packageManager
             val packages: List<Package>? =
                 packageManager?.getInstalledPackages(PackageManager.GET_META_DATA)?.filter {
@@ -162,13 +221,16 @@ class AppPlugin : FlutterPlugin, MethodChannel.MethodCallHandler, ActivityAware
         }
     }
 
+    fun requestGc() {
+        channel.invokeMethod("gc", null)
+    }
+
     override fun onAttachedToActivity(binding: ActivityPluginBinding) {
         activity = binding.activity;
-        scope = CoroutineScope(Dispatchers.Default)
     }
 
     override fun onDetachedFromActivityForConfigChanges() {
-        activity = null;
+        activity = null
     }
 
     override fun onReattachedToActivityForConfigChanges(binding: ActivityPluginBinding) {
@@ -177,7 +239,6 @@ class AppPlugin : FlutterPlugin, MethodChannel.MethodCallHandler, ActivityAware
 
     override fun onDetachedFromActivity() {
         channel.invokeMethod("exit", null)
-        scope.cancel()
-        activity = null;
+        activity = null
     }
 }

android/app/src/main/kotlin/com/follow/clash/plugins/ProxyPlugin.kt

@@ -1,7 +1,6 @@
 package com.follow.clash.plugins
 
 import android.Manifest
-import android.annotation.SuppressLint
 import android.app.Activity
 import android.content.ComponentName
 import android.content.Context
@@ -9,14 +8,14 @@ import android.content.Intent
 import android.content.ServiceConnection
 import android.content.pm.PackageManager
 import android.net.VpnService
-import android.os.Build.VERSION
-import android.os.Build.VERSION_CODES
+import android.os.Build
 import android.os.IBinder
+import android.util.Log
 import androidx.core.app.ActivityCompat
 import androidx.core.content.ContextCompat
 import com.follow.clash.GlobalState
 import com.follow.clash.RunState
-import com.follow.clash.models.AccessControl
+import com.follow.clash.models.Props
 import com.follow.clash.services.FlClashVpnService
 import com.google.gson.Gson
 import io.flutter.embedding.android.FlutterActivity
@@ -25,37 +24,36 @@ import io.flutter.embedding.engine.plugins.activity.ActivityAware
 import io.flutter.embedding.engine.plugins.activity.ActivityPluginBinding
 import io.flutter.plugin.common.MethodCall
 import io.flutter.plugin.common.MethodChannel
-import java.util.Date
 
 
 class ProxyPlugin : FlutterPlugin, MethodChannel.MethodCallHandler, ActivityAware {
 
+    private lateinit var flutterMethodChannel: MethodChannel
 
     val VPN_PERMISSION_REQUEST_CODE = 1001
     val NOTIFICATION_PERMISSION_REQUEST_CODE = 1002
 
-    private lateinit var flutterMethodChannel: MethodChannel
-
     private var activity: Activity? = null
     private var context: Context? = null
     private var flClashVpnService: FlClashVpnService? = null
-    private var isBound = false
-    private var port: Int? = null
-    private var accessControl: AccessControl? = null
-    private lateinit var title: String
-    private lateinit var content: String
+    private var port: Int = 7890
+    private var props: Props? = null
+    private var isBlockNotification: Boolean = false
+    private var isStart: Boolean = false
 
     private val connection = object : ServiceConnection {
         override fun onServiceConnected(className: ComponentName, service: IBinder) {
             val binder = service as FlClashVpnService.LocalBinder
             flClashVpnService = binder.getService()
-            port?.let { startVpn(it) }
-            isBound = true
+            if (isStart) {
+                startVpn()
+            } else {
+                flClashVpnService?.initServiceEngine()
+            }
         }
 
-        override fun onServiceDisconnected(arg0: ComponentName) {
+        override fun onServiceDisconnected(arg: ComponentName) {
             flClashVpnService = null
-            isBound = false
         }
     }
 
@@ -70,21 +68,29 @@ class ProxyPlugin : FlutterPlugin, MethodChannel.MethodCallHandler, ActivityAwar
     }
 
     override fun onMethodCall(call: MethodCall, result: MethodChannel.Result) = when (call.method) {
-        "StartProxy" -> {
-            port = call.argument<Int>("port")
-            val args = call.argument<String>("args")
-            accessControl =
-                if (args != null) Gson().fromJson(args, AccessControl::class.java) else null
-            handleStartVpn()
+        "initService" -> {
+            isStart = false
+            initService()
+            requestNotificationsPermission()
             result.success(true)
         }
 
-        "StopProxy" -> {
+        "startProxy" -> {
+            isStart = true
+            port = call.argument<Int>("port")!!
+            val args = call.argument<String>("args")
+            props =
+                if (args != null) Gson().fromJson(args, Props::class.java) else null
+            startVpn()
+            result.success(true)
+        }
+
+        "stopProxy" -> {
             stopVpn()
             result.success(true)
         }
 
-        "SetProtect" -> {
+        "setProtect" -> {
             val fd = call.argument<Int>("fd")
             if (fd != null) {
                 flClashVpnService?.protect(fd)
@@ -94,14 +100,10 @@ class ProxyPlugin : FlutterPlugin, MethodChannel.MethodCallHandler, ActivityAwar
             }
         }
 
-        "GetRunTimeStamp" -> {
-            result.success(GlobalState.runTime?.time)
-        }
-
         "startForeground" -> {
-            title = call.argument<String>("title") as String
-            content = call.argument<String>("content") as String
-            requestNotificationsPermission()
+            val title = call.argument<String>("title") as String
+            val content = call.argument<String>("content") as String
+            startForeground(title, content)
             result.success(true)
         }
 
@@ -110,65 +112,47 @@ class ProxyPlugin : FlutterPlugin, MethodChannel.MethodCallHandler, ActivityAwar
         }
     }
 
-    private fun handleStartVpn() {
+    private fun initService() {
         val intent = VpnService.prepare(context)
         if (intent != null) {
             activity?.startActivityForResult(intent, VPN_PERMISSION_REQUEST_CODE)
         } else {
-            bindService()
+            if (flClashVpnService != null) {
+                flClashVpnService!!.initServiceEngine()
+            } else {
+                bindService()
+            }
         }
     }
 
-    private fun startVpn(port: Int) {
-        if (GlobalState.runState.value == RunState.START) return;
-        flClashVpnService?.start(port, accessControl)
+    private fun startVpn() {
+        if (flClashVpnService == null) {
+            bindService()
+            return
+        }
+        if (GlobalState.runState.value == RunState.START) return
         GlobalState.runState.value = RunState.START
-        GlobalState.runTime = Date()
-        startAfter()
+        val intent = VpnService.prepare(context)
+        if (intent != null) {
+            stopVpn()
+            return
+        }
+        val fd = flClashVpnService?.start(port, props)
+        flutterMethodChannel.invokeMethod("started", fd)
     }
 
     private fun stopVpn() {
         if (GlobalState.runState.value == RunState.STOP) return
+        GlobalState.runState.value = RunState.STOP
         flClashVpnService?.stop()
-        unbindService()
-        GlobalState.runState.value = RunState.STOP;
-        GlobalState.runTime = null;
+        GlobalState.destroyServiceEngine()
     }
 
-    @SuppressLint("ForegroundServiceType")
-    private fun startForeground() {
+    private fun startForeground(title: String, content: String) {
         if (GlobalState.runState.value != RunState.START) return
         flClashVpnService?.startForeground(title, content)
     }
 
-    private fun requestNotificationsPermission() {
-        if (VERSION.SDK_INT >= VERSION_CODES.TIRAMISU) {
-            val permission = context?.let {
-                ContextCompat.checkSelfPermission(
-                    it,
-                    Manifest.permission.POST_NOTIFICATIONS
-                )
-            }
-            if (permission == PackageManager.PERMISSION_GRANTED) {
-                startForeground()
-            } else {
-                activity?.let {
-                    ActivityCompat.requestPermissions(
-                        it,
-                        arrayOf(Manifest.permission.POST_NOTIFICATIONS),
-                        NOTIFICATION_PERMISSION_REQUEST_CODE
-                    )
-                }
-            }
-        } else {
-            startForeground()
-        }
-    }
-
-    private fun startAfter() {
-        flutterMethodChannel.invokeMethod("startAfter", flClashVpnService?.fd)
-    }
-
     override fun onAttachedToActivity(binding: ActivityPluginBinding) {
         activity = binding.activity
         binding.addActivityResultListener(::onActivityResult)
@@ -183,7 +167,7 @@ class ProxyPlugin : FlutterPlugin, MethodChannel.MethodCallHandler, ActivityAwar
                 stopVpn()
             }
         }
-        return true;
+        return true
     }
 
     private fun onRequestPermissionsResultListener(
@@ -192,16 +176,33 @@ class ProxyPlugin : FlutterPlugin, MethodChannel.MethodCallHandler, ActivityAwar
         grantResults: IntArray
     ): Boolean {
         if (requestCode == NOTIFICATION_PERMISSION_REQUEST_CODE) {
-            if (grantResults.isNotEmpty() && grantResults[0] == PackageManager.PERMISSION_GRANTED) {
-                startForeground()
-            }
+            isBlockNotification = true
         }
-        return true;
+        return false
     }
 
+    private fun requestNotificationsPermission() {
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
+            val permission = context?.let {
+                ContextCompat.checkSelfPermission(
+                    it,
+                    Manifest.permission.POST_NOTIFICATIONS
+                )
+            }
+            if (permission != PackageManager.PERMISSION_GRANTED) {
+                if (isBlockNotification) return
+                if (activity == null) return
+                ActivityCompat.requestPermissions(
+                    activity!!,
+                    arrayOf(Manifest.permission.POST_NOTIFICATIONS),
+                    NOTIFICATION_PERMISSION_REQUEST_CODE
+                )
+            }
+        }
+    }
 
     override fun onDetachedFromActivityForConfigChanges() {
-        activity = null;
+        activity = null
     }
 
     override fun onReattachedToActivityForConfigChanges(binding: ActivityPluginBinding) {
@@ -209,7 +210,6 @@ class ProxyPlugin : FlutterPlugin, MethodChannel.MethodCallHandler, ActivityAwar
     }
 
     override fun onDetachedFromActivity() {
-        stopVpn()
         activity = null
     }
 
@@ -217,11 +217,4 @@ class ProxyPlugin : FlutterPlugin, MethodChannel.MethodCallHandler, ActivityAwar
         val intent = Intent(context, FlClashVpnService::class.java)
         context?.bindService(intent, connection, Context.BIND_AUTO_CREATE)
     }
-
-    private fun unbindService() {
-        if (isBound) {
-            context?.unbindService(connection)
-            isBound = false
-        }
-    }
 }

android/app/src/main/kotlin/com/follow/clash/plugins/TilePlugin.kt

@@ -1,3 +1,4 @@
+
 package com.follow.clash.plugins
 
 import io.flutter.embedding.engine.plugins.FlutterPlugin

android/app/src/main/kotlin/com/follow/clash/services/FlClashTileService.kt

@@ -1,9 +1,9 @@
 package com.follow.clash.services
 
-import android.annotation.SuppressLint
 import android.app.PendingIntent
 import android.content.Intent
 import android.os.Build
+import android.os.IBinder
 import android.service.quicksettings.Tile
 import android.service.quicksettings.TileService
 import androidx.annotation.RequiresApi
@@ -11,12 +11,6 @@ import androidx.lifecycle.Observer
 import com.follow.clash.GlobalState
 import com.follow.clash.RunState
 import com.follow.clash.TempActivity
-import com.follow.clash.plugins.AppPlugin
-import com.follow.clash.plugins.ProxyPlugin
-import com.follow.clash.plugins.TilePlugin
-import io.flutter.FlutterInjector
-import io.flutter.embedding.engine.FlutterEngine
-import io.flutter.embedding.engine.dart.DartExecutor
 
 
 @RequiresApi(Build.VERSION_CODES.N)
@@ -43,54 +37,45 @@ class FlClashTileService : TileService() {
         GlobalState.runState.observeForever(observer)
     }
 
-    @SuppressLint("StartActivityAndCollapseDeprecated")
     private fun activityTransfer() {
         val intent = Intent(this, TempActivity::class.java)
-        intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
-        if (Build.VERSION.SDK_INT >= 34) {
-            val pendingIntent = PendingIntent.getActivity(
+        intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK or Intent.FLAG_ACTIVITY_MULTIPLE_TASK)
+        val pendingIntent = if (Build.VERSION.SDK_INT >= 31) {
+            PendingIntent.getActivity(
                 this,
                 0,
                 intent,
-                PendingIntent.FLAG_IMMUTABLE
+                PendingIntent.FLAG_IMMUTABLE or PendingIntent.FLAG_UPDATE_CURRENT
             )
+        } else {
+            PendingIntent.getActivity(
+                this,
+                0,
+                intent,
+                PendingIntent.FLAG_UPDATE_CURRENT
+            )
+        }
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.UPSIDE_DOWN_CAKE) {
             startActivityAndCollapse(pendingIntent)
         } else {
             startActivityAndCollapse(intent)
         }
     }
 
-    private var flutterEngine: FlutterEngine? = null;
-
-    private fun initFlutterEngine() {
-        flutterEngine = FlutterEngine(this)
-        flutterEngine?.plugins?.add(ProxyPlugin())
-        flutterEngine?.plugins?.add(TilePlugin())
-        flutterEngine?.plugins?.add(AppPlugin())
-        GlobalState.flutterEngine = flutterEngine
-        if (flutterEngine?.dartExecutor?.isExecutingDart != true) {
-            val vpnService = DartExecutor.DartEntrypoint(
-                FlutterInjector.instance().flutterLoader().findAppBundlePath(),
-                "vpnService"
-            )
-            flutterEngine?.dartExecutor?.executeDartEntrypoint(vpnService)
-        }
-    }
-
     override fun onClick() {
         super.onClick()
         activityTransfer()
-        val currentTilePlugin = GlobalState.getCurrentTilePlugin()
         if (GlobalState.runState.value == RunState.STOP) {
             GlobalState.runState.value = RunState.PENDING
-            if(currentTilePlugin == null){
-                initFlutterEngine()
-            }else{
-                currentTilePlugin.handleStart()
+            val titlePlugin = GlobalState.getCurrentTitlePlugin()
+            if (titlePlugin != null) {
+                titlePlugin.handleStart()
+            } else {
+                GlobalState.initServiceEngine(applicationContext)
             }
-        } else if(GlobalState.runState.value == RunState.START){
+        } else if (GlobalState.runState.value == RunState.START) {
             GlobalState.runState.value = RunState.PENDING
-            currentTilePlugin?.handleStop()
+            GlobalState.getCurrentTitlePlugin()?.handleStop()
         }
 
     }

android/app/src/main/kotlin/com/follow/clash/services/FlClashVpnService.kt

@@ -1,10 +1,9 @@
 package com.follow.clash.services
 
-import android.annotation.SuppressLint
+import android.app.Notification.FOREGROUND_SERVICE_IMMEDIATE
 import android.app.NotificationChannel
 import android.app.NotificationManager
 import android.app.PendingIntent
-import android.app.Service
 import android.content.Intent
 import android.content.pm.ServiceInfo.FOREGROUND_SERVICE_TYPE_SPECIAL_USE
 import android.net.ProxyInfo
@@ -12,20 +11,23 @@ import android.net.VpnService
 import android.os.Binder
 import android.os.Build
 import android.os.IBinder
+import android.os.Parcel
+import android.os.RemoteException
+import android.util.Log
 import androidx.core.app.NotificationCompat
-import androidx.core.graphics.drawable.IconCompat
 import com.follow.clash.GlobalState
 import com.follow.clash.MainActivity
-import com.follow.clash.models.AccessControl
+import com.follow.clash.R
 import com.follow.clash.models.AccessControlMode
+import com.follow.clash.models.Props
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.launch
 
 
 class FlClashVpnService : VpnService() {
-
-
     private val CHANNEL = "FlClash"
 
-    var fd: Int? = null
     private val notificationId: Int = 1
 
     private val passList = listOf(
@@ -48,16 +50,17 @@ class FlClashVpnService : VpnService() {
         "192.168.*"
     )
 
-    override fun onStartCommand(intent: Intent?, flags: Int, startId: Int): Int {
-        return START_STICKY
+    override fun onCreate() {
+        super.onCreate()
+        initServiceEngine()
     }
 
-    fun start(port: Int, accessControl: AccessControl?) {
-        fd = with(Builder()) {
+    fun start(port: Int, props: Props?): Int? {
+        return with(Builder()) {
             addAddress("172.16.0.1", 30)
             setMtu(9000)
             addRoute("0.0.0.0", 0)
-            if (accessControl != null) {
+            props?.accessControl?.let { accessControl ->
                 when (accessControl.mode) {
                     AccessControlMode.acceptSelected -> {
                         (accessControl.acceptList + packageName).forEach {
@@ -78,8 +81,10 @@ class FlClashVpnService : VpnService() {
             if (Build.VERSION.SDK_INT >= 29) {
                 setMetered(false)
             }
-            allowBypass()
-            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
+            if (props?.allowBypass == true) {
+                allowBypass()
+            }
+            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q && props?.systemProxy == true) {
                 setHttpProxy(
                     ProxyInfo.buildDirectProxy(
                         "127.0.0.1",
@@ -97,55 +102,71 @@ class FlClashVpnService : VpnService() {
         stopForeground()
     }
 
-    @SuppressLint("ForegroundServiceType", "WrongConstant")
+    private val notificationBuilder: NotificationCompat.Builder by lazy {
+        val intent = Intent(this, MainActivity::class.java)
+
+        val pendingIntent = if (Build.VERSION.SDK_INT >= 31) {
+            PendingIntent.getActivity(
+                this,
+                0,
+                intent,
+                PendingIntent.FLAG_IMMUTABLE or PendingIntent.FLAG_UPDATE_CURRENT
+            )
+        } else {
+            PendingIntent.getActivity(
+                this,
+                0,
+                intent,
+                PendingIntent.FLAG_UPDATE_CURRENT
+            )
+        }
+        with(NotificationCompat.Builder(this, CHANNEL)) {
+            setSmallIcon(R.drawable.ic_stat_name)
+            setContentTitle("FlClash")
+            setContentIntent(pendingIntent)
+            setCategory(NotificationCompat.CATEGORY_SERVICE)
+            priority = NotificationCompat.PRIORITY_MIN
+            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S) {
+                foregroundServiceBehavior = FOREGROUND_SERVICE_IMMEDIATE
+            }
+            setOngoing(true)
+            setShowWhen(false)
+            setOnlyAlertOnce(true)
+            setAutoCancel(true)
+        }
+    }
+
+    fun initServiceEngine() {
+        GlobalState.initServiceEngine(applicationContext)
+    }
+
+    override fun onTrimMemory(level: Int) {
+        super.onTrimMemory(level)
+        GlobalState.getCurrentAppPlugin()?.requestGc()
+    }
+
     fun startForeground(title: String, content: String) {
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
-            val channel =
-                NotificationChannel(CHANNEL, "FlClash", NotificationManager.IMPORTANCE_LOW)
             val manager = getSystemService(NotificationManager::class.java)
-            manager.createNotificationChannel(channel)
-
-            val intent = Intent(this, MainActivity::class.java)
-
-            val pendingIntent = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
-                PendingIntent.getActivity(
-                    this,
-                    0,
-                    intent,
-                    PendingIntent.FLAG_IMMUTABLE or PendingIntent.FLAG_UPDATE_CURRENT
-                )
-            } else {
-                PendingIntent.getActivity(
-                    this,
-                    0,
-                    intent,
-                    PendingIntent.FLAG_UPDATE_CURRENT
-                )
-            }
-
-            val icon = IconCompat.createWithResource(this, this.applicationInfo.icon)
-
-            val notification = with(NotificationCompat.Builder(this, CHANNEL)) {
-                setSmallIcon(icon)
-                setContentTitle(title)
-                setContentText(content)
-                foregroundServiceBehavior = NotificationCompat.FOREGROUND_SERVICE_IMMEDIATE
-                setContentIntent(pendingIntent)
-                setOngoing(true)
-                setShowWhen(false)
-                build()
-            }
-            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.UPSIDE_DOWN_CAKE) {
-                startForeground(notificationId, notification, FOREGROUND_SERVICE_TYPE_SPECIAL_USE)
-            } else {
-                startForeground(notificationId, notification)
+            var channel = manager?.getNotificationChannel(CHANNEL)
+            if (channel == null) {
+                channel =
+                    NotificationChannel(CHANNEL, "FlClash", NotificationManager.IMPORTANCE_LOW)
+                manager?.createNotificationChannel(channel)
             }
         }
+        val notification =
+            notificationBuilder.setContentTitle(title).setContentText(content).build()
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
+            startForeground(notificationId, notification, FOREGROUND_SERVICE_TYPE_SPECIAL_USE)
+        } else {
+            startForeground(notificationId, notification)
+        }
     }
 
     private fun stopForeground() {
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
-            stopForeground(Service.STOP_FOREGROUND_REMOVE)
+            stopForeground(STOP_FOREGROUND_REMOVE)
         }
     }
 
@@ -153,14 +174,28 @@ class FlClashVpnService : VpnService() {
 
     inner class LocalBinder : Binder() {
         fun getService(): FlClashVpnService = this@FlClashVpnService
+
+        override fun onTransact(code: Int, data: Parcel, reply: Parcel?, flags: Int): Boolean {
+            try {
+                val isSuccess = super.onTransact(code, data, reply, flags)
+                if (!isSuccess) {
+                    CoroutineScope(Dispatchers.Main).launch {
+                        GlobalState.getCurrentTitlePlugin()?.handleStop()
+                    }
+                }
+                return isSuccess
+            } catch (e: RemoteException) {
+                throw e
+            }
+        }
     }
 
+
     override fun onBind(intent: Intent): IBinder {
         return binder
     }
 
     override fun onUnbind(intent: Intent?): Boolean {
-        GlobalState.getCurrentTilePlugin()?.handleStop();
         return super.onUnbind(intent)
     }
 

android/app/src/main/res/drawable-anydpi-v24/ic_stat_name.xml

@@ -0,0 +1,26 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="240"
+    android:viewportHeight="240"
+    android:tint="#FFFFFF">
+  <group android:scaleX="2.0264318"
+      android:scaleY="2.0264318"
+      android:translateX="-123.17181"
+      android:translateY="-123.17181">
+    <group android:scaleX="0.61"
+        android:scaleY="0.61"
+        android:translateX="46.8"
+        android:translateY="46.8">
+      <path
+          android:pathData="M67.67,115.76L144.04,39.39A18,18 0,0 1,169.5 39.39L169.5,39.39A18,18 0,0 1,169.5 64.85L93.13,141.21A18,18 0,0 1,67.67 141.21L67.67,141.21A18,18 0,0 1,67.67 115.76z"
+          android:fillColor="#6666FF"/>
+      <path
+          android:pathData="M98.79,146.87L136.97,108.69A18,18 72.93,0 1,162.43 108.69L162.43,108.69A18,18 72.93,0 1,162.43 134.14L124.24,172.33A18,18 76.87,0 1,98.79 172.33L98.79,172.33A18,18 76.87,0 1,98.79 146.87z"
+          android:fillColor="#326CBF"/>
+      <path
+          android:pathData="M129.9,177.98L129.9,177.98A18,18 107.07,0 1,155.36 177.98L155.36,177.98A18,18 107.07,0 1,155.36 203.44L155.36,203.44A18,18 107.07,0 1,129.9 203.44L129.9,203.44A18,18 107.07,0 1,129.9 177.98z"
+          android:fillColor="#56afee"/>
+    </group>
+  </group>
+</vector>

android/app/src/main/res/drawable/ic_launcher_foreground.xml

@@ -0,0 +1,25 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="108dp"
+    android:height="108dp"
+    android:viewportWidth="240"
+    android:viewportHeight="240">
+  <group android:scaleX="0.90244895"
+      android:scaleY="0.90244895"
+      android:translateX="12.708843"
+      android:translateY="10.703402">
+    <group android:scaleX="0.61"
+        android:scaleY="0.61"
+        android:translateX="46.8"
+        android:translateY="46.8">
+      <path
+          android:pathData="M67.67,115.76L144.04,39.39A18,18 0,0 1,169.5 39.39L169.5,39.39A18,18 0,0 1,169.5 64.85L93.13,141.21A18,18 0,0 1,67.67 141.21L67.67,141.21A18,18 0,0 1,67.67 115.76z"
+          android:fillColor="#6666FF"/>
+      <path
+          android:pathData="M98.79,146.87L136.97,108.69A18,18 72.93,0 1,162.43 108.69L162.43,108.69A18,18 72.93,0 1,162.43 134.14L124.24,172.33A18,18 76.87,0 1,98.79 172.33L98.79,172.33A18,18 76.87,0 1,98.79 146.87z"
+          android:fillColor="#326CBF"/>
+      <path
+          android:pathData="M129.9,177.98L129.9,177.98A18,18 107.07,0 1,155.36 177.98L155.36,177.98A18,18 107.07,0 1,155.36 203.44L155.36,203.44A18,18 107.07,0 1,129.9 203.44L129.9,203.44A18,18 107.07,0 1,129.9 177.98z"
+          android:fillColor="#56afee"/>
+    </group>
+  </group>
+</vector>

android/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
     <background android:drawable="@color/ic_launcher_background"/>
-    <foreground android:drawable="@mipmap/ic_launcher_foreground"/>
-    <monochrome android:drawable="@mipmap/ic_launcher_foreground" />
+    <foreground android:drawable="@drawable/ic_launcher_foreground"/>
+    <monochrome android:drawable="@drawable/ic_launcher_foreground" />
 </adaptive-icon>

android/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
     <background android:drawable="@color/ic_launcher_background"/>
-    <foreground android:drawable="@mipmap/ic_launcher_foreground"/>
-    <monochrome android:drawable="@mipmap/ic_launcher_foreground" />
+    <foreground android:drawable="@drawable/ic_launcher_foreground"/>
+    <monochrome android:drawable="@drawable/ic_launcher_foreground" />
 </adaptive-icon>

android/app/src/main/res/values-night-v27/styles.xml

@@ -6,7 +6,7 @@
         <item name="android:windowDrawsSystemBarBackgrounds">false</item>
         <item name="android:windowLayoutInDisplayCutoutMode">shortEdges</item>
         <item name="android:windowSplashScreenBackground" tools:targetApi="s">#121212</item>
-        <item name="android:windowSplashScreenAnimatedIcon" tools:targetApi="s">@mipmap/ic_launcher_foreground</item>
+        <item name="android:windowSplashScreenAnimatedIcon" tools:targetApi="s">@drawable/ic_launcher_foreground</item>
         <item name="postSplashScreenTheme">@style/NormalTheme</item>
     </style>
 </resources>

android/app/src/main/res/values-night/styles.xml

@@ -4,7 +4,6 @@
     <style name="LaunchTheme" parent="@android:style/Theme.Black.NoTitleBar">
         <!-- Show a splash screen on the activity. Automatically removed when
              the Flutter engine draws its first frame -->
-        <item name="android:windowBackground">@mipmap/ic_launcher_foreground</item>
     </style>
     <!-- Theme applied to the Android Window as soon as the process has started.
          This theme determines the color of the Android Window while your

android/app/src/main/res/values-v27/styles.xml

@@ -6,7 +6,7 @@
         <item name="android:windowDrawsSystemBarBackgrounds">false</item>
         <item name="android:windowLayoutInDisplayCutoutMode">shortEdges</item>
         <item name="android:windowSplashScreenBackground" tools:targetApi="s">@color/ic_launcher_background</item>
-        <item name="android:windowSplashScreenAnimatedIcon" tools:targetApi="s">@mipmap/ic_launcher_foreground</item>
+        <item name="android:windowSplashScreenAnimatedIcon" tools:targetApi="s">@drawable/ic_launcher_foreground</item>
         <item name="postSplashScreenTheme">@style/NormalTheme</item>
     </style>
 </resources>

android/app/src/main/res/values/ic_launcher_background.xml

@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <color name="ic_launcher_background">#EFEFEF</color>
+    <color name="ic_launcher_background">#FAFAFA</color>
 </resources>

android/app/src/main/res/values/styles.xml

@@ -4,7 +4,6 @@
     <style name="LaunchTheme" parent="@android:style/Theme.Light.NoTitleBar">
         <!-- Show a splash screen on the activity. Automatically removed when
              the Flutter engine draws its first frame -->
-        <item name="android:windowBackground">@mipmap/ic_launcher_foreground</item>
     </style>
     <!-- Theme applied to the Android Window as soon as the process has started.
          This theme determines the color of the Android Window while your

android/app/src/main/res/xml/network_security_config.xml

@@ -7,4 +7,8 @@
             <certificates src="user" />
         </trust-anchors>
     </base-config>
+    <domain-config cleartextTrafficPermitted="true">
+        <domain includeSubdomains="true">localhost</domain>
+        <domain includeSubdomains="true">127.0.0.1</domain>
+    </domain-config>
 </network-security-config>

core/common.go

@@ -2,19 +2,20 @@ package main
 
 import "C"
 import (
+	"github.com/metacubex/mihomo/adapter"
 	"github.com/metacubex/mihomo/adapter/inbound"
+	"github.com/metacubex/mihomo/adapter/outboundgroup"
 	ap "github.com/metacubex/mihomo/adapter/provider"
 	"github.com/metacubex/mihomo/component/dialer"
-	"github.com/metacubex/mihomo/component/process"
 	"github.com/metacubex/mihomo/component/resolver"
 	"github.com/metacubex/mihomo/config"
-	"github.com/metacubex/mihomo/constant/provider"
-	"github.com/metacubex/mihomo/dns"
+	"github.com/metacubex/mihomo/constant"
+	"github.com/metacubex/mihomo/hub"
 	"github.com/metacubex/mihomo/hub/executor"
+	"github.com/metacubex/mihomo/hub/route"
 	"github.com/metacubex/mihomo/listener"
 	"github.com/metacubex/mihomo/log"
 	"github.com/metacubex/mihomo/tunnel"
-	"math"
 	"os"
 	"os/exec"
 	"path/filepath"
@@ -22,6 +23,7 @@ import (
 	"strings"
 	"sync"
 	"syscall"
+	"time"
 )
 
 type healthCheckSchema struct {
@@ -59,11 +61,17 @@ type ruleProviderSchema struct {
 	Interval int    `provider:"interval,omitempty"`
 }
 
+type ConfigExtendedParams struct {
+	IsPatch      bool              `json:"is-patch"`
+	IsCompatible bool              `json:"is-compatible"`
+	SelectedMap  map[string]string `json:"selected-map"`
+	TestURL      *string           `json:"test-url"`
+}
+
 type GenerateConfigParams struct {
-	ProfilePath  *string           `json:"profile-path"`
-	Config       *config.RawConfig `json:"config" `
-	IsPatch      *bool             `json:"is-patch"`
-	IsCompatible *bool             `json:"is-compatible"`
+	ProfilePath *string              `json:"profile-path"`
+	Config      config.RawConfig     `json:"config" `
+	Params      ConfigExtendedParams `json:"params"`
 }
 
 type ChangeProxyParams struct {
@@ -76,23 +84,18 @@ type TestDelayParams struct {
 	Timeout   int64  `json:"timeout"`
 }
 
-type Delay struct {
-	Name  string `json:"name"`
-	Value int32  `json:"value"`
-}
-
-type Process struct {
-	Uid     uint32 `json:"uid"`
-	Network string `json:"network"`
-	Source  string `json:"source"`
-	Target  string `json:"target"`
-}
-
-type Now struct {
-	Name  string `json:"name"`
+type ProcessMapItem struct {
+	Id    int64  `json:"id"`
 	Value string `json:"value"`
 }
 
+type ExternalProvider struct {
+	Name        string    `json:"name"`
+	Type        string    `json:"type"`
+	VehicleType string    `json:"vehicle-type"`
+	UpdateAt    time.Time `json:"update-at"`
+}
+
 func restartExecutable(execPath string) {
 	var err error
 	executor.Shutdown()
@@ -160,9 +163,9 @@ func getRawConfigWithPath(path *string) *config.RawConfig {
 	}
 }
 
-func decorationConfig(profilePath *string, cfg config.RawConfig, compatible bool) *config.RawConfig {
+func decorationConfig(profilePath *string, cfg config.RawConfig) *config.RawConfig {
 	prof := getRawConfigWithPath(profilePath)
-	overwriteConfig(prof, cfg, compatible)
+	overwriteConfig(prof, cfg)
 	return prof
 }
 
@@ -312,49 +315,58 @@ func generateProxyGroupAndRule(proxyGroup *[]map[string]any, rule *[]string) {
 	*rule = computedRule
 }
 
-func overwriteConfig(targetConfig *config.RawConfig, patchConfig config.RawConfig, compatible bool) {
-	targetConfig.ExternalController = ""
+func overwriteConfig(targetConfig *config.RawConfig, patchConfig config.RawConfig) {
+	targetConfig.ExternalController = patchConfig.ExternalController
 	targetConfig.ExternalUI = ""
 	targetConfig.Interface = ""
 	targetConfig.ExternalUIURL = ""
-	//targetConfig.IPv6 = patchConfig.IPv6
+	targetConfig.TCPConcurrent = patchConfig.TCPConcurrent
+	targetConfig.UnifiedDelay = patchConfig.UnifiedDelay
+	//targetConfig.GeodataMode = false
+	targetConfig.IPv6 = patchConfig.IPv6
 	targetConfig.LogLevel = patchConfig.LogLevel
-	targetConfig.FindProcessMode = process.FindProcessAlways
-	targetConfig.AllowLan = patchConfig.AllowLan
+	targetConfig.Port = 0
+	targetConfig.SocksPort = 0
 	targetConfig.MixedPort = patchConfig.MixedPort
+	targetConfig.FindProcessMode = patchConfig.FindProcessMode
+	targetConfig.AllowLan = patchConfig.AllowLan
 	targetConfig.Mode = patchConfig.Mode
 	targetConfig.Tun.Enable = patchConfig.Tun.Enable
 	targetConfig.Tun.Device = patchConfig.Tun.Device
 	targetConfig.Tun.DNSHijack = patchConfig.Tun.DNSHijack
 	targetConfig.Tun.Stack = patchConfig.Tun.Stack
-	targetConfig.GeodataLoader = "standard"
+	targetConfig.GeodataLoader = patchConfig.GeodataLoader
 	targetConfig.Profile.StoreSelected = false
+	targetConfig.GeoXUrl = patchConfig.GeoXUrl
+	targetConfig.GlobalUA = patchConfig.GlobalUA
 	if targetConfig.DNS.Enable == false {
 		targetConfig.DNS = patchConfig.DNS
 	}
-	if runtime.GOOS == "android" {
-		targetConfig.DNS.NameServer = append(targetConfig.DNS.NameServer, "dhcp://"+dns.SystemDNSPlaceholder)
-	} else if runtime.GOOS == "windows" {
-		targetConfig.DNS.NameServer = append(targetConfig.DNS.NameServer, dns.SystemDNSPlaceholder)
-	}
-	if compatible == false {
+	//if runtime.GOOS == "android" {
+	//	targetConfig.DNS.NameServer = append(targetConfig.DNS.NameServer, "dhcp://"+dns.SystemDNSPlaceholder)
+	//} else if runtime.GOOS == "windows" {
+	//	targetConfig.DNS.NameServer = append(targetConfig.DNS.NameServer, dns.SystemDNSPlaceholder)
+	//}
+	if configParams.IsCompatible == false {
 		targetConfig.ProxyProvider = make(map[string]map[string]any)
 		targetConfig.RuleProvider = make(map[string]map[string]any)
 		generateProxyGroupAndRule(&targetConfig.ProxyGroup, &targetConfig.Rule)
 	}
-
 }
 
 func patchConfig(general *config.General) {
 	log.Infoln("[Apply] patch")
+	route.ReStartServer(general.ExternalController)
 	listener.SetAllowLan(general.AllowLan)
 	inbound.SetSkipAuthPrefixes(general.SkipAuthPrefixes)
 	inbound.SetAllowedIPs(general.LanAllowedIPs)
 	inbound.SetDisAllowedIPs(general.LanDisAllowedIPs)
 	listener.SetBindAddress(general.BindAddress)
 	tunnel.SetSniffing(general.Sniffing)
+	tunnel.SetFindProcessMode(general.FindProcessMode)
 	dialer.SetTcpConcurrent(general.TCPConcurrent)
 	dialer.DefaultInterface.Store(general.Interface)
+	adapter.UnifiedDelay.Store(general.UnifiedDelay)
 	listener.ReCreateHTTP(general.Port, tunnel.Tunnel)
 	listener.ReCreateSocks(general.SocksPort, tunnel.Tunnel)
 	listener.ReCreateRedir(general.RedirPort, tunnel.Tunnel)
@@ -367,40 +379,52 @@ func patchConfig(general *config.General) {
 	listener.ReCreateTuic(general.TuicServer, tunnel.Tunnel)
 	tunnel.SetMode(general.Mode)
 	log.SetLevel(general.LogLevel)
+
 	resolver.DisableIPv6 = !general.IPv6
 }
 
-const concurrentCount = math.MaxInt
-
-func hcCompatibleProvider(proxyProviders map[string]provider.ProxyProvider) {
-	wg := sync.WaitGroup{}
-	ch := make(chan struct{}, concurrentCount)
-	for _, proxyProvider := range proxyProviders {
-		proxyProvider := proxyProvider
-		if proxyProvider.VehicleType() == provider.Compatible {
-			log.Infoln("Start initial Compatible provider %s", proxyProvider.Name())
-			wg.Add(1)
-			ch <- struct{}{}
-			go func() {
-				defer func() { <-ch; wg.Done() }()
-				if err := proxyProvider.Initial(); err != nil {
-					log.Errorln("initial Compatible provider %s error: %v", proxyProvider.Name(), err)
-				}
-			}()
+func patchSelectGroup() {
+	mapping := configParams.SelectedMap
+	if mapping == nil {
+		return
+	}
+	for name, proxy := range tunnel.ProxiesWithProviders() {
+		outbound, ok := proxy.(*adapter.Proxy)
+		if !ok {
+			continue
 		}
 
+		selector, ok := outbound.ProxyAdapter.(outboundgroup.SelectAble)
+		if !ok {
+			continue
+		}
+
+		selected, exist := mapping[name]
+		if !exist {
+			continue
+		}
+
+		selector.ForceSet(selected)
 	}
 }
 
-func applyConfig(isPatch bool) {
+var applyLock sync.Mutex
+
+func applyConfig() {
+	applyLock.Lock()
+	defer applyLock.Unlock()
 	cfg, err := config.ParseRawConfig(currentConfig)
 	if err != nil {
 		cfg, _ = config.ParseRawConfig(config.DefaultRawConfig())
 	}
-	if isPatch {
+	if configParams.TestURL != nil {
+		constant.DefaultTestURL = *configParams.TestURL
+	}
+	if configParams.IsPatch {
 		patchConfig(cfg.General)
 	} else {
-		executor.ApplyConfig(cfg, true)
-		healthcheck()
+		runtime.GC()
+		hub.UltraApplyConfig(cfg, true)
+		patchSelectGroup()
 	}
 }

core/dart-bridge/lib.go

@@ -1,6 +1,7 @@
 package dart_bridge
 
 /*
+#include <stdlib.h>
 #include "stdint.h"
 #include "include/dart_api_dl.h"
 #include "include/dart_api_dl.c"
@@ -24,14 +25,16 @@ func InitDartApi(api unsafe.Pointer) {
 	}
 }
 
-func SendToPort(port int64, msg string) {
+func SendToPort(port int64, msg string) bool {
 	var obj C.Dart_CObject
 	obj._type = C.Dart_CObject_kString
 	msgString := C.CString(msg)
+	defer C.free(unsafe.Pointer(msgString))
 	ptr := unsafe.Pointer(&obj.value[0])
 	*(**C.char)(ptr) = msgString
 	isSuccess := C.GoDart_PostCObject(C.Dart_Port_DL(port), &obj)
 	if !isSuccess {
-		fmt.Println("ERROR: post to port ", port, " failed", msg)
+		return false
 	}
+	return true
 }

core/dart-bridge/message.go

@@ -1,29 +0,0 @@
-package dart_bridge
-
-import "encoding/json"
-
-var Port *int64
-
-type MessageType string
-
-const (
-	Log     MessageType = "log"
-	Tun     MessageType = "tun"
-	Delay   MessageType = "delay"
-	Now     MessageType = "now"
-	Process MessageType = "process"
-)
-
-type Message struct {
-	Type MessageType `json:"type"`
-	Data interface{} `json:"data"`
-}
-
-func (message *Message) Json() string {
-	data, _ := json.Marshal(message)
-	return string(data)
-}
-
-func SendMessage(message Message) {
-	SendToPort(*Port, message.Json())
-}

core/go.mod

@@ -7,8 +7,8 @@ replace github.com/metacubex/mihomo => ./Clash.Meta
 require (
 	github.com/Kr328/tun2socket v0.0.0-20220414050025-d07c78d06d34
 	github.com/metacubex/mihomo v1.17.1
-	github.com/miekg/dns v1.1.59
-	golang.org/x/net v0.24.0
+	github.com/miekg/dns v1.1.61
+	golang.org/x/net v0.26.0
 	golang.org/x/sync v0.7.0
 )
 
@@ -17,11 +17,12 @@ require (
 	github.com/RyuaNerin/go-krypto v1.2.4 // indirect
 	github.com/Yawning/aez v0.0.0-20211027044916-e49e68abd344 // indirect
 	github.com/aead/chacha20 v0.0.0-20180709150244-8b13a72661da // indirect
+	github.com/ajg/form v1.5.1 // indirect
 	github.com/andybalholm/brotli v1.0.6 // indirect
 	github.com/bahlo/generic-list-go v0.2.0 // indirect
 	github.com/buger/jsonparser v1.1.1 // indirect
 	github.com/cilium/ebpf v0.12.3 // indirect
-	github.com/cloudflare/circl v1.3.6 // indirect
+	github.com/cloudflare/circl v1.3.7 // indirect
 	github.com/coreos/go-iptables v0.7.0 // indirect
 	github.com/dlclark/regexp2 v1.11.0 // indirect
 	github.com/ericlagergren/aegis v0.0.0-20230312195928-b4ce538b56f9 // indirect
@@ -30,20 +31,23 @@ require (
 	github.com/ericlagergren/subtle v0.0.0-20220507045147-890d697da010 // indirect
 	github.com/fsnotify/fsnotify v1.7.0 // indirect
 	github.com/gaukas/godicttls v0.0.4 // indirect
+	github.com/go-chi/chi/v5 v5.0.14 // indirect
+	github.com/go-chi/cors v1.2.1 // indirect
+	github.com/go-chi/render v1.0.3 // indirect
 	github.com/go-ole/go-ole v1.3.0 // indirect
 	github.com/go-task/slim-sprig v0.0.0-20230315185526-52ccab3ef572 // indirect
 	github.com/gobwas/httphead v0.1.0 // indirect
 	github.com/gobwas/pool v0.2.1 // indirect
-	github.com/gobwas/ws v1.3.2 // indirect
-	github.com/gofrs/uuid/v5 v5.1.0 // indirect
+	github.com/gobwas/ws v1.4.0 // indirect
+	github.com/gofrs/uuid/v5 v5.2.0 // indirect
 	github.com/google/btree v1.1.2 // indirect
 	github.com/google/go-cmp v0.6.0 // indirect
 	github.com/google/pprof v0.0.0-20210407192527-94a9f03dee38 // indirect
 	github.com/hashicorp/yamux v0.1.1 // indirect
-	github.com/insomniacslk/dhcp v0.0.0-20240419123447-f1cffa2c0c49 // indirect
+	github.com/insomniacslk/dhcp v0.0.0-20240529192340-51bc6136a0a6 // indirect
 	github.com/josharian/native v1.1.0 // indirect
 	github.com/klauspost/compress v1.17.4 // indirect
-	github.com/klauspost/cpuid/v2 v2.2.7 // indirect
+	github.com/klauspost/cpuid/v2 v2.2.8 // indirect
 	github.com/lufia/plan9stats v0.0.0-20211012122336-39d0f177ccd0 // indirect
 	github.com/lunixbochs/struc v0.0.0-20200707160740-784aaebc1d40 // indirect
 	github.com/mailru/easyjson v0.7.7 // indirect
@@ -51,14 +55,16 @@ require (
 	github.com/mdlayher/socket v0.4.1 // indirect
 	github.com/metacubex/gopacket v1.1.20-0.20230608035415-7e2f98a3e759 // indirect
 	github.com/metacubex/gvisor v0.0.0-20240320004321-933faba989ec // indirect
-	github.com/metacubex/quic-go v0.42.1-0.20240418003344-f006b5735d98 // indirect
-	github.com/metacubex/sing-quic v0.0.0-20240418004036-814c531c378d // indirect
+	github.com/metacubex/quic-go v0.45.1-0.20240610004319-163fee60637e // indirect
+	github.com/metacubex/randv2 v0.2.0 // indirect
+	github.com/metacubex/sing-quic v0.0.0-20240518034124-7696d3f7da72 // indirect
 	github.com/metacubex/sing-shadowsocks v0.2.6 // indirect
 	github.com/metacubex/sing-shadowsocks2 v0.2.0 // indirect
-	github.com/metacubex/sing-tun v0.2.6 // indirect
+	github.com/metacubex/sing-tun v0.2.7-0.20240627012306-9d1f5fc0b45e // indirect
 	github.com/metacubex/sing-vmess v0.1.9-0.20231207122118-72303677451f // indirect
-	github.com/metacubex/sing-wireguard v0.0.0-20240321042214-224f96122a63 // indirect
+	github.com/metacubex/sing-wireguard v0.0.0-20240618022557-a6efaa37127a // indirect
 	github.com/metacubex/tfo-go v0.0.0-20240228025757-be1269474a66 // indirect
+	github.com/metacubex/utls v1.6.6 // indirect
 	github.com/mroth/weightedrand/v2 v2.1.0 // indirect
 	github.com/oasisprotocol/deoxysii v0.0.0-20220228165953-2091330c22b7 // indirect
 	github.com/onsi/ginkgo/v2 v2.9.5 // indirect
@@ -66,19 +72,19 @@ require (
 	github.com/oschwald/maxminddb-golang v1.12.0 // indirect
 	github.com/pierrec/lz4/v4 v4.1.14 // indirect
 	github.com/power-devops/perfstat v0.0.0-20210106213030-5aafc221ea8c // indirect
-	github.com/puzpuzpuz/xsync/v3 v3.1.0 // indirect
+	github.com/puzpuzpuz/xsync/v3 v3.2.0 // indirect
 	github.com/quic-go/qpack v0.4.0 // indirect
 	github.com/quic-go/qtls-go1-20 v0.4.1 // indirect
 	github.com/sagernet/bbolt v0.0.0-20231014093535-ea5cb2fe9f0a // indirect
-	github.com/sagernet/netlink v0.0.0-20220905062125-8043b4a9aa97 // indirect
-	github.com/sagernet/sing v0.3.8 // indirect
+	github.com/sagernet/netlink v0.0.0-20240612041022-b9a21c07ac6a // indirect
+	github.com/sagernet/nftables v0.3.0-beta.4 // indirect
+	github.com/sagernet/sing v0.5.0-alpha.10 // indirect
 	github.com/sagernet/sing-mux v0.2.1-0.20240124034317-9bfb33698bb6 // indirect
 	github.com/sagernet/sing-shadowtls v0.1.4 // indirect
 	github.com/sagernet/smux v0.0.0-20231208180855-7041f6ea79e7 // indirect
-	github.com/sagernet/utls v1.5.4 // indirect
 	github.com/sagernet/wireguard-go v0.0.0-20231209092712-9a439356a62e // indirect
 	github.com/samber/lo v1.39.0 // indirect
-	github.com/shirou/gopsutil/v3 v3.24.3 // indirect
+	github.com/shirou/gopsutil/v3 v3.24.5 // indirect
 	github.com/shoenig/go-m1cpu v0.1.6 // indirect
 	github.com/sina-ghaderi/poly1305 v0.0.0-20220724002748-c5926b03988b // indirect
 	github.com/sina-ghaderi/rabaead v0.0.0-20220730151906-ab6e06b96e8c // indirect
@@ -87,21 +93,20 @@ require (
 	github.com/tklauser/go-sysconf v0.3.12 // indirect
 	github.com/tklauser/numcpus v0.6.1 // indirect
 	github.com/u-root/uio v0.0.0-20230220225925-ffce2a382923 // indirect
-	github.com/vishvananda/netns v0.0.0-20211101163701-50045581ed74 // indirect
+	github.com/vishvananda/netns v0.0.4 // indirect
 	github.com/wk8/go-ordered-map/v2 v2.1.8 // indirect
 	github.com/yusufpapurcu/wmi v1.2.4 // indirect
-	github.com/zhangyunhao116/fastrand v0.4.0 // indirect
 	gitlab.com/yawning/bsaes.git v0.0.0-20190805113838-0a714cd429ec // indirect
 	go.uber.org/mock v0.4.0 // indirect
 	go4.org/netipx v0.0.0-20231129151722-fdeea329fbba // indirect
-	golang.org/x/crypto v0.22.0 // indirect
-	golang.org/x/exp v0.0.0-20240416160154-fe59bbe5cc7f // indirect
-	golang.org/x/mod v0.17.0 // indirect
-	golang.org/x/sys v0.19.0 // indirect
-	golang.org/x/text v0.14.0 // indirect
+	golang.org/x/crypto v0.24.0 // indirect
+	golang.org/x/exp v0.0.0-20240613232115-7f521ea00fb8 // indirect
+	golang.org/x/mod v0.18.0 // indirect
+	golang.org/x/sys v0.21.0 // indirect
+	golang.org/x/text v0.16.0 // indirect
 	golang.org/x/time v0.5.0 // indirect
-	golang.org/x/tools v0.20.0 // indirect
-	google.golang.org/protobuf v1.33.0 // indirect
+	golang.org/x/tools v0.22.0 // indirect
+	google.golang.org/protobuf v1.34.2 // indirect
 	gopkg.in/yaml.v3 v3.0.1 // indirect
-	lukechampine.com/blake3 v1.2.2 // indirect
+	lukechampine.com/blake3 v1.3.0 // indirect
 )

core/go.sum

@@ -9,6 +9,8 @@ github.com/Yawning/aez v0.0.0-20211027044916-e49e68abd344 h1:cDVUiFo+npB0ZASqnw4
 github.com/Yawning/aez v0.0.0-20211027044916-e49e68abd344/go.mod h1:9pIqrY6SXNL8vjRQE5Hd/OL5GyK/9MrGUWs87z/eFfk=
 github.com/aead/chacha20 v0.0.0-20180709150244-8b13a72661da h1:KjTM2ks9d14ZYCvmHS9iAKVt9AyzRSqNU1qabPih5BY=
 github.com/aead/chacha20 v0.0.0-20180709150244-8b13a72661da/go.mod h1:eHEWzANqSiWQsof+nXEI9bUVUyV6F53Fp89EuCh2EAA=
+github.com/ajg/form v1.5.1 h1:t9c7v8JUKu/XxOGBU0yjNpaMloxGEJhUkqFRq0ibGeU=
+github.com/ajg/form v1.5.1/go.mod h1:uL1WgH+h2mgNtvBq0339dVnzXdBETtL2LeUXaIv25UY=
 github.com/andybalholm/brotli v1.0.6 h1:Yf9fFpf49Zrxb9NlQaluyE92/+X7UVHlhMNJN2sxfOI=
 github.com/andybalholm/brotli v1.0.6/go.mod h1:fO7iG3H7G2nSZ7m0zPUDn85XEX2GTukHGRSepvi9Eig=
 github.com/bahlo/generic-list-go v0.2.0 h1:5sz/EEAK+ls5wF+NeqDpk5+iNdMDXrh3z3nPnH1Wvgk=
@@ -21,8 +23,8 @@ github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e/go.mod h1:nSuG5e5P
 github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1/go.mod h1:Q3SI9o4m/ZMnBNeIyt5eFwwo7qiLfzFZmjNmxjkiQlU=
 github.com/cilium/ebpf v0.12.3 h1:8ht6F9MquybnY97at+VDZb3eQQr8ev79RueWeVaEcG4=
 github.com/cilium/ebpf v0.12.3/go.mod h1:TctK1ivibvI3znr66ljgi4hqOT8EYQjz1KWBfb1UVgM=
-github.com/cloudflare/circl v1.3.6 h1:/xbKIqSHbZXHwkhbrhrt2YOHIwYJlXH94E3tI/gDlUg=
-github.com/cloudflare/circl v1.3.6/go.mod h1:5XYMA4rFBvNIrhs50XuiBJ15vF2pZn4nnUKZrLbUZFA=
+github.com/cloudflare/circl v1.3.7 h1:qlCDlTPz2n9fu58M0Nh1J/JzcFpfgkFHHX3O35r5vcU=
+github.com/cloudflare/circl v1.3.7/go.mod h1:sRTcRWXGLrKw6yIGJ+l7amYJFfAXbZG0kBSc8r4zxgA=
 github.com/coreos/go-iptables v0.7.0 h1:XWM3V+MPRr5/q51NuWSgU0fqMad64Zyxs8ZUoMsamr8=
 github.com/coreos/go-iptables v0.7.0/go.mod h1:Qe8Bv2Xik5FyTXwgIbLAnv2sWSBmvWdFETJConOQ//Q=
 github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
@@ -46,6 +48,12 @@ github.com/fsnotify/fsnotify v1.7.0 h1:8JEhPFa5W2WU7YfeZzPNqzMP6Lwt7L2715Ggo0nos
 github.com/fsnotify/fsnotify v1.7.0/go.mod h1:40Bi/Hjc2AVfZrqy+aj+yEI+/bRxZnMJyTJwOpGvigM=
 github.com/gaukas/godicttls v0.0.4 h1:NlRaXb3J6hAnTmWdsEKb9bcSBD6BvcIjdGdeb0zfXbk=
 github.com/gaukas/godicttls v0.0.4/go.mod h1:l6EenT4TLWgTdwslVb4sEMOCf7Bv0JAK67deKr9/NCI=
+github.com/go-chi/chi/v5 v5.0.14 h1:PyEwo2Vudraa0x/Wl6eDRRW2NXBvekgfxyydcM0WGE0=
+github.com/go-chi/chi/v5 v5.0.14/go.mod h1:DslCQbL2OYiznFReuXYUmQ2hGd1aDpCnlMNITLSKoi8=
+github.com/go-chi/cors v1.2.1 h1:xEC8UT3Rlp2QuWNEr4Fs/c2EAGVKBwy/1vHx3bppil4=
+github.com/go-chi/cors v1.2.1/go.mod h1:sSbTewc+6wYHBBCW7ytsFSn836hqM7JxpglAy2Vzc58=
+github.com/go-chi/render v1.0.3 h1:AsXqd2a1/INaIfUSKq3G5uA8weYx20FOsM7uSoCyyt4=
+github.com/go-chi/render v1.0.3/go.mod h1:/gr3hVkmYR0YlEy3LxCuVRFzEu9Ruok+gFqbIofjao0=
 github.com/go-logr/logr v1.2.4 h1:g01GSCwiDw2xSZfjJ2/T9M+S6pFdcNtFYsp+Y43HYDQ=
 github.com/go-logr/logr v1.2.4/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A=
 github.com/go-ole/go-ole v1.2.6/go.mod h1:pprOEPIfldk/42T2oK7lQ4v4JSDwmV0As9GaiUsvbm0=
@@ -57,17 +65,16 @@ github.com/gobwas/httphead v0.1.0 h1:exrUm0f4YX0L7EBwZHuCF4GDp8aJfVeBrlLQrs6NqWU
 github.com/gobwas/httphead v0.1.0/go.mod h1:O/RXo79gxV8G+RqlR/otEwx4Q36zl9rqC5u12GKvMCM=
 github.com/gobwas/pool v0.2.1 h1:xfeeEhW7pwmX8nuLVlqbzVc7udMDrwetjEv+TZIz1og=
 github.com/gobwas/pool v0.2.1/go.mod h1:q8bcK0KcYlCgd9e7WYLm9LpyS+YeLd8JVDW6WezmKEw=
-github.com/gobwas/ws v1.3.2 h1:zlnbNHxumkRvfPWgfXu8RBwyNR1x8wh9cf5PTOCqs9Q=
-github.com/gobwas/ws v1.3.2/go.mod h1:hRKAFb8wOxFROYNsT1bqfWnhX+b5MFeJM9r2ZSwg/KY=
-github.com/gofrs/uuid/v5 v5.1.0 h1:S5rqVKIigghZTCBKPCw0Y+bXkn26K3TB5mvQq2Ix8dk=
-github.com/gofrs/uuid/v5 v5.1.0/go.mod h1:CDOjlDMVAtN56jqyRUZh58JT31Tiw7/oQyEXZV+9bD8=
+github.com/gobwas/ws v1.4.0 h1:CTaoG1tojrh4ucGPcoJFiAQUAsEWekEWvLy7GsVNqGs=
+github.com/gobwas/ws v1.4.0/go.mod h1:G3gNqMNtPppf5XUz7O4shetPpcZ1VJ7zt18dlUeakrc=
+github.com/gofrs/uuid/v5 v5.2.0 h1:qw1GMx6/y8vhVsx626ImfKMuS5CvJmhIKKtuyvfajMM=
+github.com/gofrs/uuid/v5 v5.2.0/go.mod h1:CDOjlDMVAtN56jqyRUZh58JT31Tiw7/oQyEXZV+9bD8=
 github.com/golang/protobuf v1.3.1/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
 github.com/golang/protobuf v1.5.3 h1:KhyjKVUg7Usr/dYsdSqoFveMYd5ko72D+zANwlG1mmg=
 github.com/golang/protobuf v1.5.3/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY=
 github.com/google/btree v1.1.2 h1:xf4v41cLI2Z6FxbKm+8Bu+m8ifhj15JuZ9sa0jZCMUU=
 github.com/google/btree v1.1.2/go.mod h1:qOPhT0dTNdNzV6Z/lhRX0YXUafgPLFUh+gZMl761Gm4=
 github.com/google/go-cmp v0.5.6/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
-github.com/google/go-cmp v0.5.9/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
 github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI=
 github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
 github.com/google/pprof v0.0.0-20210407192527-94a9f03dee38 h1:yAJXTCF9TqKcTiHJAE8dj7HMvPfh66eeA2JYW7eFpSE=
@@ -77,16 +84,16 @@ github.com/google/tink/go v1.6.1/go.mod h1:IGW53kTgag+st5yPhKKwJ6u2l+SSp5/v9XF7s
 github.com/hashicorp/yamux v0.1.1 h1:yrQxtgseBDrq9Y652vSRDvsKCJKOUD+GzTS4Y0Y8pvE=
 github.com/hashicorp/yamux v0.1.1/go.mod h1:CtWFDAQgb7dxtzFs4tWbplKIe2jSi3+5vKbgIO0SLnQ=
 github.com/ianlancetaylor/demangle v0.0.0-20200824232613-28f6c0f3b639/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc=
-github.com/insomniacslk/dhcp v0.0.0-20240419123447-f1cffa2c0c49 h1:/OuvSMGT9+xnyZ+7MZQ1zdngaCCAdPoSw8B/uurZ7pg=
-github.com/insomniacslk/dhcp v0.0.0-20240419123447-f1cffa2c0c49/go.mod h1:KclMyHxX06VrVr0DJmeFSUb1ankt7xTfoOA35pCkoic=
+github.com/insomniacslk/dhcp v0.0.0-20240529192340-51bc6136a0a6 h1:dh8D8FksyMhD64mRMbUhZHWYJfNoNMCxfVq6eexleMw=
+github.com/insomniacslk/dhcp v0.0.0-20240529192340-51bc6136a0a6/go.mod h1:KclMyHxX06VrVr0DJmeFSUb1ankt7xTfoOA35pCkoic=
 github.com/josharian/intern v1.0.0/go.mod h1:5DoeVV0s6jJacbCEi61lwdGj/aVlrQvzHFFd8Hwg//Y=
 github.com/josharian/native v1.0.1-0.20221213033349-c1e37c09b531/go.mod h1:7X/raswPFr05uY3HiLlYeyQntB6OO7E/d2Cu7qoaN2w=
 github.com/josharian/native v1.1.0 h1:uuaP0hAbW7Y4l0ZRQ6C9zfb7Mg1mbFKry/xzDAfmtLA=
 github.com/josharian/native v1.1.0/go.mod h1:7X/raswPFr05uY3HiLlYeyQntB6OO7E/d2Cu7qoaN2w=
 github.com/klauspost/compress v1.17.4 h1:Ej5ixsIri7BrIjBkRZLTo6ghwrEtHFk7ijlczPW4fZ4=
 github.com/klauspost/compress v1.17.4/go.mod h1:/dCuZOvVtNoHsyb+cuJD3itjs3NbnF6KH9zAO4BDxPM=
-github.com/klauspost/cpuid/v2 v2.2.7 h1:ZWSB3igEs+d0qvnxR/ZBzXVmxkgt8DdzP6m9pfuVLDM=
-github.com/klauspost/cpuid/v2 v2.2.7/go.mod h1:Lcz8mBdAVJIBVzewtcLocK12l3Y+JytZYpaMropDUws=
+github.com/klauspost/cpuid/v2 v2.2.8 h1:+StwCXwm9PdpiEkPyzBXIy+M9KUb4ODm0Zarf1kS5BM=
+github.com/klauspost/cpuid/v2 v2.2.8/go.mod h1:Lcz8mBdAVJIBVzewtcLocK12l3Y+JytZYpaMropDUws=
 github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE=
 github.com/kr/pretty v0.3.1/go.mod h1:hoEshYVHaxMs3cyo3Yncou5ZscifuDolrwPKZanG3xk=
 github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY=
@@ -105,24 +112,28 @@ github.com/metacubex/gopacket v1.1.20-0.20230608035415-7e2f98a3e759 h1:cjd4biTvO
 github.com/metacubex/gopacket v1.1.20-0.20230608035415-7e2f98a3e759/go.mod h1:UHOv2xu+RIgLwpXca7TLrXleEd4oR3sPatW6IF8wU88=
 github.com/metacubex/gvisor v0.0.0-20240320004321-933faba989ec h1:HxreOiFTUrJXJautEo8rnE1uKTVGY8wtZepY1Tii/Nc=
 github.com/metacubex/gvisor v0.0.0-20240320004321-933faba989ec/go.mod h1:8BVmQ+3cxjqzWElafm24rb2Ae4jRI6vAXNXWqWjfrXw=
-github.com/metacubex/quic-go v0.42.1-0.20240418003344-f006b5735d98 h1:oMLlJV4a9AylNo8ZLBNUiqZ02Vme6GLLHjuWJz8amSk=
-github.com/metacubex/quic-go v0.42.1-0.20240418003344-f006b5735d98/go.mod h1:iGx3Y1zynls/FjFgykLSqDcM81U0IKePRTXEz5g3iiQ=
-github.com/metacubex/sing-quic v0.0.0-20240418004036-814c531c378d h1:RAe0ND8J5SOPGI623oEXfaHKaaUrrzHx+U1DN9Awcco=
-github.com/metacubex/sing-quic v0.0.0-20240418004036-814c531c378d/go.mod h1:WyY0zYxv+o+18R/Ece+QFontlgXoobKbNqbtYn2zjz8=
+github.com/metacubex/quic-go v0.45.1-0.20240610004319-163fee60637e h1:bLYn3GuRvWDcBDAkIv5kUYIhzHwafDVq635BuybnKqI=
+github.com/metacubex/quic-go v0.45.1-0.20240610004319-163fee60637e/go.mod h1:Yza2H7Ax1rxWPUcJx0vW+oAt9EsPuSiyQFhFabUPzwU=
+github.com/metacubex/randv2 v0.2.0 h1:uP38uBvV2SxYfLj53kuvAjbND4RUDfFJjwr4UigMiLs=
+github.com/metacubex/randv2 v0.2.0/go.mod h1:kFi2SzrQ5WuneuoLLCMkABtiBu6VRrMrWFqSPyj2cxY=
+github.com/metacubex/sing-quic v0.0.0-20240518034124-7696d3f7da72 h1:Wr4g1HCb5Z/QIFwFiVNjO2qL+dRu25+Mdn9xtAZZ+ew=
+github.com/metacubex/sing-quic v0.0.0-20240518034124-7696d3f7da72/go.mod h1:g7Mxj7b7zm7YVqD975mk/hSmrb0A0G4bVvIMr2MMzn8=
 github.com/metacubex/sing-shadowsocks v0.2.6 h1:6oEB3QcsFYnNiFeoevcXrCwJ3sAablwVSgtE9R3QeFQ=
 github.com/metacubex/sing-shadowsocks v0.2.6/go.mod h1:zIkMeSnb8Mbf4hdqhw0pjzkn1d99YJ3JQm/VBg5WMTg=
 github.com/metacubex/sing-shadowsocks2 v0.2.0 h1:hqwT/AfI5d5UdPefIzR6onGHJfDXs5zgOM5QSgaM/9A=
 github.com/metacubex/sing-shadowsocks2 v0.2.0/go.mod h1:LCKF6j1P94zN8ZS+LXRK1gmYTVGB3squivBSXAFnOg8=
-github.com/metacubex/sing-tun v0.2.6 h1:frc58BqnIClqcC9KcYBfVAn5bgO6WW1ANKvZW3/HYAQ=
-github.com/metacubex/sing-tun v0.2.6/go.mod h1:4VsMwZH1IlgPGFK1ZbBomZ/B2MYkTgs2+gnBAr5GOIo=
+github.com/metacubex/sing-tun v0.2.7-0.20240627012306-9d1f5fc0b45e h1:o+zohxPRo45P35fS9u1zfdBgr+L/7S0ObGU6YjbVBIc=
+github.com/metacubex/sing-tun v0.2.7-0.20240627012306-9d1f5fc0b45e/go.mod h1:WwJGbCx7bQcBzuQXiDOJvZH27R0kIjKNNlISIWsL6kM=
 github.com/metacubex/sing-vmess v0.1.9-0.20231207122118-72303677451f h1:QjXrHKbTMBip/C+R79bvbfr42xH1gZl3uFb0RELdZiQ=
 github.com/metacubex/sing-vmess v0.1.9-0.20231207122118-72303677451f/go.mod h1:olVkD4FChQ5gKMHG4ZzuD7+fMkJY1G8vwOKpRehjrmY=
-github.com/metacubex/sing-wireguard v0.0.0-20240321042214-224f96122a63 h1:AGyIB55UfQm/0ZH0HtQO9u3l//yjtHUpjeRjjPGfGRI=
-github.com/metacubex/sing-wireguard v0.0.0-20240321042214-224f96122a63/go.mod h1:uY+BYb0UEknLrqvbGcwi9i++KgrKxsurysgI6G1Pveo=
+github.com/metacubex/sing-wireguard v0.0.0-20240618022557-a6efaa37127a h1:NpSGclHJUYndUwBmyIpFBSoBVg8PoVX7QQKhYg0DjM0=
+github.com/metacubex/sing-wireguard v0.0.0-20240618022557-a6efaa37127a/go.mod h1:uY+BYb0UEknLrqvbGcwi9i++KgrKxsurysgI6G1Pveo=
 github.com/metacubex/tfo-go v0.0.0-20240228025757-be1269474a66 h1:as/aO/fM8nv4W4pOr9EETP6kV/Oaujk3fUNyQSJK61c=
 github.com/metacubex/tfo-go v0.0.0-20240228025757-be1269474a66/go.mod h1:c7bVFM9f5+VzeZ/6Kg77T/jrg1Xp8QpqlSHvG/aXVts=
-github.com/miekg/dns v1.1.59 h1:C9EXc/UToRwKLhK5wKU/I4QVsBUc8kE6MkHBkeypWZs=
-github.com/miekg/dns v1.1.59/go.mod h1:nZpewl5p6IvctfgrckopVx2OlSEHPRO/U4SYkRklrEk=
+github.com/metacubex/utls v1.6.6 h1:3D12YKHTf2Z41UPhQU2dWerNWJ5TVQD9gKoQ+H+iLC8=
+github.com/metacubex/utls v1.6.6/go.mod h1:+WLFUnXjcpdxXCnyX25nggw8C6YonZ8zOK2Zm/oRvdo=
+github.com/miekg/dns v1.1.61 h1:nLxbwF3XxhwVSm8g9Dghm9MHPaUZuqhPiGL+675ZmEs=
+github.com/miekg/dns v1.1.61/go.mod h1:mnAarhS3nWaW+NVP2wTkYVIZyHNJ098SJZUki3eykwQ=
 github.com/mroth/weightedrand/v2 v2.1.0 h1:o1ascnB1CIVzsqlfArQQjeMy1U0NcIbBO5rfd5E/OeU=
 github.com/mroth/weightedrand/v2 v2.1.0/go.mod h1:f2faGsfOGOwc1p94wzHKKZyTpcJUW7OJ/9U4yfiNAOU=
 github.com/oasisprotocol/deoxysii v0.0.0-20220228165953-2091330c22b7 h1:1102pQc2SEPp5+xrS26wEaeb26sZy6k9/ZXlZN+eXE4=
@@ -145,8 +156,8 @@ github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZb
 github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
 github.com/power-devops/perfstat v0.0.0-20210106213030-5aafc221ea8c h1:ncq/mPwQF4JjgDlrVEn3C11VoGHZN7m8qihwgMEtzYw=
 github.com/power-devops/perfstat v0.0.0-20210106213030-5aafc221ea8c/go.mod h1:OmDBASR4679mdNQnz2pUhc2G8CO2JrUAVFDRBDP/hJE=
-github.com/puzpuzpuz/xsync/v3 v3.1.0 h1:EewKT7/LNac5SLiEblJeUu8z5eERHrmRLnMQL2d7qX4=
-github.com/puzpuzpuz/xsync/v3 v3.1.0/go.mod h1:VjzYrABPabuM4KyBh1Ftq6u8nhwY5tBPKP9jpmh0nnA=
+github.com/puzpuzpuz/xsync/v3 v3.2.0 h1:9AzuUeF88YC5bK8u2vEG1Fpvu4wgpM1wfPIExfaaDxQ=
+github.com/puzpuzpuz/xsync/v3 v3.2.0/go.mod h1:VjzYrABPabuM4KyBh1Ftq6u8nhwY5tBPKP9jpmh0nnA=
 github.com/quic-go/qpack v0.4.0 h1:Cr9BXA1sQS2SmDUWjSofMPNKmvF6IiIfDRmgU0w1ZCo=
 github.com/quic-go/qpack v0.4.0/go.mod h1:UZVnYIfi5GRk+zI9UMaCPsmZ2xKJP7XBUvVyT1Knj9A=
 github.com/quic-go/qtls-go1-20 v0.4.1 h1:D33340mCNDAIKBqXuAvexTNMUByrYmFYVfKfDN5nfFs=
@@ -155,25 +166,25 @@ github.com/rogpeppe/go-internal v1.9.0 h1:73kH8U+JUqXU8lRuOHeVHaa/SZPifC7BkcraZV
 github.com/rogpeppe/go-internal v1.9.0/go.mod h1:WtVeX8xhTBvf0smdhujwtBcq4Qrzq/fJaraNFVN+nFs=
 github.com/sagernet/bbolt v0.0.0-20231014093535-ea5cb2fe9f0a h1:+NkI2670SQpQWvkkD2QgdTuzQG263YZ+2emfpeyGqW0=
 github.com/sagernet/bbolt v0.0.0-20231014093535-ea5cb2fe9f0a/go.mod h1:63s7jpZqcDAIpj8oI/1v4Izok+npJOHACFCU6+huCkM=
-github.com/sagernet/netlink v0.0.0-20220905062125-8043b4a9aa97 h1:iL5gZI3uFp0X6EslacyapiRz7LLSJyr4RajF/BhMVyE=
-github.com/sagernet/netlink v0.0.0-20220905062125-8043b4a9aa97/go.mod h1:xLnfdiJbSp8rNqYEdIW/6eDO4mVoogml14Bh2hSiFpM=
+github.com/sagernet/netlink v0.0.0-20240612041022-b9a21c07ac6a h1:ObwtHN2VpqE0ZNjr6sGeT00J8uU7JF4cNUdb44/Duis=
+github.com/sagernet/netlink v0.0.0-20240612041022-b9a21c07ac6a/go.mod h1:xLnfdiJbSp8rNqYEdIW/6eDO4mVoogml14Bh2hSiFpM=
+github.com/sagernet/nftables v0.3.0-beta.4 h1:kbULlAwAC3jvdGAC1P5Fa3GSxVwQJibNenDW2zaXr8I=
+github.com/sagernet/nftables v0.3.0-beta.4/go.mod h1:OQXAjvjNGGFxaTgVCSTRIhYB5/llyVDeapVoENYBDS8=
 github.com/sagernet/sing v0.2.18/go.mod h1:OL6k2F0vHmEzXz2KW19qQzu172FDgSbUSODylighuVo=
-github.com/sagernet/sing v0.3.8 h1:gm4JKalPhydMYX2zFOTnnd4TXtM/16WFRqSjMepYQQk=
-github.com/sagernet/sing v0.3.8/go.mod h1:+60H3Cm91RnL9dpVGWDPHt0zTQImO9Vfqt9a4rSambI=
+github.com/sagernet/sing v0.5.0-alpha.10 h1:kuHl10gpjbKQAdQfyogQU3u0CVnpqC3wrAHe/+BFaXc=
+github.com/sagernet/sing v0.5.0-alpha.10/go.mod h1:ARkL0gM13/Iv5VCZmci/NuoOlePoIsW0m7BWfln/Hak=
 github.com/sagernet/sing-mux v0.2.1-0.20240124034317-9bfb33698bb6 h1:5bCAkvDDzSMITiHFjolBwpdqYsvycdTu71FsMEFXQ14=
 github.com/sagernet/sing-mux v0.2.1-0.20240124034317-9bfb33698bb6/go.mod h1:khzr9AOPocLa+g53dBplwNDz4gdsyx/YM3swtAhlkHQ=
 github.com/sagernet/sing-shadowtls v0.1.4 h1:aTgBSJEgnumzFenPvc+kbD9/W0PywzWevnVpEx6Tw3k=
 github.com/sagernet/sing-shadowtls v0.1.4/go.mod h1:F8NBgsY5YN2beQavdgdm1DPlhaKQlaL6lpDdcBglGK4=
 github.com/sagernet/smux v0.0.0-20231208180855-7041f6ea79e7 h1:DImB4lELfQhplLTxeq2z31Fpv8CQqqrUwTbrIRumZqQ=
 github.com/sagernet/smux v0.0.0-20231208180855-7041f6ea79e7/go.mod h1:FP9X2xjT/Az1EsG/orYYoC+5MojWnuI7hrffz8fGwwo=
-github.com/sagernet/utls v1.5.4 h1:KmsEGbB2dKUtCNC+44NwAdNAqnqQ6GA4pTO0Yik56co=
-github.com/sagernet/utls v1.5.4/go.mod h1:CTGxPWExIloRipK3XFpYv0OVyhO8kk3XCGW/ieyTh1s=
 github.com/sagernet/wireguard-go v0.0.0-20231209092712-9a439356a62e h1:iGH0RMv2FzELOFNFQtvsxH7NPmlo7X5JizEK51UCojo=
 github.com/sagernet/wireguard-go v0.0.0-20231209092712-9a439356a62e/go.mod h1:YbL4TKHRR6APYQv3U2RGfwLDpPYSyWz6oUlpISBEzBE=
 github.com/samber/lo v1.39.0 h1:4gTz1wUhNYLhFSKl6O+8peW0v2F4BCY034GRpU9WnuA=
 github.com/samber/lo v1.39.0/go.mod h1:+m/ZKRl6ClXCE2Lgf3MsQlWfh4bn1bz6CXEOxnEXnEA=
-github.com/shirou/gopsutil/v3 v3.24.3 h1:eoUGJSmdfLzJ3mxIhmOAhgKEKgQkeOwKpz1NbhVnuPE=
-github.com/shirou/gopsutil/v3 v3.24.3/go.mod h1:JpND7O217xa72ewWz9zN2eIIkPWsDN/3pl0H8Qt0uwg=
+github.com/shirou/gopsutil/v3 v3.24.5 h1:i0t8kL+kQTvpAYToeuiVk3TgDeKOFioZO3Ztz/iZ9pI=
+github.com/shirou/gopsutil/v3 v3.24.5/go.mod h1:bsoOS1aStSs9ErQ1WWfxllSeS1K5D+U30r2NfcubMVk=
 github.com/shoenig/go-m1cpu v0.1.6 h1:nxdKQNcEB6vzgA2E2bvzKIYRuNj7XNJ4S/aRSwKzFtM=
 github.com/shoenig/go-m1cpu v0.1.6/go.mod h1:1JJMcUBvfNwpq05QDQVAnx3gUHr9IYF7GNg9SUEw2VQ=
 github.com/shoenig/test v0.6.4 h1:kVTaSd7WLz5WZ2IaoM0RSzRsUD+m8wRR+5qvntpn4LU=
@@ -187,15 +198,9 @@ github.com/sina-ghaderi/rabbitio v0.0.0-20220730151941-9ce26f4f872e/go.mod h1:+e
 github.com/sirupsen/logrus v1.9.3 h1:dueUQJ1C2q9oE3F7wvmSGAaVtTmUizReu6fjN8uqzbQ=
 github.com/sirupsen/logrus v1.9.3/go.mod h1:naHLuLoDiP4jHNo9R0sCBMtWGeIprob74mVsIT4qYEQ=
 github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
-github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw=
-github.com/stretchr/objx v0.5.0/go.mod h1:Yh+to48EsGEfYuaHDzXPcE3xhTkx73EhmCGUpEOglKo=
-github.com/stretchr/objx v0.5.2/go.mod h1:FRsXN1f5AsAjCGJKqEizvkpNtU+EGNCLh3NxZ/8L+MA=
 github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI=
 github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
 github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
-github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
-github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU=
-github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo=
 github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsTg=
 github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY=
 github.com/tklauser/go-sysconf v0.3.12 h1:0QaGUFOdQaIVdPgfITYzaTegZvdCjmYO52cSFAEVmqU=
@@ -207,14 +212,12 @@ github.com/u-root/uio v0.0.0-20230220225925-ffce2a382923/go.mod h1:eLL9Nub3yfAho
 github.com/vishvananda/netlink v1.1.0/go.mod h1:cTgwzPIzzgDAYoQrMm0EdrjRUBkTqKYppBueQtXaqoE=
 github.com/vishvananda/netns v0.0.0-20191106174202-0a2b9b5464df/go.mod h1:JP3t17pCcGlemwknint6hfoeCVQrEMVwxRLRjXpq+BU=
 github.com/vishvananda/netns v0.0.0-20210104183010-2eb08e3e575f/go.mod h1:DD4vA1DwXk04H54A1oHXtwZmA0grkVMdPxx/VGLCah0=
-github.com/vishvananda/netns v0.0.0-20211101163701-50045581ed74 h1:gga7acRE695APm9hlsSMoOoE65U4/TcqNj90mc69Rlg=
-github.com/vishvananda/netns v0.0.0-20211101163701-50045581ed74/go.mod h1:DD4vA1DwXk04H54A1oHXtwZmA0grkVMdPxx/VGLCah0=
+github.com/vishvananda/netns v0.0.4 h1:Oeaw1EM2JMxD51g9uhtC0D7erkIjgmj8+JZc26m1YX8=
+github.com/vishvananda/netns v0.0.4/go.mod h1:SpkAiCQRtJ6TvvxPnOSyH3BMl6unz3xZlaprSwhNNJM=
 github.com/wk8/go-ordered-map/v2 v2.1.8 h1:5h/BUHu93oj4gIdvHHHGsScSTMijfx5PeYkE/fJgbpc=
 github.com/wk8/go-ordered-map/v2 v2.1.8/go.mod h1:5nJHM5DyteebpVlHnWMV0rPz6Zp7+xBAnxjb1X5vnTw=
 github.com/yusufpapurcu/wmi v1.2.4 h1:zFUKzehAFReQwLys1b/iSMl+JQGSCSjtVqQn9bBrPo0=
 github.com/yusufpapurcu/wmi v1.2.4/go.mod h1:SBZ9tNy3G9/m5Oi98Zks0QjeHVDvuK0qfxQmPyzfmi0=
-github.com/zhangyunhao116/fastrand v0.4.0 h1:86QB6Y+GGgLZRFRDCjMmAS28QULwspK9sgL5d1Bx3H4=
-github.com/zhangyunhao116/fastrand v0.4.0/go.mod h1:vIyo6EyBhjGKpZv6qVlkPl4JVAklpMM4DSKzbAkMguA=
 gitlab.com/yawning/bsaes.git v0.0.0-20190805113838-0a714cd429ec h1:FpfFs4EhNehiVfzQttTuxanPIT43FtkkCFypIod8LHo=
 gitlab.com/yawning/bsaes.git v0.0.0-20190805113838-0a714cd429ec/go.mod h1:BZ1RAoRPbCxum9Grlv5aeksu2H8BiKehBYooU2LFiOQ=
 go.uber.org/mock v0.4.0 h1:VcM4ZOtdbR4f6VXfiOpwpVJDL6lCReaZ6mw31wqh7KU=
@@ -223,18 +226,18 @@ go4.org/netipx v0.0.0-20231129151722-fdeea329fbba h1:0b9z3AuHCjxk0x/opv64kcgZLBs
 go4.org/netipx v0.0.0-20231129151722-fdeea329fbba/go.mod h1:PLyyIXexvUFg3Owu6p/WfdlivPbZJsZdgWZlrGope/Y=
 golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
 golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
-golang.org/x/crypto v0.22.0 h1:g1v0xeRhjcugydODzvb3mEM9SQ0HGp9s/nh3COQ/C30=
-golang.org/x/crypto v0.22.0/go.mod h1:vr6Su+7cTlO45qkww3VDJlzDn0ctJvRgYbC2NvXHt+M=
-golang.org/x/exp v0.0.0-20240416160154-fe59bbe5cc7f h1:99ci1mjWVBWwJiEKYY6jWa4d2nTQVIEhZIptnrVb1XY=
-golang.org/x/exp v0.0.0-20240416160154-fe59bbe5cc7f/go.mod h1:/lliqkxwWAhPjf5oSOIJup2XcqJaw8RGS6k3TGEc7GI=
+golang.org/x/crypto v0.24.0 h1:mnl8DM0o513X8fdIkmyFE/5hTYxbwYOjDS/+rK6qpRI=
+golang.org/x/crypto v0.24.0/go.mod h1:Z1PMYSOR5nyMcyAVAIQSKCDwalqy85Aqn1x3Ws4L5DM=
+golang.org/x/exp v0.0.0-20240613232115-7f521ea00fb8 h1:yixxcjnhBmY0nkL253HFVIm0JsFHwrHdT3Yh6szTnfY=
+golang.org/x/exp v0.0.0-20240613232115-7f521ea00fb8/go.mod h1:jj3sYF3dwk5D+ghuXyeI3r5MFf+NT2An6/9dOA95KSI=
 golang.org/x/lint v0.0.0-20200302205851-738671d3881b/go.mod h1:3xt1FjdF8hUf6vQPIChWIBhFzV8gjjsPE/fR3IyQdNY=
 golang.org/x/mod v0.1.1-0.20191105210325-c90efee705ee/go.mod h1:QqPTAvyqsEbceGzBzNggFXnrqF1CaUcvgkdR5Ot7KZg=
-golang.org/x/mod v0.17.0 h1:zY54UmvipHiNd+pm+m0x9KhZ9hl1/7QNMyxXbc6ICqA=
-golang.org/x/mod v0.17.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c=
+golang.org/x/mod v0.18.0 h1:5+9lSbEzPSdWkH32vYPBwEpX8KwDbM52Ud9xBUvNlb0=
+golang.org/x/mod v0.18.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c=
 golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
 golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
-golang.org/x/net v0.24.0 h1:1PcaxkF854Fu3+lvBIx5SYn9wRlBzzcnHZSiaFFAb0w=
-golang.org/x/net v0.24.0/go.mod h1:2Q7sJY5mzlzWjKtYUEXSlBWCdyaioyXzRB2RtU8KVE8=
+golang.org/x/net v0.26.0 h1:soB7SVo0PWrY4vPW/+ay0jKDNScG2X9wFeYlXIvJsOQ=
+golang.org/x/net v0.26.0/go.mod h1:5YKkiSynbBIh3p6iOc/vibscux0x38BZDkn8sCUPxHE=
 golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.7.0 h1:YsImfSBoP9QPYL0xyKJPq0gcaJdG3rInoqxTWbfQu9M=
 golang.org/x/sync v0.7.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
@@ -254,28 +257,26 @@ golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.8.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.11.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.14.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
-golang.org/x/sys v0.18.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
-golang.org/x/sys v0.19.0 h1:q5f1RH2jigJ1MoAWp2KTp3gm5zAGFUTarQZ5U386+4o=
-golang.org/x/sys v0.19.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
-golang.org/x/term v0.19.0 h1:+ThwsDv+tYfnJFhF4L8jITxu1tdTWRTZpdsWgEgjL6Q=
-golang.org/x/term v0.19.0/go.mod h1:2CuTdWZ7KHSQwUzKva0cbMg6q2DMI3Mmxp+gKJbskEk=
+golang.org/x/sys v0.21.0 h1:rF+pYz3DAGSQAxAu1CbC7catZg4ebC4UIeIhKxBZvws=
+golang.org/x/sys v0.21.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
+golang.org/x/term v0.21.0 h1:WVXCp+/EBEHOj53Rvu+7KiT/iElMrO8ACK16SMZ3jaA=
+golang.org/x/term v0.21.0/go.mod h1:ooXLefLobQVslOqselCNF4SxFAaoS6KujMbsGzSDmX0=
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
-golang.org/x/text v0.14.0 h1:ScX5w1eTa3QqT8oi6+ziP7dTV1S2+ALU0bI+0zXKWiQ=
-golang.org/x/text v0.14.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU=
+golang.org/x/text v0.16.0 h1:a94ExnEXNtEwYLGJSIUxnWoxoRz/ZcCsV63ROupILh4=
+golang.org/x/text v0.16.0/go.mod h1:GhwF1Be+LQoKShO3cGOHzqOgRrGaYc9AvblQOmPVHnI=
 golang.org/x/time v0.5.0 h1:o7cqy6amK/52YcAKIPlM3a+Fpj35zvRj2TP+e1xFSfk=
 golang.org/x/time v0.5.0/go.mod h1:3BpzKBy/shNhVucY/MWOyx10tF3SFh9QdLuxbVysPQM=
 golang.org/x/tools v0.0.0-20200130002326-2f3ba24bd6e7/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28=
-golang.org/x/tools v0.20.0 h1:hz/CVckiOxybQvFw6h7b/q80NTr9IUQb4s1IIzW7KNY=
-golang.org/x/tools v0.20.0/go.mod h1:WvitBU7JJf6A4jOdg4S1tviW9bhUxkgeCui/0JHctQg=
+golang.org/x/tools v0.22.0 h1:gqSGLZqv+AI9lIQzniJ0nZDRG5GBPsSi+DRNHWNz6yA=
+golang.org/x/tools v0.22.0/go.mod h1:aCwcsjqvq7Yqt6TNyX7QMU2enbQ/Gt0bo6krSeEri+c=
 golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
-google.golang.org/protobuf v1.33.0 h1:uNO2rsAINq/JlFpSdYEKIZ0uKD/R9cpdv0T+yoGwGmI=
-google.golang.org/protobuf v1.33.0/go.mod h1:c6P6GXX6sHbq/GpV6MGZEdwhWPcYBgnhAHhKbcUYpos=
+google.golang.org/protobuf v1.34.2 h1:6xV6lTsCfpGD21XK49h7MhtcApnLqkfYgPcdHftf6hg=
+google.golang.org/protobuf v1.34.2/go.mod h1:qYOHts0dSfpeUzUFpOMr/WGzszTmLH+DiWniOlNbLDw=
+gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
-gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127 h1:qIbj1fsPNlZgppZ+VLlY7N33q108Sa+fhmuc+sWQYwY=
-gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
 gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
 gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
-lukechampine.com/blake3 v1.2.2 h1:wEAbSg0IVU4ih44CVlpMqMZMpzr5hf/6aqodLlevd/w=
-lukechampine.com/blake3 v1.2.2/go.mod h1:0OFRp7fBtAylGVCO40o87sbupkyIGgbpv1+M1k1LM6k=
+lukechampine.com/blake3 v1.3.0 h1:sJ3XhFINmHSrYCgl958hscfIa3bw8x4DqMP3u1YvoYE=
+lukechampine.com/blake3 v1.3.0/go.mod h1:0OFRp7fBtAylGVCO40o87sbupkyIGgbpv1+M1k1LM6k=

core/hub.go

@@ -1,5 +1,8 @@
 package main
 
+/*
+#include <stdlib.h>
+*/
 import "C"
 import (
 	bridge "core/dart-bridge"
@@ -10,10 +13,14 @@ import (
 	"github.com/metacubex/mihomo/adapter/provider"
 	"github.com/metacubex/mihomo/common/structure"
 	"github.com/metacubex/mihomo/common/utils"
+	"github.com/metacubex/mihomo/component/geodata"
+	"github.com/metacubex/mihomo/component/mmdb"
 	"github.com/metacubex/mihomo/config"
 	"github.com/metacubex/mihomo/constant"
+	cp "github.com/metacubex/mihomo/constant/provider"
 	"github.com/metacubex/mihomo/hub/executor"
 	"github.com/metacubex/mihomo/log"
+	rp "github.com/metacubex/mihomo/rules/provider"
 	"github.com/metacubex/mihomo/tunnel"
 	"github.com/metacubex/mihomo/tunnel/statistic"
 	"golang.org/x/net/context"
@@ -25,8 +32,12 @@ import (
 
 var currentConfig = config.DefaultRawConfig()
 
+var configParams = ConfigExtendedParams{}
+
 var isInit = false
 
+var currentProfileName = ""
+
 //export initClash
 func initClash(homeDirStr *C.char) bool {
 	if !isInit {
@@ -57,31 +68,53 @@ func shutdownClash() bool {
 	return true
 }
 
+//export forceGc
+func forceGc() {
+	go func() {
+		log.Infoln("[APP] request force GC")
+		runtime.GC()
+	}()
+}
+
+//export setCurrentProfileName
+func setCurrentProfileName(s *C.char) {
+	currentProfileName = C.GoString(s)
+}
+
+//export getCurrentProfileName
+func getCurrentProfileName() *C.char {
+	return C.CString(currentProfileName)
+}
+
 //export validateConfig
-func validateConfig(s *C.char) bool {
+func validateConfig(s *C.char, port C.longlong) {
+	i := int64(port)
 	bytes := []byte(C.GoString(s))
-	_, err := config.UnmarshalRawConfig(bytes)
-	return err == nil
+	go func() {
+		_, err := config.UnmarshalRawConfig(bytes)
+		if err != nil {
+			bridge.SendToPort(i, err.Error())
+			return
+		}
+		bridge.SendToPort(i, "")
+	}()
 }
 
 //export updateConfig
 func updateConfig(s *C.char, port C.longlong) {
 	i := int64(port)
+	paramsString := C.GoString(s)
 	go func() {
-		paramsString := C.GoString(s)
 		var params = &GenerateConfigParams{}
 		err := json.Unmarshal([]byte(paramsString), params)
 		if err != nil {
 			bridge.SendToPort(i, err.Error())
 			return
 		}
-		prof := decorationConfig(params.ProfilePath, *params.Config, *params.IsCompatible)
+		configParams = params.Params
+		prof := decorationConfig(params.ProfilePath, params.Config)
 		currentConfig = prof
-		if *params.IsPatch {
-			applyConfig(true)
-		} else {
-			applyConfig(false)
-		}
+		applyConfig()
 		bridge.SendToPort(i, "")
 	}()
 }
@@ -129,30 +162,32 @@ func getProxies() *C.char {
 }
 
 //export changeProxy
-func changeProxy(s *C.char) bool {
+func changeProxy(s *C.char) {
+	paramsString := C.GoString(s)
 	go func() {
-		paramsString := C.GoString(s)
 		var params = &ChangeProxyParams{}
 		err := json.Unmarshal([]byte(paramsString), params)
 		if err != nil {
 			log.Infoln("Unmarshal ChangeProxyParams %v", err)
 		}
+		groupName := *params.GroupName
+		proxyName := *params.ProxyName
 		proxies := tunnel.ProxiesWithProviders()
-		proxy := proxies[*params.GroupName]
-		if proxy == nil {
+		group, ok := proxies[groupName]
+		if !ok {
 			return
 		}
-		log.Infoln("change proxy %s", proxy.Name())
-		adapterProxy := proxy.(*adapter.Proxy)
+		adapterProxy := group.(*adapter.Proxy)
 		selector, ok := adapterProxy.ProxyAdapter.(*outboundgroup.Selector)
 		if !ok {
 			return
 		}
-		if err := selector.Set(*params.ProxyName); err != nil {
-			return
+
+		err = selector.Set(proxyName)
+		if err == nil {
+			log.Infoln("[Selector] %s selected %s", groupName, proxyName)
 		}
 	}()
-	return true
 }
 
 //export getTraffic
@@ -170,10 +205,31 @@ func getTraffic() *C.char {
 	return C.CString(string(data))
 }
 
+//export getTotalTraffic
+func getTotalTraffic() *C.char {
+	up, down := statistic.DefaultManager.Total()
+	traffic := map[string]int64{
+		"up":   up,
+		"down": down,
+	}
+	data, err := json.Marshal(traffic)
+	if err != nil {
+		fmt.Println("Error:", err)
+		return C.CString("")
+	}
+	return C.CString(string(data))
+}
+
+//export resetTraffic
+func resetTraffic() {
+	statistic.DefaultManager.ResetStatistic()
+}
+
 //export asyncTestDelay
-func asyncTestDelay(s *C.char) {
+func asyncTestDelay(s *C.char, port C.longlong) {
+	i := int64(port)
+	paramsString := C.GoString(s)
 	go func() {
-		paramsString := C.GoString(s)
 		var params = &TestDelayParams{}
 		err := json.Unmarshal([]byte(paramsString), params)
 		if err != nil {
@@ -195,26 +251,25 @@ func asyncTestDelay(s *C.char) {
 			Name: params.ProxyName,
 		}
 
-		message := bridge.Message{
-			Type: bridge.Delay,
-			Data: delayData,
-		}
-
 		if proxy == nil {
 			delayData.Value = -1
-			bridge.SendMessage(message)
+			data, _ := json.Marshal(delayData)
+			bridge.SendToPort(i, string(data))
 			return
 		}
 
 		delay, err := proxy.URLTest(ctx, constant.DefaultTestURL, expectedStatus)
 		if err != nil || delay == 0 {
 			delayData.Value = -1
-			bridge.SendMessage(message)
+			data, _ := json.Marshal(delayData)
+			bridge.SendToPort(i, string(data))
 			return
 		}
 
 		delayData.Value = int32(delay)
-		bridge.SendMessage(message)
+		data, _ := json.Marshal(delayData)
+		bridge.SendToPort(i, string(data))
+		return
 	}()
 }
 
@@ -222,7 +277,7 @@ func asyncTestDelay(s *C.char) {
 func getVersionInfo() *C.char {
 	versionInfo := map[string]string{
 		"clashName": constant.Name,
-		"version":   constant.Version,
+		"version":   "1.18.5",
 	}
 	data, err := json.Marshal(versionInfo)
 	if err != nil {
@@ -258,7 +313,6 @@ func closeConnections() bool {
 //export closeConnection
 func closeConnection(id *C.char) bool {
 	connectionId := C.GoString(id)
-
 	err := statistic.DefaultManager.Get(connectionId).Close()
 	if err != nil {
 		return false
@@ -269,10 +323,13 @@ func closeConnection(id *C.char) bool {
 //export getProviders
 func getProviders() *C.char {
 	data, err := json.Marshal(tunnel.Providers())
+	var msg *C.char
 	if err != nil {
-		return C.CString("")
+		msg = C.CString("")
+		return msg
 	}
-	return C.CString(string(data))
+	msg = C.CString(string(data))
+	return msg
 }
 
 //export getProvider
@@ -286,16 +343,103 @@ func getProvider(name *C.char) *C.char {
 	return C.CString(string(data))
 }
 
-//export healthcheck
-func healthcheck() {
-	hcCompatibleProvider(tunnel.Providers())
+//export getExternalProviders
+func getExternalProviders() *C.char {
+	externalProviders := make([]ExternalProvider, 0)
+	providers := tunnel.Providers()
+	for n, p := range providers {
+		if p.VehicleType() != cp.Compatible {
+			p := p.(*provider.ProxySetProvider)
+			externalProviders = append(externalProviders, ExternalProvider{
+				Name:        n,
+				Type:        p.Type().String(),
+				VehicleType: p.VehicleType().String(),
+				UpdateAt:    p.UpdatedAt,
+			})
+		}
+	}
+	for n, p := range tunnel.RuleProviders() {
+		if p.VehicleType() != cp.Compatible {
+			p := p.(*rp.RuleSetProvider)
+			externalProviders = append(externalProviders, ExternalProvider{
+				Name:        n,
+				Type:        p.Type().String(),
+				VehicleType: p.VehicleType().String(),
+				UpdateAt:    p.UpdatedAt,
+			})
+		}
+	}
+	data, err := json.Marshal(externalProviders)
+	if err != nil {
+		return C.CString("")
+	}
+	return C.CString(string(data))
+}
+
+//export updateExternalProvider
+func updateExternalProvider(providerName *C.char, providerType *C.char, port C.longlong) {
+	i := int64(port)
+	providerNameString := C.GoString(providerName)
+	providerTypeString := C.GoString(providerType)
+	go func() {
+		switch providerTypeString {
+		case "Proxy":
+			providers := tunnel.Providers()
+			err := providers[providerNameString].Update()
+			if err != nil {
+				bridge.SendToPort(i, err.Error())
+				return
+			}
+		case "Rule":
+			providers := tunnel.RuleProviders()
+			err := providers[providerNameString].Update()
+			if err != nil {
+				bridge.SendToPort(i, err.Error())
+				return
+			}
+		case "MMDB":
+			err := mmdb.DownloadMMDB(constant.Path.Resolve(providerNameString))
+			if err != nil {
+				bridge.SendToPort(i, err.Error())
+				return
+			}
+		case "ASN":
+			err := mmdb.DownloadASN(constant.Path.Resolve(providerNameString))
+			if err != nil {
+				bridge.SendToPort(i, err.Error())
+				return
+			}
+		case "GeoIp":
+			err := geodata.DownloadGeoIP(constant.Path.Resolve(providerNameString))
+			if err != nil {
+				bridge.SendToPort(i, err.Error())
+				return
+			}
+		case "GeoSite":
+			err := geodata.DownloadGeoSite(constant.Path.Resolve(providerNameString))
+			if err != nil {
+				bridge.SendToPort(i, err.Error())
+				return
+			}
+		}
+		bridge.SendToPort(i, "")
+	}()
 }
 
 //export initNativeApiBridge
-func initNativeApiBridge(api unsafe.Pointer, port C.longlong) {
+func initNativeApiBridge(api unsafe.Pointer) {
 	bridge.InitDartApi(api)
+}
+
+//export initMessage
+func initMessage(port C.longlong) {
 	i := int64(port)
-	bridge.Port = &i
+	Port = i
+}
+
+//export freeCString
+func freeCString(s *C.char) {
+	C.free(unsafe.Pointer(s))
 }
 
 func init() {
@@ -308,9 +452,21 @@ func init() {
 		} else {
 			delayData.Value = int32(delay)
 		}
-		bridge.SendMessage(bridge.Message{
-			Type: bridge.Delay,
+		SendMessage(Message{
+			Type: DelayMessage,
 			Data: delayData,
 		})
 	}
+	statistic.DefaultRequestNotify = func(c statistic.Tracker) {
+		SendMessage(Message{
+			Type: RequestMessage,
+			Data: c,
+		})
+	}
+	executor.DefaultProxyProviderLoadedHook = func(providerName string) {
+		SendMessage(Message{
+			Type: LoadedMessage,
+			Data: providerName,
+		})
+	}
 }

core/log.go

@@ -2,7 +2,6 @@ package main
 
 import "C"
 import (
-	bridge "core/dart-bridge"
 	"github.com/metacubex/mihomo/common/observable"
 	"github.com/metacubex/mihomo/log"
 )
@@ -18,11 +17,14 @@ func startLog() {
 	logSubscriber = log.Subscribe()
 	go func() {
 		for logData := range logSubscriber {
-			message := &bridge.Message{
-				Type: bridge.Log,
+			if logData.LogLevel < log.Level() {
+				continue
+			}
+			message := &Message{
+				Type: LogMessage,
 				Data: logData,
 			}
-			bridge.SendMessage(*message)
+			SendMessage(*message)
 		}
 	}()
 }

core/message.go

@@ -0,0 +1,77 @@
+package main
+
+import (
+	bridge "core/dart-bridge"
+	"encoding/json"
+	"github.com/metacubex/mihomo/constant"
+)
+
+var Port int64
+var ServicePort int64
+
+type MessageType string
+
+const (
+	LogMessage     MessageType = "log"
+	ProtectMessage MessageType = "protect"
+	DelayMessage   MessageType = "delay"
+	ProcessMessage MessageType = "process"
+	RequestMessage MessageType = "request"
+	StartedMessage MessageType = "started"
+	LoadedMessage  MessageType = "loaded"
+)
+
+type Delay struct {
+	Name  string `json:"name"`
+	Value int32  `json:"value"`
+}
+
+type Process struct {
+	Id       int64              `json:"id"`
+	Metadata *constant.Metadata `json:"metadata"`
+}
+
+type Message struct {
+	Type MessageType `json:"type"`
+	Data interface{} `json:"data"`
+}
+
+func (message *Message) Json() (string, error) {
+	data, err := json.Marshal(message)
+	return string(data), err
+}
+
+func SendMessage(message Message) {
+	s, err := message.Json()
+	if err != nil {
+		return
+	}
+	if handler, ok := messageHandlers[message.Type]; ok {
+		handler(s)
+	} else {
+		sendToPort(s)
+	}
+}
+
+var messageHandlers = map[MessageType]func(string) bool{
+	ProtectMessage: sendToServicePort,
+	ProcessMessage: sendToServicePort,
+	StartedMessage: conditionalSend,
+	LoadedMessage:  conditionalSend,
+}
+
+func sendToPort(s string) bool {
+	return bridge.SendToPort(Port, s)
+}
+
+func sendToServicePort(s string) bool {
+	return bridge.SendToPort(ServicePort, s)
+}
+
+func conditionalSend(s string) bool {
+	isSuccess := sendToPort(s)
+	if !isSuccess {
+		return sendToServicePort(s)
+	}
+	return isSuccess
+}

core/platform/limit.go

@@ -0,0 +1,42 @@
+//go:build android
+
+package platform
+
+import "syscall"
+
+var nullFd int
+var maxFdCount int
+
+func init() {
+	fd, err := syscall.Open("/dev/null", syscall.O_WRONLY, 0644)
+	if err != nil {
+		panic(err.Error())
+	}
+
+	nullFd = fd
+
+	var limit syscall.Rlimit
+
+	if err := syscall.Getrlimit(syscall.RLIMIT_NOFILE, &limit); err != nil {
+		maxFdCount = 1024
+	} else {
+		maxFdCount = int(limit.Cur)
+	}
+
+	maxFdCount = maxFdCount / 4 * 3
+}
+
+func ShouldBlockConnection() bool {
+	fd, err := syscall.Dup(nullFd)
+	if err != nil {
+		return true
+	}
+
+	_ = syscall.Close(fd)
+
+	if fd > maxFdCount {
+		return true
+	}
+
+	return false
+}

core/process.go

@@ -1,3 +1,81 @@
 //go:build android
 
 package main
+
+import "C"
+import (
+	"encoding/json"
+	"errors"
+	"github.com/metacubex/mihomo/component/process"
+	"github.com/metacubex/mihomo/constant"
+	"sync"
+	"sync/atomic"
+	"time"
+)
+
+type ProcessMap struct {
+	m sync.Map
+}
+
+func (cm *ProcessMap) Store(key int64, value string) {
+	cm.m.Store(key, value)
+}
+
+func (cm *ProcessMap) Load(key int64) (string, bool) {
+	value, ok := cm.m.Load(key)
+	if !ok || value == nil {
+		return "", false
+	}
+	return value.(string), true
+}
+
+var counter int64 = 0
+
+var processMap ProcessMap
+
+func init() {
+	process.DefaultPackageNameResolver = func(metadata *constant.Metadata) (string, error) {
+		if metadata == nil {
+			return "", process.ErrInvalidNetwork
+		}
+		id := atomic.AddInt64(&counter, 1)
+
+		timeout := time.After(200 * time.Millisecond)
+
+		SendMessage(Message{
+			Type: ProcessMessage,
+			Data: Process{
+				Id:       id,
+				Metadata: metadata,
+			},
+		})
+
+		for {
+			select {
+			case <-timeout:
+				return "", errors.New("package resolver timeout")
+			default:
+				value, exists := processMap.Load(id)
+				if exists {
+					return value, nil
+				}
+				time.Sleep(20 * time.Millisecond)
+			}
+		}
+	}
+}
+
+//export setProcessMap
+func setProcessMap(s *C.char) {
+	if s == nil {
+		return
+	}
+	paramsString := C.GoString(s)
+	go func() {
+		var processMapItem = &ProcessMapItem{}
+		err := json.Unmarshal([]byte(paramsString), processMapItem)
+		if err == nil {
+			processMap.Store(processMapItem.Id, processMapItem.Value)
+		}
+	}()
+}

core/status.go

@@ -0,0 +1,43 @@
+//go:build android
+
+package main
+
+import "C"
+import (
+	"encoding/json"
+	"fmt"
+)
+
+type AccessControl struct {
+	Mode              string   `json:"mode"`
+	AcceptList        []string `json:"acceptList"`
+	RejectList        []string `json:"rejectList"`
+	IsFilterSystemApp bool     `json:"isFilterSystemApp"`
+}
+
+type AndroidProps struct {
+	AccessControl *AccessControl `json:"accessControl"`
+	AllowBypass   bool           `json:"allowBypass"`
+	SystemProxy   bool           `json:"systemProxy"`
+}
+
+var androidProps AndroidProps
+
+//export getAndroidProps
+func getAndroidProps() *C.char {
+	data, err := json.Marshal(androidProps)
+	if err != nil {
+		fmt.Println("Error:", err)
+		return C.CString("")
+	}
+	return C.CString(string(data))
+}
+
+//export setAndroidProps
+func setAndroidProps(s *C.char) {
+	paramsString := C.GoString(s)
+	err := json.Unmarshal([]byte(paramsString), &androidProps)
+	if err != nil {
+		return
+	}
+}

core/tun.go

@@ -4,79 +4,157 @@ package main
 
 import "C"
 import (
+	"core/platform"
 	t "core/tun"
+	"errors"
 	"github.com/metacubex/mihomo/component/dialer"
 	"github.com/metacubex/mihomo/log"
 	"golang.org/x/sync/semaphore"
+	"strconv"
 	"sync"
+	"sync/atomic"
 	"syscall"
 	"time"
 )
 
 var tunLock sync.Mutex
 var tun *t.Tun
+var runTime *time.Time
 
-//export startTUN
-func startTUN(fd C.int) bool {
-	tunLock.Lock()
-	defer tunLock.Unlock()
-
-	if tun != nil {
-		tun.Close()
-		tun = nil
-	}
-	f := int(fd)
-	gateway := "172.16.0.1/30"
-	portal := "172.16.0.2"
-	dns := "0.0.0.0"
-
-	tempTun := &t.Tun{Closed: false, Limit: semaphore.NewWeighted(4)}
-
-	closer, err := t.Start(f, gateway, portal, dns)
-
-	applyConfig(true)
-
-	if err != nil {
-		log.Errorln("startTUN error: %v", err)
-		tempTun.Close()
-		return false
-	}
-
-	tempTun.Closer = closer
-
-	tun = tempTun
-
-	return true
+type FdMap struct {
+	m sync.Map
 }
 
-//export updateMarkSocketPort
-func updateMarkSocketPort(markSocketPort C.longlong) bool {
-	tunLock.Lock()
-	defer tunLock.Unlock()
-	//if tun != nil {
-	//	tun.MarkSocketPort = int64(markSocketPort)
-	//}
-	return true
+func (cm *FdMap) Store(key int64) {
+	cm.m.Store(key, struct{}{})
+}
+
+func (cm *FdMap) Load(key int64) bool {
+	_, ok := cm.m.Load(key)
+	return ok
+}
+
+var fdMap FdMap
+
+//export startTUN
+func startTUN(fd C.int, port C.longlong) {
+	i := int64(port)
+	ServicePort = i
+	go func() {
+		tunLock.Lock()
+		defer tunLock.Unlock()
+
+		if tun != nil {
+			tun.Close()
+			tun = nil
+		}
+
+		f := int(fd)
+		gateway := "172.16.0.1/30"
+		portal := "172.16.0.2"
+		dns := "0.0.0.0"
+
+		tempTun := &t.Tun{Closed: false, Limit: semaphore.NewWeighted(4)}
+
+		closer, err := t.Start(f, gateway, portal, dns)
+
+		if err != nil {
+			log.Errorln("startTUN error: %v", err)
+			tempTun.Close()
+		}
+
+		tempTun.Closer = closer
+
+		tun = tempTun
+
+		now := time.Now()
+
+		runTime = &now
+
+		SendMessage(Message{
+			Type: StartedMessage,
+			Data: strconv.FormatInt(runTime.UnixMilli(), 10),
+		})
+	}()
+}
+
+//export getRunTime
+func getRunTime() *C.char {
+	if runTime == nil {
+		return C.CString("")
+	}
+	return C.CString(strconv.FormatInt(runTime.UnixMilli(), 10))
 }
 
 //export stopTun
 func stopTun() {
-	tunLock.Lock()
-	defer tunLock.Unlock()
+	go func() {
+		tunLock.Lock()
+		defer tunLock.Unlock()
 
-	if tun != nil {
-		tun.Close()
-		applyConfig(true)
-		tun = nil
-	}
+		runTime = nil
+
+		if tun != nil {
+			tun.Close()
+			tun = nil
+		}
+	}()
 }
 
+var errBlocked = errors.New("blocked")
+
+//export setFdMap
+func setFdMap(fd C.long) {
+	fdInt := int64(fd)
+	go func() {
+		fdMap.Store(fdInt)
+	}()
+}
+
+type Fd struct {
+	Id    int64 `json:"id"`
+	Value int64 `json:"value"`
+}
+
+func markSocket(fd Fd) {
+	SendMessage(Message{
+		Type: ProtectMessage,
+		Data: fd,
+	})
+}
+
+var fdCounter int64 = 0
+
 func init() {
 	dialer.DefaultSocketHook = func(network, address string, conn syscall.RawConn) error {
+		if platform.ShouldBlockConnection() {
+			return errBlocked
+		}
 		return conn.Control(func(fd uintptr) {
-			if tun != nil {
-				tun.MarkSocket(int(fd))
-				time.Sleep(time.Millisecond * 100)
+			if tun == nil {
+				return
+			}
+
+			fdInt := int64(fd)
+			timeout := time.After(100 * time.Millisecond)
+			id := atomic.AddInt64(&fdCounter, 1)
+
+			markSocket(Fd{
+				Id:    id,
+				Value: fdInt,
+			})
+
+			for {
+				select {
+				case <-timeout:
+					return
+				default:
+					exists := fdMap.Load(id)
+					if exists {
+						return
+					}
+					time.Sleep(10 * time.Millisecond)
+				}
 			}
 		})
 	}

core/tun/tun.go

@@ -5,7 +5,6 @@ package tun
 import "C"
 import (
 	"context"
-	bridge "core/dart-bridge"
 	"encoding/binary"
 	"github.com/Kr328/tun2socket"
 	"github.com/Kr328/tun2socket/nat"
@@ -19,7 +18,6 @@ import (
 	"io"
 	"net"
 	"os"
-	"strconv"
 	"time"
 )
 
@@ -186,19 +184,3 @@ func Start(fd int, gateway, portal, dns string) (io.Closer, error) {
 
 	return stack, nil
 }
-
-func (t *Tun) MarkSocket(fd int) {
-	_ = t.Limit.Acquire(context.Background(), 1)
-	defer t.Limit.Release(1)
-
-	if t.Closed {
-		return
-	}
-
-	message := &bridge.Message{
-		Type: bridge.Tun,
-		Data: strconv.Itoa(fd),
-	}
-
-	bridge.SendMessage(*message)
-}

lib/application.dart

@@ -82,8 +82,11 @@ class ApplicationState extends State<Application> {
     super.initState();
     globalState.appController = AppController(context);
     WidgetsBinding.instance.addPostFrameCallback((timeStamp) async {
-      globalState.appController.updateViewWidth();
-      globalState.appController.afterInit();
+      final currentContext = globalState.navigatorKey.currentContext;
+      if (currentContext != null) {
+        globalState.appController = AppController(currentContext);
+      }
+      await globalState.appController.init();
       globalState.appController.initLink();
       _updateGroups();
     });
@@ -112,7 +115,6 @@ class ApplicationState extends State<Application> {
       lightColorScheme: lightDynamic,
       darkColorScheme: darkDynamic,
     );
-
     WidgetsBinding.instance.addPostFrameCallback((_) {
       globalState.appController.updateSystemColorSchemes(systemColorSchemes);
     });
@@ -127,7 +129,6 @@ class ApplicationState extends State<Application> {
       httpTimeoutDuration,
       (timer) async {
         await globalState.appController.updateGroups();
-        globalState.appController.appState.sortNum++;
       },
     );
   }
@@ -136,55 +137,59 @@ class ApplicationState extends State<Application> {
   Widget build(context) {
     return AppStateContainer(
       child: ClashMessageContainer(
-        child: _buildApp(
-          Selector2<AppState, Config, ApplicationSelectorState>(
-            selector: (_, appState, config) => ApplicationSelectorState(
-              locale: config.locale,
-              themeMode: config.themeMode,
-              primaryColor: config.primaryColor,
-            ),
-            builder: (_, state, child) {
-              return DynamicColorBuilder(
-                builder: (lightDynamic, darkDynamic) {
-                  _updateSystemColorSchemes(lightDynamic, darkDynamic);
-                  return MaterialApp(
-                    navigatorKey: globalState.navigatorKey,
-                    localizationsDelegates: const [
-                      AppLocalizations.delegate,
-                      GlobalMaterialLocalizations.delegate,
-                      GlobalCupertinoLocalizations.delegate,
-                      GlobalWidgetsLocalizations.delegate
-                    ],
-                    title: appName,
-                    locale: other.getLocaleForString(state.locale),
-                    supportedLocales:
-                        AppLocalizations.delegate.supportedLocales,
-                    themeMode: state.themeMode,
-                    theme: ThemeData(
-                      pageTransitionsTheme: _pageTransitionsTheme,
-                      useMaterial3: true,
-                      colorScheme: _getAppColorScheme(
-                        brightness: Brightness.light,
-                        systemColorSchemes: systemColorSchemes,
-                        primaryColor: state.primaryColor,
-                      ),
-                    ),
-                    darkTheme: ThemeData(
-                      useMaterial3: true,
-                      pageTransitionsTheme: _pageTransitionsTheme,
-                      colorScheme: _getAppColorScheme(
-                        brightness: Brightness.dark,
-                        systemColorSchemes: systemColorSchemes,
-                        primaryColor: state.primaryColor,
-                      ),
-                    ),
-                    home: child,
-                  );
-                },
-              );
-            },
-            child: const HomePage(),
+        child: Selector2<AppState, Config, ApplicationSelectorState>(
+          selector: (_, appState, config) => ApplicationSelectorState(
+            locale: config.locale,
+            themeMode: config.themeMode,
+            primaryColor: config.primaryColor,
           ),
+          builder: (_, state, child) {
+            return DynamicColorBuilder(
+              builder: (lightDynamic, darkDynamic) {
+                _updateSystemColorSchemes(lightDynamic, darkDynamic);
+                return MaterialApp(
+                  debugShowCheckedModeBanner: false,
+                  navigatorKey: globalState.navigatorKey,
+                  localizationsDelegates: const [
+                    AppLocalizations.delegate,
+                    GlobalMaterialLocalizations.delegate,
+                    GlobalCupertinoLocalizations.delegate,
+                    GlobalWidgetsLocalizations.delegate
+                  ],
+                  builder: (_, child) {
+                    return PopContainer(
+                      child: _buildApp(child!),
+                    );
+                  },
+                  scrollBehavior: BaseScrollBehavior(),
+                  title: appName,
+                  locale: other.getLocaleForString(state.locale),
+                  supportedLocales: AppLocalizations.delegate.supportedLocales,
+                  themeMode: state.themeMode,
+                  theme: ThemeData(
+                    useMaterial3: true,
+                    pageTransitionsTheme: _pageTransitionsTheme,
+                    colorScheme: _getAppColorScheme(
+                      brightness: Brightness.light,
+                      systemColorSchemes: systemColorSchemes,
+                      primaryColor: state.primaryColor,
+                    ),
+                  ),
+                  darkTheme: ThemeData(
+                    useMaterial3: true,
+                    pageTransitionsTheme: _pageTransitionsTheme,
+                    colorScheme: _getAppColorScheme(
+                      brightness: Brightness.dark,
+                      systemColorSchemes: systemColorSchemes,
+                      primaryColor: state.primaryColor,
+                    ),
+                  ),
+                  home: child,
+                );
+              },
+            );
+          },
+          child: const HomePage(),
         ),
       ),
     );

lib/clash/core.dart

@@ -5,9 +5,9 @@ import 'dart:io';
 import 'dart:isolate';
 
 import 'package:ffi/ffi.dart';
-import '../enum/enum.dart';
-import '../models/models.dart';
-import '../common/common.dart';
+import 'package:fl_clash/common/common.dart';
+import 'package:fl_clash/enum/enum.dart';
+import 'package:fl_clash/models/models.dart';
 import 'generated/clash_ffi.dart';
 
 class ClashCore {
@@ -35,7 +35,6 @@ class ClashCore {
     clashFFI = ClashFFI(lib);
     clashFFI.initNativeApiBridge(
       NativeApi.initializeApiDLData,
-      receiver.sendPort.nativePort,
     );
   }
 
@@ -45,10 +44,10 @@ class ClashCore {
   }
 
   bool init(String homeDir) {
-    return clashFFI.initClash(
-          homeDir.toNativeUtf8().cast(),
-        ) ==
-        1;
+    final homeDirChar = homeDir.toNativeUtf8().cast<Char>();
+    final isInit = clashFFI.initClash(homeDirChar) == 1;
+    malloc.free(homeDirChar);
+    return isInit;
   }
 
   shutdown() {
@@ -58,11 +57,22 @@ class ClashCore {
 
   bool get isInit => clashFFI.getIsInit() == 1;
 
-  bool validateConfig(String data) {
-    return clashFFI.validateConfig(
-          data.toNativeUtf8().cast(),
-        ) ==
-        1;
+  Future<String> validateConfig(String data) {
+    final completer = Completer<String>();
+    final receiver = ReceivePort();
+    receiver.listen((message) {
+      if (!completer.isCompleted) {
+        completer.complete(message);
+        receiver.close();
+      }
+    });
+    final dataChar = data.toNativeUtf8().cast<Char>();
+    clashFFI.validateConfig(
+      dataChar,
+      receiver.sendPort.nativePort,
+    );
+    malloc.free(dataChar);
+    return completer.future;
   }
 
   Future<String> updateConfig(UpdateConfigParams updateConfigParams) {
@@ -75,23 +85,51 @@ class ClashCore {
       }
     });
     final params = json.encode(updateConfigParams);
+    final paramsChar = params.toNativeUtf8().cast<Char>();
     clashFFI.updateConfig(
-      params.toNativeUtf8().cast(),
+      paramsChar,
       receiver.sendPort.nativePort,
     );
+    malloc.free(paramsChar);
     return completer.future;
   }
 
+  initMessage() {
+    clashFFI.initMessage(
+      receiver.sendPort.nativePort,
+    );
+  }
+
+  setProfileName(String profileName) {
+    final profileNameChar = profileName.toNativeUtf8().cast<Char>();
+    clashFFI.setCurrentProfileName(
+      profileNameChar,
+    );
+    malloc.free(profileNameChar);
+  }
+
+  getProfileName() {
+    final currentProfileNameRaw = clashFFI.getCurrentProfileName();
+    final currentProfileName =
+        currentProfileNameRaw.cast<Utf8>().toDartString();
+    clashFFI.freeCString(currentProfileNameRaw);
+    return currentProfileName;
+  }
+
   Future<List<Group>> getProxiesGroups() {
     final proxiesRaw = clashFFI.getProxies();
     final proxiesRawString = proxiesRaw.cast<Utf8>().toDartString();
+    clashFFI.freeCString(proxiesRaw);
     return Isolate.run<List<Group>>(() {
-      final proxies = json.decode(proxiesRawString);
+      if (proxiesRawString.isEmpty) return [];
+      final proxies = (json.decode(proxiesRawString) ?? {}) as Map;
+      if (proxies.isEmpty) return [];
       final groupNames = [
         UsedProxy.GLOBAL.name,
         ...(proxies[UsedProxy.GLOBAL.name]["all"] as List).where((e) {
-          final proxy = proxies[e];
-          return GroupTypeExtension.valueList.contains(proxy['type']);
+          final proxy = proxies[e] ?? {};
+          return GroupTypeExtension.valueList.contains(proxy['type']) &&
+              proxy['hidden'] != true;
         })
       ];
       final groupsRaw = groupNames.map((groupName) {
@@ -100,6 +138,7 @@ class ClashCore {
             .map(
               (name) => proxies[name],
             )
+            .where((proxy) => proxy != null)
             .toList();
         return group;
       }).toList();
@@ -107,65 +146,130 @@ class ClashCore {
     });
   }
 
-  Future<DelayMap> getDelayMap() {
-    final proxiesRaw = clashFFI.getProxies();
-    final proxiesRawString = proxiesRaw.cast<Utf8>().toDartString();
-    return Isolate.run<DelayMap>(() {
-      final proxies = json.decode(proxiesRawString) as Map<String, dynamic>;
-      return proxies.map<String, int?>(
-        (k, v) {
-          final history = v["history"] as List<dynamic>;
-          if (history.isEmpty) {
-            return MapEntry(
-              k,
-              null,
-            );
-          } else {
-            final delay = history.last["delay"];
-            return MapEntry(
-              k,
-              delay != 0 ? delay : -1,
-            );
-          }
-        },
-      );
+  Future<List<ExternalProvider>> getExternalProviders() {
+    final externalProvidersRaw = clashFFI.getExternalProviders();
+    final externalProvidersRawString =
+        externalProvidersRaw.cast<Utf8>().toDartString();
+    clashFFI.freeCString(externalProvidersRaw);
+    return Isolate.run<List<ExternalProvider>>(() {
+      final externalProviders =
+          (json.decode(externalProvidersRawString) as List<dynamic>)
+              .map(
+                (item) => ExternalProvider.fromJson(item),
+              )
+              .toList();
+      return externalProviders;
     });
   }
 
-  bool changeProxy(ChangeProxyParams changeProxyParams) {
-    final params = json.encode(changeProxyParams);
-    return clashFFI.changeProxy(params.toNativeUtf8().cast()) == 1;
+  Future<String> updateExternalProvider({
+    required String providerName,
+    required String providerType,
+  }) {
+    final completer = Completer<String>();
+    final receiver = ReceivePort();
+    receiver.listen((message) {
+      if (!completer.isCompleted) {
+        completer.complete(message);
+        receiver.close();
+      }
+    });
+    final providerNameChar = providerName.toNativeUtf8().cast<Char>();
+    final providerTypeChar = providerType.toNativeUtf8().cast<Char>();
+    clashFFI.updateExternalProvider(
+      providerNameChar,
+      providerTypeChar,
+      receiver.sendPort.nativePort,
+    );
+    malloc.free(providerNameChar);
+    malloc.free(providerTypeChar);
+    return completer.future;
   }
 
-  bool delay(String proxyName) {
+  changeProxy(ChangeProxyParams changeProxyParams) {
+    final params = json.encode(changeProxyParams);
+    final paramsChar = params.toNativeUtf8().cast<Char>();
+    clashFFI.changeProxy(paramsChar);
+    malloc.free(paramsChar);
+  }
+
+  Future<Delay> getDelay(String proxyName) {
     final delayParams = {
       "proxy-name": proxyName,
       "timeout": httpTimeoutDuration.inMilliseconds,
     };
-    clashFFI.asyncTestDelay(json.encode(delayParams).toNativeUtf8().cast());
-    return true;
+    final completer = Completer<Delay>();
+    final receiver = ReceivePort();
+    receiver.listen((message) {
+      if (!completer.isCompleted) {
+        completer.complete(Delay.fromJson(json.decode(message)));
+        receiver.close();
+      }
+    });
+    final delayParamsChar =
+        json.encode(delayParams).toNativeUtf8().cast<Char>();
+    clashFFI.asyncTestDelay(
+      delayParamsChar,
+      receiver.sendPort.nativePort,
+    );
+    malloc.free(delayParamsChar);
+    Future.delayed(httpTimeoutDuration + moreDuration, () {
+      receiver.close();
+      if (!completer.isCompleted) {
+        completer.complete(
+          Delay(name: proxyName, value: -1),
+        );
+      }
+    });
+    return completer.future;
   }
 
   clearEffect(String path) {
-    clashFFI.clearEffect(path.toNativeUtf8().cast());
-  }
-
-  healthcheck() {
-    clashFFI.healthcheck();
+    final pathChar = path.toNativeUtf8().cast<Char>();
+    clashFFI.clearEffect(pathChar);
+    malloc.free(pathChar);
   }
 
   VersionInfo getVersionInfo() {
     final versionInfoRaw = clashFFI.getVersionInfo();
     final versionInfo = json.decode(versionInfoRaw.cast<Utf8>().toDartString());
+    clashFFI.freeCString(versionInfoRaw);
     return VersionInfo.fromJson(versionInfo);
   }
 
+  setProps(Props props) {
+    final propsChar = json.encode(props).toNativeUtf8().cast<Char>();
+    clashFFI.setAndroidProps(propsChar);
+    malloc.free(propsChar);
+  }
+
+  Props getProps() {
+    final androidPropsRaw = clashFFI.getAndroidProps();
+    final androidProps = json.decode(
+      androidPropsRaw.cast<Utf8>().toDartString(),
+    );
+    clashFFI.freeCString(androidPropsRaw);
+    return Props.fromJson(androidProps);
+  }
+
   Traffic getTraffic() {
     final trafficRaw = clashFFI.getTraffic();
     final trafficMap = json.decode(trafficRaw.cast<Utf8>().toDartString());
+    clashFFI.freeCString(trafficRaw);
     return Traffic.fromMap(trafficMap);
   }
 
+  Traffic getTotalTraffic() {
+    final trafficRaw = clashFFI.getTotalTraffic();
+    final trafficMap = json.decode(trafficRaw.cast<Utf8>().toDartString());
+    clashFFI.freeCString(trafficRaw);
+    return Traffic.fromMap(trafficMap);
+  }
+
+  void resetTraffic() {
+    clashFFI.resetTraffic();
+  }
+
   void startLog() {
     clashFFI.startLog();
   }
@@ -174,21 +278,52 @@ class ClashCore {
     clashFFI.stopLog();
   }
 
-  startTun(int fd) {
-    clashFFI.startTUN(fd);
+  startTun(int fd, int port) {
+    if (!Platform.isAndroid) return;
+    clashFFI.startTUN(fd, port);
+  }
+
+  requestGc() {
+    clashFFI.forceGc();
   }
 
   void stopTun() {
     clashFFI.stopTun();
   }
 
+  void setProcessMap(ProcessMapItem processMapItem) {
+    final processMapItemChar =
+        json.encode(processMapItem).toNativeUtf8().cast<Char>();
+    clashFFI.setProcessMap(processMapItemChar);
+    malloc.free(processMapItemChar);
+  }
+
+  void setFdMap(int fd) {
+    clashFFI.setFdMap(fd);
+  }
+
+  DateTime? getRunTime() {
+    final runTimeRaw = clashFFI.getRunTime();
+    final runTimeString = runTimeRaw.cast<Utf8>().toDartString();
+    clashFFI.freeCString(runTimeRaw);
+    if (runTimeString.isEmpty) return null;
+    return DateTime.fromMillisecondsSinceEpoch(int.parse(runTimeString));
+  }
+
   List<Connection> getConnections() {
     final connectionsDataRaw = clashFFI.getConnections();
     final connectionsData =
         json.decode(connectionsDataRaw.cast<Utf8>().toDartString()) as Map;
+    clashFFI.freeCString(connectionsDataRaw);
     final connectionsRaw = connectionsData['connections'] as List? ?? [];
     return connectionsRaw.map((e) => Connection.fromJson(e)).toList();
   }
+
+  closeConnections(String id) {
+    final idChar = id.toNativeUtf8().cast<Char>();
+    clashFFI.closeConnection(idChar);
+    malloc.free(idChar);
+  }
 }
 
 final clashCore = ClashCore();

lib/clash/message.dart

@@ -7,18 +7,6 @@ import 'package:flutter/foundation.dart';
 
 import 'core.dart';
 
-abstract mixin class ClashMessageListener {
-  void onLog(Log log) {}
-
-  void onTun(String fd) {}
-
-  void onDelay(Delay delay) {}
-
-  void onProcess(Metadata metadata) {}
-
-  void onNow(Now now) {}
-}
-
 class ClashMessage {
   StreamSubscription? subscription;
 
@@ -28,23 +16,23 @@ class ClashMessage {
       subscription = null;
     }
     subscription = ClashCore.receiver.listen((message) {
-      final m = Message.fromJson(json.decode(message));
-      for (final ClashMessageListener listener in _listeners) {
+      final m = AppMessage.fromJson(json.decode(message));
+      for (final AppMessageListener listener in _listeners) {
         switch (m.type) {
-          case MessageType.log:
+          case AppMessageType.log:
             listener.onLog(Log.fromJson(m.data));
             break;
-          case MessageType.tun:
-            listener.onTun(m.data);
-            break;
-          case MessageType.delay:
+          case AppMessageType.delay:
             listener.onDelay(Delay.fromJson(m.data));
             break;
-          case MessageType.process:
-            listener.onProcess(Metadata.fromJson(m.data));
+          case AppMessageType.request:
+            listener.onRequest(Connection.fromJson(m.data));
             break;
-          case MessageType.now:
-            listener.onNow(Now.fromJson(m.data));
+          case AppMessageType.started:
+            listener.onStarted(m.data);
+            break;
+          case AppMessageType.loaded:
+            listener.onLoaded(m.data);
             break;
         }
       }
@@ -53,18 +41,18 @@ class ClashMessage {
 
   static final ClashMessage instance = ClashMessage._();
 
-  final ObserverList<ClashMessageListener> _listeners =
-      ObserverList<ClashMessageListener>();
+  final ObserverList<AppMessageListener> _listeners =
+      ObserverList<AppMessageListener>();
 
   bool get hasListeners {
     return _listeners.isNotEmpty;
   }
 
-  void addListener(ClashMessageListener listener) {
+  void addListener(AppMessageListener listener) {
     _listeners.add(listener);
   }
 
-  void removeListener(ClashMessageListener listener) {
+  void removeListener(AppMessageListener listener) {
     _listeners.remove(listener);
   }
 }

lib/clash/service.dart

@@ -1,24 +1,42 @@
 import 'dart:io';
 import 'package:fl_clash/common/common.dart';
 import 'package:fl_clash/models/models.dart';
+import 'package:flutter/cupertino.dart';
 import 'package:flutter/services.dart';
+import 'package:path/path.dart';
 
 import 'core.dart';
 
 class ClashService {
-  Future<bool> initMmdb() async {
-    final mmdbPath = await appPath.getMMDBPath();
-    var mmdbFile = File(mmdbPath);
-    final isExists = await mmdbFile.exists();
-    if (isExists) return true;
+  Future<void> initGeo() async {
+    final homePath = await appPath.getHomeDirPath();
+    final homeDir = Directory(homePath);
+    final isExists = await homeDir.exists();
+    if (!isExists) {
+      await homeDir.create(recursive: true);
+    }
+    const geoFileNameList = [
+      mmdbFileName,
+      geoIpFileName,
+      geoSiteFileName,
+      asnFileName,
+    ];
     try {
-      mmdbFile = await mmdbFile.create(recursive: true);
-      ByteData data = await rootBundle.load('assets/data/geoip.metadb');
-      List<int> bytes = data.buffer.asUint8List();
-      await mmdbFile.writeAsBytes(bytes, flush: true);
-      return true;
-    } catch (_) {
-      return false;
+      for (final geoFileName in geoFileNameList) {
+        final geoFile = File(
+          join(homePath, geoFileName),
+        );
+        final isExists = await geoFile.exists();
+        if (isExists) {
+          continue;
+        }
+        final data = await rootBundle.load('assets/data/$geoFileName');
+        List<int> bytes = data.buffer.asUint8List();
+        await geoFile.writeAsBytes(bytes, flush: true);
+      }
+    } catch (e) {
+      debugPrint("$e");
+      exit(0);
     }
   }
 
@@ -26,8 +44,7 @@ class ClashService {
     required ClashConfig clashConfig,
     required Config config,
   }) async {
-    final isInitMmdb = await initMmdb();
-    if (!isInitMmdb) return false;
+    await initGeo();
     final homeDirPath = await appPath.getHomeDirPath();
     final isInit = clashCore.init(homeDirPath);
     return isInit;

lib/common/android.dart

@@ -1,14 +1,10 @@
 import 'dart:io';
 
-import 'package:fl_clash/clash/clash.dart';
 import 'package:fl_clash/plugins/app.dart';
 
 class Android {
   init() async {
-    app?.onExit = () {
-      clashCore.shutdown();
-      exit(0);
-    };
+    app?.onExit = () {};
   }
 }
 

lib/common/common.dart

@@ -22,4 +22,7 @@ export 'string.dart';
 export 'app_localizations.dart';
 export 'function.dart';
 export 'package.dart';
-export 'measure.dart';
+export 'measure.dart';
+export 'service.dart';
+export 'iterable.dart';
+export 'scroll.dart';

lib/common/constant.dart

@@ -1,14 +1,33 @@
+import 'dart:io';
 import 'dart:ui';
 
+import 'package:fl_clash/enum/enum.dart';
+import 'package:fl_clash/models/clash_config.dart';
 import 'package:flutter/material.dart';
+import 'system.dart';
 
 const appName = "FlClash";
 const coreName = "clash.meta";
 const packageName = "FlClash";
 const httpTimeoutDuration = Duration(milliseconds: 5000);
 const moreDuration = Duration(milliseconds: 100);
+const animateDuration = Duration(milliseconds: 100);
 const defaultUpdateDuration = Duration(days: 1);
 const mmdbFileName = "geoip.metadb";
+const asnFileName = "ASN.mmdb";
+const geoIpFileName = "GeoIP.dat";
+const geoSiteFileName = "GeoSite.dat";
+final double kHeaderHeight = system.isDesktop ? (Platform.isMacOS ? 28 : 40) : 0;
+const GeoXMap defaultGeoXMap = {
+  "mmdb":
+      "https://github.com/MetaCubeX/meta-rules-dat/releases/download/latest/geoip.metadb",
+  "asn":
+      "https://github.com/xishang0128/geoip/releases/download/latest/GeoLite2-ASN.mmdb",
+  "geoip":
+      "https://github.com/MetaCubeX/meta-rules-dat/releases/download/latest/GeoIP.dat",
+  "geosite":
+      "https://github.com/MetaCubeX/meta-rules-dat/releases/download/latest/geosite.dat"
+};
 const profilesDirectoryName = "profiles";
 const localhost = "127.0.0.1";
 const clashConfigKey = "clash_config";
@@ -16,12 +35,22 @@ const configKey = "config";
 const listItemPadding = EdgeInsets.symmetric(horizontal: 16);
 const double dialogCommonWidth = 300;
 const repository = "chen08209/FlClash";
+const defaultExternalController = "127.0.0.1:9090";
 const maxMobileWidth = 600;
 const maxLaptopWidth = 840;
+const geodataLoaderMemconservative = "memconservative";
+const geodataLoaderStandard = "standard";
+const defaultTestUrl = "https://www.gstatic.com/generate_204";
 final filter = ImageFilter.blur(
   sigmaX: 5,
   sigmaY: 5,
   tileMode: TileMode.mirror,
 );
 
+const viewModeColumnsMap = {
+  ViewMode.mobile: [2, 1],
+  ViewMode.laptop: [3, 2],
+  ViewMode.desktop: [4, 3],
+};
+
 const defaultPrimaryColor = Colors.brown;

lib/common/context.dart

@@ -7,8 +7,12 @@ extension BuildContextExtension on BuildContext {
     return findAncestorStateOfType<CommonScaffoldState>();
   }
 
+  Size get appSize{
+    return MediaQuery.of(this).size;
+  }
+
   double get width {
-    return MediaQuery.of(this).size.width;
+    return appSize.width;
   }
 
   ColorScheme get colorScheme => Theme.of(this).colorScheme;

lib/common/datetime.dart

@@ -1,5 +1,7 @@
+import 'package:fl_clash/common/app_localizations.dart';
+
 extension DateTimeExtension on DateTime {
-  bool isBeforeNow() {
+  bool get isBeforeNow {
     return isBefore(DateTime.now());
   }
 
@@ -9,4 +11,32 @@ extension DateTimeExtension on DateTime {
     }
     return true;
   }
-}
+
+  String get lastUpdateTimeDesc {
+    final currentDateTime = DateTime.now();
+    final difference = currentDateTime.difference(this);
+    final days = difference.inDays;
+    if (days >= 365) {
+      return "${(days / 365).floor()} ${appLocalizations.years}${appLocalizations.ago}";
+    }
+    if (days >= 30) {
+      return "${(days / 30).floor()} ${appLocalizations.months}${appLocalizations.ago}";
+    }
+    if (days >= 1) {
+      return "$days ${appLocalizations.days}${appLocalizations.ago}";
+    }
+    final hours = difference.inHours;
+    if (hours >= 1) {
+      return "$hours ${appLocalizations.hours}${appLocalizations.ago}";
+    }
+    final minutes = difference.inMinutes;
+    if (minutes >= 1) {
+      return "$minutes ${appLocalizations.minutes}${appLocalizations.ago}";
+    }
+    return appLocalizations.just;
+  }
+
+  String get show {
+    return toIso8601String().substring(0, 10);
+  }
+}

lib/common/iterable.dart

@@ -0,0 +1,13 @@
+extension IterableExt<T> on Iterable<T> {
+  Iterable<T> separated(T separator) sync* {
+    final iterator = this.iterator;
+    if (!iterator.moveNext()) return;
+
+    yield iterator.current;
+
+    while (iterator.moveNext()) {
+      yield separator;
+      yield iterator.current;
+    }
+  }
+}

lib/common/measure.dart

@@ -23,10 +23,11 @@ class Measure {
   double? _bodyMediumHeight;
   double? _bodySmallHeight;
   double? _labelSmallHeight;
+  double? _labelMediumHeight;
   double? _titleLargeHeight;
+  double? _titleMediumHeight;
 
-
-  double get bodyMediumHeight{
+  double get bodyMediumHeight {
     _bodyMediumHeight ??= computeTextSize(
       Text(
         "",
@@ -36,7 +37,7 @@ class Measure {
     return _bodyMediumHeight!;
   }
 
-  double get bodySmallHeight{
+  double get bodySmallHeight {
     _bodySmallHeight ??= computeTextSize(
       Text(
         "",
@@ -46,7 +47,7 @@ class Measure {
     return _bodySmallHeight!;
   }
 
-  double get labelSmallHeight{
+  double get labelSmallHeight {
     _labelSmallHeight ??= computeTextSize(
       Text(
         "",
@@ -56,7 +57,17 @@ class Measure {
     return _labelSmallHeight!;
   }
 
-  double get titleLargeHeight{
+  double get labelMediumHeight {
+    _labelMediumHeight ??= computeTextSize(
+      Text(
+        "",
+        style: context.textTheme.labelMedium,
+      ),
+    ).height;
+    return _labelMediumHeight!;
+  }
+
+  double get titleLargeHeight {
     _titleLargeHeight ??= computeTextSize(
       Text(
         "",
@@ -65,4 +76,14 @@ class Measure {
     ).height;
     return _titleLargeHeight!;
   }
+
+  double get titleMediumHeight {
+    _titleMediumHeight ??= computeTextSize(
+      Text(
+        "",
+        style: context.textTheme.titleMedium,
+      ),
+    ).height;
+    return _titleMediumHeight!;
+  }
 }

lib/common/navigation.dart

@@ -29,6 +29,28 @@ class Navigation {
         label: "profiles",
         fragment: ProfilesFragment(),
       ),
+      const NavigationItem(
+        icon:  Icon(Icons.view_timeline),
+        label: "requests",
+        fragment:  RequestsFragment(),
+        description: "requestsDesc",
+        modes: [NavigationItemMode.desktop, NavigationItemMode.more],
+      ),
+      const NavigationItem(
+        icon:  Icon(Icons.ballot),
+        label: "connections",
+        fragment:  ConnectionsFragment(),
+        description: "connectionsDesc",
+        modes: [NavigationItemMode.desktop, NavigationItemMode.more],
+      ),
+      const NavigationItem(
+        icon: Icon(Icons.swap_vert_circle),
+        label: "resources",
+        description: "resourcesDesc",
+        keep: false,
+        fragment: Resources(),
+        modes: [NavigationItemMode.desktop, NavigationItemMode.more],
+      ),
       NavigationItem(
         icon: const Icon(Icons.adb),
         label: "logs",

lib/common/other.dart

@@ -2,6 +2,9 @@ import 'dart:io';
 import 'dart:isolate';
 import 'dart:typed_data';
 
+import 'package:fl_clash/common/app_localizations.dart';
+import 'package:fl_clash/common/constant.dart';
+import 'package:fl_clash/enum/enum.dart';
 import 'package:flutter/material.dart';
 import 'package:zxing2/qrcode.dart';
 import 'package:image/image.dart' as img;
@@ -37,6 +40,9 @@ class Other {
     }
     final diff = timeStamp / 1000;
     final inHours = (diff / 3600).floor();
+    if (inHours > 99) {
+      return "99:59:59";
+    }
     final inMinutes = (diff / 60 % 60).floor();
     final inSeconds = (diff % 60).floor();
 
@@ -162,11 +168,46 @@ class Other {
     }
   }
 
-  double getViewWidth(){
+  double getViewWidth() {
     final view = WidgetsBinding.instance.platformDispatcher.views.first;
     final size = view.physicalSize / view.devicePixelRatio;
     return size.width;
   }
+
+  List<String> parseReleaseBody(String? body) {
+    if (body == null) return [];
+    const pattern = r'- (.+?)\. \[.+?\]';
+    final regex = RegExp(pattern);
+    return regex
+        .allMatches(body)
+        .map((match) => match.group(1) ?? '')
+        .where((item) => item.isNotEmpty)
+        .toList();
+  }
+
+  ViewMode getViewMode(double viewWidth) {
+    if (viewWidth <= maxMobileWidth) return ViewMode.mobile;
+    if (viewWidth <= maxLaptopWidth) return ViewMode.laptop;
+    return ViewMode.desktop;
+  }
+
+  int getColumns(ViewMode viewMode, int currentColumns) {
+    final targetColumnsArray = viewModeColumnsMap[viewMode]!;
+    if (targetColumnsArray.contains(currentColumns)) {
+      return currentColumns;
+    }
+    return targetColumnsArray.first;
+  }
+
+  String getColumnsTextForInt(int number){
+    return switch(number){
+      1 => appLocalizations.oneColumn,
+      2 => appLocalizations.twoColumns,
+      3 => appLocalizations.threeColumns,
+      4 => appLocalizations.fourColumns,
+      int() => throw UnimplementedError(),
+    };
+  }
 }
 
 final other = Other();

lib/common/package.dart

@@ -1,22 +1,13 @@
-import 'dart:async';
+import 'dart:io';
 
 import 'package:package_info_plus/package_info_plus.dart';
 
-class AppPackage{
+import 'common.dart';
 
-  static AppPackage? _instance;
-  Completer<PackageInfo> packageInfoCompleter = Completer();
-
-  AppPackage._internal() {
-     PackageInfo.fromPlatform().then(
-          (value) => packageInfoCompleter.complete(value),
-    );
-  }
-
-  factory AppPackage() {
-    _instance ??= AppPackage._internal();
-    return _instance!;
-  }
+extension PackageInfoExtension on PackageInfo {
+  String get ua => [
+        "$appName/v$version",
+        "clash-verge",
+        "Platform/${Platform.operatingSystem}",
+      ].join(" ");
 }
-
-final appPackage = AppPackage();

lib/common/path.dart

@@ -8,12 +8,30 @@ import 'constant.dart';
 
 class AppPath {
   static AppPath? _instance;
-  Completer<Directory> applicationSupportDirectoryCompleter = Completer();
+  Completer<Directory> cacheDir = Completer();
+
+  // Future<Directory> _createDesktopCacheDir() async {
+  //   final path = join(dirname(Platform.resolvedExecutable), 'cache');
+  //   final dir = Directory(path);
+  //   if (await dir.exists()) {
+  //     await dir.create(recursive: true);
+  //   }
+  //   return dir;
+  // }
 
   AppPath._internal() {
-    getApplicationSupportDirectory().then(
-      (value) => applicationSupportDirectoryCompleter.complete(value),
-    );
+    getApplicationSupportDirectory().then((value) {
+      cacheDir.complete(value);
+    });
+    // if (Platform.isAndroid) {
+    //   getApplicationSupportDirectory().then((value) {
+    //     cacheDir.complete(value);
+    //   });
+    // } else {
+    //   _createDesktopCacheDir().then((value) {
+    //     cacheDir.complete(value);
+    //   });
+    // }
   }
 
   factory AppPath() {
@@ -22,12 +40,12 @@ class AppPath {
   }
 
   Future<String> getHomeDirPath() async {
-    final directory = await applicationSupportDirectoryCompleter.future;
+    final directory = await cacheDir.future;
     return directory.path;
   }
 
   Future<String> getProfilesPath() async {
-    final directory = await applicationSupportDirectoryCompleter.future;
+    final directory = await cacheDir.future;
     return join(directory.path, profilesDirectoryName);
   }
 
@@ -36,11 +54,6 @@ class AppPath {
     final directory = await getProfilesPath();
     return join(directory, "$id.yaml");
   }
-
-  Future<String> getMMDBPath() async {
-    var directory = await applicationSupportDirectoryCompleter.future;
-    return join(directory.path, mmdbFileName);
-  }
 }
 
 final appPath = AppPath();

lib/common/picker.dart

@@ -1,42 +1,33 @@
-import 'dart:io';
-
 import 'package:file_picker/file_picker.dart';
 import 'package:fl_clash/common/common.dart';
 import 'package:image_picker/image_picker.dart';
-import 'package:fl_clash/models/models.dart';
 
 class Picker {
-  Future<Result<PlatformFile>> pickerConfigFile() async {
-    FilePickerResult? filePickerResult;
-    if (Platform.isAndroid) {
-      filePickerResult = await FilePicker.platform.pickFiles(
-        withData: true,
-        type: FileType.custom,
-        allowedExtensions: ['txt', 'conf'],
-      );
-    } else {
-      filePickerResult = await FilePicker.platform.pickFiles(
-        withData: true,
-        type: FileType.custom,
-        allowedExtensions: ['yaml', 'txt', 'conf'],
-      );
-    }
-    final file = filePickerResult?.files.first;
-    if (file == null) {
-      return Result.error(appLocalizations.pleaseUploadFile);
-    }
-    return Result.success(file);
+  Future<PlatformFile?> pickerConfigFile() async {
+    final filePickerResult = await FilePicker.platform.pickFiles(
+      withData: true,
+      allowMultiple: false,
+    );
+    return filePickerResult?.files.first;
   }
 
-  Future<Result<String>> pickerConfigQRCode() async {
+  Future<PlatformFile?> pickerGeoDataFile() async {
+    final filePickerResult = await FilePicker.platform.pickFiles(
+      withData: true,
+      allowMultiple: false,
+    );
+    return filePickerResult?.files.first;
+  }
+
+  Future<String?> pickerConfigQRCode() async {
     final xFile = await ImagePicker().pickImage(source: ImageSource.gallery);
     final bytes = await xFile?.readAsBytes();
-    if (bytes == null) return Result.error();
+    if (bytes == null) return null;
     final result = await other.parseQRCode(bytes);
     if (result == null || !result.isUrl) {
-      return Result.error(appLocalizations.pleaseUploadValidQrcode);
+      throw appLocalizations.pleaseUploadValidQrcode;
     }
-    return Result.success(result);
+    return result;
   }
 }
 

lib/common/proxy.dart

@@ -11,12 +11,12 @@ class ProxyManager {
     _proxy = proxy ?? proxy_plugin.Proxy();
   }
 
-  bool get isStart => startTime != null && startTime!.isBeforeNow();
+  bool get isStart => startTime != null && startTime!.isBeforeNow;
 
   DateTime? get startTime => _proxy.startTime;
 
-  Future<bool?> startProxy({required int port, String? args}) async {
-    return await _proxy.startProxy(port, args);
+  Future<bool?> startProxy({required int port}) async {
+    return await _proxy.startProxy(port);
   }
 
   Future<bool?> stopProxy() async {
@@ -28,20 +28,6 @@ class ProxyManager {
     return await (_proxy as Proxy).updateStartTime();
   }
 
-  Future<bool?> setProtect(int fd) async {
-    if (_proxy is! Proxy) return null;
-    return await (_proxy as Proxy).setProtect(fd);
-  }
-
-  Future<bool?> startForeground({
-    required String title,
-    required String content,
-  }) async {
-    if (_proxy is! Proxy) return null;
-    return await (_proxy as Proxy)
-        .startForeground(title: title, content: content);
-  }
-
   factory ProxyManager() {
     _instance ??= ProxyManager._internal();
     return _instance!;

lib/common/request.dart

@@ -1,36 +1,107 @@
-import 'dart:convert';
+import 'dart:io';
 
+import 'package:dio/dio.dart';
+import 'package:dio/io.dart';
 import 'package:fl_clash/common/common.dart';
-import 'package:http/http.dart';
-import '../models/models.dart';
+import 'package:fl_clash/models/ip.dart';
+import 'package:fl_clash/state.dart';
 
 class Request {
-  static Future<Result<Response>> getFileResponseForUrl(String url) async {
-    final headers = {'User-Agent': coreName};
-    try {
-      final response = await get(Uri.parse(url), headers: headers).timeout(
-        httpTimeoutDuration,
+  late final Dio _dio;
+  int? _port;
+  bool _isStart = false;
+
+  Request() {
+    _dio = Dio();
+    _dio.options = BaseOptions(
+      headers: {"User-Agent": globalState.appController.clashConfig.globalUa},
+    );
+    _dio.interceptors.add(
+      InterceptorsWrapper(
+        onRequest: (options, handler) {
+          _updateAdapter();
+          return handler.next(options); // 继续请求
+        },
+      ),
+    );
+  }
+
+  _updateAdapter() {
+    final port = globalState.appController.clashConfig.mixedPort;
+    final isStart = globalState.appController.appState.isStart;
+    if (_port != port || isStart != _isStart) {
+      _port = port;
+      _isStart = isStart;
+      _dio.httpClientAdapter = IOHttpClientAdapter(
+        createHttpClient: () {
+          final client = HttpClient();
+          if (!_isStart) return client;
+          client.userAgent = globalState.appController.clashConfig.globalUa;
+          client.findProxy = (url) {
+            return "PROXY localhost:$_port;DIRECT";
+          };
+          return client;
+        },
+        validateCertificate: (_, __, ___) => true,
       );
-      return Result.success(response);
-    } catch (err) {
-      return Result.error(err.toString());
     }
   }
 
-  static Future<Result<String>> checkForUpdate() async {
-    final response = await get(
-      Uri.parse(
-        "https://api.github.com/repos/$repository/releases/latest",
+  Future<Response> getFileResponseForUrl(String url) async {
+    final response = await _dio
+        .get(
+          url,
+          options: Options(
+            responseType: ResponseType.bytes,
+          ),
+        )
+        .timeout(
+          httpTimeoutDuration * 2,
+        );
+    return response;
+  }
+
+  Future<Map<String, dynamic>?> checkForUpdate() async {
+    final response = await _dio.get(
+      "https://api.github.com/repos/$repository/releases/latest",
+      options: Options(
+        responseType: ResponseType.json,
       ),
     );
-    if (response.statusCode != 200) return Result.error();
-    final body = json.decode(response.body);
-    final remoteVersion = body['tag_name'];
-    final packageInfo = await appPackage.packageInfoCompleter.future;
-    final version = packageInfo.version;
+    if (response.statusCode != 200) return null;
+    final data = response.data as Map<String, dynamic>;
+    final remoteVersion = data['tag_name'];
+    final version = globalState.packageInfo.version;
     final hasUpdate =
         other.compareVersions(remoteVersion.replaceAll('v', ''), version) > 0;
-    if (!hasUpdate) return Result.error();
-    return Result.success(body['body']);
+    if (!hasUpdate) return null;
+    return data;
+  }
+
+  final Map<String, IpInfo Function(Map<String, dynamic>)> _ipInfoSources = {
+    "https://ipwho.is/": IpInfo.fromIpwhoIsJson,
+    "https://api.ip.sb/geoip/": IpInfo.fromIpSbJson,
+    "https://ipapi.co/json/": IpInfo.fromIpApiCoJson,
+    "https://ipinfo.io/json/": IpInfo.fromIpInfoIoJson,
+  };
+
+  Future<IpInfo?> checkIp(CancelToken? cancelToken) async {
+    for (final source in _ipInfoSources.entries) {
+      try {
+        final response = await _dio
+            .get<Map<String, dynamic>>(source.key, cancelToken: cancelToken)
+            .timeout(
+              httpTimeoutDuration,
+            );
+        if (response.statusCode == 200 && response.data != null) {
+          return source.value(response.data!);
+        }
+      } catch (e) {
+        continue;
+      }
+    }
+    return null;
   }
 }
+
+final request = Request();

lib/common/scroll.dart

@@ -0,0 +1,16 @@
+import 'dart:ui';
+
+import 'package:fl_clash/common/common.dart';
+import 'package:flutter/material.dart';
+
+class BaseScrollBehavior extends MaterialScrollBehavior {
+  @override
+  Set<PointerDeviceKind> get dragDevices => {
+        PointerDeviceKind.touch,
+        PointerDeviceKind.stylus,
+        PointerDeviceKind.invertedStylus,
+        PointerDeviceKind.trackpad,
+        if (system.isDesktop) PointerDeviceKind.mouse,
+        PointerDeviceKind.unknown,
+      };
+}

lib/common/service.dart

@@ -0,0 +1,110 @@
+import 'dart:ffi';
+import 'dart:io';
+import 'package:ffi/ffi.dart';
+import 'package:win32/win32.dart';
+
+typedef CreateServiceNative = IntPtr Function(
+  IntPtr hSCManager,
+  Pointer<Utf16> lpServiceName,
+  Pointer<Utf16> lpDisplayName,
+  Uint32 dwDesiredAccess,
+  Uint32 dwServiceType,
+  Uint32 dwStartType,
+  Uint32 dwErrorControl,
+  Pointer<Utf16> lpBinaryPathName,
+  Pointer<Utf16> lpLoadOrderGroup,
+  Pointer<Uint32> lpdwTagId,
+  Pointer<Utf16> lpDependencies,
+  Pointer<Utf16> lpServiceStartName,
+  Pointer<Utf16> lpPassword,
+);
+
+typedef CreateServiceDart = int Function(
+  int hSCManager,
+  Pointer<Utf16> lpServiceName,
+  Pointer<Utf16> lpDisplayName,
+  int dwDesiredAccess,
+  int dwServiceType,
+  int dwStartType,
+  int dwErrorControl,
+  Pointer<Utf16> lpBinaryPathName,
+  Pointer<Utf16> lpLoadOrderGroup,
+  Pointer<Uint32> lpdwTagId,
+  Pointer<Utf16> lpDependencies,
+  Pointer<Utf16> lpServiceStartName,
+  Pointer<Utf16> lpPassword,
+);
+
+const _SERVICE_ALL_ACCESS = 0xF003F;
+
+const _SERVICE_WIN32_OWN_PROCESS = 0x00000010;
+
+const _SERVICE_AUTO_START = 0x00000002;
+
+const _SERVICE_ERROR_NORMAL = 0x00000001;
+
+typedef GetLastErrorNative = Uint32 Function();
+typedef GetLastErrorDart = int Function();
+
+class Service {
+  static Service? _instance;
+  late DynamicLibrary _advapi32;
+
+  Service._internal() {
+    _advapi32 = DynamicLibrary.open('advapi32.dll');
+  }
+
+  factory Service() {
+    _instance ??= Service._internal();
+    return _instance!;
+  }
+
+  Future<void> createService() async {
+    final int scManager = OpenSCManager(nullptr, nullptr, _SERVICE_ALL_ACCESS);
+    if (scManager == 0) return;
+    final serviceName = 'FlClash Service'.toNativeUtf16();
+    final displayName = 'FlClash Service'.toNativeUtf16();
+    final binaryPathName = "C:\\Application\\Clash.Verge_1.6.6_x64_portable\\resources\\clash-verge-service.exe".toNativeUtf16();
+    final createService =
+        _advapi32.lookupFunction<CreateServiceNative, CreateServiceDart>(
+      'CreateServiceW',
+    );
+    final getLastError = DynamicLibrary.open('kernel32.dll')
+        .lookupFunction<GetLastErrorNative, GetLastErrorDart>('GetLastError');
+
+    final serviceHandle = createService(
+      scManager,
+      serviceName,
+      displayName,
+      _SERVICE_ALL_ACCESS,
+      _SERVICE_WIN32_OWN_PROCESS,
+      _SERVICE_AUTO_START,
+      _SERVICE_ERROR_NORMAL,
+      binaryPathName,
+      nullptr,
+      nullptr,
+      nullptr,
+      nullptr,
+      nullptr,
+    );
+
+    print("serviceHandle $serviceHandle");
+
+    final errorCode = GetLastError();
+    print('Error code: $errorCode');
+
+    final result = StartService(serviceHandle, 0, nullptr);
+
+    if (result == 0) {
+      print('Failed to start the service.');
+    } else {
+      print('Service started successfully.');
+    }
+
+    calloc.free(serviceName);
+    calloc.free(displayName);
+    calloc.free(binaryPathName);
+  }
+}
+
+final service = Platform.isWindows ? Service() : null;

lib/common/string.dart

@@ -1,10 +1,5 @@
 extension StringExtension on String {
   bool get isUrl {
-    try {
-      Uri.parse(this);
-      return true;
-    } catch (e) {
-      return false;
-    }
+    return RegExp(r'^(http|https|ftp)://').hasMatch(this);
   }
 }

lib/common/text.dart

@@ -2,15 +2,13 @@ import 'package:flutter/material.dart';
 import 'color.dart';
 
 extension TextStyleExtension on TextStyle {
-  toLight() {
-    return copyWith(color: color?.toLight());
-  }
+  TextStyle get toLight => copyWith(color: color?.toLight());
 
-  toSoftBold() {
-    return copyWith(fontWeight: FontWeight.w500);
-  }
+  TextStyle get toLighter => copyWith(color: color?.toLighter());
 
-  toBold() {
-    return copyWith(fontWeight: FontWeight.bold);
-  }
-}
+  TextStyle get toSoftBold => copyWith(fontWeight: FontWeight.w500);
+
+  TextStyle get toBold => copyWith(fontWeight: FontWeight.bold);
+
+  TextStyle get toMinus => copyWith(fontSize: fontSize! - 2);
+}

lib/common/window.dart

@@ -1,5 +1,6 @@
 import 'dart:io';
 
+import 'package:fl_clash/models/config.dart';
 import 'package:flutter/material.dart';
 import 'package:window_manager/window_manager.dart';
 import 'package:windows_single_instance/windows_single_instance.dart';
@@ -8,7 +9,7 @@ import 'protocol.dart';
 import 'system.dart';
 
 class Window {
-  init() async {
+  init(WindowProps props) async {
     if (Platform.isWindows) {
       await WindowsSingleInstance.ensureSingleInstance([], "FlClash");
       protocol.register("clash");
@@ -16,11 +17,21 @@ class Window {
       protocol.register("flclash");
     }
     await windowManager.ensureInitialized();
-    WindowOptions windowOptions = const WindowOptions(
-      size: Size(1000, 600),
-      minimumSize: Size(400, 600),
-      center: true,
+    WindowOptions windowOptions = WindowOptions(
+      size: Size(props.width, props.height),
+      minimumSize: const Size(380, 600),
+      titleBarStyle: TitleBarStyle.hidden,
     );
+    if (props.left != null || props.top != null) {
+      await windowManager.setPosition(
+        Offset(props.left ?? 0, props.top ?? 0),
+      );
+    } else {
+      await windowManager.setAlignment(Alignment.center);
+    }
+    // if(Platform.isWindows){
+    //   await windowManager.setTitleBarStyle(TitleBarStyle.hidden);
+    // }
     await windowManager.waitUntilReadyToShow(windowOptions, () async {
       await windowManager.setPreventClose(true);
     });

lib/controller.dart

@@ -1,11 +1,12 @@
 import 'dart:async';
 
+import 'package:fl_clash/enum/enum.dart';
 import 'package:fl_clash/state.dart';
 import 'package:flutter/material.dart';
 import 'package:provider/provider.dart';
+import 'package:url_launcher/url_launcher.dart';
 
 import 'clash/core.dart';
-import 'enum/enum.dart';
 import 'models/models.dart';
 import 'common/common.dart';
 
@@ -16,6 +17,7 @@ class AppController {
   late ClashConfig clashConfig;
   late Measure measure;
   late Function updateClashConfigDebounce;
+  late Function addCheckIpNumDebounce;
 
   AppController(this.context) {
     appState = context.read<AppState>();
@@ -24,12 +26,16 @@ class AppController {
     updateClashConfigDebounce = debounce<Function()>(() async {
       await updateClashConfig();
     });
+    addCheckIpNumDebounce = debounce(() {
+      appState.checkIpNum++;
+    });
     measure = Measure.of(context);
   }
 
   Future<void> updateSystemProxy(bool isStart) async {
     if (isStart) {
       await globalState.startSystemProxy(
+        appState: appState,
         config: config,
         clashConfig: clashConfig,
       );
@@ -39,11 +45,11 @@ class AppController {
         updateRunTime,
         updateTraffic,
       ];
-      clearShowProxyDelay();
-      testShowProxyDelay();
     } else {
       await globalState.stopSystemProxy();
+      clashCore.resetTraffic();
       appState.traffics = [];
+      appState.totalTraffic = Traffic();
       appState.runTime = null;
     }
   }
@@ -64,23 +70,14 @@ class AppController {
 
   updateTraffic() {
     globalState.updateTraffic(
-      config: config,
       appState: appState,
     );
   }
 
-  changeProxy() {
-    globalState.changeProxy(
-      appState: appState,
-      config: config,
-      clashConfig: clashConfig,
-    );
-  }
-
-  addProfile(Profile profile) {
+  addProfile(Profile profile) async {
     config.setProfile(profile);
     if (config.currentProfileId != null) return;
-    changeProfile(profile.id);
+    await changeProfile(profile.id);
   }
 
   deleteProfile(String id) async {
@@ -98,18 +95,13 @@ class AppController {
     }
   }
 
-  updateProfile(String id) async {
-    final profile = config.getCurrentProfileForId(id);
-    if (profile != null) {
-      final res = await profile.update();
-      if (res.type == ResultType.success) {
-        config.setProfile(profile);
-      }
-    }
+  Future<void> updateProfile(Profile profile) async {
+    await profile.update();
+    config.setProfile(await profile.update());
   }
 
-  Future<String> updateClashConfig({bool isPatch = true}) async {
-    return await globalState.updateClashConfig(
+  Future<void> updateClashConfig({bool isPatch = true}) async {
+    await globalState.updateClashConfig(
       clashConfig: clashConfig,
       config: config,
       isPatch: isPatch,
@@ -117,6 +109,18 @@ class AppController {
   }
 
   Future applyProfile() async {
+    final commonScaffoldState = globalState.homeScaffoldKey.currentState;
+    if (commonScaffoldState?.mounted != true) return;
+    commonScaffoldState?.loadingRun(() async {
+      await globalState.applyProfile(
+        appState: appState,
+        config: config,
+        clashConfig: clashConfig,
+      );
+    });
+  }
+
+  Future rawApplyProfile() async {
     await globalState.applyProfile(
       appState: appState,
       config: config,
@@ -124,19 +128,6 @@ class AppController {
     );
   }
 
-  Function? _changeProfileDebounce;
-
-  changeProfileDebounce(String? profileId) {
-    if (profileId == config.currentProfileId) return;
-    config.currentProfileId = profileId;
-    _changeProfileDebounce ??= debounce<Function(String?)>((profileId) async {
-      await applyProfile();
-      appState.delayMap = {};
-      saveConfigPreferences();
-    });
-    _changeProfileDebounce!([profileId]);
-  }
-
   changeProfile(String? value) async {
     if (value == config.currentProfileId) return;
     config.currentProfileId = value;
@@ -147,14 +138,34 @@ class AppController {
 
   autoUpdateProfiles() async {
     for (final profile in config.profiles) {
-      if (!profile.autoUpdate) return;
+      if (!profile.autoUpdate) continue;
       final isNotNeedUpdate = profile.lastUpdateDate
           ?.add(
             profile.autoUpdateDuration,
           )
-          .isBeforeNow();
-      if (isNotNeedUpdate == false) continue;
-      await profile.update();
+          .isBeforeNow;
+      if (isNotNeedUpdate == false || profile.type == ProfileType.file) {
+        continue;
+      }
+      try {
+        updateProfile(profile);
+      } catch (e) {
+        appState.addLog(
+          Log(
+            logLevel: LogLevel.info,
+            payload: e.toString(),
+          ),
+        );
+      }
+    }
+  }
+
+  updateProfiles() async {
+    for (final profile in config.profiles) {
+      if (profile.type == ProfileType.file) {
+        continue;
+      }
+      await updateProfile(profile);
     }
   }
 
@@ -209,53 +220,97 @@ class AppController {
   }
 
   autoCheckUpdate() async {
-    final res = await Request.checkForUpdate();
-    if(res.type != ResultType.success) return;
-    globalState.showMessage(
-      title: appLocalizations.checkUpdate,
-      message: TextSpan(
-        text: res.data,
-      ),
-    );
+    if (!config.autoCheckUpdate) return;
+    final res = await request.checkForUpdate();
+    checkUpdateResultHandle(data: res);
   }
 
-  afterInit() async {
-    if (config.autoRun) {
-      await updateSystemProxy(true);
-    } else {
-      await proxyManager.updateStartTime();
-      await updateSystemProxy(proxyManager.isStart);
+  checkUpdateResultHandle({
+    Map<String, dynamic>? data,
+    bool handleError = false,
+  }) async {
+    if (data != null) {
+      final tagName = data['tag_name'];
+      final body = data['body'];
+      final submits = other.parseReleaseBody(body);
+      final textTheme = context.textTheme;
+      globalState.showMessage(
+        title: appLocalizations.discoverNewVersion,
+        message: TextSpan(
+          text: "$tagName \n",
+          style: textTheme.headlineSmall,
+          children: [
+            TextSpan(
+              text: "\n",
+              style: textTheme.bodyMedium,
+            ),
+            for (final submit in submits)
+              TextSpan(
+                text: "- $submit \n",
+                style: textTheme.bodyMedium,
+              ),
+          ],
+        ),
+        onTab: () {
+          launchUrl(
+            Uri.parse("https://github.com/$repository/releases/latest"),
+          );
+        },
+        confirmText: appLocalizations.goDownload,
+      );
+    } else if (handleError) {
+      globalState.showMessage(
+        title: appLocalizations.checkUpdate,
+        message: TextSpan(
+          text: appLocalizations.checkUpdateError,
+        ),
+      );
     }
-    autoUpdateProfiles();
+  }
+
+  init() async {
     updateLogStatus();
     if (!config.silentLaunch) {
       window?.show();
     }
-    autoCheckUpdate();
-  }
-
-  healthcheck() {
-    if(globalState.healthcheckLock) return;
-    for (final delay in appState.delayMap.entries) {
-      setDelay(
-        Delay(
-          name: delay.key,
-          value: 0,
-        ),
+    final commonScaffoldState = globalState.homeScaffoldKey.currentState;
+    if (commonScaffoldState?.mounted == true) {
+      await commonScaffoldState?.loadingRun(() async {
+        await globalState.applyProfile(
+          appState: appState,
+          config: config,
+          clashConfig: clashConfig,
+        );
+      }, title: appLocalizations.init);
+    } else {
+      await globalState.applyProfile(
+        appState: appState,
+        config: config,
+        clashConfig: clashConfig,
       );
     }
-    clashCore.healthcheck();
+    await afterInit();
+  }
+
+  afterInit() async {
+    await proxyManager.updateStartTime();
+    if (proxyManager.isStart) {
+      await updateSystemProxy(true);
+    } else {
+      await updateSystemProxy(config.autoRun);
+    }
+    autoUpdateProfiles();
+    autoCheckUpdate();
   }
 
   setDelay(Delay delay) {
     appState.setDelay(delay);
   }
 
-  updateDelayMap() async {
-    appState.delayMap = await clashCore.getDelayMap();
-  }
-
   toPage(int index, {bool hasAnimate = false}) {
+    if (index > appState.currentNavigationItems.length - 1) {
+      return;
+    }
     appState.currentLabel = appState.currentNavigationItems[index].label;
     if ((config.isAnimateToPage || hasAnimate)) {
       globalState.pageController?.animateToPage(
@@ -268,7 +323,6 @@ class AppController {
     }
   }
 
-
   toProfiles() {
     final index = appState.currentNavigationItems.indexWhere(
       (element) => element.label == "profiles",
@@ -308,98 +362,95 @@ class AppController {
   }
 
   addProfileFormURL(String url) async {
-    globalState.navigatorKey.currentState?.popUntil((route) => route.isFirst);
+    if (globalState.navigatorKey.currentState?.canPop() ?? false) {
+      globalState.navigatorKey.currentState?.popUntil((route) => route.isFirst);
+    }
     toProfiles();
     final commonScaffoldState = globalState.homeScaffoldKey.currentState;
     if (commonScaffoldState?.mounted != true) return;
-    commonScaffoldState?.loadingRun(
+    final profile = await commonScaffoldState?.loadingRun<Profile>(
       () async {
-        await Future.delayed(const Duration(milliseconds: 300));
-        final profile = Profile(
+        return await Profile.normal(
           url: url,
-        );
-        final res = await profile.update();
-        if (res.type == ResultType.success) {
-          addProfile(profile);
-        } else {
-          debugPrint(res.message);
-          globalState.showMessage(
-            title: "${appLocalizations.add}${appLocalizations.profile}",
-            message: TextSpan(text: res.message!),
-          );
-        }
+        ).update();
       },
+      title: "${appLocalizations.add}${appLocalizations.profile}",
     );
+    if (profile != null) {
+      await addProfile(profile);
+    }
   }
 
   addProfileFormFile() async {
-    final result = await picker.pickerConfigFile();
-    if (result.type == ResultType.error) return;
+    final platformFile = await globalState.safeRun(picker.pickerConfigFile);
     if (!context.mounted) return;
     globalState.navigatorKey.currentState?.popUntil((route) => route.isFirst);
     toProfiles();
     final commonScaffoldState = globalState.homeScaffoldKey.currentState;
     if (commonScaffoldState?.mounted != true) return;
-    commonScaffoldState?.loadingRun(
+    final profile = await commonScaffoldState?.loadingRun<Profile?>(
       () async {
         await Future.delayed(const Duration(milliseconds: 300));
-        final bytes = result.data?.bytes;
+        final bytes = platformFile?.bytes;
         if (bytes == null) {
-          return;
+          return null;
         }
-        final profile = Profile(label: result.data?.name);
-        final sRes = await profile.saveFile(bytes);
-        if (sRes.type == ResultType.error) {
-          debugPrint(sRes.message);
-          globalState.showMessage(
-            title: "${appLocalizations.add}${appLocalizations.profile}",
-            message: TextSpan(text: sRes.message!),
-          );
-          return;
-        }
-        addProfile(profile);
+        return await Profile.normal(label: platformFile?.name).saveFile(bytes);
       },
+      title: "${appLocalizations.add}${appLocalizations.profile}",
     );
+    if (profile != null) {
+      await addProfile(profile);
+    }
   }
 
   addProfileFormQrCode() async {
-    final result = await picker.pickerConfigQRCode();
-    if (result.type == ResultType.error) {
-      if(result.message != null){
-        globalState.showMessage(
-          title: appLocalizations.tip,
-          message: TextSpan(
-            text: result.message,
-          ),
-        );
-      }
-      return;
-    }
-    addProfileFormURL(result.data!);
+    final url = await globalState.safeRun(picker.pickerConfigQRCode);
+    if (url == null) return;
+    addProfileFormURL(url);
   }
 
-  clearShowProxyDelay() {
-    final showProxyDelay = appState.getRealProxyName(appState.showProxyName);
-    if (showProxyDelay != null) {
-      appState.setDelay(
-        Delay(name: showProxyDelay, value: null),
+  int get columns =>
+      other.getColumns(appState.viewMode, config.proxiesColumns);
+
+  updateViewWidth(double width) {
+    WidgetsBinding.instance.addPostFrameCallback((_) {
+      appState.viewWidth = width;
+    });
+  }
+
+  List<Proxy> _sortOfName(List<Proxy> proxies) {
+    return List.of(proxies)
+      ..sort(
+        (a, b) => other.sortByChar(a.name, b.name),
       );
-    }
   }
 
-  testShowProxyDelay() {
-    final showProxyDelay = appState.getRealProxyName(appState.showProxyName);
-    if (showProxyDelay != null) {
-      globalState.updateCurrentDelay(showProxyDelay);
-    }
+  List<Proxy> _sortOfDelay(List<Proxy> proxies) {
+    return proxies = List.of(proxies)
+      ..sort(
+        (a, b) {
+          final aDelay = appState.getDelay(a.name);
+          final bDelay = appState.getDelay(b.name);
+          if (aDelay == null && bDelay == null) {
+            return 0;
+          }
+          if (aDelay == null || aDelay == -1) {
+            return 1;
+          }
+          if (bDelay == null || bDelay == -1) {
+            return -1;
+          }
+          return aDelay.compareTo(bDelay);
+        },
+      );
   }
 
-  updateViewWidth(){
-    appState.viewWidth = context.width;
-    if(appState.viewWidth == 0){
-      Future.delayed(moreDuration,(){
-        updateViewWidth();
-      });
-    }
+  List<Proxy> getSortProxies(List<Proxy> proxies) {
+    return switch (config.proxiesSortType) {
+      ProxiesSortType.none => proxies,
+      ProxiesSortType.delay => _sortOfDelay(proxies),
+      ProxiesSortType.name => _sortOfName(proxies),
+    };
   }
 }

lib/enum/enum.dart

@@ -1,6 +1,6 @@
 // ignore_for_file: constant_identifier_names
 
-enum GroupType { Selector, URLTest, Fallback }
+enum GroupType { Selector, URLTest, Fallback, LoadBalance, Relay }
 
 enum GroupName { GLOBAL, Proxy, Auto, Fallback }
 
@@ -56,9 +56,32 @@ enum ProfileType { file, url }
 
 enum ResultType { success, error }
 
-enum MessageType { log, tun, delay, process, now }
+enum AppMessageType {
+  log,
+  delay,
+  request,
+  started,
+  loaded,
+}
+
+enum ServiceMessageType {
+  protect,
+  process,
+  started,
+  loaded,
+}
+
+enum FindProcessMode { always, off }
 
 enum RecoveryOption {
   all,
   onlyProfiles,
 }
+
+enum ChipType { action, delete }
+
+enum CommonCardType { plain, filled }
+
+enum ProxiesType { tab, list }
+
+enum ProxyCardType { expand, shrink, min }

lib/fragments/about.dart

@@ -1,9 +1,6 @@
 import 'package:fl_clash/common/common.dart';
-import 'package:fl_clash/enum/enum.dart';
-import 'package:fl_clash/models/common.dart';
 import 'package:fl_clash/state.dart';
 import 'package:flutter/material.dart';
-import 'package:package_info_plus/package_info_plus.dart';
 import 'package:url_launcher/url_launcher.dart';
 
 class AboutFragment extends StatelessWidget {
@@ -12,26 +9,15 @@ class AboutFragment extends StatelessWidget {
   _checkUpdate(BuildContext context) async {
     final commonScaffoldState = context.commonScaffoldState;
     if (commonScaffoldState?.mounted != true) return;
-    final res = await commonScaffoldState?.loadingRun<Result<String>>(
-      Request.checkForUpdate,
+    final data =
+        await commonScaffoldState?.loadingRun<Map<String, dynamic>?>(
+      request.checkForUpdate,
       title: appLocalizations.checkUpdate,
     );
-    if (res == null) return;
-    if (res.type == ResultType.success) {
-      globalState.showMessage(
-        title: appLocalizations.checkUpdate,
-        message: TextSpan(
-          text: res.data,
-        ),
-      );
-    } else {
-      globalState.showMessage(
-        title: appLocalizations.checkUpdate,
-        message: TextSpan(
-          text: appLocalizations.checkUpdateError,
-        ),
-      );
-    }
+    globalState.appController.checkUpdateResultHandle(
+      data: data,
+      handleError: true,
+    );
   }
 
   @override
@@ -62,16 +48,9 @@ class AboutFragment extends StatelessWidget {
                         appName,
                         style: Theme.of(context).textTheme.headlineSmall,
                       ),
-                      FutureBuilder<PackageInfo>(
-                        future: appPackage.packageInfoCompleter.future,
-                        builder: (_, package) {
-                          final version = package.data?.version;
-                          if (version == null) return Container();
-                          return Text(
-                            version,
-                            style: Theme.of(context).textTheme.labelLarge,
-                          );
-                        },
+                      Text(
+                        globalState.packageInfo.version,
+                        style: Theme.of(context).textTheme.labelLarge,
                       )
                     ],
                   )
@@ -92,7 +71,7 @@ class AboutFragment extends StatelessWidget {
         ),
         ListTile(
           title: Text(appLocalizations.checkUpdate),
-          onTap: (){
+          onTap: () {
             _checkUpdate(context);
           },
         ),

lib/fragments/access.dart

@@ -1,11 +1,20 @@
+import 'package:collection/collection.dart';
 import 'package:fl_clash/enum/enum.dart';
 import 'package:fl_clash/models/models.dart';
 import 'package:fl_clash/plugins/app.dart';
 import 'package:fl_clash/common/common.dart';
+import 'package:fl_clash/state.dart';
 import 'package:fl_clash/widgets/widgets.dart';
 import 'package:flutter/material.dart';
 import 'package:provider/provider.dart';
 
+extension AccessControlExtension on AccessControl {
+  List<String> get currentList => switch (mode) {
+        AccessControlMode.acceptSelected => acceptList,
+        AccessControlMode.rejectSelected => rejectList,
+      };
+}
+
 class AccessFragment extends StatefulWidget {
   const AccessFragment({super.key});
 
@@ -19,11 +28,19 @@ class _AccessFragmentState extends State<AccessFragment> {
   @override
   void initState() {
     super.initState();
-    WidgetsBinding.instance.addPostFrameCallback((_) async {
-      packagesListenable.value = await app?.getPackages() ?? [];
+    WidgetsBinding.instance.addPostFrameCallback((_) {
+      Future.delayed(const Duration(milliseconds: 300), () async {
+        packagesListenable.value = await app?.getPackages() ?? [];
+      });
     });
   }
 
+  @override
+  void dispose() {
+    super.dispose();
+    packagesListenable.dispose();
+  }
+
   Widget _buildAppProxyModePopup() {
     final items = [
       CommonPopupMenuItem(
@@ -79,130 +96,103 @@ class _AccessFragmentState extends State<AccessFragment> {
     );
   }
 
-  Widget _buildSelectedAllButton({
-    required bool isSelectedAll,
-    required List<String> allValueList,
-  }) {
-    return Builder(
-      builder: (context) {
-        final tooltip = isSelectedAll
-            ? appLocalizations.cancelSelectAll
-            : appLocalizations.selectAll;
-        return IconButton(
-          tooltip: tooltip,
-          onPressed: () {
-            final config = context.read<Config>();
-            if (isSelectedAll) {
-              config.accessControl.currentList = [];
-              config.accessControl = config.accessControl.copyWith();
-            } else {
-              config.accessControl.currentList = allValueList;
-              config.accessControl = config.accessControl.copyWith();
-            }
-          },
-          icon: isSelectedAll
-              ? const Icon(Icons.deselect)
-              : const Icon(Icons.select_all),
-        );
+  Widget _buildSearchButton(List<Package> packages) {
+    return IconButton(
+      tooltip: appLocalizations.search,
+      onPressed: () {
+        showSearch(
+          context: context,
+          delegate: AccessControlSearchDelegate(
+            packages: packages,
+          ),
+        ).then((_) => {setState(() {})});
       },
+      icon: const Icon(Icons.search),
     );
   }
 
-  Widget _actionHeader({
+  Widget _buildSelectedAllButton({
     required bool isAccessControl,
-    required List<String> valueList,
-    required String describe,
-    required List<String> packageNameList,
+    required bool isSelectedAll,
+    required List<String> allValueList,
   }) {
+    final tooltip = isSelectedAll
+        ? appLocalizations.cancelSelectAll
+        : appLocalizations.selectAll;
     return AbsorbPointer(
       absorbing: !isAccessControl,
-      child: Padding(
-        padding: const EdgeInsets.only(
-          top: 4,
-          bottom: 4,
-          left: 16,
-          right: 8,
-        ),
-        child: Row(
-          mainAxisAlignment: MainAxisAlignment.spaceBetween,
-          mainAxisSize: MainAxisSize.max,
-          children: [
-            Expanded(
-              child: IntrinsicHeight(
-                child: Column(
-                  mainAxisSize: MainAxisSize.max,
-                  crossAxisAlignment: CrossAxisAlignment.start,
-                  children: [
-                    Expanded(
-                      child: Row(
-                        children: [
-                          Flexible(
-                            child: Text(
-                              appLocalizations.selected,
-                              style: Theme.of(context)
-                                  .textTheme
-                                  .labelLarge
-                                  ?.copyWith(
-                                    color:
-                                        Theme.of(context).colorScheme.primary,
-                                  ),
-                            ),
-                          ),
-                          const Flexible(
-                            child: SizedBox(
-                              width: 8,
-                            ),
-                          ),
-                          Flexible(
-                            child: Text(
-                              "${valueList.length}",
-                              style: Theme.of(context)
-                                  .textTheme
-                                  .labelLarge
-                                  ?.copyWith(
-                                    color:
-                                        Theme.of(context).colorScheme.primary,
-                                  ),
-                            ),
-                          ),
-                        ],
-                      ),
-                    ),
-                    Flexible(
-                      child: Text(describe),
-                    )
-                  ],
+      child: FloatingActionButton(
+        tooltip: tooltip,
+        onPressed: () {
+          final config = globalState.appController.config;
+          final isAccept =
+              config.accessControl.mode == AccessControlMode.acceptSelected;
+
+          if (isSelectedAll) {
+            config.accessControl = switch (isAccept) {
+              true => config.accessControl.copyWith(
+                  acceptList: [],
                 ),
-              ),
-            ),
-            Row(
-              mainAxisSize: MainAxisSize.min,
-              mainAxisAlignment: MainAxisAlignment.end,
-              children: [
-                Flexible(
-                  child: _buildSelectedAllButton(
-                    isSelectedAll: valueList.length == packageNameList.length,
-                    allValueList: packageNameList,
-                  ),
+              false => config.accessControl.copyWith(
+                  rejectList: [],
                 ),
-                Flexible(child: _buildFilterSystemAppButton()),
-                Flexible(child: _buildAppProxyModePopup()),
-              ],
-            ),
-          ],
-        ),
+            };
+          } else {
+            config.accessControl = switch (isAccept) {
+              true => config.accessControl.copyWith(
+                  acceptList: allValueList,
+                ),
+              false => config.accessControl.copyWith(
+                  rejectList: allValueList,
+                ),
+            };
+          }
+        },
+        child: isSelectedAll
+            ? const Icon(Icons.deselect)
+            : const Icon(Icons.select_all),
       ),
     );
   }
 
-  Widget _buildPackageList(bool isAccessControl) {
+  Widget _buildPackageList() {
     return ValueListenableBuilder(
       valueListenable: packagesListenable,
       builder: (_, packages, ___) {
-        return Selector<Config, AccessControl>(
-          selector: (_, config) => config.accessControl,
-          builder: (context, accessControl, __) {
+        final accessControl = globalState.appController.config.accessControl;
+        final acceptList = accessControl.acceptList;
+        final rejectList = accessControl.rejectList;
+        final acceptPackages = packages.sorted((a, b) {
+          final isSelectA = acceptList.contains(a.packageName);
+          final isSelectB = acceptList.contains(b.packageName);
+          if (isSelectA && isSelectB) return 0;
+          if (isSelectA) return -1;
+          if (isSelectB) return 1;
+          return 0;
+        });
+        final rejectPackages = packages.sorted((a, b) {
+          final isSelectA = rejectList.contains(a.packageName);
+          final isSelectB = rejectList.contains(b.packageName);
+          if (isSelectA && isSelectB) return 0;
+          if (isSelectA) return -1;
+          if (isSelectB) return 1;
+          return 0;
+        });
+        return Selector<Config, PackageListSelectorState>(
+          selector: (_, config) => PackageListSelectorState(
+            accessControl: config.accessControl,
+            isAccessControl: config.isAccessControl,
+          ),
+          builder: (context, state, __) {
+            final accessControl = state.accessControl;
+            final isAccessControl = state.isAccessControl;
             final isFilterSystemApp = accessControl.isFilterSystemApp;
+            final accessControlMode = accessControl.mode;
+            final packages =
+                accessControlMode == AccessControlMode.acceptSelected
+                    ? acceptPackages
+                    : rejectPackages;
+            final currentList = accessControl.currentList;
             final currentPackages = isFilterSystemApp
                 ? packages
                     .where((element) => element.isSystem == false)
@@ -210,60 +200,146 @@ class _AccessFragmentState extends State<AccessFragment> {
                 : packages;
             final packageNameList =
                 currentPackages.map((e) => e.packageName).toList();
-            final accessControlMode = accessControl.mode;
-            final valueList =
-                accessControl.currentList.intersection(packageNameList);
+            final valueList = currentList.intersection(packageNameList);
             final describe =
                 accessControlMode == AccessControlMode.acceptSelected
                     ? appLocalizations.accessControlAllowDesc
                     : appLocalizations.accessControlNotAllowDesc;
-
             return DisabledMask(
               status: !isAccessControl,
-              child: Column(
-                children: [
-                  _actionHeader(
+              child: FloatLayout(
+                floatingWidget: FloatWrapper(
+                  child: _buildSelectedAllButton(
                     isAccessControl: isAccessControl,
-                    valueList: valueList,
-                    describe: describe,
-                    packageNameList: packageNameList,
+                    isSelectedAll: valueList.length == packageNameList.length,
+                    allValueList: packageNameList,
                   ),
-                  Expanded(
-                    flex: 1,
-                    child: FadeBox(
-                      key: const Key("fade_box"),
-                      child: currentPackages.isEmpty
-                          ? const Center(
-                              child: CircularProgressIndicator(),
-                            )
-                          : ListView.builder(
-                              itemCount: currentPackages.length,
-                              itemBuilder: (_, index) {
-                                final package = currentPackages[index];
-                                return PackageListItem(
-                                  key: Key(package.label),
-                                  package: package,
-                                  value:
-                                      valueList.contains(package.packageName),
-                                  isActive: isAccessControl,
-                                  onChanged: (value) {
-                                    if (value == true) {
-                                      valueList.add(package.packageName);
-                                    } else {
-                                      valueList.remove(package.packageName);
-                                    }
-                                    final config = context.read<Config>();
-                                    config.accessControl.currentList =
-                                        valueList;
-                                    config.accessControl =
-                                        config.accessControl.copyWith();
-                                  },
-                                );
-                              },
+                ),
+                child: Column(
+                  children: [
+                    AbsorbPointer(
+                      absorbing: !isAccessControl,
+                      child: Padding(
+                        padding: const EdgeInsets.only(
+                          top: 4,
+                          bottom: 4,
+                          left: 16,
+                          right: 8,
+                        ),
+                        child: Row(
+                          mainAxisAlignment: MainAxisAlignment.spaceBetween,
+                          mainAxisSize: MainAxisSize.max,
+                          children: [
+                            Expanded(
+                              child: IntrinsicHeight(
+                                child: Column(
+                                  mainAxisSize: MainAxisSize.max,
+                                  crossAxisAlignment: CrossAxisAlignment.start,
+                                  children: [
+                                    Expanded(
+                                      child: Row(
+                                        children: [
+                                          Flexible(
+                                            child: Text(
+                                              appLocalizations.selected,
+                                              style: Theme.of(context)
+                                                  .textTheme
+                                                  .labelLarge
+                                                  ?.copyWith(
+                                                    color: Theme.of(context)
+                                                        .colorScheme
+                                                        .primary,
+                                                  ),
+                                            ),
+                                          ),
+                                          const Flexible(
+                                            child: SizedBox(
+                                              width: 8,
+                                            ),
+                                          ),
+                                          Flexible(
+                                            child: Text(
+                                              "${valueList.length}",
+                                              style: Theme.of(context)
+                                                  .textTheme
+                                                  .labelLarge
+                                                  ?.copyWith(
+                                                    color: Theme.of(context)
+                                                        .colorScheme
+                                                        .primary,
+                                                  ),
+                                            ),
+                                          ),
+                                        ],
+                                      ),
+                                    ),
+                                    Flexible(
+                                      child: Text(describe),
+                                    )
+                                  ],
+                                ),
+                              ),
                             ),
+                            Row(
+                              mainAxisSize: MainAxisSize.min,
+                              mainAxisAlignment: MainAxisAlignment.end,
+                              children: [
+                                Flexible(
+                                    child: _buildSearchButton(currentPackages)),
+                                Flexible(child: _buildFilterSystemAppButton()),
+                                Flexible(child: _buildAppProxyModePopup()),
+                              ],
+                            ),
+                          ],
+                        ),
+                      ),
                     ),
-                  ),
-                ],
+                    Expanded(
+                      flex: 1,
+                      child: FadeBox(
+                        key: const Key("fade_box"),
+                        child: currentPackages.isEmpty
+                            ? const Center(
+                                child: CircularProgressIndicator(),
+                              )
+                            : ListView.builder(
+                                itemCount: currentPackages.length,
+                                itemBuilder: (_, index) {
+                                  final package = currentPackages[index];
+                                  return PackageListItem(
+                                    key: Key(package.packageName),
+                                    package: package,
+                                    value:
+                                        valueList.contains(package.packageName),
+                                    isActive: isAccessControl,
+                                    onChanged: (value) {
+                                      if (value == true) {
+                                        valueList.add(package.packageName);
+                                      } else {
+                                        valueList.remove(package.packageName);
+                                      }
+                                      final config =
+                                          globalState.appController.config;
+                                      if (accessControlMode ==
+                                          AccessControlMode.acceptSelected) {
+                                        config.accessControl =
+                                            config.accessControl.copyWith(
+                                          acceptList: valueList,
+                                        );
+                                      } else {
+                                        config.accessControl =
+                                            config.accessControl.copyWith(
+                                          rejectList: valueList,
+                                        );
+                                      }
+                                    },
+                                  );
+                                },
+                              ),
+                      ),
+                    ),
+                  ],
+                ),
               ),
             );
           },
@@ -276,7 +352,7 @@ class _AccessFragmentState extends State<AccessFragment> {
   Widget build(BuildContext context) {
     return Selector<Config, bool>(
       selector: (_, config) => config.isAccessControl,
-      builder: (_, isAccessControl, __) {
+      builder: (_, isAccessControl, child) {
         return Column(
           mainAxisSize: MainAxisSize.max,
           children: [
@@ -300,11 +376,12 @@ class _AccessFragmentState extends State<AccessFragment> {
               ),
             ),
             Flexible(
-              child: _buildPackageList(isAccessControl),
+              child: child!,
             ),
           ],
         );
       },
+      child: _buildPackageList(),
     );
   }
 }
@@ -369,3 +446,111 @@ class PackageListItem extends StatelessWidget {
     );
   }
 }
+
+class AccessControlSearchDelegate extends SearchDelegate {
+  final List<Package> packages;
+
+  AccessControlSearchDelegate({
+    required this.packages,
+  });
+
+  List<Package> get _results {
+    final lowQuery = query.toLowerCase();
+    return packages
+        .where(
+          (package) =>
+              package.label.toLowerCase().contains(lowQuery) ||
+              package.packageName.contains(lowQuery),
+        )
+        .toList();
+  }
+
+  @override
+  List<Widget>? buildActions(BuildContext context) {
+    return [
+      IconButton(
+        onPressed: () {
+          if (query.isEmpty) {
+            close(context, null);
+            return;
+          }
+          query = '';
+        },
+        icon: const Icon(Icons.clear),
+      ),
+      const SizedBox(
+        width: 8,
+      )
+    ];
+  }
+
+  @override
+  Widget? buildLeading(BuildContext context) {
+    return IconButton(
+      onPressed: () {
+        close(context, null);
+      },
+      icon: const Icon(Icons.arrow_back),
+    );
+  }
+
+  Widget _packageList(List<Package> packages) {
+    return Selector<Config, PackageListSelectorState>(
+      selector: (_, config) => PackageListSelectorState(
+        accessControl: config.accessControl,
+        isAccessControl: config.isAccessControl,
+      ),
+      builder: (context, state, __) {
+        final accessControl = state.accessControl;
+        final isAccessControl = state.isAccessControl;
+        final accessControlMode = accessControl.mode;
+        final currentList = accessControl.currentList;
+        final packageNameList =
+            this.packages.map((e) => e.packageName).toList();
+        final valueList = currentList.intersection(packageNameList);
+        return DisabledMask(
+          status: !isAccessControl,
+          child: ListView.builder(
+            itemCount: packages.length,
+            itemBuilder: (_, index) {
+              final package = packages[index];
+              return PackageListItem(
+                key: Key(package.packageName),
+                package: package,
+                value: valueList.contains(package.packageName),
+                isActive: isAccessControl,
+                onChanged: (value) {
+                  if (value == true) {
+                    valueList.add(package.packageName);
+                  } else {
+                    valueList.remove(package.packageName);
+                  }
+                  final config = globalState.appController.config;
+                  if (accessControlMode == AccessControlMode.acceptSelected) {
+                    config.accessControl = config.accessControl.copyWith(
+                      acceptList: valueList,
+                    );
+                  } else {
+                    config.accessControl = config.accessControl.copyWith(
+                      rejectList: valueList,
+                    );
+                  }
+                },
+              );
+            },
+          ),
+        );
+      },
+    );
+  }
+
+  @override
+  Widget buildResults(BuildContext context) {
+    return buildSuggestions(context);
+  }
+
+  @override
+  Widget buildSuggestions(BuildContext context) {
+    return _packageList(_results);
+  }
+}

lib/fragments/application_setting.dart

@@ -89,6 +89,24 @@ class ApplicationSettingFragment extends StatelessWidget {
           );
         },
       ),
+      if (Platform.isAndroid)
+        Selector<Config, bool>(
+          selector: (_, config) => config.isExclude,
+          builder: (_, isExclude, child) {
+            return ListItem.switchItem(
+              leading: const Icon(Icons.visibility_off),
+              title: Text(appLocalizations.exclude),
+              subtitle: Text(appLocalizations.excludeDesc),
+              delegate: SwitchDelegate(
+                value: isExclude,
+                onChanged: (value) {
+                  final config = context.read<Config>();
+                  config.isExclude = value;
+                },
+              ),
+            );
+          },
+        ),
       if (Platform.isAndroid)
         Selector<Config, bool>(
           selector: (_, config) => config.isAnimateToPage,

lib/fragments/backup_and_recovery.dart

@@ -6,7 +6,6 @@ import 'package:fl_clash/models/dav.dart';
 import 'package:fl_clash/state.dart';
 import 'package:fl_clash/widgets/fade_box.dart';
 import 'package:fl_clash/widgets/list.dart';
-import 'package:fl_clash/widgets/section.dart';
 import 'package:fl_clash/widgets/text.dart';
 import 'package:flutter/material.dart';
 import 'package:provider/provider.dart';
@@ -34,9 +33,9 @@ class _BackupAndRecoveryState extends State<BackupAndRecovery> {
     final res = await commonScaffoldState?.loadingRun<bool>(() async {
       return await _client?.backup();
     });
-    if(res != true) return;
+    if (res != true) return;
     globalState.showMessage(
-      title: appLocalizations.recovery,
+      title: appLocalizations.backup,
       message: TextSpan(text: appLocalizations.backupSuccess),
     );
   }
@@ -46,7 +45,7 @@ class _BackupAndRecoveryState extends State<BackupAndRecovery> {
     final res = await commonScaffoldState?.loadingRun<bool>(() async {
       return await _client?.recovery(recoveryOption: recoveryOption);
     });
-    if(res != true) return;
+    if (res != true) return;
     globalState.showMessage(
       title: appLocalizations.recovery,
       message: TextSpan(text: appLocalizations.recoverySuccess),
@@ -69,26 +68,22 @@ class _BackupAndRecoveryState extends State<BackupAndRecovery> {
         if (dav == null) {
           return ListView(
             children: [
-              Section(
+              ListHeader(
                 title: appLocalizations.account,
-                child: Builder(
-                  builder: (_) {
-                    return ListItem(
-                      leading: const Icon(Icons.account_box),
-                      title: Text(appLocalizations.noInfo),
-                      subtitle: Text(appLocalizations.pleaseBindWebDAV),
-                      trailing: FilledButton.tonal(
-                        onPressed: () {
-                          _showAddWebDAV(dav);
-                        },
-                        child: Text(
-                          appLocalizations.bind,
-                        ),
-                      ),
-                    );
+              ),
+              ListItem(
+                leading: const Icon(Icons.account_box),
+                title: Text(appLocalizations.noInfo),
+                subtitle: Text(appLocalizations.pleaseBindWebDAV),
+                trailing: FilledButton.tonal(
+                  onPressed: () {
+                    _showAddWebDAV(dav);
                   },
+                  child: Text(
+                    appLocalizations.bind,
+                  ),
                 ),
-              )
+              ),
             ],
           );
         }
@@ -96,62 +91,60 @@ class _BackupAndRecoveryState extends State<BackupAndRecovery> {
         final pingFuture = _client!.pingCompleter.future;
         return ListView(
           children: [
-            Section(
-              title: appLocalizations.account,
-              child: ListItem(
-                leading: const Icon(Icons.account_box),
-                title: TooltipText(
-                  text: Text(
-                    dav.user,
-                    maxLines: 1,
-                    overflow: TextOverflow.ellipsis,
-                  ),
+            ListHeader(title: appLocalizations.account),
+            ListItem(
+              leading: const Icon(Icons.account_box),
+              title: TooltipText(
+                text: Text(
+                  dav.user,
+                  maxLines: 1,
+                  overflow: TextOverflow.ellipsis,
                 ),
-                subtitle: Padding(
-                  padding: const EdgeInsets.symmetric(vertical: 4),
-                  child: Row(
-                    crossAxisAlignment: CrossAxisAlignment.center,
-                    children: [
-                      Text(appLocalizations.connectivity),
-                      FutureBuilder<bool>(
-                        future: pingFuture,
-                        builder: (_, snapshot) {
-                          return Center(
-                            child: FadeBox(
-                              key: const Key("fade_box_1"),
-                              child: snapshot.connectionState ==
-                                      ConnectionState.waiting
-                                  ? const SizedBox(
-                                      width: 12,
-                                      height: 12,
-                                      child: CircularProgressIndicator(
-                                        strokeWidth: 1,
-                                      ),
-                                    )
-                                  : Container(
-                                      decoration: BoxDecoration(
-                                        shape: BoxShape.circle,
-                                        color: snapshot.data == true
-                                            ? Colors.green
-                                            : Colors.red,
-                                      ),
-                                      width: 12,
-                                      height: 12,
+              ),
+              subtitle: Padding(
+                padding: const EdgeInsets.symmetric(vertical: 4),
+                child: Row(
+                  crossAxisAlignment: CrossAxisAlignment.center,
+                  children: [
+                    Text(appLocalizations.connectivity),
+                    FutureBuilder<bool>(
+                      future: pingFuture,
+                      builder: (_, snapshot) {
+                        return Center(
+                          child: FadeBox(
+                            key: const Key("fade_box_1"),
+                            child: snapshot.connectionState ==
+                                    ConnectionState.waiting
+                                ? const SizedBox(
+                                    width: 12,
+                                    height: 12,
+                                    child: CircularProgressIndicator(
+                                      strokeWidth: 1,
                                     ),
-                            ),
-                          );
-                        },
-                      ),
-                    ],
-                  ),
+                                  )
+                                : Container(
+                                    decoration: BoxDecoration(
+                                      shape: BoxShape.circle,
+                                      color: snapshot.data == true
+                                          ? Colors.green
+                                          : Colors.red,
+                                    ),
+                                    width: 12,
+                                    height: 12,
+                                  ),
+                          ),
+                        );
+                      },
+                    ),
+                  ],
                 ),
-                trailing: FilledButton.tonal(
-                  onPressed: () {
-                    _showAddWebDAV(dav);
-                  },
-                  child: Text(
-                    appLocalizations.edit,
-                  ),
+              ),
+              trailing: FilledButton.tonal(
+                onPressed: () {
+                  _showAddWebDAV(dav);
+                },
+                child: Text(
+                  appLocalizations.edit,
                 ),
               ),
             ),
@@ -161,22 +154,21 @@ class _BackupAndRecoveryState extends State<BackupAndRecovery> {
                 return FadeBox(
                   key: const Key("fade_box_2"),
                   child: snapshot.data == true
-                      ? Section(
-                          title: appLocalizations.backupAndRecovery,
-                          child: Column(
-                            children: [
-                              ListItem(
-                                onTab: _backup,
-                                title: Text(appLocalizations.backup),
-                                subtitle: Text(appLocalizations.backupDesc),
-                              ),
-                              ListItem(
-                                onTab: _handleRecovery,
-                                title: Text(appLocalizations.recovery),
-                                subtitle: Text(appLocalizations.recoveryDesc),
-                              ),
-                            ],
-                          ),
+                      ? Column(
+                          children: [
+                            ListHeader(
+                                title: appLocalizations.backupAndRecovery),
+                            ListItem(
+                              onTab: _backup,
+                              title: Text(appLocalizations.backup),
+                              subtitle: Text(appLocalizations.backupDesc),
+                            ),
+                            ListItem(
+                              onTab: _handleRecovery,
+                              title: Text(appLocalizations.recovery),
+                              subtitle: Text(appLocalizations.recoveryDesc),
+                            ),
+                          ],
                         )
                       : Container(),
                 );
@@ -228,6 +220,12 @@ class _WebDAVFormDialogState extends State<WebDAVFormDialog> {
     Navigator.pop(context);
   }
 
+  @override
+  void dispose() {
+    super.dispose();
+    _obscureController.dispose();
+  }
+
   @override
   Widget build(BuildContext context) {
     return AlertDialog(

lib/fragments/config.dart

@@ -1,3 +1,5 @@
+import 'dart:io';
+
 import 'package:fl_clash/common/common.dart';
 import 'package:fl_clash/enum/enum.dart';
 import 'package:fl_clash/models/models.dart';
@@ -37,141 +39,409 @@ class _ConfigFragmentState extends State<ConfigFragment> {
     }
   }
 
-  _updateLoglevel(LogLevel? logLevel) {
-    if (logLevel == null ||
-        logLevel == globalState.appController.clashConfig.logLevel) return;
-    globalState.appController.clashConfig.logLevel = logLevel;
-    globalState.appController.updateClashConfigDebounce();
+  _showLogLevelDialog(LogLevel value) {
+    globalState.showCommonDialog(
+      child: AlertDialog(
+        title: Text(appLocalizations.logLevel),
+        contentPadding: const EdgeInsets.symmetric(
+          horizontal: 8,
+          vertical: 16,
+        ),
+        content: SizedBox(
+          width: 250,
+          child: Wrap(
+            children: [
+              for (final logLevel in LogLevel.values)
+                ListItem.radio(
+                  delegate: RadioDelegate<LogLevel>(
+                    value: logLevel,
+                    groupValue: value,
+                    onChanged: (LogLevel? value) {
+                      if (value == null) {
+                        return;
+                      }
+                      final appController = globalState.appController;
+                      appController.clashConfig.logLevel = value;
+                      appController.updateClashConfigDebounce();
+                      Navigator.of(context).pop();
+                    },
+                  ),
+                  title: Text(logLevel.name),
+                )
+            ],
+          ),
+        ),
+      ),
+    );
   }
 
-  @override
-  Widget build(BuildContext context) {
-    List<Widget> items = [
-      Selector<ClashConfig, int>(
-        selector: (_, clashConfig) => clashConfig.mixedPort,
-        builder: (_, mixedPort, __) {
-          return ListItem(
-            onTab: () {
-              _modifyMixedPort(mixedPort);
+  _showUaDialog(String? value) {
+    const uas = [
+      null,
+      "clash-verge/v1.6.6",
+      "ClashforWindows/0.19.23",
+    ];
+    globalState.showCommonDialog(
+      child: AlertDialog(
+        title: const Text("UA"),
+        contentPadding: const EdgeInsets.symmetric(
+          horizontal: 8,
+          vertical: 16,
+        ),
+        content: SizedBox(
+          width: 250,
+          child: Wrap(
+            children: [
+              for (final ua in uas)
+                ListItem.radio(
+                  delegate: RadioDelegate<String?>(
+                    value: ua,
+                    groupValue: value,
+                    onChanged: (String? value) {
+                      final appController = globalState.appController;
+                      appController.clashConfig.globalRealUa = value;
+                      appController.updateClashConfigDebounce();
+                      Navigator.of(context).pop();
+                    },
+                  ),
+                  title: Text(ua ?? appLocalizations.defaultText),
+                )
+            ],
+          ),
+        ),
+      ),
+    );
+  }
+
+  _modifyTestUrl(String testUrl) async {
+    final newTestUrl = await globalState.showCommonDialog<String>(
+      child: TestUrlFormDialog(
+        testUrl: testUrl,
+      ),
+    );
+    if (newTestUrl != null && newTestUrl != testUrl && mounted) {
+      try {
+        if (!newTestUrl.isUrl) {
+          throw "Invalid url";
+        }
+        globalState.appController.config.testUrl = newTestUrl;
+        globalState.appController.updateClashConfigDebounce();
+      } catch (e) {
+        globalState.showMessage(
+          title: appLocalizations.testUrl,
+          message: TextSpan(
+            text: e.toString(),
+          ),
+        );
+      }
+    }
+  }
+
+  List<Widget> _buildAppSection() {
+    return generateSection(
+      title: appLocalizations.app,
+      items: [
+        if (Platform.isAndroid)
+          Selector<Config, bool>(
+            selector: (_, config) => config.allowBypass,
+            builder: (_, allowBypass, __) {
+              return ListItem.switchItem(
+                leading: const Icon(Icons.arrow_forward_outlined),
+                title: Text(appLocalizations.allowBypass),
+                subtitle: Text(appLocalizations.allowBypassDesc),
+                delegate: SwitchDelegate(
+                  value: allowBypass,
+                  onChanged: (bool value) async {
+                    final appController = globalState.appController;
+                    appController.config.allowBypass = value;
+                  },
+                ),
+              );
             },
-            padding: const EdgeInsets.symmetric(horizontal: 16,vertical: 4),
-            leading: const Icon(Icons.adjust),
-            title: Text(appLocalizations.proxyPort),
-            trailing: FilledButton.tonal(
-              onPressed: () {
+          ),
+        if (Platform.isAndroid)
+          Selector<Config, bool>(
+            selector: (_, config) => config.systemProxy,
+            builder: (_, systemProxy, __) {
+              return ListItem.switchItem(
+                leading: const Icon(Icons.settings_ethernet),
+                title: Text(appLocalizations.systemProxy),
+                subtitle: Text(appLocalizations.systemProxyDesc),
+                delegate: SwitchDelegate(
+                  value: systemProxy,
+                  onChanged: (bool value) async {
+                    final appController = globalState.appController;
+                    appController.config.systemProxy = value;
+                  },
+                ),
+              );
+            },
+          ),
+        Selector<Config, bool>(
+          selector: (_, config) => config.isCompatible,
+          builder: (_, isCompatible, __) {
+            return ListItem.switchItem(
+              leading: const Icon(Icons.expand_outlined),
+              title: Text(appLocalizations.compatible),
+              subtitle: Text(appLocalizations.compatibleDesc),
+              delegate: SwitchDelegate(
+                value: isCompatible,
+                onChanged: (bool value) async {
+                  final appController = globalState.appController;
+                  appController.config.isCompatible = value;
+                  await appController.applyProfile();
+                },
+              ),
+            );
+          },
+        ),
+      ],
+    );
+  }
+
+  List<Widget> _buildGeneralSection() {
+    return generateSection(
+      title: appLocalizations.general,
+      items: [
+        Selector<ClashConfig, LogLevel>(
+          selector: (_, clashConfig) => clashConfig.logLevel,
+          builder: (_, value, __) {
+            return ListItem(
+              leading: const Icon(Icons.info_outline),
+              title: Text(appLocalizations.logLevel),
+              subtitle: Text(value.name),
+              onTab: () {
+                _showLogLevelDialog(value);
+              },
+            );
+          },
+        ),
+        Selector<ClashConfig, String?>(
+          selector: (_, clashConfig) => clashConfig.globalRealUa,
+          builder: (_, value, __) {
+            return ListItem(
+              leading: const Icon(Icons.computer_outlined),
+              title: const Text("UA"),
+              subtitle: Text(value ?? appLocalizations.defaultText),
+              onTab: () {
+                _showUaDialog(value);
+              },
+            );
+          },
+        ),
+        Selector<Config, String>(
+          selector: (_, config) => config.testUrl,
+          builder: (_, value, __) {
+            return ListItem(
+              leading: const Icon(Icons.timeline),
+              title: Text(appLocalizations.testUrl),
+              subtitle: Text(value),
+              onTab: () {
+                _modifyTestUrl(value);
+              },
+            );
+          },
+        ),
+        Selector<ClashConfig, int>(
+          selector: (_, clashConfig) => clashConfig.mixedPort,
+          builder: (_, mixedPort, __) {
+            return ListItem(
+              onTab: () {
                 _modifyMixedPort(mixedPort);
               },
-              child: Text(
-                "$mixedPort",
+              leading: const Icon(Icons.adjust_outlined),
+              title: Text(appLocalizations.proxyPort),
+              subtitle: Text(appLocalizations.proxyPortDesc),
+              trailing: FilledButton.tonal(
+                onPressed: () {
+                  _modifyMixedPort(mixedPort);
+                },
+                child: Text(
+                  "$mixedPort",
+                ),
               ),
-            ),
-          );
-        },
-      ),
-      Selector<ClashConfig, bool>(
-        selector: (_, clashConfig) => clashConfig.allowLan,
-        builder: (_, allowLan, __) {
-          return ListItem.switchItem(
-            leading: const Icon(Icons.device_hub),
-            title: Text(appLocalizations.allowLan),
-            subtitle: Text(appLocalizations.allowLanDesc),
-            delegate: SwitchDelegate(
-              value: allowLan,
-              onChanged: (bool value) async {
-                final clashConfig = context.read<ClashConfig>();
-                clashConfig.allowLan = value;
-                globalState.appController.updateClashConfigDebounce();
-              },
-            ),
-          );
-        },
-      ),
-      if (system.isDesktop)
+            );
+          },
+        ),
         Selector<ClashConfig, bool>(
-          selector: (_, clashConfig) => clashConfig.tun.enable,
-          builder: (_, tunEnable, __) {
+          selector: (_, clashConfig) => clashConfig.ipv6,
+          builder: (_, ipv6, __) {
             return ListItem.switchItem(
-              leading: const Icon(Icons.support),
-              title: Text(appLocalizations.tun),
-              subtitle: Text(appLocalizations.tunDesc),
+              leading: const Icon(Icons.water_outlined),
+              title: const Text("IPv6"),
+              subtitle: Text(appLocalizations.ipv6Desc),
               delegate: SwitchDelegate(
-                value: tunEnable,
+                value: ipv6,
+                onChanged: (bool value) async {
+                  final appController = globalState.appController;
+                  appController.clashConfig.ipv6 = value;
+                  appController.updateClashConfigDebounce();
+                },
+              ),
+            );
+          },
+        ),
+        Selector<ClashConfig, bool>(
+          selector: (_, clashConfig) => clashConfig.allowLan,
+          builder: (_, allowLan, __) {
+            return ListItem.switchItem(
+              leading: const Icon(Icons.device_hub),
+              title: Text(appLocalizations.allowLan),
+              subtitle: Text(appLocalizations.allowLanDesc),
+              delegate: SwitchDelegate(
+                value: allowLan,
                 onChanged: (bool value) async {
                   final clashConfig = context.read<ClashConfig>();
-                  clashConfig.tun = Tun(enable: value);
+                  clashConfig.allowLan = value;
                   globalState.appController.updateClashConfigDebounce();
                 },
               ),
             );
           },
         ),
-      Selector<Config, bool>(
-        selector: (_, config) => config.isCompatible,
-        builder: (_, isCompatible, __) {
-          return ListItem.switchItem(
-            leading: const Icon(Icons.expand),
-            title: Text(appLocalizations.compatible),
-            subtitle: Text(appLocalizations.compatibleDesc),
-            delegate: SwitchDelegate(
-              value: isCompatible,
-              onChanged: (bool value) async {
-                final appController = globalState.appController;
-                appController.config.isCompatible = value;
-                await appController.updateClashConfig(isPatch: false);
-                await appController.updateGroups();
-                appController.changeProxy();
-              },
-            ),
-          );
-        },
-      ),
-      Padding(
-        padding: kMaterialListPadding,
-        child: Selector<ClashConfig, LogLevel>(
-          selector: (_, clashConfig) => clashConfig.logLevel,
-          builder: (_, value, __) {
-            return ListItem(
-              leading: const Icon(Icons.feedback),
-              title: Text(appLocalizations.logLevel),
-              trailing: SizedBox(
-                height: 48,
-                child: DropdownMenu<LogLevel>(
-                  width: 124,
-                  inputDecorationTheme: const InputDecorationTheme(
-                    filled: true,
-                    contentPadding: EdgeInsets.symmetric(
-                      vertical: 5,
-                      horizontal: 16,
-                    ),
-                  ),
-                  initialSelection: value,
-                  dropdownMenuEntries: [
-                    for (final logLevel in LogLevel.values)
-                      DropdownMenuEntry<LogLevel>(
-                        value: logLevel,
-                        label: logLevel.name,
-                      )
-                  ],
-                  onSelected: _updateLoglevel,
-                ),
+        Selector<ClashConfig, bool>(
+          selector: (_, clashConfig) => clashConfig.unifiedDelay,
+          builder: (_, unifiedDelay, __) {
+            return ListItem.switchItem(
+              leading: const Icon(Icons.compress_outlined),
+              title: Text(appLocalizations.unifiedDelay),
+              subtitle: Text(appLocalizations.unifiedDelayDesc),
+              delegate: SwitchDelegate(
+                value: unifiedDelay,
+                onChanged: (bool value) async {
+                  final appController = globalState.appController;
+                  appController.clashConfig.unifiedDelay = value;
+                  appController.updateClashConfigDebounce();
+                },
               ),
             );
           },
         ),
-      ),
+        Selector<ClashConfig, bool>(
+          selector: (_, clashConfig) =>
+              clashConfig.findProcessMode == FindProcessMode.always,
+          builder: (_, findProcess, __) {
+            return ListItem.switchItem(
+              leading: const Icon(Icons.polymer_outlined),
+              title: Text(appLocalizations.findProcessMode),
+              subtitle: Text(appLocalizations.findProcessModeDesc),
+              delegate: SwitchDelegate(
+                value: findProcess,
+                onChanged: (bool value) async {
+                  final appController = globalState.appController;
+                  appController.clashConfig.findProcessMode =
+                      value ? FindProcessMode.always : FindProcessMode.off;
+                  appController.updateClashConfigDebounce();
+                },
+              ),
+            );
+          },
+        ),
+        Selector<ClashConfig, bool>(
+          selector: (_, clashConfig) => clashConfig.tcpConcurrent,
+          builder: (_, tcpConcurrent, __) {
+            return ListItem.switchItem(
+              leading: const Icon(Icons.double_arrow_outlined),
+              title: Text(appLocalizations.tcpConcurrent),
+              subtitle: Text(appLocalizations.tcpConcurrentDesc),
+              delegate: SwitchDelegate(
+                value: tcpConcurrent,
+                onChanged: (bool value) async {
+                  final appController = globalState.appController;
+                  appController.clashConfig.tcpConcurrent = value;
+                  appController.updateClashConfigDebounce();
+                },
+              ),
+            );
+          },
+        ),
+        Selector<ClashConfig, bool>(
+          selector: (_, clashConfig) =>
+              clashConfig.geodataLoader == geodataLoaderMemconservative,
+          builder: (_, memconservative, __) {
+            return ListItem.switchItem(
+              leading: const Icon(Icons.memory),
+              title: Text(appLocalizations.geodataLoader),
+              subtitle: Text(appLocalizations.geodataLoaderDesc),
+              delegate: SwitchDelegate(
+                value: memconservative,
+                onChanged: (bool value) async {
+                  final appController = globalState.appController;
+                  appController.clashConfig.geodataLoader = value
+                      ? geodataLoaderMemconservative
+                      : geodataLoaderStandard;
+                  appController.updateClashConfigDebounce();
+                },
+              ),
+            );
+          },
+        ),
+        Selector<ClashConfig, bool>(
+          selector: (_, clashConfig) =>
+              clashConfig.externalController.isNotEmpty,
+          builder: (_, hasExternalController, __) {
+            return ListItem.switchItem(
+              leading: const Icon(Icons.api_outlined),
+              title: Text(appLocalizations.externalController),
+              subtitle: Text(appLocalizations.externalControllerDesc),
+              delegate: SwitchDelegate(
+                value: hasExternalController,
+                onChanged: (bool value) async {
+                  final appController = globalState.appController;
+                  appController.clashConfig.externalController =
+                      value ? defaultExternalController : '';
+                  appController.updateClashConfigDebounce();
+                },
+              ),
+            );
+          },
+        ),
+      ],
+    );
+  }
+
+  List<Widget> _buildMoreSection() {
+    return generateSection(
+      title: appLocalizations.more,
+      items: [
+        if (system.isDesktop)
+          Selector<ClashConfig, bool>(
+            selector: (_, clashConfig) => clashConfig.tun.enable,
+            builder: (_, tunEnable, __) {
+              return ListItem.switchItem(
+                leading: const Icon(Icons.important_devices_outlined),
+                title: Text(appLocalizations.tun),
+                subtitle: Text(appLocalizations.tunDesc),
+                delegate: SwitchDelegate(
+                  value: tunEnable,
+                  onChanged: (bool value) async {
+                    final clashConfig = context.read<ClashConfig>();
+                    clashConfig.tun = Tun(enable: value);
+                    globalState.appController.updateClashConfigDebounce();
+                  },
+                ),
+              );
+            },
+          ),
+      ],
+    );
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    List<Widget> items = [
+      ..._buildAppSection(),
+      ..._buildGeneralSection(),
+      ..._buildMoreSection(),
     ];
-    return ListView.separated(
+    return ListView.builder(
+      padding: const EdgeInsets.only(bottom: 32),
       itemBuilder: (_, index) {
         return Container(
           alignment: Alignment.center,
           child: items[index],
         );
       },
-      separatorBuilder: (_, __) {
-        return const Divider(
-          height: 0,
-        );
-      },
       itemCount: items.length,
     );
   }
@@ -195,7 +465,7 @@ class _MixedPortFormDialogState extends State<MixedPortFormDialog> {
     portController = TextEditingController(text: "${widget.mixedPort}");
   }
 
-  _handleAddProfileFormURL() async {
+  _handleUpdate() async {
     final port = portController.value.text;
     if (port.isEmpty) return;
     Navigator.of(context).pop<String>(port);
@@ -221,7 +491,64 @@ class _MixedPortFormDialogState extends State<MixedPortFormDialog> {
       ),
       actions: [
         TextButton(
-          onPressed: _handleAddProfileFormURL,
+          onPressed: _handleUpdate,
+          child: Text(appLocalizations.submit),
+        )
+      ],
+    );
+  }
+}
+
+class TestUrlFormDialog extends StatefulWidget {
+  final String testUrl;
+
+  const TestUrlFormDialog({
+    super.key,
+    required this.testUrl,
+  });
+
+  @override
+  State<TestUrlFormDialog> createState() => _TestUrlFormDialogState();
+}
+
+class _TestUrlFormDialogState extends State<TestUrlFormDialog> {
+  late TextEditingController testUrlController;
+
+  @override
+  void initState() {
+    super.initState();
+    testUrlController = TextEditingController(text: widget.testUrl);
+  }
+
+  _handleUpdate() async {
+    final testUrl = testUrlController.value.text;
+    if (testUrl.isEmpty) return;
+    Navigator.of(context).pop<String>(testUrl);
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    return AlertDialog(
+      title: Text(appLocalizations.testUrl),
+      content: SizedBox(
+        width: 300,
+        child: Wrap(
+          runSpacing: 16,
+          children: [
+            TextField(
+              maxLines: 5,
+              minLines: 1,
+              controller: testUrlController,
+              decoration: const InputDecoration(
+                border: OutlineInputBorder(),
+              ),
+            ),
+          ],
+        ),
+      ),
+      actions: [
+        TextButton(
+          onPressed: _handleUpdate,
           child: Text(appLocalizations.submit),
         )
       ],

lib/fragments/connections.dart

@@ -1,11 +1,12 @@
 import 'dart:async';
 
-import 'package:fl_clash/clash/core.dart';
+import 'package:fl_clash/clash/clash.dart';
+import 'package:fl_clash/common/common.dart';
+import 'package:fl_clash/enum/enum.dart';
 import 'package:fl_clash/models/models.dart';
-import 'package:fl_clash/plugins/app.dart';
-import 'package:fl_clash/state.dart';
 import 'package:fl_clash/widgets/widgets.dart';
 import 'package:flutter/material.dart';
+import 'package:provider/provider.dart';
 
 class ConnectionsFragment extends StatefulWidget {
   const ConnectionsFragment({super.key});
@@ -15,124 +16,317 @@ class ConnectionsFragment extends StatefulWidget {
 }
 
 class _ConnectionsFragmentState extends State<ConnectionsFragment> {
-  final connectionsNotifier = ValueNotifier<List<Connection>>([]);
-  Map<String, String?> idPackageNameMap = {};
+  final connectionsNotifier =
+      ValueNotifier<ConnectionsAndKeywords>(const ConnectionsAndKeywords());
+  final ScrollController _scrollController = ScrollController(
+    keepScrollOffset: false,
+  );
 
   Timer? timer;
 
   @override
   void initState() {
     super.initState();
-    WidgetsBinding.instance.addPostFrameCallback((timeStamp) {
-      _getConnections();
+    WidgetsBinding.instance.addPostFrameCallback((_) {
+      connectionsNotifier.value = connectionsNotifier.value
+          .copyWith(connections: clashCore.getConnections());
       if (timer != null) {
         timer?.cancel();
         timer = null;
       }
-      timer = Timer.periodic(const Duration(seconds: 3), (timer) {
-        if (mounted) {
-          _getConnections();
-        }
-      });
+      timer = Timer.periodic(
+        const Duration(seconds: 1),
+        (timer) {
+          connectionsNotifier.value = connectionsNotifier.value
+              .copyWith(connections: clashCore.getConnections());
+        },
+      );
     });
   }
 
-  _getConnections() {
-    connectionsNotifier.value = clashCore
-        .getConnections();
+  _initActions() {
+    WidgetsBinding.instance.addPostFrameCallback(
+      (_) {
+        final commonScaffoldState =
+            context.findAncestorStateOfType<CommonScaffoldState>();
+        commonScaffoldState?.actions = [
+          IconButton(
+            onPressed: () {
+              showSearch(
+                context: context,
+                delegate: ConnectionsSearchDelegate(
+                  state: connectionsNotifier.value,
+                ),
+              );
+            },
+            icon: const Icon(Icons.search),
+          ),
+        ];
+      },
+    );
+  }
+
+  _addKeyword(String keyword) {
+    final isContains = connectionsNotifier.value.keywords.contains(keyword);
+    if (isContains) return;
+    final keywords = List<String>.from(connectionsNotifier.value.keywords)
+      ..add(keyword);
+    connectionsNotifier.value = connectionsNotifier.value.copyWith(
+      keywords: keywords,
+    );
+  }
+
+  _deleteKeyword(String keyword) {
+    final isContains = connectionsNotifier.value.keywords.contains(keyword);
+    if (!isContains) return;
+    final keywords = List<String>.from(connectionsNotifier.value.keywords)
+      ..remove(keyword);
+    connectionsNotifier.value = connectionsNotifier.value.copyWith(
+      keywords: keywords,
+    );
+  }
+
+  _handleBlockConnection(String id) {
+    clashCore.closeConnections(id);
+    connectionsNotifier.value = connectionsNotifier.value
+        .copyWith(connections: clashCore.getConnections());
   }
 
   @override
   void dispose() {
     super.dispose();
     timer?.cancel();
+    connectionsNotifier.dispose();
+    _scrollController.dispose();
     timer = null;
   }
 
-  Future<ImageProvider?> _getPackageIconWithConnection(
-      Connection connection) async {
-    final uid = connection.metadata.uid;
-    // if(globalState.packageNameMap[uid] == null){
-    //   globalState.packageNameMap[uid] = await app?.getPackageName(connection.metadata);
-    // }
-    final packageName = globalState.packageNameMap[uid];
-    if(packageName == null) return null;
-    return await app?.getPackageIcon(packageName);
-  }
-
   @override
   Widget build(BuildContext context) {
-    return ValueListenableBuilder<List<Connection>>(
-      valueListenable: connectionsNotifier,
-      builder: (_, List<Connection> connections, __) {
-        if (connections.isEmpty) {
-          return const NullStatus(
-            label: "未开启代理,或者没有连接数据",
-          );
+    return Selector<AppState, bool?>(
+      selector: (_, appState) =>
+          appState.currentLabel == 'connections' ||
+          appState.viewMode == ViewMode.mobile &&
+              appState.currentLabel == "tools",
+      builder: (_, isCurrent, child) {
+        if (isCurrent == null || isCurrent) {
+          _initActions();
         }
-        return ListView.separated(
-          physics: const AlwaysScrollableScrollPhysics(),
-          itemBuilder: (_, index) {
-            final connection = connections[index];
-            return ListTile(
-              titleAlignment: ListTileTitleAlignment.top,
-              leading: Container(
-                margin: const EdgeInsets.only(top: 4),
-                width: 48,
-                height: 48,
-                child: FutureBuilder<ImageProvider?>(
-                  future: _getPackageIconWithConnection(connection),
-                  builder: (_, snapshot) {
-                    if (!snapshot.hasData && snapshot.data == null) {
-                      return Container();
-                    } else {
-                      return Image(
-                        image: snapshot.data!,
-                        gaplessPlayback: true,
-                        width: 48,
-                        height: 48,
-                      );
-                    }
+        return child!;
+      },
+      child: ValueListenableBuilder<ConnectionsAndKeywords>(
+        valueListenable: connectionsNotifier,
+        builder: (_, state, __) {
+          var connections = state.filteredConnections;
+          if (connections.isEmpty) {
+            return NullStatus(
+              label: appLocalizations.nullConnectionsDesc,
+            );
+          }
+          connections = connections.reversed.toList();
+          return Column(
+            crossAxisAlignment: CrossAxisAlignment.start,
+            children: [
+              if (state.keywords.isNotEmpty)
+                Padding(
+                  padding: const EdgeInsets.symmetric(
+                    horizontal: 16,
+                    vertical: 16,
+                  ),
+                  child: Wrap(
+                    runSpacing: 6,
+                    spacing: 6,
+                    children: [
+                      for (final keyword in state.keywords)
+                        CommonChip(
+                          label: keyword,
+                          type: ChipType.delete,
+                          onPressed: () {
+                            _deleteKeyword(keyword);
+                          },
+                        ),
+                    ],
+                  ),
+                ),
+              Expanded(
+                child: ListView.separated(
+                  controller: _scrollController,
+                  itemBuilder: (_, index) {
+                    final connection = connections[index];
+                    return ConnectionItem(
+                      key: Key(connection.id),
+                      connection: connection,
+                      onClick: _addKeyword,
+                      trailing: IconButton(
+                        icon: const Icon(Icons.block),
+                        onPressed: () {
+                          _handleBlockConnection(connection.id);
+                        },
+                      ),
+                    );
                   },
+                  separatorBuilder: (BuildContext context, int index) {
+                    return const Divider(
+                      height: 0,
+                    );
+                  },
+                  itemCount: connections.length,
+                ),
+              )
+            ],
+          );
+        },
+      ),
+    );
+  }
+}
+
+class ConnectionsSearchDelegate extends SearchDelegate {
+  ValueNotifier<ConnectionsAndKeywords> connectionsNotifier;
+
+  ConnectionsSearchDelegate({
+    required ConnectionsAndKeywords state,
+  }) : connectionsNotifier = ValueNotifier<ConnectionsAndKeywords>(state);
+
+  get state => connectionsNotifier.value;
+
+  List<Connection> get _results {
+    final lowerQuery = query.toLowerCase().trim();
+    return connectionsNotifier.value.filteredConnections.where((request) {
+      final lowerNetwork = request.metadata.network.toLowerCase();
+      final lowerHost = request.metadata.host.toLowerCase();
+      final lowerDestinationIP = request.metadata.destinationIP.toLowerCase();
+      final lowerProcess = request.metadata.process.toLowerCase();
+      final lowerChains = request.chains.join("").toLowerCase();
+      return lowerNetwork.contains(lowerQuery) ||
+          lowerHost.contains(lowerQuery) ||
+          lowerDestinationIP.contains(lowerQuery) ||
+          lowerProcess.contains(lowerQuery) ||
+          lowerChains.contains(lowerQuery);
+    }).toList();
+  }
+
+  _addKeyword(String keyword) {
+    final isContains = connectionsNotifier.value.keywords.contains(keyword);
+    if (isContains) return;
+    final keywords = List<String>.from(connectionsNotifier.value.keywords)
+      ..add(keyword);
+    connectionsNotifier.value = connectionsNotifier.value.copyWith(
+      keywords: keywords,
+    );
+  }
+
+  _deleteKeyword(String keyword) {
+    final isContains = connectionsNotifier.value.keywords.contains(keyword);
+    if (!isContains) return;
+    final keywords = List<String>.from(connectionsNotifier.value.keywords)
+      ..remove(keyword);
+    connectionsNotifier.value = connectionsNotifier.value.copyWith(
+      keywords: keywords,
+    );
+  }
+
+  _handleBlockConnection(String id) {
+    clashCore.closeConnections(id);
+    connectionsNotifier.value = connectionsNotifier.value.copyWith(
+      connections: clashCore.getConnections(),
+    );
+  }
+
+  @override
+  List<Widget>? buildActions(BuildContext context) {
+    return [
+      IconButton(
+        onPressed: () {
+          if (query.isEmpty) {
+            close(context, null);
+            return;
+          }
+          query = '';
+        },
+        icon: const Icon(Icons.clear),
+      ),
+      const SizedBox(
+        width: 8,
+      )
+    ];
+  }
+
+  @override
+  Widget? buildLeading(BuildContext context) {
+    return IconButton(
+      onPressed: () {
+        close(context, null);
+      },
+      icon: const Icon(Icons.arrow_back),
+    );
+  }
+
+  @override
+  Widget buildResults(BuildContext context) {
+    return buildSuggestions(context);
+  }
+
+  @override
+  void dispose() {
+    connectionsNotifier.dispose();
+    super.dispose();
+  }
+
+  @override
+  Widget buildSuggestions(BuildContext context) {
+    return ValueListenableBuilder(
+      valueListenable: connectionsNotifier,
+      builder: (_, __, ___) {
+        return Column(
+          crossAxisAlignment: CrossAxisAlignment.start,
+          children: [
+            if (state.keywords.isNotEmpty)
+              Padding(
+                padding: const EdgeInsets.symmetric(
+                  horizontal: 16,
+                  vertical: 16,
+                ),
+                child: Wrap(
+                  runSpacing: 6,
+                  spacing: 6,
+                  children: [
+                    for (final keyword in state.keywords)
+                      CommonChip(
+                        label: keyword,
+                        type: ChipType.delete,
+                        onPressed: () {
+                          _deleteKeyword(keyword);
+                        },
+                      ),
+                  ],
                 ),
               ),
-              contentPadding:
-                  const EdgeInsets.symmetric(vertical: 12, horizontal: 16),
-              title: Column(
-                crossAxisAlignment: CrossAxisAlignment.start,
-                children: [
-                  Text(connection.metadata.host.isNotEmpty
-                      ? connection.metadata.host
-                      : connection.metadata.destinationIP),
-                  Padding(
-                    padding: const EdgeInsets.only(
-                      top: 12,
+            Expanded(
+              child: ListView.separated(
+                itemBuilder: (_, index) {
+                  final connection = _results[index];
+                  return ConnectionItem(
+                    key: Key(connection.id),
+                    connection: connection,
+                    onClick: _addKeyword,
+                    trailing: IconButton(
+                      icon: const Icon(Icons.block),
+                      onPressed: () {
+                        _handleBlockConnection(connection.id);
+                      },
                     ),
-                    child: Wrap(
-                      runSpacing: 8,
-                      spacing: 8,
-                      children: [
-                        for (final chain in connection.chains)
-                          CommonChip(
-                            label: chain,
-                          ),
-                      ],
-                    ),
-                  ),
-                ],
+                  );
+                },
+                separatorBuilder: (BuildContext context, int index) {
+                  return const Divider(
+                    height: 0,
+                  );
+                },
+                itemCount: _results.length,
               ),
-              trailing: IconButton(
-                icon: const Icon(Icons.block),
-                onPressed: () {},
-              ),
-            );
-          },
-          separatorBuilder: (BuildContext context, int index) {
-            return const Divider(
-              height: 0,
-            );
-          },
-          itemCount: connections.length,
+            )
+          ],
         );
       },
     );

lib/fragments/dashboard/core_info.dart

@@ -13,6 +13,7 @@ class CoreInfo extends StatelessWidget {
       selector: (_, appState) => appState.versionInfo,
       builder: (_, versionInfo, __) {
         return CommonCard(
+          onPressed: () {},
           info: Info(
             label: appLocalizations.coreInfo,
             iconData: Icons.memory,
@@ -31,7 +32,7 @@ class CoreInfo extends StatelessWidget {
                     style: context
                         .textTheme
                         .titleMedium
-                        ?.toSoftBold(),
+                        ?.toSoftBold,
                   ),
                 ),
                 const SizedBox(
@@ -44,7 +45,7 @@ class CoreInfo extends StatelessWidget {
                     style: context
                         .textTheme
                         .titleLarge
-                        ?.toSoftBold(),
+                        ?.toSoftBold,
                   ),
                 ),
               ],

lib/fragments/dashboard/dashboard.dart

@@ -1,11 +1,11 @@
-import 'package:fl_clash/enum/enum.dart';
+import 'dart:math';
+
+import 'package:fl_clash/fragments/dashboard/intranet_ip.dart';
 import 'package:fl_clash/models/models.dart';
 import 'package:flutter/material.dart';
 import 'package:fl_clash/widgets/widgets.dart';
 import 'package:provider/provider.dart';
-
 import 'network_detection.dart';
-import 'core_info.dart';
 import 'outbound_mode.dart';
 import 'start_button.dart';
 import 'network_speed.dart';
@@ -29,34 +29,35 @@ class _DashboardFragmentState extends State<DashboardFragment> {
         alignment: Alignment.topCenter,
         child: SingleChildScrollView(
           padding: const EdgeInsets.all(16),
-          child: Selector<AppState, ViewMode>(
-            selector: (_, appState) => appState.viewMode,
-            builder: (_, viewMode, ___) {
-              final isDesktop = viewMode == ViewMode.desktop;
+          child: Selector<AppState, double>(
+            selector: (_, appState) => appState.viewWidth,
+            builder: (_, viewWidth, ___) {
+              // final viewMode = other.getViewMode(viewWidth);
+              // final isDesktop = viewMode == ViewMode.desktop;
               return Grid(
-                crossAxisCount: 12,
+                crossAxisCount: max(4 * ((viewWidth / 320).ceil()), 8),
                 crossAxisSpacing: 16,
                 mainAxisSpacing: 16,
-                children: [
+                children: const [
                   GridItem(
-                    crossAxisCellCount: isDesktop ? 8 : 12,
-                    child: const NetworkSpeed(),
+                    crossAxisCellCount: 8,
+                    child: NetworkSpeed(),
                   ),
                   GridItem(
-                    crossAxisCellCount: isDesktop ? 4 : 6,
-                    child: const OutboundMode(),
+                    crossAxisCellCount: 4,
+                    child: OutboundMode(),
                   ),
                   GridItem(
-                    crossAxisCellCount: isDesktop ? 4 : 6,
-                    child: const NetworkDetection(),
+                    crossAxisCellCount: 4,
+                    child: NetworkDetection(),
                   ),
                   GridItem(
-                    crossAxisCellCount: isDesktop ? 4 : 6,
-                    child: const TrafficUsage(),
+                    crossAxisCellCount: 4,
+                    child: TrafficUsage(),
                   ),
                   GridItem(
-                    crossAxisCellCount: isDesktop ? 4 : 6,
-                    child: const CoreInfo(),
+                    crossAxisCellCount: 4,
+                    child: IntranetIP(),
                   ),
                 ],
               );