@hpcc-js/comms 2.83.0 → 2.83.1

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.83.0";
3
- export var BUILD_VERSION = "2.104.22";
2
+ export var PKG_VERSION = "2.83.1";
3
+ export var BUILD_VERSION = "2.104.23";
4
4
  //# sourceMappingURL=__package__.js.map
@@ -1,7 +1,9 @@
1
1
  import { __assign, __awaiter, __extends, __generator } from "tslib";
2
- import { Cache, StateObject } from "@hpcc-js/util";
2
+ import { Cache, StateObject, scopedLogger } from "@hpcc-js/util";
3
3
  import { EclService } from "../services/wsEcl";
4
4
  import { WorkunitsService } from "../services/wsWorkunits";
5
+ import { Topology } from "./topology";
6
+ var logger = scopedLogger("@hpcc-js/comms/ecl/query.ts");
5
7
  var QueryCache = /** @class */ (function (_super) {
6
8
  __extends(QueryCache, _super);
7
9
  function QueryCache() {
@@ -16,20 +18,18 @@ var Query = /** @class */ (function (_super) {
16
18
  __extends(Query, _super);
17
19
  function Query(optsConnection, querySet, queryID, queryDetails) {
18
20
  var _this = _super.call(this) || this;
19
- if (optsConnection instanceof EclService) {
20
- _this.connection = optsConnection;
21
- // this._topology = new Topology(this.connection.opts());
21
+ if (optsConnection instanceof WorkunitsService) {
22
+ _this.wsWorkunitsService = optsConnection;
22
23
  }
23
24
  else {
24
- _this.connection = new EclService(optsConnection);
25
- // this._topology = new Topology(optsConnection);
25
+ _this.wsWorkunitsService = new WorkunitsService(optsConnection);
26
26
  }
27
- _this._wsWorkunits = new WorkunitsService(optsConnection);
27
+ _this.topology = Topology.attach(_this.wsWorkunitsService.opts());
28
28
  _this.set(__assign({ QuerySet: querySet, QueryId: queryID }, queryDetails));
29
29
  return _this;
30
30
  }
31
31
  Object.defineProperty(Query.prototype, "BaseUrl", {
32
- get: function () { return this.connection.baseUrl; },
32
+ get: function () { return this.wsWorkunitsService.baseUrl; },
33
33
  enumerable: false,
34
34
  configurable: true
35
35
  });
@@ -164,17 +164,40 @@ var Query = /** @class */ (function (_super) {
164
164
  });
165
165
  return retVal;
166
166
  };
167
+ Query.prototype.wsEclService = function () {
168
+ return __awaiter(this, void 0, void 0, function () {
169
+ return __generator(this, function (_a) {
170
+ if (!this._eclService) {
171
+ this._eclService = this.topology.fetchServices({}).then(function (services) {
172
+ var _a, _b, _c, _d;
173
+ for (var _i = 0, _e = (_b = (_a = services === null || services === void 0 ? void 0 : services.TpEspServers) === null || _a === void 0 ? void 0 : _a.TpEspServer) !== null && _b !== void 0 ? _b : []; _i < _e.length; _i++) {
174
+ var espServer = _e[_i];
175
+ for (var _f = 0, _g = (_d = (_c = espServer === null || espServer === void 0 ? void 0 : espServer.TpBindings) === null || _c === void 0 ? void 0 : _c.TpBinding) !== null && _d !== void 0 ? _d : []; _f < _g.length; _f++) {
176
+ var binding = _g[_f];
177
+ if ((binding === null || binding === void 0 ? void 0 : binding.Service) === "ws_ecl") {
178
+ var baseUrl = "".concat(binding.Protocol, "://").concat(globalThis.location.hostname, ":").concat(binding.Port);
179
+ return new EclService({ baseUrl: baseUrl });
180
+ }
181
+ }
182
+ }
183
+ return undefined;
184
+ });
185
+ }
186
+ return [2 /*return*/, this._eclService];
187
+ });
188
+ });
189
+ };
167
190
  Query.prototype.fetchDetails = function () {
168
191
  return __awaiter(this, void 0, void 0, function () {
169
192
  var queryDetails;
170
193
  return __generator(this, function (_a) {
171
194
  switch (_a.label) {
172
- case 0: return [4 /*yield*/, this._wsWorkunits.WUQueryDetails({
195
+ case 0: return [4 /*yield*/, this.wsWorkunitsService.WUQueryDetails({
173
196
  QuerySet: this.QuerySet,
174
197
  QueryId: this.QueryId,
175
- IncludeStateOnClusters: false,
176
- IncludeSuperFiles: false,
177
- IncludeWsEclAddresses: false,
198
+ IncludeStateOnClusters: true,
199
+ IncludeSuperFiles: true,
200
+ IncludeWsEclAddresses: true,
178
201
  CheckAllNodes: false
179
202
  })];
180
203
  case 1:
@@ -186,31 +209,57 @@ var Query = /** @class */ (function (_super) {
186
209
  });
187
210
  };
188
211
  Query.prototype.fetchRequestSchema = function () {
212
+ var _a;
189
213
  return __awaiter(this, void 0, void 0, function () {
190
- var _a;
191
- return __generator(this, function (_b) {
192
- switch (_b.label) {
193
- case 0:
194
- _a = this;
195
- return [4 /*yield*/, this.connection.requestJson(this.QuerySet, this.QueryId)];
214
+ var wsEclService, _b, e_1;
215
+ return __generator(this, function (_c) {
216
+ switch (_c.label) {
217
+ case 0: return [4 /*yield*/, this.wsEclService()];
196
218
  case 1:
197
- _a._requestSchema = _b.sent();
198
- return [2 /*return*/];
219
+ wsEclService = _c.sent();
220
+ _c.label = 2;
221
+ case 2:
222
+ _c.trys.push([2, 4, , 5]);
223
+ _b = this;
224
+ return [4 /*yield*/, (wsEclService === null || wsEclService === void 0 ? void 0 : wsEclService.requestJson(this.QuerySet, this.QueryId))];
225
+ case 3:
226
+ _b._requestSchema = (_a = _c.sent()) !== null && _a !== void 0 ? _a : [];
227
+ return [3 /*break*/, 5];
228
+ case 4:
229
+ e_1 = _c.sent();
230
+ // See: https://track.hpccsystems.com/browse/HPCC-29827
231
+ logger.debug(e_1);
232
+ this._requestSchema = [];
233
+ return [3 /*break*/, 5];
234
+ case 5: return [2 /*return*/];
199
235
  }
200
236
  });
201
237
  });
202
238
  };
203
239
  Query.prototype.fetchResponseSchema = function () {
240
+ var _a;
204
241
  return __awaiter(this, void 0, void 0, function () {
205
- var _a;
206
- return __generator(this, function (_b) {
207
- switch (_b.label) {
208
- case 0:
209
- _a = this;
210
- return [4 /*yield*/, this.connection.responseJson(this.QuerySet, this.QueryId)];
242
+ var wsEclService, _b, e_2;
243
+ return __generator(this, function (_c) {
244
+ switch (_c.label) {
245
+ case 0: return [4 /*yield*/, this.wsEclService()];
211
246
  case 1:
212
- _a._responseSchema = _b.sent();
213
- return [2 /*return*/];
247
+ wsEclService = _c.sent();
248
+ _c.label = 2;
249
+ case 2:
250
+ _c.trys.push([2, 4, , 5]);
251
+ _b = this;
252
+ return [4 /*yield*/, (wsEclService === null || wsEclService === void 0 ? void 0 : wsEclService.responseJson(this.QuerySet, this.QueryId))];
253
+ case 3:
254
+ _b._responseSchema = (_a = _c.sent()) !== null && _a !== void 0 ? _a : {};
255
+ return [3 /*break*/, 5];
256
+ case 4:
257
+ e_2 = _c.sent();
258
+ // See: https://track.hpccsystems.com/browse/HPCC-29827
259
+ logger.debug(e_2);
260
+ this._responseSchema = {};
261
+ return [3 /*break*/, 5];
262
+ case 5: return [2 /*return*/];
214
263
  }
215
264
  });
216
265
  });
@@ -228,14 +277,33 @@ var Query = /** @class */ (function (_super) {
228
277
  });
229
278
  };
230
279
  Query.prototype.fetchSummaryStats = function () {
231
- return this._wsWorkunits.WUQueryGetSummaryStats({ Target: this.QuerySet, QueryId: this.QueryId });
280
+ return this.wsWorkunitsService.WUQueryGetSummaryStats({ Target: this.QuerySet, QueryId: this.QueryId });
232
281
  };
233
282
  Query.prototype.submit = function (request) {
234
- return this.connection.submit(this.QuerySet, this.QueryId, request).then(function (results) {
235
- for (var key in results) {
236
- results[key] = results[key].Row;
237
- }
238
- return results;
283
+ var _a;
284
+ return __awaiter(this, void 0, void 0, function () {
285
+ var wsEclService;
286
+ return __generator(this, function (_b) {
287
+ switch (_b.label) {
288
+ case 0: return [4 /*yield*/, this.wsEclService()];
289
+ case 1:
290
+ wsEclService = _b.sent();
291
+ try {
292
+ return [2 /*return*/, (_a = wsEclService === null || wsEclService === void 0 ? void 0 : wsEclService.submit(this.QuerySet, this.QueryId, request).then(function (results) {
293
+ for (var key in results) {
294
+ results[key] = results[key].Row;
295
+ }
296
+ return results;
297
+ })) !== null && _a !== void 0 ? _a : []];
298
+ }
299
+ catch (e) {
300
+ // See: https://track.hpccsystems.com/browse/HPCC-29827
301
+ logger.debug(e);
302
+ return [2 /*return*/, []];
303
+ }
304
+ return [2 /*return*/];
305
+ }
306
+ });
239
307
  });
240
308
  };
241
309
  Query.prototype.refresh = function () {
@@ -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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"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@hpcc-js/comms",
3
- "version": "2.83.0",
3
+ "version": "2.83.1",
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": "d68d7fd168a295186ec649d44ea524fdf1ade7c0"
95
+ "gitHead": "21788a9e79b571818151a2b78a1a660de5572b2d"
96
96
  }
@@ -1,3 +1,3 @@
1
1
  export const PKG_NAME = "@hpcc-js/comms";
2
- export const PKG_VERSION = "2.83.0";
3
- export const BUILD_VERSION = "2.104.22";
2
+ export const PKG_VERSION = "2.83.1";
3
+ export const BUILD_VERSION = "2.104.23";
package/src/ecl/query.ts CHANGED
@@ -1,7 +1,10 @@
1
- import { Cache, StateObject } from "@hpcc-js/util";
1
+ import { Cache, StateObject, scopedLogger } from "@hpcc-js/util";
2
2
  import { IConnection, IOptions } from "../connection";
3
3
  import { EclService, IWsEclRequest, IWsEclResponse, IWsEclResult } from "../services/wsEcl";
4
4
  import { WorkunitsService, WUQueryDetails } from "../services/wsWorkunits";
5
+ import { Topology } from "./topology";
6
+
7
+ const logger = scopedLogger("@hpcc-js/comms/ecl/query.ts");
5
8
 
6
9
  export interface QueryEx extends WUQueryDetails.Response {
7
10
  BaseUrl: string;
@@ -17,11 +20,9 @@ class QueryCache extends Cache<QueryEx, Query> {
17
20
  const _queries = new QueryCache();
18
21
 
19
22
  export class Query extends StateObject<QueryEx, QueryEx> implements QueryEx {
20
- protected connection: EclService;
21
- get BaseUrl() { return this.connection.baseUrl; }
22
- // protected _topology: Topology;
23
- protected _wsWorkunits: WorkunitsService;
24
- // protected _wu: Workunit;
23
+ protected wsWorkunitsService: WorkunitsService;
24
+ get BaseUrl() { return this.wsWorkunitsService.baseUrl; }
25
+ protected topology: Topology;
25
26
  protected _requestSchema: IWsEclRequest;
26
27
  protected _responseSchema: IWsEclResponse;
27
28
 
@@ -51,17 +52,14 @@ export class Query extends StateObject<QueryEx, QueryEx> implements QueryEx {
51
52
  get WUGraphs(): WUQueryDetails.WUGraphs { return this.get("WUGraphs"); }
52
53
  get WUTimers(): WUQueryDetails.WUTimers { return this.get("WUTimers"); }
53
54
 
54
- private constructor(optsConnection: IOptions | IConnection | EclService, querySet: string, queryID: string, queryDetails?: WUQueryDetails.Response) {
55
+ private constructor(optsConnection: IOptions | IConnection | WorkunitsService, querySet: string, queryID: string, queryDetails?: WUQueryDetails.Response) {
55
56
  super();
56
- if (optsConnection instanceof EclService) {
57
- this.connection = optsConnection;
58
-
59
- // this._topology = new Topology(this.connection.opts());
57
+ if (optsConnection instanceof WorkunitsService) {
58
+ this.wsWorkunitsService = optsConnection;
60
59
  } else {
61
- this.connection = new EclService(optsConnection);
62
- // this._topology = new Topology(optsConnection);
60
+ this.wsWorkunitsService = new WorkunitsService(optsConnection);
63
61
  }
64
- this._wsWorkunits = new WorkunitsService(optsConnection);
62
+ this.topology = Topology.attach(this.wsWorkunitsService.opts());
65
63
  this.set({
66
64
  QuerySet: querySet,
67
65
  QueryId: queryID,
@@ -76,24 +74,56 @@ export class Query extends StateObject<QueryEx, QueryEx> implements QueryEx {
76
74
  return retVal;
77
75
  }
78
76
 
77
+ private _eclService: Promise<EclService>;
78
+ protected async wsEclService(): Promise<EclService | undefined> {
79
+ if (!this._eclService) {
80
+ this._eclService = this.topology.fetchServices({}).then(services => {
81
+ for (const espServer of services?.TpEspServers?.TpEspServer ?? []) {
82
+ for (const binding of espServer?.TpBindings?.TpBinding ?? []) {
83
+ if (binding?.Service === "ws_ecl") {
84
+ const baseUrl = `${binding.Protocol}://${globalThis.location.hostname}:${binding.Port}`;
85
+ return new EclService({ baseUrl });
86
+ }
87
+ }
88
+ }
89
+ return undefined;
90
+ });
91
+ }
92
+ return this._eclService;
93
+ }
94
+
79
95
  private async fetchDetails(): Promise<void> {
80
- const queryDetails = await this._wsWorkunits.WUQueryDetails({
96
+ const queryDetails = await this.wsWorkunitsService.WUQueryDetails({
81
97
  QuerySet: this.QuerySet,
82
98
  QueryId: this.QueryId,
83
- IncludeStateOnClusters: false,
84
- IncludeSuperFiles: false,
85
- IncludeWsEclAddresses: false,
99
+ IncludeStateOnClusters: true,
100
+ IncludeSuperFiles: true,
101
+ IncludeWsEclAddresses: true,
86
102
  CheckAllNodes: false
87
103
  });
88
104
  this.set({ ...queryDetails } as QueryEx);
89
105
  }
90
106
 
91
107
  private async fetchRequestSchema(): Promise<void> {
92
- this._requestSchema = await this.connection.requestJson(this.QuerySet, this.QueryId);
108
+ const wsEclService = await this.wsEclService();
109
+ try {
110
+ this._requestSchema = await wsEclService?.requestJson(this.QuerySet, this.QueryId) ?? [];
111
+ } catch (e) {
112
+ // See: https://track.hpccsystems.com/browse/HPCC-29827
113
+ logger.debug(e);
114
+ this._requestSchema = [];
115
+ }
93
116
  }
94
117
 
95
118
  private async fetchResponseSchema(): Promise<void> {
96
- this._responseSchema = await this.connection.responseJson(this.QuerySet, this.QueryId);
119
+ const wsEclService = await this.wsEclService();
120
+ try {
121
+ this._responseSchema = await wsEclService?.responseJson(this.QuerySet, this.QueryId) ?? {};
122
+ } catch (e) {
123
+ // See: https://track.hpccsystems.com/browse/HPCC-29827
124
+ logger.debug(e);
125
+ this._responseSchema = {};
126
+ }
97
127
  }
98
128
 
99
129
  private async fetchSchema(): Promise<void> {
@@ -101,16 +131,23 @@ export class Query extends StateObject<QueryEx, QueryEx> implements QueryEx {
101
131
  }
102
132
 
103
133
  fetchSummaryStats() {
104
- return this._wsWorkunits.WUQueryGetSummaryStats({ Target: this.QuerySet, QueryId: this.QueryId });
134
+ return this.wsWorkunitsService.WUQueryGetSummaryStats({ Target: this.QuerySet, QueryId: this.QueryId });
105
135
  }
106
136
 
107
- submit(request: object): Promise<Array<{ [key: string]: object[] }>> {
108
- return this.connection.submit(this.QuerySet, this.QueryId, request).then(results => {
109
- for (const key in results) {
110
- results[key] = results[key].Row;
111
- }
112
- return results;
113
- });
137
+ async submit(request: object): Promise<Array<{ [key: string]: object[] }>> {
138
+ const wsEclService = await this.wsEclService();
139
+ try {
140
+ return wsEclService?.submit(this.QuerySet, this.QueryId, request).then(results => {
141
+ for (const key in results) {
142
+ results[key] = results[key].Row;
143
+ }
144
+ return results;
145
+ }) ?? [];
146
+ } catch (e) {
147
+ // See: https://track.hpccsystems.com/browse/HPCC-29827
148
+ logger.debug(e);
149
+ return [];
150
+ }
114
151
  }
115
152
 
116
153
  async refresh(): Promise<this> {
@@ -143,18 +180,4 @@ export class Query extends StateObject<QueryEx, QueryEx> implements QueryEx {
143
180
  if (!this._responseSchema[resultName]) return [];
144
181
  return this._responseSchema[resultName];
145
182
  }
146
-
147
- /*
148
- protected WUQueryDetails(): Promise<WUQueryDetails.Response> {
149
- const request: WUQueryDetails.Request = {} as WUQueryDetails.Request;
150
- request.QueryId = this.QueryId;
151
- request.QuerySet = this.QuerySet;
152
- request.IncludeSuperFiles = true;
153
- request.IncludeStateOnClusters = true;
154
- return this.connection.WUQueryDetails(request).then((response) => {
155
- this.set(response);
156
- return response;
157
- });
158
- }
159
- */
160
183
  }
@@ -1,4 +1,4 @@
1
1
  export declare const PKG_NAME = "@hpcc-js/comms";
2
- export declare const PKG_VERSION = "2.83.0";
3
- export declare const BUILD_VERSION = "2.104.22";
2
+ export declare const PKG_VERSION = "2.83.1";
3
+ export declare const BUILD_VERSION = "2.104.23";
4
4
  //# sourceMappingURL=__package__.d.ts.map
@@ -2,13 +2,14 @@ import { StateObject } from "@hpcc-js/util";
2
2
  import { IConnection, IOptions } from "../connection";
3
3
  import { EclService, IWsEclRequest, IWsEclResponse, IWsEclResult } from "../services/wsEcl";
4
4
  import { WorkunitsService, WUQueryDetails } from "../services/wsWorkunits";
5
+ import { Topology } from "./topology";
5
6
  export interface QueryEx extends WUQueryDetails.Response {
6
7
  BaseUrl: string;
7
8
  }
8
9
  export declare class Query extends StateObject<QueryEx, QueryEx> implements QueryEx {
9
- protected connection: EclService;
10
+ protected wsWorkunitsService: WorkunitsService;
10
11
  get BaseUrl(): string;
11
- protected _wsWorkunits: WorkunitsService;
12
+ protected topology: Topology;
12
13
  protected _requestSchema: IWsEclRequest;
13
14
  protected _responseSchema: IWsEclResponse;
14
15
  get properties(): WUQueryDetails.Response;
@@ -38,6 +39,8 @@ export declare class Query extends StateObject<QueryEx, QueryEx> implements Quer
38
39
  get WUTimers(): WUQueryDetails.WUTimers;
39
40
  private constructor();
40
41
  static attach(optsConnection: IOptions | IConnection, querySet: string, queryId: string): Query;
42
+ private _eclService;
43
+ protected wsEclService(): Promise<EclService | undefined>;
41
44
  private fetchDetails;
42
45
  private fetchRequestSchema;
43
46
  private fetchResponseSchema;
@@ -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,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
+ {"version":3,"file":"query.d.ts","sourceRoot":"","sources":["../../src/ecl/query.ts"],"names":[],"mappings":"AAAA,OAAO,EAAS,WAAW,EAAgB,MAAM,eAAe,CAAC;AACjE,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;AAC3E,OAAO,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAC;AAItC,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,kBAAkB,EAAE,gBAAgB,CAAC;IAC/C,IAAI,OAAO,WAA8C;IACzD,SAAS,CAAC,QAAQ,EAAE,QAAQ,CAAC;IAC7B,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;IAeP,MAAM,CAAC,MAAM,CAAC,cAAc,EAAE,QAAQ,GAAG,WAAW,EAAE,QAAQ,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,GAAG,KAAK;IAO/F,OAAO,CAAC,WAAW,CAAsB;cACzB,YAAY,IAAI,OAAO,CAAC,UAAU,GAAG,SAAS,CAAC;YAiBjD,YAAY;YAYZ,kBAAkB;YAWlB,mBAAmB;YAWnB,WAAW;IAIzB,iBAAiB;IAIX,MAAM,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,KAAK,CAAC;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,EAAE,CAAA;KAAE,CAAC,CAAC;IAgBpE,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;CAIjD"}
@@ -1,4 +1,4 @@
1
1
  export declare const PKG_NAME = "@hpcc-js/comms";
2
- export declare const PKG_VERSION = "2.83.0";
3
- export declare const BUILD_VERSION = "2.104.22";
2
+ export declare const PKG_VERSION = "2.83.1";
3
+ export declare const BUILD_VERSION = "2.104.23";
4
4
  //# sourceMappingURL=__package__.d.ts.map
@@ -2,13 +2,14 @@ import { StateObject } from "@hpcc-js/util";
2
2
  import { IConnection, IOptions } from "../connection";
3
3
  import { EclService, IWsEclRequest, IWsEclResponse, IWsEclResult } from "../services/wsEcl";
4
4
  import { WorkunitsService, WUQueryDetails } from "../services/wsWorkunits";
5
+ import { Topology } from "./topology";
5
6
  export interface QueryEx extends WUQueryDetails.Response {
6
7
  BaseUrl: string;
7
8
  }
8
9
  export declare class Query extends StateObject<QueryEx, QueryEx> implements QueryEx {
9
- protected connection: EclService;
10
+ protected wsWorkunitsService: WorkunitsService;
10
11
  readonly BaseUrl: string;
11
- protected _wsWorkunits: WorkunitsService;
12
+ protected topology: Topology;
12
13
  protected _requestSchema: IWsEclRequest;
13
14
  protected _responseSchema: IWsEclResponse;
14
15
  readonly properties: WUQueryDetails.Response;
@@ -38,6 +39,8 @@ export declare class Query extends StateObject<QueryEx, QueryEx> implements Quer
38
39
  readonly WUTimers: WUQueryDetails.WUTimers;
39
40
  private constructor();
40
41
  static attach(optsConnection: IOptions | IConnection, querySet: string, queryId: string): Query;
42
+ private _eclService;
43
+ protected wsEclService(): Promise<EclService | undefined>;
41
44
  private fetchDetails;
42
45
  private fetchRequestSchema;
43
46
  private fetchResponseSchema;