@hpcc-js/comms 2.82.2 → 2.82.3

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.
@@ -1,4 +1,4 @@
1
1
  export var PKG_NAME = "@hpcc-js/comms";
2
- export var PKG_VERSION = "2.82.2";
3
- export var BUILD_VERSION = "2.104.20";
2
+ export var PKG_VERSION = "2.82.3";
3
+ export var BUILD_VERSION = "2.104.21";
4
4
  //# sourceMappingURL=__package__.js.map
@@ -164,6 +164,27 @@ var Query = /** @class */ (function (_super) {
164
164
  });
165
165
  return retVal;
166
166
  };
167
+ Query.prototype.fetchDetails = function () {
168
+ return __awaiter(this, void 0, void 0, function () {
169
+ var queryDetails;
170
+ return __generator(this, function (_a) {
171
+ switch (_a.label) {
172
+ case 0: return [4 /*yield*/, this._wsWorkunits.WUQueryDetails({
173
+ QuerySet: this.QuerySet,
174
+ QueryId: this.QueryId,
175
+ IncludeStateOnClusters: false,
176
+ IncludeSuperFiles: false,
177
+ IncludeWsEclAddresses: false,
178
+ CheckAllNodes: false
179
+ })];
180
+ case 1:
181
+ queryDetails = _a.sent();
182
+ this.set(__assign({}, queryDetails));
183
+ return [2 /*return*/];
184
+ }
185
+ });
186
+ });
187
+ };
167
188
  Query.prototype.fetchRequestSchema = function () {
168
189
  return __awaiter(this, void 0, void 0, function () {
169
190
  var _a;
@@ -219,9 +240,16 @@ var Query = /** @class */ (function (_super) {
219
240
  };
220
241
  Query.prototype.refresh = function () {
221
242
  return __awaiter(this, void 0, void 0, function () {
222
- var _this = this;
223
243
  return __generator(this, function (_a) {
224
- return [2 /*return*/, this.fetchSchema().then(function (schema) { return _this; })];
244
+ switch (_a.label) {
245
+ case 0: return [4 /*yield*/, Promise.all([
246
+ this.fetchDetails(),
247
+ this.fetchSchema()
248
+ ])];
249
+ case 1:
250
+ _a.sent();
251
+ return [2 /*return*/, this];
252
+ }
225
253
  });
226
254
  });
227
255
  };
@@ -1 +1 @@
1
- {"version":3,"file":"query.js","sourceRoot":"","sources":["../../src/ecl/query.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"query.js","sourceRoot":"","sources":["../../src/ecl/query.ts"],"names":[],"mappings":"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"}
@@ -1,4 +1,4 @@
1
- import { __extends } from "tslib";
1
+ import { __awaiter, __extends, __generator } from "tslib";
2
2
  import { scopedLogger } from "@hpcc-js/util";
3
3
  import { LogaccessServiceBase, WsLogaccess } from "./wsdl/ws_logaccess/v1.04/ws_logaccess";
4
4
  var logger = scopedLogger("@hpcc-js/comms/services/wsLogaccess.ts");
@@ -72,134 +72,156 @@ var LogaccessService = /** @class */ (function (_super) {
72
72
  };
73
73
  LogaccessService.prototype.GetLogsEx = function (request) {
74
74
  var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k;
75
- var getLogsRequest = {
76
- Filter: {
77
- leftBinaryFilter: {
78
- BinaryLogFilter: [{
79
- leftFilter: {
80
- LogCategory: WsLogaccess.LogAccessType.All,
75
+ return __awaiter(this, void 0, void 0, function () {
76
+ var logInfo, getLogsRequest, filters, _loop_1, key, binaryLogFilter_1;
77
+ return __generator(this, function (_l) {
78
+ switch (_l.label) {
79
+ case 0: return [4 /*yield*/, this.GetLogAccessInfo()];
80
+ case 1:
81
+ logInfo = _l.sent();
82
+ getLogsRequest = {
83
+ Filter: {
84
+ leftBinaryFilter: {
85
+ BinaryLogFilter: [{
86
+ leftFilter: {
87
+ LogCategory: WsLogaccess.LogAccessType.All,
88
+ },
89
+ }]
90
+ }
81
91
  },
82
- }]
83
- }
84
- },
85
- Range: {
86
- StartDate: new Date(0).toISOString(),
87
- },
88
- LogLineStartFrom: (_a = request.LogLineStartFrom) !== null && _a !== void 0 ? _a : 0,
89
- LogLineLimit: (_b = request.LogLineLimit) !== null && _b !== void 0 ? _b : 100,
90
- SelectColumnMode: WsLogaccess.LogSelectColumnMode.DEFAULT,
91
- Format: "JSON"
92
- };
93
- var filters = [];
94
- var _loop_1 = function (key) {
95
- if (key in ElasticKnownColumns) {
96
- if (Array.isArray(request[key])) {
97
- request[key].forEach(function (value) {
98
- filters.push({
99
- LogCategory: WsLogaccess.LogAccessType.ByFieldName,
100
- SearchField: ElasticKnownColumns[key],
101
- SearchByValue: value
102
- });
103
- });
104
- }
105
- else {
106
- filters.push({
107
- LogCategory: WsLogaccess.LogAccessType.ByFieldName,
108
- SearchField: ElasticKnownColumns[key],
109
- SearchByValue: request[key]
110
- });
111
- }
112
- }
113
- };
114
- for (var key in request) {
115
- _loop_1(key);
116
- }
117
- if (filters.length > 2) {
118
- var binaryLogFilter_1 = getLogsRequest.Filter.leftBinaryFilter.BinaryLogFilter[0];
119
- filters.forEach(function (filter, i) {
120
- var operator = WsLogaccess.LogAccessFilterOperator.AND;
121
- if (i > 0) {
122
- if (filters[i - 1].SearchField === filter.SearchField) {
123
- operator = WsLogaccess.LogAccessFilterOperator.OR;
124
- }
125
- if (i === filters.length - 1) {
126
- binaryLogFilter_1.Operator = operator;
127
- binaryLogFilter_1.rightFilter = filter;
128
- }
129
- else {
130
- binaryLogFilter_1.Operator = operator;
131
- binaryLogFilter_1.rightBinaryFilter = {
132
- BinaryLogFilter: [{
133
- leftFilter: filter
134
- }]
92
+ Range: {
93
+ StartDate: new Date(0).toISOString(),
94
+ },
95
+ LogLineStartFrom: (_a = request.LogLineStartFrom) !== null && _a !== void 0 ? _a : 0,
96
+ LogLineLimit: (_b = request.LogLineLimit) !== null && _b !== void 0 ? _b : 100,
97
+ SelectColumnMode: WsLogaccess.LogSelectColumnMode.DEFAULT,
98
+ Format: "JSON"
135
99
  };
136
- binaryLogFilter_1 = binaryLogFilter_1.rightBinaryFilter.BinaryLogFilter[0];
137
- }
138
- }
139
- else {
140
- binaryLogFilter_1.leftFilter = filter;
100
+ filters = [];
101
+ _loop_1 = function (key) {
102
+ var searchField;
103
+ switch (logInfo.RemoteLogManagerType) {
104
+ case "azureloganalyticscurl":
105
+ if (key in AzureKnownColumns) {
106
+ searchField = AzureKnownColumns[key];
107
+ }
108
+ break;
109
+ case "elasticstack":
110
+ if (key in ElasticKnownColumns) {
111
+ searchField = ElasticKnownColumns[key];
112
+ }
113
+ break;
114
+ }
115
+ if (searchField) {
116
+ if (Array.isArray(request[key])) {
117
+ request[key].forEach(function (value) {
118
+ filters.push({
119
+ LogCategory: WsLogaccess.LogAccessType.ByFieldName,
120
+ SearchField: searchField,
121
+ SearchByValue: value
122
+ });
123
+ });
124
+ }
125
+ else {
126
+ filters.push({
127
+ LogCategory: WsLogaccess.LogAccessType.ByFieldName,
128
+ SearchField: searchField,
129
+ SearchByValue: request[key]
130
+ });
131
+ }
132
+ }
133
+ };
134
+ for (key in request) {
135
+ _loop_1(key);
136
+ }
137
+ if (filters.length > 2) {
138
+ binaryLogFilter_1 = getLogsRequest.Filter.leftBinaryFilter.BinaryLogFilter[0];
139
+ filters.forEach(function (filter, i) {
140
+ var operator = WsLogaccess.LogAccessFilterOperator.AND;
141
+ if (i > 0) {
142
+ if (filters[i - 1].SearchField === filter.SearchField) {
143
+ operator = WsLogaccess.LogAccessFilterOperator.OR;
144
+ }
145
+ if (i === filters.length - 1) {
146
+ binaryLogFilter_1.Operator = operator;
147
+ binaryLogFilter_1.rightFilter = filter;
148
+ }
149
+ else {
150
+ binaryLogFilter_1.Operator = operator;
151
+ binaryLogFilter_1.rightBinaryFilter = {
152
+ BinaryLogFilter: [{
153
+ leftFilter: filter
154
+ }]
155
+ };
156
+ binaryLogFilter_1 = binaryLogFilter_1.rightBinaryFilter.BinaryLogFilter[0];
157
+ }
158
+ }
159
+ else {
160
+ binaryLogFilter_1.leftFilter = filter;
161
+ }
162
+ });
163
+ }
164
+ else {
165
+ delete getLogsRequest.Filter.leftBinaryFilter;
166
+ getLogsRequest.Filter.leftFilter = {
167
+ LogCategory: WsLogaccess.LogAccessType.All
168
+ };
169
+ if ((_c = filters[0]) === null || _c === void 0 ? void 0 : _c.SearchField) {
170
+ getLogsRequest.Filter.leftFilter = {
171
+ LogCategory: (_d = filters[0]) === null || _d === void 0 ? void 0 : _d.LogCategory,
172
+ SearchField: (_e = filters[0]) === null || _e === void 0 ? void 0 : _e.SearchField,
173
+ SearchByValue: (_f = filters[0]) === null || _f === void 0 ? void 0 : _f.SearchByValue
174
+ };
175
+ }
176
+ if ((_g = filters[1]) === null || _g === void 0 ? void 0 : _g.SearchField) {
177
+ getLogsRequest.Filter.Operator = WsLogaccess.LogAccessFilterOperator.AND;
178
+ if (filters[0].SearchField === filters[1].SearchField) {
179
+ getLogsRequest.Filter.Operator = WsLogaccess.LogAccessFilterOperator.OR;
180
+ }
181
+ getLogsRequest.Filter.rightFilter = {
182
+ LogCategory: (_h = filters[0]) === null || _h === void 0 ? void 0 : _h.LogCategory,
183
+ SearchField: (_j = filters[1]) === null || _j === void 0 ? void 0 : _j.SearchField,
184
+ SearchByValue: (_k = filters[1]) === null || _k === void 0 ? void 0 : _k.SearchByValue
185
+ };
186
+ }
187
+ }
188
+ if (request.StartDate) {
189
+ getLogsRequest.Range.StartDate = request.StartDate.toISOString();
190
+ }
191
+ if (request.EndDate) {
192
+ getLogsRequest.Range.EndDate = request.EndDate.toISOString();
193
+ }
194
+ return [2 /*return*/, this.GetLogs(getLogsRequest).then(function (response) {
195
+ var _a, _b, _c, _d, _e;
196
+ try {
197
+ var logLines = JSON.parse(response.LogLines);
198
+ var lines = [];
199
+ switch (logInfo.RemoteLogManagerType) {
200
+ case "azureloganalyticscurl":
201
+ lines = (_b = (_a = logLines.lines) === null || _a === void 0 ? void 0 : _a.map(azureToLogLine)) !== null && _b !== void 0 ? _b : [];
202
+ break;
203
+ case "elasticstack":
204
+ lines = (_d = (_c = logLines.lines) === null || _c === void 0 ? void 0 : _c.map(elasticToLogLine)) !== null && _d !== void 0 ? _d : [];
205
+ break;
206
+ default:
207
+ logger.warning("Unknown RemoteLogManagerType: ".concat(logInfo.RemoteLogManagerType));
208
+ lines = [];
209
+ }
210
+ return {
211
+ lines: lines,
212
+ total: (_e = response.TotalLogLinesAvailable) !== null && _e !== void 0 ? _e : 10000
213
+ };
214
+ }
215
+ catch (e) {
216
+ logger.error(e);
217
+ }
218
+ return {
219
+ lines: [],
220
+ total: 0
221
+ };
222
+ })];
141
223
  }
142
224
  });
143
- }
144
- else {
145
- delete getLogsRequest.Filter.leftBinaryFilter;
146
- getLogsRequest.Filter.leftFilter = {
147
- LogCategory: WsLogaccess.LogAccessType.All
148
- };
149
- if ((_c = filters[0]) === null || _c === void 0 ? void 0 : _c.SearchField) {
150
- getLogsRequest.Filter.leftFilter = {
151
- LogCategory: (_d = filters[0]) === null || _d === void 0 ? void 0 : _d.LogCategory,
152
- SearchField: (_e = filters[0]) === null || _e === void 0 ? void 0 : _e.SearchField,
153
- SearchByValue: (_f = filters[0]) === null || _f === void 0 ? void 0 : _f.SearchByValue
154
- };
155
- }
156
- if ((_g = filters[1]) === null || _g === void 0 ? void 0 : _g.SearchField) {
157
- getLogsRequest.Filter.Operator = WsLogaccess.LogAccessFilterOperator.AND;
158
- if (filters[0].SearchField === filters[1].SearchField) {
159
- getLogsRequest.Filter.Operator = WsLogaccess.LogAccessFilterOperator.OR;
160
- }
161
- getLogsRequest.Filter.rightFilter = {
162
- LogCategory: (_h = filters[0]) === null || _h === void 0 ? void 0 : _h.LogCategory,
163
- SearchField: (_j = filters[1]) === null || _j === void 0 ? void 0 : _j.SearchField,
164
- SearchByValue: (_k = filters[1]) === null || _k === void 0 ? void 0 : _k.SearchByValue
165
- };
166
- }
167
- }
168
- if (request.StartDate) {
169
- getLogsRequest.Range.StartDate = request.StartDate.toISOString();
170
- }
171
- if (request.EndDate) {
172
- getLogsRequest.Range.EndDate = request.EndDate.toISOString();
173
- }
174
- return Promise.all([this.GetLogAccessInfo(), this.GetLogs(getLogsRequest)]).then(function (_a) {
175
- var _b, _c, _d, _e, _f;
176
- var info = _a[0], response = _a[1];
177
- try {
178
- var logLines = JSON.parse(response.LogLines);
179
- var lines = [];
180
- switch (info.RemoteLogManagerType) {
181
- case "azureloganalyticscurl":
182
- lines = (_c = (_b = logLines.lines) === null || _b === void 0 ? void 0 : _b.map(azureToLogLine)) !== null && _c !== void 0 ? _c : [];
183
- break;
184
- case "elasticstack":
185
- lines = (_e = (_d = logLines.lines) === null || _d === void 0 ? void 0 : _d.map(elasticToLogLine)) !== null && _e !== void 0 ? _e : [];
186
- break;
187
- default:
188
- logger.warning("Unknown RemoteLogManagerType: ".concat(info.RemoteLogManagerType));
189
- lines = [];
190
- }
191
- return {
192
- lines: lines,
193
- total: (_f = response.TotalLogLinesAvailable) !== null && _f !== void 0 ? _f : 10000
194
- };
195
- }
196
- catch (e) {
197
- logger.error(e);
198
- }
199
- return {
200
- lines: [],
201
- total: 0
202
- };
203
225
  });
204
226
  };
205
227
  return LogaccessService;
@@ -1 +1 @@
1
- {"version":3,"file":"wsLogaccess.js","sourceRoot":"","sources":["../../src/services/wsLogaccess.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"wsLogaccess.js","sourceRoot":"","sources":["../../src/services/wsLogaccess.ts"],"names":[],"mappings":"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"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@hpcc-js/comms",
3
- "version": "2.82.2",
3
+ "version": "2.82.3",
4
4
  "description": "hpcc-js - Communications",
5
5
  "main": "dist/index.node.js",
6
6
  "module": "dist/index.es6",
@@ -92,5 +92,5 @@
92
92
  "url": "https://github.com/hpcc-systems/Visualization/issues"
93
93
  },
94
94
  "homepage": "https://github.com/hpcc-systems/Visualization",
95
- "gitHead": "1047cde078892c7bdab933df61fb8862f8dff597"
95
+ "gitHead": "b7fc0219f8e29160d5aba7c8fac6826edc3569c5"
96
96
  }
@@ -1,3 +1,3 @@
1
1
  export const PKG_NAME = "@hpcc-js/comms";
2
- export const PKG_VERSION = "2.82.2";
3
- export const BUILD_VERSION = "2.104.20";
2
+ export const PKG_VERSION = "2.82.3";
3
+ export const BUILD_VERSION = "2.104.21";
package/src/ecl/query.ts CHANGED
@@ -76,6 +76,18 @@ export class Query extends StateObject<QueryEx, QueryEx> implements QueryEx {
76
76
  return retVal;
77
77
  }
78
78
 
79
+ private async fetchDetails(): Promise<void> {
80
+ const queryDetails = await this._wsWorkunits.WUQueryDetails({
81
+ QuerySet: this.QuerySet,
82
+ QueryId: this.QueryId,
83
+ IncludeStateOnClusters: false,
84
+ IncludeSuperFiles: false,
85
+ IncludeWsEclAddresses: false,
86
+ CheckAllNodes: false
87
+ });
88
+ this.set({ ...queryDetails } as QueryEx);
89
+ }
90
+
79
91
  private async fetchRequestSchema(): Promise<void> {
80
92
  this._requestSchema = await this.connection.requestJson(this.QuerySet, this.QueryId);
81
93
  }
@@ -102,7 +114,11 @@ export class Query extends StateObject<QueryEx, QueryEx> implements QueryEx {
102
114
  }
103
115
 
104
116
  async refresh(): Promise<this> {
105
- return this.fetchSchema().then(schema => this);
117
+ await Promise.all([
118
+ this.fetchDetails(),
119
+ this.fetchSchema()
120
+ ]);
121
+ return this;
106
122
  }
107
123
 
108
124
  requestFields(): IWsEclRequest {
@@ -126,7 +126,9 @@ export class LogaccessService extends LogaccessServiceBase {
126
126
  return super.GetLogs(request);
127
127
  }
128
128
 
129
- GetLogsEx(request: GetLogsExRequest): Promise<GetLogsExResponse> {
129
+ async GetLogsEx(request: GetLogsExRequest): Promise<GetLogsExResponse> {
130
+ const logInfo = await this.GetLogAccessInfo();
131
+
130
132
  const getLogsRequest: WsLogaccess.GetLogsRequest = {
131
133
  Filter: {
132
134
  leftBinaryFilter: {
@@ -148,23 +150,35 @@ export class LogaccessService extends LogaccessServiceBase {
148
150
 
149
151
  const filters: WsLogaccess.leftFilter[] = [];
150
152
  for (const key in request) {
151
- if (key in ElasticKnownColumns) {
153
+ let searchField;
154
+ switch (logInfo.RemoteLogManagerType) {
155
+ case "azureloganalyticscurl":
156
+ if (key in AzureKnownColumns) {
157
+ searchField = AzureKnownColumns[key];
158
+ }
159
+ break;
160
+ case "elasticstack":
161
+ if (key in ElasticKnownColumns) {
162
+ searchField = ElasticKnownColumns[key];
163
+ }
164
+ break;
165
+ }
166
+ if (searchField) {
152
167
  if (Array.isArray(request[key])) {
153
168
  request[key].forEach(value => {
154
169
  filters.push({
155
170
  LogCategory: WsLogaccess.LogAccessType.ByFieldName,
156
- SearchField: ElasticKnownColumns[key],
171
+ SearchField: searchField,
157
172
  SearchByValue: value
158
173
  });
159
174
  });
160
175
  } else {
161
176
  filters.push({
162
177
  LogCategory: WsLogaccess.LogAccessType.ByFieldName,
163
- SearchField: ElasticKnownColumns[key],
178
+ SearchField: searchField,
164
179
  SearchByValue: request[key]
165
180
  });
166
181
  }
167
-
168
182
  }
169
183
  }
170
184
 
@@ -224,11 +238,11 @@ export class LogaccessService extends LogaccessServiceBase {
224
238
  getLogsRequest.Range.EndDate = request.EndDate.toISOString();
225
239
  }
226
240
 
227
- return Promise.all([this.GetLogAccessInfo(), this.GetLogs(getLogsRequest)]).then(([info, response]) => {
241
+ return this.GetLogs(getLogsRequest).then(response => {
228
242
  try {
229
243
  const logLines = JSON.parse(response.LogLines);
230
244
  let lines = [];
231
- switch (info.RemoteLogManagerType) {
245
+ switch (logInfo.RemoteLogManagerType) {
232
246
  case "azureloganalyticscurl":
233
247
  lines = logLines.lines?.map(azureToLogLine) ?? [];
234
248
  break;
@@ -236,7 +250,7 @@ export class LogaccessService extends LogaccessServiceBase {
236
250
  lines = logLines.lines?.map(elasticToLogLine) ?? [];
237
251
  break;
238
252
  default:
239
- logger.warning(`Unknown RemoteLogManagerType: ${info.RemoteLogManagerType}`);
253
+ logger.warning(`Unknown RemoteLogManagerType: ${logInfo.RemoteLogManagerType}`);
240
254
  lines = [];
241
255
  }
242
256
  return {
@@ -1,4 +1,4 @@
1
1
  export declare const PKG_NAME = "@hpcc-js/comms";
2
- export declare const PKG_VERSION = "2.82.2";
3
- export declare const BUILD_VERSION = "2.104.20";
2
+ export declare const PKG_VERSION = "2.82.3";
3
+ export declare const BUILD_VERSION = "2.104.21";
4
4
  //# sourceMappingURL=__package__.d.ts.map
@@ -38,6 +38,7 @@ export declare class Query extends StateObject<QueryEx, QueryEx> implements Quer
38
38
  get WUTimers(): WUQueryDetails.WUTimers;
39
39
  private constructor();
40
40
  static attach(optsConnection: IOptions | IConnection, querySet: string, queryId: string): Query;
41
+ private fetchDetails;
41
42
  private fetchRequestSchema;
42
43
  private fetchResponseSchema;
43
44
  private fetchSchema;
@@ -1 +1 @@
1
- {"version":3,"file":"query.d.ts","sourceRoot":"","sources":["../../src/ecl/query.ts"],"names":[],"mappings":"AAAA,OAAO,EAAS,WAAW,EAAE,MAAM,eAAe,CAAC;AACnD,OAAO,EAAE,WAAW,EAAE,QAAQ,EAAE,MAAM,eAAe,CAAC;AACtD,OAAO,EAAE,UAAU,EAAE,aAAa,EAAE,cAAc,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAC;AAC5F,OAAO,EAAE,gBAAgB,EAAE,cAAc,EAAE,MAAM,yBAAyB,CAAC;AAE3E,MAAM,WAAW,OAAQ,SAAQ,cAAc,CAAC,QAAQ;IACpD,OAAO,EAAE,MAAM,CAAC;CACnB;AAWD,qBAAa,KAAM,SAAQ,WAAW,CAAC,OAAO,EAAE,OAAO,CAAE,YAAW,OAAO;IACvE,SAAS,CAAC,UAAU,EAAE,UAAU,CAAC;IACjC,IAAI,OAAO,WAAsC;IAEjD,SAAS,CAAC,YAAY,EAAE,gBAAgB,CAAC;IAEzC,SAAS,CAAC,cAAc,EAAE,aAAa,CAAC;IACxC,SAAS,CAAC,eAAe,EAAE,cAAc,CAAC;IAE1C,IAAI,UAAU,IAAI,cAAc,CAAC,QAAQ,CAAuB;IAChE,IAAI,UAAU,IAAI,cAAc,CAAC,UAAU,CAAmC;IAC9E,IAAI,OAAO,IAAI,MAAM,CAAgC;IACrD,IAAI,QAAQ,IAAI,MAAM,CAAiC;IACvD,IAAI,SAAS,IAAI,MAAM,CAAkC;IACzD,IAAI,IAAI,IAAI,MAAM,CAA6B;IAC/C,IAAI,GAAG,IAAI,MAAM,CAA4B;IAC7C,IAAI,SAAS,IAAI,OAAO,CAAkC;IAC1D,IAAI,SAAS,IAAI,OAAO,CAAkC;IAC1D,IAAI,WAAW,IAAI,MAAM,CAAoC;IAC7D,IAAI,QAAQ,IAAI,cAAc,CAAC,QAAQ,CAAiC;IACxE,IAAI,WAAW,IAAI,MAAM,CAAoC;IAC7D,IAAI,OAAO,WAAkC;IAC7C,IAAI,YAAY,IAAI,cAAc,CAAC,YAAY,CAAqC;IACpF,IAAI,UAAU,IAAI,cAAc,CAAC,UAAU,CAAmC;IAC9E,IAAI,SAAS,IAAI,OAAO,CAAkC;IAC1D,IAAI,QAAQ,IAAI,MAAM,CAAiC;IACvD,IAAI,UAAU,IAAI,MAAM,CAAmC;IAC3D,IAAI,WAAW,IAAI,MAAM,CAAoC;IAC7D,IAAI,aAAa,IAAI,cAAc,CAAC,aAAa,CAAsC;IACvF,IAAI,WAAW,IAAI,MAAM,CAAoC;IAC7D,IAAI,gBAAgB,IAAI,MAAM,CAAyC;IACvE,IAAI,cAAc,IAAI,cAAc,CAAC,cAAc,CAAuC;IAC1F,IAAI,QAAQ,IAAI,cAAc,CAAC,QAAQ,CAAiC;IACxE,IAAI,QAAQ,IAAI,cAAc,CAAC,QAAQ,CAAiC;IAExE,OAAO;IAkBP,MAAM,CAAC,MAAM,CAAC,cAAc,EAAE,QAAQ,GAAG,WAAW,EAAE,QAAQ,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,GAAG,KAAK;YAOjF,kBAAkB;YAIlB,mBAAmB;YAInB,WAAW;IAIzB,iBAAiB;IAIjB,MAAM,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,KAAK,CAAC;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,EAAE,CAAA;KAAE,CAAC,CAAC;IAS9D,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC;IAI9B,aAAa,IAAI,aAAa;IAK9B,cAAc,IAAI,cAAc;IAKhC,WAAW,IAAI,MAAM,EAAE;IAQvB,YAAY,CAAC,UAAU,EAAE,MAAM,GAAG,YAAY;CAkBjD"}
1
+ {"version":3,"file":"query.d.ts","sourceRoot":"","sources":["../../src/ecl/query.ts"],"names":[],"mappings":"AAAA,OAAO,EAAS,WAAW,EAAE,MAAM,eAAe,CAAC;AACnD,OAAO,EAAE,WAAW,EAAE,QAAQ,EAAE,MAAM,eAAe,CAAC;AACtD,OAAO,EAAE,UAAU,EAAE,aAAa,EAAE,cAAc,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAC;AAC5F,OAAO,EAAE,gBAAgB,EAAE,cAAc,EAAE,MAAM,yBAAyB,CAAC;AAE3E,MAAM,WAAW,OAAQ,SAAQ,cAAc,CAAC,QAAQ;IACpD,OAAO,EAAE,MAAM,CAAC;CACnB;AAWD,qBAAa,KAAM,SAAQ,WAAW,CAAC,OAAO,EAAE,OAAO,CAAE,YAAW,OAAO;IACvE,SAAS,CAAC,UAAU,EAAE,UAAU,CAAC;IACjC,IAAI,OAAO,WAAsC;IAEjD,SAAS,CAAC,YAAY,EAAE,gBAAgB,CAAC;IAEzC,SAAS,CAAC,cAAc,EAAE,aAAa,CAAC;IACxC,SAAS,CAAC,eAAe,EAAE,cAAc,CAAC;IAE1C,IAAI,UAAU,IAAI,cAAc,CAAC,QAAQ,CAAuB;IAChE,IAAI,UAAU,IAAI,cAAc,CAAC,UAAU,CAAmC;IAC9E,IAAI,OAAO,IAAI,MAAM,CAAgC;IACrD,IAAI,QAAQ,IAAI,MAAM,CAAiC;IACvD,IAAI,SAAS,IAAI,MAAM,CAAkC;IACzD,IAAI,IAAI,IAAI,MAAM,CAA6B;IAC/C,IAAI,GAAG,IAAI,MAAM,CAA4B;IAC7C,IAAI,SAAS,IAAI,OAAO,CAAkC;IAC1D,IAAI,SAAS,IAAI,OAAO,CAAkC;IAC1D,IAAI,WAAW,IAAI,MAAM,CAAoC;IAC7D,IAAI,QAAQ,IAAI,cAAc,CAAC,QAAQ,CAAiC;IACxE,IAAI,WAAW,IAAI,MAAM,CAAoC;IAC7D,IAAI,OAAO,WAAkC;IAC7C,IAAI,YAAY,IAAI,cAAc,CAAC,YAAY,CAAqC;IACpF,IAAI,UAAU,IAAI,cAAc,CAAC,UAAU,CAAmC;IAC9E,IAAI,SAAS,IAAI,OAAO,CAAkC;IAC1D,IAAI,QAAQ,IAAI,MAAM,CAAiC;IACvD,IAAI,UAAU,IAAI,MAAM,CAAmC;IAC3D,IAAI,WAAW,IAAI,MAAM,CAAoC;IAC7D,IAAI,aAAa,IAAI,cAAc,CAAC,aAAa,CAAsC;IACvF,IAAI,WAAW,IAAI,MAAM,CAAoC;IAC7D,IAAI,gBAAgB,IAAI,MAAM,CAAyC;IACvE,IAAI,cAAc,IAAI,cAAc,CAAC,cAAc,CAAuC;IAC1F,IAAI,QAAQ,IAAI,cAAc,CAAC,QAAQ,CAAiC;IACxE,IAAI,QAAQ,IAAI,cAAc,CAAC,QAAQ,CAAiC;IAExE,OAAO;IAkBP,MAAM,CAAC,MAAM,CAAC,cAAc,EAAE,QAAQ,GAAG,WAAW,EAAE,QAAQ,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,GAAG,KAAK;YAOjF,YAAY;YAYZ,kBAAkB;YAIlB,mBAAmB;YAInB,WAAW;IAIzB,iBAAiB;IAIjB,MAAM,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,KAAK,CAAC;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,EAAE,CAAA;KAAE,CAAC,CAAC;IAS9D,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC;IAQ9B,aAAa,IAAI,aAAa;IAK9B,cAAc,IAAI,cAAc;IAKhC,WAAW,IAAI,MAAM,EAAE;IAQvB,YAAY,CAAC,UAAU,EAAE,MAAM,GAAG,YAAY;CAkBjD"}
@@ -1 +1 @@
1
- {"version":3,"file":"wsLogaccess.d.ts","sourceRoot":"","sources":["../../src/services/wsLogaccess.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,oBAAoB,EAAE,WAAW,EAAE,MAAM,wCAAwC,CAAC;AAI3F,OAAO,EACH,WAAW,EACd,CAAC;AAEF,MAAM,WAAW,gBAAgB;IAC7B,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,KAAK,CAAC,EAAE,MAAM,EAAE,CAAC;IACjB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,SAAS,CAAC,EAAE,IAAI,CAAC;IACjB,OAAO,CAAC,EAAE,IAAI,CAAC;IACf,gBAAgB,EAAE,MAAM,CAAC;IACzB,YAAY,EAAE,MAAM,CAAA;CACvB;AAED,0BAAkB,OAAO;IACrB,QAAQ,QAAQ;IAChB,KAAK,QAAQ;IACb,OAAO,QAAQ;IACf,WAAW,QAAQ;IACnB,QAAQ,QAAQ;IAChB,MAAM,QAAQ;CACjB;AAED,0BAAkB,cAAc;IAC5B,QAAQ,QAAQ;IAChB,IAAI,QAAQ;IACZ,UAAU,QAAQ;IAClB,KAAK,QAAQ;CAChB;AAED,MAAM,WAAW,OAAO;IACpB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,aAAa,CAAC,EAAE,MAAM,CAAC;CAC1B;AAyDD,MAAM,WAAW,iBAAiB;IAC9B,KAAK,EAAE,OAAO,EAAE,CAAC;IACjB,KAAK,EAAE,MAAM,CAAC;CACjB;AAED,qBAAa,gBAAiB,SAAQ,oBAAoB;IAEtD,SAAS,CAAC,cAAc,EAAE,OAAO,CAAC,WAAW,CAAC,wBAAwB,CAAC,CAAC;IAExE,gBAAgB,CAAC,OAAO,GAAE,WAAW,CAAC,uBAA4B,GAAG,OAAO,CAAC,WAAW,CAAC,wBAAwB,CAAC;IAOlH,OAAO,CAAC,OAAO,EAAE,WAAW,CAAC,cAAc,GAAG,OAAO,CAAC,WAAW,CAAC,eAAe,CAAC;IAIlF,SAAS,CAAC,OAAO,EAAE,gBAAgB,GAAG,OAAO,CAAC,iBAAiB,CAAC;CA8HnE"}
1
+ {"version":3,"file":"wsLogaccess.d.ts","sourceRoot":"","sources":["../../src/services/wsLogaccess.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,oBAAoB,EAAE,WAAW,EAAE,MAAM,wCAAwC,CAAC;AAI3F,OAAO,EACH,WAAW,EACd,CAAC;AAEF,MAAM,WAAW,gBAAgB;IAC7B,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,KAAK,CAAC,EAAE,MAAM,EAAE,CAAC;IACjB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,SAAS,CAAC,EAAE,IAAI,CAAC;IACjB,OAAO,CAAC,EAAE,IAAI,CAAC;IACf,gBAAgB,EAAE,MAAM,CAAC;IACzB,YAAY,EAAE,MAAM,CAAA;CACvB;AAED,0BAAkB,OAAO;IACrB,QAAQ,QAAQ;IAChB,KAAK,QAAQ;IACb,OAAO,QAAQ;IACf,WAAW,QAAQ;IACnB,QAAQ,QAAQ;IAChB,MAAM,QAAQ;CACjB;AAED,0BAAkB,cAAc;IAC5B,QAAQ,QAAQ;IAChB,IAAI,QAAQ;IACZ,UAAU,QAAQ;IAClB,KAAK,QAAQ;CAChB;AAED,MAAM,WAAW,OAAO;IACpB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,aAAa,CAAC,EAAE,MAAM,CAAC;CAC1B;AAyDD,MAAM,WAAW,iBAAiB;IAC9B,KAAK,EAAE,OAAO,EAAE,CAAC;IACjB,KAAK,EAAE,MAAM,CAAC;CACjB;AAED,qBAAa,gBAAiB,SAAQ,oBAAoB;IAEtD,SAAS,CAAC,cAAc,EAAE,OAAO,CAAC,WAAW,CAAC,wBAAwB,CAAC,CAAC;IAExE,gBAAgB,CAAC,OAAO,GAAE,WAAW,CAAC,uBAA4B,GAAG,OAAO,CAAC,WAAW,CAAC,wBAAwB,CAAC;IAOlH,OAAO,CAAC,OAAO,EAAE,WAAW,CAAC,cAAc,GAAG,OAAO,CAAC,WAAW,CAAC,eAAe,CAAC;IAI5E,SAAS,CAAC,OAAO,EAAE,gBAAgB,GAAG,OAAO,CAAC,iBAAiB,CAAC;CA4IzE"}
@@ -1,4 +1,4 @@
1
1
  export declare const PKG_NAME = "@hpcc-js/comms";
2
- export declare const PKG_VERSION = "2.82.2";
3
- export declare const BUILD_VERSION = "2.104.20";
2
+ export declare const PKG_VERSION = "2.82.3";
3
+ export declare const BUILD_VERSION = "2.104.21";
4
4
  //# sourceMappingURL=__package__.d.ts.map
@@ -38,6 +38,7 @@ export declare class Query extends StateObject<QueryEx, QueryEx> implements Quer
38
38
  readonly WUTimers: WUQueryDetails.WUTimers;
39
39
  private constructor();
40
40
  static attach(optsConnection: IOptions | IConnection, querySet: string, queryId: string): Query;
41
+ private fetchDetails;
41
42
  private fetchRequestSchema;
42
43
  private fetchResponseSchema;
43
44
  private fetchSchema;