@nordicsemiconductor/pc-nrfconnect-shared 185.0.0 → 186.0.0

package/Changelog.md

@@ -7,6 +7,17 @@ This project does _not_ adhere to
 [Semantic Versioning](https://semver.org/spec/v2.0.0.html) but contrary to it
 every new version is a new major version.
 
+## 186.0.0 - 2024-10-03
+
+### Changed
+
+-   DeviceSelector Abort controler now aborts on the onDisconnected event
+
+### Fixed
+
+-   Auto connecting from CLI when multple devices are connected now works as
+    expected.
+
 ## 185.0.0 - 2024-09-20
 
 ### Added

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@nordicsemiconductor/pc-nrfconnect-shared",
-    "version": "185.0.0",
+    "version": "186.0.0",
     "description": "Shared commodities for developing pc-nrfconnect-* packages",
     "repository": {
         "type": "git",

package/src/Device/DeviceSelector/DeviceSelector.tsx

@@ -72,8 +72,11 @@ export default ({
     const waitingToAutoReconnect = useSelector(getWaitingToAutoReselect);
     const showSelectedDevice = deviceIsSelected || waitingToAutoReconnect;
 
+    const abortController = useRef<AbortController>();
+
     const doDeselectDevice = useCallback(
         (device?: Device) => {
+            abortController.current?.abort();
             if (device) {
                 telemetry.sendEvent(
                     'device deselected ',
@@ -83,21 +86,21 @@ export default ({
 
             dispatch(clearWaitForDevice());
             dispatch(setAutoSelectDevice(undefined));
-            logger.info(`Device deselected`);
+            logger.info(`Deselected device`);
             onDeviceDeselected();
             dispatch(deselectDevice());
         },
         [dispatch, onDeviceDeselected]
     );
 
-    const abortController = useRef<AbortController>();
-
     // Ensure that useCallback is
     // not updated frequently as this
     // will have a side effect to stop and start the hotplug events
     const doSelectDevice = useCallback(
         async (device: Device, autoReselected: boolean) => {
-            logger.info(`Selecting device SN: ${device.serialNumber}`);
+            logger.info(
+                `Selecting device with the serial number ${device.serialNumber}`
+            );
             abortController.current?.abort();
             const controller = new AbortController();
             abortController.current = controller;
@@ -126,7 +129,9 @@ export default ({
 
             if (!controller.signal.aborted) {
                 dispatch(setSelectedDeviceInfo(deviceInfo));
-                logger.info(`Selected device SN: ${device.serialNumber}`);
+                logger.info(
+                    `Selected device with the serial number ${device.serialNumber}`
+                );
                 onDeviceSelected(device, autoReselected, controller);
 
                 telemetry.sendEvent('device selected', {

package/src/Device/deviceLister.ts

@@ -405,7 +405,7 @@ export const startWatchingDevices =
                 deviceListing,
                 d => {
                     d.forEach(onDeviceArrived);
-                    dispatch(autoSelectDeviceCLI(doSelectDevice));
+                    autoSelectDeviceCLI(d, doSelectDevice);
                 },
                 error => {
                     logger.error(error);
@@ -459,21 +459,18 @@ const getAutoSelectDevice = (devices: Device[]) => {
     }
 };
 
-const autoSelectDeviceCLI =
-    (
-        doSelectDevice: (device: Device, autoReselected: boolean) => void
-    ): AppThunk<RootState> =>
-    (_, getState) => {
-        if (!autoSelectDeviceCLISerialUsed) {
-            const autoSelectDevice = getAutoSelectDevice(
-                getState().device.devices
-            );
+const autoSelectDeviceCLI = (
+    devices: Device[],
+    doSelectDevice: (device: Device, autoReselected: boolean) => void
+) => {
+    if (!autoSelectDeviceCLISerialUsed) {
+        const autoSelectDevice = getAutoSelectDevice(devices);
 
-            if (autoSelectDevice) doSelectDevice(autoSelectDevice, true);
+        if (autoSelectDevice) doSelectDevice(autoSelectDevice, true);
 
-            autoSelectDeviceCLISerialUsed = true;
-        }
-    };
+        autoSelectDeviceCLISerialUsed = true;
+    }
+};
 
 export const stopWatchingDevices = (callback?: () => void) => {
     if (stopNrfutilDevice) stopNrfutilDevice(callback);

package/typings/generated/src/Device/DeviceSelector/DeviceSelector.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"DeviceSelector.d.ts","sourceRoot":"","sources":["../../../../../src/Device/DeviceSelector/DeviceSelector.tsx"],"names":[],"mappings":";AAUA,OAAO,EAAE,YAAY,EAAE,MAAM,gCAAgC,CAAC;AAe9D,OAAO,EAAE,iBAAiB,EAAe,MAAM,gBAAgB,CAAC;AAEhE,OAAO,EAEH,MAAM,EAMT,MAAM,gBAAgB,CAAC;AAKxB,MAAM,WAAW,KAAK;IAClB,aAAa,EAAE,YAAY,CAAC;IAC5B,iBAAiB,CAAC,EAAE,iBAAiB,CAAC;IACtC,gBAAgB,CAAC,EAAE,CACf,MAAM,EAAE,MAAM,EACd,cAAc,EAAE,OAAO,EACvB,eAAe,EAAE,eAAe,KAC/B,IAAI,CAAC;IACV,kBAAkB,CAAC,EAAE,MAAM,IAAI,CAAC;IAChC,iBAAiB,CAAC,EAAE,CAAC,MAAM,EAAE,MAAM,KAAK,IAAI,CAAC;IAC7C,oBAAoB,CAAC,EAAE,CAAC,MAAM,EAAE,MAAM,KAAK,IAAI,CAAC;IAChD,eAAe,CAAC,EAAE,CAAC,MAAM,EAAE,MAAM,KAAK,IAAI,CAAC;IAC3C,YAAY,CAAC,EAAE,CAAC,MAAM,EAAE,MAAM,KAAK,OAAO,CAAC;CAC9C;8KAYE,KAAK;AATR,wBA+KE"}
+{"version":3,"file":"DeviceSelector.d.ts","sourceRoot":"","sources":["../../../../../src/Device/DeviceSelector/DeviceSelector.tsx"],"names":[],"mappings":";AAUA,OAAO,EAAE,YAAY,EAAE,MAAM,gCAAgC,CAAC;AAe9D,OAAO,EAAE,iBAAiB,EAAe,MAAM,gBAAgB,CAAC;AAEhE,OAAO,EAEH,MAAM,EAMT,MAAM,gBAAgB,CAAC;AAKxB,MAAM,WAAW,KAAK;IAClB,aAAa,EAAE,YAAY,CAAC;IAC5B,iBAAiB,CAAC,EAAE,iBAAiB,CAAC;IACtC,gBAAgB,CAAC,EAAE,CACf,MAAM,EAAE,MAAM,EACd,cAAc,EAAE,OAAO,EACvB,eAAe,EAAE,eAAe,KAC/B,IAAI,CAAC;IACV,kBAAkB,CAAC,EAAE,MAAM,IAAI,CAAC;IAChC,iBAAiB,CAAC,EAAE,CAAC,MAAM,EAAE,MAAM,KAAK,IAAI,CAAC;IAC7C,oBAAoB,CAAC,EAAE,CAAC,MAAM,EAAE,MAAM,KAAK,IAAI,CAAC;IAChD,eAAe,CAAC,EAAE,CAAC,MAAM,EAAE,MAAM,KAAK,IAAI,CAAC;IAC3C,YAAY,CAAC,EAAE,CAAC,MAAM,EAAE,MAAM,KAAK,OAAO,CAAC;CAC9C;8KAYE,KAAK;AATR,wBAoLE"}

package/typings/generated/src/Device/deviceLister.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"deviceLister.d.ts","sourceRoot":"","sources":["../../../../src/Device/deviceLister.ts"],"names":[],"mappings":"AAMA,OAAO,EAAE,UAAU,EAAE,MAAM,sBAAsB,CAAC;AAClD,OAAO,EAAE,YAAY,EAAiB,MAAM,6BAA6B,CAAC;AAG1E,OAAO,KAAK,EAAE,QAAQ,EAAE,SAAS,EAAE,MAAM,UAAU,CAAC;AAcpD,OAAO,EAEH,MAAM,EAIT,MAAM,eAAe,CAAC;AAsDvB,eAAO,MAAM,QAAQ,WAAY,MAAM,eAAe,UAAU,YAI3D,CAAC;AA8BN,eAAO,MAAM,oBAAoB,iBACf,YAAY,kBACV,YAAY,YAS3B,CAAC;AAkCN,eAAO,MAAM,oBAAoB,kBAEV,YAAY,8BACC,MAAM,KAAK,IAAI,iCACZ,MAAM,KAAK,IAAI,sBAC1B,MAAM,IAAI,2BACL,MAAM,kBAAkB,OAAO,KAAK,IAAI,KAClE,SAAS,SAAS,EAAE,IAAI,CA2P1B,CAAC;AAwDN,eAAO,MAAM,mBAAmB,cAAe,MAAM,IAAI,SAGxD,CAAC"}
+{"version":3,"file":"deviceLister.d.ts","sourceRoot":"","sources":["../../../../src/Device/deviceLister.ts"],"names":[],"mappings":"AAMA,OAAO,EAAE,UAAU,EAAE,MAAM,sBAAsB,CAAC;AAClD,OAAO,EAAE,YAAY,EAAiB,MAAM,6BAA6B,CAAC;AAG1E,OAAO,KAAK,EAAE,QAAQ,EAAE,SAAS,EAAE,MAAM,UAAU,CAAC;AAcpD,OAAO,EAEH,MAAM,EAIT,MAAM,eAAe,CAAC;AAsDvB,eAAO,MAAM,QAAQ,WAAY,MAAM,eAAe,UAAU,YAI3D,CAAC;AA8BN,eAAO,MAAM,oBAAoB,iBACf,YAAY,kBACV,YAAY,YAS3B,CAAC;AAkCN,eAAO,MAAM,oBAAoB,kBAEV,YAAY,8BACC,MAAM,KAAK,IAAI,iCACZ,MAAM,KAAK,IAAI,sBAC1B,MAAM,IAAI,2BACL,MAAM,kBAAkB,OAAO,KAAK,IAAI,KAClE,SAAS,SAAS,EAAE,IAAI,CA2P1B,CAAC;AAqDN,eAAO,MAAM,mBAAmB,cAAe,MAAM,IAAI,SAGxD,CAAC"}