@onekeyfe/hd-core 1.2.0-alpha.0 → 1.2.0-alpha.10

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.
Files changed (192) hide show
  1. package/__tests__/connectSettings.test.ts +19 -0
  2. package/__tests__/device-wallet-session-store.test.ts +131 -0
  3. package/__tests__/preInitialize.test.ts +33 -0
  4. package/__tests__/protocol-v2-firmware-targets.test.ts +19 -0
  5. package/__tests__/protocol-v2.test.ts +1930 -765
  6. package/dist/api/ClearSessionCache.d.ts +9 -0
  7. package/dist/api/ClearSessionCache.d.ts.map +1 -0
  8. package/dist/api/FileRead.d.ts.map +1 -1
  9. package/dist/api/FileWrite.d.ts.map +1 -1
  10. package/dist/api/FirmwareUpdateV2.d.ts.map +1 -1
  11. package/dist/api/FirmwareUpdateV3.d.ts.map +1 -1
  12. package/dist/api/FirmwareUpdateV4.d.ts +26 -5
  13. package/dist/api/FirmwareUpdateV4.d.ts.map +1 -1
  14. package/dist/api/GetDeviceInfo.d.ts.map +1 -1
  15. package/dist/api/GetFeatures.d.ts +1 -1
  16. package/dist/api/GetOnekeyFeatures.d.ts.map +1 -1
  17. package/dist/api/GetPassphraseState.d.ts +4 -4
  18. package/dist/api/GetPassphraseState.d.ts.map +1 -1
  19. package/dist/api/device/DeviceUnlock.d.ts +1 -1
  20. package/dist/api/firmware/FirmwareUpdateBaseMethod.d.ts +1 -0
  21. package/dist/api/firmware/FirmwareUpdateBaseMethod.d.ts.map +1 -1
  22. package/dist/api/firmware/bootloaderHelper.d.ts.map +1 -1
  23. package/dist/api/firmware/getBinary.d.ts +4 -0
  24. package/dist/api/firmware/getBinary.d.ts.map +1 -1
  25. package/dist/api/firmware/progressThrottle.d.ts +3 -0
  26. package/dist/api/firmware/progressThrottle.d.ts.map +1 -0
  27. package/dist/api/firmware/uploadFirmware.d.ts.map +1 -1
  28. package/dist/api/index.d.ts +8 -10
  29. package/dist/api/index.d.ts.map +1 -1
  30. package/dist/api/protocol-v2/DeviceFactoryInfoGet.d.ts +6 -0
  31. package/dist/api/protocol-v2/DeviceFactoryInfoGet.d.ts.map +1 -0
  32. package/dist/api/protocol-v2/DeviceFactoryInfoSet.d.ts +7 -0
  33. package/dist/api/protocol-v2/DeviceFactoryInfoSet.d.ts.map +1 -0
  34. package/dist/api/protocol-v2/DeviceFirmwareUpdate.d.ts +1 -1
  35. package/dist/api/protocol-v2/DeviceFirmwareUpdate.d.ts.map +1 -1
  36. package/dist/api/protocol-v2/DeviceGetFirmwareUpdateStatus.d.ts +3 -2
  37. package/dist/api/protocol-v2/DeviceGetFirmwareUpdateStatus.d.ts.map +1 -1
  38. package/dist/api/protocol-v2/{DeviceGetDeviceInfo.d.ts → DeviceInfoGet.d.ts} +10 -10
  39. package/dist/api/protocol-v2/DeviceInfoGet.d.ts.map +1 -0
  40. package/dist/api/protocol-v2/DeviceSessionGet.d.ts +9 -0
  41. package/dist/api/protocol-v2/DeviceSessionGet.d.ts.map +1 -0
  42. package/dist/api/protocol-v2/DeviceStatusGet.d.ts +6 -0
  43. package/dist/api/protocol-v2/DeviceStatusGet.d.ts.map +1 -0
  44. package/dist/api/protocol-v2/FilesystemFormat.d.ts.map +1 -1
  45. package/dist/api/protocol-v2/{FilesystemFixPermission.d.ts → FilesystemPermissionFix.d.ts} +2 -2
  46. package/dist/api/protocol-v2/FilesystemPermissionFix.d.ts.map +1 -0
  47. package/dist/api/protocol-v2/ProtocolInfoRequest.d.ts +6 -0
  48. package/dist/api/protocol-v2/ProtocolInfoRequest.d.ts.map +1 -0
  49. package/dist/api/protocol-v2/helpers.d.ts +27 -19
  50. package/dist/api/protocol-v2/helpers.d.ts.map +1 -1
  51. package/dist/api/ton/TonSignData.d.ts +1 -5
  52. package/dist/api/ton/TonSignData.d.ts.map +1 -1
  53. package/dist/api/tron/TronSignMessage.d.ts +0 -1
  54. package/dist/api/tron/TronSignMessage.d.ts.map +1 -1
  55. package/dist/api/tron/TronSignTransaction.d.ts +0 -1
  56. package/dist/api/tron/TronSignTransaction.d.ts.map +1 -1
  57. package/dist/constants/index.d.ts +2 -1
  58. package/dist/constants/index.d.ts.map +1 -1
  59. package/dist/core/index.d.ts.map +1 -1
  60. package/dist/data-manager/DataManager.d.ts +1 -1
  61. package/dist/data-manager/DataManager.d.ts.map +1 -1
  62. package/dist/data-manager/connectSettings.d.ts.map +1 -1
  63. package/dist/device/Device.d.ts +17 -18
  64. package/dist/device/Device.d.ts.map +1 -1
  65. package/dist/device/DeviceWalletSessionStore.d.ts +15 -0
  66. package/dist/device/DeviceWalletSessionStore.d.ts.map +1 -0
  67. package/dist/deviceProfile/buildDeviceFeatures.d.ts +6 -0
  68. package/dist/deviceProfile/buildDeviceFeatures.d.ts.map +1 -0
  69. package/dist/deviceProfile/buildDeviceProfile.d.ts +3 -4
  70. package/dist/deviceProfile/buildDeviceProfile.d.ts.map +1 -1
  71. package/dist/deviceProfile/index.d.ts +1 -1
  72. package/dist/deviceProfile/index.d.ts.map +1 -1
  73. package/dist/index.d.ts +657 -539
  74. package/dist/index.js +2579 -2161
  75. package/dist/inject.d.ts.map +1 -1
  76. package/dist/protocols/protocol-v2/features.d.ts +12 -14
  77. package/dist/protocols/protocol-v2/features.d.ts.map +1 -1
  78. package/dist/protocols/protocol-v2/firmware.d.ts +11 -9
  79. package/dist/protocols/protocol-v2/firmware.d.ts.map +1 -1
  80. package/dist/protocols/protocol-v2/index.d.ts +1 -0
  81. package/dist/protocols/protocol-v2/index.d.ts.map +1 -1
  82. package/dist/protocols/protocol-v2/walletSession.d.ts +13 -0
  83. package/dist/protocols/protocol-v2/walletSession.d.ts.map +1 -0
  84. package/dist/types/api/firmwareUpdate.d.ts +4 -6
  85. package/dist/types/api/firmwareUpdate.d.ts.map +1 -1
  86. package/dist/types/api/getDeviceInfo.d.ts +4 -2
  87. package/dist/types/api/getDeviceInfo.d.ts.map +1 -1
  88. package/dist/types/api/getPassphraseState.d.ts +4 -4
  89. package/dist/types/api/getPassphraseState.d.ts.map +1 -1
  90. package/dist/types/api/index.d.ts +11 -11
  91. package/dist/types/api/index.d.ts.map +1 -1
  92. package/dist/types/api/protocolV2.d.ts +16 -17
  93. package/dist/types/api/protocolV2.d.ts.map +1 -1
  94. package/dist/types/api/sessionCache.d.ts +10 -0
  95. package/dist/types/api/sessionCache.d.ts.map +1 -0
  96. package/dist/types/device.d.ts +88 -8
  97. package/dist/types/device.d.ts.map +1 -1
  98. package/dist/types/params.d.ts +1 -0
  99. package/dist/types/params.d.ts.map +1 -1
  100. package/dist/types/settings.d.ts +21 -1
  101. package/dist/types/settings.d.ts.map +1 -1
  102. package/dist/utils/capabilitieUtils.d.ts.map +1 -1
  103. package/dist/utils/deviceFeaturesUtils.d.ts +2 -0
  104. package/dist/utils/deviceFeaturesUtils.d.ts.map +1 -1
  105. package/dist/utils/deviceInfoUtils.d.ts.map +1 -1
  106. package/dist/utils/deviceVersionUtils.d.ts.map +1 -1
  107. package/dist/utils/findDefectiveBatchDevice.d.ts +1 -1
  108. package/dist/utils/patch.d.ts +1 -1
  109. package/dist/utils/patch.d.ts.map +1 -1
  110. package/package.json +4 -4
  111. package/src/api/ClearSessionCache.ts +28 -0
  112. package/src/api/FileRead.ts +16 -3
  113. package/src/api/FileWrite.ts +14 -1
  114. package/src/api/FirmwareUpdateV2.ts +9 -2
  115. package/src/api/FirmwareUpdateV3.ts +2 -1
  116. package/src/api/FirmwareUpdateV4.ts +1089 -285
  117. package/src/api/GetDeviceInfo.ts +6 -13
  118. package/src/api/GetOnekeyFeatures.ts +3 -14
  119. package/src/api/GetPassphraseState.ts +7 -4
  120. package/src/api/device/DeviceRebootToBoardloader.ts +4 -4
  121. package/src/api/device/DeviceRebootToBootloader.ts +4 -4
  122. package/src/api/firmware/FirmwareUpdateBaseMethod.ts +18 -4
  123. package/src/api/firmware/bootloaderHelper.ts +3 -2
  124. package/src/api/firmware/getBinary.ts +1 -1
  125. package/src/api/firmware/progressThrottle.ts +44 -0
  126. package/src/api/firmware/releaseHelper.ts +3 -3
  127. package/src/api/firmware/uploadFirmware.ts +5 -2
  128. package/src/api/index.ts +8 -10
  129. package/src/api/protocol-v2/{FactoryGetDeviceInfo.ts → DeviceFactoryInfoGet.ts} +3 -3
  130. package/src/api/protocol-v2/DeviceFactoryInfoSet.ts +32 -0
  131. package/src/api/protocol-v2/DeviceFirmwareUpdate.ts +3 -5
  132. package/src/api/protocol-v2/DeviceGetFirmwareUpdateStatus.ts +39 -5
  133. package/src/api/protocol-v2/{DeviceGetDeviceInfo.ts → DeviceInfoGet.ts} +52 -22
  134. package/src/api/protocol-v2/DeviceReboot.ts +2 -2
  135. package/src/api/protocol-v2/DeviceSessionGet.ts +26 -0
  136. package/src/api/protocol-v2/DeviceStatusGet.ts +14 -0
  137. package/src/api/protocol-v2/FilesystemFormat.ts +4 -1
  138. package/src/api/protocol-v2/{FilesystemFixPermission.ts → FilesystemPermissionFix.ts} +2 -2
  139. package/src/api/protocol-v2/{GetProtoVersion.ts → ProtocolInfoRequest.ts} +2 -2
  140. package/src/api/protocol-v2/helpers.ts +58 -59
  141. package/src/api/ton/TonSignData.ts +1 -5
  142. package/src/api/tron/TronSignMessage.ts +0 -1
  143. package/src/api/tron/TronSignTransaction.ts +0 -1
  144. package/src/constants/index.ts +10 -1
  145. package/src/core/index.ts +22 -10
  146. package/src/data/messages/messages-protocol-v2.json +992 -1420
  147. package/src/data/messages/messages.json +8 -0
  148. package/src/data-manager/DataManager.ts +11 -4
  149. package/src/data-manager/connectSettings.ts +4 -0
  150. package/src/device/Device.ts +158 -294
  151. package/src/device/DevicePool.ts +9 -9
  152. package/src/device/DeviceWalletSessionStore.ts +78 -0
  153. package/src/deviceProfile/buildDeviceFeatures.ts +365 -0
  154. package/src/deviceProfile/buildDeviceProfile.ts +165 -200
  155. package/src/deviceProfile/index.ts +4 -1
  156. package/src/inject.ts +13 -16
  157. package/src/protocols/protocol-v2/features.ts +28 -67
  158. package/src/protocols/protocol-v2/firmware.ts +12 -36
  159. package/src/protocols/protocol-v2/index.ts +1 -0
  160. package/src/protocols/protocol-v2/walletSession.ts +83 -0
  161. package/src/types/api/firmwareUpdate.ts +16 -20
  162. package/src/types/api/getDeviceInfo.ts +4 -2
  163. package/src/types/api/getPassphraseState.ts +4 -4
  164. package/src/types/api/index.ts +17 -20
  165. package/src/types/api/protocolV2.ts +35 -40
  166. package/src/types/api/sessionCache.ts +14 -0
  167. package/src/types/device.ts +98 -34
  168. package/src/types/params.ts +4 -0
  169. package/src/types/settings.ts +42 -30
  170. package/src/utils/capabilitieUtils.ts +1 -2
  171. package/src/utils/deviceFeaturesUtils.ts +54 -29
  172. package/src/utils/deviceInfoUtils.ts +11 -29
  173. package/src/utils/deviceVersionUtils.ts +7 -25
  174. package/src/utils/findDefectiveBatchDevice.ts +6 -6
  175. package/dist/api/protocol-v2/DevReboot.d.ts +0 -7
  176. package/dist/api/protocol-v2/DevReboot.d.ts.map +0 -1
  177. package/dist/api/protocol-v2/DeviceGetDeviceInfo.d.ts.map +0 -1
  178. package/dist/api/protocol-v2/DeviceGetOnboardingStatus.d.ts +0 -6
  179. package/dist/api/protocol-v2/DeviceGetOnboardingStatus.d.ts.map +0 -1
  180. package/dist/api/protocol-v2/FactoryDeviceInfoSettings.d.ts +0 -7
  181. package/dist/api/protocol-v2/FactoryDeviceInfoSettings.d.ts.map +0 -1
  182. package/dist/api/protocol-v2/FactoryGetDeviceInfo.d.ts +0 -6
  183. package/dist/api/protocol-v2/FactoryGetDeviceInfo.d.ts.map +0 -1
  184. package/dist/api/protocol-v2/FilesystemFixPermission.d.ts.map +0 -1
  185. package/dist/api/protocol-v2/GetProtoVersion.d.ts +0 -6
  186. package/dist/api/protocol-v2/GetProtoVersion.d.ts.map +0 -1
  187. package/dist/deviceProfile/legacyFeaturesView.d.ts +0 -5
  188. package/dist/deviceProfile/legacyFeaturesView.d.ts.map +0 -1
  189. package/src/api/protocol-v2/DevReboot.ts +0 -24
  190. package/src/api/protocol-v2/DeviceGetOnboardingStatus.ts +0 -16
  191. package/src/api/protocol-v2/FactoryDeviceInfoSettings.ts +0 -29
  192. package/src/deviceProfile/legacyFeaturesView.ts +0 -123
@@ -0,0 +1,19 @@
1
+ import { parseConnectSettings } from '../src/data-manager/connectSettings';
2
+
3
+ jest.mock('../src/data/config', () => ({
4
+ getSDKVersion: jest.fn(() => '1.0.0'),
5
+ DEFAULT_DOMAIN: 'https://jssdk.onekey.so/1.0.0/',
6
+ }));
7
+
8
+ describe('parseConnectSettings', () => {
9
+ it('keeps custom configFetcher in parsed settings', () => {
10
+ const configFetcher = jest.fn();
11
+
12
+ const settings = parseConnectSettings({
13
+ fetchConfig: true,
14
+ configFetcher,
15
+ });
16
+
17
+ expect(settings.configFetcher).toBe(configFetcher);
18
+ });
19
+ });
@@ -0,0 +1,131 @@
1
+ import ClearSessionCache from '../src/api/ClearSessionCache';
2
+ import {
3
+ DeviceWalletSessionStore,
4
+ deviceWalletSessionStore,
5
+ } from '../src/device/DeviceWalletSessionStore';
6
+ import { createCoreApi } from '../src/inject';
7
+
8
+ jest.mock('../src/data/config', () => ({
9
+ getSDKVersion: jest.fn(() => '1.0.0'),
10
+ DEFAULT_DOMAIN: 'https://jssdk.onekey.so/1.0.0/',
11
+ }));
12
+
13
+ describe('DeviceWalletSessionStore', () => {
14
+ test('requires passphraseState for wallet session lookup', () => {
15
+ const store = new DeviceWalletSessionStore();
16
+ store.set('device-1', 'hidden-a', 'session-a');
17
+
18
+ expect(store.get('device-1', undefined)).toBeUndefined();
19
+ expect(store.get('device-1', 'hidden-a')).toBe('session-a');
20
+ });
21
+
22
+ test('isolates wallets and devices', () => {
23
+ const store = new DeviceWalletSessionStore();
24
+ store.set('device-1', 'hidden-a', 'session-a');
25
+ store.set('device-1', 'hidden-b', 'session-b');
26
+ store.set('device-2', 'hidden-a', 'session-c');
27
+
28
+ expect(store.get('device-1', 'hidden-a')).toBe('session-a');
29
+ expect(store.get('device-1', 'hidden-b')).toBe('session-b');
30
+ expect(store.get('device-2', 'hidden-a')).toBe('session-c');
31
+ });
32
+
33
+ test('keeps pending sessions unreadable until wallet binding', () => {
34
+ const store = new DeviceWalletSessionStore();
35
+ store.setPending('device-1', 'pending-session');
36
+
37
+ expect(store.get('device-1', undefined)).toBeUndefined();
38
+ expect(store.getPending('device-1')).toBe('pending-session');
39
+ });
40
+
41
+ test('migrates descriptor keys to stable device ids', () => {
42
+ const store = new DeviceWalletSessionStore();
43
+ store.set('ble-path', 'hidden-a', 'session-a');
44
+ store.setPending('ble-path', 'pending-session');
45
+
46
+ store.migrateDeviceKey('ble-path', 'stable-device-id');
47
+
48
+ expect(store.get('ble-path', 'hidden-a')).toBeUndefined();
49
+ expect(store.get('stable-device-id', 'hidden-a')).toBe('session-a');
50
+ expect(store.getPending('ble-path')).toBeUndefined();
51
+ expect(store.getPending('stable-device-id')).toBe('pending-session');
52
+ });
53
+
54
+ test('clears one wallet, one device, or all sessions', () => {
55
+ const store = new DeviceWalletSessionStore();
56
+ store.set('device-1', 'hidden-a', 'session-a');
57
+ store.set('device-1', 'hidden-b', 'session-b');
58
+ store.set('device-2', 'hidden-a', 'session-c');
59
+
60
+ store.delete('device-1', 'hidden-a');
61
+ expect(store.get('device-1', 'hidden-a')).toBeUndefined();
62
+ expect(store.get('device-1', 'hidden-b')).toBe('session-b');
63
+
64
+ store.deleteDevice('device-1');
65
+ expect(store.get('device-1', 'hidden-b')).toBeUndefined();
66
+ expect(store.get('device-2', 'hidden-a')).toBe('session-c');
67
+
68
+ store.clear();
69
+ expect(store.get('device-2', 'hidden-a')).toBeUndefined();
70
+ });
71
+ });
72
+
73
+ describe('ClearSessionCache', () => {
74
+ beforeEach(() => {
75
+ deviceWalletSessionStore.clear();
76
+ });
77
+
78
+ test('clears one wallet without using a device', async () => {
79
+ deviceWalletSessionStore.set('device-1', 'hidden-a', 'session-a');
80
+ deviceWalletSessionStore.set('device-1', 'hidden-b', 'session-b');
81
+ const method = new ClearSessionCache({
82
+ payload: {
83
+ method: 'clearSessionCache',
84
+ deviceId: 'device-1',
85
+ passphraseState: 'hidden-a',
86
+ },
87
+ });
88
+
89
+ method.init();
90
+
91
+ expect(method.useDevice).toBe(false);
92
+ await expect(method.run()).resolves.toEqual({ cleared: true });
93
+ expect(deviceWalletSessionStore.get('device-1', 'hidden-a')).toBeUndefined();
94
+ expect(deviceWalletSessionStore.get('device-1', 'hidden-b')).toBe('session-b');
95
+ });
96
+
97
+ test('clears one device or the full runtime store', async () => {
98
+ deviceWalletSessionStore.set('device-1', 'hidden-a', 'session-a');
99
+ deviceWalletSessionStore.set('device-2', 'hidden-a', 'session-b');
100
+
101
+ const clearDevice = new ClearSessionCache({
102
+ payload: { method: 'clearSessionCache', deviceId: 'device-1' },
103
+ });
104
+ clearDevice.init();
105
+ await clearDevice.run();
106
+
107
+ expect(deviceWalletSessionStore.get('device-1', 'hidden-a')).toBeUndefined();
108
+ expect(deviceWalletSessionStore.get('device-2', 'hidden-a')).toBe('session-b');
109
+
110
+ const clearAll = new ClearSessionCache({
111
+ payload: { method: 'clearSessionCache' },
112
+ });
113
+ clearAll.init();
114
+ await clearAll.run();
115
+
116
+ expect(deviceWalletSessionStore.get('device-2', 'hidden-a')).toBeUndefined();
117
+ });
118
+
119
+ test('routes cache clearing through the active CoreApi call channel', async () => {
120
+ const call = jest.fn().mockResolvedValue({ success: true, payload: { cleared: true } });
121
+ const api = createCoreApi(call as any);
122
+
123
+ await api.clearSessionCache({ deviceId: 'device-1', passphraseState: 'hidden-a' });
124
+
125
+ expect(call).toHaveBeenCalledWith({
126
+ method: 'clearSessionCache',
127
+ deviceId: 'device-1',
128
+ passphraseState: 'hidden-a',
129
+ });
130
+ });
131
+ });
@@ -1,4 +1,9 @@
1
1
  import { Device } from '../src/device/Device';
2
+ import { initCore } from '../src/core';
3
+ import PreInitialize from '../src/api/device/PreInitialize';
4
+ import { IFRAME } from '../src/events';
5
+
6
+ import type Core from '../src/core';
2
7
 
3
8
  jest.mock('../src/data/config', () => ({
4
9
  getSDKVersion: jest.fn(() => '1.0.0'),
@@ -6,6 +11,10 @@ jest.mock('../src/data/config', () => ({
6
11
  }));
7
12
 
8
13
  describe('preInitialize', () => {
14
+ afterEach(() => {
15
+ jest.restoreAllMocks();
16
+ });
17
+
9
18
  it('matches pre-initialized state by passphraseState only', () => {
10
19
  const device = Object.create(Device.prototype) as Device;
11
20
 
@@ -19,4 +28,28 @@ describe('preInitialize', () => {
19
28
  })
20
29
  ).toBe(true);
21
30
  });
31
+
32
+ it('cleans request lifecycle when preInitialize is acknowledged without connectId', async () => {
33
+ const core: Core = initCore();
34
+ const disposeSpy = jest.spyOn(PreInitialize.prototype, 'dispose');
35
+
36
+ try {
37
+ const response = await core.handleMessage({
38
+ id: 1001,
39
+ type: IFRAME.CALL,
40
+ payload: {
41
+ method: 'preInitialize',
42
+ },
43
+ } as any);
44
+
45
+ expect(response).toMatchObject({
46
+ success: true,
47
+ payload: true,
48
+ });
49
+ expect((core as any).tracingContext.activeRequests.has(1001)).toBe(false);
50
+ expect(disposeSpy).toHaveBeenCalledTimes(1);
51
+ } finally {
52
+ core.dispose();
53
+ }
54
+ });
22
55
  });
@@ -0,0 +1,19 @@
1
+ import { ProtocolV2FirmwareTargetType } from '../src/protocols/protocol-v2/firmware';
2
+
3
+ describe('Protocol V2 firmware target contract', () => {
4
+ test('matches the current firmware-pro2 target ids', () => {
5
+ expect(ProtocolV2FirmwareTargetType).toEqual({
6
+ FW_MGMT_TARGET_INVALID: 0,
7
+ FW_MGMT_TARGET_CRATE: 1,
8
+ FW_MGMT_TARGET_ROMLOADER: 2,
9
+ FW_MGMT_TARGET_BOOTLOADER: 3,
10
+ FW_MGMT_TARGET_APPLICATION_P1: 4,
11
+ FW_MGMT_TARGET_APPLICATION_P2: 5,
12
+ FW_MGMT_TARGET_COPROCESSOR: 6,
13
+ FW_MGMT_TARGET_SE01: 7,
14
+ FW_MGMT_TARGET_SE02: 8,
15
+ FW_MGMT_TARGET_SE03: 9,
16
+ FW_MGMT_TARGET_SE04: 10,
17
+ });
18
+ });
19
+ });