Update README.md

README.md

@@ -19,7 +19,7 @@
 - 🎉  **New Features**
   - **Moved from TinyDB to SQLite**: SQLite provide a better performance and loading speed when getting peers! Also avoided crashing the database due to **race condition**.
   - **Added Gunicorn WSGI Server**: This could provide more stable on handling HTTP request, and more flexibility in the future (such as HTTPS support). **BIG THANKS to @pgalonza :heart:**
-  - **Add Peers by Bulk: ** User can add peers by bulk, just simply set the amount and click add.
+  - **Add Peers by Bulk:** User can add peers by bulk, just simply set the amount and click add.
   - **Delete Peers by Bulk**: User can delete peers by bulk, without deleting peers one by one.
   - **Download Peers in Zip**: User can download all *downloadable* peers in a zip.
   - **Added Pre-shared Key to peers:** Now each peer can add with a pre-shared key to enhance security. Previously added peers can add the pre-shared key through the peer setting button.
@@ -28,8 +28,8 @@
   
 - 🪚  **Bug Fixed**
   - [IP Sorting range issues #99](https://github.com/donaldzou/WGDashboard/issues/99) [❤️ @barryboom]
-  - [INvalid character written to tunnel json file #108](https://github.com/donaldzou/WGDashboard/issues/108) [❤️ @ ikidd]
+  - [INvalid character written to tunnel json file #108](https://github.com/donaldzou/WGDashboard/issues/108) [❤️ @ikidd]
-  - [Add IPv6 #91](https://github.com/donaldzou/WGDashboard/pull/91) [❤️ @ pgalonza]
+  - [Add IPv6 #91](https://github.com/donaldzou/WGDashboard/pull/91) [❤️ @pgalonza]
   - [Added MTU and PersistentKeepalive to QR code and download files #112](https://github.com/donaldzou/WGDashboard/pull/112) [:heart: @reafian]
   - **And many other bugs provided by our beloved users** :heart:
 - **🧐  Other Changes**
@@ -115,7 +115,7 @@
 1. Download WGDashboard
 
    ```shell
-   git clone -b v3.0 https://github.com/donaldzou/WGDashboard.git wgdashboard
+   git clone -b v3.0.1 https://github.com/donaldzou/WGDashboard.git wgdashboard
    
 2. Open the WGDashboard folder
 
@@ -301,7 +301,7 @@ Since version 2.0, WGDashboard will be using a configuration file called `wg-das
 | `app_ip`                     | IP address the dashboard will run with                       | `0.0.0.0`                                            | Yes            |
 | `app_port`                   | Port the the dashboard will run with                         | `10086`                                              | Yes            |
 | `auth_req`                   | Does the dashboard need authentication to access, if `auth_req = false` , user will not be access the **Setting** tab due to security consideration. **User can only edit the file directly in system**. | `true`                                               | **No**         |
-| `version`                    | Dashboard Version                                            | `v3.0`                                               | **No**         |
+| `version`                    | Dashboard Version                                            | `v3.0.1`                                             | **No**         |
 | `dashboard_refresh_interval` | How frequent the dashboard will refresh on the configuration page | `60000ms`                                            | Yes            |
 | `dashboard_sort`             | How configuration is sorting                                 | `status`                                             | Yes            |
 |                              |                                                              |                                                      |                |
@@ -349,16 +349,22 @@ Endpoint = 0.0.0.0:51820
 <hr>
 
 1. Change your directory to `wgdashboard` 
-    
+   
     ```shell
     cd wgdashboard
     ```
     
 2. Update the dashboard
     ```shell
-    git pull https://github.com/donaldzou/WGDashboard.git v3.0 --force
+    git pull https://github.com/donaldzou/WGDashboard.git v3.0.1 --force
     ```
 
+3. Install
+
+   ```shell
+   ./wgd.sh install
+   ```
+
 Starting with `v3.0`, you can simply do `./wgd.sh update` !! (I hope, lol)
 
 ## 🥘 Experimental Functions

src/dashboard.py

@@ -66,9 +66,9 @@ def get_dashboard_conf():
     Get dashboard configuration
     @return: configparser.ConfigParser
     """
-    config = configparser.ConfigParser(strict=False)
+    r_config = configparser.ConfigParser(strict=False)
-    config.read(DASHBOARD_CONF)
+    r_config.read(DASHBOARD_CONF)
-    return config
+    return r_config
 
 
 def set_dashboard_conf(config):
@@ -190,7 +190,7 @@ def read_conf_file(config_name):
                 conf_peer_data["Peers"].append({})
             elif peer > -1:
                 if len(i) > 0:
-                    tmp = re.split('\s*=\s*', i, 1)
+                    tmp = re.split(r'\s*=\s*', i, 1)
                     if len(tmp) == 2:
                         conf_peer_data["Peers"][peer][tmp[0]] = tmp[1]
 
@@ -224,10 +224,10 @@ def get_latest_handshake(config_name):
             status = "stopped"
         if int(data_usage[count + 1]) > 0:
             g.cur.execute("UPDATE %s SET latest_handshake = '%s', status = '%s' WHERE id='%s'"
-                          % (config_name, str(minus).split(".", maxsplit=1)[0], status, data_usage[count]))
+            % (config_name, str(minus).split(".", maxsplit=1)[0], status, data_usage[count]))
         else:
             g.cur.execute("UPDATE %s SET latest_handshake = '(None)', status = '%s' WHERE id='%s'"
-                          % (config_name, status, data_usage[count]))
+            % (config_name, status, data_usage[count]))
         count += 2
 
 
@@ -1705,6 +1705,7 @@ def get_host_bind():
 
 
 if __name__ == "__main__":
+    init_dashboard()
     UPDATE = check_update()
     config = configparser.ConfigParser(strict=False)
     config.read('wg-dashboard.ini')

src/static/js/configuration.js

@@ -338,8 +338,12 @@
      * Load Peers from server to configuration page
      * @param searchString
      */
+    let d1 = new Date();
+    let time = 0;
+    let count = 0;
     function loadPeers(searchString){
         startProgressBar();
+        d1 = new Date();
         $.ajax({
             method: "GET",
             url: `/get_config/${conf_name}?search=${encodeURIComponent(searchString)}`,
@@ -354,6 +358,12 @@
             $(".dot.dot-stopped").attr("title","Peer Disconnected").tooltip();
             $("i[data-toggle='tooltip']").tooltip();
             endProgressBar();
+            let d2 = new Date();
+            let seconds = (d2 - d1);
+            time += seconds;
+            count += 1;
+            console.log(`Average ${time/count}ms`);
+            $("#peer_loading_time").html(`Peer Loading Time: ${seconds}ms`);
         }).fail(function(){
             noResponding();
         });

src/templates/configuration.html

@@ -11,7 +11,6 @@
         </div>
     </div>
 	{% include "navbar.html" %}
-
 	<div class="container-fluid" id="right_body">
 		{% include "sidebar.html" %}
         <div class="col-md-9 ml-sm-auto col-lg-10 px-md-4 mt-4 mb-4">
@@ -120,6 +119,7 @@
                     </div>
                 </div>
                 <div class="row peer_list"></div>
+                <small id="peer_loading_time" class="text-muted"></small>
             </main>
         </div>
 	</div>

src/wgd.sh

@@ -33,6 +33,7 @@ help () {
 }
 
 _check_and_set_venv(){
+    # This function will not be using in v3.0
     # deb/ubuntu users: might need a 'apt install python3.8-venv'
     # set up the local environment
     APP_ROOT=`pwd`