@hpcc-js/comms 2.68.0 → 2.72.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/dist/index.es6.js +331 -25
- package/dist/index.es6.js.map +1 -1
- package/dist/index.js +334 -25
- package/dist/index.js.map +1 -1
- package/dist/index.min.js +1 -1
- package/dist/index.min.js.map +1 -1
- package/dist/index.node.js +334 -25
- package/dist/index.node.js.map +1 -1
- package/dist/index.node.min.js +1 -1
- package/dist/index.node.min.js.map +1 -1
- package/lib-es6/__package__.js +2 -2
- package/lib-es6/__package__.js.map +1 -1
- package/lib-es6/ecl/machine.js +13 -3
- package/lib-es6/ecl/machine.js.map +1 -1
- package/lib-es6/ecl/targetCluster.js +4 -4
- package/lib-es6/ecl/targetCluster.js.map +1 -1
- package/lib-es6/ecl/workunit.js +3 -0
- package/lib-es6/ecl/workunit.js.map +1 -1
- package/lib-es6/index-common.js +3 -0
- package/lib-es6/index-common.js.map +1 -1
- package/lib-es6/services/wsAccess.js +11 -0
- package/lib-es6/services/wsAccess.js.map +1 -0
- package/lib-es6/services/wsDFU.js +1 -1
- package/lib-es6/services/wsDFU.js.map +1 -1
- package/lib-es6/services/wsLogaccess.js +11 -0
- package/lib-es6/services/wsLogaccess.js.map +1 -0
- package/lib-es6/services/wsMachine.js +12 -23
- package/lib-es6/services/wsMachine.js.map +1 -1
- package/lib-es6/services/wsResources.js +11 -0
- package/lib-es6/services/wsResources.js.map +1 -0
- package/lib-es6/services/wsdl/WsLogaccess/v1/WsLogaccess.js +28 -0
- package/lib-es6/services/wsdl/WsLogaccess/v1/WsLogaccess.js.map +1 -0
- package/lib-es6/services/wsdl/WsResources/v1.01/WsResources.js +20 -0
- package/lib-es6/services/wsdl/WsResources/v1.01/WsResources.js.map +1 -0
- package/lib-es6/services/wsdl/ws_access/v1.16/ws_access.js +203 -0
- package/lib-es6/services/wsdl/ws_access/v1.16/ws_access.js.map +1 -0
- package/lib-es6/services/wsdl/ws_machine/v1.17/ws_machine.js +41 -0
- package/lib-es6/services/wsdl/ws_machine/v1.17/ws_machine.js.map +1 -0
- package/package.json +20 -6
- package/src/__package__.ts +2 -2
- package/src/ecl/machine.ts +15 -13
- package/src/ecl/targetCluster.ts +10 -10
- package/src/ecl/workunit.ts +3 -0
- package/src/index-common.ts +3 -0
- package/src/services/wsAccess.ts +8 -0
- package/src/services/wsDFU.ts +3 -2
- package/src/services/wsLogaccess.ts +8 -0
- package/src/services/wsMachine.ts +17 -293
- package/src/services/wsResources.ts +8 -0
- package/src/services/wsdl/WsLogaccess/v1/WsLogaccess.ts +78 -0
- package/src/services/wsdl/WsResources/v1.01/WsResources.ts +119 -0
- package/src/services/wsdl/ws_access/v1.16/ws_access.ts +1086 -0
- package/src/services/wsdl/ws_machine/v1.17/ws_machine.ts +567 -0
- package/types/__package__.d.ts +2 -2
- package/types/__package__.d.ts.map +1 -1
- package/types/ecl/machine.d.ts +12 -10
- package/types/ecl/machine.d.ts.map +1 -1
- package/types/ecl/targetCluster.d.ts +6 -6
- package/types/ecl/targetCluster.d.ts.map +1 -1
- package/types/ecl/workunit.d.ts.map +1 -1
- package/types/index-common.d.ts +3 -0
- package/types/index-common.d.ts.map +1 -1
- package/types/services/wsAccess.d.ts +5 -0
- package/types/services/wsAccess.d.ts.map +1 -0
- package/types/services/wsDFU.d.ts +2 -1
- package/types/services/wsDFU.d.ts.map +1 -1
- package/types/services/wsLogaccess.d.ts +5 -0
- package/types/services/wsLogaccess.d.ts.map +1 -0
- package/types/services/wsMachine.d.ts +9 -235
- package/types/services/wsMachine.d.ts.map +1 -1
- package/types/services/wsResources.d.ts +5 -0
- package/types/services/wsResources.d.ts.map +1 -0
- package/types/services/wsdl/WsLogaccess/v1/WsLogaccess.d.ts +51 -0
- package/types/services/wsdl/WsLogaccess/v1/WsLogaccess.d.ts.map +1 -0
- package/types/services/wsdl/WsResources/v1.01/WsResources.d.ts +85 -0
- package/types/services/wsdl/WsResources/v1.01/WsResources.d.ts.map +1 -0
- package/types/services/wsdl/ws_access/v1.16/ws_access.d.ts +778 -0
- package/types/services/wsdl/ws_access/v1.16/ws_access.d.ts.map +1 -0
- package/types/services/wsdl/ws_machine/v1.17/ws_machine.d.ts +470 -0
- package/types/services/wsdl/ws_machine/v1.17/ws_machine.d.ts.map +1 -0
- package/types-3.4/__package__.d.ts +2 -2
- package/types-3.4/ecl/machine.d.ts +12 -10
- package/types-3.4/ecl/targetCluster.d.ts +6 -6
- package/types-3.4/index-common.d.ts +3 -0
- package/types-3.4/services/wsAccess.d.ts +5 -0
- package/types-3.4/services/wsDFU.d.ts +2 -1
- package/types-3.4/services/wsLogaccess.d.ts +5 -0
- package/types-3.4/services/wsMachine.d.ts +9 -235
- package/types-3.4/services/wsResources.d.ts +5 -0
- package/types-3.4/services/wsdl/WsLogaccess/v1/WsLogaccess.d.ts +51 -0
- package/types-3.4/services/wsdl/WsResources/v1.01/WsResources.d.ts +85 -0
- package/types-3.4/services/wsdl/ws_access/v1.16/ws_access.d.ts +778 -0
- package/types-3.4/services/wsdl/ws_machine/v1.17/ws_machine.d.ts +470 -0
|
@@ -0,0 +1,203 @@
|
|
|
1
|
+
import { __extends } from "tslib";
|
|
2
|
+
import { Service } from "../../../../espConnection";
|
|
3
|
+
export var ViewMemberType;
|
|
4
|
+
(function (ViewMemberType) {
|
|
5
|
+
ViewMemberType["User"] = "User";
|
|
6
|
+
ViewMemberType["Group"] = "Group";
|
|
7
|
+
})(ViewMemberType || (ViewMemberType = {}));
|
|
8
|
+
export var UserSortBy;
|
|
9
|
+
(function (UserSortBy) {
|
|
10
|
+
UserSortBy["Username"] = "Username";
|
|
11
|
+
UserSortBy["Fullname"] = "Fullname";
|
|
12
|
+
UserSortBy["Passwordexpiration"] = "Passwordexpiration";
|
|
13
|
+
UserSortBy["EmployeeID"] = "EmployeeID";
|
|
14
|
+
UserSortBy["EmployeeNumber"] = "EmployeeNumber";
|
|
15
|
+
})(UserSortBy || (UserSortBy = {}));
|
|
16
|
+
export var GroupSortBy;
|
|
17
|
+
(function (GroupSortBy) {
|
|
18
|
+
GroupSortBy["Name"] = "Name";
|
|
19
|
+
GroupSortBy["ManagedBy"] = "ManagedBy";
|
|
20
|
+
})(GroupSortBy || (GroupSortBy = {}));
|
|
21
|
+
export var AccountTypeReq;
|
|
22
|
+
(function (AccountTypeReq) {
|
|
23
|
+
AccountTypeReq["Any"] = "Any";
|
|
24
|
+
AccountTypeReq["User"] = "User";
|
|
25
|
+
AccountTypeReq["Group"] = "Group";
|
|
26
|
+
})(AccountTypeReq || (AccountTypeReq = {}));
|
|
27
|
+
export var ResourcePermissionSortBy;
|
|
28
|
+
(function (ResourcePermissionSortBy) {
|
|
29
|
+
ResourcePermissionSortBy["Name"] = "Name";
|
|
30
|
+
ResourcePermissionSortBy["Type"] = "Type";
|
|
31
|
+
})(ResourcePermissionSortBy || (ResourcePermissionSortBy = {}));
|
|
32
|
+
export var ResourceSortBy;
|
|
33
|
+
(function (ResourceSortBy) {
|
|
34
|
+
ResourceSortBy["Name"] = "Name";
|
|
35
|
+
})(ResourceSortBy || (ResourceSortBy = {}));
|
|
36
|
+
var AccessService = /** @class */ (function (_super) {
|
|
37
|
+
__extends(AccessService, _super);
|
|
38
|
+
function AccessService(optsConnection) {
|
|
39
|
+
return _super.call(this, optsConnection, "ws_access", "1.16") || this;
|
|
40
|
+
}
|
|
41
|
+
AccessService.prototype.AccountPermissions = function (request) {
|
|
42
|
+
return this._connection.send("AccountPermissions", request);
|
|
43
|
+
};
|
|
44
|
+
AccessService.prototype.AddUser = function (request) {
|
|
45
|
+
return this._connection.send("AddUser", request);
|
|
46
|
+
};
|
|
47
|
+
AccessService.prototype.AddView = function (request) {
|
|
48
|
+
return this._connection.send("AddView", request);
|
|
49
|
+
};
|
|
50
|
+
AccessService.prototype.AddViewColumn = function (request) {
|
|
51
|
+
return this._connection.send("AddViewColumn", request);
|
|
52
|
+
};
|
|
53
|
+
AccessService.prototype.AddViewMember = function (request) {
|
|
54
|
+
return this._connection.send("AddViewMember", request);
|
|
55
|
+
};
|
|
56
|
+
AccessService.prototype.ClearPermissionsCache = function (request) {
|
|
57
|
+
return this._connection.send("ClearPermissionsCache", request);
|
|
58
|
+
};
|
|
59
|
+
AccessService.prototype.DeleteView = function (request) {
|
|
60
|
+
return this._connection.send("DeleteView", request);
|
|
61
|
+
};
|
|
62
|
+
AccessService.prototype.DeleteViewColumn = function (request) {
|
|
63
|
+
return this._connection.send("DeleteViewColumn", request);
|
|
64
|
+
};
|
|
65
|
+
AccessService.prototype.DeleteViewMember = function (request) {
|
|
66
|
+
return this._connection.send("DeleteViewMember", request);
|
|
67
|
+
};
|
|
68
|
+
AccessService.prototype.DisableScopeScans = function (request) {
|
|
69
|
+
return this._connection.send("DisableScopeScans", request);
|
|
70
|
+
};
|
|
71
|
+
AccessService.prototype.EnableScopeScans = function (request) {
|
|
72
|
+
return this._connection.send("EnableScopeScans", request);
|
|
73
|
+
};
|
|
74
|
+
AccessService.prototype.FilePermission = function (request) {
|
|
75
|
+
return this._connection.send("FilePermission", request);
|
|
76
|
+
};
|
|
77
|
+
AccessService.prototype.GroupAction = function (request) {
|
|
78
|
+
return this._connection.send("GroupAction", request);
|
|
79
|
+
};
|
|
80
|
+
AccessService.prototype.GroupAdd = function (request) {
|
|
81
|
+
return this._connection.send("GroupAdd", request);
|
|
82
|
+
};
|
|
83
|
+
AccessService.prototype.GroupEdit = function (request) {
|
|
84
|
+
return this._connection.send("GroupEdit", request);
|
|
85
|
+
};
|
|
86
|
+
AccessService.prototype.GroupMemberEdit = function (request) {
|
|
87
|
+
return this._connection.send("GroupMemberEdit", request);
|
|
88
|
+
};
|
|
89
|
+
AccessService.prototype.GroupMemberEditInput = function (request) {
|
|
90
|
+
return this._connection.send("GroupMemberEditInput", request);
|
|
91
|
+
};
|
|
92
|
+
AccessService.prototype.GroupMemberQuery = function (request) {
|
|
93
|
+
return this._connection.send("GroupMemberQuery", request);
|
|
94
|
+
};
|
|
95
|
+
AccessService.prototype.GroupQuery = function (request) {
|
|
96
|
+
return this._connection.send("GroupQuery", request);
|
|
97
|
+
};
|
|
98
|
+
AccessService.prototype.Groups = function (request) {
|
|
99
|
+
return this._connection.send("Groups", request);
|
|
100
|
+
};
|
|
101
|
+
AccessService.prototype.PermissionAction = function (request) {
|
|
102
|
+
return this._connection.send("PermissionAction", request);
|
|
103
|
+
};
|
|
104
|
+
AccessService.prototype.PermissionAddInput = function (request) {
|
|
105
|
+
return this._connection.send("PermissionAddInput", request);
|
|
106
|
+
};
|
|
107
|
+
AccessService.prototype.Permissions = function (request) {
|
|
108
|
+
return this._connection.send("Permissions", request);
|
|
109
|
+
};
|
|
110
|
+
AccessService.prototype.PermissionsReset = function (request) {
|
|
111
|
+
return this._connection.send("PermissionsReset", request);
|
|
112
|
+
};
|
|
113
|
+
AccessService.prototype.PermissionsResetInput = function (request) {
|
|
114
|
+
return this._connection.send("PermissionsResetInput", request);
|
|
115
|
+
};
|
|
116
|
+
AccessService.prototype.Ping = function (request) {
|
|
117
|
+
return this._connection.send("Ping", request);
|
|
118
|
+
};
|
|
119
|
+
AccessService.prototype.QueryScopeScansEnabled = function (request) {
|
|
120
|
+
return this._connection.send("QueryScopeScansEnabled", request);
|
|
121
|
+
};
|
|
122
|
+
AccessService.prototype.QueryUserViewColumns = function (request) {
|
|
123
|
+
return this._connection.send("QueryUserViewColumns", request);
|
|
124
|
+
};
|
|
125
|
+
AccessService.prototype.QueryViewColumns = function (request) {
|
|
126
|
+
return this._connection.send("QueryViewColumns", request);
|
|
127
|
+
};
|
|
128
|
+
AccessService.prototype.QueryViewMembers = function (request) {
|
|
129
|
+
return this._connection.send("QueryViewMembers", request);
|
|
130
|
+
};
|
|
131
|
+
AccessService.prototype.QueryViews = function (request) {
|
|
132
|
+
return this._connection.send("QueryViews", request);
|
|
133
|
+
};
|
|
134
|
+
AccessService.prototype.ResourceAdd = function (request) {
|
|
135
|
+
return this._connection.send("ResourceAdd", request);
|
|
136
|
+
};
|
|
137
|
+
AccessService.prototype.ResourceAddInput = function (request) {
|
|
138
|
+
return this._connection.send("ResourceAddInput", request);
|
|
139
|
+
};
|
|
140
|
+
AccessService.prototype.ResourceDelete = function (request) {
|
|
141
|
+
return this._connection.send("ResourceDelete", request);
|
|
142
|
+
};
|
|
143
|
+
AccessService.prototype.ResourcePermissionQuery = function (request) {
|
|
144
|
+
return this._connection.send("ResourcePermissionQuery", request);
|
|
145
|
+
};
|
|
146
|
+
AccessService.prototype.ResourcePermissions = function (request) {
|
|
147
|
+
return this._connection.send("ResourcePermissions", request);
|
|
148
|
+
};
|
|
149
|
+
AccessService.prototype.ResourceQuery = function (request) {
|
|
150
|
+
return this._connection.send("ResourceQuery", request);
|
|
151
|
+
};
|
|
152
|
+
AccessService.prototype.Resources = function (request) {
|
|
153
|
+
return this._connection.send("Resources", request);
|
|
154
|
+
};
|
|
155
|
+
AccessService.prototype.UserAccountExport = function (request) {
|
|
156
|
+
return this._connection.send("UserAccountExport", request);
|
|
157
|
+
};
|
|
158
|
+
AccessService.prototype.UserAction = function (request) {
|
|
159
|
+
return this._connection.send("UserAction", request);
|
|
160
|
+
};
|
|
161
|
+
AccessService.prototype.UserEdit = function (request) {
|
|
162
|
+
return this._connection.send("UserEdit", request);
|
|
163
|
+
};
|
|
164
|
+
AccessService.prototype.UserGroupEdit = function (request) {
|
|
165
|
+
return this._connection.send("UserGroupEdit", request);
|
|
166
|
+
};
|
|
167
|
+
AccessService.prototype.UserGroupEditInput = function (request) {
|
|
168
|
+
return this._connection.send("UserGroupEditInput", request);
|
|
169
|
+
};
|
|
170
|
+
AccessService.prototype.UserInfoEdit = function (request) {
|
|
171
|
+
return this._connection.send("UserInfoEdit", request);
|
|
172
|
+
};
|
|
173
|
+
AccessService.prototype.UserInfoEditInput = function (request) {
|
|
174
|
+
return this._connection.send("UserInfoEditInput", request);
|
|
175
|
+
};
|
|
176
|
+
AccessService.prototype.UserPosix = function (request) {
|
|
177
|
+
return this._connection.send("UserPosix", request);
|
|
178
|
+
};
|
|
179
|
+
AccessService.prototype.UserPosixInput = function (request) {
|
|
180
|
+
return this._connection.send("UserPosixInput", request);
|
|
181
|
+
};
|
|
182
|
+
AccessService.prototype.UserQuery = function (request) {
|
|
183
|
+
return this._connection.send("UserQuery", request);
|
|
184
|
+
};
|
|
185
|
+
AccessService.prototype.UserResetPass = function (request) {
|
|
186
|
+
return this._connection.send("UserResetPass", request);
|
|
187
|
+
};
|
|
188
|
+
AccessService.prototype.UserResetPassInput = function (request) {
|
|
189
|
+
return this._connection.send("UserResetPassInput", request);
|
|
190
|
+
};
|
|
191
|
+
AccessService.prototype.UserSudoers = function (request) {
|
|
192
|
+
return this._connection.send("UserSudoers", request);
|
|
193
|
+
};
|
|
194
|
+
AccessService.prototype.UserSudoersInput = function (request) {
|
|
195
|
+
return this._connection.send("UserSudoersInput", request);
|
|
196
|
+
};
|
|
197
|
+
AccessService.prototype.Users = function (request) {
|
|
198
|
+
return this._connection.send("Users", request);
|
|
199
|
+
};
|
|
200
|
+
return AccessService;
|
|
201
|
+
}(Service));
|
|
202
|
+
export { AccessService };
|
|
203
|
+
//# sourceMappingURL=ws_access.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"ws_access.js","sourceRoot":"","sources":["../../../../../src/services/wsdl/ws_access/v1.16/ws_access.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,41 @@
|
|
|
1
|
+
import { __extends } from "tslib";
|
|
2
|
+
import { Service } from "../../../../espConnection";
|
|
3
|
+
var MachineService = /** @class */ (function (_super) {
|
|
4
|
+
__extends(MachineService, _super);
|
|
5
|
+
function MachineService(optsConnection) {
|
|
6
|
+
return _super.call(this, optsConnection, "ws_machine", "1.17") || this;
|
|
7
|
+
}
|
|
8
|
+
MachineService.prototype.GetComponentStatus = function (request) {
|
|
9
|
+
return this._connection.send("GetComponentStatus", request);
|
|
10
|
+
};
|
|
11
|
+
MachineService.prototype.GetComponentUsage = function (request) {
|
|
12
|
+
return this._connection.send("GetComponentUsage", request);
|
|
13
|
+
};
|
|
14
|
+
MachineService.prototype.GetMachineInfo = function (request) {
|
|
15
|
+
return this._connection.send("GetMachineInfo", request);
|
|
16
|
+
};
|
|
17
|
+
MachineService.prototype.GetMachineInfoEx = function (request) {
|
|
18
|
+
return this._connection.send("GetMachineInfoEx", request);
|
|
19
|
+
};
|
|
20
|
+
MachineService.prototype.GetMetrics = function (request) {
|
|
21
|
+
return this._connection.send("GetMetrics", request);
|
|
22
|
+
};
|
|
23
|
+
MachineService.prototype.GetNodeGroupUsage = function (request) {
|
|
24
|
+
return this._connection.send("GetNodeGroupUsage", request);
|
|
25
|
+
};
|
|
26
|
+
MachineService.prototype.GetTargetClusterInfo = function (request) {
|
|
27
|
+
return this._connection.send("GetTargetClusterInfo", request);
|
|
28
|
+
};
|
|
29
|
+
MachineService.prototype.GetTargetClusterUsage = function (request) {
|
|
30
|
+
return this._connection.send("GetTargetClusterUsage", request);
|
|
31
|
+
};
|
|
32
|
+
MachineService.prototype.Ping = function (request) {
|
|
33
|
+
return this._connection.send("Ping", request);
|
|
34
|
+
};
|
|
35
|
+
MachineService.prototype.UpdateComponentStatus = function (request) {
|
|
36
|
+
return this._connection.send("UpdateComponentStatus", request);
|
|
37
|
+
};
|
|
38
|
+
return MachineService;
|
|
39
|
+
}(Service));
|
|
40
|
+
export { MachineService };
|
|
41
|
+
//# sourceMappingURL=ws_machine.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"ws_machine.js","sourceRoot":"","sources":["../../../../../src/services/wsdl/ws_machine/v1.17/ws_machine.ts"],"names":[],"mappings":";AACA,OAAO,EAAE,OAAO,EAAE,MAAM,2BAA2B,CAAC;AAugBpD;IAAoC,kCAAO;IAEvC,wBAAY,cAAsC;eAC9C,kBAAM,cAAc,EAAE,YAAY,EAAE,MAAM,CAAC;IAC/C,CAAC;IAED,2CAAkB,GAAlB,UAAmB,OAA4C;QAC3D,OAAO,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,oBAAoB,EAAE,OAAO,CAAC,CAAC;IAChE,CAAC;IAED,0CAAiB,GAAjB,UAAkB,OAA2C;QACzD,OAAO,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,mBAAmB,EAAE,OAAO,CAAC,CAAC;IAC/D,CAAC;IAED,uCAAc,GAAd,UAAe,OAAwC;QACnD,OAAO,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,gBAAgB,EAAE,OAAO,CAAC,CAAC;IAC5D,CAAC;IAED,yCAAgB,GAAhB,UAAiB,OAA0C;QACvD,OAAO,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,kBAAkB,EAAE,OAAO,CAAC,CAAC;IAC9D,CAAC;IAED,mCAAU,GAAV,UAAW,OAAiC;QACxC,OAAO,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,YAAY,EAAE,OAAO,CAAC,CAAC;IACxD,CAAC;IAED,0CAAiB,GAAjB,UAAkB,OAA2C;QACzD,OAAO,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,mBAAmB,EAAE,OAAO,CAAC,CAAC;IAC/D,CAAC;IAED,6CAAoB,GAApB,UAAqB,OAA8C;QAC/D,OAAO,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,sBAAsB,EAAE,OAAO,CAAC,CAAC;IAClE,CAAC;IAED,8CAAqB,GAArB,UAAsB,OAA+C;QACjE,OAAO,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,uBAAuB,EAAE,OAAO,CAAC,CAAC;IACnE,CAAC;IAED,6BAAI,GAAJ,UAAK,OAAwC;QACzC,OAAO,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IAClD,CAAC;IAED,8CAAqB,GAArB,UAAsB,OAA+C;QACjE,OAAO,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,uBAAuB,EAAE,OAAO,CAAC,CAAC;IACnE,CAAC;IAEL,qBAAC;AAAD,CAAC,AA9CD,CAAoC,OAAO,GA8C1C"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@hpcc-js/comms",
|
|
3
|
-
"version": "2.
|
|
3
|
+
"version": "2.72.0",
|
|
4
4
|
"description": "hpcc-js - Communications",
|
|
5
5
|
"main": "dist/index.node.js",
|
|
6
6
|
"module": "dist/index.es6",
|
|
@@ -22,6 +22,7 @@
|
|
|
22
22
|
"compile-es6-watch": "npm run compile-es6 -- -w",
|
|
23
23
|
"compile-umd": "tsc --module umd --outDir ./lib-umd",
|
|
24
24
|
"compile-umd-watch": "npm run compile-umd -- -w",
|
|
25
|
+
"compile-util": "tsc --esModuleInterop --target es2019 --skipLibCheck --module commonjs --outDir ./lib-cjs ./utils/index.ts",
|
|
25
26
|
"bundle": "rollup -c",
|
|
26
27
|
"bundle-watch": "npm run bundle -- -w",
|
|
27
28
|
"minimize-browser": "terser dist/index.js -c -m --source-map \"content='dist/index.js.map',url='index.min.js.map'\" -o dist/index.min.js",
|
|
@@ -35,14 +36,26 @@
|
|
|
35
36
|
"lint-fix": "eslint --fix src/**/*.ts",
|
|
36
37
|
"test": "./node_modules/.bin/mocha lib-umd/__tests__ --reporter spec",
|
|
37
38
|
"docs": "typedoc --options tdoptions.json .",
|
|
38
|
-
"update": "npx npm-check-updates -u -t minor"
|
|
39
|
+
"update": "npx npm-check-updates -u -t minor",
|
|
40
|
+
"wsdl-access": "node ./lib-cjs/index.js --url=http://localhost:8010/ws_access?wsdl --outDir=./src/services/wsdl",
|
|
41
|
+
"wsdl-account": "node ./lib-cjs/index.js --url=http://localhost:8010/Ws_Account?wsdl --outDir=./src/services/wsdl",
|
|
42
|
+
"wsdl-codesign": "node ./lib-cjs/index.js --url=http://localhost:8010/ws_codesign?wsdl --outDir=./src/services/wsdl",
|
|
43
|
+
"wsdl-dfu": "node ./lib-cjs/index.js --url=http://localhost:8010/WsDfu?wsdl --outDir=./src/services/wsdl",
|
|
44
|
+
"wsdl-dfuxref": "node ./lib-cjs/index.js --url=http://localhost:8010/WsDFUXRef?wsdl --outDir=./src/services/wsdl",
|
|
45
|
+
"wsdl-logaccess": "node ./lib-cjs/index.js --url=http://localhost:8010/Ws_logaccess?wsdl --outDir=./src/services/wsdl",
|
|
46
|
+
"wsdl-machine": "node ./lib-cjs/index.js --url=http://localhost:8010/ws_machine?wsdl --outDir=./src/services/wsdl",
|
|
47
|
+
"wsdl-smc": "node ./lib-cjs/index.js --url=http://localhost:8010/WsSMC?wsdl --outDir=./src/services/wsdl",
|
|
48
|
+
"wsdl-store": "node ./lib-cjs/index.js --url=http://localhost:8010/WsStore?wsdl --outDir=./src/services/wsdl",
|
|
49
|
+
"wsdl-topology": "node ./lib-cjs/index.js --url=http://localhost:8010/WsTopology?wsdl --outDir=./src/services/wsdl",
|
|
50
|
+
"wsdl-workunits": "node ./lib-cjs/index.js --url=http://localhost:8010/WsWorkunits?wsdl --outDir=./src/services/wsdl",
|
|
51
|
+
"wsdl": "npm-run-all --serial compile-util --parallel wsdl-account wsdl-codesign wsdl-dfu wsdl-dfuxref wsdl-machine wsdl-smc wsdl-store wsdl-topology wsdl-workunits"
|
|
39
52
|
},
|
|
40
53
|
"dependencies": {
|
|
41
|
-
"@hpcc-js/ddl-shim": "^2.17.
|
|
42
|
-
"@hpcc-js/util": "^2.
|
|
54
|
+
"@hpcc-js/ddl-shim": "^2.17.25",
|
|
55
|
+
"@hpcc-js/util": "^2.45.0",
|
|
43
56
|
"@xmldom/xmldom": "0.7.2",
|
|
44
57
|
"abort-controller": "3.0.0",
|
|
45
|
-
"node-fetch": "
|
|
58
|
+
"node-fetch": "2.6.7",
|
|
46
59
|
"safe-buffer": "5.1.2",
|
|
47
60
|
"tmp": "0.0.33"
|
|
48
61
|
},
|
|
@@ -71,6 +84,7 @@
|
|
|
71
84
|
"rollup": "2.10.7",
|
|
72
85
|
"rollup-plugin-postcss": "3.1.1",
|
|
73
86
|
"rollup-plugin-sourcemaps": "0.6.2",
|
|
87
|
+
"soap": "0.43.0",
|
|
74
88
|
"terser": "4.0.0",
|
|
75
89
|
"tslib": "2.3.0",
|
|
76
90
|
"typedoc": "0.14.2",
|
|
@@ -88,5 +102,5 @@
|
|
|
88
102
|
"url": "https://github.com/hpcc-systems/Visualization/issues"
|
|
89
103
|
},
|
|
90
104
|
"homepage": "https://github.com/hpcc-systems/Visualization",
|
|
91
|
-
"gitHead": "
|
|
105
|
+
"gitHead": "ebc7a767b8dda09c177fba77fab1527bed6d306c"
|
|
92
106
|
}
|
package/src/__package__.ts
CHANGED
|
@@ -1,3 +1,3 @@
|
|
|
1
1
|
export const PKG_NAME = "@hpcc-js/comms";
|
|
2
|
-
export const PKG_VERSION = "2.
|
|
3
|
-
export const BUILD_VERSION = "2.
|
|
2
|
+
export const PKG_VERSION = "2.72.0";
|
|
3
|
+
export const BUILD_VERSION = "2.101.2";
|
package/src/ecl/machine.ts
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { Cache, StateObject } from "@hpcc-js/util";
|
|
2
2
|
import { IConnection, IOptions } from "../connection";
|
|
3
|
-
import {
|
|
3
|
+
import { WsMachine, MachineServiceEx } from "../services/wsMachine";
|
|
4
4
|
|
|
5
5
|
export class MachineCache extends Cache<{ Address: string }, Machine> {
|
|
6
6
|
constructor() {
|
|
@@ -11,11 +11,11 @@ export class MachineCache extends Cache<{ Address: string }, Machine> {
|
|
|
11
11
|
}
|
|
12
12
|
const _machines = new MachineCache();
|
|
13
13
|
|
|
14
|
-
export interface MachineInfoEx extends
|
|
14
|
+
export interface MachineInfoEx extends WsMachine.MachineInfoEx {
|
|
15
15
|
}
|
|
16
16
|
|
|
17
17
|
export class Machine extends StateObject<MachineInfoEx, MachineInfoEx> implements MachineInfoEx {
|
|
18
|
-
protected connection:
|
|
18
|
+
protected connection: MachineServiceEx;
|
|
19
19
|
|
|
20
20
|
get Address(): string { return this.get("Address"); }
|
|
21
21
|
get ConfigAddress(): string { return this.get("ConfigAddress"); }
|
|
@@ -33,14 +33,16 @@ export class Machine extends StateObject<MachineInfoEx, MachineInfoEx> implement
|
|
|
33
33
|
get RoxieStateDetails(): string { return this.get("RoxieStateDetails"); }
|
|
34
34
|
get OS(): number { return this.get("OS"); }
|
|
35
35
|
get ProcessNumber(): number { return this.get("ProcessNumber"); }
|
|
36
|
-
get
|
|
37
|
-
get
|
|
38
|
-
get
|
|
39
|
-
get
|
|
40
|
-
get
|
|
41
|
-
get
|
|
36
|
+
get Channels(): number { return this.get("Channels"); }
|
|
37
|
+
get Processors(): WsMachine.Processors { return this.get("Processors"); }
|
|
38
|
+
get Storage(): WsMachine.Storage { return this.get("Storage"); }
|
|
39
|
+
get Running(): WsMachine.Running { return this.get("Running"); }
|
|
40
|
+
get PhysicalMemory(): WsMachine.PhysicalMemory { return this.get("PhysicalMemory"); }
|
|
41
|
+
get VirtualMemory(): WsMachine.VirtualMemory { return this.get("VirtualMemory"); }
|
|
42
|
+
get ComponentInfo(): WsMachine.ComponentInfo { return this.get("ComponentInfo"); }
|
|
43
|
+
get Exception(): string { return this.get("Exception"); }
|
|
42
44
|
|
|
43
|
-
static attach(optsConnection: IOptions | IConnection |
|
|
45
|
+
static attach(optsConnection: IOptions | IConnection | MachineServiceEx, address: string, state?: WsMachine.MachineInfoEx): Machine {
|
|
44
46
|
const retVal: Machine = _machines.get({ Address: address }, () => {
|
|
45
47
|
return new Machine(optsConnection);
|
|
46
48
|
});
|
|
@@ -50,12 +52,12 @@ export class Machine extends StateObject<MachineInfoEx, MachineInfoEx> implement
|
|
|
50
52
|
return retVal;
|
|
51
53
|
}
|
|
52
54
|
|
|
53
|
-
private constructor(optsConnection: IOptions | IConnection |
|
|
55
|
+
private constructor(optsConnection: IOptions | IConnection | MachineServiceEx) {
|
|
54
56
|
super();
|
|
55
|
-
if (optsConnection instanceof
|
|
57
|
+
if (optsConnection instanceof MachineServiceEx) {
|
|
56
58
|
this.connection = optsConnection;
|
|
57
59
|
} else {
|
|
58
|
-
this.connection = new
|
|
60
|
+
this.connection = new MachineServiceEx(optsConnection);
|
|
59
61
|
}
|
|
60
62
|
}
|
|
61
63
|
}
|
package/src/ecl/targetCluster.ts
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { Cache, StateObject } from "@hpcc-js/util";
|
|
2
2
|
import { IConnection, IOptions } from "../connection";
|
|
3
|
-
import {
|
|
3
|
+
import { WsMachine, WsMachineEx, MachineServiceEx } from "../services/wsMachine";
|
|
4
4
|
import { TopologyService, TpListTargetClusters, TpTargetClusterQuery } from "../services/wsTopology";
|
|
5
5
|
import { Machine } from "./machine";
|
|
6
6
|
|
|
@@ -14,14 +14,14 @@ export class TargetClusterCache extends Cache<{ BaseUrl: string, Name: string },
|
|
|
14
14
|
const _targetCluster = new TargetClusterCache();
|
|
15
15
|
|
|
16
16
|
export interface TpTargetClusterEx {
|
|
17
|
-
MachineInfoEx:
|
|
17
|
+
MachineInfoEx: WsMachine.MachineInfoEx[];
|
|
18
18
|
}
|
|
19
19
|
|
|
20
20
|
export type UTargetClusterState = TpTargetClusterQuery.TpTargetCluster & TpListTargetClusters.TpClusterNameType & TpTargetClusterEx;
|
|
21
21
|
export type ITargetClusterState = TpTargetClusterQuery.TpTargetCluster | TpListTargetClusters.TpClusterNameType | TpTargetClusterEx;
|
|
22
22
|
export class TargetCluster extends StateObject<UTargetClusterState, ITargetClusterState> implements UTargetClusterState {
|
|
23
23
|
protected connection: TopologyService;
|
|
24
|
-
protected machineConnection:
|
|
24
|
+
protected machineConnection: MachineServiceEx;
|
|
25
25
|
get BaseUrl() { return this.connection.baseUrl; }
|
|
26
26
|
|
|
27
27
|
get Name(): string { return this.get("Name"); }
|
|
@@ -33,7 +33,7 @@ export class TargetCluster extends StateObject<UTargetClusterState, ITargetClust
|
|
|
33
33
|
get TpEclServers(): TpTargetClusterQuery.TpEclServers { return this.get("TpEclServers"); }
|
|
34
34
|
get TpEclAgents(): TpTargetClusterQuery.TpEclAgents { return this.get("TpEclAgents"); }
|
|
35
35
|
get TpEclSchedulers(): TpTargetClusterQuery.TpEclSchedulers { return this.get("TpEclSchedulers"); }
|
|
36
|
-
get MachineInfoEx():
|
|
36
|
+
get MachineInfoEx(): WsMachine.MachineInfoEx[] { return this.get("MachineInfoEx", []); }
|
|
37
37
|
get CMachineInfoEx(): Machine[] {
|
|
38
38
|
return this.MachineInfoEx.map(machineInfoEx => Machine.attach(this.machineConnection, machineInfoEx.Address, machineInfoEx));
|
|
39
39
|
}
|
|
@@ -54,24 +54,24 @@ export class TargetCluster extends StateObject<UTargetClusterState, ITargetClust
|
|
|
54
54
|
super();
|
|
55
55
|
if (optsConnection instanceof TopologyService) {
|
|
56
56
|
this.connection = optsConnection;
|
|
57
|
-
this.machineConnection = new
|
|
57
|
+
this.machineConnection = new MachineServiceEx(optsConnection.connectionOptions());
|
|
58
58
|
} else {
|
|
59
59
|
this.connection = new TopologyService(optsConnection);
|
|
60
|
-
this.machineConnection = new
|
|
60
|
+
this.machineConnection = new MachineServiceEx(optsConnection);
|
|
61
61
|
}
|
|
62
62
|
this.clear({
|
|
63
63
|
Name: name
|
|
64
64
|
});
|
|
65
65
|
}
|
|
66
66
|
|
|
67
|
-
fetchMachines(request:
|
|
67
|
+
fetchMachines(request: WsMachine.GetTargetClusterInfoRequest = {}): Promise<Machine[]> {
|
|
68
68
|
return this.machineConnection.GetTargetClusterInfo({
|
|
69
69
|
TargetClusters: {
|
|
70
70
|
Item: [`${this.Type}:${this.Name}`]
|
|
71
71
|
},
|
|
72
72
|
...request
|
|
73
73
|
}).then(response => {
|
|
74
|
-
const retVal:
|
|
74
|
+
const retVal: WsMachine.MachineInfoEx[] = [];
|
|
75
75
|
for (const machineInfo of response.TargetClusterInfoList.TargetClusterInfo) {
|
|
76
76
|
for (const machineInfoEx of machineInfo.Processes.MachineInfoEx) {
|
|
77
77
|
retVal.push(machineInfoEx);
|
|
@@ -102,8 +102,8 @@ export class TargetCluster extends StateObject<UTargetClusterState, ITargetClust
|
|
|
102
102
|
};
|
|
103
103
|
}
|
|
104
104
|
|
|
105
|
-
fetchUsage(): Promise<
|
|
106
|
-
return this.machineConnection.GetTargetClusterUsageEx([this.Name]);
|
|
105
|
+
fetchUsage(): Promise<WsMachineEx.TargetClusterUsage[]> {
|
|
106
|
+
return this.machineConnection.GetTargetClusterUsageEx({ TargetClusters: { Item: [this.Name] } });
|
|
107
107
|
}
|
|
108
108
|
}
|
|
109
109
|
|
package/src/ecl/workunit.ts
CHANGED
|
@@ -550,6 +550,9 @@ export class Workunit extends StateObject<UWorkunitState, IWorkunitState> implem
|
|
|
550
550
|
case "cnt":
|
|
551
551
|
props[scopeProperty.Name] = +scopeProperty.RawValue;
|
|
552
552
|
break;
|
|
553
|
+
case "cost":
|
|
554
|
+
props[scopeProperty.Name] = +scopeProperty.RawValue / 1000000;
|
|
555
|
+
break;
|
|
553
556
|
case "cpu":
|
|
554
557
|
case "skw":
|
|
555
558
|
case "node":
|
package/src/index-common.ts
CHANGED
|
@@ -1,11 +1,14 @@
|
|
|
1
1
|
export * from "./__package__";
|
|
2
2
|
|
|
3
|
+
export * from "./services/wsAccess";
|
|
3
4
|
export * from "./services/wsAccount";
|
|
4
5
|
export * from "./services/wsCodesign";
|
|
5
6
|
export * from "./services/wsDFU";
|
|
6
7
|
export * from "./services/wsDFUXRef";
|
|
7
8
|
export * from "./services/wsEcl";
|
|
9
|
+
export * from "./services/wsLogaccess";
|
|
8
10
|
export * from "./services/wsMachine";
|
|
11
|
+
export * from "./services/wsResources";
|
|
9
12
|
export * from "./services/wsSMC";
|
|
10
13
|
export * from "./services/wsStore";
|
|
11
14
|
export * from "./services/wsTopology";
|
package/src/services/wsDFU.ts
CHANGED
|
@@ -1555,7 +1555,8 @@ export namespace WsDfu {
|
|
|
1555
1555
|
KeyType: string;
|
|
1556
1556
|
NumOfSubfiles: number;
|
|
1557
1557
|
Accessed: string;
|
|
1558
|
-
|
|
1558
|
+
AtRestCost?: number;
|
|
1559
|
+
AccessCost?: number;
|
|
1559
1560
|
}
|
|
1560
1561
|
|
|
1561
1562
|
export interface Superfiles {
|
|
@@ -2821,7 +2822,7 @@ export namespace WsDfu {
|
|
|
2821
2822
|
export class DFUService extends Service {
|
|
2822
2823
|
|
|
2823
2824
|
constructor(optsConnection: IOptions | IConnection) {
|
|
2824
|
-
super(optsConnection, "WsDfu", "1.
|
|
2825
|
+
super(optsConnection, "WsDfu", "1.62");
|
|
2825
2826
|
}
|
|
2826
2827
|
|
|
2827
2828
|
DFUQuery(request: WsDfu.DFUQueryRequest): Promise<WsDfu.DFUQueryResponse> {
|