add: changed index test

babico · babico · commit 78147ad260b3 · 2023-08-11T20:59:20.000+03:00
diff --git a/package.json b/package.json
@@ -36,6 +36,7 @@
     "compact2string": "^1.4.1",
     "debug": "^4.1.1",
     "ip": "^1.1.5",
+    "jsdom": "^22.1.0",
     "lru": "^3.1.0",
     "minimist": "^1.2.5",
     "once": "^1.4.0",
diff --git a/server.js b/server.js
@@ -331,25 +331,25 @@ class Server extends EventEmitter {
               <body>
                 <div class="center">
                     <div class="first">Tracker Stats</div>
-                    <div class="first">There are ${stats.torrents} torrents, ${stats.activeTorrents} are active.</div>
-                    <div class="first">Connected Peers: ${stats.peersAll}</div>
+                    <div class="first">There are <div id="torrents">${stats.torrents}</div> torrents, <div id="activeTorrents">${stats.activeTorrents}</div> are active.</div>
+                    <div class="first">Connected Peers: <div id="peersAll">${stats.peersAll}</div></div>
                 </div>
                       
                 <div class="center">
-                    <div class="second">Peers Seeding Only: ${stats.peersSeederOnly}</div>
-                    <div class="second">Peers Leeching Only: ${stats.peersLeecherOnly}</div>
-                    <div class="second">Peers Seeding & Leeching: ${stats.peersSeederAndLeecher}</div>
+                    <div class="second">Peers Seeding Only: <div id="peersSeederOnly">${stats.peersSeederOnly}</div></div>
+                    <div class="second">Peers Leeching Only: <div id="peersLeecherOnly">${stats.peersLeecherOnly}</div></div>
+                    <div class="second">Peers Seeding & Leeching: <div id="peersSeederAndLeecher">${stats.peersSeederAndLeecher}</div></div>
                 </div>
                   
                 <div class="center">
-                    <div class="third">IPv4 Peers: ${stats.peersIPv4}</div>
-                    <div class="third">IPv6 Peers: ${stats.peersIPv6}</div>
+                    <div class="third">IPv4 Peers: <div id="peersIPv4">${stats.peersIPv4}</div></div>
+                    <div class="third">IPv6 Peers: <div id="peersIPv6">${stats.peersIPv6}</div></div>
                 </div>
                   
                 <div class="center">
                     <div class="fourth">
                         <h4>Clients:</h4>
-                        ${printClients(stats.clients)}
+                        <div id="clients">${printClients(stats.clients)}</div>
                     </div>
                 </div>
             </body>
diff --git a/test/stats.js b/test/stats.js
@@ -3,29 +3,23 @@ import commonTest from './common.js'
 import fixtures from 'webtorrent-fixtures'
 import get from 'simple-get'
 import test from 'tape'
+import jsdom from 'jsdom'
 
 const peerId = Buffer.from('-WW0091-4ea5886ce160')
 const unknownPeerId = Buffer.from('01234567890123456789')
 
 function parseHtml (html) {
-  const extractValue = /[^v^h](\d+)/
-  const array = html.replace('torrents', '\n').split('\n').filter(line => line && line.trim().length > 0).map(line => {
-    const a = extractValue.exec(line)
-    if (a) {
-      return parseInt(a[1])
-    }
-    return null
-  })
-  let i = 0
+  const dom = new jsdom.JSDOM(html)
+
   return {
-    torrents: array[i++],
-    activeTorrents: array[i++],
-    peersAll: array[i++],
-    peersSeederOnly: array[i++],
-    peersLeecherOnly: array[i++],
-    peersSeederAndLeecher: array[i++],
-    peersIPv4: array[i++],
-    peersIPv6: array[i]
+    torrents: parseInt(dom.window.document.getElementById('torrents').textContent),
+    activeTorrents: parseInt(dom.window.document.getElementById('activeTorrents').textContent),
+    peersAll: parseInt(dom.window.document.getElementById('peersAll').textContent),
+    peersSeederOnly: parseInt(dom.window.document.getElementById('peersSeederOnly').textContent),
+    peersLeecherOnly: parseInt(dom.window.document.getElementById('peersLeecherOnly').textContent),
+    peersSeederAndLeecher: parseInt(dom.window.document.getElementById('peersSeederAndLeecher').textContent),
+    peersIPv4: parseInt(dom.window.document.getElementById('peersIPv4').textContent),
+    peersIPv6: parseInt(dom.window.document.getElementById('peersIPv6').textContent)
   }
 }
 
