@ledgerhq/live-common 34.35.0-nightly.3 → 34.35.0-nightly.4
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/lib/apps/support.d.ts +1 -0
- package/lib/apps/support.d.ts.map +1 -1
- package/lib/apps/support.js +10 -1
- package/lib/apps/support.js.map +1 -1
- package/lib/e2e/enum/Account.js +5 -5
- package/lib/e2e/enum/Account.js.map +1 -1
- package/lib/e2e/index.d.ts +2 -0
- package/lib/e2e/index.d.ts.map +1 -1
- package/lib/featureFlags/defaultFeatures.d.ts.map +1 -1
- package/lib/featureFlags/defaultFeatures.js +1 -0
- package/lib/featureFlags/defaultFeatures.js.map +1 -1
- package/lib/featureFlags/useFeature.d.ts +1 -1
- package/lib/featureFlags/useFeature.d.ts.map +1 -1
- package/lib/hw/actions/manager.d.ts +1 -1
- package/lib/hw/actions/manager.d.ts.map +1 -1
- package/lib/hw/connectApp.d.ts.map +1 -1
- package/lib/hw/connectApp.js +56 -5
- package/lib/hw/connectApp.js.map +1 -1
- package/lib/hw/connectAppEventMapper.d.ts +29 -0
- package/lib/hw/connectAppEventMapper.d.ts.map +1 -0
- package/lib/hw/connectAppEventMapper.js +300 -0
- package/lib/hw/connectAppEventMapper.js.map +1 -0
- package/lib/hw/connectManager.d.ts +3 -2
- package/lib/hw/connectManager.d.ts.map +1 -1
- package/lib/hw/connectManager.js +34 -3
- package/lib/hw/connectManager.js.map +1 -1
- package/lib/hw/connectManagerEventMapper.d.ts +16 -0
- package/lib/hw/connectManagerEventMapper.d.ts.map +1 -0
- package/lib/hw/connectManagerEventMapper.js +78 -0
- package/lib/hw/connectManagerEventMapper.js.map +1 -0
- package/lib/notifications/AnnouncementProvider/index.d.ts.map +1 -1
- package/lib/notifications/AnnouncementProvider/index.js +12 -10
- package/lib/notifications/AnnouncementProvider/index.js.map +1 -1
- package/lib/notifications/AnnouncementProvider/machine.d.ts +1 -4
- package/lib/notifications/AnnouncementProvider/machine.d.ts.map +1 -1
- package/lib/notifications/AnnouncementProvider/machine.js +9 -8
- package/lib/notifications/AnnouncementProvider/machine.js.map +1 -1
- package/lib/notifications/ServiceStatusProvider/index.d.ts.map +1 -1
- package/lib/notifications/ServiceStatusProvider/index.js +5 -4
- package/lib/notifications/ServiceStatusProvider/index.js.map +1 -1
- package/lib/notifications/ServiceStatusProvider/machine.d.ts +1 -4
- package/lib/notifications/ServiceStatusProvider/machine.d.ts.map +1 -1
- package/lib/notifications/ServiceStatusProvider/machine.js +4 -4
- package/lib/notifications/ServiceStatusProvider/machine.js.map +1 -1
- package/lib/wallet-api/ModularDrawer/types.d.ts +63 -0
- package/lib/wallet-api/ModularDrawer/types.d.ts.map +1 -0
- package/lib/wallet-api/ModularDrawer/types.js +25 -0
- package/lib/wallet-api/ModularDrawer/types.js.map +1 -0
- package/lib/wallet-api/ModularDrawer/utils.d.ts +5 -0
- package/lib/wallet-api/ModularDrawer/utils.d.ts.map +1 -0
- package/lib/wallet-api/ModularDrawer/utils.js +30 -0
- package/lib/wallet-api/ModularDrawer/utils.js.map +1 -0
- package/lib/wallet-api/react.d.ts +2 -0
- package/lib/wallet-api/react.d.ts.map +1 -1
- package/lib/wallet-api/react.js +2 -1
- package/lib/wallet-api/react.js.map +1 -1
- package/lib-es/apps/support.d.ts +1 -0
- package/lib-es/apps/support.d.ts.map +1 -1
- package/lib-es/apps/support.js +8 -0
- package/lib-es/apps/support.js.map +1 -1
- package/lib-es/e2e/enum/Account.js +5 -5
- package/lib-es/e2e/enum/Account.js.map +1 -1
- package/lib-es/e2e/index.d.ts +2 -0
- package/lib-es/e2e/index.d.ts.map +1 -1
- package/lib-es/featureFlags/defaultFeatures.d.ts.map +1 -1
- package/lib-es/featureFlags/defaultFeatures.js +1 -0
- package/lib-es/featureFlags/defaultFeatures.js.map +1 -1
- package/lib-es/featureFlags/useFeature.d.ts +1 -1
- package/lib-es/featureFlags/useFeature.d.ts.map +1 -1
- package/lib-es/hw/actions/manager.d.ts +1 -1
- package/lib-es/hw/actions/manager.d.ts.map +1 -1
- package/lib-es/hw/connectApp.d.ts.map +1 -1
- package/lib-es/hw/connectApp.js +57 -6
- package/lib-es/hw/connectApp.js.map +1 -1
- package/lib-es/hw/connectAppEventMapper.d.ts +29 -0
- package/lib-es/hw/connectAppEventMapper.d.ts.map +1 -0
- package/lib-es/hw/connectAppEventMapper.js +296 -0
- package/lib-es/hw/connectAppEventMapper.js.map +1 -0
- package/lib-es/hw/connectManager.d.ts +3 -2
- package/lib-es/hw/connectManager.d.ts.map +1 -1
- package/lib-es/hw/connectManager.js +34 -4
- package/lib-es/hw/connectManager.js.map +1 -1
- package/lib-es/hw/connectManagerEventMapper.d.ts +16 -0
- package/lib-es/hw/connectManagerEventMapper.d.ts.map +1 -0
- package/lib-es/hw/connectManagerEventMapper.js +74 -0
- package/lib-es/hw/connectManagerEventMapper.js.map +1 -0
- package/lib-es/notifications/AnnouncementProvider/index.d.ts.map +1 -1
- package/lib-es/notifications/AnnouncementProvider/index.js +12 -10
- package/lib-es/notifications/AnnouncementProvider/index.js.map +1 -1
- package/lib-es/notifications/AnnouncementProvider/machine.d.ts +1 -4
- package/lib-es/notifications/AnnouncementProvider/machine.d.ts.map +1 -1
- package/lib-es/notifications/AnnouncementProvider/machine.js +9 -8
- package/lib-es/notifications/AnnouncementProvider/machine.js.map +1 -1
- package/lib-es/notifications/ServiceStatusProvider/index.d.ts.map +1 -1
- package/lib-es/notifications/ServiceStatusProvider/index.js +5 -4
- package/lib-es/notifications/ServiceStatusProvider/index.js.map +1 -1
- package/lib-es/notifications/ServiceStatusProvider/machine.d.ts +1 -4
- package/lib-es/notifications/ServiceStatusProvider/machine.d.ts.map +1 -1
- package/lib-es/notifications/ServiceStatusProvider/machine.js +4 -4
- package/lib-es/notifications/ServiceStatusProvider/machine.js.map +1 -1
- package/lib-es/wallet-api/ModularDrawer/types.d.ts +63 -0
- package/lib-es/wallet-api/ModularDrawer/types.d.ts.map +1 -0
- package/lib-es/wallet-api/ModularDrawer/types.js +22 -0
- package/lib-es/wallet-api/ModularDrawer/types.js.map +1 -0
- package/lib-es/wallet-api/ModularDrawer/utils.d.ts +5 -0
- package/lib-es/wallet-api/ModularDrawer/utils.d.ts.map +1 -0
- package/lib-es/wallet-api/ModularDrawer/utils.js +25 -0
- package/lib-es/wallet-api/ModularDrawer/utils.js.map +1 -0
- package/lib-es/wallet-api/react.d.ts +2 -0
- package/lib-es/wallet-api/react.d.ts.map +1 -1
- package/lib-es/wallet-api/react.js +2 -1
- package/lib-es/wallet-api/react.js.map +1 -1
- package/package.json +50 -49
- package/src/apps/support.ts +11 -0
- package/src/e2e/enum/Account.ts +5 -5
- package/src/featureFlags/defaultFeatures.ts +1 -0
- package/src/hw/actions/manager.ts +1 -1
- package/src/hw/connectApp.ts +245 -178
- package/src/hw/connectAppEventMapper.ts +364 -0
- package/src/hw/connectManager.ts +116 -74
- package/src/hw/connectManagerEventMapper.ts +109 -0
- package/src/notifications/AnnouncementProvider/index.tsx +21 -17
- package/src/notifications/AnnouncementProvider/machine.ts +9 -8
- package/src/notifications/ServiceStatusProvider/index.tsx +11 -8
- package/src/notifications/ServiceStatusProvider/machine.ts +4 -4
- package/src/wallet-api/ModularDrawer/types.ts +45 -0
- package/src/wallet-api/ModularDrawer/utils.ts +37 -0
- package/src/wallet-api/react.ts +37 -31
- package/lib/index.d.ts +0 -2
- package/lib/index.d.ts.map +0 -1
- package/lib/index.js +0 -3
- package/lib/index.js.map +0 -1
- package/lib-es/index.d.ts +0 -1
- package/lib-es/index.d.ts.map +0 -1
- package/lib-es/index.js +0 -2
- package/lib-es/index.js.map +0 -1
- package/src/index.ts +0 -0
@@ -0,0 +1,296 @@
|
|
1
|
+
import { Observable, Subject, of, share, takeUntil } from "rxjs";
|
2
|
+
import { catchError, tap, withLatestFrom } from "rxjs/operators";
|
3
|
+
import { DeviceActionStatus, DeviceLockedError, DeviceSessionStateType, DeviceStatus, UserInteractionRequired, OutOfMemoryDAError, SecureChannelError, UnsupportedFirmwareDAError, } from "@ledgerhq/device-management-kit";
|
4
|
+
import { UserRefusedAllowManager, UserRefusedOnDevice, LatestFirmwareVersionRequired, } from "@ledgerhq/errors";
|
5
|
+
import { SkipReason } from "../apps/types";
|
6
|
+
import { parseDeviceInfo } from "../deviceSDK/tasks/getDeviceInfo";
|
7
|
+
export class ConnectAppEventMapper {
|
8
|
+
dmk;
|
9
|
+
sessionId;
|
10
|
+
appName;
|
11
|
+
events;
|
12
|
+
openAppRequested = false;
|
13
|
+
permissionRequested = false;
|
14
|
+
lastSeenDeviceSent = false;
|
15
|
+
installPlan = null;
|
16
|
+
eventSubject = new Subject();
|
17
|
+
constructor(dmk, sessionId, appName, events) {
|
18
|
+
this.dmk = dmk;
|
19
|
+
this.sessionId = sessionId;
|
20
|
+
this.appName = appName;
|
21
|
+
this.events = events;
|
22
|
+
}
|
23
|
+
map() {
|
24
|
+
const cancelAction = this.events.cancel;
|
25
|
+
const unsubscribe = new Subject();
|
26
|
+
// Create a shared observable for device session state
|
27
|
+
const deviceSessionState = this.dmk
|
28
|
+
.getDeviceSessionState({ sessionId: this.sessionId })
|
29
|
+
.pipe(share());
|
30
|
+
// Subscribe to device action events
|
31
|
+
this.events.observable
|
32
|
+
.pipe(withLatestFrom(deviceSessionState), tap(([event, deviceState]) => this.handleEvent(event, deviceState)), takeUntil(unsubscribe), catchError(error => this.handleError(error)))
|
33
|
+
.subscribe();
|
34
|
+
// Subscribe to device session state events
|
35
|
+
deviceSessionState
|
36
|
+
.pipe(tap(deviceState => this.handleDeviceState(deviceState)), takeUntil(unsubscribe))
|
37
|
+
.subscribe();
|
38
|
+
return new Observable(observer => {
|
39
|
+
const sub = this.eventSubject.subscribe(observer);
|
40
|
+
return () => {
|
41
|
+
sub.unsubscribe();
|
42
|
+
cancelAction();
|
43
|
+
unsubscribe.next();
|
44
|
+
};
|
45
|
+
});
|
46
|
+
}
|
47
|
+
handleDeviceState(deviceState) {
|
48
|
+
if (deviceState.sessionStateType === DeviceSessionStateType.Connected) {
|
49
|
+
return;
|
50
|
+
}
|
51
|
+
if (deviceState.deviceStatus === DeviceStatus.NOT_CONNECTED) {
|
52
|
+
this.eventSubject.next({ type: "disconnected", expected: false });
|
53
|
+
}
|
54
|
+
else if (deviceState.firmwareVersion?.metadata &&
|
55
|
+
deviceState.firmwareUpdateContext &&
|
56
|
+
!this.lastSeenDeviceSent) {
|
57
|
+
this.lastSeenDeviceSent = true;
|
58
|
+
this.eventSubject.next({
|
59
|
+
type: "device-update-last-seen",
|
60
|
+
deviceInfo: this.mapDeviceInfo(deviceState.firmwareVersion.metadata),
|
61
|
+
latestFirmware: this.mapLatestFirmware(deviceState.firmwareUpdateContext),
|
62
|
+
});
|
63
|
+
}
|
64
|
+
}
|
65
|
+
handleEvent(event, deviceState) {
|
66
|
+
switch (event.status) {
|
67
|
+
case DeviceActionStatus.Pending:
|
68
|
+
this.handlePendingEvent(event.intermediateValue);
|
69
|
+
break;
|
70
|
+
case DeviceActionStatus.Completed:
|
71
|
+
this.handleCompletedEvent(event.output, deviceState);
|
72
|
+
break;
|
73
|
+
case DeviceActionStatus.Error:
|
74
|
+
this.handleErrorEvent(event.error, deviceState);
|
75
|
+
break;
|
76
|
+
case DeviceActionStatus.NotStarted:
|
77
|
+
case DeviceActionStatus.Stopped:
|
78
|
+
this.eventSubject.error(new Error("Unexpected device action status"));
|
79
|
+
break;
|
80
|
+
}
|
81
|
+
}
|
82
|
+
handlePendingEvent(intermediateValue) {
|
83
|
+
switch (intermediateValue.requiredUserInteraction) {
|
84
|
+
case UserInteractionRequired.ConfirmOpenApp:
|
85
|
+
if (!this.openAppRequested) {
|
86
|
+
this.openAppRequested = true;
|
87
|
+
this.eventSubject.next({ type: "ask-open-app", appName: this.appName });
|
88
|
+
}
|
89
|
+
break;
|
90
|
+
case UserInteractionRequired.AllowSecureConnection:
|
91
|
+
if (!this.permissionRequested) {
|
92
|
+
this.permissionRequested = true;
|
93
|
+
this.eventSubject.next({ type: "device-permission-requested" });
|
94
|
+
}
|
95
|
+
break;
|
96
|
+
case UserInteractionRequired.UnlockDevice:
|
97
|
+
this.eventSubject.next({ type: "lockedDevice" });
|
98
|
+
break;
|
99
|
+
case UserInteractionRequired.None:
|
100
|
+
if (this.openAppRequested) {
|
101
|
+
this.openAppRequested = false;
|
102
|
+
this.eventSubject.next({ type: "device-permission-granted" });
|
103
|
+
}
|
104
|
+
if (this.permissionRequested) {
|
105
|
+
this.permissionRequested = false;
|
106
|
+
this.eventSubject.next({ type: "device-permission-granted" });
|
107
|
+
// Simulate apps listing (not systematic step in LDMK)
|
108
|
+
this.eventSubject.next({ type: "listing-apps" });
|
109
|
+
}
|
110
|
+
if (intermediateValue.installPlan !== null) {
|
111
|
+
this.handleInstallPlan(intermediateValue.installPlan);
|
112
|
+
}
|
113
|
+
break;
|
114
|
+
}
|
115
|
+
}
|
116
|
+
handleInstallPlan(installPlan) {
|
117
|
+
// Handle install plan resolved events
|
118
|
+
if (this.installPlan === null) {
|
119
|
+
// Skipped applications
|
120
|
+
const alreadyInstalled = this.mapSkippedApps(installPlan.alreadyInstalled, SkipReason.AppAlreadyInstalled);
|
121
|
+
const missing = this.mapSkippedApps(installPlan.missingApplications, SkipReason.NoSuchAppOnProvider);
|
122
|
+
const skippedAppOps = [...alreadyInstalled, ...missing];
|
123
|
+
if (skippedAppOps.length > 0) {
|
124
|
+
this.eventSubject.next({
|
125
|
+
type: "some-apps-skipped",
|
126
|
+
skippedAppOps,
|
127
|
+
});
|
128
|
+
}
|
129
|
+
// Install queue content
|
130
|
+
this.eventSubject.next({
|
131
|
+
type: "listed-apps",
|
132
|
+
installQueue: installPlan.installPlan.map(app => app.versionName),
|
133
|
+
});
|
134
|
+
}
|
135
|
+
// Handle ongoing install events
|
136
|
+
this.eventSubject.next({
|
137
|
+
type: "inline-install",
|
138
|
+
progress: installPlan.currentProgress,
|
139
|
+
itemProgress: installPlan.currentIndex,
|
140
|
+
currentAppOp: {
|
141
|
+
type: "install",
|
142
|
+
name: installPlan.installPlan[installPlan.currentIndex].versionName,
|
143
|
+
},
|
144
|
+
installQueue: installPlan.installPlan.map(app => app.versionName),
|
145
|
+
});
|
146
|
+
this.installPlan = installPlan;
|
147
|
+
}
|
148
|
+
handleCompletedEvent(output, deviceState) {
|
149
|
+
if (deviceState.sessionStateType !== DeviceSessionStateType.Connected) {
|
150
|
+
// Handle opened app
|
151
|
+
const currentApp = deviceState.currentApp;
|
152
|
+
let flags = 0;
|
153
|
+
if (typeof currentApp.flags === "number") {
|
154
|
+
flags = currentApp.flags;
|
155
|
+
}
|
156
|
+
else if (currentApp.flags !== undefined) {
|
157
|
+
flags = Buffer.from(currentApp.flags);
|
158
|
+
}
|
159
|
+
this.eventSubject.next({
|
160
|
+
type: "opened",
|
161
|
+
app: {
|
162
|
+
name: currentApp.name,
|
163
|
+
version: currentApp.version,
|
164
|
+
flags,
|
165
|
+
},
|
166
|
+
derivation: output.derivation ? { address: output.derivation } : undefined,
|
167
|
+
});
|
168
|
+
}
|
169
|
+
this.eventSubject.complete();
|
170
|
+
}
|
171
|
+
handleErrorEvent(error, deviceState) {
|
172
|
+
if (error instanceof OutOfMemoryDAError && this.installPlan !== null) {
|
173
|
+
const appNames = this.installPlan.installPlan.map(app => app.versionName);
|
174
|
+
this.eventSubject.next({
|
175
|
+
type: "app-not-installed",
|
176
|
+
appNames,
|
177
|
+
appName: appNames[0],
|
178
|
+
});
|
179
|
+
this.eventSubject.complete();
|
180
|
+
}
|
181
|
+
else if (error instanceof UnsupportedFirmwareDAError &&
|
182
|
+
deviceState.sessionStateType !== DeviceSessionStateType.Connected) {
|
183
|
+
this.eventSubject.error(new LatestFirmwareVersionRequired("LatestFirmwareVersionRequired", {
|
184
|
+
current: deviceState.firmwareUpdateContext.currentFirmware.version,
|
185
|
+
latest: deviceState.firmwareUpdateContext?.availableUpdate?.finalFirmware.version ||
|
186
|
+
deviceState.firmwareUpdateContext.currentFirmware.version,
|
187
|
+
}));
|
188
|
+
}
|
189
|
+
else if (error instanceof DeviceLockedError) {
|
190
|
+
this.eventSubject.next({ type: "lockedDevice" });
|
191
|
+
this.eventSubject.complete();
|
192
|
+
}
|
193
|
+
else if (error instanceof SecureChannelError) {
|
194
|
+
this.eventSubject.error(new UserRefusedAllowManager());
|
195
|
+
}
|
196
|
+
else if ("_tag" in error && error._tag === "WebHidSendReportError") {
|
197
|
+
this.eventSubject.next({ type: "disconnected", expected: false });
|
198
|
+
this.eventSubject.complete();
|
199
|
+
}
|
200
|
+
else if ("errorCode" in error && typeof error.errorCode === "string" && "_tag" in error) {
|
201
|
+
this.eventSubject.error(this.mapDeviceError(error.errorCode, error._tag));
|
202
|
+
}
|
203
|
+
else {
|
204
|
+
this.eventSubject.error(error);
|
205
|
+
}
|
206
|
+
}
|
207
|
+
handleError(error) {
|
208
|
+
this.eventSubject.error(error);
|
209
|
+
return of();
|
210
|
+
}
|
211
|
+
mapDeviceError(errorCode, defaultMessage) {
|
212
|
+
switch (errorCode) {
|
213
|
+
case "5501":
|
214
|
+
return new UserRefusedOnDevice();
|
215
|
+
default:
|
216
|
+
return new Error(defaultMessage);
|
217
|
+
}
|
218
|
+
}
|
219
|
+
mapSkippedApps(appNames, reason) {
|
220
|
+
return appNames.map(name => ({
|
221
|
+
reason,
|
222
|
+
appOp: {
|
223
|
+
type: "install",
|
224
|
+
name,
|
225
|
+
},
|
226
|
+
}));
|
227
|
+
}
|
228
|
+
mapDeviceInfo(osVersion) {
|
229
|
+
return parseDeviceInfo({
|
230
|
+
isBootloader: osVersion.isBootloader,
|
231
|
+
rawVersion: osVersion.seVersion,
|
232
|
+
targetId: osVersion.targetId,
|
233
|
+
seVersion: osVersion.seVersion,
|
234
|
+
seTargetId: osVersion.seTargetId,
|
235
|
+
mcuBlVersion: undefined,
|
236
|
+
mcuVersion: osVersion.mcuSephVersion,
|
237
|
+
mcuTargetId: osVersion.mcuTargetId,
|
238
|
+
flags: Buffer.from(osVersion.seFlags),
|
239
|
+
bootloaderVersion: osVersion.mcuBootloaderVersion,
|
240
|
+
hardwareVersion: parseInt(osVersion.hwVersion, 16),
|
241
|
+
languageId: osVersion.langId,
|
242
|
+
});
|
243
|
+
}
|
244
|
+
mapLatestFirmware(updateContext) {
|
245
|
+
if (!updateContext.availableUpdate) {
|
246
|
+
return null;
|
247
|
+
}
|
248
|
+
const availableUpdate = updateContext.availableUpdate;
|
249
|
+
const osu = availableUpdate.osuFirmware;
|
250
|
+
const final = availableUpdate.finalFirmware;
|
251
|
+
return {
|
252
|
+
osu: {
|
253
|
+
id: osu.id,
|
254
|
+
perso: osu.perso,
|
255
|
+
firmware: osu.firmware,
|
256
|
+
firmware_key: osu.firmwareKey,
|
257
|
+
hash: osu.hash || "",
|
258
|
+
next_se_firmware_final_version: osu.nextFinalFirmware,
|
259
|
+
// Following fields are inherited from dto, but unused
|
260
|
+
description: undefined,
|
261
|
+
display_name: undefined,
|
262
|
+
notes: undefined,
|
263
|
+
name: "",
|
264
|
+
date_creation: "",
|
265
|
+
date_last_modified: "",
|
266
|
+
device_versions: [],
|
267
|
+
providers: [],
|
268
|
+
previous_se_firmware_final_version: [],
|
269
|
+
},
|
270
|
+
final: {
|
271
|
+
id: final.id,
|
272
|
+
name: final.version,
|
273
|
+
version: final.version,
|
274
|
+
perso: final.perso,
|
275
|
+
firmware: final.firmware || "",
|
276
|
+
firmware_key: final.firmwareKey || "",
|
277
|
+
hash: final.hash || "",
|
278
|
+
bytes: final.bytes || 0,
|
279
|
+
mcu_versions: final.mcuVersions,
|
280
|
+
// Following fields are inherited from dto, but unused
|
281
|
+
description: undefined,
|
282
|
+
display_name: undefined,
|
283
|
+
notes: undefined,
|
284
|
+
se_firmware: 0,
|
285
|
+
date_creation: "",
|
286
|
+
date_last_modified: "",
|
287
|
+
device_versions: [],
|
288
|
+
application_versions: [],
|
289
|
+
osu_versions: [],
|
290
|
+
providers: [],
|
291
|
+
},
|
292
|
+
shouldFlashMCU: availableUpdate.mcuUpdateRequired,
|
293
|
+
};
|
294
|
+
}
|
295
|
+
}
|
296
|
+
//# sourceMappingURL=connectAppEventMapper.js.map
|
@@ -0,0 +1 @@
|
|
1
|
+
{"version":3,"file":"connectAppEventMapper.js","sourceRoot":"","sources":["../../src/hw/connectAppEventMapper.ts"],"names":[],"mappings":"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"}
|
@@ -18,6 +18,7 @@ export type ConnectManagerEvent = AttemptToQuitAppEvent | {
|
|
18
18
|
type: "listingApps";
|
19
19
|
deviceInfo: DeviceInfo;
|
20
20
|
} | ListAppsEvent | LockedDeviceEvent;
|
21
|
-
|
22
|
-
|
21
|
+
export default function connectManagerFactory({ isLdmkConnectAppEnabled, }?: {
|
22
|
+
isLdmkConnectAppEnabled: boolean;
|
23
|
+
}): ({ deviceId, request }: Input) => Observable<ConnectManagerEvent>;
|
23
24
|
//# sourceMappingURL=connectManager.d.ts.map
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"connectManager.d.ts","sourceRoot":"","sources":["../../src/hw/connectManager.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,
|
1
|
+
{"version":3,"file":"connectManager.d.ts","sourceRoot":"","sources":["../../src/hw/connectManager.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAA4C,MAAM,MAAM,CAAC;AAQ5E,OAAO,EAAE,UAAU,EAAE,MAAM,sBAAsB,CAAC;AAIlD,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,SAAS,CAAC;AAO7C,OAAyB,EAAE,qBAAqB,EAAE,MAAM,oBAAoB,CAAC;AAC7E,OAAO,EAAE,iBAAiB,EAAE,MAAM,iBAAiB,CAAC;AACpD,OAAO,EAAE,cAAc,EAAE,MAAM,mBAAmB,CAAC;AAGnD,MAAM,MAAM,KAAK,GAAG;IAClB,QAAQ,EAAE,MAAM,CAAC;IACjB,OAAO,EAAE,cAAc,GAAG,IAAI,GAAG,SAAS,CAAC;CAC5C,CAAC;AAEF,MAAM,MAAM,mBAAmB,GAC3B,qBAAqB,GACrB;IACE,IAAI,EAAE,KAAK,CAAC;IACZ,UAAU,EAAE,UAAU,CAAC;CACxB,GACD;IACE,IAAI,EAAE,YAAY,CAAC;IACnB,UAAU,EAAE,UAAU,CAAC;CACxB,GACD;IACE,IAAI,EAAE,aAAa,CAAC;IACpB,UAAU,EAAE,UAAU,CAAC;CACxB,GACD,aAAa,GACb,iBAAiB,CAAC;AA2FtB,MAAM,CAAC,OAAO,UAAU,qBAAqB,CAC3C,EACE,uBAAuB,GACxB,GAAE;IACD,uBAAuB,EAAE,OAAO,CAAC;CACG,2BAGL,KAAK,KAAG,WAAW,mBAAmB,CAAC,CAsBzE"}
|
@@ -1,6 +1,7 @@
|
|
1
|
-
import { Observable, concat, from, of, throwError } from "rxjs";
|
1
|
+
import { Observable, concat, concatWith, from, of, throwError } from "rxjs";
|
2
2
|
import { concatMap, catchError, delay } from "rxjs/operators";
|
3
3
|
import { TransportStatusError, DeviceOnDashboardExpected, StatusCodes, LockedDeviceError, } from "@ledgerhq/errors";
|
4
|
+
import { PrepareConnectManagerDeviceAction } from "@ledgerhq/live-dmk-shared";
|
4
5
|
import { listAppsUseCase } from "../device/use-cases/listAppsUseCase";
|
5
6
|
import { withDevice } from "./deviceAccess";
|
6
7
|
import getDeviceInfo from "./getDeviceInfo";
|
@@ -8,7 +9,8 @@ import getAppAndVersion from "./getAppAndVersion";
|
|
8
9
|
import { isDashboardName } from "./isDashboardName";
|
9
10
|
import { DeviceNotOnboarded } from "../errors";
|
10
11
|
import attemptToQuitApp from "./attemptToQuitApp";
|
11
|
-
|
12
|
+
import { PrepareConnectManagerEventMapper } from "./connectManagerEventMapper";
|
13
|
+
const cmd = (transport, { request }) => new Observable(o => {
|
12
14
|
const timeoutSub = of({
|
13
15
|
type: "unresponsiveDevice",
|
14
16
|
})
|
@@ -67,6 +69,34 @@ const cmd = ({ deviceId, request }) => withDevice(deviceId)(transport => new Obs
|
|
67
69
|
timeoutSub.unsubscribe();
|
68
70
|
sub.unsubscribe();
|
69
71
|
};
|
70
|
-
})
|
71
|
-
|
72
|
+
});
|
73
|
+
const isDmkTransport = (transport) => {
|
74
|
+
return ("dmk" in transport &&
|
75
|
+
transport.dmk !== undefined &&
|
76
|
+
"sessionId" in transport &&
|
77
|
+
transport.sessionId !== undefined);
|
78
|
+
};
|
79
|
+
export default function connectManagerFactory({ isLdmkConnectAppEnabled, } = { isLdmkConnectAppEnabled: false }) {
|
80
|
+
if (!isLdmkConnectAppEnabled) {
|
81
|
+
return ({ deviceId, request }) => withDevice(deviceId)(transport => cmd(transport, { deviceId, request }));
|
82
|
+
}
|
83
|
+
return ({ deviceId, request }) => withDevice(deviceId)(transport => {
|
84
|
+
if (!isDmkTransport(transport)) {
|
85
|
+
return cmd(transport, { deviceId, request });
|
86
|
+
}
|
87
|
+
const { dmk, sessionId } = transport;
|
88
|
+
const deviceAction = new PrepareConnectManagerDeviceAction({
|
89
|
+
input: {
|
90
|
+
unlockTimeout: 0, // Expect to fail immediately when device is locked
|
91
|
+
},
|
92
|
+
});
|
93
|
+
const observable = dmk.executeDeviceAction({
|
94
|
+
sessionId,
|
95
|
+
deviceAction,
|
96
|
+
});
|
97
|
+
return new PrepareConnectManagerEventMapper(observable)
|
98
|
+
.map()
|
99
|
+
.pipe(concatWith(cmd(transport, { deviceId, request })));
|
100
|
+
});
|
101
|
+
}
|
72
102
|
//# sourceMappingURL=connectManager.js.map
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"connectManager.js","sourceRoot":"","sources":["../../src/hw/connectManager.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,EAAE,IAAI,EAAE,EAAE,EAAE,UAAU,EAAE,MAAM,MAAM,CAAC;
|
1
|
+
{"version":3,"file":"connectManager.js","sourceRoot":"","sources":["../../src/hw/connectManager.ts"],"names":[],"mappings":"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"}
|
@@ -0,0 +1,16 @@
|
|
1
|
+
import { Observable } from "rxjs";
|
2
|
+
import type { ExecuteDeviceActionReturnType } from "@ledgerhq/device-management-kit";
|
3
|
+
import type { PrepareConnectManagerDAOutput, PrepareConnectManagerDAError, PrepareConnectManagerDAIntermediateValue } from "@ledgerhq/live-dmk-shared";
|
4
|
+
import { LockedDeviceEvent } from "./actions/types";
|
5
|
+
export declare class PrepareConnectManagerEventMapper {
|
6
|
+
private events;
|
7
|
+
private eventSubject;
|
8
|
+
constructor(events: ExecuteDeviceActionReturnType<PrepareConnectManagerDAOutput, PrepareConnectManagerDAError, PrepareConnectManagerDAIntermediateValue>);
|
9
|
+
map(): Observable<LockedDeviceEvent>;
|
10
|
+
private handleEvent;
|
11
|
+
private handlePendingEvent;
|
12
|
+
private handleCompletedEvent;
|
13
|
+
private handleErrorEvent;
|
14
|
+
private handleError;
|
15
|
+
}
|
16
|
+
//# sourceMappingURL=connectManagerEventMapper.d.ts.map
|
@@ -0,0 +1 @@
|
|
1
|
+
{"version":3,"file":"connectManagerEventMapper.d.ts","sourceRoot":"","sources":["../../src/hw/connectManagerEventMapper.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAA0B,MAAM,MAAM,CAAC;AAE1D,OAAO,KAAK,EAEV,6BAA6B,EAC9B,MAAM,iCAAiC,CAAC;AAMzC,OAAO,KAAK,EACV,6BAA6B,EAC7B,4BAA4B,EAC5B,wCAAwC,EACzC,MAAM,2BAA2B,CAAC;AAGnC,OAAO,EAAE,iBAAiB,EAAE,MAAM,iBAAiB,CAAC;AAEpD,qBAAa,gCAAgC;IAIzC,OAAO,CAAC,MAAM;IAHhB,OAAO,CAAC,YAAY,CAAoC;gBAG9C,MAAM,EAAE,6BAA6B,CAC3C,6BAA6B,EAC7B,4BAA4B,EAC5B,wCAAwC,CACzC;IAGH,GAAG,IAAI,UAAU,CAAC,iBAAiB,CAAC;IAuBpC,OAAO,CAAC,WAAW;IAwBnB,OAAO,CAAC,kBAAkB;IAW1B,OAAO,CAAC,oBAAoB;IAI5B,OAAO,CAAC,gBAAgB;IAWxB,OAAO,CAAC,WAAW;CAIpB"}
|
@@ -0,0 +1,74 @@
|
|
1
|
+
import { Observable, Subject, of, takeUntil } from "rxjs";
|
2
|
+
import { catchError, tap } from "rxjs/operators";
|
3
|
+
import { DeviceActionStatus, DeviceLockedError, UserInteractionRequired, } from "@ledgerhq/device-management-kit";
|
4
|
+
import { DisconnectedDevice } from "@ledgerhq/errors";
|
5
|
+
export class PrepareConnectManagerEventMapper {
|
6
|
+
events;
|
7
|
+
eventSubject = new Subject();
|
8
|
+
constructor(events) {
|
9
|
+
this.events = events;
|
10
|
+
}
|
11
|
+
map() {
|
12
|
+
const cancelAction = this.events.cancel;
|
13
|
+
const unsubscribe = new Subject();
|
14
|
+
// Subscribe to device action events
|
15
|
+
this.events.observable
|
16
|
+
.pipe(tap(event => this.handleEvent(event)), takeUntil(unsubscribe), catchError(error => this.handleError(error)))
|
17
|
+
.subscribe();
|
18
|
+
return new Observable(observer => {
|
19
|
+
const sub = this.eventSubject.subscribe(observer);
|
20
|
+
return () => {
|
21
|
+
sub.unsubscribe();
|
22
|
+
cancelAction();
|
23
|
+
unsubscribe.next();
|
24
|
+
};
|
25
|
+
});
|
26
|
+
}
|
27
|
+
handleEvent(event) {
|
28
|
+
switch (event.status) {
|
29
|
+
case DeviceActionStatus.Pending:
|
30
|
+
this.handlePendingEvent(event.intermediateValue);
|
31
|
+
break;
|
32
|
+
case DeviceActionStatus.Completed:
|
33
|
+
this.handleCompletedEvent(event.output);
|
34
|
+
break;
|
35
|
+
case DeviceActionStatus.Error:
|
36
|
+
this.handleErrorEvent(event.error);
|
37
|
+
break;
|
38
|
+
case DeviceActionStatus.NotStarted:
|
39
|
+
case DeviceActionStatus.Stopped:
|
40
|
+
this.eventSubject.error(new Error("Unexpected device action status"));
|
41
|
+
break;
|
42
|
+
}
|
43
|
+
}
|
44
|
+
handlePendingEvent(intermediateValue) {
|
45
|
+
switch (intermediateValue.requiredUserInteraction) {
|
46
|
+
case UserInteractionRequired.UnlockDevice:
|
47
|
+
this.eventSubject.next({ type: "lockedDevice" });
|
48
|
+
break;
|
49
|
+
case UserInteractionRequired.None:
|
50
|
+
// Nothing to do
|
51
|
+
break;
|
52
|
+
}
|
53
|
+
}
|
54
|
+
handleCompletedEvent(_output) {
|
55
|
+
this.eventSubject.complete();
|
56
|
+
}
|
57
|
+
handleErrorEvent(error) {
|
58
|
+
if (error instanceof DeviceLockedError) {
|
59
|
+
this.eventSubject.next({ type: "lockedDevice" });
|
60
|
+
this.eventSubject.complete();
|
61
|
+
}
|
62
|
+
else if ("_tag" in error && error._tag === "WebHidSendReportError") {
|
63
|
+
this.eventSubject.error(new DisconnectedDevice());
|
64
|
+
}
|
65
|
+
else {
|
66
|
+
this.eventSubject.error(error);
|
67
|
+
}
|
68
|
+
}
|
69
|
+
handleError(error) {
|
70
|
+
this.eventSubject.error(error);
|
71
|
+
return of();
|
72
|
+
}
|
73
|
+
}
|
74
|
+
//# sourceMappingURL=connectManagerEventMapper.js.map
|
@@ -0,0 +1 @@
|
|
1
|
+
{"version":3,"file":"connectManagerEventMapper.js","sourceRoot":"","sources":["../../src/hw/connectManagerEventMapper.ts"],"names":[],"mappings":"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"}
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/notifications/AnnouncementProvider/index.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,EAAmD,YAAY,EAAE,MAAM,OAAO,CAAC;
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/notifications/AnnouncementProvider/index.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,EAAmD,YAAY,EAAE,MAAM,OAAO,CAAC;AAI7F,OAAO,KAAK,EAAE,YAAY,EAAE,yBAAyB,EAAE,KAAK,EAAE,gBAAgB,EAAE,MAAM,SAAS,CAAC;AAOhG,KAAK,KAAK,GAAG;IACX,QAAQ,EAAE,KAAK,CAAC,SAAS,CAAC;IAC1B,UAAU,EAAE,MAAM,OAAO,CAAC;QACxB,aAAa,EAAE,YAAY,EAAE,CAAC;QAC9B,OAAO,EAAE,MAAM,EAAE,CAAC;QAClB,cAAc,EAAE,MAAM,CAAC;KACxB,CAAC,CAAC;IACH,UAAU,EAAE,CAAC,IAAI,EAAE;QACjB,aAAa,EAAE,YAAY,EAAE,CAAC;QAC9B,OAAO,EAAE,MAAM,EAAE,CAAC;QAClB,cAAc,EAAE,MAAM,CAAC;KACxB,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;IACpB,OAAO,EAAE,yBAAyB,CAAC;IACnC,eAAe,EAAE,MAAM,CAAC;IACxB,iBAAiB,CAAC,EAAE,CAAC,IAAI,EAAE,YAAY,KAAK,IAAI,CAAC;IACjD,kBAAkB,CAAC,EAAE,CAAC,IAAI,EAAE,YAAY,KAAK,IAAI,CAAC;IAClD,QAAQ,CAAC,EAAE,gBAAgB,CAAC;CAC7B,CAAC;AACF,KAAK,GAAG,GAAG;IACT,WAAW,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,CAAC;IACjC,SAAS,EAAE,CAAC,MAAM,EAAE,MAAM,KAAK,IAAI,CAAC;CACrC,CAAC;AACF,MAAM,MAAM,uBAAuB,GAAG,KAAK,GAAG,GAAG,CAAC;AAWlD,wBAAgB,gBAAgB,IAAI,uBAAuB,CAE1D;AACD,eAAO,MAAM,oBAAoB,qHAS9B,KAAK,KAAG,YA0FV,CAAC"}
|
@@ -1,5 +1,6 @@
|
|
1
1
|
import React, { createContext, useMemo, useCallback, useContext } from "react";
|
2
2
|
import differenceBy from "lodash/differenceBy";
|
3
|
+
import { fromPromise } from "xstate";
|
3
4
|
import { useMachine } from "@xstate/react";
|
4
5
|
import { localizeAnnouncements, filterAnnouncements } from "./logic";
|
5
6
|
import defaultFetchApi from "./api";
|
@@ -18,7 +19,8 @@ export function useAnnouncements() {
|
|
18
19
|
return useContext(AnnouncementsContext);
|
19
20
|
}
|
20
21
|
export const AnnouncementProvider = ({ children, context, handleLoad, handleSave, autoUpdateDelay, onNewAnnouncement, onAnnouncementRead, fetchApi = defaultFetchApi, }) => {
|
21
|
-
const fetchData = useCallback(async (
|
22
|
+
const fetchData = useCallback(async (arg0) => {
|
23
|
+
const { allIds, cache } = arg0.input;
|
22
24
|
const rawAnnouncements = await fetchApi.fetchAnnouncements();
|
23
25
|
const localizedAnnouncements = localizeAnnouncements(rawAnnouncements, context);
|
24
26
|
const announcements = filterAnnouncements(localizedAnnouncements, context);
|
@@ -34,9 +36,9 @@ export const AnnouncementProvider = ({ children, context, handleLoad, handleSave
|
|
34
36
|
updateTime: Date.now(),
|
35
37
|
};
|
36
38
|
}, [context, onNewAnnouncement, fetchApi]);
|
37
|
-
const emitNewAnnouncement = useCallback(({
|
39
|
+
const emitNewAnnouncement = useCallback(({ context }) => {
|
38
40
|
if (onAnnouncementRead) {
|
39
|
-
onAnnouncementRead(cache[seenId]);
|
41
|
+
onAnnouncementRead(context.cache[context.seenId]);
|
40
42
|
}
|
41
43
|
}, [onAnnouncementRead]);
|
42
44
|
const loadData = useCallback(async () => {
|
@@ -47,7 +49,7 @@ export const AnnouncementProvider = ({ children, context, handleLoad, handleSave
|
|
47
49
|
seenIds,
|
48
50
|
};
|
49
51
|
}, [handleLoad]);
|
50
|
-
const saveData = useCallback(context => {
|
52
|
+
const saveData = useCallback(({ context }) => {
|
51
53
|
const { cache, lastUpdateTime, seenIds, allIds } = context;
|
52
54
|
const announcements = allIds.map((id) => cache[id]);
|
53
55
|
handleSave({
|
@@ -56,19 +58,19 @@ export const AnnouncementProvider = ({ children, context, handleLoad, handleSave
|
|
56
58
|
lastUpdateTime,
|
57
59
|
});
|
58
60
|
}, [handleSave]);
|
59
|
-
const [state, send] = useMachine(announcementMachine
|
61
|
+
const [state, send] = useMachine(announcementMachine.provide({
|
60
62
|
actions: {
|
61
63
|
saveData,
|
62
|
-
emitNewAnnouncement
|
64
|
+
emitNewAnnouncement,
|
63
65
|
},
|
64
|
-
|
65
|
-
loadData,
|
66
|
-
fetchData,
|
66
|
+
actors: {
|
67
|
+
loadData: fromPromise(loadData),
|
68
|
+
fetchData: fromPromise(fetchData),
|
67
69
|
},
|
68
70
|
delays: {
|
69
71
|
AUTO_UPDATE_DELAY: autoUpdateDelay,
|
70
72
|
},
|
71
|
-
});
|
73
|
+
}));
|
72
74
|
const api = useMemo(() => ({
|
73
75
|
updateCache: async () => {
|
74
76
|
send({
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/notifications/AnnouncementProvider/index.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,EAAE,aAAa,EAAE,OAAO,EAAE,WAAW,EAAE,UAAU,EAAgB,MAAM,OAAO,CAAC;AAC7F,OAAO,YAAY,MAAM,qBAAqB,CAAC;AAC/C,OAAO,EAAE,UAAU,EAAE,MAAM,eAAe,CAAC;AAE3C,OAAO,EAAE,qBAAqB,EAAE,mBAAmB,EAAE,MAAM,SAAS,CAAC;AACrE,OAAO,eAAe,MAAM,OAAO,CAAC;AACpC,OAAO,EAAE,mBAAmB,EAAE,MAAM,WAAW,CAAC;AA2BhD,MAAM,oBAAoB,GAAG,aAAa,CAA0B;IAClE,OAAO,EAAE,EAAE;IACX,MAAM,EAAE,EAAE;IACV,KAAK,EAAE,EAAE;IACT,SAAS,EAAE,KAAK;IAChB,cAAc,EAAE,SAAS;IACzB,KAAK,EAAE,SAAS;IAChB,WAAW,EAAE,GAAG,EAAE,CAAC,OAAO,CAAC,OAAO,EAAE;IACpC,SAAS,EAAE,GAAG,EAAE,GAAE,CAAC;CACpB,CAAC,CAAC;AACH,MAAM,UAAU,gBAAgB;IAC9B,OAAO,UAAU,CAAC,oBAAoB,CAAC,CAAC;AAC1C,CAAC;AACD,MAAM,CAAC,MAAM,oBAAoB,GAAG,CAAC,EACnC,QAAQ,EACR,OAAO,EACP,UAAU,EACV,UAAU,EACV,eAAe,EACf,iBAAiB,EACjB,kBAAkB,EAClB,QAAQ,GAAG,eAAe,GACpB,EAAgB,EAAE;IACxB,MAAM,SAAS,GAAG,WAAW,CAC3B,KAAK,EAAE,EAAE,MAAM,EAAE,
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/notifications/AnnouncementProvider/index.tsx"],"names":[],"mappings":"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"}
|
@@ -1,6 +1,3 @@
|
|
1
1
|
import type { State } from "./types";
|
2
|
-
export declare const announcementMachine: import("xstate").StateMachine<State,
|
3
|
-
value: any;
|
4
|
-
context: State;
|
5
|
-
}, import("xstate").BaseActionObject, import("xstate").ServiceMap, import("xstate").ResolveTypegenMeta<import("xstate").TypegenDisabled, import("xstate").AnyEventObject, import("xstate").BaseActionObject, import("xstate").ServiceMap>>;
|
2
|
+
export declare const announcementMachine: import("xstate").StateMachine<State, import("xstate").AnyEventObject, Record<string, import("xstate").AnyActorRef>, import("xstate").ProvidedActor, import("xstate").ParameterizedObject, import("xstate").ParameterizedObject, string, import("xstate").StateValue, string, unknown, import("xstate").NonReducibleUnknown, import("xstate").EventObject, import("xstate").MetaObject, any>;
|
6
3
|
//# sourceMappingURL=machine.d.ts.map
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"machine.d.ts","sourceRoot":"","sources":["../../../src/notifications/AnnouncementProvider/machine.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,SAAS,CAAC;AASrC,eAAO,MAAM,mBAAmB
|
1
|
+
{"version":3,"file":"machine.d.ts","sourceRoot":"","sources":["../../../src/notifications/AnnouncementProvider/machine.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,SAAS,CAAC;AASrC,eAAO,MAAM,mBAAmB,6XA6F/B,CAAC"}
|