@nordicsemiconductor/pc-nrfconnect-shared 121.0.0 → 123.0.0

package/nrfutil/device/recover.ts

@@ -8,11 +8,11 @@ import { Progress } from '../sandboxTypes';
 import {
     DeviceCore,
     deviceSingleTaskEndOperationVoid,
-    NrfutilDeviceWithSerialnumber,
+    NrfutilDevice,
 } from './common';
 
 export default (
-    device: NrfutilDeviceWithSerialnumber,
+    device: NrfutilDevice,
     core?: DeviceCore,
     onProgress?: (progress: Progress) => void,
     controller?: AbortController

package/nrfutil/device/reset.ts

@@ -8,12 +8,12 @@ import { Progress } from '../sandboxTypes';
 import {
     DeviceCore,
     deviceSingleTaskEndOperationVoid,
-    NrfutilDeviceWithSerialnumber,
+    NrfutilDevice,
     ResetKind,
 } from './common';
 
 export default async (
-    device: NrfutilDeviceWithSerialnumber,
+    device: NrfutilDevice,
     core?: DeviceCore,
     resetKind?: ResetKind,
     onProgress?: (progress: Progress) => void,

package/nrfutil/device/setMcuState.ts

@@ -5,15 +5,12 @@
  */
 
 import { Progress } from '../sandboxTypes';
-import {
-    deviceSingleTaskEndOperationVoid,
-    NrfutilDeviceWithSerialnumber,
-} from './common';
+import { deviceSingleTaskEndOperationVoid, NrfutilDevice } from './common';
 
 export type McuState = 'Application' | 'Programming';
 
 export default (
-    device: NrfutilDeviceWithSerialnumber,
+    device: NrfutilDevice,
     state: McuState,
     onProgress?: (progress: Progress) => void,
     controller?: AbortController

package/nrfutil/device/setProtectionStatus.ts

@@ -8,11 +8,11 @@ import { Progress } from '../sandboxTypes';
 import {
     DeviceCore,
     deviceSingleTaskEndOperationVoid,
-    NrfutilDeviceWithSerialnumber,
+    NrfutilDevice,
 } from './common';
 
 export default (
-    device: NrfutilDeviceWithSerialnumber,
+    device: NrfutilDevice,
     region: 'All' | 'SecureRegions' | 'Region0' | 'Region0Region1',
     core?: DeviceCore,
     onProgress?: (progress: Progress) => void,

package/nrfutil/index.ts

@@ -12,9 +12,9 @@ export type {
     ProtectionStatus,
     SerialPort as DeviceSerialPort,
     NrfutilDevice,
-    NrfutilDeviceWithSerialnumber,
 } from './device/common';
 
+export type { DeviceInfo } from './device/deviceInfo';
 export type { DeviceCoreInfo } from './device/getCoreInfo';
 export type { ImageType } from './device/getFwInfo';
 

package/nrfutil/moduleVersion.ts

@@ -4,13 +4,14 @@
  * SPDX-License-Identifier: LicenseRef-Nordic-4-Clause
  */
 
-import packageJson from '../src/utils/packageJson';
+import { packageJsonApp } from '../src/utils/packageJson';
 import {
     Dependency,
     isIncrementalVersion,
     isSemanticVersion,
     isStringVersion,
     SubDependency,
+    versionToString,
 } from './sandboxTypes';
 
 export const describeVersion = (version?: SubDependency | string) => {
@@ -51,6 +52,25 @@ const findInDependencies = (
     }
 };
 
+export const getExpectedVersion = (dependency: Dependency) => {
+    const currentVersion = versionToString(
+        dependency.versionFormat,
+        dependency.version
+    );
+
+    const expectedVersion = dependency.expectedVersion
+        ? versionToString(
+              dependency.expectedVersion.versionFormat,
+              dependency.expectedVersion.version
+          )
+        : currentVersion;
+
+    return {
+        isExpectedVersion: currentVersion === expectedVersion,
+        expectedVersion,
+    };
+};
+
 export const resolveModuleVersion = (
     module: KnownModule,
     versions: Dependency[] = []
@@ -69,7 +89,7 @@ const overriddenVersion = (module: string) => {
 };
 
 const versionFromPackageJson = (module: string) =>
-    packageJson().nrfConnectForDesktop.nrfutil?.[module][0];
+    packageJsonApp().nrfConnectForDesktop.nrfutil?.[module][0];
 
 const failToDetermineVersion = (module: string) => {
     throw new Error(`No version specified for nrfutil-${module}`);

package/nrfutil/sandbox.ts

@@ -10,6 +10,7 @@ import os from 'os';
 import path from 'path';
 
 import describeError from '../src/logging/describeError';
+import usageData from '../src/utils/usageData';
 import { versionToInstall } from './moduleVersion';
 import { getNrfutilLogger } from './nrfutilLogger';
 import {
@@ -67,8 +68,9 @@ const commonParser = <Result>(
         onInfo?: (info: Result) => void;
         onTaskBegin?: (taskEnd: TaskBegin) => void;
         onTaskEnd?: (taskEnd: TaskEnd<Result>) => void;
-        onLogging?: (logging: LogMessage) => void;
-    }
+        onLogging?: (logging: LogMessage, pid?: number) => void;
+    },
+    pid?: number
 ): Buffer | undefined => {
     const parsedData: NrfutilJson<Result>[] | undefined =
         parseJsonBuffers(data);
@@ -95,7 +97,7 @@ const commonParser = <Result>(
                 callbacks.onInfo?.(item.data);
                 break;
             case 'log':
-                callbacks.onLogging?.(item.data);
+                callbacks.onLogging?.(item.data, pid);
                 break;
             case 'batch_update':
                 processItem(item.data.data);
@@ -110,7 +112,7 @@ export class NrfutilSandbox {
     baseDir: string;
     module: string;
     version: string;
-    onLoggingHandlers: ((logging: LogMessage) => void)[] = [];
+    onLoggingHandlers: ((logging: LogMessage, pid?: number) => void)[] = [];
     logLevel: LogLevel = 'info';
     env: ReturnType<typeof prepareEnv>;
 
@@ -122,9 +124,11 @@ export class NrfutilSandbox {
         this.env = prepareEnv(baseDir, module, version);
     }
 
-    private processLoggingData = (data: NrfutilJson) => {
+    private processLoggingData = (data: NrfutilJson, pid?: number) => {
         if (data.type === 'log') {
-            this.onLoggingHandlers.forEach(onLogging => onLogging(data.data));
+            this.onLoggingHandlers.forEach(onLogging =>
+                onLogging(data.data, pid)
+            );
             return true;
         }
 
@@ -200,28 +204,35 @@ export class NrfutilSandbox {
         const info: Result[] = [];
         const taskEnd: TaskEnd<Result>[] = [];
         let stdErr: string | undefined;
+        let pid: number | undefined;
+
         try {
             await this.execCommand(
                 command,
                 args,
-                data =>
-                    commonParser<Result>(data, {
-                        onProgress,
-                        onTaskBegin,
-                        onTaskEnd: end => {
-                            taskEnd.push(end);
-                            onTaskEnd?.(end);
-                        },
-                        onInfo: i => {
-                            info.push(i);
+                (data, processId) =>
+                    commonParser<Result>(
+                        data,
+                        {
+                            onProgress,
+                            onTaskBegin,
+                            onTaskEnd: end => {
+                                taskEnd.push(end);
+                                onTaskEnd?.(end);
+                            },
+                            onInfo: i => {
+                                info.push(i);
+                            },
+                            onLogging: logging => {
+                                this.onLoggingHandlers.forEach(onLogging => {
+                                    onLogging(logging, processId);
+                                });
+                            },
                         },
-                        onLogging: logging => {
-                            this.onLoggingHandlers.forEach(onLogging => {
-                                onLogging(logging);
-                            });
-                        },
-                    }),
-                data => {
+                        processId
+                    ),
+                (data, processId) => {
+                    pid = processId;
                     stdErr = (stdErr ?? '') + data.toString();
                 },
                 controller
@@ -256,6 +267,11 @@ export class NrfutilSandbox {
             }
 
             error.message = error.message.replaceAll('Error: ', '');
+            usageData.sendErrorReport(
+                `${
+                    pid && this.logLevel === 'trace' ? `[PID:${pid}] ` : ''
+                }${describeError(error)}`
+            );
             throw error;
         }
     };
@@ -280,12 +296,13 @@ export class NrfutilSandbox {
     private execCommand = (
         command: string,
         args: string[],
-        parser: (data: Buffer) => Buffer | undefined,
-        onStdError: (data: Buffer) => void,
+        parser: (data: Buffer, pid?: number) => Buffer | undefined,
+        onStdError: (data: Buffer, pid?: number) => void,
         controller?: AbortController
     ) =>
         new Promise<void>((resolve, reject) => {
             let aborting = false;
+            usageData.sendUsageData(`running nrfutil ${command}`, { args });
             const nrfutil = spawn(
                 path.join(this.baseDir, 'nrfutil'),
                 [
@@ -319,7 +336,7 @@ export class NrfutilSandbox {
                 if (controller?.signal.aborted) return;
 
                 buffer = Buffer.concat([buffer, data]);
-                const remainingBytes = parser(buffer);
+                const remainingBytes = parser(buffer, nrfutil.pid);
                 if (remainingBytes) {
                     buffer = remainingBytes;
                 } else {
@@ -328,7 +345,7 @@ export class NrfutilSandbox {
             });
 
             nrfutil.stderr.on('data', (data: Buffer) => {
-                onStdError(data);
+                onStdError(data, nrfutil.pid);
             });
 
             nrfutil.on('close', code => {
@@ -364,7 +381,7 @@ export class NrfutilSandbox {
         const operation = this.execCommand(
             this.module,
             [command, ...args],
-            data => {
+            (data, pid) => {
                 const parsedData: NrfutilJson<Result>[] | undefined =
                     parseJsonBuffers(data);
 
@@ -373,15 +390,15 @@ export class NrfutilSandbox {
                 }
 
                 parsedData.forEach(item => {
-                    if (!this.processLoggingData(item)) {
+                    if (!this.processLoggingData(item, pid)) {
                         if (item.type === 'info') {
                             processors.onData(item.data);
                         }
                     }
                 });
             },
-            data => {
-                processors.onError(new Error(data.toString()));
+            (data, pid) => {
+                processors.onError(new Error(data.toString()), pid);
             },
             controller
         );
@@ -392,6 +409,7 @@ export class NrfutilSandbox {
                 closedHandlers.forEach(callback => callback());
             })
             .catch(error => {
+                usageData.sendErrorReport(describeError(error));
                 running = false;
                 closedHandlers.forEach(callback => callback(error));
             });
@@ -471,7 +489,9 @@ export class NrfutilSandbox {
         throw new Error('Unexpected result');
     };
 
-    public onLogging = (handler: (logging: LogMessage) => void) => {
+    public onLogging = (
+        handler: (logging: LogMessage, pid?: number) => void
+    ) => {
         this.onLoggingHandlers.push(handler);
 
         return () =>

package/nrfutil/sandboxTypes.ts

@@ -5,7 +5,7 @@
  */
 
 export interface BackgroundTask<T> {
-    onError: (error: Error) => void;
+    onError: (error: Error, pid?: number) => void;
     onData: (data: T) => void;
 }
 
@@ -155,6 +155,10 @@ export type Dependency = {
     dependencies?: SubDependency[];
     versionFormat: VersionFormat;
     version: VersionType;
+    expectedVersion?: {
+        versionFormat: VersionFormat;
+        version: VersionType;
+    };
 };
 
 export type VersionType = SemanticVersion | string | number;
@@ -165,6 +169,7 @@ export interface SubDependency {
     dependencies?: SubDependency[];
     versionFormat: VersionFormat;
     version: VersionType;
+    expectedVersion?: { versionFormat: VersionFormat; version: VersionType };
 }
 
 export type ModuleVersion = {
@@ -192,3 +197,12 @@ export const isStringVersion = (
     version?: SubDependency
 ): version is SubDependency & { version: string } =>
     version?.versionFormat === 'string';
+
+export const versionToString = (type: VersionFormat, version: VersionType) => {
+    if (type === 'incremental' || type === 'string') {
+        return `${version}`;
+    }
+
+    const v = version as SemanticVersion;
+    return `${v.major}.${v.minor}.${v.patch}`;
+};

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@nordicsemiconductor/pc-nrfconnect-shared",
-    "version": "121.0.0",
+    "version": "123.0.0",
     "description": "Shared commodities for developing pc-nrfconnect-* packages",
     "repository": {
         "type": "git",
@@ -33,7 +33,7 @@
         "@mdi/font": "7.2.96",
         "@mdi/js": "^7.2.96",
         "@mdi/react": "^1.6.1",
-        "@microsoft/applicationinsights-web": "^3.0.2",
+        "@microsoft/applicationinsights-web": "^3.0.4",
         "@reduxjs/toolkit": "1.9.3",
         "@svgr/core": "^7.0.0",
         "@svgr/plugin-jsx": "7.0.0",
@@ -57,6 +57,7 @@
         "@typescript-eslint/eslint-plugin": "5.57.1",
         "@typescript-eslint/parser": "5.57.1",
         "adm-zip": "^0.5.5",
+        "applicationinsights": "^2.9.0",
         "autoprefixer": "10.4.14",
         "bootstrap": "4.6.2",
         "commander": "10.0.0",

package/scripts/check-app-properties.ts

@@ -10,7 +10,7 @@ import { execSync } from 'child_process';
 import { existsSync, readdirSync, readFileSync } from 'fs';
 import property from 'lodash/property';
 
-import { PackageJson, parsePackageJson } from '../ipc/schema/packageJson';
+import { PackageJsonApp, parsePackageJsonApp } from '../ipc/schema/packageJson';
 
 const format = (strings: string[]) =>
     strings.map(string => `\`${string}\``).join(', ');
@@ -61,7 +61,7 @@ const mustContainOneOf = (
     }
 };
 
-const checkRepoUrl = (packageJson: PackageJson) => {
+const checkRepoUrl = (packageJson: PackageJsonApp) => {
     if (!existsSync('./.git')) {
         return;
     }
@@ -88,7 +88,7 @@ const checkRepoUrl = (packageJson: PackageJson) => {
     }
 };
 
-const checkOptionalProperties = (packageJson: PackageJson) => {
+const checkOptionalProperties = (packageJson: PackageJsonApp) => {
     if (propertyIsMissing(packageJson)('homepage')) {
         warn('Please provide a property `homepage` in package.json.');
     }
@@ -100,7 +100,7 @@ const checkOptionalProperties = (packageJson: PackageJson) => {
     }
 };
 
-const checkFileProperty = (packageJson: PackageJson) => {
+const checkFileProperty = (packageJson: PackageJsonApp) => {
     mustContain(
         packageJson.files ?? [],
         ['LICENSE', 'dist/', 'Changelog.md'],
@@ -115,7 +115,7 @@ const checkFileProperty = (packageJson: PackageJson) => {
 };
 
 const readAndCheckPackageJson = () => {
-    const packageJsonResult = parsePackageJson(
+    const packageJsonResult = parsePackageJsonApp(
         readFileSync('./package.json', 'utf8')
     );
 
@@ -136,7 +136,7 @@ const changelogEntryRegexp = (version?: string) =>
     new RegExp(`^## ${version}`, 'mi');
 
 const checkChangelog = (
-    packageJson: PackageJson,
+    packageJson: PackageJsonApp,
     checkChangelogHasCurrentEntry: boolean
 ) => {
     if (!existsSync('./Changelog.md')) {

package/scripts/esbuild.ts

@@ -8,11 +8,11 @@
 import * as fs from 'node:fs';
 import * as path from 'node:path';
 
-import { parsePackageJson } from '../ipc/schema/packageJson';
+import { parsePackageJsonApp } from '../ipc/schema/packageJson';
 import { build } from './esbuild-renderer';
 
 const validate = (packageJson: string) => {
-    const result = parsePackageJson(packageJson);
+    const result = parsePackageJsonApp(packageJson);
 
     if (!result.success) {
         console.log(result.error.message);
@@ -42,7 +42,7 @@ const bundle = () => {
 
     build({
         define: {
-            'process.env.PACKAGE_JSON_OF_APP': JSON.stringify(packageJson),
+            'process.env.PACKAGE_JSON': JSON.stringify(packageJson),
         },
         entryPoints: [entry()],
     });