♻️ (webble): Extract web ble transport to its own module

apps/sample/package.json

@@ -21,6 +21,7 @@
     "@ledgerhq/device-signer-kit-ethereum": "workspace:*",
     "@ledgerhq/device-signer-kit-solana": "workspace:*",
     "@ledgerhq/device-sdk-transport-mock": "workspace:*",
+    "@ledgerhq/device-transport-kit-web-ble": "workspace:*",
     "@ledgerhq/device-transport-kit-web-hid": "workspace:*",
     "@ledgerhq/react-ui": "^0.16.2",
     "@sentry/nextjs": "^8.32.0",

apps/sample/src/components/MainView/ConnectDeviceActions.tsx

@@ -3,6 +3,7 @@ import {
   BuiltinTransports,
   type SdkError,
 } from "@ledgerhq/device-management-kit";
+import { webBleIdentifier } from "@ledgerhq/device-transport-kit-web-ble";
 import { webHidIdentifier } from "@ledgerhq/device-transport-kit-web-hid";
 import { Button, Flex } from "@ledgerhq/react-ui";
 import styled from "styled-components";
@@ -86,14 +87,14 @@ export const ConnectDeviceActions = ({
       >
         Select a USB device
       </ConnectButton>
-      {/* <ConnectButton
-        onClick={() => onSelectDeviceClicked(BuiltinTransports.BLE)}
+      <ConnectButton
+        onClick={() => onSelectDeviceClicked(webBleIdentifier)}
         variant="main"
         backgroundColor="main"
         size="large"
       >
         Select a BLE device
-      </ConnectButton> */}
+      </ConnectButton>
     </Flex>
   );
 };

apps/sample/src/providers/DeviceSdkProvider/index.tsx

@@ -8,6 +8,7 @@ import {
   WebLogsExporterLogger,
 } from "@ledgerhq/device-management-kit";
 import { FlipperSdkLogger } from "@ledgerhq/device-management-kit-flipper-plugin-client";
+import { WebBleTransport } from "@ledgerhq/device-transport-kit-web-ble";
 import { WebHidTransport } from "@ledgerhq/device-transport-kit-web-hid";
 
 import { useHasChanged } from "@/hooks/useHasChanged";
@@ -33,6 +34,20 @@ function buildDefaultSdk(logsExporter: WebLogsExporterLogger) {
           apduReceiverServiceFactory,
         ),
     )
+    .addTransport(
+      ({
+        deviceModelDataSource,
+        loggerServiceFactory,
+        apduSenderServiceFactory,
+        apduReceiverServiceFactory,
+      }) =>
+        new WebBleTransport(
+          deviceModelDataSource,
+          loggerServiceFactory,
+          apduSenderServiceFactory,
+          apduReceiverServiceFactory,
+        ),
+    )
     .addLogger(logsExporter)
     .addLogger(new FlipperSdkLogger())
     .build();

packages/core/package.json

@@ -59,7 +59,6 @@
     "@ledgerhq/tsconfig-dsdk": "workspace:*",
     "@types/semver": "^7.5.8",
     "@types/uuid": "^10.0.0",
-    "@types/web-bluetooth": "^0.0.20",
     "rxjs": "^7.8.1",
     "ts-node": "^10.9.2"
   }

packages/core/src/api/device-model/data/DeviceModelDataSource.ts

@@ -1,6 +1,8 @@
 import { type DeviceModelId } from "@api/device/DeviceModel";
-import { type TransportDeviceModel } from "@api/device-model/model/DeviceModel";
-import { type BleDeviceInfos } from "@internal/transport/ble/model/BleDeviceInfos";
+import {
+  type BleDeviceInfos,
+  type TransportDeviceModel,
+} from "@api/device-model/model/DeviceModel";
 
 /**
  * Source of truth for the device models

packages/core/src/api/device-model/data/StaticDeviceModelDataSource.test.ts

@@ -1,5 +1,5 @@
 import { DeviceModelId } from "@api/device/DeviceModel";
-import { BleDeviceInfos } from "@internal/transport/ble/model/BleDeviceInfos";
+import { BleDeviceInfos } from "@api/device-model/model/DeviceModel";
 
 import { StaticDeviceModelDataSource } from "./StaticDeviceModelDataSource";
 

packages/core/src/api/device-model/data/StaticDeviceModelDataSource.ts

@@ -1,8 +1,10 @@
 import { injectable } from "inversify";
 
 import { DeviceModelId } from "@api/device/DeviceModel";
-import { TransportDeviceModel } from "@api/device-model/model/DeviceModel";
-import { BleDeviceInfos } from "@internal/transport/ble/model/BleDeviceInfos";
+import {
+  BleDeviceInfos,
+  TransportDeviceModel,
+} from "@api/device-model/model/DeviceModel";
 
 import { DeviceModelDataSource } from "./DeviceModelDataSource";
 

packages/core/src/api/device-model/model/DeviceModel.ts

@@ -61,3 +61,13 @@ export class TransportDeviceModel {
     }
   }
 }
+
+export class BleDeviceInfos {
+  constructor(
+    public deviceModel: TransportDeviceModel,
+    public serviceUuid: string,
+    public writeUuid: string,
+    public writeCmdUuid: string,
+    public notifyUuid: string,
+  ) {}
+}

packages/core/src/api/index.ts

@@ -1,58 +1,54 @@
 "use strict";
 
-export { Apdu } from "./apdu/model/Apdu";
-export { APDU_MAX_PAYLOAD, ApduBuilder } from "./apdu/utils/ApduBuilder";
-export { ApduParser } from "./apdu/utils/ApduParser";
-export { ByteArrayBuilder } from "./apdu/utils/ByteArrayBuilder";
-export { ByteArrayParser } from "./apdu/utils/ByteArrayParser";
+export { Apdu } from "@api/apdu/model/Apdu";
+export { APDU_MAX_PAYLOAD, ApduBuilder } from "@api/apdu/utils/ApduBuilder";
+export { ApduParser } from "@api/apdu/utils/ApduParser";
+export * from "@api/apdu/utils/AppBuilderError";
+export { ByteArrayBuilder } from "@api/apdu/utils/ByteArrayBuilder";
+export { ByteArrayParser } from "@api/apdu/utils/ByteArrayParser";
+export { InvalidStatusWordError } from "@api/command/Errors";
 export {
   CommandResultFactory,
   CommandResultStatus,
   isSuccessCommandResult,
-} from "./command/model/CommandResult";
-export { CloseAppCommand } from "./command/os/CloseAppCommand";
+} from "@api/command/model/CommandResult";
+export { CloseAppCommand } from "@api/command/os/CloseAppCommand";
 export {
   GetAppAndVersionCommand,
   type GetAppAndVersionResponse,
-} from "./command/os/GetAppAndVersionCommand";
+} from "@api/command/os/GetAppAndVersionCommand";
 export {
   BatteryStatusType,
   type GetBatteryStatusArgs,
   GetBatteryStatusCommand,
   type GetBatteryStatusResponse,
-} from "./command/os/GetBatteryStatusCommand";
+} from "@api/command/os/GetBatteryStatusCommand";
 export {
   GetOsVersionCommand,
   type GetOsVersionResponse,
-} from "./command/os/GetOsVersionCommand";
+} from "@api/command/os/GetOsVersionCommand";
 export {
   type ListAppsArgs,
   ListAppsCommand,
   type ListAppsErrorCodes,
   type ListAppsResponse,
-} from "./command/os/ListAppsCommand";
-export { type OpenAppArgs, OpenAppCommand } from "./command/os/OpenAppCommand";
-export { isCommandErrorCode } from "./command/utils/CommandErrors";
-export { CommandUtils } from "./command/utils/CommandUtils";
+} from "@api/command/os/ListAppsCommand";
+export {
+  type OpenAppArgs,
+  OpenAppCommand,
+} from "@api/command/os/OpenAppCommand";
+export { isCommandErrorCode } from "@api/command/utils/CommandErrors";
+export { CommandUtils } from "@api/command/utils/CommandUtils";
 export {
   GlobalCommandError,
   GlobalCommandErrorHandler,
-} from "./command/utils/GlobalCommandError";
-export { DeviceModel, DeviceModelId } from "./device/DeviceModel";
-export { DeviceStatus } from "./device/DeviceStatus";
-export { ApduResponse } from "./device-session/ApduResponse";
-export { DeviceSdk } from "./DeviceSdk";
-export { LedgerDeviceSdkBuilder as DeviceSdkBuilder } from "./DeviceSdkBuilder";
-export { DeviceExchangeError, UnknownDeviceExchangeError } from "./Error";
-export { LogLevel } from "./logger-subscriber/model/LogLevel";
-export { ConsoleLogger } from "./logger-subscriber/service/ConsoleLogger";
-export { WebLogsExporterLogger } from "./logger-subscriber/service/WebLogsExporterLogger";
-export { ConnectedDevice } from "./transport/model/ConnectedDevice";
-export { BuiltinTransports } from "./transport/model/TransportIdentifier";
-export * from "./types";
-export * from "@api/apdu/utils/AppBuilderError";
-export { InvalidStatusWordError } from "@api/command/Errors";
-export { LEDGER_VENDOR_ID } from "@api/device/DeviceModel";
+} from "@api/command/utils/GlobalCommandError";
+export {
+  DeviceModel,
+  DeviceModelId,
+  LEDGER_VENDOR_ID,
+} from "@api/device/DeviceModel";
+export { DeviceStatus } from "@api/device/DeviceStatus";
 export {
   type DeviceAction,
   type DeviceActionIntermediateValue,
@@ -120,7 +116,11 @@ export {
 } from "@api/device-action/xstate-utils/XStateDeviceAction";
 export { type DeviceModelDataSource } from "@api/device-model/data/DeviceModelDataSource";
 export { StaticDeviceModelDataSource } from "@api/device-model/data/StaticDeviceModelDataSource";
-export { TransportDeviceModel } from "@api/device-model/model/DeviceModel";
+export {
+  BleDeviceInfos,
+  TransportDeviceModel,
+} from "@api/device-model/model/DeviceModel";
+export { ApduResponse } from "@api/device-session/ApduResponse";
 export {
   type DeviceSessionState,
   DeviceSessionStateType,
@@ -133,8 +133,15 @@ export { type ApduSenderService } from "@api/device-session/service/ApduSenderSe
 export { defaultApduReceiverServiceStubBuilder } from "@api/device-session/service/DefaultApduReceiverService.stub";
 export { defaultApduSenderServiceStubBuilder } from "@api/device-session/service/DefaultApduSenderService.stub";
 export { FramerUtils } from "@api/device-session/utils/FramerUtils";
+export { DeviceSdk } from "@api/DeviceSdk";
+export { LedgerDeviceSdkBuilder as DeviceSdkBuilder } from "@api/DeviceSdkBuilder";
+export { DeviceExchangeError, UnknownDeviceExchangeError } from "@api/Error";
 export { type SdkError } from "@api/Error";
 export { type LoggerPublisherService } from "@api/logger-publisher/service/LoggerPublisherService";
+export { LogLevel } from "@api/logger-subscriber/model/LogLevel";
+export { ConsoleLogger } from "@api/logger-subscriber/service/ConsoleLogger";
+export { WebLogsExporterLogger } from "@api/logger-subscriber/service/WebLogsExporterLogger";
+export { ConnectedDevice } from "@api/transport/model/ConnectedDevice";
 export {
   type DeviceConnection,
   type DisconnectHandler,
@@ -143,6 +150,8 @@ export * from "@api/transport/model/Errors";
 export { TransportConnectedDevice } from "@api/transport/model/TransportConnectedDevice";
 export { connectedDeviceStubBuilder } from "@api/transport/model/TransportConnectedDevice.stub";
 export { type TransportDiscoveredDevice } from "@api/transport/model/TransportDiscoveredDevice";
+export { BuiltinTransports } from "@api/transport/model/TransportIdentifier";
+export * from "@api/types";
 export { base64StringToBuffer, isBase64String } from "@api/utils/Base64String";
 export {
   bufferToHexaString,

packages/core/src/api/transport/model/Errors.ts

@@ -1,5 +1,4 @@
 import { type SdkError } from "@api/Error";
-import { type DeviceAlreadyConnectedError } from "@internal/transport/ble/model/Errors";
 
 export type ConnectError =
   | UnknownDeviceError
@@ -25,6 +24,13 @@ export class DeviceNotRecognizedError extends GeneralSdkError {
   }
 }
 
+export class DeviceAlreadyConnectedError extends GeneralSdkError {
+  override readonly _tag = "DeviceAlreadyDiscoveredError";
+  constructor(readonly err?: unknown) {
+    super(err);
+  }
+}
+
 export class NoAccessibleDeviceError extends GeneralSdkError {
   override readonly _tag = "NoAccessibleDeviceError";
   constructor(readonly err?: unknown) {

packages/signer/context-module/src/typed-data/domain/DefaultTypedDataContextLoader.ts

@@ -90,8 +90,8 @@ export class DefaultTypedDataContextLoader implements TypedDataContextLoader {
             address,
             chainId,
           });
-          payload.ifRight((payload) => {
-            mappedTokens[tokenIndex] = payload;
+          payload.ifRight((p) => {
+            mappedTokens[tokenIndex] = p;
           });
         }
       }
@@ -109,8 +109,8 @@ export class DefaultTypedDataContextLoader implements TypedDataContextLoader {
           address,
           chainId,
         });
-        payload.ifRight((payload) => {
-          mappedTokens[tokenIndex] = payload;
+        payload.ifRight((p) => {
+          mappedTokens[tokenIndex] = p;
         });
       }
     }

packages/tools/esbuild-tools/watch.mjs

@@ -16,7 +16,7 @@ const config = {
   // metafile: true,
 };
 
-const { entryPoints, tsconfig } = argv;
+const { entryPoints, tsconfig, platform } = argv;
 
 if (!entryPoints) {
   console.error(chalk.red("Entry points are required"));
@@ -92,8 +92,14 @@ const getNodeContext = async () => {
 const watch = async () => {
   const browserContext = await getBrowserContext();
   const nodeContext = await getNodeContext();
-  await browserContext.watch();
-  await nodeContext.watch();
+  if (platform === "web") {
+    await browserContext.watch();
+  } else if (platform === "node") {
+    await nodeContext.watch();
+  } else {
+    await browserContext.watch();
+    await nodeContext.watch();
+  }
 };
 
 watch().catch((e) => {

packages/transport/web-ble/.prettierignore

@@ -0,0 +1,2 @@
+lib/*
+coverage/*