fix: IPv6 URL should has []

PBH-BTN · Jan 20, 2025 · 2fc1691 · 2fc1691
1 parent 439c989
commit 2fc1691
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 7 deletions.
diff --git a/webui/pnpm-lock.yaml b/webui/pnpm-lock.yaml
diff --git a/webui/src/utils/string.ts b/webui/src/utils/string.ts
@@ -1,3 +1,4 @@
+import { isIPv6 } from 'is-ip'
 export function hashString(str: string) {
   let hash = 0,
     i,
@@ -10,3 +11,6 @@ export function hashString(str: string) {
   }
   return hash
 }
+
+export const formatIPAddressPort = (address: string, port: number) =>
+  isIPv6(address) ? `[${address}]:${port}` : `${address}:${port}`
diff --git a/webui/src/views/dashboard/components/peerListModal.vue b/webui/src/views/dashboard/components/peerListModal.vue
@@ -22,7 +22,7 @@
           <countryFlag v-if="record.geo?.country?.iso" :iso="record.geo.country.iso" />
           <a-typography-text copyable code style="white-space: nowrap">
             <queryIpLink :ip="record.peer.address.ip" style="color: var(--color-text-2)">
-              {{ record.peer.address.ip }}:{{ record.peer.address.port }}
+              {{ formatIPAddressPort(record.peer.address.ip, record.peer.address.port) }}
             </queryIpLink>
           </a-typography-text>
         </a-space>
@@ -84,6 +84,7 @@ import countryFlag from '@/components/countryFlag.vue'
 import queryIpLink from '@/components/queryIpLink.vue'
 import { getPeer } from '@/service/downloaders'
 import { formatFileSize } from '@/utils/file'
+import { formatIPAddressPort } from '@/utils/string'
 import { ref } from 'vue'
 import { useI18n } from 'vue-i18n'
 import { useRequest } from 'vue-request'

diff --git a/webui/src/views/data-view/banlog/components/banlogTable.vue b/webui/src/views/data-view/banlog/components/banlogTable.vue
@@ -32,7 +32,7 @@
     <template #peerAddress="{ record }">
       <a-typography-text copyable code>
         <queryIpLink :ip="record.peerIp" style="color: var(--color-text-2)">
-          {{ record.peerIp }}:{{ record.peerPort }}
+          {{ formatIPAddressPort(record.peerIp, record.peerPort) }}
         </queryIpLink>
       </a-typography-text>
     </template>
@@ -79,6 +79,7 @@ import { useAutoUpdatePlugin } from '@/stores/autoUpdate'
 import { useEndpointStore } from '@/stores/endpoint'
 import { formatFileSize } from '@/utils/file'
 import { computed, ref, watch } from 'vue'
+import { formatIPAddressPort } from '@/utils/string'
 import { useI18n } from 'vue-i18n'
 import { usePagination } from 'vue-request'
 const forceLoading = ref(true)

diff --git a/webui/src/views/data-view/torrentList/components/banHistoryModal.vue b/webui/src/views/data-view/torrentList/components/banHistoryModal.vue
@@ -45,7 +45,7 @@
         <template #peerAddress="{ record }">
           <a-typography-text code>
             <queryIpLink :ip="record.peerIp" style="color: var(--color-text-2)">
-              {{ record.peerIp }}:{{ record.peerPort }}
+              {{ formatIPAddressPort(record.peerIp, record.peerPort) }}
             </queryIpLink>
           </a-typography-text>
         </template>
@@ -91,6 +91,8 @@ import { useEndpointStore } from '@/stores/endpoint'
 import { formatFileSize } from '@/utils/file'
 import { computed, ref } from 'vue'
 import { useI18n } from 'vue-i18n'
+import { formatIPAddressPort } from '@/utils/string'
+
 import { usePagination } from 'vue-request'
 
 const endpointState = useEndpointStore()