bugfix: LIVE-11803 - rename device broken if an app is open

.changeset/sharp-rabbits-accept.md

@@ -0,0 +1,5 @@
+---
+"@ledgerhq/live-common": patch
+---
+
+Add a quitApp before launching the renameDevice device flow

libs/ledger-live-common/src/hw/actions/implementations.ts

@@ -46,7 +46,11 @@ type PollingImplementationConfig = {
 
 type PollingImplementationParams<Request, EmittedEvents> = {
   deviceSubject: ReplaySubject<Device | null | undefined>;
-  task: (params: { deviceId: string; request: Request }) => Observable<EmittedEvents>;
+  task: (params: {
+    deviceId: string;
+    request: Request;
+    wired: boolean;
+  }) => Observable<EmittedEvents>;
   request: Request;
   config?: PollingImplementationConfig;
   // retryableWithDelayDisconnectedErrors has default value of [DisconnectedDevice, DisconnectedDeviceDuringOperation]
@@ -120,7 +124,7 @@ const pollingImplementation: Implementation = <SpecificType, GenericRequestType>
             device: currentDevice,
             replaceable: !firstRound,
           }),
-          task({ deviceId: currentDevice.deviceId, request }),
+          task({ deviceId: currentDevice.deviceId, request, wired: currentDevice.wired }),
         )
           .pipe(
             // Any event should clear the initialTimeout.
@@ -230,7 +234,7 @@ const eventImplementation: Implementation = <SpecificType, GenericRequestType>(
 
             return concat(
               initialEvent,
-              !device ? EMPTY : task({ deviceId: device.deviceId, request }),
+              !device ? EMPTY : task({ deviceId: device.deviceId, request, wired: device.wired }),
             );
           }),
           catchError((error: Error) =>

libs/ledger-live-common/src/hw/renameDevice.ts

@@ -1,9 +1,15 @@
-import { Observable, concat, from, of } from "rxjs";
-import { map, catchError } from "rxjs/operators";
-import { withDevice } from "./deviceAccess";
+import { Observable, concat, defer, from, of } from "rxjs";
+import { catchError, concatMap, map, retry, switchMap } from "rxjs/operators";
+import { retryWhileErrors, withDevice } from "./deviceAccess";
 import editDeviceName from "./editDeviceName";
+import getAppAndVersion from "./getAppAndVersion";
+import { isDashboardName } from "./isDashboardName";
+// import attemptToQuitApp from "./attemptToQuitApp";
+import quitApp from "./quitApp";
 
 export type RenameDeviceEvent =
+  | { type: "attemptToQuitApp" }
+  | { type: "onDashboard" }
   | {
       type: "unresponsiveDevice";
     }
@@ -19,36 +25,147 @@ export type RenameDeviceRequest = { name: string };
 export type Input = {
   deviceId: string;
   request: RenameDeviceRequest;
+  wired: boolean;
 };
 
-export default function renameDevice({ deviceId, request }: Input): Observable<RenameDeviceEvent> {
+export default function renameDevice({
+  deviceId,
+  request, // wired,
+}: Input): Observable<RenameDeviceEvent> {
   const { name } = request;
 
-  const sub = withDevice(deviceId)(
-    transport =>
-      new Observable(o => {
-        const sub = concat(
+  // const sub: Observable<RenameDeviceEvent> = withDevice(deviceId)((transport): any => {
+  //   const innerSub = () =>
+  //     defer(() => from(getAppAndVersion(transport))).pipe(
+  //       concatMap(appAndVersion => {
+  //         if (!isDashboardName(appAndVersion.name)) {
+  //           return concat(
+  //             attemptToQuitApp(transport),
+  //             of(<RenameDeviceEvent>{
+  //               type: "attemptToQuitApp",
+  //             }),
+  //             innerSub(),
+  //           );
+  //         }
+
+  //         return new Observable(o => {
+  //           return concat(
+  //             of(<RenameDeviceEvent>{
+  //               type: "permission-requested",
+  //             }),
+  //             from(editDeviceName(transport, name)),
+  //           )
+  //             .pipe(
+  //               map(e => e || { type: "device-renamed", name }),
+  //               catchError((error: Error) =>
+  //                 of({
+  //                   type: "error",
+  //                   error,
+  //                 }),
+  //               ),
+  //             )
+  //             .subscribe(e => o.next(e));
+  //         });
+  //       }),
+  //     );
+
+  //   return innerSub;
+  // });
+
+  const sub = withDevice(deviceId)(transport =>
+    defer(() => from(getAppAndVersion(transport))).pipe(
+      switchMap(appAndVersion => {
+        if (!isDashboardName(appAndVersion.name)) {
+          return from(quitApp(transport)).pipe(
+            switchMap(() => {
+              throw new Error("not on dashboard");
+            }),
+          );
+        }
+
+        return concat(
           of(<RenameDeviceEvent>{
             type: "permission-requested",
           }),
           from(editDeviceName(transport, name)),
-        )
-          .pipe(
-            map(e => e || { type: "device-renamed", name }),
-            catchError((error: Error) =>
-              of({
-                type: "error",
-                error,
-              }),
-            ),
-          )
-          .subscribe(e => o.next(e));
-
-        return () => {
-          sub.unsubscribe();
-        };
+        );
       }),
-  );
+    ),
+  ).pipe(retryWhileErrors((_e: Error) => true));
+
+  // const sub = withDevice(deviceId)(transport =>
+  //   defer(() => from(quitApp(transport)))
+  //     .pipe(
+  //       switchMap(() => {
+  //         return from(getAppAndVersion(transport)).pipe(
+  //           map(appAndVersion => {
+  //             if (!isDashboardName(appAndVersion.name)) {
+  //               throw new Error("not on dashboard");
+  //             }
+
+  //             return of(<RenameDeviceEvent>{
+  //               type: "onDashboard",
+  //             });
+  //           }),
+  //           retry({ delay: 500 }),
+  //         );
+  //       }),
+  //     )
+  //     .pipe(
+  //       switchMap(() => {
+  //         return new Observable(o => {
+  //           const innerSub = concat(
+  //             of(<RenameDeviceEvent>{
+  //               type: "permission-requested",
+  //             }),
+  //             from(editDeviceName(transport, name)),
+  //           )
+  //             .pipe(
+  //               map(e => e || { type: "device-renamed", name }),
+  //               catchError((error: Error) =>
+  //                 of({
+  //                   type: "error",
+  //                   error,
+  //                 }),
+  //               ),
+  //             )
+  //             .subscribe(e => o.next(e));
+
+  //           return () => {
+  //             innerSub.unsubscribe();
+  //           };
+  //         });
+  //       }),
+  //     ),
+  // );
+
+  // const renameAppFlow = withDevice(deviceId)(
+  //   transport =>
+  //     new Observable(o => {
+  //       const innerSub = concat(
+  //         of(<RenameDeviceEvent>{
+  //           type: "permission-requested",
+  //         }),
+  //         from(editDeviceName(transport, name)),
+  //       )
+  //         .pipe(
+  //           map(e => e || { type: "device-renamed", name }),
+  //           catchError((error: Error) =>
+  //             of({
+  //               type: "error",
+  //               error,
+  //             }),
+  //           ),
+  //         )
+  //         .subscribe(e => o.next(e));
+
+  //       return () => {
+  //         innerSub.unsubscribe();
+  //       };
+  //     }),
+  // );
+
+  // const sub = quitAppFlow.pipe(switchMap(_ => concat(renameAppFlow)));
 
   return sub as Observable<RenameDeviceEvent>;
 }