@nordicsemiconductor/pc-nrfconnect-shared 185.0.0 → 187.0.0

package/Changelog.md

@@ -7,6 +7,23 @@ 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.
 
+## 187.0.0 - 2024-10-04
+
+### Fixed
+
+-   Auto connecting from CLI for device that has persisted data.
+
+## 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": "187.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

@@ -11,6 +11,11 @@ import logger from '../logging';
 import type { AppThunk, RootState } from '../store';
 import simplifyDevice from '../telemetry/simplifyDevice';
 import telemetry from '../telemetry/telemetry';
+import {
+    getPersistedIsFavorite,
+    getPersistedNickname,
+    getPersistedSerialPortSettings,
+} from '../utils/persistentStore';
 import {
     clearWaitForDevice,
     clearWaitForDeviceTimeout,
@@ -161,6 +166,36 @@ const removeDeviceFromList =
  * library for available traits. Whenever devices are attached/detached, this
  * will dispatch AddDevice or removeDevice and trigger events.
  */
+
+const setPersistedData = (device: Device) => {
+    if (device.serialNumber) {
+        const newDevice = { ...device };
+        newDevice.favorite = getPersistedIsFavorite(device.serialNumber);
+        newDevice.nickname = getPersistedNickname(device.serialNumber);
+
+        const persistedSerialPortSettings = getPersistedSerialPortSettings(
+            device.serialNumber
+        );
+
+        if (persistedSerialPortSettings) {
+            const path =
+                newDevice.serialPorts?.[persistedSerialPortSettings.vComIndex]
+                    ?.comName;
+
+            if (path) {
+                newDevice.persistedSerialPortOptions = {
+                    ...persistedSerialPortSettings.serialPortOptions,
+                    path,
+                };
+            }
+        }
+
+        return newDevice;
+    }
+
+    return device;
+};
+
 export const startWatchingDevices =
     (
         deviceListing: DeviceTraits,
@@ -404,13 +439,20 @@ export const startWatchingDevices =
             const operation = await NrfutilDeviceLib.list(
                 deviceListing,
                 d => {
+                    d = d.map(setPersistedData);
                     d.forEach(onDeviceArrived);
-                    dispatch(autoSelectDeviceCLI(doSelectDevice));
+                    autoSelectDeviceCLI(d, doSelectDevice);
                 },
                 error => {
                     logger.error(error);
                 },
-                { onDeviceArrived, onDeviceLeft }
+                {
+                    onDeviceArrived: d => {
+                        d = setPersistedData(d);
+                        onDeviceArrived(d);
+                    },
+                    onDeviceLeft,
+                }
             );
 
             stopNrfutilDevice = (callback?: () => void) => {
@@ -459,21 +501,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/src/Device/deviceSlice.ts

@@ -12,9 +12,6 @@ import { DeviceInfo } from '../../nrfutil/device';
 import { NrfutilDevice } from '../../nrfutil/device/common';
 import type { RootState } from '../store';
 import {
-    getPersistedIsFavorite,
-    getPersistedNickname,
-    getPersistedSerialPortSettings,
     persistIsFavorite,
     persistNickname,
     persistSerialPortSettings as persistSerialPortSettingsToStore,
@@ -69,35 +66,6 @@ const initialState: DeviceState = {
     devices: [],
 };
 
-const setPersistedData = (device: Device) => {
-    if (device.serialNumber) {
-        const newDevice = { ...device };
-        newDevice.favorite = getPersistedIsFavorite(device.serialNumber);
-        newDevice.nickname = getPersistedNickname(device.serialNumber);
-
-        const persistedSerialPortSettings = getPersistedSerialPortSettings(
-            device.serialNumber
-        );
-
-        if (persistedSerialPortSettings) {
-            const path =
-                newDevice.serialPorts?.[persistedSerialPortSettings.vComIndex]
-                    ?.comName;
-
-            if (path) {
-                newDevice.persistedSerialPortOptions = {
-                    ...persistedSerialPortSettings.serialPortOptions,
-                    path,
-                };
-            }
-        }
-
-        return newDevice;
-    }
-
-    return device;
-};
-
 const slice = createSlice({
     name: 'device',
     initialState,
@@ -130,12 +98,10 @@ const slice = createSlice({
                     item.serialNumber === action.payload.serialNumber ||
                     item.id === action.payload.id
             );
-
-            const device = setPersistedData(action.payload);
             if (index !== -1) {
-                state.devices[index] = device;
+                state.devices[index] = action.payload;
             } else {
-                state.devices.push(device);
+                state.devices.push(action.payload);
             }
         },
 

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;AAmBpD,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;AAgEN,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,CAkQ1B,CAAC;AAqDN,eAAO,MAAM,mBAAmB,cAAe,MAAM,IAAI,SAGxD,CAAC"}

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

@@ -1 +1 @@
-{"version":3,"file":"deviceSlice.d.ts","sourceRoot":"","sources":["../../../../src/Device/deviceSlice.ts"],"names":[],"mappings":"AAOA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,0BAA0B,CAAC;AAChE,OAAO,EAAE,qBAAqB,EAAE,MAAM,YAAY,CAAC;AAEnD,OAAO,EAAE,UAAU,EAAE,MAAM,sBAAsB,CAAC;AAClD,OAAO,EAAE,aAAa,EAAE,MAAM,6BAA6B,CAAC;AAC5D,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,UAAU,CAAC;AAU1C,MAAM,WAAW,MAAO,SAAQ,aAAa;IACzC,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,0BAA0B,CAAC,EAAE,qBAAqB,CAAC,eAAe,CAAC,CAAC;CACvE;AAED,MAAM,WAAW,sBAAuB,SAAQ,MAAM;IAClD,YAAY,EAAE,MAAM,CAAC;CACxB;AAED,eAAO,MAAM,wBAAwB,WACzB,MAAM,qCAEmC,CAAC;AA0BtD,MAAM,WAAW,WAAW;IACxB,OAAO,EAAE,MAAM,EAAE,CAAC;IAClB,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,kBAAkB,CAAC,EAAE,UAAU,CAAC;CACnC;AAsMD,eAAO,MACH,OAAO,mEAEH,cAAc,mFACd,mBAAmB,6FACnB,YAAY,sFACZ,qBAAqB,uHACrB,SAAS,mFACT,YAAY,sFACZ,iBAAiB;;;8CACjB,qBAAqB,+FACrB,wBAAwB,gIAEvB,CAAC;AAEV,eAAO,MAAM,SAAS,UAAW,SAAS,gBAAgB,MAAM,uBACG,CAAC;AAEpE,eAAO,MAAM,UAAU,UAAW,SAAS,aAAyB,CAAC;AAErE,eAAO,MAAM,gBAAgB,UAAW,SAAS,YAChB,CAAC;AAElC,eAAO,MAAM,cAAc,UAAW,SAAS,uBAAgC,CAAC;AAEhF,eAAO,MAAM,kBAAkB,UAAW,SAAS,2BAC0B,CAAC;AAE9E,eAAO,MAAM,oBAAoB,UAAW,SAAS,8BACR,CAAC;AAE9C,eAAO,MAAM,qBAAqB,UAAW,SAAS,gEACM,CAAC"}
+{"version":3,"file":"deviceSlice.d.ts","sourceRoot":"","sources":["../../../../src/Device/deviceSlice.ts"],"names":[],"mappings":"AAOA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,0BAA0B,CAAC;AAChE,OAAO,EAAE,qBAAqB,EAAE,MAAM,YAAY,CAAC;AAEnD,OAAO,EAAE,UAAU,EAAE,MAAM,sBAAsB,CAAC;AAClD,OAAO,EAAE,aAAa,EAAE,MAAM,6BAA6B,CAAC;AAC5D,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,UAAU,CAAC;AAO1C,MAAM,WAAW,MAAO,SAAQ,aAAa;IACzC,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,0BAA0B,CAAC,EAAE,qBAAqB,CAAC,eAAe,CAAC,CAAC;CACvE;AAED,MAAM,WAAW,sBAAuB,SAAQ,MAAM;IAClD,YAAY,EAAE,MAAM,CAAC;CACxB;AAED,eAAO,MAAM,wBAAwB,WACzB,MAAM,qCAEmC,CAAC;AA0BtD,MAAM,WAAW,WAAW;IACxB,OAAO,EAAE,MAAM,EAAE,CAAC;IAClB,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,kBAAkB,CAAC,EAAE,UAAU,CAAC;CACnC;AAuKD,eAAO,MACH,OAAO,mEAEH,cAAc,mFACd,mBAAmB,6FACnB,YAAY,sFACZ,qBAAqB,uHACrB,SAAS,mFACT,YAAY,sFACZ,iBAAiB;;;8CACjB,qBAAqB,+FACrB,wBAAwB,gIAEvB,CAAC;AAEV,eAAO,MAAM,SAAS,UAAW,SAAS,gBAAgB,MAAM,uBACG,CAAC;AAEpE,eAAO,MAAM,UAAU,UAAW,SAAS,aAAyB,CAAC;AAErE,eAAO,MAAM,gBAAgB,UAAW,SAAS,YAChB,CAAC;AAElC,eAAO,MAAM,cAAc,UAAW,SAAS,uBAAgC,CAAC;AAEhF,eAAO,MAAM,kBAAkB,UAAW,SAAS,2BAC0B,CAAC;AAE9E,eAAO,MAAM,oBAAoB,UAAW,SAAS,8BACR,CAAC;AAE9C,eAAO,MAAM,qBAAqB,UAAW,SAAS,gEACM,CAAC"}