@ledgerhq/live-common 21.32.3 → 21.32.6

package/src/hw/connectManager.ts

@@ -12,6 +12,7 @@ import getDeviceInfo from "./getDeviceInfo";
 import getAppAndVersion from "./getAppAndVersion";
 import appSupportsQuitApp from "../appSupportsQuitApp";
 import { isDashboardName } from "./isDashboardName";
+import { DeviceNotOnboarded } from "../errors";
 import type { AppAndVersion } from "./connectApp";
 import quitApp from "./quitApp";
 export type Input = {
@@ -77,6 +78,11 @@ const cmd = ({
           concatMap((deviceInfo) => {
             timeoutSub.unsubscribe();
 
+            // FIXME Until we have proper flagging of the onboarded status.
+            if (!deviceInfo.onboarded) {
+              throw new DeviceNotOnboarded();
+            }
+
             if (deviceInfo.isBootloader) {
               return of({
                 type: "bootloader",

package/src/hw/getDeviceInfo.ts

@@ -10,6 +10,7 @@ import getAppAndVersion from "./getAppAndVersion";
 import type { DeviceInfo } from "../types/manager";
 import { PROVIDERS } from "../manager/provider";
 import { isDashboardName } from "./isDashboardName";
+import { DeviceNotOnboarded } from "../errors";
 const ManagerAllowedFlag = 0x08;
 const PinValidatedFlag = 0x80;
 export default async function getDeviceInfo(
@@ -37,7 +38,16 @@ export default async function getDeviceInfo(
     throw new DeviceOnDashboardExpected();
   }
 
-  const res = await getVersion(transport);
+  const res = await getVersion(transport).catch((e) => {
+    if (e instanceof TransportStatusError) {
+      // @ts-expect-error typescript not checking agains the instanceof
+      if (e.statusCode === 0x6d06) {
+        throw new DeviceNotOnboarded();
+      }
+    }
+    throw e;
+  });
+
   const {
     isBootloader,
     rawVersion,
@@ -57,6 +67,12 @@ export default async function getDeviceInfo(
   const flag = flags.length > 0 ? flags[0] : 0;
   const managerAllowed = !!(flag & ManagerAllowedFlag);
   const pinValidated = !!(flag & PinValidatedFlag);
+
+  // FIXME Until we have proper flagging of the onboarded status.
+  let onboarded = true;
+  if (flags.length === 4) {
+    onboarded = !!(flags[0] & 0x04);
+  }
   log(
     "hw",
     "deviceInfo: se@" +
@@ -79,5 +95,6 @@ export default async function getDeviceInfo(
     isBootloader,
     managerAllowed,
     pinValidated,
+    onboarded,
   };
 }

package/src/platform/PlatformAppProvider/helpers.ts

@@ -6,6 +6,7 @@ export type FilterParams = {
   private?: boolean;
   version?: string;
 };
+import { getEnv } from "../../env";
 
 function matchVersion(filterParams: FilterParams, manifest: AppManifest) {
   return (
@@ -52,3 +53,31 @@ export function mergeManifestLists(
   const newIds = new Set(list2.map((elem) => elem.id));
   return [...list1.filter((elem) => !newIds.has(elem.id)), ...list2];
 }
+
+export const initializeLocalManifest = (): Map<string, AppManifest> => {
+  const localManifestJsonRaw: string | null | undefined = getEnv(
+    "PLATFORM_LOCAL_MANIFEST_JSON"
+  );
+
+  if (!localManifestJsonRaw) {
+    return new Map();
+  }
+
+  try {
+    const manifest: AppManifest | [AppManifest] =
+      JSON.parse(localManifestJsonRaw);
+
+    const manifestArray = Array.isArray(manifest) ? manifest : [manifest];
+
+    const map = new Map(manifestArray.map((m) => [m.id, m]));
+
+    return map;
+  } catch (error) {
+    /**
+     * Probable error during `JSON.parse` call, log error and return empty map
+     * as if env variable was not defined
+     */
+    console.error(error);
+    return new Map();
+  }
+};

package/src/platform/PlatformAppProvider/index.tsx

@@ -9,11 +9,12 @@ import React, {
 import type { PlatformAppContextType, Props, State } from "./types";
 import api from "./api";
 import type { AppManifest } from "../types";
+import { initializeLocalManifest } from "./helpers";
 
 // @ts-expect-error empty object creates an error
 const PlatformAppContext = createContext<PlatformAppContextType>({});
 const initialState: State = {
-  localManifests: new Map(),
+  localManifests: initializeLocalManifest(),
   remoteManifests: new Map(),
   isLoading: false,
   lastUpdateTime: undefined,
@@ -28,7 +29,7 @@ export function PlatformAppProvider({
   autoUpdateDelay,
   platformAppsServerURL,
   children,
-}: Props) {
+}: Props): JSX.Element {
   const [state, setState] = useState<State>(initialState);
 
   const addLocalManifest = useCallback((manifest: AppManifest) => {

package/src/types/manager.ts

@@ -30,6 +30,7 @@ export type DeviceInfo = {
   mcuBlVersion?: string;
   mcuTargetId?: number;
   seTargetId?: number;
+  onboarded?: boolean;
 };
 export type DeviceModelInfo = {
   modelId: DeviceModelId;
@@ -155,9 +156,10 @@ export type Application = {
   compatibleWalletsJSON: string | null | undefined;
 };
 export enum AppType {
-  APP = "app",
-  PLUGIN = "plugin",
-  TOOL = "tool", // Nb not used for now
+  app = "app",
+  plugin = "plugin",
+  tool = "tool",
+  swap = "swap",
 }
 // App is higher level on top of Application and ApplicationVersion
 // with all fields Live needs and in normalized form (but still serializable)