Add ability to include port with IP address.

It is common to be able to specify a non-default port along with an
IP address by using `addr:port` notation. This is useful in cases where
port forwarding is needed.

Fixes: #108

Author: dlech

CHANGELOG.md

@@ -8,6 +8,7 @@ All notable changes to the "ev3dev-browser" extension will be documented in this
 ### Fixed
 - Fixed Windows path separator in "program" in `.vscode/launch.json` not converted to UNIX path.
 - Fixed running files with `#!` and Windows line endings (CRLF vs. LF).
+- Fixed no way to specify port for user-specified IP address.
 
 ## v1.2.0 - 2020-07-20
 ### Changed

package.json

@@ -108,7 +108,7 @@
                             },
                             "ipAddress": {
                                 "type": "string",
-                                "pattern": "\\d{1,3}\\.\\d{1,3}\\.\\d{1,3}\\.\\d{1,3}"
+                                "pattern": "\\d{1,3}\\.\\d{1,3}\\.\\d{1,3}\\.\\d{1,3}(:\\d{1,5})?"
                             },
                             "username": {
                                 "type": "string",
@@ -452,4 +452,4 @@
         "vscode-debugadapter": "^1.37.1",
         "zen-observable": "^0.5.2"
     }
-}
+}

src/device.ts

@@ -515,11 +515,15 @@ export class Device extends vscode.Disposable {
         const txt: dnssd.TxtRecords = {};
         txt['ev3dev.robot.user'] = device.username || 'robot';
         txt['ev3dev.robot.home'] = device.homeDirectory || `/home/${txt['ev3dev.robot.user']}`;
+
+        // device.ipAddress is validated, so this is safe
+        const [address, port] = device.ipAddress.split(':');
+
         return <dnssd.Service>{
             name: device.name,
-            address: device.ipAddress,
+            address,
             ipv: 'IPv4',
-            port: 22,
+            port: Number(port) || 22,
             service: 'sftp-ssh',
             transport: 'tcp',
             txt: txt
@@ -643,7 +647,7 @@ export class Device extends vscode.Disposable {
                 prompt: "Enter the IP address of the device",
                 placeHolder: 'Example: "192.168.137.3"',
                 validateInput: (v) => {
-                    if (!/^\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}$/.test(v)) {
+                    if (!/^\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}(:\d{1,5})?$/.test(v)) {
                         return 'Not a valid IP address';
                     }
                     return undefined;