@nordicsemiconductor/pc-nrfconnect-shared 134.0.0 → 136.0.0

package/Changelog.md

@@ -7,6 +7,34 @@ 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.
 
+## 136.0.0 - 2023-12-01
+
+### Fixed
+
+-   `useStopWatch` milliseconds was not correctly calculated
+-   External JLink devices would not connect to apps device list properly if
+    selected before they are connected to the debug-in heder of the device
+
+### Changed
+
+-   `useStopWatch` reset and start no longer force a rerender if these are a
+    dependency of a useEffect
+-   `useStopWatch` start optional time param no longer default to the last time
+    when paused but 0.
+-   `nrfutil device` `device-info` return undefined if reading info throws
+
+### Steps to upgrade when using this package
+
+-   `useStopWatch` If start() was used after a pause() with no call to reset()
+    start need to be called with time i.e. start(time)
+
+## 135.0.0 - 2023-11-29
+
+### Changed
+
+-   Updated `nrf-intel-hex` to the latest version which slightly changed some
+    types (from `Buffer` to `Uint8Array`) because this was corrected there.
+
 ## 134.0.0 - 2023-11-22
 
 ### Added

package/nrfutil/device/deviceInfo.ts

@@ -56,15 +56,20 @@ export default async (
     core?: DeviceCore,
     onProgress?: (progress: Progress) => void,
     controller?: AbortController
-) =>
-    device.traits.jlink || device.traits.nordicDfu
-        ? (
-              await deviceSingleTaskEndOperation<DeviceInfoRaw>(
-                  device,
-                  'device-info',
-                  onProgress,
-                  controller,
-                  core ? ['--core', core] : []
-              )
-          ).deviceInfo
-        : undefined;
+) => {
+    try {
+        return device.traits.jlink || device.traits.nordicDfu
+            ? (
+                  await deviceSingleTaskEndOperation<DeviceInfoRaw>(
+                      device,
+                      'device-info',
+                      onProgress,
+                      controller,
+                      core ? ['--core', core] : []
+                  )
+              ).deviceInfo
+            : undefined;
+    } catch (_) {
+        return undefined;
+    }
+};

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@nordicsemiconductor/pc-nrfconnect-shared",
-    "version": "134.0.0",
+    "version": "136.0.0",
     "description": "Shared commodities for developing pc-nrfconnect-* packages",
     "repository": {
         "type": "git",
@@ -90,7 +90,7 @@
         "lodash.range": "3.2.0",
         "mousetrap": "1.6.5",
         "npm-run-all2": "6.0.5",
-        "nrf-intel-hex": "^1.3.0",
+        "nrf-intel-hex": "^1.4.0",
         "postcss": "8.4.24",
         "postcss-modules": "^6.0.0",
         "prettier": "2.8.8",

package/scripts/release-shared.test.ts

@@ -52,7 +52,7 @@ describe('checking Changelod.md', () => {
 
 All notable changes to this project will be documented in this file.
 
-## 34 - 2022-03-10
+## 34.0.0 - 2022-03-10
 
 ### Changed
 
@@ -72,7 +72,7 @@ All notable changes to this project will be documented in this file.
 
 All notable changes to this project will be documented in this file.
 
-## 33 - 2022-02-01
+## 33.0.0 - 2022-02-01
 
 ### Changed
 
@@ -92,9 +92,9 @@ All notable changes to this project will be documented in this file.
 
 All notable changes to this project will be documented in this file.
 
-## 34 - 2022-03-10
+## 34.0.0 - 2022-03-10
 
-## 33 - 2022-02-01`;
+## 33.0.0 - 2022-02-01`;
 
         expect(
             latestEntryIsNotEmpty({
@@ -110,13 +110,13 @@ describe('Parsing Changelog.md', () => {
 
 All notable changes to this project will be documented in this file.
 
-## 34 - 2023-04-20
+## 34.0.0 - 2023-04-20
 
 ### Changed
 
 -   Something
 
-## 33 - 2023-04-19
+## 33.0.0 - 2023-04-19
 
 ### Added
 
@@ -125,7 +125,7 @@ All notable changes to this project will be documented in this file.
 
     test('Extracting the latest entry', () => {
         expect(getLatestEntry(changelog)).toMatchObject({
-            header: '34 - 2023-04-20',
+            header: '34.0.0 - 2023-04-20',
             content: '### Changed\n\n-   Something',
         });
     });

package/scripts/release-shared.ts

@@ -135,7 +135,9 @@ export const latestHeaderIsCorrect = (
         changelog: getLatestChangelog(),
     }
 ) => {
-    const expectedHeaderline = `${expectedVersionNumber} - ${withoutTime(now)}`;
+    const expectedHeaderline = `${expectedVersionNumber}.0.0 - ${withoutTime(
+        now
+    )}`;
     const actualHeaderline = getLatestEntry(changelog).header;
 
     return equality(

package/src/Device/initPacket.ts

@@ -68,7 +68,7 @@ export const defaultInitPacket: InitPacket = {
 export interface DfuImage {
     name: string;
     initPacket: InitPacket;
-    firmwareImage: Buffer;
+    firmwareImage: Uint8Array;
 }
 
 // Create hash by using hash type and bytes

package/src/Device/sdfuOperations.ts

@@ -317,7 +317,7 @@ function parseFirmwareImage(firmware: Buffer | string) {
     return memMap.slicePad(
         startAddress,
         Math.ceil((endAddress - startAddress) / 4) * 4
-    ) as Buffer;
+    );
 }
 
 function calculateSHA256Hash(image: Uint8Array) {
@@ -327,7 +327,7 @@ function calculateSHA256Hash(image: Uint8Array) {
 }
 
 interface DfuData {
-    application?: { bin: Buffer; dat: Buffer };
+    application?: { bin: Uint8Array; dat: Uint8Array };
     softdevice?: { bin: Uint8Array; dat: Uint8Array };
     params?: InitPacket;
 }
@@ -376,8 +376,8 @@ const createDfuZip = (dfuImages: DfuImage[]) =>
                 bin_file: 'application.bin',
                 dat_file: 'application.dat',
             };
-            zip.addFile('application.bin', data.application.bin);
-            zip.addFile('application.dat', data.application.dat);
+            zip.addFile('application.bin', data.application.bin as Buffer);
+            zip.addFile('application.dat', data.application.dat as Buffer);
         }
 
         if (data.softdevice) {

package/src/utils/useStopwatch.test.tsx

@@ -88,7 +88,7 @@ describe('Stop Watch', () => {
         expect(stopwatch.isRunning).toBeFalsy();
     });
 
-    test('Start a paused timer will continue timer', () => {
+    test('Start a paused timer will continue timer from provided time', () => {
         const stopwatch = setup({
             autoStart: true,
             resolution: 1000,
@@ -120,7 +120,7 @@ describe('Stop Watch', () => {
         mockNow.mockReturnValue(5000);
 
         act(() => {
-            stopwatch.start();
+            stopwatch.start(500);
             stopwatch;
         });
 

package/src/utils/useStopwatch.ts

@@ -37,7 +37,7 @@ const splitMS = (ms: number) => {
     ms -= minutes * 60 * 1000;
 
     const seconds = Math.floor(ms / 1000);
-    const millisecond = ms - seconds * 60 * 1000;
+    const millisecond = ms - seconds * 1000;
 
     return {
         time,
@@ -89,7 +89,7 @@ export default ({
     );
 
     const start = useCallback(
-        (elapsedTime = time) => {
+        (elapsedTime = 0) => {
             if (pauseTimeout.current === null) {
                 previousTickTime.current = timer.now();
                 expectedTickTime.current =
@@ -98,7 +98,7 @@ export default ({
                 pauseTimeout.current = nextTick(elapsedTime);
             }
         },
-        [nextTick, resolution, time, timer]
+        [nextTick, resolution, timer]
     );
 
     const pause = useCallback(() => {

package/typings/generated/nrfutil/device/deviceInfo.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"deviceInfo.d.ts","sourceRoot":"","sources":["../../../../nrfutil/device/deviceInfo.ts"],"names":[],"mappings":"AAMA,OAAO,EAAE,QAAQ,EAAE,MAAM,iBAAiB,CAAC;AAC3C,OAAO,EACH,UAAU,EAEV,aAAa,EAChB,MAAM,UAAU,CAAC;AAElB,MAAM,WAAW,MAAM;IACnB,OAAO,EAAE,MAAM,CAAC;IAChB,OAAO,EAAE,MAAM,CAAC;IAChB,WAAW,EAAE,MAAM,CAAC;IACpB,YAAY,EAAE,MAAM,CAAC;IACrB,aAAa,EAAE,MAAM,CAAC;CACzB;AAED,MAAM,WAAW,eAAe;IAC5B,YAAY,EAAE,MAAM,CAAC;IACrB,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,sBAAsB,EAAE,MAAM,CAAC;IAC/B,YAAY,EAAE,MAAM,GAAG,IAAI,CAAC;IAC5B,aAAa,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;CACjC;AAED,MAAM,WAAW,cAAc;IAC3B,QAAQ,EAAE,MAAM,CAAC;IACjB,aAAa,EAAE,MAAM,CAAC;IACtB,aAAa,EAAE,MAAM,CAAC;IACtB,WAAW,EAAE,MAAM,CAAC;IACpB,UAAU,EAAE,MAAM,CAAC;IACnB,cAAc,EAAE,MAAM,CAAC;CAC1B;AACD,MAAM,WAAW,iBAAiB;IAC9B,MAAM,EAAE,MAAM,CAAC;CAClB;AAED,MAAM,WAAW,UAAU;IACvB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,KAAK,CAAC,EAAE,eAAe,CAAC;IACxB,iBAAiB,CAAC,EAAE,iBAAiB,CAAC;IACtC,cAAc,CAAC,EAAE,cAAc,CAAC;CACnC;AAED,MAAM,WAAW,aAAa;IAC1B,IAAI,EAAE,aAAa,CAAC;IACpB,UAAU,EAAE,UAAU,CAAC;CAC1B;iCAGW,aAAa,SACd,UAAU,2BACO,QAAQ,KAAK,IAAI,4BAC5B,eAAe;AAJhC,wBAgBoB"}
+{"version":3,"file":"deviceInfo.d.ts","sourceRoot":"","sources":["../../../../nrfutil/device/deviceInfo.ts"],"names":[],"mappings":"AAMA,OAAO,EAAE,QAAQ,EAAE,MAAM,iBAAiB,CAAC;AAC3C,OAAO,EACH,UAAU,EAEV,aAAa,EAChB,MAAM,UAAU,CAAC;AAElB,MAAM,WAAW,MAAM;IACnB,OAAO,EAAE,MAAM,CAAC;IAChB,OAAO,EAAE,MAAM,CAAC;IAChB,WAAW,EAAE,MAAM,CAAC;IACpB,YAAY,EAAE,MAAM,CAAC;IACrB,aAAa,EAAE,MAAM,CAAC;CACzB;AAED,MAAM,WAAW,eAAe;IAC5B,YAAY,EAAE,MAAM,CAAC;IACrB,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,sBAAsB,EAAE,MAAM,CAAC;IAC/B,YAAY,EAAE,MAAM,GAAG,IAAI,CAAC;IAC5B,aAAa,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;CACjC;AAED,MAAM,WAAW,cAAc;IAC3B,QAAQ,EAAE,MAAM,CAAC;IACjB,aAAa,EAAE,MAAM,CAAC;IACtB,aAAa,EAAE,MAAM,CAAC;IACtB,WAAW,EAAE,MAAM,CAAC;IACpB,UAAU,EAAE,MAAM,CAAC;IACnB,cAAc,EAAE,MAAM,CAAC;CAC1B;AACD,MAAM,WAAW,iBAAiB;IAC9B,MAAM,EAAE,MAAM,CAAC;CAClB;AAED,MAAM,WAAW,UAAU;IACvB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,KAAK,CAAC,EAAE,eAAe,CAAC;IACxB,iBAAiB,CAAC,EAAE,iBAAiB,CAAC;IACtC,cAAc,CAAC,EAAE,cAAc,CAAC;CACnC;AAED,MAAM,WAAW,aAAa;IAC1B,IAAI,EAAE,aAAa,CAAC;IACpB,UAAU,EAAE,UAAU,CAAC;CAC1B;iCAGW,aAAa,SACd,UAAU,2BACO,QAAQ,KAAK,IAAI,4BAC5B,eAAe;AAJhC,wBAqBE"}

package/typings/generated/scripts/release-shared.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"release-shared.d.ts","sourceRoot":"","sources":["../../../scripts/release-shared.ts"],"names":[],"mappings":";AA+CA,eAAO,MAAM,oBAAoB;;;;;YAgBhC,CAAC;AAmBF,eAAO,MAAM,oBAAoB,0BACN,MAAM;oBAtDN,MAAM;;aAqEhC,CAAC;AAIF,eAAO,MAAM,cAAc,cAAe,MAAM;;;CAO/C,CAAC;AAEF,eAAO,MAAM,qBAAqB;oBAId,MAAM,KAAK,IAAI;eACpB,MAAM;aASpB,CAAC;AAIF,eAAO,MAAM,qBAAqB,0BACP,MAAM;oBArGN,MAAM;;;aAqHhC,CAAC;AAEF,eAAO,MAAM,kBAAkB,0BACJ,MAAM;oBAxHN,MAAM;;;aAgIyC,CAAC"}
+{"version":3,"file":"release-shared.d.ts","sourceRoot":"","sources":["../../../scripts/release-shared.ts"],"names":[],"mappings":";AA+CA,eAAO,MAAM,oBAAoB;;;;;YAgBhC,CAAC;AAmBF,eAAO,MAAM,oBAAoB,0BACN,MAAM;oBAtDN,MAAM;;aAqEhC,CAAC;AAIF,eAAO,MAAM,cAAc,cAAe,MAAM;;;CAO/C,CAAC;AAEF,eAAO,MAAM,qBAAqB;oBAId,MAAM,KAAK,IAAI;eACpB,MAAM;aASpB,CAAC;AAIF,eAAO,MAAM,qBAAqB,0BACP,MAAM;oBArGN,MAAM;;;aAuHhC,CAAC;AAEF,eAAO,MAAM,kBAAkB,0BACJ,MAAM;oBA1HN,MAAM;;;aAkIyC,CAAC"}

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

@@ -39,7 +39,7 @@ export declare const defaultInitPacket: InitPacket;
 export interface DfuImage {
     name: string;
     initPacket: InitPacket;
-    firmwareImage: Buffer;
+    firmwareImage: Uint8Array;
 }
 /**
  * Create reset command packet

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

@@ -1 +1 @@
-{"version":3,"file":"initPacket.d.ts","sourceRoot":"","sources":["../../../../src/Device/initPacket.ts"],"names":[],"mappings":";AAMA,OAAO,QAAQ,MAAM,YAAY,CAAC;AAMlC,oBAAY,MAAM;IACd,WAAW,IAAA;IACX,UAAU,IAAA;IACV,UAAU,IAAA;IACV,qBAAqB,IAAA;CACxB;AAED,oBAAY,QAAQ;IAChB,OAAO,IAAA;IACP,GAAG,IAAA;IACH,MAAM,IAAA;IACN,MAAM,IAAA;IACN,MAAM,IAAA;CACT;AAED,eAAO,MAAM,MAAM;;;CAGlB,CAAC;AAEF,eAAO,MAAM,aAAa;;;CAGzB,CAAC;AAEF,MAAM,WAAW,UAAU;IACvB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,KAAK,CAAC,EAAE,MAAM,EAAE,CAAC;IACjB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,MAAM,EAAE,MAAM,CAAC;IACf,MAAM,EAAE,MAAM,CAAC;IACf,OAAO,EAAE,MAAM,CAAC;IAChB,QAAQ,EAAE,MAAM,CAAC;IACjB,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,OAAO,EAAE,OAAO,CAAC;IACjB,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,SAAS,CAAC,EAAE,EAAE,CAAC;CAClB;AAED,eAAO,MAAM,iBAAiB,EAAE,UAa/B,CAAC;AAEF,MAAM,WAAW,QAAQ;IACrB,IAAI,EAAE,MAAM,CAAC;IACb,UAAU,EAAE,UAAU,CAAC;IACvB,aAAa,EAAE,MAAM,CAAC;CACzB;AAoHD;;;;;;;;GAQG;AACH,eAAO,MAAM,iBAAiB,YACjB,MAAM,iBACA,MAAM,aACV,EAAE,KACd,SAAS,OA8BX,CAAC;AAEF;;;;;;;;GAQG;AACH,eAAO,MAAM,uBAAuB,YACvB,MAAM,iBACA,MAAM,aACV,EAAE,KACd,UAKF,CAAC;AAEF;;;;;;;;;;;;;;;;;GAiBG;AACH,eAAO,MAAM,gBAAgB,cACd,MAAM,GAAG,SAAS,aAClB,MAAM,GAAG,SAAS,SACtB,MAAM,EAAE,GAAG,SAAS,UACnB,MAAM,GAAG,SAAS,UAClB,MAAM,GAAG,SAAS,UAClB,MAAM,GAAG,SAAS,WACjB,MAAM,GAAG,SAAS,YACjB,MAAM,GAAG,SAAS,QACtB,MAAM,GAAG,SAAS,WACf,OAAO,iBACD,MAAM,GAAG,SAAS,aACtB,EAAE,GAAG,SAAS,KAC1B,SAAS,OAsCX,CAAC;AAEF;;;;;;;;;;;;;;;;;GAiBG;AACH,eAAO,MAAM,sBAAsB,cACpB,MAAM,aACN,MAAM,SACV,MAAM,EAAE,UACP,MAAM,UACN,MAAM,UACN,MAAM,WACL,MAAM,YACL,MAAM,QACV,MAAM,WACH,OAAO,iBACD,MAAM,aACV,EAAE,KACd,MAkBF,CAAC;AAEF;;;;;;GAMG;AACH,eAAO,MAAM,0BAA0B,iBACrB,UAAU,KACzB,UAkBF,CAAC"}
+{"version":3,"file":"initPacket.d.ts","sourceRoot":"","sources":["../../../../src/Device/initPacket.ts"],"names":[],"mappings":";AAMA,OAAO,QAAQ,MAAM,YAAY,CAAC;AAMlC,oBAAY,MAAM;IACd,WAAW,IAAA;IACX,UAAU,IAAA;IACV,UAAU,IAAA;IACV,qBAAqB,IAAA;CACxB;AAED,oBAAY,QAAQ;IAChB,OAAO,IAAA;IACP,GAAG,IAAA;IACH,MAAM,IAAA;IACN,MAAM,IAAA;IACN,MAAM,IAAA;CACT;AAED,eAAO,MAAM,MAAM;;;CAGlB,CAAC;AAEF,eAAO,MAAM,aAAa;;;CAGzB,CAAC;AAEF,MAAM,WAAW,UAAU;IACvB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,KAAK,CAAC,EAAE,MAAM,EAAE,CAAC;IACjB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,MAAM,EAAE,MAAM,CAAC;IACf,MAAM,EAAE,MAAM,CAAC;IACf,OAAO,EAAE,MAAM,CAAC;IAChB,QAAQ,EAAE,MAAM,CAAC;IACjB,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,OAAO,EAAE,OAAO,CAAC;IACjB,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,SAAS,CAAC,EAAE,EAAE,CAAC;CAClB;AAED,eAAO,MAAM,iBAAiB,EAAE,UAa/B,CAAC;AAEF,MAAM,WAAW,QAAQ;IACrB,IAAI,EAAE,MAAM,CAAC;IACb,UAAU,EAAE,UAAU,CAAC;IACvB,aAAa,EAAE,UAAU,CAAC;CAC7B;AAoHD;;;;;;;;GAQG;AACH,eAAO,MAAM,iBAAiB,YACjB,MAAM,iBACA,MAAM,aACV,EAAE,KACd,SAAS,OA8BX,CAAC;AAEF;;;;;;;;GAQG;AACH,eAAO,MAAM,uBAAuB,YACvB,MAAM,iBACA,MAAM,aACV,EAAE,KACd,UAKF,CAAC;AAEF;;;;;;;;;;;;;;;;;GAiBG;AACH,eAAO,MAAM,gBAAgB,cACd,MAAM,GAAG,SAAS,aAClB,MAAM,GAAG,SAAS,SACtB,MAAM,EAAE,GAAG,SAAS,UACnB,MAAM,GAAG,SAAS,UAClB,MAAM,GAAG,SAAS,UAClB,MAAM,GAAG,SAAS,WACjB,MAAM,GAAG,SAAS,YACjB,MAAM,GAAG,SAAS,QACtB,MAAM,GAAG,SAAS,WACf,OAAO,iBACD,MAAM,GAAG,SAAS,aACtB,EAAE,GAAG,SAAS,KAC1B,SAAS,OAsCX,CAAC;AAEF;;;;;;;;;;;;;;;;;GAiBG;AACH,eAAO,MAAM,sBAAsB,cACpB,MAAM,aACN,MAAM,SACV,MAAM,EAAE,UACP,MAAM,UACN,MAAM,UACN,MAAM,WACL,MAAM,YACL,MAAM,QACV,MAAM,WACH,OAAO,iBACD,MAAM,aACV,EAAE,KACd,MAkBF,CAAC;AAEF;;;;;;GAMG;AACH,eAAO,MAAM,0BAA0B,iBACrB,UAAU,KACzB,UAkBF,CAAC"}