From bd92cf6c4d63d0a1da41978d3755f5d210614744 Mon Sep 17 00:00:00 2001
From: Raphix <picot.raphael@gmail.com>
Date: Sat, 13 Jan 2024 17:20:34 +0100
Subject: [PATCH] =?UTF-8?q?Version=201.0.3=20-=20Ajout=20de=20WebMetrics?=
 =?UTF-8?q?=20en=20Pr=C3=A9vsion?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 data/metrics.json               |  7 +++++++
 data/users.json                 |  2 +-
 package-lock.json               | 15 +++++++++++++--
 package.json                    |  3 ++-
 src/modules/global-variables.js |  3 ++-
 src/web/routes/index.js         |  9 +++++++++
 src/web/routes/internal.js      |  1 -
 7 files changed, 34 insertions(+), 6 deletions(-)
 create mode 100644 data/metrics.json

diff --git a/data/metrics.json b/data/metrics.json
new file mode 100644
index 0000000..220db73
--- /dev/null
+++ b/data/metrics.json
@@ -0,0 +1,7 @@
+[
+  {
+    "name": "visitorCounted",
+    "description": "Nombre de visiteurs",
+    "value": 17
+  }
+]
\ No newline at end of file
diff --git a/data/users.json b/data/users.json
index 7e0484f..75c1a7c 100644
--- a/data/users.json
+++ b/data/users.json
@@ -188,6 +188,6 @@
     "deaf": false,
     "bio": "",
     "banner": null,
-    "token": "fdc6a37b-0696-4951-9c91-5c59494264ec"
+    "token": "adf077e6-1fac-4c0c-9468-6ebe698c550a"
   }
 ]
\ No newline at end of file
diff --git a/package-lock.json b/package-lock.json
index cd7c187..4f1bc6f 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "subsonics-web",
-  "version": "0.6.0",
+  "version": "1.0.3",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "subsonics-web",
-      "version": "0.6.0",
+      "version": "1.0.3",
       "dependencies": {
         "cookie": "^0.5.0",
         "cookie-parser": "^1.4.6",
@@ -20,6 +20,7 @@
         "pm2": "^5.3.0",
         "socket.io": "^4.6.1",
         "uuid": "^9.0.0",
+        "webmetrik": "^0.1.3",
         "ytfps": "^1.1.0"
       }
     },
@@ -3391,6 +3392,11 @@
         "lodash": "^4.17.14"
       }
     },
+    "node_modules/webmetrik": {
+      "version": "0.1.3",
+      "resolved": "https://registry.npmjs.org/webmetrik/-/webmetrik-0.1.3.tgz",
+      "integrity": "sha512-UhCK1qTwAuhw17by2/lS5fL9o9uLyKBZ9+WvIY+VFSmuTcYr6zAVD4E0ns0M69NodHznH+L4a5mOyIfsq0o8cw=="
+    },
     "node_modules/wrappy": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz",
@@ -5929,6 +5935,11 @@
         }
       }
     },
+    "webmetrik": {
+      "version": "0.1.3",
+      "resolved": "https://registry.npmjs.org/webmetrik/-/webmetrik-0.1.3.tgz",
+      "integrity": "sha512-UhCK1qTwAuhw17by2/lS5fL9o9uLyKBZ9+WvIY+VFSmuTcYr6zAVD4E0ns0M69NodHznH+L4a5mOyIfsq0o8cw=="
+    },
     "wrappy": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz",
diff --git a/package.json b/package.json
index ebfb0bf..177d290 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "subsonics-web",
   "author": "Raphix",
-  "version": "1.0.2",
+  "version": "1.0.3",
   "nodemonConfig": {
     "ext": "js, html",
     "ignore": [
@@ -24,6 +24,7 @@
     "pm2": "^5.3.0",
     "socket.io": "^4.6.1",
     "uuid": "^9.0.0",
+    "webmetrik": "^0.1.4",
     "ytfps": "^1.1.0"
   },
   "scripts": {
diff --git a/src/modules/global-variables.js b/src/modules/global-variables.js
index d3179dd..0e426cf 100644
--- a/src/modules/global-variables.js
+++ b/src/modules/global-variables.js
@@ -19,7 +19,8 @@ const __glob = {
     README: root + path.sep + "README.md",
     PLAYLIST:  root + path.sep + "data" + path.sep + "playlist.json",
     RADIO:  root + path.sep + "data" + path.sep + "radios.json",
-    LOGS: root + path.sep + "src" + path.sep + "modules" + path.sep + "logs"
+    LOGS: root + path.sep + "src" + path.sep + "modules" + path.sep + "logs",
+    METRIC_FILE: root + path.sep + "data" + path.sep + "metrics.json",
 };
 
 const webroot = __glob.WEB_DIR + path.sep 
diff --git a/src/web/routes/index.js b/src/web/routes/index.js
index 7f262a4..2b13326 100644
--- a/src/web/routes/index.js
+++ b/src/web/routes/index.js
@@ -5,6 +5,11 @@ var auth = require("../../modules/sub-auth")
 var log = require("../../modules/sub-log")
 var { __glob } = require("../../modules/global-variables")
 var uuid = require("uuid")
+const metric = require("webmetrik")
+metric.setMetricFile(__glob.METRIC_FILE)
+metric.publishMetrics("8001", "raphraph")
+
+
 var fs = require("fs")
 
 var md = require('markdown-it')({
@@ -36,6 +41,10 @@ var md = require('markdown-it')({
 
 
 router.get('/', function(req, res, next) {
+
+    const visitorCounted = new metric.Metric("visitorCounted", "Nombre de visiteurs")
+    visitorCounted.setValue(visitorCounted.getValue() + 1)
+
     if(!auth.checkUser(req.cookies.token)) {
 
         res.redirect("/login")
diff --git a/src/web/routes/internal.js b/src/web/routes/internal.js
index 3ef9419..2a724c9 100644
--- a/src/web/routes/internal.js
+++ b/src/web/routes/internal.js
@@ -31,7 +31,6 @@ router.get('/redirect', function(req, res, next) {
                     
                     var user = data
                     const token = uuid.v4().toString()
-
                     user.token = token
                     auth.addUser(user)