Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions .changeset/quiet-transport-wire.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
---
"ledger-live-desktop": minor
"live-mobile": minor
---

Add debug WebSocket transport to DevTools relay
2 changes: 2 additions & 0 deletions apps/ledger-live-desktop/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -74,6 +74,8 @@
"@domain/entity-large-screen-upsell-modal": "workspace:*",
"@devtools/shell": "workspace:^",
"@devtools/bindings": "workspace:*",
"@devtools/transport-panel": "workspace:*",
"@devtools/wire": "workspace:*",
"@electron/fuses": "2.0.0",
"@features/flow-card": "workspace:^",
"@features/flow-contacts": "workspace:^",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,9 @@ jest.mock("react-router", () => ({
...jest.requireActual("react-router"),
useNavigate: () => mockNavigate,
}));
jest.mock("@devtools/transport-panel", () => ({
TransportPanel: () => null,
}));

const devToolsSpy = jest.fn();
jest.mock("@devtools/shell", () => ({
Expand All @@ -24,6 +27,20 @@ jest.mock("@devtools/bindings", () => ({
useFeatureFlagsToolProps: () => ({ marker: "ff-props" }),
}));

jest.mock("@devtools/wire", () => {
const wireState = { hubUrl: "ws://127.0.0.1:9090", role: "host" };
return {
buildTransport: () => ({
transport: {},
subscribe: () => () => {},
getState: () => wireState,
setHubUrl: jest.fn(),
}),
buildCopyStoreProtocol: () => ({}),
combineProtocols: (...args: unknown[]) => args[0],
};
});

describe("DevToolsScreen", () => {
beforeEach(() => {
mockNavigate.mockClear();
Expand Down
Original file line number Diff line number Diff line change
@@ -1,16 +1,23 @@
import React from "react";
import { DevTools } from "@devtools/shell";
import { TransportPanel } from "@devtools/transport-panel";
import { useDevToolsScreenViewModel } from "./useDevToolsScreenViewModel";

export default function DevToolsScreen() {
const { config, onClose } = useDevToolsScreenViewModel();
const { config, onClose, transport, hubUrl, setHubUrl, role } = useDevToolsScreenViewModel();

Comment thread
Sebastien-Dav1d marked this conversation as resolved.
return (
<div
style={{ display: "flex", flexDirection: "column", flex: 1, minHeight: 0 }}
className="rounded-md overflow-hidden"
>
<DevTools config={config} onClose={onClose} />
<DevTools
config={config}
onClose={onClose}
footer={
<TransportPanel transport={transport} hubUrl={hubUrl} setHubUrl={setHubUrl} role={role} />
}
/>
</div>
);
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
import { useSyncExternalStore } from "react";
import { buildTransport, buildCopyStoreProtocol, combineProtocols } from "@devtools/wire";
import { sleepingListener } from "~/state-manager/sleepingListener";
import { useStore } from "LLD/hooks/redux";

const HUB_URL = "ws://127.0.0.1:9090";
const ROLE = "host" as const;

function buildRelay(store: ReturnType<typeof useStore>) {
return buildTransport(
{ hubUrl: HUB_URL, role: ROLE, id: "lld" },
combineProtocols(buildCopyStoreProtocol(store, sleepingListener, ROLE)),
);
}

let relay: ReturnType<typeof buildRelay> | undefined;

export function useDevToolsRelay() {
const store = useStore();
if (!relay) relay = buildRelay(store);
const wireState = useSyncExternalStore(relay.subscribe, relay.getState, relay.getState);
return { wire: relay, wireState };
}
Comment thread
Sebastien-Dav1d marked this conversation as resolved.
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,12 @@ import { useCallback, useMemo } from "react";
import { useNavigate } from "react-router";
import { useFeatureFlagsToolProps } from "@devtools/bindings";
import type { DevToolsConfig } from "@devtools/shell";
import { useDevToolsRelay } from "./useDevToolsRelay";

export function useDevToolsScreenViewModel(): {
config: DevToolsConfig;
onClose: () => void;
} {
export function useDevToolsScreenViewModel() {
const navigate = useNavigate();
const featureFlagsToolProps = useFeatureFlagsToolProps();
const { wire, wireState } = useDevToolsRelay();

const config: DevToolsConfig = useMemo(
() => [{ id: "feature-flags", config: featureFlagsToolProps }],
Expand All @@ -17,5 +16,12 @@ export function useDevToolsScreenViewModel(): {

const onClose = useCallback(() => navigate(-1), [navigate]);

return { config, onClose };
return {
config,
onClose,
transport: wire.transport,
hubUrl: wireState.hubUrl,
setHubUrl: wire.setHubUrl,
role: wireState.role,
};
}
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ import { createIdentitiesSyncMiddleware, pushDevicesApiExtra } from "@domain/api
import { canPushDeviceIdsSelector, languageSelector } from "~/renderer/reducers/settings";
import { createFeatureFlagsMiddleware, type PartialFeatures } from "@shared/feature-flags";
import { fetchRemoteFlags as defaultFetchRemoteFlags } from "~/firebase/remoteConfig";
import { sleepingListener } from "./sleepingListener";
type Props = {
state?: State;
dbMiddleware?: Middleware;
Expand Down Expand Up @@ -116,7 +117,8 @@ const customCreateStore = ({
fetchRemoteFlags: fetchRemoteFlags ?? undefined,
getAppLanguage: languageSelector,
}),
),
)
.concat(sleepingListener.middleware),
devTools: __DEV__,
});

Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
import { createListenerMiddleware } from "@reduxjs/toolkit";

export const sleepingListener = createListenerMiddleware();
Comment thread
Sebastien-Dav1d marked this conversation as resolved.
2 changes: 2 additions & 0 deletions apps/ledger-live-mobile/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -87,6 +87,8 @@
"@datadog/mobile-react-navigation": "2.8.2",
"@devtools/bindings": "workspace:^",
"@devtools/shell": "workspace:^",
"@devtools/transport-panel": "workspace:*",
"@devtools/wire": "workspace:*",
"@domain/api-altcoins-sentiment": "workspace:^",
"@domain/api-currency-fiat": "workspace:^",
"@domain/api-currency-token": "workspace:^",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,24 @@ jest.mock(
() => ({ useFeatureFlagsToolProps: () => ({ marker: "ff-props" }) }),
{ virtual: true },
);
jest.mock("@devtools/transport-panel", () => ({ TransportPanel: () => null }), { virtual: true });
jest.mock(
"@devtools/wire",
() => {
const wireState = { hubUrl: "ws://127.0.0.1:9090", role: "tool" };
return {
buildTransport: () => ({
transport: {},
subscribe: () => () => {},
getState: () => wireState,
setHubUrl: jest.fn(),
}),
buildCopyStoreProtocol: () => ({}),
combineProtocols: (...args: unknown[]) => args[0],
};
},
{ virtual: true },
);

function withBottomInset(children: React.ReactNode) {
return (
Expand Down
Original file line number Diff line number Diff line change
@@ -1,9 +1,19 @@
import React from "react";
import { DevTools } from "@devtools/shell";
import { TransportPanel } from "@devtools/transport-panel";
import { useDevToolsScreenViewModel } from "./useDevToolsScreenViewModel";

export default function DevToolsScreen() {
const { config, screenOptions } = useDevToolsScreenViewModel();
const { config, screenOptions, transport, hubUrl, setHubUrl, role } =
useDevToolsScreenViewModel();

Comment thread
Sebastien-Dav1d marked this conversation as resolved.
return <DevTools config={config} screenOptions={screenOptions} />;
return (
<DevTools
config={config}
screenOptions={screenOptions}
footer={
<TransportPanel transport={transport} hubUrl={hubUrl} setHubUrl={setHubUrl} role={role} />
}
/>
);
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
import { useSyncExternalStore } from "react";
import { buildTransport, buildCopyStoreProtocol, combineProtocols } from "@devtools/wire";
import { store } from "~/state-manager/configureStore";
import { sleepingListener } from "~/state-manager/sleepingListener";

const HUB_URL = "ws://127.0.0.1:9090";
const ROLE = "host" as const;

function buildRelay() {
return buildTransport(
{ hubUrl: HUB_URL, role: ROLE, id: "lwm" },
combineProtocols(buildCopyStoreProtocol(store, sleepingListener, ROLE)),
);
}

let relay: ReturnType<typeof buildRelay> | undefined;

export function useDevToolsRelay() {
if (!relay) relay = buildRelay();
const wireState = useSyncExternalStore(relay.subscribe, relay.getState, relay.getState);
return { wire: relay, wireState };
Comment thread
Sebastien-Dav1d marked this conversation as resolved.
}
Original file line number Diff line number Diff line change
Expand Up @@ -5,22 +5,19 @@ import { useTheme } from "@ledgerhq/lumen-ui-rnative/styles";
import { getStackNavigationConfigV4 } from "LLM/components/Navigation";
import { useFeatureFlagsToolProps } from "@devtools/bindings";
import type { DevToolsConfig } from "@devtools/shell";
import { useDevToolsRelay } from "./useDevToolsRelay";

export function useDevToolsScreenViewModel(): {
config: DevToolsConfig;
screenOptions: NativeStackNavigationOptions;
} {
export function useDevToolsScreenViewModel() {
const featureFlagsProps = useFeatureFlagsToolProps();
const { theme } = useTheme();
const { bottom } = useSafeAreaInsets();
const { wire, wireState } = useDevToolsRelay();

const config: DevToolsConfig = useMemo(
() => [{ id: "feature-flags", config: featureFlagsProps }],
[featureFlagsProps],
);

// DevTools renders its own stack; reuse the app's config and add the bottom
// safe-area inset since DevTools only provides body content.
const screenOptions: NativeStackNavigationOptions = useMemo(() => {
const navConfig = getStackNavigationConfigV4(theme);
return {
Expand All @@ -29,5 +26,12 @@ export function useDevToolsScreenViewModel(): {
};
}, [theme, bottom]);

return { config, screenOptions };
return {
config,
screenOptions,
transport: wire.transport,
hubUrl: wireState.hubUrl,
setHubUrl: wire.setHubUrl,
role: wireState.role,
};
}
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ import { altcoinsSentimentApiExtra } from "@domain/api-altcoins-sentiment";
import { payCardApiExtra } from "@domain/api-pay-card";
import { createFeatureFlagsMiddleware, type PartialFeatures } from "@shared/feature-flags";
import { fetchRemoteFlags } from "~/firebase/remoteConfig";
import { sleepingListener } from "./sleepingListener";
import { createPkcePairWithExpoCrypto } from "~/helpers/pkce";

// This listenerMiddleware is cross-scope as it is preferable to have one instance per store
Expand Down Expand Up @@ -102,7 +103,8 @@ export const store = configureStore({
fetchRemoteFlags,
getAppLanguage: languageSelector,
}),
),
)
.concat(sleepingListener.middleware),

enhancers: getDefaultEnhancers => {
const enhancers = getDefaultEnhancers();
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
import { createListenerMiddleware } from "@reduxjs/toolkit";

export const sleepingListener = createListenerMiddleware();
21 changes: 13 additions & 8 deletions pnpm-lock.yaml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading