bfg-common 1.5.40 → 1.5.41

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 (194) hide show
  1. package/CODE_STYLE.md +109 -109
  2. package/assets/img/icons/icons-sprite-dark-3.svg +227 -227
  3. package/assets/img/icons/icons-sprite-dark-5.svg +488 -488
  4. package/assets/img/icons/icons-sprite-light-3.svg +227 -227
  5. package/assets/img/icons/icons-sprite-light-5.svg +488 -488
  6. package/assets/scss/common/normalize.scss +339 -339
  7. package/components/atoms/TheIcon3.vue +50 -50
  8. package/components/atoms/collapse/CollapseNav.vue +165 -165
  9. package/components/atoms/dropdown/dropdown/Dropdown.vue +168 -168
  10. package/components/atoms/modal/bySteps/BySteps.vue +253 -253
  11. package/components/atoms/perPage/PerPage.vue +58 -58
  12. package/components/atoms/stack/StackBlock.vue +185 -185
  13. package/components/atoms/table/dataGrid/DataGridColumnSwitch.vue +222 -222
  14. package/components/atoms/table/dataGrid/lib/config/settingsTable.ts +94 -94
  15. package/components/atoms/table/dataGrid/lib/utils/export.ts +16 -16
  16. package/components/atoms/tabs/VerticalTabs.vue +105 -105
  17. package/components/atoms/tooltip/Signpost.vue +227 -227
  18. package/components/common/accordion/Recursion.vue +222 -222
  19. package/components/common/browse/BrowseNew.vue +237 -237
  20. package/components/common/browse/BrowseOld.vue +217 -217
  21. package/components/common/browse/blocks/contents/Files.vue +37 -37
  22. package/components/common/browse/blocks/contents/FilesOld.vue +72 -72
  23. package/components/common/browse/blocks/contents/filesNew/FilesNew.vue +96 -96
  24. package/components/common/browse/blocks/contents/filesNew/Skeleton.vue +18 -18
  25. package/components/common/browse/blocks/lib/models/types.ts +1 -1
  26. package/components/common/browse/lib/models/interfaces.ts +5 -5
  27. package/components/common/context/Context.vue +111 -111
  28. package/components/common/context/lib/models/interfaces.ts +31 -31
  29. package/components/common/context/recursion/Recursion.vue +87 -87
  30. package/components/common/context/recursion/RecursionNew.vue +238 -238
  31. package/components/common/context/recursion/RecursionOld.vue +228 -228
  32. package/components/common/details/DetailsItem.vue +109 -109
  33. package/components/common/diagramMain/DiagramMain.vue +897 -897
  34. package/components/common/diagramMain/Header.vue +214 -214
  35. package/components/common/diagramMain/adapter/AdapterItems.vue +61 -61
  36. package/components/common/diagramMain/lib/config/initial.ts +50 -50
  37. package/components/common/diagramMain/lib/models/types.ts +21 -21
  38. package/components/common/diagramMain/lib/utils/utils.ts +331 -331
  39. package/components/common/diagramMain/modals/editSettings/ConfirmTeamingSettingsModal.vue +40 -40
  40. package/components/common/diagramMain/modals/editSettings/tabs/NetworkProperties.vue +214 -214
  41. package/components/common/diagramMain/modals/editSettings/tabs/Security.vue +189 -189
  42. package/components/common/diagramMain/modals/editSettings/tabs/SwitchProperties.vue +163 -163
  43. package/components/common/diagramMain/modals/editSettings/tabs/TeamingFailover.vue +175 -175
  44. package/components/common/diagramMain/modals/editSettings/tabs/port/IpvFourSettings.vue +346 -346
  45. package/components/common/diagramMain/modals/editSettings/tabs/port/PortProperties.vue +205 -205
  46. package/components/common/diagramMain/modals/lib/config/initial.ts +180 -180
  47. package/components/common/diagramMain/modals/lib/config/vmKernelAdapter.ts +90 -90
  48. package/components/common/diagramMain/modals/lib/mappers/mappers.ts +87 -87
  49. package/components/common/diagramMain/modals/lib/utils/index.ts +24 -24
  50. package/components/common/diagramMain/modals/migrateVmkernelAdapter/lib/config/steps.ts +114 -114
  51. package/components/common/diagramMain/modals/migrateVmkernelAdapter/steps/ConnectionSettings.vue +169 -169
  52. package/components/common/diagramMain/modals/migrateVmkernelAdapter/steps/SelectVmkernelAdapter.vue +159 -159
  53. package/components/common/diagramMain/modals/migrateVmkernelAdapter/validations/common.ts +14 -14
  54. package/components/common/diagramMain/modals/migrateVmkernelAdapter/validations/connectionSettings.ts +137 -137
  55. package/components/common/diagramMain/modals/migrateVmkernelAdapter/validations/selectVmkernelAdapter.ts +52 -52
  56. package/components/common/diagramMain/modals/migrateVmkernelAdapter/validations/validations.ts +19 -19
  57. package/components/common/diagramMain/port/Ports.vue +47 -47
  58. package/components/common/layout/theHeader/helpMenu/About.vue +82 -82
  59. package/components/common/layout/theHeader/helpMenu/aboutNew/AboutNew.vue +103 -103
  60. package/components/common/layout/theHeader/userMenu/modals/preferences/view/ViewOld.vue +112 -112
  61. package/components/common/mainNavigationPanel/MainNavigationPanelNew.vue +336 -336
  62. package/components/common/mainNavigationPanel/MainNavigationPanelOld.vue +311 -311
  63. package/components/common/modals/unsavedChanges/UnsavedChanges.vue +56 -56
  64. package/components/common/monitor/overview/OverviewOld.vue +139 -139
  65. package/components/common/pages/home/StatusContent.vue +49 -49
  66. package/components/common/pages/home/headline/Headline.vue +45 -45
  67. package/components/common/pages/home/headline/HeadlineOld.vue +42 -42
  68. package/components/common/pages/home/lib/models/interfaces.ts +48 -48
  69. package/components/common/pages/home/widgets/Widgets.vue +49 -49
  70. package/components/common/pages/home/widgets/WidgetsNew.vue +86 -86
  71. package/components/common/pages/home/widgets/WidgetsOld.vue +34 -34
  72. package/components/common/pages/home/widgets/hosts/Hosts.vue +27 -27
  73. package/components/common/pages/home/widgets/hosts/lib/config/items.ts +23 -23
  74. package/components/common/pages/home/widgets/vms/Vms.vue +26 -26
  75. package/components/common/pages/home/widgets/vms/VmsOld.vue +35 -35
  76. package/components/common/pages/home/widgets/vms/lib/config/items.ts +19 -19
  77. package/components/common/pages/packages/Packages.vue +208 -208
  78. package/components/common/pages/shortcuts/block/BlockNew.vue +96 -96
  79. package/components/common/pages/shortcuts/block/BlockOld.vue +68 -68
  80. package/components/common/portlets/customAttributes/Portlet.vue +667 -667
  81. package/components/common/portlets/tag/Portlet.vue +433 -433
  82. package/components/common/recursionTree/RecursionTree.vue +223 -223
  83. package/components/common/select/button/ButtonDropdown.vue +108 -108
  84. package/components/common/spiceConsole/Drawer.vue +370 -370
  85. package/components/common/spiceConsole/lib/models/interfaces.ts +5 -5
  86. package/components/common/split/horizontal/HorizontalNew.vue +376 -376
  87. package/components/common/split/horizontal/HorizontalOld.vue +337 -337
  88. package/components/common/split/vertical/Vertical.vue +160 -160
  89. package/components/common/tools/Actions.vue +188 -188
  90. package/components/common/vm/actions/add/Add.vue +774 -772
  91. package/components/common/vm/actions/add/lib/config/steps.ts +247 -247
  92. package/components/common/vm/actions/clone/Clone.vue +798 -668
  93. package/components/common/vm/actions/clone/lib/config/steps.ts +291 -178
  94. package/components/common/vm/actions/clone/toTemplate/ToTemplate.vue +634 -634
  95. package/components/common/vm/actions/clone/toTemplate/lib/config/steps.ts +116 -116
  96. package/components/common/vm/actions/common/customizeHardware/CustomizeHardware.vue +275 -275
  97. package/components/common/vm/actions/common/customizeHardware/CustomizeHardwareNew.vue +274 -274
  98. package/components/common/vm/actions/common/customizeHardware/CustomizeHardwareOld.vue +177 -177
  99. package/components/common/vm/actions/common/customizeHardware/virtualHardware/VirtualHardware.vue +698 -698
  100. package/components/common/vm/actions/common/customizeHardware/virtualHardware/VirtualHardwareNew.vue +410 -410
  101. package/components/common/vm/actions/common/customizeHardware/virtualHardware/VirtualHardwareOld.vue +319 -319
  102. package/components/common/vm/actions/common/customizeHardware/virtualHardware/browseView/BrowseView.vue +219 -219
  103. package/components/common/vm/actions/common/customizeHardware/virtualHardware/bus/Bus.vue +99 -99
  104. package/components/common/vm/actions/common/customizeHardware/virtualHardware/bus/BusNew.vue +117 -117
  105. package/components/common/vm/actions/common/customizeHardware/virtualHardware/cdDvdDrive/CdDvdDrive.vue +232 -232
  106. package/components/common/vm/actions/common/customizeHardware/virtualHardware/cdDvdDrive/CdDvdDriveNew.vue +164 -164
  107. package/components/common/vm/actions/common/customizeHardware/virtualHardware/cdDvdDrive/CdDvdDriveOld.vue +168 -168
  108. package/components/common/vm/actions/common/customizeHardware/virtualHardware/cdDvdDrive/media/Media.vue +25 -25
  109. package/components/common/vm/actions/common/customizeHardware/virtualHardware/cdDvdDrive/media/MediaNew.vue +70 -70
  110. package/components/common/vm/actions/common/customizeHardware/virtualHardware/cdDvdDrive/media/MediaOld.vue +50 -50
  111. package/components/common/vm/actions/common/customizeHardware/virtualHardware/cpu/Cpu.vue +338 -338
  112. package/components/common/vm/actions/common/customizeHardware/virtualHardware/limit/Limit.vue +220 -220
  113. package/components/common/vm/actions/common/customizeHardware/virtualHardware/newHardDisk/NewHardDisk.vue +368 -368
  114. package/components/common/vm/actions/common/customizeHardware/virtualHardware/newHardDisk/NewHardDiskNew.vue +232 -232
  115. package/components/common/vm/actions/common/customizeHardware/virtualHardware/newHardDisk/NewHardDiskOld.vue +250 -250
  116. package/components/common/vm/actions/common/customizeHardware/virtualHardware/newHardDisk/mode/ModeOld.vue +56 -56
  117. package/components/common/vm/actions/common/customizeHardware/virtualHardware/newHardDisk/sharing/SharingNew.vue +44 -44
  118. package/components/common/vm/actions/common/customizeHardware/virtualHardware/newNetwork/NewNetwork.vue +286 -286
  119. package/components/common/vm/actions/common/customizeHardware/virtualHardware/newNetwork/NewNetworkNew.vue +124 -124
  120. package/components/common/vm/actions/common/customizeHardware/virtualHardware/newNetwork/location/LocationOld.vue +134 -134
  121. package/components/common/vm/actions/common/customizeHardware/virtualHardware/newNetwork/location/new/New.vue +63 -63
  122. package/components/common/vm/actions/common/customizeHardware/virtualHardware/newNetwork/location/new/table/lib/config/config.ts +95 -95
  123. package/components/common/vm/actions/common/customizeHardware/virtualHardware/newNetwork/macAddress/MacAddress.vue +119 -119
  124. package/components/common/vm/actions/common/customizeHardware/virtualHardware/newNetwork/macAddress/MacAddressNew.vue +69 -69
  125. package/components/common/vm/actions/common/customizeHardware/virtualHardware/newNetwork/macAddress/MacAddressOld.vue +83 -83
  126. package/components/common/vm/actions/common/customizeHardware/virtualHardware/newPciDevice/NewPciDevice.vue +205 -205
  127. package/components/common/vm/actions/common/customizeHardware/virtualHardware/newPciDevice/directPathIo/DirectPathIoNew.vue +66 -66
  128. package/components/common/vm/actions/common/customizeHardware/virtualHardware/newPciDevice/directPathIo/DirectPathIoOld.vue +62 -62
  129. package/components/common/vm/actions/common/customizeHardware/virtualHardware/newPciDevice/dynamicDirectPathIo/DynamicDirectPathIo.vue +31 -31
  130. package/components/common/vm/actions/common/customizeHardware/virtualHardware/newPciDevice/dynamicDirectPathIo/DynamicDirectPathIoNew.vue +84 -84
  131. package/components/common/vm/actions/common/customizeHardware/virtualHardware/newPciDevice/dynamicDirectPathIo/DynamicDirectPathIoOld.vue +76 -76
  132. package/components/common/vm/actions/common/customizeHardware/virtualHardware/newPciDevice/note/Note.vue +15 -15
  133. package/components/common/vm/actions/common/customizeHardware/virtualHardware/newPciDevice/note/NoteNew.vue +42 -42
  134. package/components/common/vm/actions/common/customizeHardware/virtualHardware/newPciDevice/note/NoteOld.vue +30 -30
  135. package/components/common/vm/actions/common/customizeHardware/virtualHardware/newPciDevice/nvidiaGrid/NvidiaGrid.vue +41 -41
  136. package/components/common/vm/actions/common/customizeHardware/virtualHardware/newPciDevice/nvidiaGrid/NvidiaGridNew.vue +81 -81
  137. package/components/common/vm/actions/common/customizeHardware/virtualHardware/newPciDevice/nvidiaGrid/NvidiaGridOld.vue +84 -84
  138. package/components/common/vm/actions/common/customizeHardware/virtualHardware/newUsbController/NewUsbControllerNew.vue +56 -56
  139. package/components/common/vm/actions/common/customizeHardware/virtualHardware/other/Other.vue +16 -16
  140. package/components/common/vm/actions/common/customizeHardware/virtualHardware/other/OtherNew.vue +30 -30
  141. package/components/common/vm/actions/common/customizeHardware/virtualHardware/videoCard/VideoCardNew.vue +104 -104
  142. package/components/common/vm/actions/common/customizeHardware/virtualHardware/videoCard/VideoCardOld.vue +112 -112
  143. package/components/common/vm/actions/common/customizeHardware/virtualHardware/videoCard/totalVideoMemory/TotalVideoMemoryNew.vue +54 -54
  144. package/components/common/vm/actions/common/customizeHardware/vmoptions/Vmoptions.vue +145 -145
  145. package/components/common/vm/actions/common/customizeHardware/vmoptions/VmoptionsNew.vue +102 -102
  146. package/components/common/vm/actions/common/customizeHardware/vmoptions/bootOptions/BootOptionsNew.vue +75 -75
  147. package/components/common/vm/actions/common/customizeHardware/vmoptions/bootOptions/delay/Delay.vue +26 -26
  148. package/components/common/vm/actions/common/customizeHardware/vmoptions/bootOptions/firmware/Firmware.vue +57 -57
  149. package/components/common/vm/actions/common/customizeHardware/vmoptions/bootOptions/firmware/FirmwareNew.vue +42 -42
  150. package/components/common/vm/actions/common/customizeHardware/vmoptions/bootOptions/menu/MenuNew.vue +25 -25
  151. package/components/common/vm/actions/common/customizeHardware/vmoptions/bootOptions/order/Order.vue +171 -171
  152. package/components/common/vm/actions/common/customizeHardware/vmoptions/bootOptions/order/OrderNew.vue +50 -50
  153. package/components/common/vm/actions/common/customizeHardware/vmoptions/generalOptions/GeneralOptionsNew.vue +141 -141
  154. package/components/common/vm/actions/common/customizeHardware/vmoptions/remoteConsoleOptions/New.vue +140 -140
  155. package/components/common/vm/actions/common/customizeHardware/vmoptions/remoteConsoleOptions/copyPaste/CopyPasteNew.vue +30 -30
  156. package/components/common/vm/actions/common/customizeHardware/vmoptions/remoteConsoleOptions/fileTransfer/FileTransferNew.vue +30 -30
  157. package/components/common/vm/actions/common/customizeHardware/vmoptions/remoteConsoleOptions/folderSharing/FolderSharingNew.vue +30 -30
  158. package/components/common/vm/actions/common/customizeHardware/vmoptions/remoteConsoleOptions/keymap/Keymap.vue +32 -32
  159. package/components/common/vm/actions/common/customizeHardware/vmoptions/remoteConsoleOptions/keymap/KeymapNew.vue +39 -39
  160. package/components/common/vm/actions/common/customizeHardware/vmoptions/remoteConsoleOptions/password/Password.vue +103 -103
  161. package/components/common/vm/actions/common/customizeHardware/vmoptions/remoteConsoleOptions/password/PasswordNew.vue +102 -102
  162. package/components/common/vm/actions/common/customizeHardware/vmoptions/remoteConsoleOptions/password/PasswordOld.vue +94 -94
  163. package/components/common/vm/actions/common/customizeHardware/vmoptions/remoteConsoleOptions/usbRedirection/UsbRedirection.vue +28 -28
  164. package/components/common/vm/actions/common/customizeHardware/vmoptions/remoteConsoleOptions/usbRedirection/UsbRedirectionNew.vue +38 -38
  165. package/components/common/vm/actions/common/customizeHardware/vmoptions/remoteConsoleOptions/usbRedirection/UsbRedirectionOld.vue +44 -44
  166. package/components/common/vm/actions/common/lib/models/interfaces.ts +1 -0
  167. package/components/common/vm/actions/common/lib/utils/capabilities.ts +52 -51
  168. package/components/common/vm/actions/common/select/createType/CreateType.vue +74 -74
  169. package/components/common/vm/actions/common/select/storage/Storage.vue +130 -130
  170. package/components/common/vm/actions/common/select/storage/StorageOld.vue +129 -129
  171. package/components/common/vm/actions/common/select/template/Template.vue +65 -65
  172. package/components/common/vm/actions/common/select/template/TemplateTreeView.vue +88 -88
  173. package/components/common/vm/actions/editSettings/new/Skeleton.vue +88 -88
  174. package/components/common/wizards/datastore/add/lib/config/steps.ts +138 -138
  175. package/components/common/wizards/datastore/add/nfs/accessibility/Accessibility.vue +60 -60
  176. package/components/common/wizards/datastore/add/readyComplete/ReadyComplete.vue +92 -92
  177. package/components/common/wizards/network/add/steps/SelectConnectionType.vue +105 -105
  178. package/components/common/wizards/vm/migrate/lib/config/constructDataReady.ts +220 -220
  179. package/components/common/wizards/vm/migrate/select/network/Network.vue +103 -103
  180. package/components/common/wizards/vm/migrate/select/network/table/network/Network.vue +150 -150
  181. package/components/common/wizards/vm/migrate/select/network/table/network/lib/config/advancedTable.ts +91 -91
  182. package/components/common/wizards/vm/migrate/select/priority/Priority.vue +43 -43
  183. package/composables/productNameLocal.ts +30 -30
  184. package/composables/useAppVersion.ts +21 -21
  185. package/lib/models/store/interfaces.ts +1 -0
  186. package/lib/models/store/vm/interfaces.ts +2 -0
  187. package/package.json +1 -1
  188. package/plugins/date.ts +233 -233
  189. package/plugins/directives.ts +24 -24
  190. package/public/spice-console/lib/images/bitmap.js +203 -203
  191. package/public/spice-console/network/spicechannel.js +383 -383
  192. package/store/main/mutations.ts +7 -7
  193. package/store/main/state.ts +7 -7
  194. package/store/tasks/mappers/recentTasks.ts +64 -64
@@ -1,383 +1,383 @@
1
- /*
2
- Copyright (c) 2016 eyeOS
3
-
4
- This file is part of Open365.
5
-
6
- Open365 is free software: you can redistribute it and/or modify
7
- it under the terms of the GNU Affero General Public License as
8
- published by the Free Software Foundation, either version 3 of the
9
- License, or (at your option) any later version.
10
-
11
- This program is distributed in the hope that it will be useful,
12
- but WITHOUT ANY WARRANTY; without even the implied warranty of
13
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
14
- GNU Affero General Public License for more details.
15
-
16
- You should have received a copy of the GNU Affero General Public License
17
- along with this program. If not, see <http://www.gnu.org/licenses/>.
18
- */
19
-
20
- //Must fire event types: connectionId and message
21
-
22
- wdi.SpiceChannel = $.spcExtend(wdi.EventObject.prototype, {
23
- counter: 0,
24
- ackWindow: 0,
25
- connectionId: 0,
26
- socketQ: null,
27
- packetReassembler: null,
28
- channel: 1,
29
- codec: wdi.SpiceVideoCodecType.SPICE_VIDEO_CODEC_TYPE_MJPEG,
30
- proxy: null,
31
- token: null,
32
-
33
- init: function (c) {
34
- this.superInit()
35
- this.socketQ = c.socketQ || new wdi.SocketQueue()
36
- this.packetReassembler =
37
- c.packetReassembler ||
38
- wdi.ReassemblerFactory.getPacketReassembler(this.socketQ)
39
- this.setListeners()
40
- this.ackWindow = 0
41
-
42
- // var _this = this
43
- // setInterval(() => {
44
- // var body = new wdi.RedPing({id: 0, time: new Date().getTime()}).marshall();
45
- // _this.sendObject(body, wdi.SpiceVars.SPICE_MSGC_PONG);
46
- // }, 60_00)
47
- },
48
-
49
- // startHandshakeTimeout: function () {
50
- // var self = this
51
- // this.handshakeTimeout = window.setTimeout(function () {
52
- // var err = new Error('Handshake timeout')
53
- // err.code = 4200
54
- // wdi.Debug.error('Handshake timeout reached, raising error')
55
- // self.fire('error', err)
56
- // }, 5000)
57
- // },
58
-
59
- fireHandshakeTimeoutError: function () {
60
- var err = new Error('Handshake timeout')
61
- err.code = 4200
62
- wdi.Debug.error('Handshake timeout reached, raising error')
63
- this.fire('error', err)
64
- },
65
-
66
- // cancelHandshakeTimeout: function () {
67
- // clearTimeout(this.handshakeTimeout)
68
- // },
69
-
70
- setListeners: function () {
71
- var date
72
- var self = this
73
- this.packetReassembler.addListener(
74
- 'packetComplete',
75
- function (e) {
76
- var rawMessage = e
77
- if (rawMessage.status === 'spicePacket') {
78
- wdi.Debug.log('packetComplete spicePacket')
79
- // self.cancelHandshakeTimeout()
80
- if (wdi.logOperations) {
81
- wdi.DataLogger.logNetworkTime()
82
- date = Date.now()
83
- }
84
- var rsm = this.getRawSpiceMessage(rawMessage.data)
85
- if (rsm) {
86
- if (
87
- wdi.logOperations &&
88
- rsm.channel === wdi.SpiceVars.SPICE_CHANNEL_DISPLAY
89
- ) {
90
- wdi.DataLogger.setStartTime(date)
91
- }
92
- this.fire('message', rsm)
93
- }
94
- } else if (rawMessage.status === 'reply') {
95
- wdi.Debug.log('packetComplete reply')
96
- var packet = this.getRedLinkReplyBytes(rawMessage.data)
97
- this.send(packet)
98
- } else if (rawMessage.status === 'errorCode') {
99
- wdi.Debug.log('packetComplete errorCode')
100
- var packet = this.getErrorCodeBytes(rawMessage.data)
101
- if (packet) {
102
- this.send(packet)
103
- if (this.channel === wdi.SpiceVars.SPICE_CHANNEL_DISPLAY) {
104
- // Custom code
105
- // Set codec
106
- // this.changeCodec(this.codec)
107
- // Custom code end
108
- }
109
- }
110
- this.fire('channelConnected')
111
- } else {
112
- self.fireHandshakeTimeoutError()
113
- }
114
- },
115
- this
116
- )
117
-
118
- this.socketQ.addListener(
119
- 'open',
120
- function () {
121
- var packet = this.getRedLinkMessBytes()
122
- this.send(packet)
123
- this.proxy ? this.proxy.end() : false
124
- },
125
- this
126
- )
127
-
128
- this.socketQ.addListener(
129
- 'close',
130
- function (e) {
131
- if (this.channel === 1) {
132
- this.fire('error', e)
133
- }
134
- this.socketQ.disconnect()
135
- },
136
- this
137
- )
138
-
139
- this.socketQ.addListener(
140
- 'error',
141
- function (e) {
142
- this.fire('error', e)
143
- this.socketQ.disconnect()
144
- },
145
- this
146
- )
147
- },
148
-
149
- changeCodec: function (codec) {
150
- this.sendObject(
151
- [
152
- ...wdi.SpiceObject.numberTo16(2),
153
- ...wdi.SpiceObject.numberTo16(codec),
154
- ...wdi.SpiceObject.numberTo16(3),
155
- ],
156
- wdi.SpiceVars.SPICE_MSGC_DISPLAY_PREFERRED_VIDEO_CODEC_TYPE
157
- )
158
-
159
- wdi.currentCodec = codec
160
-
161
- console.log(`codec changed: ${codec}`)
162
- },
163
-
164
- connect: function (connectionInfo, channel, connectionId, proxy) {
165
- var url = wdi.Utils.generateWebSocketUrl(
166
- connectionInfo.protocol,
167
- connectionInfo.host,
168
- connectionInfo.port,
169
- connectionInfo.vmHost,
170
- connectionInfo.vmPort,
171
- 'spice',
172
- connectionInfo.vmInfoToken,
173
- connectionInfo.vmid
174
- )
175
- this.channel = channel
176
- this.connectionId = connectionId || 0
177
- this.socketQ.connect(url)
178
- // this.startHandshakeTimeout()
179
- this.proxy = proxy
180
- this.token = connectionInfo.token
181
- this.packetReassembler.start()
182
- },
183
-
184
- disconnect: function () {
185
- wdi.Debug.log('spicechannel disconnect')
186
- this.counter = 0
187
- this.ackWindow = 0
188
- this.connectionId = 0
189
- this.socketQ.disconnect()
190
- this.socketQ = null
191
- this.packetReassembler.dispose()
192
- this.packetReassembler = null
193
- this.channel = 1
194
- this.proxy = null
195
- this.token = null
196
- },
197
-
198
- send: function (data, flush) {
199
- this.socketQ.send(data, flush)
200
- },
201
-
202
- sendObject: function (data, type, flush) {
203
- // TODO: Unhardcode this value
204
- var bufSize = 2048
205
- for (var current = 0; current < data.length; current += bufSize) {
206
- var part = data.slice(current, current + bufSize)
207
- var packet = new wdi.SpiceDataHeader({
208
- type: type,
209
- size: part.length,
210
- }).marshall()
211
-
212
- packet = packet.concat(part)
213
-
214
- this.send(packet, flush)
215
- }
216
- },
217
-
218
- // Custom code
219
- arrayOfNumberToUint32: function (arrayOfNumber) {
220
- let v = 0
221
- for (let n of arrayOfNumber) {
222
- v |= 1 << n
223
- }
224
- return v
225
- },
226
- // Custom code end
227
-
228
- setAckWindow: function (window) {
229
- this.ackWindow = window
230
- this.counter = 0
231
- },
232
-
233
- getRawSpiceMessage: function (rawData) {
234
- var headerQueue = wdi.GlobalPool.create('ViewQueue')
235
- var body = wdi.GlobalPool.create('ViewQueue')
236
-
237
- var header = new Uint8Array(
238
- rawData,
239
- 0,
240
- wdi.SpiceDataHeader.prototype.objectSize
241
- )
242
- headerQueue.setData(header)
243
- var headerObj = new wdi.SpiceDataHeader().demarshall(headerQueue)
244
- wdi.GlobalPool.discard('ViewQueue', headerQueue)
245
- var rawBody = rawData.subarray(wdi.SpiceDataHeader.prototype.objectSize)
246
- body.setData(rawBody)
247
-
248
- this.counter++
249
-
250
- if (this.ackWindow && this.counter === this.ackWindow) {
251
- this.counter = 0
252
- var ack = new wdi.SpiceDataHeader({
253
- type: wdi.SpiceVars.SPICE_MSGC_ACK,
254
- size: 0,
255
- }).marshall()
256
- this.send(ack)
257
- }
258
-
259
- var packet = wdi.PacketLinkFactory.extract(headerObj, body) || false
260
- if (packet) {
261
- wdi.PacketLinkProcess.process(headerObj, packet, this)
262
- wdi.GlobalPool.discard('ViewQueue', body)
263
- return false
264
- } else {
265
- var rawSpiceMessage = wdi.GlobalPool.create('RawSpiceMessage')
266
- rawSpiceMessage.set(headerObj, body, this.channel)
267
- return rawSpiceMessage
268
- }
269
- },
270
-
271
- //This functions are to avoid hardcoded values on logic
272
- getRedLinkReplyBytes: function (data) {
273
- if (this.token) {
274
- var newq = new wdi.ViewQueue()
275
- newq.setData(data)
276
- newq.eatBytes(wdi.SpiceLinkHeader.prototype.objectSize)
277
- var myBody = new wdi.SpiceLinkReply().demarshall(newq)
278
-
279
- // Custom code
280
- const token = window.password || this.token
281
- // Custom code end
282
-
283
- //Returnnig void bytes or encrypted ticket
284
- var key = wdi.SpiceObject.stringHexToBytes(
285
- RSA_public_encrypt(token, myBody.pub_key)
286
- )
287
- return key
288
- } else {
289
- return wdi.SpiceObject.stringToBytesPadding('', 128)
290
- }
291
- },
292
-
293
- getRedLinkMessBytes: function () {
294
- // var header = new wdi.SpiceLinkHeader({magic:1363428690, major_version:2, minor_version:2, size:22}).marshall();
295
- // var body = new wdi.SpiceLinkMess({
296
- // connection_id:this.connectionId,
297
- // channel_type:this.channel,
298
- // caps_offset:18,
299
- // num_common_caps: 1,
300
- // num_channel_caps: 0,
301
- // common_caps: (1 << wdi.SpiceVars.SPICE_COMMON_CAP_MINI_HEADER)
302
- // }).marshall();
303
-
304
- // Custom code
305
- // TODO uncomment this code for send caps
306
- var header = new wdi.SpiceLinkHeader({
307
- magic: 1363428690,
308
- major_version: 2,
309
- minor_version: 2,
310
- size: 26,
311
- }).marshall()
312
- var body = new wdi.SpiceLinkMess({
313
- connection_id: this.connectionId,
314
- channel_type: this.channel,
315
- caps_offset: 18,
316
- num_common_caps: 1,
317
- num_channel_caps: 1,
318
- common_caps: 1 << wdi.SpiceVars.SPICE_COMMON_CAP_MINI_HEADER,
319
- channel_caps: this.arrayOfNumberToUint32([
320
- wdi.SpiceDisplayCaps.SPICE_DISPLAY_CAP_SIZED_STREAM,
321
- wdi.SpiceDisplayCaps.SPICE_DISPLAY_CAP_STREAM_REPORT,
322
- wdi.SpiceDisplayCaps.SPICE_DISPLAY_CAP_MONITORS_CONFIG,
323
-
324
- wdi.SpiceDisplayCaps.SPICE_DISPLAY_CAP_MULTI_CODEC,
325
- wdi.SpiceDisplayCaps.SPICE_DISPLAY_CAP_PREF_VIDEO_CODEC_TYPE,
326
- wdi.SpiceDisplayCaps.SPICE_DISPLAY_CAP_CODEC_MJPEG,
327
- wdi.SpiceDisplayCaps.SPICE_DISPLAY_CAP_CODEC_VP8,
328
- wdi.SpiceDisplayCaps.SPICE_DISPLAY_CAP_CODEC_H264,
329
- wdi.SpiceDisplayCaps.SPICE_DISPLAY_CAP_CODEC_VP9,
330
- wdi.SpiceDisplayCaps.SPICE_DISPLAY_CAP_CODEC_H265,
331
-
332
- wdi.SpiceDisplayCaps.SPICE_DISPLAY_CAP_LZ4_COMPRESSION,
333
- wdi.SpiceDisplayCaps.SPICE_DISPLAY_CAP_PREF_COMPRESSION,
334
- ]),
335
- }).marshall()
336
- // Custom code end
337
-
338
- return header.concat(body)
339
- },
340
-
341
- getErrorCodeBytes: function (data) {
342
- var errorQ = wdi.GlobalPool.create('ViewQueue')
343
- errorQ.setData(data)
344
- var errorCode = wdi.SpiceObject.bytesToInt32NoAllocate(errorQ)
345
- wdi.GlobalPool.discard('ViewQueue', errorQ)
346
- if (errorCode === 0) {
347
- if (this.channel === wdi.SpiceVars.SPICE_CHANNEL_DISPLAY) {
348
- var redDisplayInit = new wdi.SpiceDataHeader({
349
- type: wdi.SpiceVars.SPICE_MSGC_DISPLAY_INIT,
350
- size: 14,
351
- }).marshall()
352
- //TODO: ultrahardcoded value here, move to configuration
353
-
354
- //DUE To high level storage the memory specified for cache
355
- //is 2-3 times bigger than expected.
356
- var cache_size = 1
357
-
358
- var body = new wdi.SpiceCDisplayInit({
359
- pixmap_cache_id: 1,
360
- pixmap_cache_size: cache_size,
361
- glz_dictionary_id: 0,
362
- glz_dictionary_window_size: 0,
363
- }).marshall()
364
-
365
- return redDisplayInit.concat(body)
366
- } else if (this.channel == wdi.SpiceVars.SPICE_CHANNEL_MAIN) {
367
- return new wdi.SpiceDataHeader({
368
- type: wdi.SpiceVars.SPICE_MSGC_MAIN_ATTACH_CHANNELS,
369
- size: 0,
370
- }).marshall()
371
- }
372
- // Custom code
373
- } else if (errorCode === 7) {
374
- window.password = window.prompt('Enter the password')
375
- // Custom code end
376
- } else {
377
- throw new wdi.Exception({
378
- message: 'Server refused client',
379
- errorCode: 2,
380
- })
381
- }
382
- },
383
- })
1
+ /*
2
+ Copyright (c) 2016 eyeOS
3
+
4
+ This file is part of Open365.
5
+
6
+ Open365 is free software: you can redistribute it and/or modify
7
+ it under the terms of the GNU Affero General Public License as
8
+ published by the Free Software Foundation, either version 3 of the
9
+ License, or (at your option) any later version.
10
+
11
+ This program is distributed in the hope that it will be useful,
12
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
13
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
14
+ GNU Affero General Public License for more details.
15
+
16
+ You should have received a copy of the GNU Affero General Public License
17
+ along with this program. If not, see <http://www.gnu.org/licenses/>.
18
+ */
19
+
20
+ //Must fire event types: connectionId and message
21
+
22
+ wdi.SpiceChannel = $.spcExtend(wdi.EventObject.prototype, {
23
+ counter: 0,
24
+ ackWindow: 0,
25
+ connectionId: 0,
26
+ socketQ: null,
27
+ packetReassembler: null,
28
+ channel: 1,
29
+ codec: wdi.SpiceVideoCodecType.SPICE_VIDEO_CODEC_TYPE_MJPEG,
30
+ proxy: null,
31
+ token: null,
32
+
33
+ init: function (c) {
34
+ this.superInit()
35
+ this.socketQ = c.socketQ || new wdi.SocketQueue()
36
+ this.packetReassembler =
37
+ c.packetReassembler ||
38
+ wdi.ReassemblerFactory.getPacketReassembler(this.socketQ)
39
+ this.setListeners()
40
+ this.ackWindow = 0
41
+
42
+ // var _this = this
43
+ // setInterval(() => {
44
+ // var body = new wdi.RedPing({id: 0, time: new Date().getTime()}).marshall();
45
+ // _this.sendObject(body, wdi.SpiceVars.SPICE_MSGC_PONG);
46
+ // }, 60_00)
47
+ },
48
+
49
+ // startHandshakeTimeout: function () {
50
+ // var self = this
51
+ // this.handshakeTimeout = window.setTimeout(function () {
52
+ // var err = new Error('Handshake timeout')
53
+ // err.code = 4200
54
+ // wdi.Debug.error('Handshake timeout reached, raising error')
55
+ // self.fire('error', err)
56
+ // }, 5000)
57
+ // },
58
+
59
+ fireHandshakeTimeoutError: function () {
60
+ var err = new Error('Handshake timeout')
61
+ err.code = 4200
62
+ wdi.Debug.error('Handshake timeout reached, raising error')
63
+ this.fire('error', err)
64
+ },
65
+
66
+ // cancelHandshakeTimeout: function () {
67
+ // clearTimeout(this.handshakeTimeout)
68
+ // },
69
+
70
+ setListeners: function () {
71
+ var date
72
+ var self = this
73
+ this.packetReassembler.addListener(
74
+ 'packetComplete',
75
+ function (e) {
76
+ var rawMessage = e
77
+ if (rawMessage.status === 'spicePacket') {
78
+ wdi.Debug.log('packetComplete spicePacket')
79
+ // self.cancelHandshakeTimeout()
80
+ if (wdi.logOperations) {
81
+ wdi.DataLogger.logNetworkTime()
82
+ date = Date.now()
83
+ }
84
+ var rsm = this.getRawSpiceMessage(rawMessage.data)
85
+ if (rsm) {
86
+ if (
87
+ wdi.logOperations &&
88
+ rsm.channel === wdi.SpiceVars.SPICE_CHANNEL_DISPLAY
89
+ ) {
90
+ wdi.DataLogger.setStartTime(date)
91
+ }
92
+ this.fire('message', rsm)
93
+ }
94
+ } else if (rawMessage.status === 'reply') {
95
+ wdi.Debug.log('packetComplete reply')
96
+ var packet = this.getRedLinkReplyBytes(rawMessage.data)
97
+ this.send(packet)
98
+ } else if (rawMessage.status === 'errorCode') {
99
+ wdi.Debug.log('packetComplete errorCode')
100
+ var packet = this.getErrorCodeBytes(rawMessage.data)
101
+ if (packet) {
102
+ this.send(packet)
103
+ if (this.channel === wdi.SpiceVars.SPICE_CHANNEL_DISPLAY) {
104
+ // Custom code
105
+ // Set codec
106
+ // this.changeCodec(this.codec)
107
+ // Custom code end
108
+ }
109
+ }
110
+ this.fire('channelConnected')
111
+ } else {
112
+ self.fireHandshakeTimeoutError()
113
+ }
114
+ },
115
+ this
116
+ )
117
+
118
+ this.socketQ.addListener(
119
+ 'open',
120
+ function () {
121
+ var packet = this.getRedLinkMessBytes()
122
+ this.send(packet)
123
+ this.proxy ? this.proxy.end() : false
124
+ },
125
+ this
126
+ )
127
+
128
+ this.socketQ.addListener(
129
+ 'close',
130
+ function (e) {
131
+ if (this.channel === 1) {
132
+ this.fire('error', e)
133
+ }
134
+ this.socketQ.disconnect()
135
+ },
136
+ this
137
+ )
138
+
139
+ this.socketQ.addListener(
140
+ 'error',
141
+ function (e) {
142
+ this.fire('error', e)
143
+ this.socketQ.disconnect()
144
+ },
145
+ this
146
+ )
147
+ },
148
+
149
+ changeCodec: function (codec) {
150
+ this.sendObject(
151
+ [
152
+ ...wdi.SpiceObject.numberTo16(2),
153
+ ...wdi.SpiceObject.numberTo16(codec),
154
+ ...wdi.SpiceObject.numberTo16(3),
155
+ ],
156
+ wdi.SpiceVars.SPICE_MSGC_DISPLAY_PREFERRED_VIDEO_CODEC_TYPE
157
+ )
158
+
159
+ wdi.currentCodec = codec
160
+
161
+ console.log(`codec changed: ${codec}`)
162
+ },
163
+
164
+ connect: function (connectionInfo, channel, connectionId, proxy) {
165
+ var url = wdi.Utils.generateWebSocketUrl(
166
+ connectionInfo.protocol,
167
+ connectionInfo.host,
168
+ connectionInfo.port,
169
+ connectionInfo.vmHost,
170
+ connectionInfo.vmPort,
171
+ 'spice',
172
+ connectionInfo.vmInfoToken,
173
+ connectionInfo.vmid
174
+ )
175
+ this.channel = channel
176
+ this.connectionId = connectionId || 0
177
+ this.socketQ.connect(url)
178
+ // this.startHandshakeTimeout()
179
+ this.proxy = proxy
180
+ this.token = connectionInfo.token
181
+ this.packetReassembler.start()
182
+ },
183
+
184
+ disconnect: function () {
185
+ wdi.Debug.log('spicechannel disconnect')
186
+ this.counter = 0
187
+ this.ackWindow = 0
188
+ this.connectionId = 0
189
+ this.socketQ.disconnect()
190
+ this.socketQ = null
191
+ this.packetReassembler.dispose()
192
+ this.packetReassembler = null
193
+ this.channel = 1
194
+ this.proxy = null
195
+ this.token = null
196
+ },
197
+
198
+ send: function (data, flush) {
199
+ this.socketQ.send(data, flush)
200
+ },
201
+
202
+ sendObject: function (data, type, flush) {
203
+ // TODO: Unhardcode this value
204
+ var bufSize = 2048
205
+ for (var current = 0; current < data.length; current += bufSize) {
206
+ var part = data.slice(current, current + bufSize)
207
+ var packet = new wdi.SpiceDataHeader({
208
+ type: type,
209
+ size: part.length,
210
+ }).marshall()
211
+
212
+ packet = packet.concat(part)
213
+
214
+ this.send(packet, flush)
215
+ }
216
+ },
217
+
218
+ // Custom code
219
+ arrayOfNumberToUint32: function (arrayOfNumber) {
220
+ let v = 0
221
+ for (let n of arrayOfNumber) {
222
+ v |= 1 << n
223
+ }
224
+ return v
225
+ },
226
+ // Custom code end
227
+
228
+ setAckWindow: function (window) {
229
+ this.ackWindow = window
230
+ this.counter = 0
231
+ },
232
+
233
+ getRawSpiceMessage: function (rawData) {
234
+ var headerQueue = wdi.GlobalPool.create('ViewQueue')
235
+ var body = wdi.GlobalPool.create('ViewQueue')
236
+
237
+ var header = new Uint8Array(
238
+ rawData,
239
+ 0,
240
+ wdi.SpiceDataHeader.prototype.objectSize
241
+ )
242
+ headerQueue.setData(header)
243
+ var headerObj = new wdi.SpiceDataHeader().demarshall(headerQueue)
244
+ wdi.GlobalPool.discard('ViewQueue', headerQueue)
245
+ var rawBody = rawData.subarray(wdi.SpiceDataHeader.prototype.objectSize)
246
+ body.setData(rawBody)
247
+
248
+ this.counter++
249
+
250
+ if (this.ackWindow && this.counter === this.ackWindow) {
251
+ this.counter = 0
252
+ var ack = new wdi.SpiceDataHeader({
253
+ type: wdi.SpiceVars.SPICE_MSGC_ACK,
254
+ size: 0,
255
+ }).marshall()
256
+ this.send(ack)
257
+ }
258
+
259
+ var packet = wdi.PacketLinkFactory.extract(headerObj, body) || false
260
+ if (packet) {
261
+ wdi.PacketLinkProcess.process(headerObj, packet, this)
262
+ wdi.GlobalPool.discard('ViewQueue', body)
263
+ return false
264
+ } else {
265
+ var rawSpiceMessage = wdi.GlobalPool.create('RawSpiceMessage')
266
+ rawSpiceMessage.set(headerObj, body, this.channel)
267
+ return rawSpiceMessage
268
+ }
269
+ },
270
+
271
+ //This functions are to avoid hardcoded values on logic
272
+ getRedLinkReplyBytes: function (data) {
273
+ if (this.token) {
274
+ var newq = new wdi.ViewQueue()
275
+ newq.setData(data)
276
+ newq.eatBytes(wdi.SpiceLinkHeader.prototype.objectSize)
277
+ var myBody = new wdi.SpiceLinkReply().demarshall(newq)
278
+
279
+ // Custom code
280
+ const token = window.password || this.token
281
+ // Custom code end
282
+
283
+ //Returnnig void bytes or encrypted ticket
284
+ var key = wdi.SpiceObject.stringHexToBytes(
285
+ RSA_public_encrypt(token, myBody.pub_key)
286
+ )
287
+ return key
288
+ } else {
289
+ return wdi.SpiceObject.stringToBytesPadding('', 128)
290
+ }
291
+ },
292
+
293
+ getRedLinkMessBytes: function () {
294
+ // var header = new wdi.SpiceLinkHeader({magic:1363428690, major_version:2, minor_version:2, size:22}).marshall();
295
+ // var body = new wdi.SpiceLinkMess({
296
+ // connection_id:this.connectionId,
297
+ // channel_type:this.channel,
298
+ // caps_offset:18,
299
+ // num_common_caps: 1,
300
+ // num_channel_caps: 0,
301
+ // common_caps: (1 << wdi.SpiceVars.SPICE_COMMON_CAP_MINI_HEADER)
302
+ // }).marshall();
303
+
304
+ // Custom code
305
+ // TODO uncomment this code for send caps
306
+ var header = new wdi.SpiceLinkHeader({
307
+ magic: 1363428690,
308
+ major_version: 2,
309
+ minor_version: 2,
310
+ size: 26,
311
+ }).marshall()
312
+ var body = new wdi.SpiceLinkMess({
313
+ connection_id: this.connectionId,
314
+ channel_type: this.channel,
315
+ caps_offset: 18,
316
+ num_common_caps: 1,
317
+ num_channel_caps: 1,
318
+ common_caps: 1 << wdi.SpiceVars.SPICE_COMMON_CAP_MINI_HEADER,
319
+ channel_caps: this.arrayOfNumberToUint32([
320
+ wdi.SpiceDisplayCaps.SPICE_DISPLAY_CAP_SIZED_STREAM,
321
+ wdi.SpiceDisplayCaps.SPICE_DISPLAY_CAP_STREAM_REPORT,
322
+ wdi.SpiceDisplayCaps.SPICE_DISPLAY_CAP_MONITORS_CONFIG,
323
+
324
+ wdi.SpiceDisplayCaps.SPICE_DISPLAY_CAP_MULTI_CODEC,
325
+ wdi.SpiceDisplayCaps.SPICE_DISPLAY_CAP_PREF_VIDEO_CODEC_TYPE,
326
+ wdi.SpiceDisplayCaps.SPICE_DISPLAY_CAP_CODEC_MJPEG,
327
+ wdi.SpiceDisplayCaps.SPICE_DISPLAY_CAP_CODEC_VP8,
328
+ wdi.SpiceDisplayCaps.SPICE_DISPLAY_CAP_CODEC_H264,
329
+ wdi.SpiceDisplayCaps.SPICE_DISPLAY_CAP_CODEC_VP9,
330
+ wdi.SpiceDisplayCaps.SPICE_DISPLAY_CAP_CODEC_H265,
331
+
332
+ wdi.SpiceDisplayCaps.SPICE_DISPLAY_CAP_LZ4_COMPRESSION,
333
+ wdi.SpiceDisplayCaps.SPICE_DISPLAY_CAP_PREF_COMPRESSION,
334
+ ]),
335
+ }).marshall()
336
+ // Custom code end
337
+
338
+ return header.concat(body)
339
+ },
340
+
341
+ getErrorCodeBytes: function (data) {
342
+ var errorQ = wdi.GlobalPool.create('ViewQueue')
343
+ errorQ.setData(data)
344
+ var errorCode = wdi.SpiceObject.bytesToInt32NoAllocate(errorQ)
345
+ wdi.GlobalPool.discard('ViewQueue', errorQ)
346
+ if (errorCode === 0) {
347
+ if (this.channel === wdi.SpiceVars.SPICE_CHANNEL_DISPLAY) {
348
+ var redDisplayInit = new wdi.SpiceDataHeader({
349
+ type: wdi.SpiceVars.SPICE_MSGC_DISPLAY_INIT,
350
+ size: 14,
351
+ }).marshall()
352
+ //TODO: ultrahardcoded value here, move to configuration
353
+
354
+ //DUE To high level storage the memory specified for cache
355
+ //is 2-3 times bigger than expected.
356
+ var cache_size = 1
357
+
358
+ var body = new wdi.SpiceCDisplayInit({
359
+ pixmap_cache_id: 1,
360
+ pixmap_cache_size: cache_size,
361
+ glz_dictionary_id: 0,
362
+ glz_dictionary_window_size: 0,
363
+ }).marshall()
364
+
365
+ return redDisplayInit.concat(body)
366
+ } else if (this.channel == wdi.SpiceVars.SPICE_CHANNEL_MAIN) {
367
+ return new wdi.SpiceDataHeader({
368
+ type: wdi.SpiceVars.SPICE_MSGC_MAIN_ATTACH_CHANNELS,
369
+ size: 0,
370
+ }).marshall()
371
+ }
372
+ // Custom code
373
+ } else if (errorCode === 7) {
374
+ window.password = window.prompt('Enter the password')
375
+ // Custom code end
376
+ } else {
377
+ throw new wdi.Exception({
378
+ message: 'Server refused client',
379
+ errorCode: 2,
380
+ })
381
+ }
382
+ },
383
+ })