@nordicsemiconductor/pc-nrfconnect-shared 163.0.0 → 165.0.0

package/Changelog.md

@@ -7,6 +7,18 @@ 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.
 
+## 165.0.0 - 2024-03-05
+
+### Added
+
+-   Auto update nrfutil core for sandboxes
+
+## 164.0.0 - 2024-03-05
+
+### Fixed
+
+-   Device setup dialog failed to show on JLink device with no FW
+
 ## 163.0.0 - 2024-03-05
 
 ### Fixed

package/nrfutil/modules.ts

@@ -27,6 +27,14 @@ const logModuleVersions = (module: string, moduleSandbox: NrfutilSandbox) => {
             );
         });
     }
+
+    moduleSandbox.getCoreVersion().then(moduleVersion => {
+        getNrfutilLogger()?.info(
+            `Using nrfutil-${module} core version: ${describeVersion(
+                moduleVersion.version
+            )}`
+        );
+    });
 };
 
 const forwardLogging = (moduleSandbox: NrfutilSandbox) => {

package/nrfutil/sandbox.ts

@@ -149,6 +149,16 @@ export class NrfutilSandbox {
         throw new Error('Unexpected result');
     };
 
+    public getCoreVersion = async () => {
+        const results = await this.spawnNrfutil<ModuleVersion>('--version', []);
+
+        if (results.info.length === 1) {
+            return results.info[0];
+        }
+
+        throw new Error('Unexpected result');
+    };
+
     public isSandboxInstalled = async () => {
         if (
             fs.existsSync(
@@ -192,6 +202,17 @@ export class NrfutilSandbox {
         }
     };
 
+    public updateNrfUtilCore = async (
+        onProgress?: (progress: Progress, task?: Task) => void
+    ) => {
+        try {
+            await this.spawnNrfutil('self-upgrade', [], onProgress);
+        } catch (error) {
+            // User might not have internet hance fail silently
+            getNrfutilLogger()?.error(`Error while updated nrfutil core`);
+        }
+    };
+
     public getNrfutilExePath = () => path.join(this.baseDir, 'nrfutil');
 
     public spawnNrfutilSubcommand = <Result>(
@@ -725,6 +746,9 @@ export default async (
 
     if (!result) {
         await sandbox.prepareSandbox(onProgress);
+    } else {
+        // update nrfutil core
+        await sandbox.updateNrfUtilCore(onProgress);
     }
 
     onProgress?.(convertNrfutilProgress({ progressPercentage: 100 }));

package/package.json

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

package/src/Device/jprogOperations.ts

@@ -124,7 +124,7 @@ export const jprogDeviceSetup = (
                     programDeviceWithFw(device, firmwareOption, onProgress)
                 ),
         })),
-    isExpectedFirmware: (device, deviceInfo) => (dispatch, getState) => {
+    isExpectedFirmware: (device, deviceInfo) => async (_, getState) => {
         const fwVersions = firmwareOptions(device, firmware, deviceInfo);
         if (fwVersions.length === 0) {
             return Promise.resolve({
@@ -146,7 +146,8 @@ export const jprogDeviceSetup = (
             });
         }
 
-        return NrfutilDeviceLib.getFwInfo(device).then(info => {
+        try {
+            const info = await NrfutilDeviceLib.getFwInfo(device);
             if (info.imageInfoList.length > 0) {
                 const fw = fwVersions.find(version =>
                     info.imageInfoList.find(
@@ -161,11 +162,13 @@ export const jprogDeviceSetup = (
                     validFirmware: fw !== undefined,
                 });
             }
+        } catch {
+            // do nothing
+        }
 
-            return Promise.resolve({
-                device,
-                validFirmware: false,
-            });
+        return Promise.resolve({
+            device,
+            validFirmware: false,
         });
     },
     tryToSwitchToApplicationMode: () => () => Promise.resolve(null),

package/typings/generated/nrfutil/modules.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"modules.d.ts","sourceRoot":"","sources":["../../../nrfutil/modules.ts"],"names":[],"mappings":"AAYA,OAAgB,EAAE,cAAc,EAAE,MAAM,WAAW,CAAC;AACpD,OAAO,EAAE,QAAQ,EAAE,MAAM,gBAAgB,CAAC;AAoG1C,eAAO,MAAM,SAAS,WAAY,MAAM,6CAMvC,CAAC;AAEF,eAAO,MAAM,mBAAmB,WAAY,MAAM,YACZ,CAAC;AASvC,eAAO,MAAM,WAAW,UAAiB,QAAQ,kBAIhD,CAAC;AAEF,eAAO,MAAM,iBAAiB,YAAmB,OAAO,kBAIvD,CAAC;AAEF,eAAO,MAAM,oBAAoB,yDAK5B,CAAC"}
+{"version":3,"file":"modules.d.ts","sourceRoot":"","sources":["../../../nrfutil/modules.ts"],"names":[],"mappings":"AAYA,OAAgB,EAAE,cAAc,EAAE,MAAM,WAAW,CAAC;AACpD,OAAO,EAAE,QAAQ,EAAE,MAAM,gBAAgB,CAAC;AA4G1C,eAAO,MAAM,SAAS,WAAY,MAAM,6CAMvC,CAAC;AAEF,eAAO,MAAM,mBAAmB,WAAY,MAAM,YACZ,CAAC;AASvC,eAAO,MAAM,WAAW,UAAiB,QAAQ,kBAIhD,CAAC;AAEF,eAAO,MAAM,iBAAiB,YAAmB,OAAO,kBAIvD,CAAC;AAEF,eAAO,MAAM,oBAAoB,yDAK5B,CAAC"}

package/typings/generated/nrfutil/sandbox.d.ts

@@ -22,8 +22,10 @@ export declare class NrfutilSandbox {
     constructor(baseDir: string, module: string, version: string);
     private processLoggingData;
     getModuleVersion: () => Promise<ModuleVersion>;
+    getCoreVersion: () => Promise<ModuleVersion>;
     isSandboxInstalled: () => Promise<boolean>;
     prepareSandbox: (onProgress?: ((progress: Progress, task?: Task) => void) | undefined) => Promise<void>;
+    updateNrfUtilCore: (onProgress?: ((progress: Progress, task?: Task) => void) | undefined) => Promise<void>;
     getNrfutilExePath: () => string;
     spawnNrfutilSubcommand: <Result>(command: string, args: string[], onProgress?: ((progress: Progress, task?: Task) => void) | undefined, onTaskBegin?: ((taskBegin: TaskBegin) => void) | undefined, onTaskEnd?: ((taskEnd: TaskEnd<Result>) => void) | undefined, controller?: AbortController, editEnv?: ((env: NodeJS.ProcessEnv) => NodeJS.ProcessEnv) | undefined) => Promise<{
         taskEnd: TaskEnd<Result>[];

package/typings/generated/nrfutil/sandbox.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"sandbox.d.ts","sourceRoot":"","sources":["../../../nrfutil/sandbox.ts"],"names":[],"mappings":";AAiBA,OAAO,EACH,cAAc,EACd,QAAQ,EACR,UAAU,EACV,aAAa,EAGb,QAAQ,EACR,IAAI,EACJ,SAAS,EACT,OAAO,EACV,MAAM,gBAAgB,CAAC;AAcxB,QAAA,MAAM,UAAU,YAAa,MAAM,UAAU,MAAM,WAAW,MAAM;;;;;;;;;;;CAqBnE,CAAC;AAiDF,qBAAa,cAAc;IACvB,OAAO,EAAE,MAAM,CAAC;IAChB,MAAM,EAAE,MAAM,CAAC;IACf,OAAO,EAAE,MAAM,CAAC;IAChB,iBAAiB,EAAE,CAAC,CAAC,OAAO,EAAE,UAAU,EAAE,GAAG,CAAC,EAAE,MAAM,KAAK,IAAI,CAAC,EAAE,CAAM;IACxE,QAAQ,EAAE,QAAQ,CAAmC;IACrD,GAAG,EAAE,UAAU,CAAC,OAAO,UAAU,CAAC,CAAC;gBAEvB,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM;IAQ5D,OAAO,CAAC,kBAAkB,CASxB;IAEK,gBAAgB,+BAUrB;IAEK,kBAAkB,yBAmBvB;IAEK,cAAc,4BACO,QAAQ,SAAS,IAAI,KAAK,IAAI,gCAmBxD;IAEK,iBAAiB,eAA4C;IAE7D,sBAAsB,oBAChB,MAAM,QACT,MAAM,EAAE,2BACU,QAAQ,SAAS,IAAI,KAAK,IAAI,0CAC5B,SAAS,KAAK,IAAI,0DACF,IAAI,4BACjC,eAAe,mBACZ,OAAO,UAAU,KAAK,OAAO,UAAU;;;OAUrD;IAEN,OAAO,CAAC,mBAAmB,CAsBrB;IAEN,OAAO,CAAC,YAAY,CAmFlB;IAEK,YAAY,YACN,MAAM,QACT,MAAM,EAAE,iBACC,MAAM,QAAQ,MAAM,KAAK,MAAM,GAAG,SAAS,qBACvC,MAAM,QAAQ,MAAM,KAAK,IAAI,eACnC,eAAe,kBACb,OAAO,UAAU,KAAK,OAAO,UAAU,mBAqEnD;IAEA,qBAAqB,oBACf,MAAM,QACT,MAAM,EAAE,2BACU,QAAQ,SAAS,IAAI,KAAK,IAAI,0CAC5B,SAAS,KAAK,IAAI,0DACF,IAAI,4BACjC,eAAe,mBACZ,OAAO,UAAU,KAAK,OAAO,UAAU;;;OAUrD;IAEN,OAAO,CAAC,kBAAkB,CAmFxB;IAEK,WAAW,YACL,MAAM,QACT,MAAM,EAAE,iBACC,MAAM,QAAQ,MAAM,KAAK,IAAI,qBACzB,MAAM,QAAQ,MAAM,KAAK,IAAI,eACnC,eAAe,kBACb,OAAO,UAAU,KAAK,OAAO,UAAU,mBA0DnD;IAEA,yBAAyB,oBACnB,MAAM,QACT,MAAM,EAAE,uDAEE,OAAO,UAAU,KAAK,OAAO,UAAU;yBA4ClC,MAAM,IAAI;;qCAKE,KAAK,KAAK,IAAI,qBA7Cf,KAAK,KAAK,IAAI;MAoDhD;IAEK,8BAA8B,eACxB,MAAM,2BACS,QAAQ,SAAS,IAAI,KAAK,IAAI,4BACzC,eAAe,SACtB,MAAM,EAAE,sCAahB;IAEK,kCAAkC,sBAC5B,MAAM,2BACS,QAAQ,SAAS,IAAI,KAAK,IAAI,4BACzC,eAAe,SACtB,MAAM,EAAE,gBAehB;IAEK,+BAA+B,sBACzB,MAAM,eACF,eAAe,SACtB,MAAM,EAAE,gBAehB;IAEK,SAAS,sBACO,UAAU,QAAQ,MAAM,KAAK,IAAI,sBAlkB1B,UAAU,QAAQ,MAAM,KAAK,IAAI,IA2kB7D;IAEK,WAAW,UAAW,QAAQ,UAEnC;CACL;kCAGY,MAAM,UACP,MAAM,YACJ,MAAM,2BACQ,QAAQ,SAAS,IAAI,KAAK,IAAI;AAJ1D,wBAqBE"}
+{"version":3,"file":"sandbox.d.ts","sourceRoot":"","sources":["../../../nrfutil/sandbox.ts"],"names":[],"mappings":";AAiBA,OAAO,EACH,cAAc,EACd,QAAQ,EACR,UAAU,EACV,aAAa,EAGb,QAAQ,EACR,IAAI,EACJ,SAAS,EACT,OAAO,EACV,MAAM,gBAAgB,CAAC;AAcxB,QAAA,MAAM,UAAU,YAAa,MAAM,UAAU,MAAM,WAAW,MAAM;;;;;;;;;;;CAqBnE,CAAC;AAiDF,qBAAa,cAAc;IACvB,OAAO,EAAE,MAAM,CAAC;IAChB,MAAM,EAAE,MAAM,CAAC;IACf,OAAO,EAAE,MAAM,CAAC;IAChB,iBAAiB,EAAE,CAAC,CAAC,OAAO,EAAE,UAAU,EAAE,GAAG,CAAC,EAAE,MAAM,KAAK,IAAI,CAAC,EAAE,CAAM;IACxE,QAAQ,EAAE,QAAQ,CAAmC;IACrD,GAAG,EAAE,UAAU,CAAC,OAAO,UAAU,CAAC,CAAC;gBAEvB,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM;IAQ5D,OAAO,CAAC,kBAAkB,CASxB;IAEK,gBAAgB,+BAUrB;IAEK,cAAc,+BAQnB;IAEK,kBAAkB,yBAmBvB;IAEK,cAAc,4BACO,QAAQ,SAAS,IAAI,KAAK,IAAI,gCAmBxD;IAEK,iBAAiB,4BACI,QAAQ,SAAS,IAAI,KAAK,IAAI,gCAQxD;IAEK,iBAAiB,eAA4C;IAE7D,sBAAsB,oBAChB,MAAM,QACT,MAAM,EAAE,2BACU,QAAQ,SAAS,IAAI,KAAK,IAAI,0CAC5B,SAAS,KAAK,IAAI,0DACF,IAAI,4BACjC,eAAe,mBACZ,OAAO,UAAU,KAAK,OAAO,UAAU;;;OAUrD;IAEN,OAAO,CAAC,mBAAmB,CAsBrB;IAEN,OAAO,CAAC,YAAY,CAmFlB;IAEK,YAAY,YACN,MAAM,QACT,MAAM,EAAE,iBACC,MAAM,QAAQ,MAAM,KAAK,MAAM,GAAG,SAAS,qBACvC,MAAM,QAAQ,MAAM,KAAK,IAAI,eACnC,eAAe,kBACb,OAAO,UAAU,KAAK,OAAO,UAAU,mBAqEnD;IAEA,qBAAqB,oBACf,MAAM,QACT,MAAM,EAAE,2BACU,QAAQ,SAAS,IAAI,KAAK,IAAI,0CAC5B,SAAS,KAAK,IAAI,0DACF,IAAI,4BACjC,eAAe,mBACZ,OAAO,UAAU,KAAK,OAAO,UAAU;;;OAUrD;IAEN,OAAO,CAAC,kBAAkB,CAmFxB;IAEK,WAAW,YACL,MAAM,QACT,MAAM,EAAE,iBACC,MAAM,QAAQ,MAAM,KAAK,IAAI,qBACzB,MAAM,QAAQ,MAAM,KAAK,IAAI,eACnC,eAAe,kBACb,OAAO,UAAU,KAAK,OAAO,UAAU,mBA0DnD;IAEA,yBAAyB,oBACnB,MAAM,QACT,MAAM,EAAE,uDAEE,OAAO,UAAU,KAAK,OAAO,UAAU;yBA4ClC,MAAM,IAAI;;qCAKE,KAAK,KAAK,IAAI,qBA7Cf,KAAK,KAAK,IAAI;MAoDhD;IAEK,8BAA8B,eACxB,MAAM,2BACS,QAAQ,SAAS,IAAI,KAAK,IAAI,4BACzC,eAAe,SACtB,MAAM,EAAE,sCAahB;IAEK,kCAAkC,sBAC5B,MAAM,2BACS,QAAQ,SAAS,IAAI,KAAK,IAAI,4BACzC,eAAe,SACtB,MAAM,EAAE,gBAehB;IAEK,+BAA+B,sBACzB,MAAM,eACF,eAAe,SACtB,MAAM,EAAE,gBAehB;IAEK,SAAS,sBACO,UAAU,QAAQ,MAAM,KAAK,IAAI,sBAvlB1B,UAAU,QAAQ,MAAM,KAAK,IAAI,IAgmB7D;IAEK,WAAW,UAAW,QAAQ,UAEnC;CACL;kCAGY,MAAM,UACP,MAAM,YACJ,MAAM,2BACQ,QAAQ,SAAS,IAAI,KAAK,IAAI;AAJ1D,wBAwBE"}

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

@@ -1 +1 @@
-{"version":3,"file":"jprogOperations.d.ts","sourceRoot":"","sources":["../../../../src/Device/jprogOperations.ts"],"names":[],"mappings":"AAUA,OAAO,EAAE,WAAW,EAAE,UAAU,EAAE,MAAM,eAAe,CAAC;AAmGxD,eAAO,MAAM,gBAAgB,aACf,UAAU,EAAE,uEAGvB,WA0DD,CAAC"}
+{"version":3,"file":"jprogOperations.d.ts","sourceRoot":"","sources":["../../../../src/Device/jprogOperations.ts"],"names":[],"mappings":"AAUA,OAAO,EAAE,WAAW,EAAE,UAAU,EAAE,MAAM,eAAe,CAAC;AAmGxD,eAAO,MAAM,gBAAgB,aACf,UAAU,EAAE,uEAGvB,WA6DD,CAAC"}