Update dependency go to v1.25.4

* Update golangci/golangci-lint-action action to v9

* Bump golangci-lint to 2.6.2

* Refactor to pass golangcli-lint

* Fix tests

---------

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: Dave Gallant <dave.gallant@gmail.com>
Co-authored-by: Dave Gallant <davegallant@proton.me>

.github/workflows/golangci-lint.yml

@@ -4,17 +4,22 @@ on:
     tags:
       - v*
     branches:
-      - master
       - main
   pull_request:
+permissions:
+  contents: read
 jobs:
-  golangci:
+  validate:
-    name: lint
+    name: validate
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/setup-go@v6
-      - name: golangci-lint
-        uses: golangci/golangci-lint-action@v2
         with:
-          # Required: the version of golangci-lint is required and must be specified without patch version: we always use the latest patch version.
+          go-version: 1.25
-          version: v1.29
+      - uses: actions/checkout@v6
+      - name: golangci-lint
+        uses: golangci/golangci-lint-action@v9
+        with:
+          version: v2.6.2
+      - name: test
+        run: make test

.github/workflows/release.yml

@@ -11,19 +11,20 @@ jobs:
     steps:
       -
         name: Checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v6
         with:
           fetch-depth: 0
       -
         name: Set up Go
-        uses: actions/setup-go@v2
+        uses: actions/setup-go@v6
         with:
-          go-version: 1.15
+          go-version: "1.25"
       -
         name: Run GoReleaser
-        uses: goreleaser/goreleaser-action@v2
+        uses: goreleaser/goreleaser-action@v6
         with:
-          version: latest
+          version: '~> v2'
-          args: release --rm-dist
+          args: release --clean
         env:
           GITHUB_TOKEN: ${{ secrets.PERSONAL_GITHUB_TOKEN }}
+          CGO_ENABLED: 0

.gitignore

@@ -0,0 +1,3 @@
+dist
+
+.vscode

.goreleaser.yaml

@@ -1,35 +1,53 @@
+# yaml-language-server: $schema=https://goreleaser.com/static/schema.json
+# vim: set ts=2 sw=2 tw=0 fo=jcroql
+version: 2
+
 before:
   hooks:
     - go mod tidy
     - go get -v
     - rm -rf dist
 builds:
--
+  - env:
-  env:
+      - CGO_ENABLED=0
-    - CGO_ENABLED=0
+    goos:
-  ldflags:
+      - linux
-    - -s -w
+      - darwin
-  goos:
+      - windows
-    - darwin
+    goarch:
-    - linux
+      - "386"
-  goarch:
+      - amd64
-    - amd64
+      - arm
-archives:
+      - arm64
-- replacements:
+    goarm:
-    darwin: Darwin
+      - "7"
-    linux: Linux
+    ldflags:
-    amd64: x86_64
+      - -s -w
+    mod_timestamp: "{{ .CommitTimestamp }}"
 checksum:
-  name_template: 'checksums.txt'
+  name_template: "checksums.txt"
 snapshot:
   name_template: "{{ .Tag }}"
 changelog:
   sort: asc
+  use: github
   filters:
     exclude:
-    - '^docs:'
+      - "^docs:"
-    - '^test:'
+      - "^test:"
 release:
   github:
     owner: davegallant
     name: vpngate
+
+# Check https://goreleaser.com/customization/homebrew/
+brews:
+  - homepage: "https://github.com/davegallant/homebrew-public"
+    description: "a client for vpngate.net"
+    directory: Formula
+    commit_author:
+      name: davegallant
+      email: davegallant@gmail.com
+    repository:
+      owner: davegallant
+      name: homebrew-public

LICENSE

@@ -1,21 +1,674 @@
-The MIT License (MIT)
+                    GNU GENERAL PUBLIC LICENSE
+                       Version 3, 29 June 2007
 
-Copyright (c) 2020 Dave Gallant
+ 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.
 
-Permission is hereby granted, free of charge, to any person obtaining a copy
+                            Preamble
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
 
-The above copyright notice and this permission notice shall be included in all
+  The GNU General Public License is a free, copyleft license for
-copies or substantial portions of the Software.
+software and other kinds of works.
 
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+  The licenses for most software and other practical works are designed
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+to take away your freedom to share and change the works.  By contrast,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+the GNU General Public License is intended to guarantee your freedom to
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+share and change all versions of a program--to make sure it remains free
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+software for all its users.  We, the Free Software Foundation, use the
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+GNU General Public License for most of our software; it applies also to
-SOFTWARE.
+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>.

Makefile

@@ -1,5 +1,7 @@
 BIN ?= dist/vpngate
 
+export CGO_ENABLED := 0
+
 build: ## Builds the binary
 	go build -o $(BIN)
 .PHONY: build
@@ -9,5 +11,5 @@ test: ## Run unit tests
 .PHONY: test
 
 lint: ## Run lint
-	go get github.com/golangci/golangci-lint/cmd/golangci-lint@v1.27.0
+	@go get github.com/golangci/golangci-lint/v2/cmd/golangci-lint@v2.6.2
 	golangci-lint run

README.md

@@ -2,55 +2,117 @@
 
 This is a client for [vpngate.net](https://www.vpngate.net/).
 
-![image](https://user-images.githubusercontent.com/4519234/103308173-ce250780-49df-11eb-9032-ef832e5b9463.png)
+![vpngate](https://github.com/user-attachments/assets/dafa2702-8d68-4b5f-badb-2c53ddd68991)
 
-This client fetches the list of available relay servers provided by vpngate.net. Once connected to a relay server, speed tests kick off to determine latency, upload speed and download speed.
+This client fetches the list of available relay servers provided by vpngate.net, and allows you to filter and connect to a server of your liking.
 
-![image](https://user-images.githubusercontent.com/4519234/103308641-e47f9300-49e0-11eb-8ff2-77c6e3e8cc7b.png)
+You can check out your current IP address and region at <https://ipinfo.io/json>, or run the following:
 
-Once connected, you can check out your IP address: https://nordvpn.com/what-is-my-ip/
+```shell
+curl ipinfo.io
+```
 
 ## Requirements
 
-- [openvpn](https://github.com/OpenVPN/openvpn)
+- OpenVPN
-- macOS or Linux (might work on Windows)
+- macOS, Linux, or Windows
 
 ## Install
 
-```sh
+You can install vpngate in a few different ways, and it will differ slightly depending on your OS.
-go get github.com/davegallant/vpngate
+
+### Homebrew (macOS and linux)
+
+vpngate can be installed with [homebrew](https://brew.sh/) (if on macOS, ensure that xcode is installed before installing homebrew by running `xcode-select --install`).
+
+```shell
+brew install openvpn davegallant/public/vpngate
+```
+
+### Windows
+
+On Windows, install OpenVPN from the [official website](https://openvpn.net/community-downloads/).
+
+As there is no installer at the moment, you will need to download and extract the Windows release from the relevant Github release.
+
+Once the release is extracted, open Command Prompt *as Administrator*, and run vpngate.exe from the location where it was extracted.
+
+<img width="278" alt="image" src="https://github.com/user-attachments/assets/fb47270d-82bb-4790-833a-377b874c8104">
+
+<img width="565" alt="image" src="https://github.com/user-attachments/assets/42287904-6c00-48d1-bff3-9757cf250519">
+
+### Build from source
+
+Ensure that [go](https://golang.org/doc/install) is installed.
+
+```shell
+CGO_ENABLED=0 go get github.com/davegallant/vpngate
+```
+
+Ensure that the go bin path is discoverable:
+
+```shell
+echo 'export PATH=$PATH:$HOME/go/bin' >> ~/.profile
+source ~/.profile
 ```
 
 ## Usage
 
-### List Available VPNs
+> If on macOS, you may need to add openvpn to your PATH (if you installed it with brew): `export PATH=$(brew --prefix openvpn)/sbin:$PATH`
 
-```sh
+### List available servers
-$ vpngate list
+
+```shell
+vpngate list
 ```
 
-### Connect to a VPN
+### Connect to a server
 
 Because openvpn creates a network interface, run the connect command with `sudo` or a user with escalated privileges.
 
-```sh
+```shell
-$ sudo vpngate connect
+sudo vpngate connect
+```
+
+#### Reconnect
+
+To continually attempt to reconnect (this can be combined with `--random`):
+
+```shell
+sudo vpngate connect --reconnect
 ```
 
 #### Random
 
-If the country doesn't matter, a random VPN can be selected:
+If the country doesn't matter, a random server can be selected:
 
-```sh
+```shell
-$ sudo vpngate connect --random
+sudo vpngate connect --random
+```
+
+#### Proxy
+
+In some cases, anonymity is necessary to populate the list of available VPN servers.
+
+A proxy is a way to bypass restrictions and in some cases, internet censorship.
+
+##### HTTP/HTTPS
+
+Use the specified HTTP/HTTPS proxy to fetch the server list.
+
+```shell
+sudo vpngate connect --proxy "http://localhost:8080"
+```
+
+##### SOCKS5
+
+Use the specified SOCKS5 proxy to fetch the server list.
+
+```shell
+sudo vpngate connect --socks5 "127.0.0.1:1080"
 ```
 
 ## Notes
 
-- I do not maintain any of the VPN servers on vpngate.net. Connect to these VPN servers at your own discretion
+- I do not maintain any of the servers on vpngate.net (connect to these servers at your own discretion)
 - Many of the listed servers claim to have a logging policy of 2 weeks
-
-
-## Todo
-
-- Allow for servers to be cycled periodically (--cycle)

cmd/connect.go

@@ -2,10 +2,7 @@ package cmd
 
 import (
 	"encoding/base64"
-	"time"
-
 	"fmt"
-	"io/ioutil"
 	"math/rand"
 	"os"
 	"strings"
@@ -17,24 +14,31 @@ import (
 	"github.com/spf13/cobra"
 )
 
-var flagRandom bool
+var (
+	flagRandom      bool
+	flagReconnect   bool
+	flagProxy       string
+	flagSocks5Proxy string
+)
 
 func init() {
 	connectCmd.Flags().BoolVarP(&flagRandom, "random", "r", false, "connect to a random server")
+	connectCmd.Flags().BoolVarP(&flagReconnect, "reconnect", "t", false, "continually attempt to connect to the server")
+	connectCmd.Flags().StringVarP(&flagProxy, "proxy", "p", "", "provide a http/https proxy server to make requests through (i.e. http://127.0.0.1:8080)")
+	connectCmd.Flags().StringVarP(&flagSocks5Proxy, "socks5", "s", "", "provide a socks5 proxy server to make requests through (i.e. 127.0.0.1:1080)")
 	rootCmd.AddCommand(connectCmd)
 }
 
 var connectCmd = &cobra.Command{
-	Use:   "connect",
+	Use: "connect",
+
 	Short: "Connect to a vpn server (survey selection appears if hostname is not provided)",
 	Long:  `Connect to a vpn from a list of relay servers`,
 	Args:  cobra.RangeArgs(0, 1),
 	Run: func(cmd *cobra.Command, args []string) {
-
+		vpnServers, err := vpn.GetList(flagProxy, flagSocks5Proxy)
-		vpnServers, err := vpn.GetList()
-
 		if err != nil {
-			log.Fatal().Msgf(err.Error())
+			log.Fatal().Msg(err.Error())
 			os.Exit(1)
 		}
 
@@ -42,7 +46,7 @@ var connectCmd = &cobra.Command{
 		serverSelected := vpn.Server{}
 
 		for _, s := range *vpnServers {
-			serverSelection = append(serverSelection, fmt.Sprintf("%s (%s)", s.HostName, s.CountryShort))
+			serverSelection = append(serverSelection, fmt.Sprintf("%s (%s)", s.HostName, s.CountryLong))
 		}
 
 		selection := ""
@@ -51,11 +55,7 @@ var connectCmd = &cobra.Command{
 			Options: serverSelection,
 		}
 
-		if flagRandom {
+		if !flagRandom {
-			// Select a random server
-			rand.Seed(time.Now().UnixNano())
-			serverSelected = (*vpnServers)[rand.Intn(50)]
-		} else {
 
 			if len(args) > 0 {
 				selection = args[0]
@@ -80,38 +80,50 @@ var connectCmd = &cobra.Command{
 			}
 		}
 
-		decodedConfig, err := base64.StdEncoding.DecodeString(serverSelected.OpenVpnConfigData)
+		for {
-		if err != nil {
+
-			log.Fatal().Msgf(err.Error())
+			if flagRandom {
-			os.Exit(1)
+				// Select a random server
+				serverSelected = (*vpnServers)[rand.Intn(len(*vpnServers))]
+			}
+
+			decodedConfig, err := base64.StdEncoding.DecodeString(serverSelected.OpenVpnConfigData)
+			if err != nil {
+				log.Fatal().Msg(err.Error())
+				os.Exit(1)
+			}
+
+			tmpfile, err := os.CreateTemp("", "vpngate-openvpn-config-")
+			if err != nil {
+				log.Fatal().Msg(err.Error())
+				os.Exit(1)
+			}
+
+			if _, err := tmpfile.Write(decodedConfig); err != nil {
+				log.Fatal().Msg(err.Error())
+				os.Exit(1)
+			}
+
+			if err := tmpfile.Close(); err != nil {
+				log.Fatal().Msg(err.Error())
+				os.Exit(1)
+			}
+
+			log.Info().Msgf("Connecting to %s (%s) in %s", serverSelected.HostName, serverSelected.IPAddr, serverSelected.CountryLong)
+
+			err = vpn.Connect(tmpfile.Name())
+
+			if err != nil && !flagReconnect {
+				log.Fatal().Msg(err.Error())
+				os.Exit(1)
+			} else {
+				err = os.Remove(tmpfile.Name())
+				if err !=  nil {
+					log.Fatal().Msg(err.Error())
+					os.Exit(1)
+				}
+			}
+
 		}
-
-		tmpfile, err := ioutil.TempFile("", "vpngate-openvpn-config-")
-		if err != nil {
-			log.Fatal().Msgf(err.Error())
-			os.Exit(1)
-		}
-
-		defer os.Remove(tmpfile.Name())
-
-		if _, err := tmpfile.Write(decodedConfig); err != nil {
-			log.Fatal().Msgf(err.Error())
-			os.Exit(1)
-		}
-
-		if err := tmpfile.Close(); err != nil {
-			log.Fatal().Msgf(err.Error())
-			os.Exit(1)
-		}
-
-		log.Info().Msgf("Connecting to %s (%s) in %s", serverSelected.HostName, serverSelected.IPAddr, serverSelected.CountryLong)
-
-		err = vpn.Connect(tmpfile.Name())
-
-		if err != nil {
-			log.Fatal().Msgf(err.Error())
-			os.Exit(1)
-		}
-
 	},
 }

cmd/list.go

@@ -8,11 +8,14 @@ import (
 	"github.com/rs/zerolog/log"
 
 	"github.com/davegallant/vpngate/pkg/vpn"
+
 	"github.com/spf13/cobra"
 )
 
 func init() {
 	rootCmd.AddCommand(listCmd)
+	listCmd.Flags().StringVarP(&flagProxy, "proxy", "p", "", "provide a http/https proxy server to make requests through (i.e. http://127.0.0.1:8080)")
+	listCmd.Flags().StringVarP(&flagSocks5Proxy, "socks5", "s", "", "provide a socks5 proxy server to make requests through (i.e. 127.0.0.1:1080)")
 }
 
 var listCmd = &cobra.Command{
@@ -21,10 +24,9 @@ var listCmd = &cobra.Command{
 	Args:  cobra.NoArgs,
 	Run: func(cmd *cobra.Command, args []string) {
 
-		vpnServers, err := vpn.GetList()
+		vpnServers, err := vpn.GetList(flagProxy, flagSocks5Proxy)
-
 		if err != nil {
-			log.Fatal().Msgf(err.Error())
+			log.Fatal().Msg(err.Error())
 			os.Exit(1)
 		}
 
@@ -35,6 +37,5 @@ var listCmd = &cobra.Command{
 			table.Append([]string{strconv.Itoa(i + 1), v.HostName, v.CountryLong, v.Ping, strconv.Itoa(v.Score)})
 		}
 		table.Render() // Send output
-
 	},
 }

flake.lock

@@ -0,0 +1,61 @@
+{
+  "nodes": {
+    "flake-utils": {
+      "inputs": {
+        "systems": "systems"
+      },
+      "locked": {
+        "lastModified": 1731533236,
+        "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=",
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b",
+        "type": "github"
+      },
+      "original": {
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "type": "github"
+      }
+    },
+    "nixpkgs": {
+      "locked": {
+        "lastModified": 1743814133,
+        "narHash": "sha256-drDyYyUmjeYGiHmwB9eOPTQRjmrq3Yz26knwmMPLZFk=",
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "250b695f41e0e2f5afbf15c6b12480de1fe0001b",
+        "type": "github"
+      },
+      "original": {
+        "owner": "NixOS",
+        "ref": "nixpkgs-unstable",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
+    "root": {
+      "inputs": {
+        "flake-utils": "flake-utils",
+        "nixpkgs": "nixpkgs"
+      }
+    },
+    "systems": {
+      "locked": {
+        "lastModified": 1681028828,
+        "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
+        "owner": "nix-systems",
+        "repo": "default",
+        "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-systems",
+        "repo": "default",
+        "type": "github"
+      }
+    }
+  },
+  "root": "root",
+  "version": 7
+}

flake.nix

@@ -0,0 +1,46 @@
+{
+  inputs = {
+    nixpkgs.url = "github:NixOS/nixpkgs/nixpkgs-unstable";
+    flake-utils.url = "github:numtide/flake-utils";
+  };
+
+  outputs =
+    {
+      self,
+      nixpkgs,
+      flake-utils,
+    }:
+    let
+      vpngate =
+        pkgs:
+        pkgs.buildGo123Module rec {
+          name = "vpngate";
+          src = ./.;
+          vendorHash = "sha256-CP2sFJdIde88WFJlAq29GlE7c1c0xJ6tHzrrasMzJo8=";
+          nativeBuildInputs = pkgs.lib.optionals pkgs.stdenv.isLinux [ pkgs.makeWrapper ];
+          env.CGO_ENABLED = 0;
+          doCheck = false;
+        };
+
+      flakeForSystem =
+        nixpkgs: system:
+        let
+          pkgs = nixpkgs.legacyPackages.${system};
+          vg = vpngate pkgs;
+        in
+        {
+          packages = {
+            default = vg;
+            vpngate = vg;
+          };
+          devShell = pkgs.mkShell {
+            packages = with pkgs; [
+              gopls
+              gotools
+              go_1_25
+            ];
+          };
+        };
+    in
+    flake-utils.lib.eachDefaultSystem (system: flakeForSystem nixpkgs system);
+}

go.mod

@@ -1,24 +1,227 @@
 module github.com/davegallant/vpngate
 
-go 1.15
+go 1.24.0
+
+toolchain go1.25.4
 
 require (
-	github.com/AlecAivazis/survey/v2 v2.2.7
+	github.com/AlecAivazis/survey/v2 v2.3.7
-	github.com/golangci/golangci-lint v1.27.0 // indirect
+	github.com/jszwec/csvutil v1.10.0
-	github.com/hpcloud/tail v1.0.0
+	github.com/juju/errors v1.0.0
-	github.com/jszwec/csvutil v1.4.0
+	github.com/olekukonko/tablewriter v0.0.5
-	github.com/juju/errors v0.0.0-20200330140219-3fe23663418f
+	github.com/rs/zerolog v1.34.0
-	github.com/juju/testing v0.0.0-20201216035041-2be42bba85f3 // indirect
+	github.com/spf13/afero v1.14.0
-	github.com/mattn/go-colorable v0.1.8 // indirect
+	github.com/spf13/cobra v1.10.1
-	github.com/mattn/go-runewidth v0.0.8 // indirect
+	github.com/stretchr/testify v1.11.1
-	github.com/olekukonko/tablewriter v0.0.4
+	golang.org/x/net v0.46.0
-	github.com/rs/zerolog v1.20.0
+)
-	github.com/showwin/speedtest-go v1.1.0
+
-	github.com/spf13/afero v1.3.2
+require (
-	github.com/spf13/cobra v1.1.1
+	4d63.com/gocheckcompilerdirectives v1.3.0 // indirect
-	github.com/stretchr/testify v1.6.1 // indirect
+	4d63.com/gochecknoglobals v0.2.2 // indirect
-	golang.org/x/sys v0.0.0-20201009025420-dfb3f7c4e634 // indirect
+	codeberg.org/chavacava/garif v0.2.0 // indirect
-	golang.org/x/text v0.3.4 // indirect
+	dev.gaijin.team/go/exhaustruct/v4 v4.0.0 // indirect
-	gopkg.in/fsnotify.v1 v1.4.7 // indirect
+	dev.gaijin.team/go/golib v0.6.0 // indirect
-	gopkg.in/yaml.v2 v2.4.0 // indirect
+	github.com/4meepo/tagalign v1.4.3 // indirect
+	github.com/Abirdcfly/dupword v0.1.7 // indirect
+	github.com/AdminBenni/iota-mixing v1.0.0 // indirect
+	github.com/AlwxSin/noinlineerr v1.0.5 // indirect
+	github.com/Antonboom/errname v1.1.1 // indirect
+	github.com/Antonboom/nilnil v1.1.1 // indirect
+	github.com/Antonboom/testifylint v1.6.4 // indirect
+	github.com/BurntSushi/toml v1.5.0 // indirect
+	github.com/Djarvur/go-err113 v0.1.1 // indirect
+	github.com/Masterminds/semver/v3 v3.4.0 // indirect
+	github.com/MirrexOne/unqueryvet v1.2.1 // indirect
+	github.com/OpenPeeDeeP/depguard/v2 v2.2.1 // indirect
+	github.com/alecthomas/chroma/v2 v2.20.0 // indirect
+	github.com/alecthomas/go-check-sumtype v0.3.1 // indirect
+	github.com/alexkohler/nakedret/v2 v2.0.6 // indirect
+	github.com/alexkohler/prealloc v1.0.0 // indirect
+	github.com/alfatraining/structtag v1.0.0 // indirect
+	github.com/alingse/asasalint v0.0.11 // indirect
+	github.com/alingse/nilnesserr v0.2.0 // indirect
+	github.com/ashanbrown/forbidigo/v2 v2.3.0 // indirect
+	github.com/ashanbrown/makezero/v2 v2.1.0 // indirect
+	github.com/aymanbagabas/go-osc52/v2 v2.0.1 // indirect
+	github.com/beorn7/perks v1.0.1 // indirect
+	github.com/bkielbasa/cyclop v1.2.3 // indirect
+	github.com/blizzy78/varnamelen v0.8.0 // indirect
+	github.com/bombsimon/wsl/v4 v4.7.0 // indirect
+	github.com/bombsimon/wsl/v5 v5.3.0 // indirect
+	github.com/breml/bidichk v0.3.3 // indirect
+	github.com/breml/errchkjson v0.4.1 // indirect
+	github.com/butuzov/ireturn v0.4.0 // indirect
+	github.com/butuzov/mirror v1.3.0 // indirect
+	github.com/catenacyber/perfsprint v0.10.0 // indirect
+	github.com/ccojocar/zxcvbn-go v1.0.4 // indirect
+	github.com/cespare/xxhash/v2 v2.3.0 // indirect
+	github.com/charithe/durationcheck v0.0.11 // indirect
+	github.com/charmbracelet/colorprofile v0.2.3-0.20250311203215-f60798e515dc // indirect
+	github.com/charmbracelet/lipgloss v1.1.0 // indirect
+	github.com/charmbracelet/x/ansi v0.8.0 // indirect
+	github.com/charmbracelet/x/cellbuf v0.0.13-0.20250311204145-2c3ea96c31dd // indirect
+	github.com/charmbracelet/x/term v0.2.1 // indirect
+	github.com/ckaznocha/intrange v0.3.1 // indirect
+	github.com/curioswitch/go-reassign v0.3.0 // indirect
+	github.com/daixiang0/gci v0.13.7 // indirect
+	github.com/dave/dst v0.27.3 // indirect
+	github.com/davecgh/go-spew v1.1.1 // indirect
+	github.com/denis-tingaikin/go-header v0.5.0 // indirect
+	github.com/dlclark/regexp2 v1.11.5 // indirect
+	github.com/ettle/strcase v0.2.0 // indirect
+	github.com/fatih/color v1.18.0 // indirect
+	github.com/fatih/structtag v1.2.0 // indirect
+	github.com/firefart/nonamedreturns v1.0.6 // indirect
+	github.com/fsnotify/fsnotify v1.5.4 // indirect
+	github.com/fzipp/gocyclo v0.6.0 // indirect
+	github.com/ghostiam/protogetter v0.3.17 // indirect
+	github.com/go-critic/go-critic v0.14.2 // indirect
+	github.com/go-toolsmith/astcast v1.1.0 // indirect
+	github.com/go-toolsmith/astcopy v1.1.0 // indirect
+	github.com/go-toolsmith/astequal v1.2.0 // indirect
+	github.com/go-toolsmith/astfmt v1.1.0 // indirect
+	github.com/go-toolsmith/astp v1.1.0 // indirect
+	github.com/go-toolsmith/strparse v1.1.0 // indirect
+	github.com/go-toolsmith/typep v1.1.0 // indirect
+	github.com/go-viper/mapstructure/v2 v2.4.0 // indirect
+	github.com/go-xmlfmt/xmlfmt v1.1.3 // indirect
+	github.com/gobwas/glob v0.2.3 // indirect
+	github.com/godoc-lint/godoc-lint v0.10.1 // indirect
+	github.com/gofrs/flock v0.13.0 // indirect
+	github.com/golang/protobuf v1.5.3 // indirect
+	github.com/golangci/asciicheck v0.5.0 // indirect
+	github.com/golangci/dupl v0.0.0-20250308024227-f665c8d69b32 // indirect
+	github.com/golangci/go-printf-func-name v0.1.1 // indirect
+	github.com/golangci/gofmt v0.0.0-20250106114630-d62b90e6713d // indirect
+	github.com/golangci/golangci-lint/v2 v2.6.2 // indirect
+	github.com/golangci/golines v0.0.0-20250217134842-442fd0091d95 // indirect
+	github.com/golangci/misspell v0.7.0 // indirect
+	github.com/golangci/plugin-module-register v0.1.2 // indirect
+	github.com/golangci/revgrep v0.8.0 // indirect
+	github.com/golangci/swaggoswag v0.0.0-20250504205917-77f2aca3143e // indirect
+	github.com/golangci/unconvert v0.0.0-20250410112200-a129a6e6413e // indirect
+	github.com/google/go-cmp v0.7.0 // indirect
+	github.com/gordonklaus/ineffassign v0.2.0 // indirect
+	github.com/gostaticanalysis/analysisutil v0.7.1 // indirect
+	github.com/gostaticanalysis/comment v1.5.0 // indirect
+	github.com/gostaticanalysis/forcetypeassert v0.2.0 // indirect
+	github.com/gostaticanalysis/nilerr v0.1.2 // indirect
+	github.com/hashicorp/go-immutable-radix/v2 v2.1.0 // indirect
+	github.com/hashicorp/go-version v1.7.0 // indirect
+	github.com/hashicorp/golang-lru/v2 v2.0.7 // indirect
+	github.com/hashicorp/hcl v1.0.0 // indirect
+	github.com/hexops/gotextdiff v1.0.3 // indirect
+	github.com/inconshreveable/mousetrap v1.1.0 // indirect
+	github.com/jgautheron/goconst v1.8.2 // indirect
+	github.com/jingyugao/rowserrcheck v1.1.1 // indirect
+	github.com/jjti/go-spancheck v0.6.5 // indirect
+	github.com/julz/importas v0.2.0 // indirect
+	github.com/karamaru-alpha/copyloopvar v1.2.2 // indirect
+	github.com/kballard/go-shellquote v0.0.0-20180428030007-95032a82bc51 // indirect
+	github.com/kisielk/errcheck v1.9.0 // indirect
+	github.com/kkHAIKE/contextcheck v1.1.6 // indirect
+	github.com/kr/pretty v0.3.1 // indirect
+	github.com/kulti/thelper v0.7.1 // indirect
+	github.com/kunwardeep/paralleltest v1.0.15 // indirect
+	github.com/lasiar/canonicalheader v1.1.2 // indirect
+	github.com/ldez/exptostd v0.4.5 // indirect
+	github.com/ldez/gomoddirectives v0.7.1 // indirect
+	github.com/ldez/grignotin v0.10.1 // indirect
+	github.com/ldez/tagliatelle v0.7.2 // indirect
+	github.com/ldez/usetesting v0.5.0 // indirect
+	github.com/leonklingele/grouper v1.1.2 // indirect
+	github.com/lucasb-eyer/go-colorful v1.2.0 // indirect
+	github.com/macabu/inamedparam v0.2.0 // indirect
+	github.com/magiconair/properties v1.8.6 // indirect
+	github.com/manuelarte/embeddedstructfieldcheck v0.4.0 // indirect
+	github.com/manuelarte/funcorder v0.5.0 // indirect
+	github.com/maratori/testableexamples v1.0.1 // indirect
+	github.com/maratori/testpackage v1.1.2 // indirect
+	github.com/matoous/godox v1.1.0 // indirect
+	github.com/mattn/go-colorable v0.1.14 // indirect
+	github.com/mattn/go-isatty v0.0.20 // indirect
+	github.com/mattn/go-runewidth v0.0.16 // indirect
+	github.com/matttproud/golang_protobuf_extensions v1.0.1 // indirect
+	github.com/mgechev/revive v1.12.0 // indirect
+	github.com/mgutz/ansi v0.0.0-20200706080929-d51e80ef957d // indirect
+	github.com/mitchellh/go-homedir v1.1.0 // indirect
+	github.com/mitchellh/mapstructure v1.5.0 // indirect
+	github.com/moricho/tparallel v0.3.2 // indirect
+	github.com/muesli/termenv v0.16.0 // indirect
+	github.com/nakabonne/nestif v0.3.1 // indirect
+	github.com/nishanths/exhaustive v0.12.0 // indirect
+	github.com/nishanths/predeclared v0.2.2 // indirect
+	github.com/nunnatsa/ginkgolinter v0.21.2 // indirect
+	github.com/pelletier/go-toml v1.9.5 // indirect
+	github.com/pelletier/go-toml/v2 v2.2.4 // indirect
+	github.com/pmezard/go-difflib v1.0.0 // indirect
+	github.com/polyfloyd/go-errorlint v1.8.0 // indirect
+	github.com/prometheus/client_golang v1.12.1 // indirect
+	github.com/prometheus/client_model v0.2.0 // indirect
+	github.com/prometheus/common v0.32.1 // indirect
+	github.com/prometheus/procfs v0.7.3 // indirect
+	github.com/quasilyte/go-ruleguard v0.4.5 // indirect
+	github.com/quasilyte/go-ruleguard/dsl v0.3.23 // indirect
+	github.com/quasilyte/gogrep v0.5.0 // indirect
+	github.com/quasilyte/regex/syntax v0.0.0-20210819130434-b3f0c404a727 // indirect
+	github.com/quasilyte/stdinfo v0.0.0-20220114132959-f7386bf02567 // indirect
+	github.com/raeperd/recvcheck v0.2.0 // indirect
+	github.com/rivo/uniseg v0.4.7 // indirect
+	github.com/rogpeppe/go-internal v1.14.1 // indirect
+	github.com/ryancurrah/gomodguard v1.4.1 // indirect
+	github.com/ryanrolds/sqlclosecheck v0.5.1 // indirect
+	github.com/sanposhiho/wastedassign/v2 v2.1.0 // indirect
+	github.com/santhosh-tekuri/jsonschema/v6 v6.0.2 // indirect
+	github.com/sashamelentyev/interfacebloat v1.1.0 // indirect
+	github.com/sashamelentyev/usestdlibvars v1.29.0 // indirect
+	github.com/securego/gosec/v2 v2.22.10 // indirect
+	github.com/sirupsen/logrus v1.9.3 // indirect
+	github.com/sivchari/containedctx v1.0.3 // indirect
+	github.com/sonatard/noctx v0.4.0 // indirect
+	github.com/sourcegraph/go-diff v0.7.0 // indirect
+	github.com/spf13/cast v1.5.0 // indirect
+	github.com/spf13/jwalterweatherman v1.1.0 // indirect
+	github.com/spf13/pflag v1.0.10 // indirect
+	github.com/spf13/viper v1.12.0 // indirect
+	github.com/ssgreg/nlreturn/v2 v2.2.1 // indirect
+	github.com/stbenjam/no-sprintf-host-port v0.2.0 // indirect
+	github.com/stretchr/objx v0.5.2 // indirect
+	github.com/subosito/gotenv v1.4.1 // indirect
+	github.com/tetafro/godot v1.5.4 // indirect
+	github.com/timakin/bodyclose v0.0.0-20241222091800-1db5c5ca4d67 // indirect
+	github.com/timonwong/loggercheck v0.11.0 // indirect
+	github.com/tomarrell/wrapcheck/v2 v2.11.0 // indirect
+	github.com/tommy-muehle/go-mnd/v2 v2.5.1 // indirect
+	github.com/ultraware/funlen v0.2.0 // indirect
+	github.com/ultraware/whitespace v0.2.0 // indirect
+	github.com/uudashr/gocognit v1.2.0 // indirect
+	github.com/uudashr/iface v1.4.1 // indirect
+	github.com/xen0n/gosmopolitan v1.3.0 // indirect
+	github.com/xo/terminfo v0.0.0-20220910002029-abceb7e1c41e // indirect
+	github.com/yagipy/maintidx v1.0.0 // indirect
+	github.com/yeya24/promlinter v0.3.0 // indirect
+	github.com/ykadowak/zerologlint v0.1.5 // indirect
+	gitlab.com/bosi/decorder v0.4.2 // indirect
+	go-simpler.org/musttag v0.14.0 // indirect
+	go-simpler.org/sloglint v0.11.1 // indirect
+	go.augendre.info/arangolint v0.3.1 // indirect
+	go.augendre.info/fatcontext v0.9.0 // indirect
+	go.uber.org/automaxprocs v1.6.0 // indirect
+	go.uber.org/multierr v1.10.0 // indirect
+	go.uber.org/zap v1.27.0 // indirect
+	golang.org/x/exp/typeparams v0.0.0-20251023183803-a4bb9ffd2546 // indirect
+	golang.org/x/mod v0.29.0 // indirect
+	golang.org/x/sync v0.18.0 // indirect
+	golang.org/x/sys v0.37.0 // indirect
+	golang.org/x/term v0.36.0 // indirect
+	golang.org/x/text v0.30.0 // indirect
+	golang.org/x/tools v0.38.0 // indirect
+	google.golang.org/protobuf v1.36.8 // indirect
+	gopkg.in/ini.v1 v1.67.0 // indirect
+	gopkg.in/yaml.v2 v2.4.0 // indirect
+	gopkg.in/yaml.v3 v3.0.1 // indirect
+	honnef.co/go/tools v0.6.1 // indirect
+	mvdan.cc/gofumpt v0.9.2 // indirect
+	mvdan.cc/unparam v0.0.0-20251027182757-5beb8c8f8f15 // indirect
 )

pkg/exec/run.go

@@ -1,17 +1,18 @@
 package exec
 
 import (
-	"bytes"
+	"bufio"
 	"os"
 	"os/exec"
 	"strings"
 
-	"github.com/juju/errors"
 	"github.com/rs/zerolog/log"
 )
 
-// Run executes anycommand in workDir and returns stdout and error.
+// Run executes a command in workDir and returns stdout and error.
-func Run(path string, workDir string, args ...string) (string, error) {
+// The spawned process will exit upon termination of this application
+// to ensure a clean exit
+func Run(path string, workDir string, args ...string) error {
 	_, err := exec.LookPath(path)
 	if err != nil {
 		log.Error().Msgf("%s is required, please install it", path)
@@ -19,25 +20,28 @@ func Run(path string, workDir string, args ...string) (string, error) {
 	}
 	cmd := exec.Command(path, args...)
 	cmd.Dir = workDir
-	stdout := &bytes.Buffer{}
+	log.Debug().Msg("Executing " + strings.Join(cmd.Args, " "))
-	stderr := &bytes.Buffer{}
+	stdout, err := cmd.StdoutPipe()
-	cmd.Stdout = stdout
-	cmd.Stderr = stderr
-	log.Debug().Msgf("Executing " + strings.Join(cmd.Args, " "))
-	err = cmd.Run()
-	output := strings.TrimSpace(stdout.String())
-	errOut := strings.TrimSpace(stderr.String())
-	if output != "" {
-		log.Debug().Msgf(output)
-	}
-	if errOut != "" {
-		log.Debug().Msgf(errOut)
-	}
-	if _, ok := err.(*exec.ExitError); !ok {
-		return output, errors.Trace(err)
-	}
 	if err != nil {
-		return output, errors.Annotatef(err, path, cmd.Args, errOut)
+		log.Fatal().Msgf("Failed to get stdout pipe: %v", err)
 	}
-	return output, nil
+	if err := cmd.Start(); err != nil {
+		log.Fatal().Msgf("Failed to start command: %v", err)
+	}
+
+	scanner := bufio.NewScanner(stdout)
+
+	for scanner.Scan() {
+		log.Debug().Msg(scanner.Text())
+	}
+
+	if err := scanner.Err(); err != nil {
+		log.Fatal().Msgf("Error reading stdout: %v", err)
+	}
+
+	if err := cmd.Wait(); err != nil {
+		log.Fatal().Msgf("Command finished with error: %v", err)
+		return err
+	}
+	return nil
 }

pkg/network/speedtest.go

@@ -1,52 +0,0 @@
-package network
-
-import (
-	"github.com/juju/errors"
-	"github.com/rs/zerolog/log"
-	"github.com/showwin/speedtest-go/speedtest"
-)
-
-// TestSpeed tests the speed of an active network connection
-func TestSpeed() error {
-	user, err := speedtest.FetchUserInfo()
-
-	if err != nil {
-		return errors.Annotate(err, "Unable to fetch user info")
-	}
-
-	serverList, err := speedtest.FetchServerList(user)
-
-	if err != nil {
-		return errors.Annotate(err, "Unable to fetch server list")
-	}
-
-	targets, _ := serverList.FindServer([]int{})
-
-	if err != nil {
-		return errors.Annotate(err, "Unable to find server")
-	}
-
-	for _, s := range targets {
-		err := s.PingTest()
-
-		if err != nil {
-			log.Error().Msg("Failed to obtain ping")
-		}
-
-		err = s.DownloadTest(true)
-
-		if err != nil {
-			log.Error().Msg("Failed download test")
-		}
-
-		err = s.UploadTest(true)
-
-		if err != nil {
-			log.Error().Msg("Failed upload test")
-		}
-
-		log.Info().Msgf("Latency: %s, Download: %f, Upload: %f", s.Latency, s.DLSpeed, s.ULSpeed)
-	}
-
-	return nil
-}

pkg/util/retry.go

@@ -0,0 +1,18 @@
+package util
+
+import (
+	"time"
+	"github.com/rs/zerolog/log"
+)
+
+func Retry(attempts int, delay time.Duration,fn func() error) error {
+	var err error
+	for i := 0; i < attempts; i++ {
+		if err = fn(); err == nil {
+			return nil
+		}
+		log.Error().Msgf("Retrying after %d seconds. An error occured: %s", delay, err)
+		time.Sleep(delay)
+	}
+	return err
+}

pkg/vpn/cache.go

@@ -2,7 +2,7 @@ package vpn
 
 import (
 	"encoding/json"
-	"io/ioutil"
+	"io"
 	"os"
 	"path"
 	"time"
@@ -25,20 +25,18 @@ func getCacheDir() string {
 
 func createCacheDir() error {
 	cacheDir := getCacheDir()
-	var AppFs = afero.NewOsFs()
+	AppFs := afero.NewOsFs()
-	return AppFs.MkdirAll(cacheDir, 0700)
+	return AppFs.MkdirAll(cacheDir, 0o700)
 }
 
 func getVpnListCache() (*[]Server, error) {
 	cacheFile := path.Join(getCacheDir(), serverCachefile)
 	serversFile, err := os.Open(cacheFile)
-
 	if err != nil {
 		return nil, err
 	}
 
-	byteValue, err := ioutil.ReadAll(serversFile)
+	byteValue, err := io.ReadAll(serversFile)
-
 	if err != nil {
 		return nil, err
 	}
@@ -55,30 +53,25 @@ func getVpnListCache() (*[]Server, error) {
 }
 
 func writeVpnListToCache(servers []Server) error {
-
 	err := createCacheDir()
-
 	if err != nil {
 		return err
 	}
 
 	f, err := json.MarshalIndent(servers, "", " ")
-
 	if err != nil {
 		return err
 	}
 
 	cacheFile := path.Join(getCacheDir(), serverCachefile)
 
-	err = ioutil.WriteFile(cacheFile, f, 0644)
+	err = os.WriteFile(cacheFile, f, 0o644)
 
 	return err
-
 }
 
 func vpnListCacheIsExpired() bool {
 	file, err := os.Stat(path.Join(getCacheDir(), serverCachefile))
-
 	if err != nil {
 		return true
 	}

pkg/vpn/client.go

@@ -1,48 +1,28 @@
 package vpn
 
 import (
-	"io/ioutil"
 	"os"
-	"time"
+	"runtime"
 
 	"github.com/davegallant/vpngate/pkg/exec"
-	"github.com/davegallant/vpngate/pkg/network"
-	"github.com/hpcloud/tail"
 	"github.com/juju/errors"
-	"github.com/rs/zerolog/log"
 )
 
 // Connect to a specified OpenVPN configuration
 func Connect(configPath string) error {
-
+	tmpLogFile, err := os.CreateTemp("", "vpngate-openvpn-log-")
-	tmpLogFile, err := ioutil.TempFile("", "vpngate-openvpn-log-")
 	if err != nil {
 		return errors.Annotate(err, "Unable to create a temporary log file")
 	}
-	defer os.Remove(tmpLogFile.Name())
+	defer func() {
-
+		_ = os.Remove(tmpLogFile.Name())
-	go func() {
-		for {
-			err = network.TestSpeed()
-			if err != nil {
-				log.Error().Msg("Failed to test network speed")
-			}
-			time.Sleep(time.Minute)
-		}
-
 	}()
 
-	go func() {
+	executable := "openvpn"
-		// Tail the temporary openvpn log file
+	if runtime.GOOS == "windows" {
-		t, err := tail.TailFile(tmpLogFile.Name(), tail.Config{Follow: true})
+		executable = "C:\\Program Files\\OpenVPN\\bin\\openvpn.exe"
-		if err != nil {
+	}
-			log.Error().Msgf("%s", err)
-		}
-		for line := range t.Lines {
-			log.Debug().Msg(line.Text)
-		}
-	}()
 
-	_, err = exec.Run("openvpn", ".", "--verb", "4", "--log", tmpLogFile.Name(), "--config", configPath)
+	err = exec.Run(executable, ".", "--verb", "4", "--config", configPath, "--data-ciphers", "AES-128-CBC")
 	return err
 }

pkg/vpn/list.go

@@ -1,14 +1,17 @@
 package vpn
 
 import (
-	"net/http"
-
 	"bytes"
 	"io"
+	"net/http"
+	"net/url"
+	"os"
 
 	"github.com/jszwec/csvutil"
 	"github.com/rs/zerolog/log"
+	"golang.org/x/net/proxy"
 
+	"github.com/davegallant/vpngate/pkg/util"
 	"github.com/juju/errors"
 )
 
@@ -38,7 +41,6 @@ func streamToBytes(stream io.Reader) []byte {
 
 // parse csv
 func parseVpnList(r io.Reader) (*[]Server, error) {
-
 	var servers []Server
 
 	serverList := streamToBytes(r)
@@ -46,21 +48,21 @@ func parseVpnList(r io.Reader) (*[]Server, error) {
 	// Trim known invalid rows
 	serverList = bytes.TrimPrefix(serverList, []byte("*vpn_servers\r\n"))
 	serverList = bytes.TrimSuffix(serverList, []byte("*\r\n"))
+	serverList = bytes.ReplaceAll(serverList, []byte(`"`), []byte{})
 
 	if err := csvutil.Unmarshal(serverList, &servers); err != nil {
 		return nil, errors.Annotatef(err, "Unable to parse CSV")
 	}
 
 	return &servers, nil
-
 }
 
 // GetList returns a list of vpn servers
-func GetList() (*[]Server, error) {
+func GetList(httpProxy string, socks5Proxy string) (*[]Server, error) {
-
 	cacheExpired := vpnListCacheIsExpired()
 
 	var servers *[]Server
+	var client *http.Client
 
 	if !cacheExpired {
 		servers, err := getVpnListCache()
@@ -76,28 +78,71 @@ func GetList() (*[]Server, error) {
 	}
 
 	log.Info().Msg("Fetching the latest server list")
-	r, err := http.Get(vpnList)
 
-	if err != nil {
+	if httpProxy != "" {
-		return nil, errors.Annotate(err, "Unable to retrieve vpn list")
+		proxyURL, err := url.Parse(httpProxy)
+		if err != nil {
+			log.Error().Msgf("Error parsing proxy: %s", err)
+			os.Exit(1)
+		}
+		transport := &http.Transport{
+			Proxy: http.ProxyURL(proxyURL),
+		}
+
+		client = &http.Client{
+			Transport: transport,
+		}
+
+	} else if socks5Proxy != "" {
+		dialer, err := proxy.SOCKS5("tcp", socks5Proxy, nil, proxy.Direct)
+		if err != nil {
+			log.Error().Msgf("Error creating SOCKS5 dialer: %v", err)
+			os.Exit(1)
+		}
+
+		httpTransport := &http.Transport{
+			Dial: dialer.Dial,
+		}
+
+		client = &http.Client{
+			Transport: httpTransport,
+		}
+	} else {
+		client = &http.Client{}
 	}
 
-	defer r.Body.Close()
+	var r *http.Response
 
-	if r.StatusCode != 200 {
+	err := util.Retry(5, 1, func() error {
-		return nil, errors.Annotatef(err, "Unexpected status code when retrieving vpn list: %d", r.StatusCode)
+		var err error
-	}
+		r, err = client.Get(vpnList)
+		if err != nil {
+			return err
+		}
+		defer func() {
+			_ = r.Body.Close()
+		}()
 
-	servers, err = parseVpnList(r.Body)
+		if r.StatusCode != 200 {
+			return errors.Annotatef(err, "Unexpected status code when retrieving vpn list: %d", r.StatusCode)
+		}
+
+		servers, err = parseVpnList(r.Body)
+
+		if err != nil {
+			return err
+		}
+
+		err = writeVpnListToCache(*servers)
+
+		if err != nil {
+			log.Warn().Msgf("Unable to write servers to cache: %s", err)
+		}
+		return nil
+	})
 
 	if err != nil {
-		return nil, errors.Annotate(err, "unable to parse vpn list")
+		return nil, err
-	}
-
-	err = writeVpnListToCache(*servers)
-
-	if err != nil {
-		log.Warn().Msgf("Unable to write servers to cache: %s", err)
 	}
 
 	return servers, nil

pkg/vpn/list_test.go

@@ -0,0 +1,32 @@
+package vpn
+
+import (
+	"os"
+	"testing"
+
+	"github.com/stretchr/testify/assert"
+)
+
+// TestGetListReal tests getting the real list of vpn servers
+func TestGetListReal(t *testing.T) {
+	_, err := GetList("", "")
+
+	assert.NoError(t, err)
+}
+
+// TestParseVpnList parses a local copy of vpn list csv
+func TestParseVpnList(t *testing.T) {
+	dat, err := os.Open("../../test_data/vpn_list.csv")
+	assert.NoError(t, err)
+
+	servers, err := parseVpnList(dat)
+	assert.NoError(t, err)
+
+	assert.Equal(t, len(*servers), 98)
+
+	assert.Equal(t, (*servers)[0].CountryLong, "Japan")
+	assert.Equal(t, (*servers)[0].CountryShort, "jp")
+	assert.Equal(t, (*servers)[0].HostName, "public-vpn-227")
+	assert.Equal(t, (*servers)[0].Ping, "13")
+	assert.Equal(t, (*servers)[0].Score, 2086924)
+}

renovate.json

@@ -0,0 +1,9 @@
+{
+  "$schema": "https://docs.renovatebot.com/renovate-schema.json",
+  "schedule": [
+    "every weekend"
+  ],
+  "extends": [
+    "config:recommended"
+  ]
+}