@ledgerhq/device-management-kit 0.0.0-develop-20241010001101 → 0.4.0
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/LICENSE.MD +202 -0
- package/lib/cjs/package.json +1 -1
- package/lib/cjs/src/api/command/os/GetAppAndVersionCommand.d.ts +3 -0
- package/lib/cjs/src/api/command/os/GetAppAndVersionCommand.d.ts.map +1 -1
- package/lib/cjs/src/api/command/os/GetAppAndVersionCommand.js.map +1 -1
- package/lib/cjs/src/api/device-action/os/GetDeviceStatus/GetDeviceStatusDeviceAction.d.ts +1 -1
- package/lib/cjs/src/api/device-action/os/GetDeviceStatus/GetDeviceStatusDeviceAction.d.ts.map +1 -1
- package/lib/cjs/src/api/device-action/os/GetDeviceStatus/GetDeviceStatusDeviceAction.js +14 -44
- package/lib/cjs/src/api/device-action/os/GetDeviceStatus/GetDeviceStatusDeviceAction.js.map +1 -1
- package/lib/cjs/src/api/device-action/os/GoToDashboard/GoToDashboardDeviceAction.d.ts +2 -2
- package/lib/cjs/src/api/device-action/os/GoToDashboard/GoToDashboardDeviceAction.d.ts.map +1 -1
- package/lib/cjs/src/api/device-action/os/GoToDashboard/GoToDashboardDeviceAction.js +18 -44
- package/lib/cjs/src/api/device-action/os/GoToDashboard/GoToDashboardDeviceAction.js.map +1 -1
- package/lib/cjs/src/api/device-action/os/OpenAppDeviceAction/OpenAppDeviceAction.d.ts +1 -0
- package/lib/cjs/src/api/device-action/os/OpenAppDeviceAction/OpenAppDeviceAction.d.ts.map +1 -1
- package/lib/cjs/src/api/device-action/os/OpenAppDeviceAction/OpenAppDeviceAction.js +15 -5
- package/lib/cjs/src/api/device-action/os/OpenAppDeviceAction/OpenAppDeviceAction.js.map +1 -1
- package/lib/cjs/src/api/device-session/DeviceSessionState.d.ts +6 -1
- package/lib/cjs/src/api/device-session/DeviceSessionState.d.ts.map +1 -1
- package/lib/cjs/src/api/device-session/DeviceSessionState.js.map +1 -1
- package/lib/cjs/src/api/index.d.ts +1 -0
- package/lib/cjs/src/api/index.d.ts.map +1 -1
- package/lib/cjs/src/api/index.js +3 -1
- package/lib/cjs/src/api/index.js.map +1 -1
- package/lib/cjs/src/api/logger-subscriber/service/WebLogsExporterLogger.d.ts +18 -0
- package/lib/cjs/src/api/logger-subscriber/service/WebLogsExporterLogger.d.ts.map +1 -0
- package/lib/cjs/src/api/logger-subscriber/service/WebLogsExporterLogger.js +86 -0
- package/lib/cjs/src/api/logger-subscriber/service/WebLogsExporterLogger.js.map +1 -0
- package/lib/cjs/src/internal/device-session/model/DeviceSessionRefresher.js +1 -1
- package/lib/cjs/src/internal/device-session/model/DeviceSessionRefresher.js.map +1 -1
- package/lib/cjs/tsconfig.cjs.tsbuildinfo +1 -1
- package/lib/esm/package.json +1 -1
- package/lib/esm/src/api/command/os/GetAppAndVersionCommand.d.ts +3 -0
- package/lib/esm/src/api/command/os/GetAppAndVersionCommand.d.ts.map +1 -1
- package/lib/esm/src/api/command/os/GetAppAndVersionCommand.js.map +1 -1
- package/lib/esm/src/api/device-action/os/GetDeviceStatus/GetDeviceStatusDeviceAction.d.ts +1 -1
- package/lib/esm/src/api/device-action/os/GetDeviceStatus/GetDeviceStatusDeviceAction.d.ts.map +1 -1
- package/lib/esm/src/api/device-action/os/GetDeviceStatus/GetDeviceStatusDeviceAction.js +16 -46
- package/lib/esm/src/api/device-action/os/GetDeviceStatus/GetDeviceStatusDeviceAction.js.map +1 -1
- package/lib/esm/src/api/device-action/os/GoToDashboard/GoToDashboardDeviceAction.d.ts +2 -2
- package/lib/esm/src/api/device-action/os/GoToDashboard/GoToDashboardDeviceAction.d.ts.map +1 -1
- package/lib/esm/src/api/device-action/os/GoToDashboard/GoToDashboardDeviceAction.js +19 -45
- package/lib/esm/src/api/device-action/os/GoToDashboard/GoToDashboardDeviceAction.js.map +1 -1
- package/lib/esm/src/api/device-action/os/OpenAppDeviceAction/OpenAppDeviceAction.d.ts +1 -0
- package/lib/esm/src/api/device-action/os/OpenAppDeviceAction/OpenAppDeviceAction.d.ts.map +1 -1
- package/lib/esm/src/api/device-action/os/OpenAppDeviceAction/OpenAppDeviceAction.js +15 -5
- package/lib/esm/src/api/device-action/os/OpenAppDeviceAction/OpenAppDeviceAction.js.map +1 -1
- package/lib/esm/src/api/device-session/DeviceSessionState.d.ts +6 -1
- package/lib/esm/src/api/device-session/DeviceSessionState.d.ts.map +1 -1
- package/lib/esm/src/api/device-session/DeviceSessionState.js.map +1 -1
- package/lib/esm/src/api/index.d.ts +1 -0
- package/lib/esm/src/api/index.d.ts.map +1 -1
- package/lib/esm/src/api/index.js +1 -0
- package/lib/esm/src/api/index.js.map +1 -1
- package/lib/esm/src/api/logger-subscriber/service/WebLogsExporterLogger.d.ts +18 -0
- package/lib/esm/src/api/logger-subscriber/service/WebLogsExporterLogger.d.ts.map +1 -0
- package/lib/esm/src/api/logger-subscriber/service/WebLogsExporterLogger.js +81 -0
- package/lib/esm/src/api/logger-subscriber/service/WebLogsExporterLogger.js.map +1 -0
- package/lib/esm/src/internal/device-session/model/DeviceSessionRefresher.js +1 -1
- package/lib/esm/src/internal/device-session/model/DeviceSessionRefresher.js.map +1 -1
- package/lib/esm/tsconfig.esm.tsbuildinfo +1 -1
- package/package.json +1 -1
package/lib/esm/package.json
CHANGED
|
@@ -11,6 +11,9 @@ export type GetAppAndVersionResponse = {
|
|
|
11
11
|
* The version of the application currently running on the device.
|
|
12
12
|
*/
|
|
13
13
|
readonly version: string;
|
|
14
|
+
/**
|
|
15
|
+
* Flags that are used to provide additional information about the application.
|
|
16
|
+
*/
|
|
14
17
|
readonly flags?: number | Uint8Array;
|
|
15
18
|
};
|
|
16
19
|
export type GetAppAndVersionCommandResult = CommandResult<GetAppAndVersionResponse>;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"GetAppAndVersionCommand.d.ts","sourceRoot":"","sources":["../../../../../../src/api/command/os/GetAppAndVersionCommand.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,MAAM,sBAAsB,CAAC;AAG5C,OAAO,EAAE,OAAO,EAAE,MAAM,sBAAsB,CAAC;AAE/C,OAAO,EACL,aAAa,EAEd,MAAM,kCAAkC,CAAC;AAG1C,OAAO,EAAE,YAAY,EAAE,MAAM,kCAAkC,CAAC;AAEhE,MAAM,MAAM,wBAAwB,GAAG;IACrC;;OAEG;IACH,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IACtB;;OAEG;IACH,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAC;IACzB,QAAQ,CAAC,KAAK,CAAC,EAAE,MAAM,GAAG,UAAU,CAAC;CACtC,CAAC;AAEF,MAAM,MAAM,6BAA6B,GACvC,aAAa,CAAC,wBAAwB,CAAC,CAAC;AAE1C;;;GAGG;AACH,qBAAa,uBACX,YAAW,OAAO,CAAC,wBAAwB,CAAC;IAE5C,QAAQ,CAAC,IAAI,YAAa;IAE1B,OAAO,IAAI,IAAI;IAUf,aAAa,CAAC,YAAY,EAAE,YAAY,GAAG,6BAA6B;CA8BzE"}
|
|
1
|
+
{"version":3,"file":"GetAppAndVersionCommand.d.ts","sourceRoot":"","sources":["../../../../../../src/api/command/os/GetAppAndVersionCommand.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,MAAM,sBAAsB,CAAC;AAG5C,OAAO,EAAE,OAAO,EAAE,MAAM,sBAAsB,CAAC;AAE/C,OAAO,EACL,aAAa,EAEd,MAAM,kCAAkC,CAAC;AAG1C,OAAO,EAAE,YAAY,EAAE,MAAM,kCAAkC,CAAC;AAEhE,MAAM,MAAM,wBAAwB,GAAG;IACrC;;OAEG;IACH,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IACtB;;OAEG;IACH,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAC;IACzB;;OAEG;IACH,QAAQ,CAAC,KAAK,CAAC,EAAE,MAAM,GAAG,UAAU,CAAC;CACtC,CAAC;AAEF,MAAM,MAAM,6BAA6B,GACvC,aAAa,CAAC,wBAAwB,CAAC,CAAC;AAE1C;;;GAGG;AACH,qBAAa,uBACX,YAAW,OAAO,CAAC,wBAAwB,CAAC;IAE5C,QAAQ,CAAC,IAAI,YAAa;IAE1B,OAAO,IAAI,IAAI;IAUf,aAAa,CAAC,YAAY,EAAE,YAAY,GAAG,6BAA6B;CA8BzE"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"GetAppAndVersionCommand.js","sourceRoot":"","sources":["../../../../../../src/api/command/os/GetAppAndVersionCommand.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,WAAW,EAAmB,MAAM,6BAA6B,CAAC;AAC3E,OAAO,EAAE,UAAU,EAAE,MAAM,4BAA4B,CAAC;AAExD,OAAO,EAAE,0BAA0B,EAAE,MAAM,qBAAqB,CAAC;AACjE,OAAO,EAEL,oBAAoB,GACrB,MAAM,kCAAkC,CAAC;AAC1C,OAAO,EAAE,YAAY,EAAE,MAAM,iCAAiC,CAAC;AAC/D,OAAO,EAAE,yBAAyB,EAAE,MAAM,uCAAuC,CAAC;
|
|
1
|
+
{"version":3,"file":"GetAppAndVersionCommand.js","sourceRoot":"","sources":["../../../../../../src/api/command/os/GetAppAndVersionCommand.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,WAAW,EAAmB,MAAM,6BAA6B,CAAC;AAC3E,OAAO,EAAE,UAAU,EAAE,MAAM,4BAA4B,CAAC;AAExD,OAAO,EAAE,0BAA0B,EAAE,MAAM,qBAAqB,CAAC;AACjE,OAAO,EAEL,oBAAoB,GACrB,MAAM,kCAAkC,CAAC;AAC1C,OAAO,EAAE,YAAY,EAAE,MAAM,iCAAiC,CAAC;AAC/D,OAAO,EAAE,yBAAyB,EAAE,MAAM,uCAAuC,CAAC;AAqBlF;;;GAGG;AACH,MAAM,OAAO,uBAAuB;IAGzB,IAAI,GAAG,SAAS,CAAC;IAE1B,OAAO;QACL,MAAM,wBAAwB,GAAoB;YAChD,GAAG,EAAE,IAAI;YACT,GAAG,EAAE,IAAI;YACT,EAAE,EAAE,IAAI;YACR,EAAE,EAAE,IAAI;SACT,CAAC;QACF,OAAO,IAAI,WAAW,CAAC,wBAAwB,CAAC,CAAC,KAAK,EAAE,CAAC;IAC3D,CAAC;IAED,aAAa,CAAC,YAA0B;QACtC,IAAI,CAAC,YAAY,CAAC,iBAAiB,CAAC,YAAY,CAAC,EAAE,CAAC;YAClD,OAAO,oBAAoB,CAAC;gBAC1B,KAAK,EAAE,yBAAyB,CAAC,MAAM,CAAC,YAAY,CAAC;aACtD,CAAC,CAAC;QACL,CAAC;QACD,MAAM,MAAM,GAAG,IAAI,UAAU,CAAC,YAAY,CAAC,CAAC;QAE5C,IAAI,MAAM,CAAC,eAAe,EAAE,KAAK,CAAC,EAAE,CAAC;YACnC,OAAO,oBAAoB,CAAC;gBAC1B,KAAK,EAAE,IAAI,0BAA0B,CACnC,wCAAwC,CACzC;aACF,CAAC,CAAC;QACL,CAAC;QAED,MAAM,IAAI,GAAG,MAAM,CAAC,cAAc,CAAC,MAAM,CAAC,qBAAqB,EAAE,CAAC,CAAC;QACnE,MAAM,OAAO,GAAG,MAAM,CAAC,cAAc,CAAC,MAAM,CAAC,qBAAqB,EAAE,CAAC,CAAC;QAEtE,IAAI,MAAM,CAAC,0BAA0B,EAAE,KAAK,CAAC,EAAE,CAAC;YAC9C,OAAO,oBAAoB,CAAC;gBAC1B,IAAI,EAAE,EAAE,IAAI,EAAE,OAAO,EAAE;aACxB,CAAC,CAAC;QACL,CAAC;QAED,MAAM,KAAK,GAAG,MAAM,CAAC,qBAAqB,EAAE,CAAC;QAC7C,OAAO,oBAAoB,CAAC;YAC1B,IAAI,EAAE,EAAE,IAAI,EAAE,OAAO,EAAE,KAAK,EAAE;SAC/B,CAAC,CAAC;IACL,CAAC;CACF"}
|
|
@@ -19,7 +19,7 @@ export type MachineDependencies = {
|
|
|
19
19
|
unlockTimeout: number;
|
|
20
20
|
};
|
|
21
21
|
}) => Observable<void>;
|
|
22
|
-
readonly
|
|
22
|
+
readonly setDeviceSessionState: (state: DeviceSessionState) => DeviceSessionState;
|
|
23
23
|
readonly isDeviceOnboarded: () => boolean;
|
|
24
24
|
};
|
|
25
25
|
export type ExtractMachineDependencies = (internalApi: InternalApi) => MachineDependencies;
|
package/lib/esm/src/api/device-action/os/GetDeviceStatus/GetDeviceStatusDeviceAction.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"GetDeviceStatusDeviceAction.d.ts","sourceRoot":"","sources":["../../../../../../../src/api/device-action/os/GetDeviceStatus/GetDeviceStatusDeviceAction.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,UAAU,EAAE,MAAM,MAAM,CAAC;
|
|
1
|
+
{"version":3,"file":"GetDeviceStatusDeviceAction.d.ts","sourceRoot":"","sources":["../../../../../../../src/api/device-action/os/GetDeviceStatus/GetDeviceStatusDeviceAction.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,UAAU,EAAE,MAAM,MAAM,CAAC;AAKlC,OAAO,EAEL,6BAA6B,EAC9B,MAAM,yCAAyC,CAAC;AAEjD,OAAO,EAAE,WAAW,EAAE,MAAM,iCAAiC,CAAC;AAQ9D,OAAO,EACL,wBAAwB,EACxB,kBAAkB,EACnB,MAAM,oDAAoD,CAAC;AAC5D,OAAO,EACL,kBAAkB,EAEnB,MAAM,wCAAwC,CAAC;AAEhD,OAAO,EACL,sBAAsB,EACtB,sBAAsB,EACtB,kCAAkC,EAClC,uBAAuB,EACxB,MAAM,SAAS,CAAC;AAEjB,KAAK,mCAAmC,GAAG;IACzC,QAAQ,CAAC,SAAS,EAAE,OAAO,CAAC;IAC5B,QAAQ,CAAC,MAAM,EAAE,OAAO,CAAC;IACzB,QAAQ,CAAC,UAAU,EAAE,MAAM,GAAG,IAAI,CAAC;IACnC,QAAQ,CAAC,iBAAiB,EAAE,MAAM,GAAG,IAAI,CAAC;IAC1C,QAAQ,CAAC,KAAK,EAAE,sBAAsB,GAAG,IAAI,CAAC;CAC/C,CAAC;AAEF,MAAM,MAAM,mBAAmB,GAAG;IAChC,QAAQ,CAAC,gBAAgB,EAAE,MAAM,OAAO,CAAC,6BAA6B,CAAC,CAAC;IACxE,QAAQ,CAAC,qBAAqB,EAAE,MAAM,kBAAkB,CAAC;IACzD,QAAQ,CAAC,mBAAmB,EAAE,CAAC,IAAI,EAAE;QACnC,KAAK,EAAE;YAAE,aAAa,EAAE,MAAM,CAAA;SAAE,CAAC;KAClC,KAAK,UAAU,CAAC,IAAI,CAAC,CAAC;IACvB,QAAQ,CAAC,qBAAqB,EAAE,CAC9B,KAAK,EAAE,kBAAkB,KACtB,kBAAkB,CAAC;IACxB,QAAQ,CAAC,iBAAiB,EAAE,MAAM,OAAO,CAAC;CAC3C,CAAC;AAEF,MAAM,MAAM,0BAA0B,GAAG,CACvC,WAAW,EAAE,WAAW,KACrB,mBAAmB,CAAC;AAEzB,qBAAa,2BAA4B,SAAQ,kBAAkB,CACjE,uBAAuB,EACvB,sBAAsB,EACtB,sBAAsB,EACtB,kCAAkC,EAClC,mCAAmC,CACpC;IACC,gBAAgB,CACd,WAAW,EAAE,WAAW,GACvB,wBAAwB,CACzB,uBAAuB,EACvB,sBAAsB,EACtB,sBAAsB,EACtB,kCAAkC,EAClC,mCAAmC,CACpC;IAqPD,mBAAmB,CAAC,WAAW,EAAE,WAAW,GAAG,mBAAmB;CAqCnE"}
|
|
@@ -1,18 +1,18 @@
|
|
|
1
1
|
import { Left, Right } from "purify-ts";
|
|
2
2
|
import { Observable } from "rxjs";
|
|
3
3
|
import { tap, timeout } from "rxjs/operators";
|
|
4
|
-
import { assign,
|
|
4
|
+
import { assign, fromObservable, fromPromise, setup } from "xstate";
|
|
5
5
|
import { isSuccessCommandResult } from "../../../command/model/CommandResult";
|
|
6
6
|
import { GetAppAndVersionCommand, } from "../../../command/os/GetAppAndVersionCommand";
|
|
7
7
|
import { DeviceStatus } from "../../../device/DeviceStatus";
|
|
8
8
|
import { UserInteractionRequired } from "../../../device-action/model/UserInteractionRequired";
|
|
9
9
|
import { DEFAULT_UNLOCK_TIMEOUT_MS } from "../../../device-action/os/Const";
|
|
10
|
-
import { DeviceLockedError, DeviceNotOnboardedError,
|
|
10
|
+
import { DeviceLockedError, DeviceNotOnboardedError, } from "../../../device-action/os/Errors";
|
|
11
11
|
import { XStateDeviceAction, } from "../../../device-action/xstate-utils/XStateDeviceAction";
|
|
12
12
|
import { DeviceSessionStateType, } from "../../../device-session/DeviceSessionState";
|
|
13
13
|
export class GetDeviceStatusDeviceAction extends XStateDeviceAction {
|
|
14
14
|
makeStateMachine(internalApi) {
|
|
15
|
-
const { getAppAndVersion, getDeviceSessionState,
|
|
15
|
+
const { getAppAndVersion, getDeviceSessionState, setDeviceSessionState, waitForDeviceUnlock, isDeviceOnboarded, } = this.extractDependencies(internalApi);
|
|
16
16
|
const unlockTimeout = this.input.unlockTimeout ?? DEFAULT_UNLOCK_TIMEOUT_MS;
|
|
17
17
|
return setup({
|
|
18
18
|
types: {
|
|
@@ -25,20 +25,6 @@ export class GetDeviceStatusDeviceAction extends XStateDeviceAction {
|
|
|
25
25
|
actors: {
|
|
26
26
|
getAppAndVersion: fromPromise(getAppAndVersion),
|
|
27
27
|
waitForDeviceUnlock: fromObservable(waitForDeviceUnlock),
|
|
28
|
-
saveSessionState: fromCallback(({ input, sendBack, }) => {
|
|
29
|
-
const { currentApp, currentAppVersion } = input;
|
|
30
|
-
if (!currentApp) {
|
|
31
|
-
return sendBack({ type: "error" });
|
|
32
|
-
}
|
|
33
|
-
const sessionState = getDeviceSessionState();
|
|
34
|
-
const updatedState = {
|
|
35
|
-
...sessionState,
|
|
36
|
-
currentApp,
|
|
37
|
-
currentAppVersion,
|
|
38
|
-
};
|
|
39
|
-
saveSessionState(updatedState);
|
|
40
|
-
sendBack({ type: "done" });
|
|
41
|
-
}),
|
|
42
28
|
},
|
|
43
29
|
guards: {
|
|
44
30
|
isDeviceOnboarded: () => isDeviceOnboarded(), // TODO: we don't have this info for now, this can be derived from the "flags" obtained in the getVersion command
|
|
@@ -61,12 +47,6 @@ export class GetDeviceStatusDeviceAction extends XStateDeviceAction {
|
|
|
61
47
|
requiredUserInteraction: UserInteractionRequired.UnlockDevice,
|
|
62
48
|
},
|
|
63
49
|
}),
|
|
64
|
-
assignErrorSaveAppState: assign({
|
|
65
|
-
_internalState: (_) => ({
|
|
66
|
-
..._.context._internalState,
|
|
67
|
-
error: new UnknownDAError("SaveAppStateError"),
|
|
68
|
-
}),
|
|
69
|
-
}),
|
|
70
50
|
assignErrorFromEvent: assign({
|
|
71
51
|
_internalState: (_) => ({
|
|
72
52
|
..._.context._internalState,
|
|
@@ -87,7 +67,7 @@ export class GetDeviceStatusDeviceAction extends XStateDeviceAction {
|
|
|
87
67
|
}),
|
|
88
68
|
},
|
|
89
69
|
}).createMachine({
|
|
90
|
-
/** @xstate-layout
|
|
70
|
+
/** @xstate-layout N4IgpgJg5mDOIC5QHEwBcAiYBuBLAxmAMpoCGaArrFnoQIL5q4D2AdgHQ0FgBKYpEAJ4BiANoAGALqJQAB2axcTNjJAAPRAFoArAHZx7AIwAmQ7oCcugMyHzANmMAWYwBoQgxI8vsAHOJM+VuLmVj5e2gC+EW6omDjcJORUXPSMLBwA8qwARsykAE4QuKxQAMIAFmD4ANZiUqryisqsqhoImo4O7OGhPj4h5n6Obh4IunZ2RoZ+ena6nYaGUTHoKcRklNTxqc3sWbkFRSUVVbWihtJIII1K6a1aVtoGTxOOjtbv84YjiObik7ofPM7GFDP9jNofMsQLE1olNmsGLsADLMGrFMqVGp1S5yBS3FRXNqaOzadjiHx2KyORbzcRBczmH4IbTOdjaabaKmdGy6XSRaIw1bbdZJLa0MBI9LsVHo45Ys4XBr45r3dps-n0ubaGxgx6PZlWULkkLBGmDCzGYzQ2Ei+HJEVStjsACqsDA+SdrBdrAANmjqmthBA2GB2MVsMxqmG3R6vT7-TU1hJcdcVXciYgglZycYQiYqRTQoZtMynDmbM4aW8rHYzD4BSs4hL7eLuF7Xe7PWk2AmA0GPflmPl2LJfeQAGbDgC2nbjPe9fv7IpTyqaGdAbXmxnZPkMNNM820VuZ+8M7Dsb3MznpwW31sFtpbGwdEo7dFksjorAgADUPYobAnNiIasGGEZRmGT4JC+bY7NKH5fj+-75IBrDAdUCAQfg5DpCmq5XDcqqZmMjgGDY-yGJeejjFRzJ2P47DZoEJb+Hyx42sKz5ioiC7sIh35-gB6QYcIg7DqO45oFO+SztBhCtrxuwCchwlAQqWGsJGOHNPh9SEemhKbogdLsIMTjmPuNF1nYZaOBW+5OPu9l1oCjZCs2ME8Y6fGIb6BC4WwdDYKQuDjtkvq8HAFC+mgokEXi65GeoiBguYZJOPSJa6Hm1hGsyuglkxxiUjYVjXlq7nyaKCI+cpn7+Tp6TBaF4WRXwsAxXFCpiEqBlJS0JFAo4vg+BCe55e8-QFUVVglVShjlWRtZ2FEgqsMwEBwKo1WKXVG5pgNaokmRZmQg4fyLHR7ieCNpjGPyx7aNo6UNo4nGeQpsFKdKax8AIoyJQSg3Ge0L07q9F3+Istk3Qg1IjUaZ7GNS-LlU4H1wt9+3OvseSFBiGFrsDx01mZ15mHooReFaVj0fZ5Jci5zissYIKY3a2NvnxsrVITCrE8RoMdDucxWgx1jpZCELDHDgKTC9jg6mNXKLDSHPcbV3O7LG3bNH2SYioLB3EmCI1-HuVL6Cj4hU6eNjsIVD3UrWfKXVCj5cV5Wvtr5n6CShaFE-1JMkWzPgXpCjh+Faw3Mjq5jdOlJhGvo-RzRr3uvr79VjgFzQtWFpARVFnWxcHQNCylCBm+eKPjJL4jWMEdNww4O46vSFVsfyD5Nlj3na9KRAUPghCwPAIdV20QIR7e-RzOYbNK98cN7ndgR-BSzgo+YmdfYPOfSgAovkQ75MbyVtItehmSrJgcijz2uHD+pmXyQSQnyVLs2tQA */
|
|
91
71
|
id: "GetDeviceStatusDeviceAction",
|
|
92
72
|
initial: "DeviceReady",
|
|
93
73
|
context: (_) => {
|
|
@@ -105,7 +85,7 @@ export class GetDeviceStatusDeviceAction extends XStateDeviceAction {
|
|
|
105
85
|
locked: sessionState.deviceStatus === DeviceStatus.LOCKED,
|
|
106
86
|
currentApp: sessionStateType ===
|
|
107
87
|
DeviceSessionStateType.ReadyWithoutSecureChannel
|
|
108
|
-
? sessionState.currentApp
|
|
88
|
+
? sessionState.currentApp.name
|
|
109
89
|
: null,
|
|
110
90
|
currentAppVersion: null,
|
|
111
91
|
error: null,
|
|
@@ -193,6 +173,15 @@ export class GetDeviceStatusDeviceAction extends XStateDeviceAction {
|
|
|
193
173
|
actions: assign({
|
|
194
174
|
_internalState: (_) => {
|
|
195
175
|
if (isSuccessCommandResult(_.event.output)) {
|
|
176
|
+
const state = getDeviceSessionState();
|
|
177
|
+
// Narrow the type to ReadyWithoutSecureChannelState or ReadyWithSecureChannelState
|
|
178
|
+
if (state.sessionStateType !==
|
|
179
|
+
DeviceSessionStateType.Connected) {
|
|
180
|
+
setDeviceSessionState({
|
|
181
|
+
...state,
|
|
182
|
+
currentApp: _.event.output.data,
|
|
183
|
+
});
|
|
184
|
+
}
|
|
196
185
|
return {
|
|
197
186
|
..._.context._internalState,
|
|
198
187
|
currentApp: _.event.output.data.name,
|
|
@@ -219,28 +208,9 @@ export class GetDeviceStatusDeviceAction extends XStateDeviceAction {
|
|
|
219
208
|
target: "Error",
|
|
220
209
|
},
|
|
221
210
|
{
|
|
222
|
-
target: "SaveAppState",
|
|
223
|
-
},
|
|
224
|
-
],
|
|
225
|
-
},
|
|
226
|
-
SaveAppState: {
|
|
227
|
-
// We save the current app and version in the session state
|
|
228
|
-
invoke: {
|
|
229
|
-
src: "saveSessionState",
|
|
230
|
-
input: (_) => ({
|
|
231
|
-
currentApp: _.context._internalState.currentApp,
|
|
232
|
-
currentAppVersion: _.context._internalState.currentAppVersion,
|
|
233
|
-
}),
|
|
234
|
-
},
|
|
235
|
-
on: {
|
|
236
|
-
done: {
|
|
237
211
|
target: "Success",
|
|
238
212
|
},
|
|
239
|
-
|
|
240
|
-
target: "Error",
|
|
241
|
-
actions: "assignErrorSaveAppState",
|
|
242
|
-
},
|
|
243
|
-
},
|
|
213
|
+
],
|
|
244
214
|
},
|
|
245
215
|
Success: {
|
|
246
216
|
type: "final",
|
|
@@ -285,7 +255,7 @@ export class GetDeviceStatusDeviceAction extends XStateDeviceAction {
|
|
|
285
255
|
getAppAndVersion,
|
|
286
256
|
waitForDeviceUnlock,
|
|
287
257
|
getDeviceSessionState: () => internalApi.getDeviceSessionState(),
|
|
288
|
-
|
|
258
|
+
setDeviceSessionState: (state) => internalApi.setDeviceSessionState(state),
|
|
289
259
|
isDeviceOnboarded: () => true, // TODO: we don't have this info for now
|
|
290
260
|
};
|
|
291
261
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"GetDeviceStatusDeviceAction.js","sourceRoot":"","sources":["../../../../../../../src/api/device-action/os/GetDeviceStatus/GetDeviceStatusDeviceAction.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,KAAK,EAAE,MAAM,WAAW,CAAC;AACxC,OAAO,EAAE,UAAU,EAAE,MAAM,MAAM,CAAC;AAClC,OAAO,EAAE,GAAG,EAAE,OAAO,EAAE,MAAM,gBAAgB,CAAC;AAC9C,OAAO,
|
|
1
|
+
{"version":3,"file":"GetDeviceStatusDeviceAction.js","sourceRoot":"","sources":["../../../../../../../src/api/device-action/os/GetDeviceStatus/GetDeviceStatusDeviceAction.ts"],"names":[],"mappings":"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"}
|
|
@@ -3,7 +3,7 @@ import { GetAppAndVersionCommandResult } from "../../../command/os/GetAppAndVers
|
|
|
3
3
|
import { InternalApi } from "../../../device-action/DeviceAction";
|
|
4
4
|
import { DeviceActionStateMachine, XStateDeviceAction } from "../../../device-action/xstate-utils/XStateDeviceAction";
|
|
5
5
|
import { DeviceSessionState } from "../../../device-session/DeviceSessionState";
|
|
6
|
-
import { GoToDashboardDAError, GoToDashboardDAInput, GoToDashboardDAIntermediateValue, GoToDashboardDAOutput } from "./types";
|
|
6
|
+
import type { GoToDashboardDAError, GoToDashboardDAInput, GoToDashboardDAIntermediateValue, GoToDashboardDAOutput } from "./types";
|
|
7
7
|
type GoToDashboardMachineInternalState = {
|
|
8
8
|
readonly currentApp: string | null;
|
|
9
9
|
readonly error: GoToDashboardDAError | null;
|
|
@@ -12,7 +12,7 @@ export type MachineDependencies = {
|
|
|
12
12
|
readonly getAppAndVersion: () => Promise<GetAppAndVersionCommandResult>;
|
|
13
13
|
readonly closeApp: () => Promise<CloseAppCommandResult>;
|
|
14
14
|
readonly getDeviceSessionState: () => DeviceSessionState;
|
|
15
|
-
readonly
|
|
15
|
+
readonly setDeviceSessionState: (state: DeviceSessionState) => DeviceSessionState;
|
|
16
16
|
};
|
|
17
17
|
export type ExtractMachineDependencies = (internalApi: InternalApi) => MachineDependencies;
|
|
18
18
|
export declare class GoToDashboardDeviceAction extends XStateDeviceAction<GoToDashboardDAOutput, GoToDashboardDAInput, GoToDashboardDAError, GoToDashboardDAIntermediateValue, GoToDashboardMachineInternalState> {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"GoToDashboardDeviceAction.d.ts","sourceRoot":"","sources":["../../../../../../../src/api/device-action/os/GoToDashboard/GoToDashboardDeviceAction.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"GoToDashboardDeviceAction.d.ts","sourceRoot":"","sources":["../../../../../../../src/api/device-action/os/GoToDashboard/GoToDashboardDeviceAction.ts"],"names":[],"mappings":"AAIA,OAAO,EAEL,qBAAqB,EACtB,MAAM,iCAAiC,CAAC;AACzC,OAAO,EAEL,6BAA6B,EAC9B,MAAM,yCAAyC,CAAC;AACjD,OAAO,EAAE,WAAW,EAAE,MAAM,iCAAiC,CAAC;AAM9D,OAAO,EACL,wBAAwB,EACxB,kBAAkB,EACnB,MAAM,oDAAoD,CAAC;AAC5D,OAAO,EACL,kBAAkB,EAEnB,MAAM,wCAAwC,CAAC;AAEhD,OAAO,KAAK,EACV,oBAAoB,EACpB,oBAAoB,EACpB,gCAAgC,EAChC,qBAAqB,EACtB,MAAM,SAAS,CAAC;AAEjB,KAAK,iCAAiC,GAAG;IACvC,QAAQ,CAAC,UAAU,EAAE,MAAM,GAAG,IAAI,CAAC;IACnC,QAAQ,CAAC,KAAK,EAAE,oBAAoB,GAAG,IAAI,CAAC;CAC7C,CAAC;AAEF,MAAM,MAAM,mBAAmB,GAAG;IAChC,QAAQ,CAAC,gBAAgB,EAAE,MAAM,OAAO,CAAC,6BAA6B,CAAC,CAAC;IACxE,QAAQ,CAAC,QAAQ,EAAE,MAAM,OAAO,CAAC,qBAAqB,CAAC,CAAC;IACxD,QAAQ,CAAC,qBAAqB,EAAE,MAAM,kBAAkB,CAAC;IACzD,QAAQ,CAAC,qBAAqB,EAAE,CAC9B,KAAK,EAAE,kBAAkB,KACtB,kBAAkB,CAAC;CACzB,CAAC;AAEF,MAAM,MAAM,0BAA0B,GAAG,CACvC,WAAW,EAAE,WAAW,KACrB,mBAAmB,CAAC;AAEzB,qBAAa,yBAA0B,SAAQ,kBAAkB,CAC/D,qBAAqB,EACrB,oBAAoB,EACpB,oBAAoB,EACpB,gCAAgC,EAChC,iCAAiC,CAClC;IACC,gBAAgB,CACd,WAAW,EAAE,WAAW,GACvB,wBAAwB,CACzB,qBAAqB,EACrB,oBAAoB,EACpB,oBAAoB,EACpB,gCAAgC,EAChC,iCAAiC,CAClC;IA0PD,mBAAmB,CAAC,WAAW,EAAE,WAAW,GAAG,mBAAmB;CAanE"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { Left, Right } from "purify-ts";
|
|
2
|
-
import { assign,
|
|
2
|
+
import { assign, fromPromise, setup } from "xstate";
|
|
3
3
|
import { isSuccessCommandResult } from "../../../command/model/CommandResult";
|
|
4
4
|
import { CloseAppCommand, } from "../../../command/os/CloseAppCommand";
|
|
5
5
|
import { GetAppAndVersionCommand, } from "../../../command/os/GetAppAndVersionCommand";
|
|
@@ -8,9 +8,10 @@ import { DEFAULT_UNLOCK_TIMEOUT_MS } from "../../../device-action/os/Const";
|
|
|
8
8
|
import { UnknownDAError } from "../../../device-action/os/Errors";
|
|
9
9
|
import { GetDeviceStatusDeviceAction } from "../../../device-action/os/GetDeviceStatus/GetDeviceStatusDeviceAction";
|
|
10
10
|
import { XStateDeviceAction, } from "../../../device-action/xstate-utils/XStateDeviceAction";
|
|
11
|
+
import { DeviceSessionStateType, } from "../../../device-session/DeviceSessionState";
|
|
11
12
|
export class GoToDashboardDeviceAction extends XStateDeviceAction {
|
|
12
13
|
makeStateMachine(internalApi) {
|
|
13
|
-
const { getDeviceSessionState,
|
|
14
|
+
const { getDeviceSessionState, setDeviceSessionState, closeApp, getAppAndVersion, } = this.extractDependencies(internalApi);
|
|
14
15
|
const unlockTimeout = this.input.unlockTimeout ?? DEFAULT_UNLOCK_TIMEOUT_MS;
|
|
15
16
|
const getDeviceStatusMachine = new GetDeviceStatusDeviceAction({
|
|
16
17
|
input: {
|
|
@@ -29,21 +30,6 @@ export class GoToDashboardDeviceAction extends XStateDeviceAction {
|
|
|
29
30
|
getAppAndVersion: fromPromise(getAppAndVersion),
|
|
30
31
|
closeApp: fromPromise(closeApp),
|
|
31
32
|
getDeviceStatus: getDeviceStatusMachine,
|
|
32
|
-
saveSessionState: fromCallback(({ input, sendBack, }) => {
|
|
33
|
-
const { currentApp } = input;
|
|
34
|
-
const sessionState = getDeviceSessionState();
|
|
35
|
-
const updatedState = {
|
|
36
|
-
...sessionState,
|
|
37
|
-
currentApp,
|
|
38
|
-
};
|
|
39
|
-
try {
|
|
40
|
-
saveSessionState(updatedState);
|
|
41
|
-
sendBack({ type: "done" });
|
|
42
|
-
}
|
|
43
|
-
catch (_) {
|
|
44
|
-
sendBack({ type: "error" });
|
|
45
|
-
}
|
|
46
|
-
}),
|
|
47
33
|
},
|
|
48
34
|
guards: {
|
|
49
35
|
hasError: ({ context }) => {
|
|
@@ -58,12 +44,6 @@ export class GoToDashboardDeviceAction extends XStateDeviceAction {
|
|
|
58
44
|
// error: new UnknownDAError("GetDeviceUnknownStatusError"),
|
|
59
45
|
// }),
|
|
60
46
|
// }),
|
|
61
|
-
assignErrorSaveAppState: assign({
|
|
62
|
-
_internalState: (_) => ({
|
|
63
|
-
..._.context._internalState,
|
|
64
|
-
error: new UnknownDAError("SaveAppStateError"),
|
|
65
|
-
}),
|
|
66
|
-
}),
|
|
67
47
|
assignErrorFromEvent: assign({
|
|
68
48
|
_internalState: (_) => ({
|
|
69
49
|
..._.context._internalState,
|
|
@@ -72,7 +52,7 @@ export class GoToDashboardDeviceAction extends XStateDeviceAction {
|
|
|
72
52
|
}),
|
|
73
53
|
},
|
|
74
54
|
}).createMachine({
|
|
75
|
-
/** @xstate-layout
|
|
55
|
+
/** @xstate-layout N4IgpgJg5mDOIC5QHED2AVVARAhrAFgEao4BOEWYAbgJYDGYAgnQC42oB2AdJbQwEpgcEAJ4BiANoAGALqJQAB1SwabTvJAAPRAHYAjFwDMATikA2MwA5DOnQBYArGeOGANCBGI9VrlcvmpRyknQwcAXzD3NExcAmIyCmp6JlZ2bmQwFl5kgGUWHBYAV1gxCE4wLhoOKlQAawqIJIY8guLpOSQQJRU1Dg1tBAAmOy49QYcpHQdBvR0pMcszO3dPBEM7My4HYz1pqWNLPRsdJYiojGw8IhJybIZmXq4AYXwwOlq7sBaikvaNbtUaX6iDsgy2g3Wdksjn8JlBDhWiAchk2OkMgysB2RzlBZxA0UucRuiT4KUeLzeHyaX3yP0keg6imUgPUnQGgxmo3hdkcemMwwcG0RCGxXDRGMsWJRxlxkXxF1i1wSnweaR4V3i5Ap70ksn+zN6wIQfMsYsG0LMg2MZlm60mwucDi4HMli0GgX0zjxBMVmpJyVVnHVRIS2tq9MZXQNQLZII5XEcoQx5kO3mWHkQjud5oOlo93mM3oVGuJKtSQd9xLDkkGkYBhtjCEtxi41h5fJs+ysOgdOjBE2Gw1sUmC5qLMRLyupge4ldDrx1EkMdejrNAA2sTu8jsO0Lsej5wr7prsoTGs2CJz748JStu0-L3CeABtlEwFApSuVKtU6hUfZO96kjOzyvrA74KAgVQ1HQBRpO0fydPWMbrl4kwGFMzizMYcyCsK-gjE4OiWBC-jGDK+g3nOQEBo+oFvowH5iGApCkKgpBcAoz4FAAZuxAC2XAASGNH3HRL4MR+UG-rBvQIXqSGrn0jaHGCNocoYko2BiUzCvymyadsdg6Dh+zTFRgH+mJ5JgRB1aIUyPQoVoaHEWKegjsYDgOGi9hjMKHmGAYdg7KCVhLOagoWSJVlkmqEngYxCj2Qy+pOWuLnGuMUhcNagoHMZgqhMYAVSEFCahRKEWWFFcrCXesUgRkLBJYwHAQAAaixKicF+HAVNBf5CcWMVlo8zWte1XWkD1HDSTBcGcPJK7pcpqEIARCZQsMqZSDM+7Cg4limjaXnbHMlhzIYERyhwqCNPAnT1X6Y3OchGUDAAtDKvj6NYgQohYljCsMRjzIYASTN2NjXXVI0Na9FbUoIwirI5LJrZloJcCOI52GVZihD5goIhmxoHq24OQycl02NFCMPuNmSfN8xRpRjRqfRsv16P9p4WFYIOGIYCYjgex1mD5oLrPTL2M-FC5UqSrOPejDbrbMraniZ+4nGV6J6OmqwbJsl3jPY2wQ2YaKy6W8sVpZYbs+rmUzDl4y84T7rBDyZgOvsWvqd4EI67bU7AeJtlJc7zkbnyYrBORxGaVCDh6PhhtGAcJjjPye3EWHolxUGCV2YrMcfWhFi5TyjgUYb9h+2TFG+GMIUhRyUy7IXjV0RNH5tZ13VvUpRpjOYYpBWZCxzOnZNHQZGweSR7qhDLcMTqN9vcDkhR0AwsCq1Gq1GhyIxWvsSYWMZ-I9mTJGEbXsx7Av4Qb7ecsR48ACirHsRXmMBjIi2JaRwEIDzeWtsDMmgUdCthwjadSaJFiWBumEIAA */
|
|
76
56
|
id: "GoToDashboardDeviceAction",
|
|
77
57
|
initial: "DeviceReady",
|
|
78
58
|
context: (_) => {
|
|
@@ -85,7 +65,9 @@ export class GoToDashboardDeviceAction extends XStateDeviceAction {
|
|
|
85
65
|
requiredUserInteraction: UserInteractionRequired.None,
|
|
86
66
|
},
|
|
87
67
|
_internalState: {
|
|
88
|
-
currentApp: "currentApp" in sessionState
|
|
68
|
+
currentApp: "currentApp" in sessionState
|
|
69
|
+
? sessionState.currentApp.name
|
|
70
|
+
: null,
|
|
89
71
|
error: null,
|
|
90
72
|
},
|
|
91
73
|
};
|
|
@@ -149,7 +131,7 @@ export class GoToDashboardDeviceAction extends XStateDeviceAction {
|
|
|
149
131
|
// We check if the dashboard is open
|
|
150
132
|
always: [
|
|
151
133
|
{
|
|
152
|
-
target: "
|
|
134
|
+
target: "Success",
|
|
153
135
|
guard: "isDashboardOpen",
|
|
154
136
|
},
|
|
155
137
|
{
|
|
@@ -204,6 +186,7 @@ export class GoToDashboardDeviceAction extends XStateDeviceAction {
|
|
|
204
186
|
},
|
|
205
187
|
{
|
|
206
188
|
target: "GetAppAndVersion",
|
|
189
|
+
reenter: true,
|
|
207
190
|
},
|
|
208
191
|
],
|
|
209
192
|
},
|
|
@@ -215,6 +198,15 @@ export class GoToDashboardDeviceAction extends XStateDeviceAction {
|
|
|
215
198
|
actions: assign({
|
|
216
199
|
_internalState: (_) => {
|
|
217
200
|
if (isSuccessCommandResult(_.event.output)) {
|
|
201
|
+
const state = getDeviceSessionState();
|
|
202
|
+
// Narrow the type to ReadyWithoutSecureChannelState or ReadyWithSecureChannelState
|
|
203
|
+
if (state.sessionStateType !==
|
|
204
|
+
DeviceSessionStateType.Connected) {
|
|
205
|
+
setDeviceSessionState({
|
|
206
|
+
...state,
|
|
207
|
+
currentApp: _.event.output.data,
|
|
208
|
+
});
|
|
209
|
+
}
|
|
218
210
|
return {
|
|
219
211
|
..._.context._internalState,
|
|
220
212
|
currentApp: _.event.output.data.name,
|
|
@@ -229,24 +221,6 @@ export class GoToDashboardDeviceAction extends XStateDeviceAction {
|
|
|
229
221
|
},
|
|
230
222
|
},
|
|
231
223
|
},
|
|
232
|
-
SaveSessionState: {
|
|
233
|
-
invoke: {
|
|
234
|
-
src: "saveSessionState",
|
|
235
|
-
input: (_) => ({
|
|
236
|
-
// NOTE: DashboardCheck will error if currentApp is null so we can safely assume it's not null here
|
|
237
|
-
currentApp: _.context._internalState.currentApp,
|
|
238
|
-
}),
|
|
239
|
-
},
|
|
240
|
-
on: {
|
|
241
|
-
done: {
|
|
242
|
-
target: "Success",
|
|
243
|
-
},
|
|
244
|
-
error: {
|
|
245
|
-
target: "Error",
|
|
246
|
-
actions: "assignErrorSaveAppState",
|
|
247
|
-
},
|
|
248
|
-
},
|
|
249
|
-
},
|
|
250
224
|
Success: {
|
|
251
225
|
type: "final",
|
|
252
226
|
},
|
|
@@ -269,7 +243,7 @@ export class GoToDashboardDeviceAction extends XStateDeviceAction {
|
|
|
269
243
|
closeApp,
|
|
270
244
|
getAppAndVersion,
|
|
271
245
|
getDeviceSessionState: () => internalApi.getDeviceSessionState(),
|
|
272
|
-
|
|
246
|
+
setDeviceSessionState: (state) => internalApi.setDeviceSessionState(state),
|
|
273
247
|
};
|
|
274
248
|
}
|
|
275
249
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"GoToDashboardDeviceAction.js","sourceRoot":"","sources":["../../../../../../../src/api/device-action/os/GoToDashboard/GoToDashboardDeviceAction.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,KAAK,EAAE,MAAM,WAAW,CAAC;AACxC,OAAO,
|
|
1
|
+
{"version":3,"file":"GoToDashboardDeviceAction.js","sourceRoot":"","sources":["../../../../../../../src/api/device-action/os/GoToDashboard/GoToDashboardDeviceAction.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,KAAK,EAAE,MAAM,WAAW,CAAC;AACxC,OAAO,EAAE,MAAM,EAAE,WAAW,EAAE,KAAK,EAAE,MAAM,QAAQ,CAAC;AAEpD,OAAO,EAAE,sBAAsB,EAAE,MAAM,kCAAkC,CAAC;AAC1E,OAAO,EACL,eAAe,GAEhB,MAAM,iCAAiC,CAAC;AACzC,OAAO,EACL,uBAAuB,GAExB,MAAM,yCAAyC,CAAC;AAEjD,OAAO,EAAE,uBAAuB,EAAE,MAAM,kDAAkD,CAAC;AAC3F,OAAO,EAAE,yBAAyB,EAAE,MAAM,6BAA6B,CAAC;AACxE,OAAO,EAAE,cAAc,EAAE,MAAM,8BAA8B,CAAC;AAC9D,OAAO,EAAE,2BAA2B,EAAE,MAAM,mEAAmE,CAAC;AAEhH,OAAO,EAEL,kBAAkB,GACnB,MAAM,oDAAoD,CAAC;AAC5D,OAAO,EAEL,sBAAsB,GACvB,MAAM,wCAAwC,CAAC;AA2BhD,MAAM,OAAO,yBAA0B,SAAQ,kBAM9C;IACC,gBAAgB,CACd,WAAwB;QAgBxB,MAAM,EACJ,qBAAqB,EACrB,qBAAqB,EACrB,QAAQ,EACR,gBAAgB,GACjB,GAAG,IAAI,CAAC,mBAAmB,CAAC,WAAW,CAAC,CAAC;QAE1C,MAAM,aAAa,GAAG,IAAI,CAAC,KAAK,CAAC,aAAa,IAAI,yBAAyB,CAAC;QAE5E,MAAM,sBAAsB,GAAG,IAAI,2BAA2B,CAAC;YAC7D,KAAK,EAAE;gBACL,aAAa;aACd;SACF,CAAC,CAAC,gBAAgB,CAAC,WAAW,CAAC,CAAC;QACjC,OAAO,KAAK,CAAC;YACX,KAAK,EAAE;gBACL,KAAK,EAAE;oBACL,aAAa;iBACI;gBACnB,OAAO,EAAE,EAAsB;gBAC/B,MAAM,EAAE,EAAqB;aAC9B;YACD,MAAM,EAAE;gBACN,gBAAgB,EAAE,WAAW,CAAC,gBAAgB,CAAC;gBAC/C,QAAQ,EAAE,WAAW,CAAC,QAAQ,CAAC;gBAC/B,eAAe,EAAE,sBAAsB;aACxC;YACD,MAAM,EAAE;gBACN,QAAQ,EAAE,CAAC,EAAE,OAAO,EAAiC,EAAE,EAAE;oBACvD,OAAO,OAAO,CAAC,cAAc,CAAC,KAAK,KAAK,IAAI,CAAC;gBAC/C,CAAC;gBACD,eAAe,EAAE,CAAC,EAAE,OAAO,EAAiC,EAAE,EAAE,CAC9D,OAAO,CAAC,cAAc,CAAC,UAAU,KAAK,OAAO;aAChD;YACD,OAAO,EAAE;gBACP,8CAA8C;gBAC9C,8BAA8B;gBAC9B,mCAAmC;gBACnC,gEAAgE;gBAChE,QAAQ;gBACR,MAAM;gBACN,oBAAoB,EAAE,MAAM,CAAC;oBAC3B,cAAc,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC;wBACtB,GAAG,CAAC,CAAC,OAAO,CAAC,cAAc;wBAC3B,KAAK,EAAE,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,EAAE,oEAAoE;qBAC9F,CAAC;iBACH,CAAC;aACH;SACF,CAAC,CAAC,aAAa,CAAC;YACf,+kDAA+kD;YAC/kD,EAAE,EAAE,2BAA2B;YAC/B,OAAO,EAAE,aAAa;YACtB,OAAO,EAAE,CAAC,CAAC,EAAE,EAAE;gBACb,MAAM,YAAY,GAAG,qBAAqB,EAAE,CAAC;gBAC7C,OAAO;oBACL,KAAK,EAAE;wBACL,aAAa,EAAE,CAAC,CAAC,KAAK,CAAC,aAAa;qBACrC;oBACD,iBAAiB,EAAE;wBACjB,uBAAuB,EAAE,uBAAuB,CAAC,IAAI;qBACtD;oBACD,cAAc,EAAE;wBACd,UAAU,EACR,YAAY,IAAI,YAAY;4BAC1B,CAAC,CAAC,YAAY,CAAC,UAAU,CAAC,IAAI;4BAC9B,CAAC,CAAC,IAAI;wBACV,KAAK,EAAE,IAAI;qBACZ;iBACF,CAAC;YACJ,CAAC;YACD,MAAM,EAAE;gBACN,WAAW,EAAE;oBACX,MAAM,EAAE;wBACN,MAAM,EAAE,iBAAiB;qBAC1B;iBACF;gBACD,eAAe,EAAE;oBACf,4EAA4E;oBAC5E,MAAM,EAAE;wBACN,EAAE,EAAE,cAAc;wBAClB,GAAG,EAAE,iBAAiB;wBACtB,KAAK,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC;4BACb,aAAa,EAAE,CAAC,CAAC,OAAO,CAAC,KAAK,CAAC,aAAa;yBAC7C,CAAC;wBACF,UAAU,EAAE;4BACV,OAAO,EAAE,MAAM,CAAC;gCACd,iBAAiB,EAAE,CAAC,CAAC,EAAE,EAAE,CACvB,CAAC,CAAC,KAAK,CAAC,QAAQ,CAAC,OAAO,CAAC,iBAAiB;6BAC7C,CAAC;yBACH;wBACD,MAAM,EAAE;4BACN,MAAM,EAAE,mBAAmB;4BAC3B,OAAO,EAAE,MAAM,CAAC;gCACd,cAAc,EAAE,CAAC,CAAC,EAAE,EAAE;oCACpB,OAAO,CAAC,CAAC,KAAK,CAAC,MAAM,CAAC,MAAM,CAC1B;wCACE,KAAK,EAAE,CAAC,MAAM,EAAE,EAAE,CAAC,CAAC;4CAClB,GAAG,CAAC,CAAC,OAAO,CAAC,cAAc;4CAC3B,UAAU,EAAE,MAAM,CAAC,UAAU;yCAC9B,CAAC;wCACF,IAAI,EAAE,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC;4CAChB,GAAG,CAAC,CAAC,OAAO,CAAC,cAAc;4CAC3B,KAAK;yCACN,CAAC;qCACH,CACF,CAAC;gCACJ,CAAC;6BACF,CAAC;yBACH;wBACD,8FAA8F;wBAC9F,aAAa;wBACb,qBAAqB;wBACrB,kDAAkD;wBAClD,KAAK;qBACN;iBACF;gBACD,iBAAiB,EAAE;oBACjB,4DAA4D;oBAC5D,MAAM,EAAE;wBACN;4BACE,MAAM,EAAE,OAAO;4BACf,KAAK,EAAE,UAAU;yBAClB;wBACD;4BACE,MAAM,EAAE,gBAAgB;yBACzB;qBACF;iBACF;gBACD,cAAc,EAAE;oBACd,oCAAoC;oBACpC,MAAM,EAAE;wBACN;4BACE,MAAM,EAAE,SAAS;4BACjB,KAAK,EAAE,iBAAiB;yBACzB;wBACD;4BACE,MAAM,EAAE,OAAO;4BACf,KAAK,EAAE,UAAU;yBAClB;wBACD;4BACE,MAAM,EAAE,OAAO;4BACf,KAAK,EAAE,CAAC,CAAC,EAAE,EAAE;gCACX,OAAO,CAAC,CAAC,OAAO,CAAC,cAAc,CAAC,UAAU,KAAK,IAAI,CAAC;4BACtD,CAAC;4BACD,OAAO,EAAE,MAAM,CAAC;gCACd,cAAc,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC;oCACtB,GAAG,CAAC,CAAC,OAAO,CAAC,cAAc;oCAC3B,KAAK,EAAE,IAAI,cAAc,CAAC,qBAAqB,CAAC;iCACjD,CAAC;6BACH,CAAC;yBACH;wBACD;4BACE,MAAM,EAAE,UAAU;yBACnB;qBACF;iBACF;gBACD,QAAQ,EAAE;oBACR,MAAM,EAAE;wBACN,GAAG,EAAE,UAAU;wBACf,MAAM,EAAE;4BACN,MAAM,EAAE,eAAe;4BACvB,OAAO,EAAE,MAAM,CAAC;gCACd,cAAc,EAAE,CAAC,CAAC,EAAE,EAAE;oCACpB,IAAI,sBAAsB,CAAC,CAAC,CAAC,KAAK,CAAC,MAAM,CAAC,EAAE,CAAC;wCAC3C,OAAO,CAAC,CAAC,OAAO,CAAC,cAAc,CAAC;oCAClC,CAAC;oCACD,OAAO;wCACL,GAAG,CAAC,CAAC,OAAO,CAAC,cAAc;wCAC3B,KAAK,EAAE,CAAC,CAAC,KAAK,CAAC,MAAM,CAAC,KAAK;qCAC5B,CAAC;gCACJ,CAAC;6BACF,CAAC;yBACH;wBACD,OAAO,EAAE;4BACP,MAAM,EAAE,OAAO;4BACf,OAAO,EAAE,sBAAsB;yBAChC;qBACF;iBACF;gBACD,aAAa,EAAE;oBACb,MAAM,EAAE;wBACN;4BACE,MAAM,EAAE,OAAO;4BACf,KAAK,EAAE,UAAU;yBAClB;wBACD;4BACE,MAAM,EAAE,kBAAkB;4BAC1B,OAAO,EAAE,IAAI;yBACd;qBACF;iBACF;gBACD,gBAAgB,EAAE;oBAChB,MAAM,EAAE;wBACN,GAAG,EAAE,kBAAkB;wBACvB,MAAM,EAAE;4BACN,MAAM,EAAE,gBAAgB;4BACxB,OAAO,EAAE,MAAM,CAAC;gCACd,cAAc,EAAE,CAAC,CAAC,EAAE,EAAE;oCACpB,IAAI,sBAAsB,CAAC,CAAC,CAAC,KAAK,CAAC,MAAM,CAAC,EAAE,CAAC;wCAC3C,MAAM,KAAK,GAAuB,qBAAqB,EAAE,CAAC;wCAC1D,mFAAmF;wCACnF,IACE,KAAK,CAAC,gBAAgB;4CACtB,sBAAsB,CAAC,SAAS,EAChC,CAAC;4CACD,qBAAqB,CAAC;gDACpB,GAAG,KAAK;gDACR,UAAU,EAAE,CAAC,CAAC,KAAK,CAAC,MAAM,CAAC,IAAI;6CAChC,CAAC,CAAC;wCACL,CAAC;wCACD,OAAO;4CACL,GAAG,CAAC,CAAC,OAAO,CAAC,cAAc;4CAC3B,UAAU,EAAE,CAAC,CAAC,KAAK,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI;yCACrC,CAAC;oCACJ,CAAC;oCACD,OAAO;wCACL,GAAG,CAAC,CAAC,OAAO,CAAC,cAAc;wCAC3B,KAAK,EAAE,CAAC,CAAC,KAAK,CAAC,MAAM,CAAC,KAAK;qCAC5B,CAAC;gCACJ,CAAC;6BACF,CAAC;yBACH;qBACF;iBACF;gBACD,OAAO,EAAE;oBACP,IAAI,EAAE,OAAO;iBACd;gBACD,KAAK,EAAE;oBACL,IAAI,EAAE,OAAO;iBACd;aACF;YACD,MAAM,EAAE,CAAC,CAAC,EAAE,EAAE;gBACZ,IAAI,CAAC,CAAC,OAAO,CAAC,cAAc,CAAC,KAAK,EAAE,CAAC;oBACnC,OAAO,IAAI,CAAC,CAAC,CAAC,OAAO,CAAC,cAAc,CAAC,KAAK,CAAC,CAAC;gBAC9C,CAAC;gBAED,OAAO,KAAK,CAAC,SAAS,CAAC,CAAC;YAC1B,CAAC;SACF,CAAC,CAAC;IACL,CAAC;IAED,mBAAmB,CAAC,WAAwB;QAC1C,MAAM,QAAQ,GAAG,KAAK,IAAI,EAAE,CAAC,WAAW,CAAC,WAAW,CAAC,IAAI,eAAe,EAAE,CAAC,CAAC;QAC5E,MAAM,gBAAgB,GAAG,KAAK,IAAI,EAAE,CAClC,WAAW,CAAC,WAAW,CAAC,IAAI,uBAAuB,EAAE,CAAC,CAAC;QAEzD,OAAO;YACL,QAAQ;YACR,gBAAgB;YAChB,qBAAqB,EAAE,GAAG,EAAE,CAAC,WAAW,CAAC,qBAAqB,EAAE;YAChE,qBAAqB,EAAE,CAAC,KAAyB,EAAE,EAAE,CACnD,WAAW,CAAC,qBAAqB,CAAC,KAAK,CAAC;SAC3C,CAAC;IACJ,CAAC;CACF"}
|
|
@@ -18,6 +18,7 @@ export type MachineDependencies = {
|
|
|
18
18
|
};
|
|
19
19
|
}) => Promise<OpenAppCommandResult>;
|
|
20
20
|
readonly getDeviceSessionState: () => DeviceSessionState;
|
|
21
|
+
readonly setDeviceSessionState: (state: DeviceSessionState) => void;
|
|
21
22
|
readonly isDeviceOnboarded: () => boolean;
|
|
22
23
|
};
|
|
23
24
|
export type ExtractMachineDependencies = (internalApi: InternalApi) => MachineDependencies;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"OpenAppDeviceAction.d.ts","sourceRoot":"","sources":["../../../../../../../src/api/device-action/os/OpenAppDeviceAction/OpenAppDeviceAction.ts"],"names":[],"mappings":"AAIA,OAAO,EAEL,qBAAqB,EACtB,MAAM,iCAAiC,CAAC;AACzC,OAAO,EAEL,6BAA6B,EAC9B,MAAM,yCAAyC,CAAC;AACjD,OAAO,EAEL,oBAAoB,EACrB,MAAM,gCAAgC,CAAC;AAExC,OAAO,EAAE,WAAW,EAAE,MAAM,iCAAiC,CAAC;AAO9D,OAAO,EACL,wBAAwB,EACxB,kBAAkB,EACnB,MAAM,oDAAoD,CAAC;AAC5D,OAAO,EACL,kBAAkB,EAEnB,MAAM,wCAAwC,CAAC;AAEhD,OAAO,EACL,cAAc,EACd,cAAc,EACd,0BAA0B,EAC1B,eAAe,EAChB,MAAM,SAAS,CAAC;AAEjB,KAAK,gCAAgC,GAAG;IACtC,QAAQ,CAAC,mBAAmB,EAAE,MAAM,GAAG,IAAI,CAAC;IAC5C,QAAQ,CAAC,KAAK,EAAE,cAAc,GAAG,IAAI,CAAC;CACvC,CAAC;AAEF,MAAM,MAAM,mBAAmB,GAAG;IAChC,QAAQ,CAAC,gBAAgB,EAAE,MAAM,OAAO,CAAC,6BAA6B,CAAC,CAAC;IACxE,QAAQ,CAAC,QAAQ,EAAE,MAAM,OAAO,CAAC,qBAAqB,CAAC,CAAC;IACxD,QAAQ,CAAC,OAAO,EAAE,CAAC,IAAI,EAAE;QACvB,KAAK,EAAE;YAAE,OAAO,EAAE,MAAM,CAAA;SAAE,CAAC;KAC5B,KAAK,OAAO,CAAC,oBAAoB,CAAC,CAAC;IACpC,QAAQ,CAAC,qBAAqB,EAAE,MAAM,kBAAkB,CAAC;IACzD,QAAQ,CAAC,iBAAiB,EAAE,MAAM,OAAO,CAAC;CAC3C,CAAC;AAEF,MAAM,MAAM,0BAA0B,GAAG,CACvC,WAAW,EAAE,WAAW,KACrB,mBAAmB,CAAC;AAEzB;;;;;;;;;;;;;;;;;GAiBG;AACH,qBAAa,mBAAoB,SAAQ,kBAAkB,CACzD,eAAe,EACf,cAAc,EACd,cAAc,EACd,0BAA0B,EAC1B,gCAAgC,CACjC;IACC,gBAAgB,CACd,WAAW,EAAE,WAAW,GACvB,wBAAwB,CACzB,eAAe,EACf,cAAc,EACd,cAAc,EACd,0BAA0B,EAC1B,gCAAgC,CACjC;
|
|
1
|
+
{"version":3,"file":"OpenAppDeviceAction.d.ts","sourceRoot":"","sources":["../../../../../../../src/api/device-action/os/OpenAppDeviceAction/OpenAppDeviceAction.ts"],"names":[],"mappings":"AAIA,OAAO,EAEL,qBAAqB,EACtB,MAAM,iCAAiC,CAAC;AACzC,OAAO,EAEL,6BAA6B,EAC9B,MAAM,yCAAyC,CAAC;AACjD,OAAO,EAEL,oBAAoB,EACrB,MAAM,gCAAgC,CAAC;AAExC,OAAO,EAAE,WAAW,EAAE,MAAM,iCAAiC,CAAC;AAO9D,OAAO,EACL,wBAAwB,EACxB,kBAAkB,EACnB,MAAM,oDAAoD,CAAC;AAC5D,OAAO,EACL,kBAAkB,EAEnB,MAAM,wCAAwC,CAAC;AAEhD,OAAO,EACL,cAAc,EACd,cAAc,EACd,0BAA0B,EAC1B,eAAe,EAChB,MAAM,SAAS,CAAC;AAEjB,KAAK,gCAAgC,GAAG;IACtC,QAAQ,CAAC,mBAAmB,EAAE,MAAM,GAAG,IAAI,CAAC;IAC5C,QAAQ,CAAC,KAAK,EAAE,cAAc,GAAG,IAAI,CAAC;CACvC,CAAC;AAEF,MAAM,MAAM,mBAAmB,GAAG;IAChC,QAAQ,CAAC,gBAAgB,EAAE,MAAM,OAAO,CAAC,6BAA6B,CAAC,CAAC;IACxE,QAAQ,CAAC,QAAQ,EAAE,MAAM,OAAO,CAAC,qBAAqB,CAAC,CAAC;IACxD,QAAQ,CAAC,OAAO,EAAE,CAAC,IAAI,EAAE;QACvB,KAAK,EAAE;YAAE,OAAO,EAAE,MAAM,CAAA;SAAE,CAAC;KAC5B,KAAK,OAAO,CAAC,oBAAoB,CAAC,CAAC;IACpC,QAAQ,CAAC,qBAAqB,EAAE,MAAM,kBAAkB,CAAC;IACzD,QAAQ,CAAC,qBAAqB,EAAE,CAAC,KAAK,EAAE,kBAAkB,KAAK,IAAI,CAAC;IACpE,QAAQ,CAAC,iBAAiB,EAAE,MAAM,OAAO,CAAC;CAC3C,CAAC;AAEF,MAAM,MAAM,0BAA0B,GAAG,CACvC,WAAW,EAAE,WAAW,KACrB,mBAAmB,CAAC;AAEzB;;;;;;;;;;;;;;;;;GAiBG;AACH,qBAAa,mBAAoB,SAAQ,kBAAkB,CACzD,eAAe,EACf,cAAc,EACd,cAAc,EACd,0BAA0B,EAC1B,gCAAgC,CACjC;IACC,gBAAgB,CACd,WAAW,EAAE,WAAW,GACvB,wBAAwB,CACzB,eAAe,EACf,cAAc,EACd,cAAc,EACd,0BAA0B,EAC1B,gCAAgC,CACjC;IAsUD,mBAAmB,CAAC,WAAW,EAAE,WAAW,GAAG,mBAAmB;CAmBnE"}
|
|
@@ -29,7 +29,7 @@ import { DeviceSessionStateType, } from "../../../device-session/DeviceSessionSt
|
|
|
29
29
|
*/
|
|
30
30
|
export class OpenAppDeviceAction extends XStateDeviceAction {
|
|
31
31
|
makeStateMachine(internalApi) {
|
|
32
|
-
const { getAppAndVersion, closeApp, openApp, getDeviceSessionState, isDeviceOnboarded, } = this.extractDependencies(internalApi);
|
|
32
|
+
const { getAppAndVersion, closeApp, openApp, getDeviceSessionState, setDeviceSessionState, isDeviceOnboarded, } = this.extractDependencies(internalApi);
|
|
33
33
|
return setup({
|
|
34
34
|
types: {
|
|
35
35
|
input: {},
|
|
@@ -98,7 +98,7 @@ export class OpenAppDeviceAction extends XStateDeviceAction {
|
|
|
98
98
|
}),
|
|
99
99
|
},
|
|
100
100
|
}).createMachine({
|
|
101
|
-
/** @xstate-layout
|
|
101
|
+
/** @xstate-layout N4IgpgJg5mDOIC5QHkAOYB2BBVqAiYAbgJYDGYWpALsQPYYB0BJ5ASmAIYQCeAxANoAGALqJQqWrGI16YkAA9EARhWCGADgAsAZm1b1SwUoDspgDQhuiAEzX1DbQE5tJlQDYlm414CsAXz8LNEwcfCIyCmo6RmQMACNaDgAnCGIMKABhAAswUgBrARE5CSkZDDlFBCUPbQYfZx91H0FtTRNjCysEbWM1bTdHAzcfH2q9awCg9GxcZgjKMoZYhOTU9Ozcgv4lUSQQEuloiuUauoamlrbzSxtBNTu7pW1BEe1rJUmQYJmwlkjFgAytHyaUyOXyhV24kkh1ke0q7w8DDcxmqjkM1l6Kh8nUQzR8DEEjjcz3UxKUjiMbk+31Cc3IC2iDCBIPW4K2O2KMLKxwQiKUyNRAwxWKUOJu3TaDFsw28bkExmsgnU-Rp0zp4QZUXoDFCABsyBwylhCBxiHqOHE9WBeBB6GAGGlCLQ8g7abNNf8mfrDcbTebLdaEE7gUbokJhBGuaUjvCbCSCdZNI5UQqhg1cQhNOprAxND4XP0xZTHI01SEPX9GTqfaQw-QTWaLVabWAkklaEkGKgLVQAGadgC2S3Vlfm2sYtfr2H9zaDIbrZQjUb2Bx5cb5CelydTxnT2nFXTcmjUBYTzlazkcE0CX1Hv3HiynfqbgbA7FgAFc9VQNhCV9CMZwqAlQuAWZwHiqbStI0mY+PmdRKNYxLZmKgjvDeUwVg+WpPrgBqLtEjYBi2H7fr+7ICJyq7crGIGIK0LwME8dzJuizzNNYmZeLmAysZ4Ph2KYmiaOWPz0l6Nb4b60R-lsRQ0UB5Qbq0pgMM4FJ8dYx4KpomaOJo6k9G4yHvEhBmYmJGpVhOurSYR9ByVRUL7LRwEKAxYq1PUkGtE8+ZaJmBh1A8hieMh17vFZY64UyeAcLAWQrCkTkAa5Sm8tY-TIkmlJvFojjXuocHysiegvB4JJ6P4t7ujhkmMPFiXJRAqXUYBsLKfRfLZSZyYtHYbF2JmQoaMeIweEmJjHtF9XVowGR6pIFD2dOtr2o6GDOq6I7YRJ80MIty3PtEwZbaGS4iGla50R5CBVYSJkFncbzGC4mYoo4zHlfUCo+KieizfttlHbAK09jJ9C8G2HZdj2RoDkkw51cDiyg+DBHTmdzoORgy4KR167dQ9ghPc8A1vUomZIQqeZksmTw9JoJlA56B3oyd9BkT+qUE+lnW8iohgaDoeioUYpgdBKQu5sz8rEgYxjwaJtX3qjTIc6tZTcxRmzOdGAsbqoagmM8Yr-aTTyOCNpXWAW-TGIMfmO6zNmLHVmNlOtGAOiGO0o2ztke5DGDYxd4ZXXzN3uZU1RPBBjTNM7UtdAWxjqQZ6gqv0LyO9oruPkywe49D7adt2vaI8jauB+796e6dC7TvjLnR11d1x955xJ1cKeIAZ6dGEJqJKk4qqq3ttdF-XIc67zrdue3CLVG4gqZyMpbGG4bhBeoq9b-mB7jaTZYT+JU86sX05z5R2wLxlG78oKYpNKW16mx9x6EkhWdGKTSvXgLrFKSENcbsC4Hwa6i9eQHgQgmCkIlBjKmcEFUY24ejaSTMeCkHxPgYFoBAOAcgA5u1um3XkABaHeEoKEEkKvQwQJ4XjKl6ErIBDUmCenATwA2RM7rknUm4FUhV-oiTJFTCUth05j0xJVFUTxt7sIOssRIKRQRyV4bdWOTNkTqDekqAwbxNDIUzFIhwzhZHVHkf0akZ9rKFx1CyPI6j2SaJjsoUsBIBimB8MMeUZJqFdH6PYDwKYBjwQaEYpRtlOYzlfC2NxS8bB6HsM4RUIwiSH0VNxAy6lkL1EEjTYUtisLn1ISAhuDZZxvhvpsRJmVX51FJFlZ4-Qk5wUYcxR2BTTIGUKtEvCoDpwaMUobbqugUzIg8PmEwIiTJ9yqAMaUW90IngCaIgZcUEpJVUa1Vxoy+GVGMbvZiuVf5IM8CoTZOpNZDL4eQjcIlDLIRRH5FhoxDyIGFMiASe8IoFlGNchaS0waxNqfkepG4tACiMGeQw6IiQeBGncMaMycxEl8eoIFu0fiVPbg87qSE3q6MVBpehPQ4K6G+uoZUJIVB7laNiq+2s4DkRGYTLRygs6GSQtmO4iIaWljgvUBgip-K5RErofOdiYocLBZwHhBzOWSkKqKz6Lw3i6U+QgPchlTB7xTPBeCWVHDYoAMqflIOQWA8AlXuO6KMQylImipgMi4BZzhDIKkpM0FEypRimplXNWyABRMuSRIXjNaKvHQ3h0Q0reCYT+3khGNEKgqIRxgAgBCAA */
|
|
102
102
|
id: "OpenAppDeviceAction",
|
|
103
103
|
initial: "DeviceReady",
|
|
104
104
|
context: ({ input }) => {
|
|
@@ -113,7 +113,7 @@ export class OpenAppDeviceAction extends XStateDeviceAction {
|
|
|
113
113
|
error: null,
|
|
114
114
|
currentlyRunningApp: sessionStateType ===
|
|
115
115
|
DeviceSessionStateType.ReadyWithoutSecureChannel
|
|
116
|
-
? sessionState.currentApp
|
|
116
|
+
? sessionState.currentApp.name
|
|
117
117
|
: null,
|
|
118
118
|
},
|
|
119
119
|
};
|
|
@@ -162,6 +162,15 @@ export class OpenAppDeviceAction extends XStateDeviceAction {
|
|
|
162
162
|
actions: assign({
|
|
163
163
|
_internalState: (_) => {
|
|
164
164
|
if (isSuccessCommandResult(_.event.output)) {
|
|
165
|
+
const state = getDeviceSessionState();
|
|
166
|
+
// Narrow the type to ReadyWithoutSecureChannelState or ReadyWithSecureChannelState
|
|
167
|
+
if (state.sessionStateType !==
|
|
168
|
+
DeviceSessionStateType.Connected) {
|
|
169
|
+
setDeviceSessionState({
|
|
170
|
+
...state,
|
|
171
|
+
currentApp: _.event.output.data,
|
|
172
|
+
});
|
|
173
|
+
}
|
|
165
174
|
return {
|
|
166
175
|
..._.context._internalState,
|
|
167
176
|
currentlyRunningApp: _.event.output.data.name,
|
|
@@ -247,7 +256,7 @@ export class OpenAppDeviceAction extends XStateDeviceAction {
|
|
|
247
256
|
target: "Error",
|
|
248
257
|
guard: "hasError",
|
|
249
258
|
},
|
|
250
|
-
"OpenApplication",
|
|
259
|
+
{ target: "OpenApplication" },
|
|
251
260
|
],
|
|
252
261
|
},
|
|
253
262
|
OpenApplication: {
|
|
@@ -288,7 +297,7 @@ export class OpenAppDeviceAction extends XStateDeviceAction {
|
|
|
288
297
|
target: "Error",
|
|
289
298
|
guard: "hasError",
|
|
290
299
|
},
|
|
291
|
-
"
|
|
300
|
+
{ target: "ApplicationAvailable" },
|
|
292
301
|
],
|
|
293
302
|
},
|
|
294
303
|
ApplicationReady: {
|
|
@@ -319,6 +328,7 @@ export class OpenAppDeviceAction extends XStateDeviceAction {
|
|
|
319
328
|
closeApp,
|
|
320
329
|
openApp,
|
|
321
330
|
getDeviceSessionState: () => internalApi.getDeviceSessionState(),
|
|
331
|
+
setDeviceSessionState: (state) => internalApi.setDeviceSessionState(state),
|
|
322
332
|
isDeviceOnboarded: () => true, // TODO: we don't have this info for now, this can be derived from the "flags" obtained in the getVersion command
|
|
323
333
|
};
|
|
324
334
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"OpenAppDeviceAction.js","sourceRoot":"","sources":["../../../../../../../src/api/device-action/os/OpenAppDeviceAction/OpenAppDeviceAction.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,KAAK,EAAE,MAAM,WAAW,CAAC;AACxC,OAAO,EAAE,MAAM,EAAE,WAAW,EAAE,KAAK,EAAE,MAAM,QAAQ,CAAC;AAEpD,OAAO,EAAE,sBAAsB,EAAE,MAAM,kCAAkC,CAAC;AAC1E,OAAO,EACL,eAAe,GAEhB,MAAM,iCAAiC,CAAC;AACzC,OAAO,EACL,uBAAuB,GAExB,MAAM,yCAAyC,CAAC;AACjD,OAAO,EACL,cAAc,GAEf,MAAM,gCAAgC,CAAC;AACxC,OAAO,EAAE,YAAY,EAAE,MAAM,0BAA0B,CAAC;AAExD,OAAO,EAAE,uBAAuB,EAAE,MAAM,kDAAkD,CAAC;AAC3F,OAAO,EACL,iBAAiB,EACjB,uBAAuB,GACxB,MAAM,8BAA8B,CAAC;AAEtC,OAAO,EAEL,kBAAkB,GACnB,MAAM,oDAAoD,CAAC;AAC5D,OAAO,EAEL,sBAAsB,GACvB,MAAM,wCAAwC,CAAC;
|
|
1
|
+
{"version":3,"file":"OpenAppDeviceAction.js","sourceRoot":"","sources":["../../../../../../../src/api/device-action/os/OpenAppDeviceAction/OpenAppDeviceAction.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,3 +1,4 @@
|
|
|
1
|
+
import { GetAppAndVersionResponse } from "../command/os/GetAppAndVersionCommand";
|
|
1
2
|
import { BatteryStatusFlags } from "../command/os/GetBatteryStatusCommand";
|
|
2
3
|
import { DeviceStatus } from "../device/DeviceStatus";
|
|
3
4
|
import { Application } from "../../internal/manager-api/model/ManagerApiType";
|
|
@@ -28,6 +29,10 @@ export type FirmwareVersion = {
|
|
|
28
29
|
*/
|
|
29
30
|
readonly os: string;
|
|
30
31
|
};
|
|
32
|
+
/**
|
|
33
|
+
* The current application running on a device. Alias of GetAppAndVersionResponse.
|
|
34
|
+
*/
|
|
35
|
+
export type RunningApp = GetAppAndVersionResponse;
|
|
31
36
|
/**
|
|
32
37
|
* The state types of a device session.
|
|
33
38
|
*/
|
|
@@ -61,7 +66,7 @@ type DeviceSessionReadyState = {
|
|
|
61
66
|
/**
|
|
62
67
|
* The current application running on the device.
|
|
63
68
|
*/
|
|
64
|
-
readonly currentApp:
|
|
69
|
+
readonly currentApp: RunningApp;
|
|
65
70
|
/**
|
|
66
71
|
* The current applications installed on the device.
|
|
67
72
|
*/
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"DeviceSessionState.d.ts","sourceRoot":"","sources":["../../../../../src/api/device-session/DeviceSessionState.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,kBAAkB,EAAE,MAAM,yCAAyC,CAAC;AAC7E,OAAO,EAAE,YAAY,EAAE,MAAM,0BAA0B,CAAC;AACxD,OAAO,EAAE,WAAW,EAAE,MAAM,4CAA4C,CAAC;AAEzE;;GAEG;AACH,MAAM,MAAM,aAAa,GAAG;IAC1B,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAC;IACvB,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAC;IACzB,QAAQ,CAAC,WAAW,EAAE,MAAM,CAAC;IAC7B,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAC;IACzB,QAAQ,CAAC,MAAM,EAAE,kBAAkB,CAAC;CACrC,CAAC;AAEF;;GAEG;AACH,MAAM,MAAM,eAAe,GAAG;IAC5B;;OAEG;IACH,QAAQ,CAAC,GAAG,EAAE,MAAM,CAAC;IAErB;;OAEG;IACH,QAAQ,CAAC,UAAU,EAAE,MAAM,CAAC;IAE5B;;OAEG;IACH,QAAQ,CAAC,EAAE,EAAE,MAAM,CAAC;CACrB,CAAC;AAEF;;GAEG;AACH,oBAAY,sBAAsB;IAChC,SAAS,IAAA;IACT,yBAAyB,IAAA;IACzB,sBAAsB,IAAA;CACvB;AAED,KAAK,sBAAsB,GAAG;IAC5B,QAAQ,CAAC,gBAAgB,EAAE,sBAAsB,CAAC;IAElD;;OAEG;IACH,QAAQ,CAAC,YAAY,EAAE,YAAY,CAAC;IAEpC;;OAEG;IACH,QAAQ,CAAC,UAAU,CAAC,EAAE,MAAM,CAAC;CAC9B,CAAC;AAEF,KAAK,uBAAuB,GAAG;IAC7B;;;OAGG;IACH,QAAQ,CAAC,aAAa,CAAC,EAAE,aAAa,CAAC;IAEvC;;;OAGG;IACH,QAAQ,CAAC,eAAe,CAAC,EAAE,eAAe,CAAC;IAE3C;;OAEG;IACH,QAAQ,CAAC,UAAU,EAAE,
|
|
1
|
+
{"version":3,"file":"DeviceSessionState.d.ts","sourceRoot":"","sources":["../../../../../src/api/device-session/DeviceSessionState.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,wBAAwB,EAAE,MAAM,yCAAyC,CAAC;AACnF,OAAO,EAAE,kBAAkB,EAAE,MAAM,yCAAyC,CAAC;AAC7E,OAAO,EAAE,YAAY,EAAE,MAAM,0BAA0B,CAAC;AACxD,OAAO,EAAE,WAAW,EAAE,MAAM,4CAA4C,CAAC;AAEzE;;GAEG;AACH,MAAM,MAAM,aAAa,GAAG;IAC1B,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAC;IACvB,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAC;IACzB,QAAQ,CAAC,WAAW,EAAE,MAAM,CAAC;IAC7B,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAC;IACzB,QAAQ,CAAC,MAAM,EAAE,kBAAkB,CAAC;CACrC,CAAC;AAEF;;GAEG;AACH,MAAM,MAAM,eAAe,GAAG;IAC5B;;OAEG;IACH,QAAQ,CAAC,GAAG,EAAE,MAAM,CAAC;IAErB;;OAEG;IACH,QAAQ,CAAC,UAAU,EAAE,MAAM,CAAC;IAE5B;;OAEG;IACH,QAAQ,CAAC,EAAE,EAAE,MAAM,CAAC;CACrB,CAAC;AAEF;;GAEG;AACH,MAAM,MAAM,UAAU,GAAG,wBAAwB,CAAC;AAElD;;GAEG;AACH,oBAAY,sBAAsB;IAChC,SAAS,IAAA;IACT,yBAAyB,IAAA;IACzB,sBAAsB,IAAA;CACvB;AAED,KAAK,sBAAsB,GAAG;IAC5B,QAAQ,CAAC,gBAAgB,EAAE,sBAAsB,CAAC;IAElD;;OAEG;IACH,QAAQ,CAAC,YAAY,EAAE,YAAY,CAAC;IAEpC;;OAEG;IACH,QAAQ,CAAC,UAAU,CAAC,EAAE,MAAM,CAAC;CAC9B,CAAC;AAEF,KAAK,uBAAuB,GAAG;IAC7B;;;OAGG;IACH,QAAQ,CAAC,aAAa,CAAC,EAAE,aAAa,CAAC;IAEvC;;;OAGG;IACH,QAAQ,CAAC,eAAe,CAAC,EAAE,eAAe,CAAC;IAE3C;;OAEG;IACH,QAAQ,CAAC,UAAU,EAAE,UAAU,CAAC;IAEhC;;OAEG;IACH,QAAQ,CAAC,aAAa,EAAE,WAAW,EAAE,CAAC;CACvC,CAAC;AAEF;;GAEG;AACH,MAAM,MAAM,cAAc,GAAG,sBAAsB,GAAG;IACpD;;OAEG;IACH,QAAQ,CAAC,gBAAgB,EAAE,sBAAsB,CAAC,SAAS,CAAC;CAC7D,CAAC;AAEF;;GAEG;AACH,MAAM,MAAM,8BAA8B,GAAG,sBAAsB,GACjE,uBAAuB,GAAG;IACxB;;OAEG;IACH,QAAQ,CAAC,gBAAgB,EAAE,sBAAsB,CAAC,yBAAyB,CAAC;CAC7E,CAAC;AAEJ;;GAEG;AACH,MAAM,MAAM,2BAA2B,GAAG,sBAAsB,GAC9D,uBAAuB,GAAG;IACxB;;OAEG;IACH,QAAQ,CAAC,gBAAgB,EAAE,sBAAsB,CAAC,sBAAsB,CAAC;CAC1E,CAAC;AAEJ;;GAEG;AACH,MAAM,MAAM,kBAAkB,GAC1B,cAAc,GACd,8BAA8B,GAC9B,2BAA2B,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"DeviceSessionState.js","sourceRoot":"","sources":["../../../../../src/api/device-session/DeviceSessionState.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"DeviceSessionState.js","sourceRoot":"","sources":["../../../../../src/api/device-session/DeviceSessionState.ts"],"names":[],"mappings":"AAyCA;;GAEG;AACH,MAAM,CAAN,IAAY,sBAIX;AAJD,WAAY,sBAAsB;IAChC,6EAAS,CAAA;IACT,6GAAyB,CAAA;IACzB,uGAAsB,CAAA;AACxB,CAAC,EAJW,sBAAsB,KAAtB,sBAAsB,QAIjC"}
|