Fix parsing last online user (#47)

leonovk · Aug 3, 2024 · bdface0 · bdface0
1 parent 1103673
commit bdface0
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 15 deletions.
diff --git a/lib/wire_guard/stat_parser.rb b/lib/wire_guard/stat_parser.rb
@@ -40,7 +40,7 @@ def parse_wg_line(peer_data)
     end
 
     def build_latest_data(data)
-      data[-3..]&.join(' ')
+      data[2..]&.join(' ')
     end
 
     def build_traffic_data(data)

diff --git a/spec/app/clients_serializer_spec.rb b/spec/app/clients_serializer_spec.rb
@@ -143,7 +143,7 @@
           dns: '1.1.1.1',
           persistent_keepalive: 0,
           endpoint: '2.2.2.2:51820',
-          last_online: '13 seconds ago',
+          last_online: '1 minute, 13 seconds ago',
           traffic: {
             received: '62.44 MiB',
             sent: '3.21 GiB'

diff --git a/spec/fixtures/stat.txt b/spec/fixtures/stat.txt
@@ -7,7 +7,7 @@ peer: LiXk4UOfnScgf4UnkcYNcz4wWeqTOW1UrHKRVhZ1OXg=
 preshared key: (hidden)
 endpoint: 109.252.46.192:1382
 allowed ips: 10.8.0.26/32
-latest handshake: 25 seconds ago
+latest handshake: 2 hours, 10 minutes, 20 seconds ago
 transfer: 56.28 MiB received, 1.35 GiB sent
 
 peer: hvIyIW2o8JROVKuY2yYFdUn0oA+43aLuT8KCy0YbORE=

diff --git a/spec/lib/wire_guard/server_stat_spec.rb b/spec/lib/wire_guard/server_stat_spec.rb
@@ -19,7 +19,7 @@
       let(:expected_result) do
         {
           'LiXk4UOfnScgf4UnkcYNcz4wWeqTOW1UrHKRVhZ1OXg=' => {
-            last_online: '25 seconds ago',
+            last_online: '2 hours, 10 minutes, 20 seconds ago',
             traffic: {
               received: '56.28 MiB',
               sent: '1.35 GiB'
@@ -33,7 +33,7 @@
             }
           },
           'bPKBg66uC1J2hlkE31Of5wnkg+IjowVXgoLcjcLn0js=' => {
-            last_online: '13 seconds ago',
+            last_online: '1 minute, 13 seconds ago',
             traffic: {
               received: '62.44 MiB',
               sent: '3.21 GiB'
@@ -63,7 +63,7 @@
       let(:expected_result) do
         {
           'LiXk4UOfnScgf4UnkcYNcz4wWeqTOW1UrHKRVhZ1OXg=' => {
-            last_online: '25 seconds ago',
+            last_online: '2 hours, 10 minutes, 20 seconds ago',
             traffic: {
               received: '56.28 MiB',
               sent: '1.35 GiB'
@@ -77,7 +77,7 @@
             }
           },
           'bPKBg66uC1J2hlkE31Of5wnkg+IjowVXgoLcjcLn0js=' => {
-            last_online: '13 seconds ago',
+            last_online: '1 minute, 13 seconds ago',
             traffic: {
               received: '62.44 MiB',
               sent: '3.21 GiB'
@@ -108,7 +108,7 @@
             'LiXk4UOfnScgf4UnkcYNcz4wWeqTOW1UrHKRVhZ1OXg=' => {},
             'hvIyIW2o8JROVKuY2yYFdUn0oA+43aLuT8KCy0YbORE=' => {},
             'bPKBg66uC1J2hlkE31Of5wnkg+IjowVXgoLcjcLn0js=' => {
-              last_online: '13 seconds ago',
+              last_online: '1 minute, 13 seconds ago',
               traffic: {
                 received: '62.44 MiB',
                 sent: '3.21 GiB'
@@ -154,7 +154,7 @@
               }
             },
             'bPKBg66uC1J2hlkE31Of5wnkg+IjowVXgoLcjcLn0js=' => {
-              last_online: '13 seconds ago',
+              last_online: '1 minute, 13 seconds ago',
               traffic: {
                 received: '62.44 MiB',
                 sent: '3.21 GiB'
@@ -186,7 +186,7 @@
         let(:expected_result) do
           {
             'LiXk4UOfnScgf4UnkcYNcz4wWeqTOW1UrHKRVhZ1OXg=' => {
-              last_online: '25 seconds ago',
+              last_online: '2 hours, 10 minutes, 20 seconds ago',
               traffic: {
                 received: '56.28 MiB',
                 sent: '1.35 GiB'
@@ -200,7 +200,7 @@
               }
             },
             'bPKBg66uC1J2hlkE31Of5wnkg+IjowVXgoLcjcLn0js=' => {
-              last_online: '13 seconds ago',
+              last_online: '1 minute, 13 seconds ago',
               traffic: {
                 received: '62.44 MiB',
                 sent: '3.21 GiB'
@@ -236,7 +236,7 @@
             },
             'hvIyIW2o8JROVKuY2yYFdUn0oA+43aLuT8KCy0YbORE=' => {},
             'bPKBg66uC1J2hlkE31Of5wnkg+IjowVXgoLcjcLn0js=' => {
-              last_online: '13 seconds ago',
+              last_online: '1 minute, 13 seconds ago',
               traffic: {
                 received: '62.44 MiB',
                 sent: '3.21 GiB'

diff --git a/spec/lib/wire_guard/stat_parser_spec.rb b/spec/lib/wire_guard/stat_parser_spec.rb
@@ -12,7 +12,7 @@
     let(:expected_result) do
       {
         'LiXk4UOfnScgf4UnkcYNcz4wWeqTOW1UrHKRVhZ1OXg=' => {
-          last_online: '25 seconds ago',
+          last_online: '2 hours, 10 minutes, 20 seconds ago',
           traffic: {
             received: '56.28 MiB',
             sent: '1.35 GiB'
@@ -26,7 +26,7 @@
           }
         },
         'bPKBg66uC1J2hlkE31Of5wnkg+IjowVXgoLcjcLn0js=' => {
-          last_online: '13 seconds ago',
+          last_online: '1 minute, 13 seconds ago',
           traffic: {
             received: '62.44 MiB',
             sent: '3.21 GiB'
@@ -47,7 +47,7 @@
         'LiXk4UOfnScgf4UnkcYNcz4wWeqTOW1UrHKRVhZ1OXg=' => {},
         'hvIyIW2o8JROVKuY2yYFdUn0oA+43aLuT8KCy0YbORE=' => {},
         'bPKBg66uC1J2hlkE31Of5wnkg+IjowVXgoLcjcLn0js=' => {
-          last_online: '13 seconds ago',
+          last_online: '1 minute, 13 seconds ago',
           traffic: {
             received: '62.44 MiB',
             sent: '3.21 GiB'