Merge pull request #37 from WCY-dt/fix

fix: Fix bugs in regex and text transmission
WCY-dt · Dec 13, 2024 · 60166db · 60166db
2 parents 297a1d5 + fb2cd88
commit 60166db
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 15 deletions.
diff --git a/client/src/components/ReceiveItem.vue b/client/src/components/ReceiveItem.vue
@@ -29,12 +29,7 @@ function onTextClick(): void {
 function isLinkMessage(text: string): boolean {
   if (props.type === 'TRANSFER_TYPE_TEXT') {
     const urlPattern = new RegExp(
-      '^(https?:\\/\\/)?' + // protocol
-        '((([a-z\\d]([a-z\\d-]*[a-z\\d])*)\\.?)+[a-z]{2,}|' + // domain name
-        '((\\d{1,3}\\.){3}\\d{1,3}))' + // OR ip (v4) address
-        '(\\:\\d+)?(\\/[-a-z\\d%_.~+]*)*' + // port and path
-        '(\\?[;&a-z\\d%_.~+=-]*)?' + // query string
-        '(\\#[-a-z\\d_]*)?$',
+      '^(?!mailto:)(?:(?:http|https|ftp)://)(?:\\S+(?::\\S*)?@)?(?:(?:(?:[1-9]\\d?|1\\d\\d|2[01]\\d|22[0-3])(?:\\.(?:1?\\d{1,2}|2[0-4]\\d|25[0-5])){2}(?:\\.(?:[0-9]\\d?|1\\d\\d|2[0-4]\\d|25[0-4]))|(?:(?:[a-z\\u00a1-\\uffff0-9]+-?)*[a-z\\u00a1-\\uffff0-9]+)(?:\\.(?:[a-z\\u00a1-\\uffff0-9]+-?)*[a-z\\u00a1-\\uffff0-9]+)*(?:\\.(?:[a-z\\u00a1-\\uffff]{2,})))|localhost)(?::\\d{2,5})?(?:(/|\\?|#)[^\\s]*)?$',
       'i', // fragment locator
     )
     return !!urlPattern.test(text)

diff --git a/client/src/components/SendItem.vue b/client/src/components/SendItem.vue
@@ -29,12 +29,7 @@ function onTextClick(): void {
 function isLinkMessage(text: string): boolean {
   if (props.type === 'TRANSFER_TYPE_TEXT') {
     const urlPattern = new RegExp(
-      '^(https?:\\/\\/)?' + // protocol
-        '((([a-z\\d]([a-z\\d-]*[a-z\\d])*)\\.?)+[a-z]{2,}|' + // domain name
-        '((\\d{1,3}\\.){3}\\d{1,3}))' + // OR ip (v4) address
-        '(\\:\\d+)?(\\/[-a-z\\d%_.~+]*)*' + // port and path
-        '(\\?[;&a-z\\d%_.~+=-]*)?' + // query string
-        '(\\#[-a-z\\d_]*)?$',
+      '^(?!mailto:)(?:(?:http|https|ftp)://)(?:\\S+(?::\\S*)?@)?(?:(?:(?:[1-9]\\d?|1\\d\\d|2[01]\\d|22[0-3])(?:\\.(?:1?\\d{1,2}|2[0-4]\\d|25[0-5])){2}(?:\\.(?:[0-9]\\d?|1\\d\\d|2[0-4]\\d|25[0-4]))|(?:(?:[a-z\\u00a1-\\uffff0-9]+-?)*[a-z\\u00a1-\\uffff0-9]+)(?:\\.(?:[a-z\\u00a1-\\uffff0-9]+-?)*[a-z\\u00a1-\\uffff0-9]+)*(?:\\.(?:[a-z\\u00a1-\\uffff]{2,})))|localhost)(?::\\d{2,5})?(?:(/|\\?|#)[^\\s]*)?$',
       'i', // fragment locator
     )
     return !!urlPattern.test(text)

diff --git a/client/src/stores/send.ts b/client/src/stores/send.ts
@@ -233,9 +233,9 @@ export const useSendStore = defineStore('send', () => {
   async function sendTextContent(text: string) {
     if (!checkSendTextAvailability(text)) return
 
-    await sendData('CONTENT_META' + 'TRANSFER_TYPE_TEXT', true)
-    await sendData('CONTENT_META' + text, true)
-    await sendData('CONTENT_META' + text.length, true)
+    await sendData('CONTENT_METAt' + 'TRANSFER_TYPE_TEXT', true)
+    await sendData('CONTENT_METAn' + text, true)
+    await sendData('CONTENT_METAs' + text.length, true)
 
     addUploadFileItem(
       'javascript:void(0)',