Support the regular expression of port in merge rules (sheepzh#75)

Author: sheepzh

src/app/components/rule-merge/alert-info.ts

@@ -7,14 +7,20 @@
 
 import { ElAlert } from "element-plus"
 import { t } from "@app/locale"
-import { h } from "vue"
+import { defineComponent, h } from "vue"
 import { MergeRuleMessage } from "@app/locale/components/merge-rule"
 
 const liKeys: (keyof MergeRuleMessage)[] = ['infoAlert0', 'infoAlert1', 'infoAlert2', 'infoAlert3', 'infoAlert4', 'infoAlert5']
+const title = t(msg => msg.mergeRule.infoAlertTitle)
 
-const alertInfo = () => h(ElAlert,
-    { type: 'info', title: t(msg => msg.mergeRule.infoAlertTitle) },
-    () => liKeys.map(key => h('li', t(msg => msg.mergeRule[key])))
-)
+const _default = defineComponent({
+    name: "RuleMergeAlertInfo",
+    render() {
+        return h(ElAlert,
+            { type: 'info', title },
+            () => liKeys.map(key => h('li', t(msg => msg.mergeRule[key])))
+        )
+    }
+})
 
-export default alertInfo
+export default _default

src/app/components/rule-merge/index.ts

@@ -8,18 +8,18 @@
 import '../common/editable-tag'
 import { defineComponent } from "vue"
 import ContentContainer from "../common/content-container"
-import alertInfo from "./alert-info"
+import RuleMergeAlertInfo from "./alert-info"
 import itemList from "./item-list"
 import { ElCard } from "element-plus"
 import { h } from "vue"
 
 const _default = defineComponent({
     name: "RuleMerge",
     setup() {
-        return () => h(ContentContainer, {},
-            {
-                default: () => h(ElCard, {}, () => [alertInfo(), itemList()])
-            })
+        return () => h(ContentContainer, () => h(ElCard, () => [
+            h(RuleMergeAlertInfo),
+            itemList()
+        ]))
     }
 })
 

src/util/pattern.ts

@@ -5,7 +5,6 @@
  * https://opensource.org/licenses/MIT
  */
 
-import { IS_CHROME, IS_EDGE } from "./constant/environment"
 import { SUFFIX_HOST_MAP } from "./constant/remain-host"
 
 /**
@@ -54,7 +53,7 @@ export function isValidHost(host: string) {
     const indexOfColon = host.indexOf(':')
     if (indexOfColon > -1) {
         const portStr = host.substring(indexOfColon + 1)
-        if (isNotValidPort(portStr)) {
+        if (portStr !== '*' && isNotValidPort(portStr)) {
             return false
         }
         host = host.substring(0, indexOfColon)

test/util/pattern.test.ts

@@ -21,11 +21,14 @@ test('ip and port', () => {
     expect(isIpAndPort('222.222.22.2:65535')).toBeTruthy()
     // 65536 is invalid port
     expect(isIpAndPort('222.222.22.2:65536')).toBeFalsy()
+    // Regular expression is not valid
+    expect(isIpAndPort('222.222.22.2:*')).toBeFalsy()
 })
 
 test('merge host origin', () => {
     expect(isValidHost('wwdad.basd.com.111:12345')).toBeTruthy()
     expect(isValidHost('wwdad.basd.com.a111a:12345')).toBeTruthy()
+    expect(isValidHost('wwdad.basd.com.a111a:*')).toBeTruthy()
     expect(isValidHost('wwdad.basd.**:12345')).toBeFalsy()
     expect(isValidHost('wwdad.basd.**:65536')).toBeFalsy()
     expect(isValidHost('wwdad.basd.*.*')).toBeTruthy()