@ledgerhq/live-common 24.1.0 → 25.0.0-next.1

package/src/performance.test.ts

@@ -0,0 +1,26 @@
+import { connectLogsToSentry, startSpan } from "./performance";
+
+test("connectLogsToSentry", () => {
+  const finish = jest.fn();
+  const startChild = jest.fn((arg) => ({ arg, finish }));
+  const getSpan = jest.fn(() => ({ startChild }));
+  const Sentry = {
+    getCurrentHub: () => ({
+      getScope: () => ({ getSpan }),
+    }),
+  };
+  connectLogsToSentry(Sentry);
+  const span = startSpan("op", "desc", { tags: { foo: 42 } });
+  expect(startChild.mock.calls.length).toBe(1);
+  expect(startChild.mock.calls[0][0]).toMatchObject({
+    op: "op",
+    description: "desc",
+    tags: { foo: 42 },
+  });
+  expect(finish.mock.calls.length).toBe(0);
+  span.finish();
+  startSpan("ignored");
+  expect(finish.mock.calls.length).toBe(1);
+  span.finish();
+  expect(finish.mock.calls.length).toBe(1);
+});

package/src/performance.ts

@@ -0,0 +1,61 @@
+// Provide helpers to track performance spans through our internal logs
+import { log, listen } from "@ledgerhq/logs";
+
+type Unsubscribe = () => void;
+
+export function connectLogsToSentry(Sentry: any): Unsubscribe {
+  let apduSpan;
+  const spans = {};
+  return listen((l) => {
+    if (!l) return;
+    if (l.type === "apdu") {
+      if (l.message?.startsWith("=>")) {
+        const t = Sentry.getCurrentHub().getScope().getSpan();
+        apduSpan = t?.startChild({
+          op: "apdu",
+          description: l.message.slice(0, 11),
+        });
+      } else if (l.message?.startsWith("<=")) {
+        apduSpan?.finish();
+      }
+    } else if (l.type === "perf-span") {
+      const { data } = l;
+      if (!data) return;
+      const { id, starts, span } = data;
+      if (starts) {
+        const t = Sentry.getCurrentHub().getScope().getSpan();
+        spans[id] = t?.startChild({ ...span, description: l.message || "" });
+      } else {
+        const span = spans[id];
+        span?.finish();
+      }
+    }
+  });
+}
+
+let idCounter = 0;
+export function startSpan(
+  op: string,
+  description?: string,
+  rest?: {
+    tags?: any;
+    data?: any;
+  }
+): {
+  finish: () => void;
+} {
+  let id = ++idCounter;
+  const span: any = { op, ...rest };
+  log("perf-span", description || "", {
+    id,
+    starts: true,
+    span,
+  });
+  return {
+    finish: () => {
+      if (!id) return;
+      log("perf-span", description || "", { id });
+      id = 0;
+    },
+  };
+}

package/src/platform/providers/RemoteLiveAppProvider/api/index.ts

@@ -34,6 +34,12 @@ const api = {
     provider: string
   ): Promise<LiveAppManifest[]> => {
     if (getEnv("MOCK")) {
+      if (getEnv("MOCK_REMOTE_LIVE_MANIFEST")) {
+        return [
+          ...mockData,
+          ...JSON.parse(getEnv("MOCK_REMOTE_LIVE_MANIFEST")),
+        ] as LiveAppManifest[];
+      }
       return mockData as LiveAppManifest[];
     }
 

package/src/platform/providers/RemoteLiveAppProvider/api/mock.json

@@ -920,36 +920,5 @@
     "domains": [
       "https://*"
     ]
-  },
-  {
-    "id": "dummy-live-app",
-    "name": "Dummy Live App",
-    "url": "http://localhost:3001",
-    "homepageUrl": "https://developers.ledger.com/",
-    "icon": "",
-    "platform": "all",
-    "apiVersion": "0.0.1",
-    "manifestVersion": "1",
-    "branch": "stable",
-    "categories": [
-      "tools"
-    ],
-    "currencies": "*",
-    "content": {
-      "shortDescription": {
-        "en": "Dummy app for testing the Platform apps and Live SDK in E2E (Playwright) tests"
-      },
-      "description": {
-        "en": "Dummy app for testing the Platform apps and Live SDK in E2E (Playwright) tests"
-      }
-    },
-    "permissions": [
-      {
-        "method": "*"
-      }
-    ],
-    "domains": [
-      "https://*"
-    ]
   }
-]
+]

package/src/types/currencies.ts

@@ -6,7 +6,7 @@ import type {
   FiatCurrency,
   Currency,
   CryptoCurrencyIds,
-} from "@ledgerhq/cryptoassets/lib/types";
+} from "@ledgerhq/cryptoassets";
 export type {
   Unit,
   ExplorerView,

package/src/walletconnect/Provider.tsx

@@ -133,16 +133,14 @@ const ProviderCommon = ({
         status: STATUS.CONNECTED,
       });
     });
-    connector.on("disconnect", () => {
-      disconnect();
-    });
-    connector.on("error", (error) => {
+    connector.on("disconnect", () => disconnect());
+    connector.on("error", (error: Error) => {
       dispatch({
         status: STATUS.ERROR,
         error,
       });
     });
-    connector.on("call_request", (error, payload) => {
+    connector.on("call_request", (error: Error, payload: unknown | null) => {
       if (error) {
         dispatch({
           status: STATUS.ERROR,
@@ -153,6 +151,7 @@ const ProviderCommon = ({
 
       handleCallRequest(payload);
     });
+
     dispatch({
       error: null,
       connector,