@nordicsemiconductor/pc-nrfconnect-shared 176.0.0 → 178.0.0

package/Changelog.md

@@ -7,6 +7,24 @@ 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.
 
+## 178.0.0 - 2024-06-11
+
+### Changed
+
+-   `isDeviceInDFUBootloader` now also expect nordic DFU Trait to be true
+
+### Fixed
+
+-   Wait for device `when='dfuBootLoaderMode'` will wait until nordic DFU Trait
+    is also present
+
+## 177.0.0 - 2024-05-28
+
+### Added
+
+-   Apps can no control better when to auto reconnect after programming with
+    `sdfuDeviceSetup`. This is optional. Defaults have nit changed
+
 ## 176.0.0 - 2024-05-06
 
 ### Added

package/package.json

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

package/scripts/nordic-publish.ts

@@ -17,21 +17,6 @@ import { AppInfo, SourceJson } from '../ipc/MetaFiles';
 import { PackageJsonApp } from '../ipc/schema/packageJson';
 import checkAppProperties from './check-app-properties';
 
-interface LegacyAppInfo {
-    ['dist-tags']?: {
-        latest?: string;
-    };
-    versions?: {
-        [version: string]: {
-            dist: {
-                publishTimestamp?: string;
-                tarball: string;
-                shasum: string;
-            };
-        };
-    };
-}
-
 interface App {
     filename: string;
     name: string;

package/src/Device/deviceAutoSelectSlice.ts

@@ -9,14 +9,16 @@ import { createSlice, PayloadAction } from '@reduxjs/toolkit';
 import type { AppThunk, RootState } from '../store';
 import type { Device } from './deviceSlice';
 
+export type WaitForDeviceWhen =
+    | 'always'
+    | 'applicationMode'
+    | 'dfuBootLoaderMode'
+    | 'sameTraits'
+    | ((device: Device) => boolean);
+
 export interface WaitForDevice {
     timeout: number;
-    when:
-        | 'always'
-        | 'applicationMode'
-        | 'dfuBootLoaderMode'
-        | 'sameTraits'
-        | ((device: Device) => boolean);
+    when: WaitForDeviceWhen;
     once: boolean;
     skipRefetchDeviceInfo?: boolean;
     onSuccess?: (device: Device) => void;

package/src/Device/deviceLister.ts

@@ -282,6 +282,7 @@ export const startWatchingDevices =
                                 (typeof waitForDevice.when === 'function' &&
                                     waitForDevice.when(device))
                             ) {
+                                dispatch(setArrivedButWrongWhen(undefined));
                                 dispatch(
                                     setLastArrivedDeviceId(
                                         deviceWithPersistedData.id

package/src/Device/sdfuOperations.ts

@@ -14,7 +14,11 @@ import { McuState } from '../../nrfutil/device/setMcuState';
 import logger from '../logging';
 import { AppThunk, RootState } from '../store';
 import { getAppFile } from '../utils/appDirs';
-import { clearWaitForDevice, setWaitForDevice } from './deviceAutoSelectSlice';
+import {
+    clearWaitForDevice,
+    setWaitForDevice,
+    WaitForDeviceWhen,
+} from './deviceAutoSelectSlice';
 import { DeviceSetup, DfuEntry } from './deviceSetup';
 import { openDeviceSetupDialog } from './deviceSetupSlice';
 import { Device } from './deviceSlice';
@@ -43,7 +47,8 @@ export const isDeviceInDFUBootloader = (device: Device) => {
         const { descriptor: d } = device.usb.device;
         return (
             d.idVendor === NORDIC_VENDOR_ID &&
-            d.idProduct === NORDIC_DFU_PRODUCT_ID
+            d.idProduct === NORDIC_DFU_PRODUCT_ID &&
+            !!device.traits.nordicDfu
         );
     }
 
@@ -147,16 +152,20 @@ const switchToDeviceMode =
         device: Device,
         mcuState: McuState,
         onSuccess: (device: Device) => void,
-        onFail: (reason?: unknown) => void
+        onFail: (reason?: unknown) => void,
+        autoReconnectWhen?: WaitForDeviceWhen
     ): AppThunk =>
     dispatch => {
+        if (autoReconnectWhen === undefined) {
+            autoReconnectWhen =
+                mcuState === 'Application'
+                    ? 'applicationMode'
+                    : 'dfuBootLoaderMode';
+        }
         dispatch(
             setWaitForDevice({
                 timeout: 10000,
-                when:
-                    mcuState === 'Application'
-                        ? 'applicationMode'
-                        : 'dfuBootLoaderMode',
+                when: autoReconnectWhen,
                 once: true,
                 onSuccess,
                 onFail,
@@ -199,7 +208,8 @@ export const switchToApplicationMode =
     (
         device: Device,
         onSuccess: (device: Device) => void,
-        onFail: (reason?: unknown) => void
+        onFail: (reason?: unknown) => void,
+        autoReconnectWhen?: WaitForDeviceWhen
     ): AppThunk =>
     dispatch => {
         if (isDeviceInDFUBootloader(device)) {
@@ -216,7 +226,8 @@ export const switchToApplicationMode =
                             );
                         else onSuccess(d);
                     },
-                    onFail
+                    onFail,
+                    autoReconnectWhen
                 )
             );
         } else {
@@ -408,7 +419,8 @@ const programInDFUBootloader =
         dfu: DfuEntry,
         onProgress: (progress: number, message?: string) => void,
         onSuccess: (device: Device) => void,
-        onFail: (reason?: unknown) => void
+        onFail: (reason?: unknown) => void,
+        autoReconnectAfterProgrammingWhen: WaitForDeviceWhen = 'applicationMode'
     ): AppThunk<RootState, Promise<void>> =>
     async dispatch => {
         logger.debug(`${device.serialNumber} on is now in DFU-Bootloader...`);
@@ -494,7 +506,7 @@ const programInDFUBootloader =
                 dispatch(
                     setWaitForDevice({
                         timeout: DEFAULT_DEVICE_WAIT_TIME,
-                        when: 'applicationMode',
+                        when: autoReconnectAfterProgrammingWhen,
                         once: true,
                         onSuccess,
                         onFail,
@@ -518,7 +530,8 @@ const programDeviceWithFw =
     (
         device: Device,
         selectedFw: DfuEntry,
-        onProgress: (progress: number, message?: string) => void
+        onProgress: (progress: number, message?: string) => void,
+        autoReconnectAfterProgrammingWhen: WaitForDeviceWhen = 'applicationMode'
     ): AppThunk<RootState, Promise<Device>> =>
     dispatch =>
         new Promise<Device>((resolve, reject) => {
@@ -529,7 +542,8 @@ const programDeviceWithFw =
                         selectedFw,
                         onProgress,
                         resolve,
-                        reject
+                        reject,
+                        autoReconnectAfterProgrammingWhen
                     )
                 );
                 logger.debug('DFU finished: ', d);
@@ -542,7 +556,8 @@ const programDeviceWithFw =
 
 export const sdfuDeviceSetup = (
     dfuFirmware: DfuEntry[],
-    needSerialport = false
+    needSerialport = false,
+    autoReconnectAfterProgrammingWhen: WaitForDeviceWhen = 'applicationMode'
 ): DeviceSetup => ({
     supportsProgrammingMode: (device, deviceInfo) =>
         ((!!deviceInfo?.dfuTriggerVersion &&
@@ -555,7 +570,12 @@ export const sdfuDeviceSetup = (
             description: firmwareOption.description,
             programDevice: onProgress => dispatch =>
                 dispatch(
-                    programDeviceWithFw(device, firmwareOption, onProgress)
+                    programDeviceWithFw(
+                        device,
+                        firmwareOption,
+                        onProgress,
+                        autoReconnectAfterProgrammingWhen
+                    )
                 ),
         })),
     isExpectedFirmware: (device, deviceInfo) => () => {
@@ -580,7 +600,14 @@ export const sdfuDeviceSetup = (
     },
     tryToSwitchToApplicationMode: device => dispatch =>
         new Promise<Device>((resolve, reject) => {
-            dispatch(switchToApplicationMode(device, resolve, reject));
+            dispatch(
+                switchToApplicationMode(
+                    device,
+                    resolve,
+                    reject,
+                    autoReconnectAfterProgrammingWhen
+                )
+            );
         }),
 });
 

package/typings/generated/src/Device/deviceAutoSelectSlice.d.ts

@@ -1,8 +1,9 @@
 import type { AppThunk, RootState } from '../store';
 import type { Device } from './deviceSlice';
+export type WaitForDeviceWhen = 'always' | 'applicationMode' | 'dfuBootLoaderMode' | 'sameTraits' | ((device: Device) => boolean);
 export interface WaitForDevice {
     timeout: number;
-    when: 'always' | 'applicationMode' | 'dfuBootLoaderMode' | 'sameTraits' | ((device: Device) => boolean);
+    when: WaitForDeviceWhen;
     once: boolean;
     skipRefetchDeviceInfo?: boolean;
     onSuccess?: (device: Device) => void;

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

@@ -1 +1 @@
-{"version":3,"file":"deviceAutoSelectSlice.d.ts","sourceRoot":"","sources":["../../../../src/Device/deviceAutoSelectSlice.ts"],"names":[],"mappings":"AAQA,OAAO,KAAK,EAAE,QAAQ,EAAE,SAAS,EAAE,MAAM,UAAU,CAAC;AACpD,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,eAAe,CAAC;AAE5C,MAAM,WAAW,aAAa;IAC1B,OAAO,EAAE,MAAM,CAAC;IAChB,IAAI,EACE,QAAQ,GACR,iBAAiB,GACjB,mBAAmB,GACnB,YAAY,GACZ,CAAC,CAAC,MAAM,EAAE,MAAM,KAAK,OAAO,CAAC,CAAC;IACpC,IAAI,EAAE,OAAO,CAAC;IACd,qBAAqB,CAAC,EAAE,OAAO,CAAC;IAChC,SAAS,CAAC,EAAE,CAAC,MAAM,EAAE,MAAM,KAAK,IAAI,CAAC;IACrC,MAAM,CAAC,EAAE,CAAC,MAAM,CAAC,EAAE,MAAM,KAAK,IAAI,CAAC;CACtC;AAED,MAAM,WAAW,qBAAqB;IAClC,YAAY,EAAE,OAAO,CAAC;IACtB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,iBAAiB,CAAC,EAAE,MAAM,CAAC;IAC3B,aAAa,CAAC,EAAE,aAAa,CAAC;IAC9B,oBAAoB,CAAC,EAAE,MAAM,CAAC;IAC9B,mBAAmB,CAAC,EAAE,MAAM,CAAC;IAC7B,mBAAmB,CAAC,EAAE,OAAO,CAAC;IAC9B,eAAe,CAAC,EAAE,MAAM,IAAI,CAAC;CAChC;AA4ED,eAAO,MACH,OAAO,6EAEH,uBAAuB,2GACvB,yBAAyB,8GACzB,mBAAmB,2HACnB,mBAAmB,2HACnB,eAAe,oGACf,gBAAgB,2GAChB,sBAAsB,8HACtB,sBAAsB,+HACtB,kBAAkB,4DAjBsC,IAAI,wCAmB3D,CAAC;AAEV,eAAO,MAAM,qBAAqB,UAAW,SAAS,uBACrB,CAAC;AAElC,eAAO,MAAM,eAAe,UAAW,SAAS,YACT,CAAC;AAExC,eAAO,MAAM,wBAAwB,UAAW,SAAS,YAElB,CAAC;AAExC,eAAO,MAAM,0BAA0B,UAAW,SAAS,YACE,CAAC;AAE9D,eAAO,MAAM,oBAAoB,UAAW,SAAS,uBACT,CAAC;AAE7C,eAAO,MAAM,gBAAgB,UAAW,SAAS,8BACT,CAAC;AAEzC,eAAO,MAAM,sBAAsB,UAAW,SAAS,uBACT,CAAC;AAC/C,eAAO,MAAM,sBAAsB,UAAW,SAAS,wBACT,CAAC;AAE/C,eAAO,MAAM,kBAAkB,QAAO,QAKrC,CAAC"}
+{"version":3,"file":"deviceAutoSelectSlice.d.ts","sourceRoot":"","sources":["../../../../src/Device/deviceAutoSelectSlice.ts"],"names":[],"mappings":"AAQA,OAAO,KAAK,EAAE,QAAQ,EAAE,SAAS,EAAE,MAAM,UAAU,CAAC;AACpD,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,eAAe,CAAC;AAE5C,MAAM,MAAM,iBAAiB,GACvB,QAAQ,GACR,iBAAiB,GACjB,mBAAmB,GACnB,YAAY,GACZ,CAAC,CAAC,MAAM,EAAE,MAAM,KAAK,OAAO,CAAC,CAAC;AAEpC,MAAM,WAAW,aAAa;IAC1B,OAAO,EAAE,MAAM,CAAC;IAChB,IAAI,EAAE,iBAAiB,CAAC;IACxB,IAAI,EAAE,OAAO,CAAC;IACd,qBAAqB,CAAC,EAAE,OAAO,CAAC;IAChC,SAAS,CAAC,EAAE,CAAC,MAAM,EAAE,MAAM,KAAK,IAAI,CAAC;IACrC,MAAM,CAAC,EAAE,CAAC,MAAM,CAAC,EAAE,MAAM,KAAK,IAAI,CAAC;CACtC;AAED,MAAM,WAAW,qBAAqB;IAClC,YAAY,EAAE,OAAO,CAAC;IACtB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,iBAAiB,CAAC,EAAE,MAAM,CAAC;IAC3B,aAAa,CAAC,EAAE,aAAa,CAAC;IAC9B,oBAAoB,CAAC,EAAE,MAAM,CAAC;IAC9B,mBAAmB,CAAC,EAAE,MAAM,CAAC;IAC7B,mBAAmB,CAAC,EAAE,OAAO,CAAC;IAC9B,eAAe,CAAC,EAAE,MAAM,IAAI,CAAC;CAChC;AA4ED,eAAO,MACH,OAAO,6EAEH,uBAAuB,2GACvB,yBAAyB,8GACzB,mBAAmB,2HACnB,mBAAmB,2HACnB,eAAe,oGACf,gBAAgB,2GAChB,sBAAsB,8HACtB,sBAAsB,+HACtB,kBAAkB,4DAjBsC,IAAI,wCAmB3D,CAAC;AAEV,eAAO,MAAM,qBAAqB,UAAW,SAAS,uBACrB,CAAC;AAElC,eAAO,MAAM,eAAe,UAAW,SAAS,YACT,CAAC;AAExC,eAAO,MAAM,wBAAwB,UAAW,SAAS,YAElB,CAAC;AAExC,eAAO,MAAM,0BAA0B,UAAW,SAAS,YACE,CAAC;AAE9D,eAAO,MAAM,oBAAoB,UAAW,SAAS,uBACT,CAAC;AAE7C,eAAO,MAAM,gBAAgB,UAAW,SAAS,8BACT,CAAC;AAEzC,eAAO,MAAM,sBAAsB,UAAW,SAAS,uBACT,CAAC;AAC/C,eAAO,MAAM,sBAAsB,UAAW,SAAS,wBACT,CAAC;AAE/C,eAAO,MAAM,kBAAkB,QAAO,QAKrC,CAAC"}

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,CA0P1B,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;AAwDN,eAAO,MAAM,mBAAmB,cAAe,MAAM,IAAI,SAGxD,CAAC"}

package/typings/generated/src/Device/sdfuOperations.d.ts

@@ -1,13 +1,14 @@
 /// <reference types="node" />
 import { AppThunk } from '../store';
+import { WaitForDeviceWhen } from './deviceAutoSelectSlice';
 import { DeviceSetup, DfuEntry } from './deviceSetup';
 import { Device } from './deviceSlice';
 import { DfuImage } from './initPacket';
 export declare const isDeviceInDFUBootloader: (device: Device) => boolean;
 export declare const ensureBootloaderMode: (device: Device) => boolean;
 export declare const switchToBootloaderMode: (device: Device, onSuccess: (device: Device) => void, onFail: (reason?: unknown) => void) => AppThunk;
-export declare const switchToApplicationMode: (device: Device, onSuccess: (device: Device) => void, onFail: (reason?: unknown) => void) => AppThunk;
-export declare const sdfuDeviceSetup: (dfuFirmware: DfuEntry[], needSerialport?: boolean) => DeviceSetup;
+export declare const switchToApplicationMode: (device: Device, onSuccess: (device: Device) => void, onFail: (reason?: unknown) => void, autoReconnectWhen?: WaitForDeviceWhen) => AppThunk;
+export declare const sdfuDeviceSetup: (dfuFirmware: DfuEntry[], needSerialport?: boolean, autoReconnectAfterProgrammingWhen?: WaitForDeviceWhen) => DeviceSetup;
 declare const _default: {
     createDfuZipBuffer: (dfuImages: DfuImage[]) => Promise<Buffer>;
 };

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

@@ -1 +1 @@
-{"version":3,"file":"sdfuOperations.d.ts","sourceRoot":"","sources":["../../../../src/Device/sdfuOperations.ts"],"names":[],"mappings":";AAcA,OAAO,EAAE,QAAQ,EAAa,MAAM,UAAU,CAAC;AAG/C,OAAO,EAAE,WAAW,EAAE,QAAQ,EAAE,MAAM,eAAe,CAAC;AAEtD,OAAO,EAAE,MAAM,EAAE,MAAM,eAAe,CAAC;AACvC,OAAO,EAGH,QAAQ,EAIX,MAAM,cAAc,CAAC;AAUtB,eAAO,MAAM,uBAAuB,WAAY,MAAM,YAiBrD,CAAC;AAEF,eAAO,MAAM,oBAAoB,WAAY,MAAM,YAOlD,CAAC;AA2GF,eAAO,MAAM,sBAAsB,WAEnB,MAAM,sBACM,MAAM,KAAK,IAAI,oBACjB,OAAO,KAAK,IAAI,KACnC,QAoBF,CAAC;AAEN,eAAO,MAAM,uBAAuB,WAEpB,MAAM,sBACM,MAAM,KAAK,IAAI,oBACjB,OAAO,KAAK,IAAI,KACnC,QAsBF,CAAC;AA8TN,eAAO,MAAM,eAAe,gBACX,QAAQ,EAAE,+BAExB,WAuCD,CAAC;;;;AAEH,wBAEE"}
+{"version":3,"file":"sdfuOperations.d.ts","sourceRoot":"","sources":["../../../../src/Device/sdfuOperations.ts"],"names":[],"mappings":";AAcA,OAAO,EAAE,QAAQ,EAAa,MAAM,UAAU,CAAC;AAE/C,OAAO,EAGH,iBAAiB,EACpB,MAAM,yBAAyB,CAAC;AACjC,OAAO,EAAE,WAAW,EAAE,QAAQ,EAAE,MAAM,eAAe,CAAC;AAEtD,OAAO,EAAE,MAAM,EAAE,MAAM,eAAe,CAAC;AACvC,OAAO,EAGH,QAAQ,EAIX,MAAM,cAAc,CAAC;AAUtB,eAAO,MAAM,uBAAuB,WAAY,MAAM,YAkBrD,CAAC;AAEF,eAAO,MAAM,oBAAoB,WAAY,MAAM,YAOlD,CAAC;AA+GF,eAAO,MAAM,sBAAsB,WAEnB,MAAM,sBACM,MAAM,KAAK,IAAI,oBACjB,OAAO,KAAK,IAAI,KACnC,QAoBF,CAAC;AAEN,eAAO,MAAM,uBAAuB,WAEpB,MAAM,sBACM,MAAM,KAAK,IAAI,oBACjB,OAAO,KAAK,IAAI,sBACd,iBAAiB,KACtC,QAuBF,CAAC;AAiUN,eAAO,MAAM,eAAe,gBACX,QAAQ,EAAE,gEAEY,iBAAiB,KACrD,WAmDD,CAAC;;;;AAEH,wBAEE"}