Optional properties.

Fixed the enhanced port address.

Signed-off-by: Akos Kitta <[email protected]>

Author: Akos Kitta

arduino-ide-extension/src/common/protocol/boards-service.ts

@@ -151,15 +151,11 @@ export interface BoardsService
 }
 
 export interface Port {
-  // id is the combination of address and protocol
-  // formatted like "<address>|<protocol>" used
-  // to uniquely recognize a port
-  // readonly id: string;
   readonly address: string;
   readonly addressLabel: string;
   readonly protocol: string;
   readonly protocolLabel: string;
-  readonly properties: Record<string, string>;
+  readonly properties?: Record<string, string>;
 }
 export namespace Port {
   export type Properties = Record<string, string>;

arduino-ide-extension/src/node/board-discovery.ts

@@ -393,16 +393,18 @@ const PortAddressEnhancers = [enhanceESP32_S2];
 function enhanceESP32_S2(detectedPort: DetectedPort): DetectedPort | undefined {
   if (DetectedPort.isUnrecognizedNetwork(detectedPort)) {
     const { properties } = detectedPort.port;
-    const board = properties['board']; // This is just a cheap hack. See https://github.com/arduino/arduino-ide/issues/567#issuecomment-1219494389
-    if (board) {
-      const { boards, port } = detectedPort;
-      return {
-        boards,
-        port: {
-          ...port,
-          address: `${port.address} at ${board}`,
-        },
-      };
+    if (properties) {
+      const board = properties['board']; // This is just a cheap hack. See https://github.com/arduino/arduino-ide/issues/567#issuecomment-1219494389
+      if (board) {
+        const { boards, port } = detectedPort;
+        return {
+          boards,
+          port: {
+            ...port,
+            address: `${board} at ${port.address}`,
+          },
+        };
+      }
     }
   }
   return undefined;

arduino-ide-extension/src/test/browser/fixtures/boards.ts

@@ -9,15 +9,13 @@ export const aBoard: Board = {
     addressLabel: '/lol/port1234',
     protocol: 'serial',
     protocolLabel: 'Serial Port (USB)',
-    properties: {},
   },
 };
 export const aPort: Port = {
   address: aBoard.port!.address,
   addressLabel: aBoard.port!.addressLabel,
   protocol: aBoard.port!.protocol,
   protocolLabel: aBoard.port!.protocolLabel,
-  properties: {},
 };
 export const aBoardConfig: BoardsConfig.Config = {
   selectedBoard: aBoard,
@@ -31,15 +29,13 @@ export const anotherBoard: Board = {
     addressLabel: '/kek/port5678',
     protocol: 'serial',
     protocolLabel: 'Serial Port (USB)',
-    properties: {},
   },
 };
 export const anotherPort: Port = {
   address: anotherBoard.port!.address,
   addressLabel: anotherBoard.port!.addressLabel,
   protocol: anotherBoard.port!.protocol,
   protocolLabel: anotherBoard.port!.protocolLabel,
-  properties: {},
 };
 export const anotherBoardConfig: BoardsConfig.Config = {
   selectedBoard: anotherBoard,