@nordicsemiconductor/pc-nrfconnect-shared 89.0.0 → 91.0.0

package/scripts/nordic-publish.ts

@@ -378,8 +378,16 @@ const failBecauseOfMissingProperty = () => {
 const getUpdatedAppInfo = async (app: App): Promise<AppInfo> => {
     const versions = await downloadExistingVersions(app);
 
-    const { name, displayName, description, homepage, version } =
-        app.packageJson;
+    const {
+        name,
+        displayName,
+        description,
+        homepage,
+        version,
+        nrfConnectForDesktop,
+    } = app.packageJson;
+
+    const nrfutilModules = nrfConnectForDesktop?.nrfutil;
 
     return {
         name,
@@ -394,6 +402,7 @@ const getUpdatedAppInfo = async (app: App): Promise<AppInfo> => {
             [version]: {
                 tarballUrl: `${app.sourceUrl}/${app.filename}`,
                 shasum: app.shasum,
+                nrfutilModules,
             },
         },
     };

package/src/About/SupportCard.tsx

@@ -8,18 +8,15 @@ import React from 'react';
 import { useDispatch, useSelector } from 'react-redux';
 import { getCurrentWindow } from '@electron/remote';
 
+import NrfutilDeviceLib from '../../nrfutil/device/device';
 import Button from '../Button/Button';
 import Card from '../Card/Card';
-import { setVerboseDeviceLibLogging } from '../Device/deviceLibWrapper';
 import {
     deviceInfo,
     getDevices,
     selectedSerialNumber,
 } from '../Device/deviceSlice';
-import {
-    isLoggingVerboseSelector,
-    toggleIsLoggingVerbose,
-} from '../Log/logSlice';
+import { isLoggingVerbose, setIsLoggingVerbose } from '../Log/logSlice';
 import { Toggle } from '../Toggle/Toggle';
 import { persistIsLoggingVerbose } from '../utils/persistentStore';
 import systemReport from '../utils/systemReport';
@@ -30,7 +27,7 @@ export default () => {
     const dispatch = useDispatch();
     const devices = useSelector(getDevices);
     const currentSerialNumber = useSelector(selectedSerialNumber);
-    const verboseLogging = useSelector(isLoggingVerboseSelector);
+    const verboseLogging = useSelector(isLoggingVerbose);
     const currentDevice = useSelector(deviceInfo);
 
     return (
@@ -74,9 +71,9 @@ export default () => {
                         <Toggle
                             id="enableVerboseLoggin"
                             label="VERBOSE LOGGING"
-                            onToggle={() => {
-                                setVerboseDeviceLibLogging(!verboseLogging);
-                                dispatch(toggleIsLoggingVerbose());
+                            onToggle={isToggled => {
+                                NrfutilDeviceLib.setVerboseLogging(isToggled);
+                                dispatch(setIsLoggingVerbose(isToggled));
                             }}
                             isToggled={verboseLogging}
                             variant="primary"

package/src/App/App.test.tsx

@@ -15,6 +15,10 @@ jest.mock('../Log/LogViewer', () => ({
     default: () => null,
 }));
 
+jest.mock('../logging/index.ts', () => ({
+    initialise: () => {},
+}));
+
 const renderApp = (panes: Pane[]) => {
     const dummyReducer = (s = null) => s;
     const dummyNode = <div />;

package/src/App/App.tsx

@@ -6,13 +6,14 @@
 
 import 'focus-visible';
 
-import React, { FC, ReactNode, useEffect, useMemo } from 'react';
+import React, { FC, ReactNode, useEffect, useMemo, useRef } from 'react';
 import Carousel from 'react-bootstrap/Carousel';
 import ReactDOM from 'react-dom';
 import { useDispatch, useSelector } from 'react-redux';
 import { Reducer } from 'redux';
 
 import { inMain as openWindow } from '../../ipc/openWindow';
+import { setNrfutilLogger } from '../../nrfutil/nrfutilLogger';
 import About from '../About/About';
 import BrokenDeviceDialog from '../Device/BrokenDeviceDialog/BrokenDeviceDialog';
 import { setAutoReselect } from '../Device/deviceAutoSelectSlice';
@@ -25,12 +26,13 @@ import ErrorBoundary from '../ErrorBoundary/ErrorBoundary';
 import ErrorDialog from '../ErrorDialog/ErrorDialog';
 import FlashMessages from '../FlashMessage/FlashMessage';
 import LogViewer from '../Log/LogViewer';
+import logger from '../logging';
 import NavBar from '../NavBar/NavBar';
 import FeedbackPane, { FeedbackPaneProps } from '../Panes/FeedbackPane';
 import classNames from '../utils/classNames';
 import packageJson from '../utils/packageJson';
 import { getPersistedCurrentPane } from '../utils/persistentStore';
-import { init as usageDataInit } from '../utils/usageData';
+import { init as usageDataInit, setUsageLogger } from '../utils/usageData';
 import useHotKey from '../utils/useHotKey';
 import {
     currentPane as currentPaneSelector,
@@ -93,6 +95,15 @@ const ConnectedApp: FC<ConnectedAppProps> = ({
     children,
     autoReselectByDefault = false,
 }) => {
+    const initialisedLogger = useRef(false);
+
+    if (!initialisedLogger.current) {
+        logger.initialise();
+        setNrfutilLogger(logger);
+        setUsageLogger(logger);
+        initialisedLogger.current = true;
+    }
+
     usePersistedPane();
     const isLogVisible = useSelector(isLogVisibleSelector);
     const currentPane = useSelector(currentPaneSelector);

package/src/Device/DeviceSelector/DeviceList/MoreDeviceInfo.tsx

@@ -5,8 +5,8 @@
  */
 
 import React, { ReactNode } from 'react';
-import { SerialPort } from '@nordicsemiconductor/nrf-device-lib-js';
 
+import { SerialPort } from '../../../../nrfutil/device/common';
 import { displayedDeviceName } from '../../deviceInfo/deviceInfo';
 import { Device } from '../../deviceSlice';
 

package/src/Device/DeviceSelector/DeviceSelector.test.tsx

@@ -13,10 +13,12 @@ import {
 } from '@testing-library/react';
 
 import render from '../../../test/testrenderer';
-import { Device, setDevices } from '../deviceSlice';
+import { addDevice, Device, removeDevice } from '../deviceSlice';
 import { jprogDeviceSetup } from '../jprogOperations';
 import DeviceSelector from './DeviceSelector';
 
+jest.mock('../../../nrfutil/device/device');
+
 const testDevice: Device = {
     id: 1,
     hwInfo: {
@@ -92,17 +94,23 @@ const testDevice: Device = {
     },
 };
 
+const deviceSetupMock: ReturnType<typeof jprogDeviceSetup> = {
+    supportsProgrammingMode: jest.fn(() => true),
+    getFirmwareOptions: jest.fn(() => [
+        { key: 'PCATest', programDevice: jest.fn() },
+    ]),
+    isExpectedFirmware: jest.fn(
+        (device: Device) => () =>
+            Promise.resolve({
+                device,
+                validFirmware: false,
+            })
+    ),
+    tryToSwitchToApplicationMode: jest.fn(() => () => Promise.resolve(null)),
+};
+
 const validFirmware = {
-    deviceSetups: [
-        jprogDeviceSetup([
-            {
-                key: 'PCATest',
-                fw: 'firmware/invalidDevice.hex',
-                fwVersion: 'fw-1.0.0',
-                fwIdAddress: 0x6000,
-            },
-        ]),
-    ],
+    deviceSetups: [deviceSetupMock],
     allowCustomDevice: false,
 };
 
@@ -112,7 +120,7 @@ describe('DeviceSelector', () => {
             <DeviceSelector
                 deviceListing={{
                     nordicUsb: true,
-                    serialPort: true,
+                    serialPorts: true,
                     jlink: true,
                     mcuBoot: true,
                 }}
@@ -126,7 +134,7 @@ describe('DeviceSelector', () => {
             <DeviceSelector
                 deviceListing={{
                     nordicUsb: true,
-                    serialPort: true,
+                    serialPorts: true,
                     jlink: true,
                     mcuBoot: true,
                 }}
@@ -141,12 +149,12 @@ describe('DeviceSelector', () => {
             <DeviceSelector
                 deviceListing={{
                     nordicUsb: true,
-                    serialPort: true,
+                    serialPorts: true,
                     jlink: true,
                     mcuBoot: true,
                 }}
             />,
-            [setDevices([testDevice])]
+            [addDevice(testDevice)]
         );
         expect(screen.getByText(testDevice.serialNumber)).toBeInTheDocument();
     });
@@ -156,12 +164,12 @@ describe('DeviceSelector', () => {
             <DeviceSelector
                 deviceListing={{
                     nordicUsb: true,
-                    serialPort: true,
+                    serialPorts: true,
                     jlink: true,
                     mcuBoot: true,
                 }}
             />,
-            [setDevices([testDevice]), setDevices([])]
+            [addDevice(testDevice), removeDevice(testDevice)]
         );
         expect(screen.queryByText(testDevice.serialNumber)).toBeNull();
     });
@@ -171,12 +179,12 @@ describe('DeviceSelector', () => {
             <DeviceSelector
                 deviceListing={{
                     nordicUsb: true,
-                    serialPort: true,
+                    serialPorts: true,
                     jlink: true,
                     mcuBoot: true,
                 }}
             />,
-            [setDevices([testDevice])]
+            [addDevice(testDevice)]
         );
         fireEvent.click(screen.getByText('Select device'));
         fireEvent.click(screen.getByTestId('show-more-device-info'));
@@ -188,12 +196,12 @@ describe('DeviceSelector', () => {
             <DeviceSelector
                 deviceListing={{
                     nordicUsb: true,
-                    serialPort: true,
+                    serialPorts: true,
                     jlink: true,
                     mcuBoot: true,
                 }}
             />,
-            [setDevices([testDevice])]
+            [addDevice(testDevice)]
         );
 
         fireEvent.click(screen.getByText('Select device'));
@@ -206,12 +214,12 @@ describe('DeviceSelector', () => {
             <DeviceSelector
                 deviceListing={{
                     nordicUsb: true,
-                    serialPort: true,
+                    serialPorts: true,
                     jlink: true,
                     mcuBoot: true,
                 }}
             />,
-            [setDevices([testDevice])]
+            [addDevice(testDevice)]
         );
         fireEvent.click(screen.getByText('Select device'));
         fireEvent.click(screen.getByText(testDevice.serialNumber));
@@ -226,7 +234,7 @@ describe('DeviceSelector', () => {
             <DeviceSelector
                 deviceListing={{
                     nordicUsb: true,
-                    serialPort: true,
+                    serialPorts: true,
                     jlink: true,
                     mcuBoot: true,
                 }}
@@ -244,7 +252,7 @@ describe('DeviceSelector', () => {
                     allowCustomDevice: true,
                 }}
             />,
-            [setDevices([testDevice])]
+            [addDevice(testDevice)]
         );
         fireEvent.click(screen.getByText('Select device'));
         fireEvent.click(screen.getByText(testDevice.serialNumber));
@@ -258,7 +266,7 @@ describe('DeviceSelector', () => {
             <DeviceSelector
                 deviceListing={{
                     nordicUsb: true,
-                    serialPort: true,
+                    serialPorts: true,
                     jlink: true,
                     mcuBoot: true,
                 }}
@@ -276,7 +284,7 @@ describe('DeviceSelector', () => {
                     allowCustomDevice: false,
                 }}
             />,
-            [setDevices([testDevice])]
+            [addDevice(testDevice)]
         );
 
         fireEvent.click(screen.getByText('Select device'));
@@ -296,13 +304,13 @@ describe('DeviceSelector', () => {
             <DeviceSelector
                 deviceListing={{
                     nordicUsb: true,
-                    serialPort: true,
+                    serialPorts: true,
                     jlink: true,
                     mcuBoot: true,
                 }}
                 deviceSetupConfig={validFirmware}
             />,
-            [setDevices([testDevice])]
+            [addDevice(testDevice)]
         );
 
         fireEvent.click(screen.getByText('Select device'));
@@ -318,13 +326,13 @@ describe('DeviceSelector', () => {
             <DeviceSelector
                 deviceListing={{
                     nordicUsb: true,
-                    serialPort: true,
+                    serialPorts: true,
                     jlink: true,
                     mcuBoot: true,
                 }}
                 deviceSetupConfig={validFirmware}
             />,
-            [setDevices([testDevice])]
+            [addDevice(testDevice)]
         );
 
         fireEvent.click(screen.getByText('Select device'));

package/src/Device/DeviceSelector/DeviceSelector.tsx

@@ -6,8 +6,8 @@
 
 import React, { useCallback, useEffect, useState } from 'react';
 import { useDispatch, useSelector } from 'react-redux';
-import { DeviceTraits } from '@nordicsemiconductor/nrf-device-lib-js';
 
+import { DeviceTraits } from '../../../nrfutil/device/common';
 import useHotKey from '../../utils/useHotKey';
 import {
     getWaitingToAutoReselect,
@@ -31,13 +31,8 @@ import DeviceList from './DeviceList/DeviceList';
 import SelectDevice from './SelectDevice';
 import SelectedDevice from './SelectedDevice';
 
-interface OutdatedDeviceTraits {
-    serialPort?: boolean;
-    serialport?: boolean;
-}
-
 export interface Props {
-    deviceListing: DeviceTraits & OutdatedDeviceTraits;
+    deviceListing: DeviceTraits;
     deviceSetupConfig?: DeviceSetupConfig;
     onDeviceSelected?: (device: Device, autoReselected: boolean) => void;
     onDeviceDeselected?: () => void;
@@ -104,13 +99,9 @@ export default ({
     );
 
     const doStartWatchingDevices = useCallback(() => {
-        const patchedDeviceListing = {
-            serialPorts: deviceListing.serialPort || deviceListing.serialport,
-            ...deviceListing,
-        };
         dispatch(
             startWatchingDevices(
-                patchedDeviceListing,
+                deviceListing,
                 onDeviceConnected,
                 onDeviceDisconnected,
                 onDeviceDeselected,

package/src/Device/deviceInfo/deviceInfo.ts

@@ -28,8 +28,7 @@
    through CSS, e.g. to change the colours.
 */
 
-import type { Device as NrfdlDevice } from '@nordicsemiconductor/nrf-device-lib-js';
-
+import { NrfutilDevice } from '../../../nrfutil';
 import type { Device as WrappedDevice } from '../deviceSlice';
 
 import nrf51logo from '!!@svgr!./nRF51-Series-logo.svg';
@@ -41,7 +40,7 @@ import ppkLogo from '!!@svgr!./ppk-logo.svg';
 import unknownLogo from '!!@svgr!./unknown-logo.svg';
 import unknownNordicLogo from '!!@svgr!./unknown-nordic-logo.svg';
 
-type Device = NrfdlDevice | WrappedDevice;
+type Device = NrfutilDevice | WrappedDevice;
 
 type DevicePCA =
     | 'PCA10028'

package/src/Device/deviceLister.test.ts

@@ -4,8 +4,7 @@
  * SPDX-License-Identifier: LicenseRef-Nordic-4-Clause
  */
 
-import { DeviceTraits } from '@nordicsemiconductor/nrf-device-lib-js';
-
+import { DeviceTraits } from '../../nrfutil/device/common';
 import { hasValidDeviceTraits } from './deviceLister';
 
 const allFalseDeviceTraits: DeviceTraits = {