@nordicsemiconductor/pc-nrfconnect-shared 78.0.0 → 80.0.0

package/Changelog.md

@@ -7,7 +7,7 @@ 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.
 
-## 78 - 2023-08-02
+## 80 - Unreleased
 
 ### Changed
 
@@ -16,6 +16,37 @@ every new version is a new major version.
     and use the new name `@nordicsemiconductor/pc-nrfconnect-shared` when
     importing components from shared
 
+### Steps to upgrade when using this package
+
+-   Change all references from `pc-nrfconnect-shared` to
+    `@nordicsemiconductor/pc-nrfconnect-shared`
+
+```diff
+- import { App } from 'pc-nrfconnect-shared';
++ import { App } from '@nordicsemiconductor/pc-nrfconnect-shared';
+```
+
+-   Also check references in `tsconfig.json`, s`jest.config.js` and
+    `.scss`-files.
+
+## 79 - 2023-08-04
+
+### Added
+
+-   Export app utility functions (like `isInstalled`) and types.
+
+## 78 - 2023-08-03
+
+### Changed
+
+-   Shared now only uses `device.jlink.boardversion` instead of
+    `jlink.boardVersion`.
+
+### Fixed
+
+-   `deviceInfo` can now be used in applications that don't make use of the
+    shared redux store.
+
 ## 77 - 2023-08-01
 
 ### Added

package/ipc/MetaFiles.ts

@@ -0,0 +1,64 @@
+/*
+ * Copyright (c) 2022 Nordic Semiconductor ASA
+ *
+ * SPDX-License-Identifier: LicenseRef-Nordic-4-Clause
+ */
+
+export type UrlString = string;
+
+export interface SourceJson {
+    name: string;
+    apps: UrlString[];
+}
+
+export type WithdrawnJson = UrlString[];
+
+export type AppVersions = {
+    [version: string]: {
+        shasum?: string;
+        tarballUrl: UrlString;
+    };
+};
+
+export interface AppInfo {
+    name: string;
+    displayName: string;
+    description: string;
+    homepage?: UrlString;
+    iconUrl: UrlString;
+    releaseNotesUrl: UrlString;
+    latestVersion: string;
+    versions: AppVersions;
+    installed?: {
+        path: string;
+        shasum?: string;
+    };
+}
+
+interface ObjectContainingOptionalStrings {
+    [index: string]: string | undefined;
+}
+
+export interface PackageJson {
+    name: string;
+    version: string;
+
+    // Several optional properties
+    author?: string;
+    bin?: ObjectContainingOptionalStrings | string;
+    dependencies?: ObjectContainingOptionalStrings;
+    description?: string;
+    homepage?: UrlString;
+    devDependencies?: ObjectContainingOptionalStrings;
+    displayName?: string;
+    engines?: ObjectContainingOptionalStrings;
+    files?: readonly string[];
+    license?: string;
+    main?: string;
+    peerDependencies?: ObjectContainingOptionalStrings;
+    repository?: {
+        type: string;
+        url: UrlString;
+    };
+    scripts?: ObjectContainingOptionalStrings;
+}

package/ipc/README.md

@@ -0,0 +1,43 @@
+The folder `ipc/` is meant as a middle layer between the main and renderer
+processes.
+
+Some of the code here should be called from the main process, usually to
+register IPC handlers. Other code here should be called from the renderer
+process(es), usually the ones to send IPC messages. They are both kept together
+to keep them in sync, especially that the channel names and the shape of the
+messages are the same.
+
+All the code for the main process here is ran by the launcher. The launcher or
+apps can invoke the functions from here, e.g. to do things like opening an app.
+This means, the API must be kept stable here and in the launcher, so that the
+launcher will react in the way the apps expect it.
+
+## Code conventions
+
+There are a few conventions we follow with the code here in `ipc/`:
+
+-   In each file there are pairs of functions: One to send a message over an IPC
+    channel (e.g. `openApp`) and another to register a handler for the messages
+    on that same channel (e.g. `registerOpenApp`).
+
+    Usually these two functions utilize a shared signature which is defined in a
+    type above them. Usually the functions are defined by invoking functions
+    from `infrastructure/mainToRenderer.ts` or
+    `infrastructure/rendererToMain.ts` which also use that type.
+
+-   The functions mentioned before are then exported in objects with the names
+    `inMain`, `forRenderer`, `inRenderer`, and `forMain` to signify how the
+    functions are supposed to be used. E.g. the mentioned `openApp` is in
+    `inMain` because it is called by code in the renderer processes to invoke
+    code in the main process to open an window. `registerOpenApp` is in
+    `forRenderer` because the handler is registered so that code in the renderer
+    processes can invoke it.
+
+    So, `inMain` and `forRenderer` are used when sending messages from the
+    renderer processes to the main process. `inRenderer` and `forMain` are used,
+    when sending messages from the main process to the renderer processes.
+
+-   The code here in `ipc/` must neither reference any code in `src/` (which is
+    for code of the renderer processes) nor in `main/` (which is for code in the
+    main process). Only the other way around code in those two folders can
+    reference code in `ipc/`.

package/ipc/appDetails.ts

@@ -0,0 +1,47 @@
+/*
+ * Copyright (c) 2022 Nordic Semiconductor ASA
+ *
+ * SPDX-License-Identifier: LicenseRef-Nordic-4-Clause
+ */
+
+import { ipcMain, WebContents } from 'electron';
+
+import { LaunchableApp } from './apps';
+import { handleWithSender, invoke } from './infrastructure/rendererToMain';
+
+const channel = {
+    request: 'get-app-details',
+    response: 'app-details',
+};
+
+interface AppDetails {
+    coreVersion: string;
+    corePath: string;
+    homeDir: string;
+    tmpDir: string;
+    bundledJlink: string;
+    path: string;
+}
+
+export type AppDetailsFromLauncher = AppDetails & LaunchableApp;
+
+type GetAppDetails = () => AppDetailsFromLauncher;
+
+const getAppDetails = invoke<GetAppDetails>(channel.request);
+
+const registerGetAppDetails = (
+    onGetAppDetails: (webContents: WebContents) => AppDetailsFromLauncher
+) => {
+    handleWithSender<GetAppDetails>(channel.request)(onGetAppDetails);
+
+    // This legacy implementation is still needed, because we currently still
+    // send the corresponding message in apps using shared 76 or earlier.
+    // When all apps are updated and required a launcher using shared 77 or
+    // later, we can remove this.
+    ipcMain.on(channel.request, event => {
+        event.sender.send(channel.response, onGetAppDetails(event.sender));
+    });
+};
+
+export const forRenderer = { registerGetAppDetails };
+export const inMain = { getAppDetails };

package/ipc/apps.ts

@@ -0,0 +1,151 @@
+/*
+ * Copyright (c) 2022 Nordic Semiconductor ASA
+ *
+ * SPDX-License-Identifier: LicenseRef-Nordic-4-Clause
+ */
+
+import { handle, invoke } from './infrastructure/rendererToMain';
+import { AppVersions, UrlString } from './MetaFiles';
+import { LOCAL, Source, SourceName } from './sources';
+
+export interface AppSpec {
+    name: string;
+    source: SourceName;
+}
+
+interface BaseApp {
+    name: string;
+    displayName: string;
+    description: string;
+    iconPath: string;
+}
+
+interface Downloadable {
+    source: SourceName;
+    homepage?: UrlString;
+    versions?: AppVersions;
+    releaseNotes?: string;
+    latestVersion: string;
+}
+
+interface Installed {
+    currentVersion: string;
+    engineVersion?: string;
+    repositoryUrl?: UrlString;
+    html?: string;
+    installed: {
+        path: string;
+        shasum?: string;
+    };
+}
+
+export interface LocalApp extends Installed, BaseApp {
+    source: typeof LOCAL;
+}
+
+export interface InstalledDownloadableApp
+    extends BaseApp,
+        Installed,
+        Downloadable {
+    isWithdrawn: false;
+}
+
+export interface UninstalledDownloadableApp extends BaseApp, Downloadable {
+    isWithdrawn: false;
+}
+
+export interface WithdrawnApp extends BaseApp, Installed, Downloadable {
+    isWithdrawn: true;
+}
+
+export type DownloadableApp =
+    | InstalledDownloadableApp
+    | UninstalledDownloadableApp
+    | WithdrawnApp;
+
+export type LaunchableApp = LocalApp | InstalledDownloadableApp | WithdrawnApp;
+
+export type App = LocalApp | DownloadableApp;
+
+export interface AppWithError extends AppSpec {
+    reason: unknown;
+    path: string;
+}
+
+const channel = {
+    getDownloadableApps: 'apps:get-downloadable-apps',
+    installDownloadableApp: 'apps:install-downloadable-app',
+};
+
+export type SourceWithError = { source: Source; reason?: string };
+
+export const isDownloadable = (app?: App): app is DownloadableApp =>
+    app != null && app?.source !== LOCAL;
+
+export const isInstalled = (app?: App): app is LaunchableApp =>
+    app != null && 'installed' in app;
+
+export const isWithdrawn = (app?: App): app is WithdrawnApp =>
+    isDownloadable(app) && app.isWithdrawn;
+
+const latestVersionHasDifferentChecksum = (app: InstalledDownloadableApp) => {
+    const shaOfLatest = app.versions?.[app.latestVersion]?.shasum;
+    const shaOfInstalled = app.installed.shasum;
+
+    return (
+        shaOfLatest != null &&
+        shaOfInstalled != null &&
+        shaOfInstalled !== shaOfLatest
+    );
+};
+
+export const isUpdatable = (app?: App): app is InstalledDownloadableApp =>
+    !isWithdrawn(app) &&
+    isInstalled(app) &&
+    isDownloadable(app) &&
+    (app.currentVersion !== app.latestVersion ||
+        latestVersionHasDifferentChecksum(app));
+
+// getDownloadableApps
+type GetDownloadableAppsResult = {
+    apps: DownloadableApp[];
+    appsWithErrors: AppWithError[];
+    sourcesWithErrors: SourceWithError[];
+};
+
+type GetDownloadableApps = () => GetDownloadableAppsResult;
+
+const getDownloadableApps = invoke<GetDownloadableApps>(
+    channel.getDownloadableApps
+);
+const registerGetDownloadableApps = handle<GetDownloadableApps>(
+    channel.getDownloadableApps
+);
+
+// installDownloadableApp
+type InstallDownloadableApp = (
+    app: DownloadableApp,
+    version?: string
+) => DownloadableApp;
+
+const installDownloadableApp = invoke<InstallDownloadableApp>(
+    channel.installDownloadableApp
+);
+const registerInstallDownloadableApp = handle<InstallDownloadableApp>(
+    channel.installDownloadableApp
+);
+
+export const forRenderer = {
+    registerGetDownloadableApps,
+    registerInstallDownloadableApp,
+};
+
+export const inMain = {
+    getDownloadableApps,
+    installDownloadableApp,
+
+    isDownloadable,
+    isInstalled,
+    isWithdrawn,
+    isUpdatable,
+};

package/ipc/infrastructure/mainToRenderer.ts

@@ -0,0 +1,49 @@
+/*
+ * Copyright (c) 2022 Nordic Semiconductor ASA
+ *
+ * SPDX-License-Identifier: LicenseRef-Nordic-4-Clause
+ */
+
+import { BrowserWindow, ipcRenderer, WebContents } from 'electron';
+
+let launcherWindow: BrowserWindow | undefined;
+
+export const registerLauncherWindowFromMain = (window: BrowserWindow) => {
+    launcherWindow = window;
+};
+
+export const send =
+    <T extends (...args: never[]) => void>(channel: string) =>
+    (...args: Parameters<T>) =>
+        launcherWindow?.webContents.send(channel, ...args);
+
+export const on =
+    <T extends (...args: never[]) => void>(channel: string) =>
+    (handler: T) =>
+        ipcRenderer.on(channel, (_event, ...args: unknown[]) =>
+            handler(...(args as Parameters<T>))
+        );
+
+// Broadcast with a subchannel
+
+export const broadcast =
+    <T extends (...args: never[]) => void>(channel: string) =>
+    (
+        subChannel: string,
+        targets: Pick<WebContents, 'send'>[] = [],
+        ...args: Parameters<T>
+    ) =>
+        targets.forEach(target => {
+            target.send(`${channel}_${subChannel}`, ...args);
+        });
+
+export const onBroadcasted =
+    <T extends (...args: never[]) => void>(
+        channel: string,
+        subChannel: string
+    ) =>
+    (handler: T) =>
+        ipcRenderer.on(
+            `${channel}_${subChannel}`,
+            (_event, ...args: unknown[]) => handler(...(args as Parameters<T>))
+        );

package/ipc/infrastructure/rendererToMain.ts

@@ -0,0 +1,51 @@
+/*
+ * Copyright (c) 2022 Nordic Semiconductor ASA
+ *
+ * SPDX-License-Identifier: LicenseRef-Nordic-4-Clause
+ */
+
+import { ipcMain, ipcRenderer, WebContents } from 'electron';
+
+// Send
+export const send =
+    <T extends (...args: never[]) => void>(channel: string) =>
+    (...args: Parameters<T>) =>
+        ipcRenderer.send(channel, ...args);
+
+export const on =
+    <T extends (...args: never[]) => void>(channel: string) =>
+    (handler: T) =>
+        ipcMain.on(channel, (_event, ...args: unknown[]) =>
+            handler(...(args as Parameters<T>))
+        );
+
+// Invoke
+export const invoke =
+    <T extends (...args: never[]) => unknown>(channel: string) =>
+    (...args: Parameters<T>) =>
+        ipcRenderer.invoke(channel, ...args) as Promise<ReturnType<T>>;
+
+export const handle =
+    <T extends (...args: never[]) => unknown>(channel: string) =>
+    (
+        handler:
+            | ((...args: Parameters<T>) => ReturnType<T>)
+            | ((...args: Parameters<T>) => Promise<ReturnType<T>>)
+    ) =>
+        ipcMain.handle(channel, (_event, ...args: unknown[]) =>
+            handler(...(args as Parameters<T>))
+        );
+
+export const handleWithSender =
+    <T extends (...args: never[]) => unknown>(channel: string) =>
+    (
+        handler:
+            | ((sender: WebContents, ...args: Parameters<T>) => ReturnType<T>)
+            | ((
+                  sender: WebContents,
+                  ...args: Parameters<T>
+              ) => Promise<ReturnType<T>>)
+    ) =>
+        ipcMain.handle(channel, ({ sender }, ...args: unknown[]) =>
+            handler(sender, ...(args as Parameters<T>))
+        );

package/ipc/openWindow.ts

@@ -0,0 +1,35 @@
+/*
+ * Copyright (c) 2022 Nordic Semiconductor ASA
+ *
+ * SPDX-License-Identifier: LicenseRef-Nordic-4-Clause
+ */
+
+import type { AppSpec } from './apps';
+import { on, send } from './infrastructure/rendererToMain';
+
+const channel = {
+    app: 'open:app',
+    launcher: 'open-app-launcher', // It would be nice to call this `open:launcher` but we have to stick to the current name, because that is used by supported apps.
+};
+
+export interface OpenAppOptions {
+    device?: { serialNumber: string; serialPortPath?: string };
+}
+
+type OpenApp = (app: AppSpec, openAppOptions?: OpenAppOptions) => void;
+const openApp = send<OpenApp>(channel.app);
+const registerOpenApp = on<OpenApp>(channel.app);
+
+type OpenLauncher = () => void;
+const openLauncher = send<OpenLauncher>(channel.launcher);
+const registerOpenLauncher = on<OpenLauncher>(channel.launcher);
+
+export const forRenderer = {
+    registerOpenApp,
+    registerOpenLauncher,
+};
+
+export const inMain = {
+    openApp,
+    openLauncher,
+};

package/ipc/preventSleep.ts

@@ -0,0 +1,23 @@
+/*
+ * Copyright (c) 2023 Nordic Semiconductor ASA
+ *
+ * SPDX-License-Identifier: LicenseRef-Nordic-4-Clause
+ */
+
+import { handle, invoke, on, send } from './infrastructure/rendererToMain';
+
+const channel = {
+    start: 'prevent-sleep:start',
+    end: 'prevent-sleep:end',
+};
+
+type Start = () => number;
+const start = invoke<Start>(channel.start);
+const registerStart = handle<Start>(channel.start);
+
+type End = (id: number) => void;
+const end = send<End>(channel.end);
+const registerEnd = on<End>(channel.end);
+
+export const forRenderer = { registerStart, registerEnd };
+export const inMain = { start, end };

package/ipc/serialPort.ts

@@ -0,0 +1,167 @@
+/*
+ * Copyright (c) 2023 Nordic Semiconductor ASA
+ *
+ * SPDX-License-Identifier: LicenseRef-Nordic-4-Clause
+ */
+
+import type {
+    AutoDetectTypes,
+    SetOptions,
+    UpdateOptions,
+} from '@serialport/bindings-cpp';
+import type { SerialPortOpenOptions } from 'serialport';
+
+import { broadcast, onBroadcasted } from './infrastructure/mainToRenderer';
+import {
+    handle,
+    handleWithSender,
+    invoke,
+} from './infrastructure/rendererToMain';
+
+const channel = {
+    // **************
+    // Commands (from the renderer processes of apps to the main process)
+    // **************
+    open: 'serialport:open',
+    close: 'serialport:close',
+    write: 'serialport:write',
+    update: 'serialport:update',
+    set: 'serialport:set',
+
+    // **************
+    // Queries (from the renderer processes of apps to the main process)
+    // **************
+    isOpen: 'serialport:is-open',
+    getOptions: 'serialport:get-options',
+
+    // **************
+    // Callbacks (from the the main process to the renderer processes of apps)
+    // **************
+    onClosed: 'serialport:on-close',
+    onUpdated: 'serialport:on-update',
+    onSet: 'serialport:on-set',
+    onChanged: 'serialport:on-changed',
+
+    // Would be nice to rename the next two channels, but we cannot change the
+    // string because it would break interoperability between apps and launchers
+    onDataReived: 'serialport:on-data',
+    onDataWritten: 'serialport:on-write',
+};
+
+export type OverwriteOptions = {
+    overwrite?: boolean;
+    settingsLocked?: boolean;
+};
+
+// **************
+// Commands (from the renderer processes of apps to the main process)
+// **************
+
+type Open = (
+    options: SerialPortOpenOptions<AutoDetectTypes>,
+    overwriteOptions: OverwriteOptions
+) => void;
+const open = invoke<Open>(channel.open);
+const registerOpen = handleWithSender<Open>(channel.open);
+
+type Close = (path: string) => void;
+const close = invoke<Close>(channel.close);
+const registerClose = handleWithSender<Close>(channel.close);
+
+type Write = (path: string, data: string | number[] | Buffer) => void;
+const write = invoke<Write>(channel.write);
+const registerWrite = handle<Write>(channel.write);
+
+type Update = (path: string, options: UpdateOptions) => void;
+const update = invoke<Update>(channel.update);
+const registerUpdate = handle<Update>(channel.update);
+
+type Set = (path: string, set: SetOptions) => void;
+const set = invoke<Set>(channel.set);
+const registerSet = handle<Set>(channel.set);
+
+// **************
+// Queries (from the renderer processes of apps to the main process)
+// **************
+
+type IsOpen = (path: string) => boolean;
+const isOpen = invoke<IsOpen>(channel.isOpen);
+const registerIsOpen = handle<IsOpen>(channel.isOpen);
+
+type GetOptions = (
+    path: string
+) => SerialPortOpenOptions<AutoDetectTypes> | undefined;
+const getOptions = invoke<GetOptions>(channel.getOptions);
+const registerGetOptions = handle<GetOptions>(channel.getOptions);
+
+// **************
+// Callbacks (from the the main process to the renderer processes of apps)
+// **************
+
+type OnDataReceived = (data: unknown) => void;
+const broadcastDataReceived = broadcast<OnDataReceived>(channel.onDataReived);
+const registerOnDataReceived = (path: string) =>
+    onBroadcasted<OnDataReceived>(channel.onDataReived, path);
+
+type OnDataWritten = (data: string | number[] | Buffer) => void;
+const broadcastDataWritten = broadcast<OnDataWritten>(channel.onDataWritten);
+const registerOnDataWritten = (path: string) =>
+    onBroadcasted<OnDataWritten>(channel.onDataWritten, path);
+
+type OnClosed = () => void;
+const broadcastClosed = broadcast<OnClosed>(channel.onClosed);
+const registerOnClosed = (path: string) =>
+    onBroadcasted<OnClosed>(channel.onClosed, path);
+
+type OnUpdate = (newOptions: UpdateOptions) => void;
+const broadcastUpdated = broadcast<OnUpdate>(channel.onUpdated);
+const registerOnUpdated = (path: string) =>
+    onBroadcasted<OnUpdate>(channel.onUpdated, path);
+
+type OnSet = (newOptions: SetOptions) => void;
+const broadcastSet = broadcast<OnSet>(channel.onSet);
+const registerOnSet = (path: string) =>
+    onBroadcasted<OnSet>(channel.onSet, path);
+
+type OnChanged = (newOptions: SerialPortOpenOptions<AutoDetectTypes>) => void;
+const broadcastChanged = broadcast<OnChanged>(channel.onChanged);
+const registerOnChanged = (path: string) =>
+    onBroadcasted<OnChanged>(channel.onChanged, path);
+
+export const inRenderer = {
+    broadcastChanged,
+    broadcastClosed,
+    broadcastDataReceived,
+    broadcastDataWritten,
+    broadcastSet,
+    broadcastUpdated,
+};
+
+export const forRenderer = {
+    registerClose,
+    registerGetOptions,
+    registerIsOpen,
+    registerOpen,
+    registerSet,
+    registerUpdate,
+    registerWrite,
+};
+
+export const inMain = {
+    open,
+    close,
+    write,
+    update,
+    set,
+    isOpen,
+    getOptions,
+};
+
+export const forMain = {
+    registerOnDataReceived,
+    registerOnDataWritten,
+    registerOnClosed,
+    registerOnUpdated,
+    registerOnSet,
+    registerOnChanged,
+};

package/ipc/sources.ts

@@ -0,0 +1,19 @@
+/*
+ * Copyright (c) 2022 Nordic Semiconductor ASA
+ *
+ * SPDX-License-Identifier: LicenseRef-Nordic-4-Clause
+ */
+
+import { UrlString } from './MetaFiles';
+
+enum StandardSourceNames {
+    OFFICIAL = 'official',
+    LOCAL = 'local',
+}
+
+export const { LOCAL, OFFICIAL } = StandardSourceNames;
+export const allStandardSourceNames: SourceName[] = [OFFICIAL, LOCAL];
+
+export type SourceName = string;
+export type SourceUrl = UrlString;
+export type Source = { name: SourceName; url: SourceUrl };

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@nordicsemiconductor/pc-nrfconnect-shared",
-    "version": "78.0.0",
+    "version": "80.0.0",
     "description": "Shared commodities for developing pc-nrfconnect-* packages",
     "repository": {
         "type": "git",
@@ -18,9 +18,10 @@
     "files": [
         "./config",
         "./dist",
-        "fw",
-        "main",
-        "mocks",
+        "./fw",
+        "./ipc",
+        "./main",
+        "./mocks",
         "./scripts",
         "./src",
         "./test",

package/src/About/DeviceCard.tsx

@@ -36,7 +36,7 @@ export default () => {
         );
     }
 
-    const pca = device.boardVersion;
+    const pca = device.jlink?.boardVersion;
     const { name, cores } = deviceInfo(device);
 
     return (

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

@@ -20,11 +20,11 @@ const Row = ({ children }: { children: ReactNode }) => (
 );
 
 const PcaNumber = ({ device }: { device: Device }) => {
-    if (device.boardVersion == null) {
+    if (!device.jlink?.boardVersion) {
         return null;
     }
 
-    return <div>{device.boardVersion}</div>;
+    return <div>{device.jlink.boardVersion}</div>;
 };
 
 const MaybeDeviceName = ({ device }: { device: Device }) => {

package/src/Device/deviceInfo/deviceInfo.ts

@@ -181,7 +181,7 @@ const devicesByPca: { [P in DevicePCA]: DeviceInfo } = {
 };
 
 const deviceByPca = (device: Device) =>
-    devicesByPca[String(device.boardVersion).toUpperCase() as DevicePCA];
+    devicesByPca[String(device.jlink?.boardVersion).toUpperCase() as DevicePCA];
 
 const NORDIC_VENDOR_ID = '1915';
 const isNordicDevice = (device: Device) =>
@@ -240,7 +240,7 @@ export const displayedDeviceName = (
         return device.nickname;
     }
 
-    return deviceInfo(device).name || device.boardVersion || 'Unknown';
+    return deviceInfo(device).name || device.jlink?.boardVersion || 'Unknown';
 };
 
 export const productPageUrl = (device: Device) =>

package/src/index.ts

@@ -3,6 +3,7 @@
  *
  * SPDX-License-Identifier: LicenseRef-Nordic-4-Clause
  */
+
 import { hideDialog, showDialog } from './ErrorDialog/errorDialogSlice';
 
 export const ErrorDialogActions = { hideDialog, showDialog };
@@ -145,6 +146,18 @@ export {
     newSuccessFlashMessage,
 } from './FlashMessage/FlashMessageSlice';
 
-export { inMain as apps } from '../ipc/apps';
+export {
+    inMain as apps,
+    type App as AppType,
+    type AppSpec,
+    type AppWithError,
+    type DownloadableApp,
+    type InstalledDownloadableApp,
+    type LaunchableApp,
+    type LocalApp,
+    type SourceWithError,
+    type UninstalledDownloadableApp,
+    type WithdrawnApp,
+} from '../ipc/apps';
 export { inMain as openWindow } from '../ipc/openWindow';
 export { inMain as preventSleep } from '../ipc/preventSleep';

package/src/utils/packageJson.ts

@@ -32,7 +32,7 @@ import { readFileSync } from 'fs';
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore This will be available when the app uses it.
 // eslint-disable-next-line import/no-unresolved
-import packageJsons from '../../../../package.json';
+import packageJsons from '../../../../../package.json';
 import type { PackageJson } from '../../ipc/MetaFiles';
 
 let packageJson: PackageJson = packageJsons;

package/src/utils/systemReport.ts

@@ -95,9 +95,9 @@ const allDevicesReport = (allDevices: Device[] = []) => [
     '- Connected devices:',
     ...allDevices.map(
         d =>
-            `    - ${d.serialNumber} ${d.boardVersion || ''}: ${d.serialPorts
-                ?.map(s => s.comName)
-                .join(', ')}`
+            `    - ${d.serialNumber} ${
+                d.jlink?.boardVersion || ''
+            }: ${d.serialPorts?.map(s => s.comName).join(', ')}`
     ),
     '',
 ];

package/typings/generated/ipc/apps.d.ts

@@ -50,6 +50,10 @@ export type SourceWithError = {
     source: Source;
     reason?: string;
 };
+export declare const isDownloadable: (app?: App) => app is DownloadableApp;
+export declare const isInstalled: (app?: App) => app is LaunchableApp;
+export declare const isWithdrawn: (app?: App) => app is WithdrawnApp;
+export declare const isUpdatable: (app?: App) => app is InstalledDownloadableApp;
 type GetDownloadableAppsResult = {
     apps: DownloadableApp[];
     appsWithErrors: AppWithError[];
@@ -62,6 +66,10 @@ export declare const forRenderer: {
 export declare const inMain: {
     getDownloadableApps: () => Promise<GetDownloadableAppsResult>;
     installDownloadableApp: (app: DownloadableApp, version?: string | undefined) => Promise<DownloadableApp>;
+    isDownloadable: (app?: App) => app is DownloadableApp;
+    isInstalled: (app?: App) => app is LaunchableApp;
+    isWithdrawn: (app?: App) => app is WithdrawnApp;
+    isUpdatable: (app?: App) => app is InstalledDownloadableApp;
 };
 export {};
 //# sourceMappingURL=apps.d.ts.map

package/typings/generated/ipc/apps.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"apps.d.ts","sourceRoot":"","sources":["../../../ipc/apps.ts"],"names":[],"mappings":"AAOA,OAAO,EAAE,WAAW,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AACrD,OAAO,EAAE,KAAK,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,WAAW,CAAC;AAEtD,MAAM,WAAW,OAAO;IACpB,IAAI,EAAE,MAAM,CAAC;IACb,MAAM,EAAE,UAAU,CAAC;CACtB;AAED,UAAU,OAAO;IACb,IAAI,EAAE,MAAM,CAAC;IACb,WAAW,EAAE,MAAM,CAAC;IACpB,WAAW,EAAE,MAAM,CAAC;IACpB,QAAQ,EAAE,MAAM,CAAC;CACpB;AAED,UAAU,YAAY;IAClB,MAAM,EAAE,UAAU,CAAC;IACnB,QAAQ,CAAC,EAAE,SAAS,CAAC;IACrB,QAAQ,CAAC,EAAE,WAAW,CAAC;IACvB,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,aAAa,EAAE,MAAM,CAAC;CACzB;AAED,UAAU,SAAS;IACf,cAAc,EAAE,MAAM,CAAC;IACvB,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,aAAa,CAAC,EAAE,SAAS,CAAC;IAC1B,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,SAAS,EAAE;QACP,IAAI,EAAE,MAAM,CAAC;QACb,MAAM,CAAC,EAAE,MAAM,CAAC;KACnB,CAAC;CACL;AAED,MAAM,WAAW,QAAS,SAAQ,SAAS,EAAE,OAAO;IAChD,MAAM,EAAE,OAAO,KAAK,CAAC;CACxB;AAED,MAAM,WAAW,wBACb,SAAQ,OAAO,EACX,SAAS,EACT,YAAY;IAChB,WAAW,EAAE,KAAK,CAAC;CACtB;AAED,MAAM,WAAW,0BAA2B,SAAQ,OAAO,EAAE,YAAY;IACrE,WAAW,EAAE,KAAK,CAAC;CACtB;AAED,MAAM,WAAW,YAAa,SAAQ,OAAO,EAAE,SAAS,EAAE,YAAY;IAClE,WAAW,EAAE,IAAI,CAAC;CACrB;AAED,MAAM,MAAM,eAAe,GACrB,wBAAwB,GACxB,0BAA0B,GAC1B,YAAY,CAAC;AAEnB,MAAM,MAAM,aAAa,GAAG,QAAQ,GAAG,wBAAwB,GAAG,YAAY,CAAC;AAE/E,MAAM,MAAM,GAAG,GAAG,QAAQ,GAAG,eAAe,CAAC;AAE7C,MAAM,WAAW,YAAa,SAAQ,OAAO;IACzC,MAAM,EAAE,OAAO,CAAC;IAChB,IAAI,EAAE,MAAM,CAAC;CAChB;AAOD,MAAM,MAAM,eAAe,GAAG;IAAE,MAAM,EAAE,MAAM,CAAC;IAAC,MAAM,CAAC,EAAE,MAAM,CAAA;CAAE,CAAC;AAGlE,KAAK,yBAAyB,GAAG;IAC7B,IAAI,EAAE,eAAe,EAAE,CAAC;IACxB,cAAc,EAAE,YAAY,EAAE,CAAC;IAC/B,iBAAiB,EAAE,eAAe,EAAE,CAAC;CACxC,CAAC;AAwBF,eAAO,MAAM,WAAW;;;CAGvB,CAAC;AAEF,eAAO,MAAM,MAAM;;;CAGlB,CAAC"}
+{"version":3,"file":"apps.d.ts","sourceRoot":"","sources":["../../../ipc/apps.ts"],"names":[],"mappings":"AAOA,OAAO,EAAE,WAAW,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AACrD,OAAO,EAAE,KAAK,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,WAAW,CAAC;AAEtD,MAAM,WAAW,OAAO;IACpB,IAAI,EAAE,MAAM,CAAC;IACb,MAAM,EAAE,UAAU,CAAC;CACtB;AAED,UAAU,OAAO;IACb,IAAI,EAAE,MAAM,CAAC;IACb,WAAW,EAAE,MAAM,CAAC;IACpB,WAAW,EAAE,MAAM,CAAC;IACpB,QAAQ,EAAE,MAAM,CAAC;CACpB;AAED,UAAU,YAAY;IAClB,MAAM,EAAE,UAAU,CAAC;IACnB,QAAQ,CAAC,EAAE,SAAS,CAAC;IACrB,QAAQ,CAAC,EAAE,WAAW,CAAC;IACvB,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,aAAa,EAAE,MAAM,CAAC;CACzB;AAED,UAAU,SAAS;IACf,cAAc,EAAE,MAAM,CAAC;IACvB,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,aAAa,CAAC,EAAE,SAAS,CAAC;IAC1B,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,SAAS,EAAE;QACP,IAAI,EAAE,MAAM,CAAC;QACb,MAAM,CAAC,EAAE,MAAM,CAAC;KACnB,CAAC;CACL;AAED,MAAM,WAAW,QAAS,SAAQ,SAAS,EAAE,OAAO;IAChD,MAAM,EAAE,OAAO,KAAK,CAAC;CACxB;AAED,MAAM,WAAW,wBACb,SAAQ,OAAO,EACX,SAAS,EACT,YAAY;IAChB,WAAW,EAAE,KAAK,CAAC;CACtB;AAED,MAAM,WAAW,0BAA2B,SAAQ,OAAO,EAAE,YAAY;IACrE,WAAW,EAAE,KAAK,CAAC;CACtB;AAED,MAAM,WAAW,YAAa,SAAQ,OAAO,EAAE,SAAS,EAAE,YAAY;IAClE,WAAW,EAAE,IAAI,CAAC;CACrB;AAED,MAAM,MAAM,eAAe,GACrB,wBAAwB,GACxB,0BAA0B,GAC1B,YAAY,CAAC;AAEnB,MAAM,MAAM,aAAa,GAAG,QAAQ,GAAG,wBAAwB,GAAG,YAAY,CAAC;AAE/E,MAAM,MAAM,GAAG,GAAG,QAAQ,GAAG,eAAe,CAAC;AAE7C,MAAM,WAAW,YAAa,SAAQ,OAAO;IACzC,MAAM,EAAE,OAAO,CAAC;IAChB,IAAI,EAAE,MAAM,CAAC;CAChB;AAOD,MAAM,MAAM,eAAe,GAAG;IAAE,MAAM,EAAE,MAAM,CAAC;IAAC,MAAM,CAAC,EAAE,MAAM,CAAA;CAAE,CAAC;AAElE,eAAO,MAAM,cAAc,SAAU,GAAG,2BACA,CAAC;AAEzC,eAAO,MAAM,WAAW,SAAU,GAAG,yBACA,CAAC;AAEtC,eAAO,MAAM,WAAW,SAAU,GAAG,wBACK,CAAC;AAa3C,eAAO,MAAM,WAAW,SAAU,GAAG,oCAKU,CAAC;AAGhD,KAAK,yBAAyB,GAAG;IAC7B,IAAI,EAAE,eAAe,EAAE,CAAC;IACxB,cAAc,EAAE,YAAY,EAAE,CAAC;IAC/B,iBAAiB,EAAE,eAAe,EAAE,CAAC;CACxC,CAAC;AAwBF,eAAO,MAAM,WAAW;;;CAGvB,CAAC;AAEF,eAAO,MAAM,MAAM;;;2BA7DkB,GAAG;wBAGN,GAAG;wBAGH,GAAG;wBAcH,GAAG;CAiDpC,CAAC"}

package/typings/generated/src/index.d.ts

@@ -67,7 +67,7 @@ export { default as ConflictingSettingsDialog } from './SerialPort/ConflictingSe
 export type { AppDispatch, AppThunk, NrfConnectState } from './store';
 export { type DeviceSetupConfig, type DeviceSetup, prepareDevice, } from './Device/deviceSetup';
 export { addNewMessage, newCopiedFlashMessage, newInfoFlashMessage, newWarningFlashMessage, newErrorFlashMessage, newSuccessFlashMessage, } from './FlashMessage/FlashMessageSlice';
-export { inMain as apps } from '../ipc/apps';
+export { inMain as apps, type App as AppType, type AppSpec, type AppWithError, type DownloadableApp, type InstalledDownloadableApp, type LaunchableApp, type LocalApp, type SourceWithError, type UninstalledDownloadableApp, type WithdrawnApp, } from '../ipc/apps';
 export { inMain as openWindow } from '../ipc/openWindow';
 export { inMain as preventSleep } from '../ipc/preventSleep';
 //# sourceMappingURL=index.d.ts.map

package/typings/generated/src/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/index.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/index.ts"],"names":[],"mappings":"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"}