update servers, improve network info

cloud.html

@@ -102,7 +102,7 @@
       <div class="p-16 c-2">
         Login credentials are compatible between any the cloud resource, but DHT data would be different by the network architecture.
       </div>
-      <div class="grid float-left w-33-100" data-cloud-server="cs1.twisterarmy.org">
+      <div class="grid float-left w-33-100" data-cloud-server="cs1.twisterarmy.dedyn.io">
         <div class="p-16">
           <div class="p-16 b-c-103 bg-c-3 b-1 b-r-3">
             <div class="bb-1 b-c-0 f-size-20 pb-10 mb-16">
@@ -113,7 +113,7 @@
               Free, community instance, running original <a class="c-0" href="https://github.com/twisterarmy/cloud-server">cloud-server</a> pre-releases on the organization dedicated server.
             </div>
             <div>
-              <a class="c-3" href="https://cs1.twisterarmy.org">Select</a>
+              <a class="c-3" href="https://cs1.twisterarmy.dedyn.io">Select</a>
             </div>
           </div>
         </div>

css/common.css

@@ -173,6 +173,10 @@ a.c-4:hover {
   color: #44c508
 }
 
+.c-8 {
+  color: #9bb6da
+}
+
 /* dimensions */
 .w-100-100 {
   width: 100%

guide.html

@@ -334,7 +334,7 @@
         <h4 class="f-size-16 mb-16 px-12 f-normal">twister-core</h4>
         <p class="mb-16">Find following string in the file <i>src/chainparams.cpp</i></p>
         <pre class="mx-auto pt-16 mb-16 bg-c-4 b-r-3 o-x">
-          vSeeds.push_back(CDNSSeedData("twisterarmy.org", "seed.twisterarmy.org"));
+          vSeeds.push_back(CDNSSeedData("twisterarmy.dedyn.io", "seed.twisterarmy.dedyn.io"));
         </pre>
         <p class="mb-16">add</p>
         <pre class="mx-auto pt-16 mb-16 bg-c-4 b-r-3 o-x">
@@ -348,15 +348,15 @@
         <h4 class="f-size-16 mb-16 px-12 f-normal">twister-seeder</h4>
         <p class="mb-16">Find following string in the file <i>main.cpp</i></p>
         <pre class="mx-auto pt-16 mb-16 bg-c-4 b-r-3 o-x">
-          static const string mainnet_seeds[] = {"seed.twister.net.co","seed2.twister.net.co","seed3.twister.net.co","twisterseed.tk","twisterarmyseed.tk","seed.twisterarmy.org",""};
+          static const string mainnet_seeds[] = {"seed.twister.net.co","seed2.twister.net.co","seed3.twister.net.co","twisterseed.tk","twisterarmyseed.tk","seed.twisterarmy.dedyn.io",""};
         </pre>
         <p class="mb-16">add DNS seeder address to the end of this list:</p>
         <pre class="mx-auto pt-16 mb-16 bg-c-4 b-r-3 o-x">
-          static const string mainnet_seeds[] = {"seed.twister.net.co","seed2.twister.net.co","seed3.twister.net.co","twisterseed.tk","twisterarmyseed.tk","seed.twisterarmy.org","domainseed.tk",""};
+          static const string mainnet_seeds[] = {"seed.twister.net.co","seed2.twister.net.co","seed3.twister.net.co","twisterseed.tk","twisterarmyseed.tk","seed.twisterarmy.dedyn.io","domainseed.tk",""};
         </pre>
         <p class="mb-16">or</p>
         <pre class="mx-auto pt-16 mb-16 bg-c-4 b-r-3 o-x">
-          static const string mainnet_seeds[] = {"seed.twister.net.co","seed2.twister.net.co","seed3.twister.net.co","twisterseed.tk","twisterarmyseed.tk","seed.twisterarmy.org","seed.domain.org",""};
+          static const string mainnet_seeds[] = {"seed.twister.net.co","seed2.twister.net.co","seed3.twister.net.co","twisterseed.tk","twisterarmyseed.tk","seed.twisterarmy.dedyn.io","seed.domain.org",""};
         </pre>
         <p class="mb-16">Changes will be applied on the twister-seeders recompilation.</p>
         <h4 class="f-size-16 mb-16 px-12 f-normal">Network monitor</h4>

js/cloud.js

@@ -14,4 +14,4 @@ function nsLookup(host) {
   });
 }
 
-nsLookup('cs1.twisterarmy.org');
+nsLookup('cs1.twisterarmy.dedyn.io');

js/network.js

@@ -1,62 +1,123 @@
+function peerLookupYggdrasil(element) {
 
-function getCountry(answer, element) {
+  // Get online status
+  // @TODO
 
-  element.children('td:eq(3)').html('');
+  // If provided, set special status
+  if ($(element).data('yggdrasil').length > 0) {
 
-  $(answer).each(function() {
-    $.ajax({
-      type: 'GET',
-      url: 'https://ipapi.co/' + this.data + '/json',
-      dataType: 'json',
-      success: function (result) {
-        if (result.country_code && result.country_code != '' && result.country_code != 'undefined') {
-          element.children('td:eq(3)').append(' ' + result.country_code + ' ');
-        }
+    $(element).children('td:eq(0)').find('i').removeClass('c-5');
+    $(element).children('td:eq(0)').find('i').addClass('c-6');
+  }
+}
+
+function peerLookupIpv6(element) {
+
+  // Get online status
+  // @TODO
+
+  // Get country
+  $.ajax({
+    type: 'GET',
+    url: 'https://ipapi.co/' + $(element).data('ipv4') + '/json',
+    dataType: 'json',
+    success: function (result) {
+
+      if (result.country_code && result.country_code != '' && result.country_code != 'undefined') {
+
+        // Set country
+        $(element).children('td:eq(1)').text(result.country_code);
+      }
+    }
+  });
+}
+
+function peerLookupIpv4(element) {
+
+  // Get online status
+  // @TODO
+
+  // Get country
+  $.ajax({
+    type: 'GET',
+    url: 'https://ipapi.co/' + $(element).data('ipv4') + '/json',
+    dataType: 'json',
+    success: function (result) {
+
+      if (result.country_code && result.country_code != '' && result.country_code != 'undefined') {
+
+        // Set country
+        $(element).children('td:eq(1)').text(result.country_code);
       }
-    });
+    }
   });
 }
 
-function nsLookup(host) {
+function nsLookup(element) {
+
   $.ajax({
     type: 'GET',
-    url: 'https://dns.google/resolve?name=' + host,
+    url: 'https://dns.google/resolve?name=' + $(element).data('host'),
     dataType: 'json',
     success: function (result) {
 
       if (result.Answer) {
 
-        var peers = result.Answer.length;
+        if (result.Answer.length == 1) {
+
+          $(element).children('td:eq(0)').find('i').removeClass('c-5');
+          $(element).children('td:eq(0)').find('i').addClass('c-6');
 
-        var element = $('tr[data-host="' + host + '"');
+        } else if (result.Answer.length > 1) {
 
-        if (peers == 1) {
-          element.children('td:eq(0)').find('i').removeClass('c-5');
-          element.children('td:eq(0)').find('i').addClass('c-6');
-        } else if (peers > 1) {
-          element.children('td:eq(0)').find('i').removeClass('c-5');
-          element.children('td:eq(0)').find('i').addClass('c-7');
+          $(element).children('td:eq(0)').find('i').removeClass('c-5');
+          $(element).children('td:eq(0)').find('i').addClass('c-7');
         }
 
-        element.children('td:eq(2)').html(peers);
+        $(element).children('td:eq(2)').html(result.Answer.length);
+
+        // Get country
+        $(element).children('td:eq(3)').html('');
+
+        $(result.Answer).each(function() {
 
-        getCountry(result.Answer, element);
+          $.ajax({
+            type: 'GET',
+            url: 'https://ipapi.co/' + this.data + '/json',
+            dataType: 'json',
+            success: function (result) {
+
+              if (result.country_code && result.country_code != '' && result.country_code != 'undefined') {
+
+                $(element).children('td:eq(3)').append(' ' + result.country_code + ' ');
+              }
+            }
+          });
+        });
       }
     }
   });
 }
 
-$( document ).ready(function() {
+$(document).ready(function() {
 
-  nsLookup('seed.twister.net.co');
-  nsLookup('seed2.twister.net.co');
-  nsLookup('seed3.twister.net.co');
-  nsLookup('dnsseed.gombadi.com');
-  nsLookup('twisterseed.tk');
-  nsLookup('cruller.tasty.sexy');
-  nsLookup('twister-seeder.muh.freedu.ms');
-  nsLookup('twisterarmyseed.tk');
-  nsLookup('seed.twisterarmy.org');
+  // Check DNS
+  $('#dns tr[data-host]').each(function() {
+    nsLookup(this);
+  });
+
+  // Check peers
+  $('#peers tr[data-yggdrasil]').each(function() {
+    peerLookupYggdrasil(this);
+  });
+
+  $('#peers tr[data-ipv6]').each(function() {
+    peerLookupIpv6(this);
+  });
+
+  $('#peers tr[data-ipv4]').each(function() {
+    peerLookupIpv4(this);
+  });
 
   /*
   $('#vmap').vectorMap({
@@ -76,4 +137,4 @@ $( document ).ready(function() {
     showTooltip: true,
   });
   */
-});
+});

network.html

@@ -24,7 +24,7 @@
   <script src="/js/jquery.vmap.js"></script>
   <script src="/js/jquery.vmap.world.js"></script>
   -->
-  <script src="/js/network.js?v=3"></script>
+  <script src="/js/network.js?v=4"></script>
 </head>
 <body class="bg-c-1 bg-img-1 c-0">
   <div class="bg-c-2 bg-img-2 c-1 of-hidden position-fixed z-i-99 position-t-0 position-x-0">
@@ -59,13 +59,13 @@
       <h1 class="f-size-26 mt-96 mb-48 pb-36 pt-16 t-center f-normal bb-1-2 b-c-0">Network Monitor</h1>
       <!--<h2 class="f-size-20 mt-48 pb-10 f-normal t-center">DNS</h2>-->
       <div class="mx-auto mt-20 bg-c-4 b-r-3">
-        <table class="w-100-100">
+        <table class="w-100-100" id="dns">
           <tr>
             <th class="t-center bb-2 b-c-6 py-16 px-8">Status</th>
-            <th class="t-left pl-26 bb-2 b-c-6 py-16 px-8">DNS Server</th>
+            <th class="t-left pl-26 bb-2 b-c-6 py-16 px-8">DNS</th>
             <th class="t-center bb-2 b-c-6 py-16 px-8">Nodes</th>
             <th class="t-center bb-2 b-c-6 py-16 px-8">Location</th>
-            <th class="t-left bb-2 b-c-6 py-16 px-8">Twister compatibility</th>
+            <th class="t-left bb-2 b-c-6 py-16 px-8">Compatibility</th>
           </tr>
           <tr data-host="seed.twister.net.co">
             <td class="t-center bb-2 b-c-6 py-16 px-8"><i class="bi-circle-fill mr-6 f-size-10 p-16 c-5"></i></td>
@@ -123,6 +123,13 @@
             <td class="t-center bb-2 b-c-6 p-8">-</td>
             <td class="t-left bb-2 b-c-6 p-8">[Official, TA Edition] Mar 20, 2021 and later</td>
           </tr>
+          <tr data-host="seed.twisterarmy.dedyn.io">
+            <td class="t-center bb-2 b-c-6 py-16 px-8"><i class="bi-circle-fill mr-6 f-size-10 p-16 c-5"></i></td>
+            <td class="t-left bb-2 b-c-6 pl-26 p-8">seed.twisterarmy.dedyn.io</td>
+            <td class="t-center bb-2 b-c-6 p-8">-</td>
+            <td class="t-center bb-2 b-c-6 p-8">-</td>
+            <td class="t-left bb-2 b-c-6 p-8">[TA Edition] Dec 15, 2023</td>
+          </tr>
         </table>
       </div>
       <!--
@@ -139,27 +146,30 @@
       <a name="peers"></a>
       <h2 class="f-size-26 mb-48 pb-36 pt-16 t-center f-normal bb-1-2 b-c-0">Peers</h2>
       <div class="mx-auto mt-20 bg-c-4 b-r-3">
-        <table class="w-100-100">
+        <table class="w-100-100" id="peers">
           <tr>
-            <th class="t-left bb-2 b-c-6 py-16 px-8">Location</th>
+            <th class="t-center bb-2 b-c-6 py-16 px-8">Status</th>
+            <th class="t-center bb-2 b-c-6 py-16 px-8">Location</th>
             <th class="t-left pl-26 bb-2 b-c-6 py-16 px-8">IPv4</th>
             <th class="t-left bb-2 b-c-6 py-16 px-8">IPv6</th>
             <th class="t-left bb-2 b-c-6 py-16 px-8">Yggdrasil</th>
             <th class="t-center bb-2 b-c-6 py-16 px-8">Port TCP</th>
             <th class="t-center bb-2 b-c-6 py-16 px-8">Port UDP+TCP</th>
           </tr>
-          <tr>
-            <td class="t-left bb-2 b-c-6 py-16 px-8">Latvia</td>
+          <tr data-ipv4="94.140.114.241" data-ipv6="2a02:7aa0:4000::f2" data-yggdrasil="301:23b4:991a:634d::33">
+            <td class="t-center bb-2 b-c-6 py-16 px-8"><i class="bi-circle-fill mr-6 f-size-10 p-16 c-5"></i></td>
+            <td class="t-center bb-2 b-c-6 py-16 px-8">-</td>
             <td class="t-left pl-26 bb-2 b-c-6 p-8">94.140.114.241</td>
             <td class="t-left bb-2 b-c-6 p-8">2a02:7aa0:4000::f2</td>
-            <td class="t-left bb-2 b-c-6 p-8">201:23b4:991a:634d:8359:4521:5576:15b7</td>
+            <td class="t-left bb-2 b-c-6 p-8">301:23b4:991a:634d::33</td>
             <td class="t-center bb-2 b-c-6 p-8">28333</td>
             <td class="t-center bb-2 b-c-6 p-8">29333</td>
           </tr>
         </table>
       </div>
       <div class="t-center my-36">
-        <small>* connect to peer manually without DNS</small>
+        <p><small>* connect to peer manually without DNS</small></p>
+        <p><small>** IPv6 support enabled in <a href="https://github.com/twisterarmy/twister-core" class="c-1">twister-core TA Edition</a></small></p>
       </div>
       <div class="t-center my-36">
         <a href="https://github.com/twisterarmy/twisterarmy.github.io/blob/main/network.html" class="c-1">Add peer</a>

uk/cloud.html

@@ -102,7 +102,7 @@
       <div class="p-16 c-2">
         Облікові дані для входу сумісні між будь-яким хмарним ресурсом, але дані DHT будуть відрізнятися в залежності від мережевого статусу оператора.
       </div>
-      <div class="grid float-left w-33-100" data-cloud-server="cs1.twisterarmy.org">
+      <div class="grid float-left w-33-100" data-cloud-server="cs1.twisterarmy.dedyn.io">
         <div class="p-16">
           <div class="p-16 b-c-103 bg-c-3 b-1 b-r-3">
             <div class="bb-1 b-c-0 f-size-20 pb-10 mb-16">
@@ -113,7 +113,7 @@
               Безкоштовна, громадська інстанція Twisterarmy, використовує останні оновлення <a class="c-0" href="https://github.com/twisterarmy/cloud-server">cloud-server</a> на виділених серверах організації.
             </div>
             <div>
-              <a class="c-3" href="https://cs1.twisterarmy.org">Обрати</a>
+              <a class="c-3" href="https://cs1.twisterarmy.dedyn.io">Обрати</a>
             </div>
           </div>
         </div>

uk/guide.html

@@ -334,7 +334,7 @@
         <h4 class="f-size-16 mb-16 px-12 f-normal">twister-core</h4>
         <p class="mb-16">Знайдіть у файлі <i>src/chainparams.cpp</i></p>
         <pre class="mx-auto pt-16 mb-16 bg-c-4 b-r-3 o-x">
-          vSeeds.push_back(CDNSSeedData("twisterarmy.org", "seed.twisterarmy.org"));
+          vSeeds.push_back(CDNSSeedData("twisterarmy.dedyn.io", "seed.twisterarmy.dedyn.io"));
         </pre>
         <p class="mb-16">додайте</p>
         <pre class="mx-auto pt-16 mb-16 bg-c-4 b-r-3 o-x">
@@ -348,15 +348,15 @@
         <h4 class="f-size-16 mb-16 px-12 f-normal">twister-seeder</h4>
         <p class="mb-16">Знайдіть у файлі <i>main.cpp</i></p>
         <pre class="mx-auto pt-16 mb-16 bg-c-4 b-r-3 o-x">
-          static const string mainnet_seeds[] = {"seed.twister.net.co","seed2.twister.net.co","seed3.twister.net.co","twisterseed.tk","twisterarmyseed.tk","seed.twisterarmy.org",""};
+          static const string mainnet_seeds[] = {"seed.twister.net.co","seed2.twister.net.co","seed3.twister.net.co","twisterseed.tk","twisterarmyseed.tk","seed.twisterarmy.dedyn.io",""};
         </pre>
         <p class="mb-16">додайте в кінець списку адресу вашого DNS сервісу</p>
         <pre class="mx-auto pt-16 mb-16 bg-c-4 b-r-3 o-x">
-          static const string mainnet_seeds[] = {"seed.twister.net.co","seed2.twister.net.co","seed3.twister.net.co","twisterseed.tk","twisterarmyseed.tk","seed.twisterarmy.org","domainseed.tk",""};
+          static const string mainnet_seeds[] = {"seed.twister.net.co","seed2.twister.net.co","seed3.twister.net.co","twisterseed.tk","twisterarmyseed.tk","seed.twisterarmy.dedyn.io","domainseed.tk",""};
         </pre>
         <p class="mb-16">або</p>
         <pre class="mx-auto pt-16 mb-16 bg-c-4 b-r-3 o-x">
-          static const string mainnet_seeds[] = {"seed.twister.net.co","seed2.twister.net.co","seed3.twister.net.co","twisterseed.tk","twisterarmyseed.tk","seed.twisterarmy.org","seed.domain.org",""};
+          static const string mainnet_seeds[] = {"seed.twister.net.co","seed2.twister.net.co","seed3.twister.net.co","twisterseed.tk","twisterarmyseed.tk","seed.twisterarmy.dedyn.io","seed.domain.org",""};
         </pre>
         <p class="mb-16">Оскільки twister-seeder також потребує ініціальних вузлів для початку сканування інших, запис DNS буде доступний для інших серверів після повторної компіляції.</p>
         <h4 class="f-size-16 mb-16 px-12 f-normal">Монітор мережі</h4>

uk/network.html

@@ -60,10 +60,10 @@
       <h1 class="f-size-26 mt-96 mb-48 pb-36 pt-16 t-center f-normal bb-1-2 b-c-0">Мережа</h1>
       <!--<h2 class="f-size-20 mt-48 pb-10 f-normal t-center">DNS</h2>-->
       <div class="mx-auto mt-20 bg-c-4 b-r-3">
-        <table class="w-100-100">
+        <table class="w-100-100" id="dns">
           <tr>
             <th class="t-center bb-2 b-c-6 py-16 px-8">Статус</th>
-            <th class="t-left pl-26 bb-2 b-c-6 py-16 px-8">DNS Сервер</th>
+            <th class="t-left pl-26 bb-2 b-c-6 py-16 px-8">DNS</th>
             <th class="t-center bb-2 b-c-6 py-16 px-8">Вузли</th>
             <th class="t-center bb-2 b-c-6 py-16 px-8">Розташування</th>
             <th class="t-left bb-2 b-c-6 py-16 px-8">Сумісність</th>
@@ -124,6 +124,13 @@
             <td class="t-center bb-2 b-c-6 p-8">-</td>
             <td class="t-left bb-2 b-c-6 p-8">[Official, TA Edition] від 20 березня, 2021</td>
           </tr>
+          <tr data-host="seed.twisterarmy.dedyn.io">
+            <td class="t-center bb-2 b-c-6 py-16 px-8"><i class="bi-circle-fill mr-6 f-size-10 p-16 c-5"></i></td>
+            <td class="t-left bb-2 b-c-6 pl-26 p-8">seed.twisterarmy.dedyn.io</td>
+            <td class="t-center bb-2 b-c-6 p-8">-</td>
+            <td class="t-center bb-2 b-c-6 p-8">-</td>
+            <td class="t-left bb-2 b-c-6 p-8">[TA Edition] від 15 грудня, 2023</td>
+          </tr>
         </table>
       </div>
       <!--
@@ -140,27 +147,30 @@
       <a name="peers"></a>
       <h2 class="f-size-26 mb-48 pb-36 pt-16 t-center f-normal bb-1-2 b-c-0">Вузли</h2>
       <div class="mx-auto mt-20 bg-c-4 b-r-3">
-        <table class="w-100-100">
+        <table class="w-100-100" id="peers">
           <tr>
-            <th class="t-left bb-2 b-c-6 py-16 px-8">Розташування</th>
+            <th class="t-center bb-2 b-c-6 py-16 px-8">Статус</th>
+            <th class="t-center bb-2 b-c-6 py-16 px-8">Розташування</th>
             <th class="t-left pl-26 bb-2 b-c-6 py-16 px-8">IPv4</th>
             <th class="t-left bb-2 b-c-6 py-16 px-8">IPv6</th>
             <th class="t-left bb-2 b-c-6 py-16 px-8">Yggdrasil</th>
             <th class="t-center bb-2 b-c-6 py-16 px-8">Порт TCP</th>
             <th class="t-center bb-2 b-c-6 py-16 px-8">Порт UDP+TCP</th>
           </tr>
-          <tr>
-            <td class="t-left bb-2 b-c-6 py-16 px-8">Латвія</td>
+          <tr data-ipv4="94.140.114.241" data-ipv6="2a02:7aa0:4000::f2" data-yggdrasil="301:23b4:991a:634d::33">
+            <td class="t-center bb-2 b-c-6 py-16 px-8"><i class="bi-circle-fill mr-6 f-size-10 p-16 c-5"></i></td>
+            <td class="t-center bb-2 b-c-6 py-16 px-8">-</td>
             <td class="t-left pl-26 bb-2 b-c-6 p-8">94.140.114.241</td>
             <td class="t-left bb-2 b-c-6 p-8">2a02:7aa0:4000::f2</td>
-            <td class="t-left bb-2 b-c-6 p-8">201:23b4:991a:634d:8359:4521:5576:15b7</td>
+            <td class="t-left bb-2 b-c-6 p-8">301:23b4:991a:634d::33</td>
             <td class="t-center bb-2 b-c-6 p-8">28333</td>
             <td class="t-center bb-2 b-c-6 p-8">29333</td>
           </tr>
         </table>
       </div>
       <div class="t-center my-36">
-        <small>* ручне підключення до вузла без DNS</small>
+        <p><small>* ручне підключення до вузла без DNS</small></p>
+        <p><small>** підтримка IPv6 доступна в <a href="https://github.com/twisterarmy/twister-core" class="c-1">twister-core TA Edition</a></small></p>
       </div>
       <div class="t-center my-36">
         <a href="https://github.com/twisterarmy/twisterarmy.github.io/blob/main/uk/network.html" class="c-1">Додати вузол</a>