fix(ignore): improve e9240da

Koenkk · Dec 5, 2024 · 5a29fda · 5a29fda
1 parent e9240da
commit 5a29fda
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 5 deletions.
diff --git a/src/adapter/adapterDiscovery.ts b/src/adapter/adapterDiscovery.ts
@@ -1,3 +1,4 @@
+import assert from 'assert';
 import {platform} from 'os';
 
 import {PortInfo} from '@serialport/bindings-cpp';
@@ -460,9 +461,10 @@ export async function findmDNSAdapter(path: string): Promise<[adapter: Adapter,
 }
 
 export async function findTCPAdapter(path: string, adapter?: Adapter): Promise<[adapter: Adapter, path: string]> {
-    const regex = /^(tcp|socket):\/\/.+:\d{1,5}$/gm;
-
-    if (!regex.test(path)) {
+    try {
+        const url = new URL(path);
+        assert(url.port !== '');
+    } catch {
         throw new Error(`Invalid TCP path, expected format: tcp://<host>:<port>`);
     }
 

diff --git a/test/adapter/adapter.test.ts b/test/adapter/adapter.test.ts
@@ -190,9 +190,9 @@ describe('Adapter', () => {
             });
         });
 
-        it('invalid path', async () => {
+        test.each([`tcp://192168.1.321`, `tcp://192168.1.321:INVALID`])('invalid path', async (path) => {
             expect(async () => {
-                await Adapter.create({panID: 0x1a62, channelList: [11]}, {path: `tcp://192168.1.321:INVALID`, adapter: `zstack`}, 'test.db.backup', {
+                await Adapter.create({panID: 0x1a62, channelList: [11]}, {path, adapter: `zstack`}, 'test.db.backup', {
                     disableLED: false,
                 });
             }).rejects.toThrow(`Invalid TCP path, expected format: tcp://<host>:<port>`);