@hpcc-js/comms 2.66.0 → 2.68.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 +197 -199
- package/dist/index.es6.js.map +1 -1
- package/dist/index.js +85 -101
- 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 +173 -216
- 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/clienttools/eclMeta.js +4 -4
- package/lib-es6/clienttools/eclMeta.js.map +1 -1
- package/lib-es6/clienttools/eclcc.js +18 -18
- package/lib-es6/clienttools/eclcc.js.map +1 -1
- package/lib-es6/connection.js +6 -6
- package/lib-es6/connection.js.map +1 -1
- package/lib-es6/ecl/graph.js +5 -5
- package/lib-es6/ecl/graph.js.map +1 -1
- package/lib-es6/ecl/logicalFile.js +2 -2
- package/lib-es6/ecl/logicalFile.js.map +1 -1
- package/lib-es6/ecl/result.js +1 -1
- package/lib-es6/ecl/result.js.map +1 -1
- package/lib-es6/ecl/scope.js +5 -5
- package/lib-es6/ecl/scope.js.map +1 -1
- package/lib-es6/ecl/store.js +4 -4
- package/lib-es6/ecl/store.js.map +1 -1
- package/lib-es6/ecl/targetCluster.js +2 -2
- package/lib-es6/ecl/targetCluster.js.map +1 -1
- package/lib-es6/ecl/topology.js +1 -1
- package/lib-es6/ecl/topology.js.map +1 -1
- package/lib-es6/ecl/workunit.js +4 -4
- package/lib-es6/ecl/workunit.js.map +1 -1
- package/lib-es6/espConnection.js +1 -1
- package/lib-es6/espConnection.js.map +1 -1
- package/lib-es6/services/wsEcl.js +3 -3
- package/lib-es6/services/wsEcl.js.map +1 -1
- package/package.json +21 -20
- package/src/__package__.ts +2 -2
- package/src/ecl/topology.ts +1 -1
- package/types/__package__.d.ts +2 -2
- package/types/ecl/activity.d.ts +1 -1
- package/types/ecl/activity.d.ts.map +1 -1
- package/types/ecl/topology.d.ts.map +1 -1
- package/types-3.4/__package__.d.ts +2 -2
- package/types-3.4/ecl/activity.d.ts +1 -1
package/dist/index.js
CHANGED
|
@@ -1,8 +1,8 @@
|
|
|
1
1
|
(function (global, factory) {
|
|
2
2
|
typeof exports === 'object' && typeof module !== 'undefined' ? factory(exports, require('@hpcc-js/util')) :
|
|
3
3
|
typeof define === 'function' && define.amd ? define(['exports', '@hpcc-js/util'], factory) :
|
|
4
|
-
(global =
|
|
5
|
-
}
|
|
4
|
+
(global = global || self, factory(global['@hpcc-js/comms'] = {}, global['@hpcc-js/util']));
|
|
5
|
+
}(this, (function (exports, util) { 'use strict';
|
|
6
6
|
|
|
7
7
|
var global =
|
|
8
8
|
(typeof globalThis !== 'undefined' && globalThis) ||
|
|
@@ -603,8 +603,8 @@
|
|
|
603
603
|
}
|
|
604
604
|
|
|
605
605
|
var PKG_NAME = "@hpcc-js/comms";
|
|
606
|
-
var PKG_VERSION = "2.
|
|
607
|
-
var BUILD_VERSION = "2.
|
|
606
|
+
var PKG_VERSION = "2.68.0";
|
|
607
|
+
var BUILD_VERSION = "2.99.0";
|
|
608
608
|
|
|
609
609
|
/*! *****************************************************************************
|
|
610
610
|
Copyright (c) Microsoft Corporation.
|
|
@@ -693,10 +693,10 @@
|
|
|
693
693
|
ar[i] = from[i];
|
|
694
694
|
}
|
|
695
695
|
}
|
|
696
|
-
return to.concat(ar ||
|
|
696
|
+
return to.concat(ar || from);
|
|
697
697
|
}
|
|
698
698
|
|
|
699
|
-
var logger
|
|
699
|
+
var logger = util.scopedLogger("comms/connection.ts");
|
|
700
700
|
function instanceOfIOptions(object) {
|
|
701
701
|
return "baseUrl" in object;
|
|
702
702
|
}
|
|
@@ -735,20 +735,20 @@
|
|
|
735
735
|
obj[key].forEach(function (row, i) {
|
|
736
736
|
if (typeof row === "object") {
|
|
737
737
|
includeItemCount_1 = true;
|
|
738
|
-
str.push(serializeRequest(row, encodeRequest, prefix + encode(
|
|
738
|
+
str.push(serializeRequest(row, encodeRequest, prefix + encode(key + "." + i, encodeRequest)));
|
|
739
739
|
}
|
|
740
740
|
else {
|
|
741
|
-
str.push(prefix + encode(
|
|
741
|
+
str.push(prefix + encode(key + "_i" + i, encodeRequest) + "=" + serializeRequest(row, encodeRequest));
|
|
742
742
|
}
|
|
743
743
|
});
|
|
744
744
|
if (includeItemCount_1) {
|
|
745
|
-
str.push(prefix + encode(
|
|
745
|
+
str.push(prefix + encode(key + ".itemcount", encodeRequest) + "=" + obj[key].length);
|
|
746
746
|
}
|
|
747
747
|
}
|
|
748
748
|
else if (typeof obj[key] === "object") {
|
|
749
749
|
if (obj[key] && obj[key]["Item"] instanceof Array) { // Specific to ws_machine.GetTargetClusterInfo?
|
|
750
750
|
str.push(serializeRequest(obj[key]["Item"], encodeRequest, prefix + encode(key, encodeRequest)));
|
|
751
|
-
str.push(prefix + encode(
|
|
751
|
+
str.push(prefix + encode(key + ".itemcount", encodeRequest) + "=" + obj[key]["Item"].length);
|
|
752
752
|
}
|
|
753
753
|
else {
|
|
754
754
|
str.push(serializeRequest(obj[key], encodeRequest, prefix + encode(key, encodeRequest)));
|
|
@@ -798,12 +798,12 @@
|
|
|
798
798
|
respondedTimeout -= respondedTick;
|
|
799
799
|
if (respondedTimeout <= 0) {
|
|
800
800
|
clearInterval(progress);
|
|
801
|
-
logger
|
|
801
|
+
logger.error("Request timeout: " + script.src);
|
|
802
802
|
doCallback();
|
|
803
803
|
reject(Error("Request timeout: " + script.src));
|
|
804
804
|
}
|
|
805
805
|
else {
|
|
806
|
-
logger
|
|
806
|
+
logger.debug("Request pending (" + respondedTimeout / 1000 + " sec): " + script.src);
|
|
807
807
|
}
|
|
808
808
|
}
|
|
809
809
|
}, respondedTick);
|
|
@@ -814,7 +814,7 @@
|
|
|
814
814
|
});
|
|
815
815
|
}
|
|
816
816
|
function authHeader(opts) {
|
|
817
|
-
return opts.userID ? { Authorization: "Basic "
|
|
817
|
+
return opts.userID ? { Authorization: "Basic " + btoa(opts.userID + ":" + opts.password) } : {};
|
|
818
818
|
}
|
|
819
819
|
// _omitMap is a workaround for older HPCC-Platform instances without credentials ---
|
|
820
820
|
var _omitMap = {};
|
|
@@ -873,7 +873,7 @@
|
|
|
873
873
|
abortSignal = request.abortSignal_;
|
|
874
874
|
delete request.abortSignal_;
|
|
875
875
|
}
|
|
876
|
-
return doFetch(opts,
|
|
876
|
+
return doFetch(opts, action + "?" + serializeRequest(request, opts.encodeRequest), {
|
|
877
877
|
method: "get",
|
|
878
878
|
signal: abortSignal
|
|
879
879
|
}, __assign({}, header), responseType);
|
|
@@ -952,7 +952,7 @@
|
|
|
952
952
|
_this.Source = exceptions.Source;
|
|
953
953
|
_this.Exception = exceptions.Exception;
|
|
954
954
|
if (exceptions.Exception.length) {
|
|
955
|
-
_this.message =
|
|
955
|
+
_this.message = exceptions.Exception[0].Code + ": " + exceptions.Exception[0].Message;
|
|
956
956
|
}
|
|
957
957
|
else {
|
|
958
958
|
_this.message = "";
|
|
@@ -1272,7 +1272,7 @@
|
|
|
1272
1272
|
};
|
|
1273
1273
|
EclService.prototype.requestJson = function (querySet, queryId) {
|
|
1274
1274
|
// http://192.168.3.22:8002/WsEcl/example/request/query/roxie/peopleaccounts/json?display
|
|
1275
|
-
return this._connection.send("example/request/query/"
|
|
1275
|
+
return this._connection.send("example/request/query/" + querySet + "/" + queryId + "/json", {}, "text").then(function (response) {
|
|
1276
1276
|
var requestSchema = JSON.parse(response);
|
|
1277
1277
|
for (var key in requestSchema) {
|
|
1278
1278
|
return requestSchema[key];
|
|
@@ -1282,7 +1282,7 @@
|
|
|
1282
1282
|
};
|
|
1283
1283
|
EclService.prototype.responseJson = function (querySet, queryId) {
|
|
1284
1284
|
// http://192.168.3.22:8002/WsEcl/example/response/query/roxie/peopleaccounts/json?display
|
|
1285
|
-
return this._connection.send("example/response/query/"
|
|
1285
|
+
return this._connection.send("example/response/query/" + querySet + "/" + queryId + "/json", {}, "text").then(function (response) {
|
|
1286
1286
|
var responseSchema = JSON.parse(response);
|
|
1287
1287
|
for (var key in responseSchema) {
|
|
1288
1288
|
return responseSchema[key].Results;
|
|
@@ -1298,7 +1298,7 @@
|
|
|
1298
1298
|
};
|
|
1299
1299
|
EclService.prototype.submit = function (querySet, queryId, request) {
|
|
1300
1300
|
// http://192.168.3.22:8002/WsEcl/submit/query/roxie/peopleaccounts.1/json
|
|
1301
|
-
var action = "submit/query/"
|
|
1301
|
+
var action = "submit/query/" + querySet + "/" + queryId;
|
|
1302
1302
|
return this._connection.send(action, request, "json2").then(function (response) {
|
|
1303
1303
|
if (response.Results && response.Results.Exception) {
|
|
1304
1304
|
throw new ESPExceptions(action, request, {
|
|
@@ -1348,7 +1348,7 @@
|
|
|
1348
1348
|
};
|
|
1349
1349
|
}
|
|
1350
1350
|
|
|
1351
|
-
bisector(ascending);
|
|
1351
|
+
var ascendingBisect = bisector(ascending);
|
|
1352
1352
|
|
|
1353
1353
|
function number(x) {
|
|
1354
1354
|
return x === null ? NaN : +x;
|
|
@@ -1569,18 +1569,13 @@
|
|
|
1569
1569
|
return StoreService;
|
|
1570
1570
|
}(Service));
|
|
1571
1571
|
|
|
1572
|
-
/*
|
|
1573
|
-
Response structures generated via:
|
|
1574
|
-
* http://localhost:8010/WsTopology/TpLogicalClusterQuery?respjson_
|
|
1575
|
-
* http://json2ts.com/
|
|
1576
|
-
*/
|
|
1577
|
-
exports.TpLogicalClusterQuery = void 0;
|
|
1578
1572
|
(function (TpLogicalClusterQuery) {
|
|
1573
|
+
var RoxieQueueFilter;
|
|
1579
1574
|
(function (RoxieQueueFilter) {
|
|
1580
1575
|
RoxieQueueFilter["All"] = "All";
|
|
1581
1576
|
RoxieQueueFilter["QueriesOnly"] = "QueriesOnly";
|
|
1582
1577
|
RoxieQueueFilter["WorkunitsOnly"] = "WorkunitsOnly";
|
|
1583
|
-
})(TpLogicalClusterQuery.RoxieQueueFilter || (TpLogicalClusterQuery.RoxieQueueFilter = {}));
|
|
1578
|
+
})(RoxieQueueFilter = TpLogicalClusterQuery.RoxieQueueFilter || (TpLogicalClusterQuery.RoxieQueueFilter = {}));
|
|
1584
1579
|
})(exports.TpLogicalClusterQuery || (exports.TpLogicalClusterQuery = {}));
|
|
1585
1580
|
var TopologyService = /** @class */ (function (_super) {
|
|
1586
1581
|
__extends(TopologyService, _super);
|
|
@@ -1636,13 +1631,6 @@
|
|
|
1636
1631
|
return TopologyService;
|
|
1637
1632
|
}(Service));
|
|
1638
1633
|
|
|
1639
|
-
/*
|
|
1640
|
-
Response structures generated via:
|
|
1641
|
-
* http://localhost:8010/WsWorkunits/WUInfo?reqjson_
|
|
1642
|
-
* http://localhost:8010/WsWorkunits/WUInfo?respjson_
|
|
1643
|
-
* http://json2ts.com/
|
|
1644
|
-
*/
|
|
1645
|
-
exports.WUStateID = void 0;
|
|
1646
1634
|
(function (WUStateID) {
|
|
1647
1635
|
WUStateID[WUStateID["Unknown"] = 0] = "Unknown";
|
|
1648
1636
|
WUStateID[WUStateID["Compiled"] = 1] = "Compiled";
|
|
@@ -1667,8 +1655,8 @@
|
|
|
1667
1655
|
function isECLResult(_) {
|
|
1668
1656
|
return typeof _.Name === "string";
|
|
1669
1657
|
}
|
|
1670
|
-
exports.WUUpdate = void 0;
|
|
1671
1658
|
(function (WUUpdate) {
|
|
1659
|
+
var Action;
|
|
1672
1660
|
(function (Action) {
|
|
1673
1661
|
Action[Action["Unknown"] = 0] = "Unknown";
|
|
1674
1662
|
Action[Action["Compile"] = 1] = "Compile";
|
|
@@ -1680,7 +1668,7 @@
|
|
|
1680
1668
|
Action[Action["Resume"] = 7] = "Resume";
|
|
1681
1669
|
Action[Action["Debug"] = 8] = "Debug";
|
|
1682
1670
|
Action[Action["__size"] = 9] = "__size";
|
|
1683
|
-
})(WUUpdate.Action || (WUUpdate.Action = {}));
|
|
1671
|
+
})(Action = WUUpdate.Action || (WUUpdate.Action = {}));
|
|
1684
1672
|
})(exports.WUUpdate || (exports.WUUpdate = {}));
|
|
1685
1673
|
function isWUQueryECLWorkunit(_) {
|
|
1686
1674
|
return _.TotalClusterTime !== undefined;
|
|
@@ -1882,8 +1870,6 @@
|
|
|
1882
1870
|
return date.getDate() - 1;
|
|
1883
1871
|
});
|
|
1884
1872
|
|
|
1885
|
-
var timeDay = day;
|
|
1886
|
-
|
|
1887
1873
|
function weekday(i) {
|
|
1888
1874
|
return newInterval(function(date) {
|
|
1889
1875
|
date.setDate(date.getDate() - (date.getDay() + 7 - i) % 7);
|
|
@@ -1897,11 +1883,11 @@
|
|
|
1897
1883
|
|
|
1898
1884
|
var sunday = weekday(0);
|
|
1899
1885
|
var monday = weekday(1);
|
|
1900
|
-
weekday(2);
|
|
1901
|
-
weekday(3);
|
|
1886
|
+
var tuesday = weekday(2);
|
|
1887
|
+
var wednesday = weekday(3);
|
|
1902
1888
|
var thursday = weekday(4);
|
|
1903
|
-
weekday(5);
|
|
1904
|
-
weekday(6);
|
|
1889
|
+
var friday = weekday(5);
|
|
1890
|
+
var saturday = weekday(6);
|
|
1905
1891
|
|
|
1906
1892
|
var year = newInterval(function(date) {
|
|
1907
1893
|
date.setMonth(0, 1);
|
|
@@ -1925,8 +1911,6 @@
|
|
|
1925
1911
|
});
|
|
1926
1912
|
};
|
|
1927
1913
|
|
|
1928
|
-
var timeYear = year;
|
|
1929
|
-
|
|
1930
1914
|
var utcDay = newInterval(function(date) {
|
|
1931
1915
|
date.setUTCHours(0, 0, 0, 0);
|
|
1932
1916
|
}, function(date, step) {
|
|
@@ -1937,8 +1921,6 @@
|
|
|
1937
1921
|
return date.getUTCDate() - 1;
|
|
1938
1922
|
});
|
|
1939
1923
|
|
|
1940
|
-
var utcDay$1 = utcDay;
|
|
1941
|
-
|
|
1942
1924
|
function utcWeekday(i) {
|
|
1943
1925
|
return newInterval(function(date) {
|
|
1944
1926
|
date.setUTCDate(date.getUTCDate() - (date.getUTCDay() + 7 - i) % 7);
|
|
@@ -1952,11 +1934,11 @@
|
|
|
1952
1934
|
|
|
1953
1935
|
var utcSunday = utcWeekday(0);
|
|
1954
1936
|
var utcMonday = utcWeekday(1);
|
|
1955
|
-
utcWeekday(2);
|
|
1956
|
-
utcWeekday(3);
|
|
1937
|
+
var utcTuesday = utcWeekday(2);
|
|
1938
|
+
var utcWednesday = utcWeekday(3);
|
|
1957
1939
|
var utcThursday = utcWeekday(4);
|
|
1958
|
-
utcWeekday(5);
|
|
1959
|
-
utcWeekday(6);
|
|
1940
|
+
var utcFriday = utcWeekday(5);
|
|
1941
|
+
var utcSaturday = utcWeekday(6);
|
|
1960
1942
|
|
|
1961
1943
|
var utcYear = newInterval(function(date) {
|
|
1962
1944
|
date.setUTCMonth(0, 1);
|
|
@@ -1980,8 +1962,6 @@
|
|
|
1980
1962
|
});
|
|
1981
1963
|
};
|
|
1982
1964
|
|
|
1983
|
-
var utcYear$1 = utcYear;
|
|
1984
|
-
|
|
1985
1965
|
function localDate(d) {
|
|
1986
1966
|
if (0 <= d.y && d.y < 100) {
|
|
1987
1967
|
var date = new Date(-1, d.m, d.d, d.H, d.M, d.S, d.L);
|
|
@@ -2170,7 +2150,7 @@
|
|
|
2170
2150
|
return function(string) {
|
|
2171
2151
|
var d = newDate(1900, undefined, 1),
|
|
2172
2152
|
i = parseSpecifier(d, specifier, string += "", 0),
|
|
2173
|
-
week, day;
|
|
2153
|
+
week, day$1;
|
|
2174
2154
|
if (i != string.length) return null;
|
|
2175
2155
|
|
|
2176
2156
|
// If a UNIX timestamp is specified, return it.
|
|
@@ -2191,25 +2171,25 @@
|
|
|
2191
2171
|
if (d.V < 1 || d.V > 53) return null;
|
|
2192
2172
|
if (!("w" in d)) d.w = 1;
|
|
2193
2173
|
if ("Z" in d) {
|
|
2194
|
-
week = utcDate(newDate(d.y, 0, 1)), day = week.getUTCDay();
|
|
2195
|
-
week = day > 4 || day === 0 ? utcMonday.ceil(week) : utcMonday(week);
|
|
2196
|
-
week = utcDay
|
|
2174
|
+
week = utcDate(newDate(d.y, 0, 1)), day$1 = week.getUTCDay();
|
|
2175
|
+
week = day$1 > 4 || day$1 === 0 ? utcMonday.ceil(week) : utcMonday(week);
|
|
2176
|
+
week = utcDay.offset(week, (d.V - 1) * 7);
|
|
2197
2177
|
d.y = week.getUTCFullYear();
|
|
2198
2178
|
d.m = week.getUTCMonth();
|
|
2199
2179
|
d.d = week.getUTCDate() + (d.w + 6) % 7;
|
|
2200
2180
|
} else {
|
|
2201
|
-
week = localDate(newDate(d.y, 0, 1)), day = week.getDay();
|
|
2202
|
-
week = day > 4 || day === 0 ? monday.ceil(week) : monday(week);
|
|
2203
|
-
week =
|
|
2181
|
+
week = localDate(newDate(d.y, 0, 1)), day$1 = week.getDay();
|
|
2182
|
+
week = day$1 > 4 || day$1 === 0 ? monday.ceil(week) : monday(week);
|
|
2183
|
+
week = day.offset(week, (d.V - 1) * 7);
|
|
2204
2184
|
d.y = week.getFullYear();
|
|
2205
2185
|
d.m = week.getMonth();
|
|
2206
2186
|
d.d = week.getDate() + (d.w + 6) % 7;
|
|
2207
2187
|
}
|
|
2208
2188
|
} else if ("W" in d || "U" in d) {
|
|
2209
2189
|
if (!("w" in d)) d.w = "u" in d ? d.u % 7 : "W" in d ? 1 : 0;
|
|
2210
|
-
day = "Z" in d ? utcDate(newDate(d.y, 0, 1)).getUTCDay() : localDate(newDate(d.y, 0, 1)).getDay();
|
|
2190
|
+
day$1 = "Z" in d ? utcDate(newDate(d.y, 0, 1)).getUTCDay() : localDate(newDate(d.y, 0, 1)).getDay();
|
|
2211
2191
|
d.m = 0;
|
|
2212
|
-
d.d = "W" in d ? (d.w + 6) % 7 + d.W * 7 - (day + 5) % 7 : d.w + d.U * 7 - (day + 6) % 7;
|
|
2192
|
+
d.d = "W" in d ? (d.w + 6) % 7 + d.W * 7 - (day$1 + 5) % 7 : d.w + d.U * 7 - (day$1 + 6) % 7;
|
|
2213
2193
|
}
|
|
2214
2194
|
|
|
2215
2195
|
// If a time zone is specified, all fields are interpreted as UTC and then
|
|
@@ -2495,7 +2475,7 @@
|
|
|
2495
2475
|
}
|
|
2496
2476
|
|
|
2497
2477
|
function formatDayOfYear(d, p) {
|
|
2498
|
-
return pad(1 +
|
|
2478
|
+
return pad(1 + day.count(year(d), d), p, 3);
|
|
2499
2479
|
}
|
|
2500
2480
|
|
|
2501
2481
|
function formatMilliseconds(d, p) {
|
|
@@ -2524,7 +2504,7 @@
|
|
|
2524
2504
|
}
|
|
2525
2505
|
|
|
2526
2506
|
function formatWeekNumberSunday(d, p) {
|
|
2527
|
-
return pad(sunday.count(
|
|
2507
|
+
return pad(sunday.count(year(d) - 1, d), p, 2);
|
|
2528
2508
|
}
|
|
2529
2509
|
|
|
2530
2510
|
function dISO(d) {
|
|
@@ -2534,7 +2514,7 @@
|
|
|
2534
2514
|
|
|
2535
2515
|
function formatWeekNumberISO(d, p) {
|
|
2536
2516
|
d = dISO(d);
|
|
2537
|
-
return pad(thursday.count(
|
|
2517
|
+
return pad(thursday.count(year(d), d) + (year(d).getDay() === 4), p, 2);
|
|
2538
2518
|
}
|
|
2539
2519
|
|
|
2540
2520
|
function formatWeekdayNumberSunday(d) {
|
|
@@ -2542,7 +2522,7 @@
|
|
|
2542
2522
|
}
|
|
2543
2523
|
|
|
2544
2524
|
function formatWeekNumberMonday(d, p) {
|
|
2545
|
-
return pad(monday.count(
|
|
2525
|
+
return pad(monday.count(year(d) - 1, d), p, 2);
|
|
2546
2526
|
}
|
|
2547
2527
|
|
|
2548
2528
|
function formatYear(d, p) {
|
|
@@ -2584,7 +2564,7 @@
|
|
|
2584
2564
|
}
|
|
2585
2565
|
|
|
2586
2566
|
function formatUTCDayOfYear(d, p) {
|
|
2587
|
-
return pad(1 + utcDay
|
|
2567
|
+
return pad(1 + utcDay.count(utcYear(d), d), p, 3);
|
|
2588
2568
|
}
|
|
2589
2569
|
|
|
2590
2570
|
function formatUTCMilliseconds(d, p) {
|
|
@@ -2613,7 +2593,7 @@
|
|
|
2613
2593
|
}
|
|
2614
2594
|
|
|
2615
2595
|
function formatUTCWeekNumberSunday(d, p) {
|
|
2616
|
-
return pad(utcSunday.count(utcYear
|
|
2596
|
+
return pad(utcSunday.count(utcYear(d) - 1, d), p, 2);
|
|
2617
2597
|
}
|
|
2618
2598
|
|
|
2619
2599
|
function UTCdISO(d) {
|
|
@@ -2623,7 +2603,7 @@
|
|
|
2623
2603
|
|
|
2624
2604
|
function formatUTCWeekNumberISO(d, p) {
|
|
2625
2605
|
d = UTCdISO(d);
|
|
2626
|
-
return pad(utcThursday.count(utcYear
|
|
2606
|
+
return pad(utcThursday.count(utcYear(d), d) + (utcYear(d).getUTCDay() === 4), p, 2);
|
|
2627
2607
|
}
|
|
2628
2608
|
|
|
2629
2609
|
function formatUTCWeekdayNumberSunday(d) {
|
|
@@ -2631,7 +2611,7 @@
|
|
|
2631
2611
|
}
|
|
2632
2612
|
|
|
2633
2613
|
function formatUTCWeekNumberMonday(d, p) {
|
|
2634
|
-
return pad(utcMonday.count(utcYear
|
|
2614
|
+
return pad(utcMonday.count(utcYear(d) - 1, d), p, 2);
|
|
2635
2615
|
}
|
|
2636
2616
|
|
|
2637
2617
|
function formatUTCYear(d, p) {
|
|
@@ -2670,6 +2650,8 @@
|
|
|
2670
2650
|
}
|
|
2671
2651
|
|
|
2672
2652
|
var locale;
|
|
2653
|
+
var timeFormat;
|
|
2654
|
+
var timeParse;
|
|
2673
2655
|
var utcFormat;
|
|
2674
2656
|
var utcParse;
|
|
2675
2657
|
|
|
@@ -2686,6 +2668,8 @@
|
|
|
2686
2668
|
|
|
2687
2669
|
function defaultLocale(definition) {
|
|
2688
2670
|
locale = formatLocale(definition);
|
|
2671
|
+
timeFormat = locale.format;
|
|
2672
|
+
timeParse = locale.parse;
|
|
2689
2673
|
utcFormat = locale.utcFormat;
|
|
2690
2674
|
utcParse = locale.utcParse;
|
|
2691
2675
|
return locale;
|
|
@@ -2912,7 +2896,7 @@
|
|
|
2912
2896
|
scopeStack.pop();
|
|
2913
2897
|
}
|
|
2914
2898
|
if (!scopeParent1) {
|
|
2915
|
-
console.log("Missing SG:Parent ("
|
|
2899
|
+
console.log("Missing SG:Parent (" + scope.Id + "): " + scope.parentScope());
|
|
2916
2900
|
}
|
|
2917
2901
|
else {
|
|
2918
2902
|
var parent1 = scopeParent1;
|
|
@@ -2922,7 +2906,7 @@
|
|
|
2922
2906
|
case "activity":
|
|
2923
2907
|
var scopeParent2 = subgraphs[scope.parentScope()];
|
|
2924
2908
|
if (!scopeParent2) {
|
|
2925
|
-
console.log("Missing A:Parent ("
|
|
2909
|
+
console.log("Missing A:Parent (" + scope.Id + "): " + scope.parentScope());
|
|
2926
2910
|
}
|
|
2927
2911
|
else {
|
|
2928
2912
|
vertices[scope.ScopeName] = scopeParent2.createVertex(scope);
|
|
@@ -2934,7 +2918,7 @@
|
|
|
2934
2918
|
case "function":
|
|
2935
2919
|
var scopeParent3 = vertices[scope.parentScope()];
|
|
2936
2920
|
if (!scopeParent3) {
|
|
2937
|
-
console.log("Missing F:Parent ("
|
|
2921
|
+
console.log("Missing F:Parent (" + scope.Id + "): " + scope.parentScope());
|
|
2938
2922
|
}
|
|
2939
2923
|
else {
|
|
2940
2924
|
scopeParent3._.children().push(scope);
|
|
@@ -2946,7 +2930,7 @@
|
|
|
2946
2930
|
var scope = edges[id];
|
|
2947
2931
|
var scopeParent3 = subgraphs[scope.parentScope()];
|
|
2948
2932
|
if (!scopeParent3) {
|
|
2949
|
-
console.log("Missing E:Parent ("
|
|
2933
|
+
console.log("Missing E:Parent (" + scope.Id + "): " + scope.parentScope());
|
|
2950
2934
|
}
|
|
2951
2935
|
else {
|
|
2952
2936
|
var parent3 = scopeParent3;
|
|
@@ -2958,7 +2942,7 @@
|
|
|
2958
2942
|
catch (e) {
|
|
2959
2943
|
// const sourceIndex = scope.attr("SourceIndex").RawValue;
|
|
2960
2944
|
// const targetIndex = scope.attr("TargetIndex").RawValue;
|
|
2961
|
-
console.log("Invalid Edge: "
|
|
2945
|
+
console.log("Invalid Edge: " + id);
|
|
2962
2946
|
}
|
|
2963
2947
|
}
|
|
2964
2948
|
}
|
|
@@ -3251,7 +3235,7 @@
|
|
|
3251
3235
|
__extends(GlobalResultCache, _super);
|
|
3252
3236
|
function GlobalResultCache() {
|
|
3253
3237
|
return _super.call(this, function (obj) {
|
|
3254
|
-
return
|
|
3238
|
+
return obj.BaseUrl + "-" + obj.Wuid + "-" + obj.ResultName;
|
|
3255
3239
|
}) || this;
|
|
3256
3240
|
}
|
|
3257
3241
|
return GlobalResultCache;
|
|
@@ -3722,21 +3706,21 @@
|
|
|
3722
3706
|
var label = "";
|
|
3723
3707
|
var rows = [];
|
|
3724
3708
|
label = this.Id;
|
|
3725
|
-
rows.push("<tr><td class=\"key\">ID:</td><td class=\"value\">"
|
|
3709
|
+
rows.push("<tr><td class=\"key\">ID:</td><td class=\"value\">" + this.Id + "</td></tr>");
|
|
3726
3710
|
if (parentScope) {
|
|
3727
|
-
rows.push("<tr><td class=\"key\">Parent ID:</td><td class=\"value\">"
|
|
3711
|
+
rows.push("<tr><td class=\"key\">Parent ID:</td><td class=\"value\">" + parentScope.Id + "</td></tr>");
|
|
3728
3712
|
}
|
|
3729
|
-
rows.push("<tr><td class=\"key\">Scope:</td><td class=\"value\">"
|
|
3713
|
+
rows.push("<tr><td class=\"key\">Scope:</td><td class=\"value\">" + this.ScopeName + "</td></tr>");
|
|
3730
3714
|
var attrs = this.formattedAttrs();
|
|
3731
3715
|
for (var key in attrs) {
|
|
3732
3716
|
if (key === "Label") {
|
|
3733
3717
|
label = attrs[key];
|
|
3734
3718
|
}
|
|
3735
3719
|
else {
|
|
3736
|
-
rows.push("<tr><td class=\"key\">"
|
|
3720
|
+
rows.push("<tr><td class=\"key\">" + key + "</td><td class=\"value\">" + attrs[key] + "</td></tr>");
|
|
3737
3721
|
}
|
|
3738
3722
|
}
|
|
3739
|
-
return "<div class=\"eclwatch_WUGraph_Tooltip\" style=\"max-width:480px\">\n <h4 align=\"center\">"
|
|
3723
|
+
return "<div class=\"eclwatch_WUGraph_Tooltip\" style=\"max-width:480px\">\n <h4 align=\"center\">" + label + "</h4>\n <table>\n " + rows.join("") + "\n </table>\n </div>";
|
|
3740
3724
|
};
|
|
3741
3725
|
return BaseScope;
|
|
3742
3726
|
}(util.StateObject));
|
|
@@ -3870,13 +3854,13 @@
|
|
|
3870
3854
|
|
|
3871
3855
|
var formatter = utcFormat("%Y-%m-%dT%H:%M:%S.%LZ");
|
|
3872
3856
|
var parser = utcParse("%Y-%m-%dT%H:%M:%S.%LZ");
|
|
3873
|
-
var logger = util.scopedLogger("workunit.ts");
|
|
3857
|
+
var logger$1 = util.scopedLogger("workunit.ts");
|
|
3874
3858
|
var WUStateID = exports.WUStateID;
|
|
3875
3859
|
var WorkunitCache = /** @class */ (function (_super) {
|
|
3876
3860
|
__extends(WorkunitCache, _super);
|
|
3877
3861
|
function WorkunitCache() {
|
|
3878
3862
|
return _super.call(this, function (obj) {
|
|
3879
|
-
return
|
|
3863
|
+
return obj.BaseUrl + "-" + obj.Wuid;
|
|
3880
3864
|
}) || this;
|
|
3881
3865
|
}
|
|
3882
3866
|
return WorkunitCache;
|
|
@@ -4978,7 +4962,7 @@
|
|
|
4978
4962
|
return false;
|
|
4979
4963
|
});
|
|
4980
4964
|
if (!wuMissing) {
|
|
4981
|
-
logger.warning("Unexpected exception: ");
|
|
4965
|
+
logger$1.warning("Unexpected exception: ");
|
|
4982
4966
|
throw e;
|
|
4983
4967
|
}
|
|
4984
4968
|
return {};
|
|
@@ -5015,7 +4999,7 @@
|
|
|
5015
4999
|
return false;
|
|
5016
5000
|
});
|
|
5017
5001
|
if (!wuMissing) {
|
|
5018
|
-
logger.warning("Unexpected exception: ");
|
|
5002
|
+
logger$1.warning("Unexpected exception: ");
|
|
5019
5003
|
throw e;
|
|
5020
5004
|
}
|
|
5021
5005
|
return {};
|
|
@@ -5083,12 +5067,12 @@
|
|
|
5083
5067
|
var optsStr = "";
|
|
5084
5068
|
for (var key in opts) {
|
|
5085
5069
|
if (opts.hasOwnProperty(key)) {
|
|
5086
|
-
optsStr += " "
|
|
5070
|
+
optsStr += " " + key + "='" + opts[key] + "'";
|
|
5087
5071
|
}
|
|
5088
5072
|
}
|
|
5089
5073
|
return this.connection.WUCDebug({
|
|
5090
5074
|
Wuid: this.Wuid,
|
|
5091
|
-
Command: "<debug:"
|
|
5075
|
+
Command: "<debug:" + command + " uid='" + this.Wuid + "'" + optsStr + "/>"
|
|
5092
5076
|
}).then(function (response) {
|
|
5093
5077
|
return response;
|
|
5094
5078
|
});
|
|
@@ -5104,7 +5088,7 @@
|
|
|
5104
5088
|
}
|
|
5105
5089
|
return new util.XMLNode(command);
|
|
5106
5090
|
}).catch(function (_) {
|
|
5107
|
-
logger.error(_);
|
|
5091
|
+
logger$1.error(_);
|
|
5108
5092
|
return Promise.resolve(new util.XMLNode(command));
|
|
5109
5093
|
});
|
|
5110
5094
|
};
|
|
@@ -5219,7 +5203,7 @@
|
|
|
5219
5203
|
column: +_col
|
|
5220
5204
|
};
|
|
5221
5205
|
}
|
|
5222
|
-
throw new Error("Bad definition: "
|
|
5206
|
+
throw new Error("Bad definition: " + vertex._[ATTR_DEFINITION]);
|
|
5223
5207
|
}
|
|
5224
5208
|
function breakpointLocations(graph, path) {
|
|
5225
5209
|
var retVal = [];
|
|
@@ -5408,12 +5392,12 @@
|
|
|
5408
5392
|
__extends(LogicalFileCache, _super);
|
|
5409
5393
|
function LogicalFileCache() {
|
|
5410
5394
|
return _super.call(this, function (obj) {
|
|
5411
|
-
return
|
|
5395
|
+
return obj.BaseUrl + "-" + obj.Cluster + "-" + obj.Name;
|
|
5412
5396
|
}) || this;
|
|
5413
5397
|
}
|
|
5414
5398
|
return LogicalFileCache;
|
|
5415
5399
|
}(util.Cache));
|
|
5416
|
-
var _store
|
|
5400
|
+
var _store = new LogicalFileCache();
|
|
5417
5401
|
var LogicalFile = /** @class */ (function (_super) {
|
|
5418
5402
|
__extends(LogicalFile, _super);
|
|
5419
5403
|
function LogicalFile(optsConnection, Cluster, Name) {
|
|
@@ -5696,14 +5680,14 @@
|
|
|
5696
5680
|
configurable: true
|
|
5697
5681
|
});
|
|
5698
5682
|
LogicalFile.attach = function (optsConnection, Cluster, Name) {
|
|
5699
|
-
var retVal = _store
|
|
5683
|
+
var retVal = _store.get({ BaseUrl: optsConnection.baseUrl, Cluster: Cluster, Name: Name }, function () {
|
|
5700
5684
|
return new LogicalFile(optsConnection, Cluster, Name);
|
|
5701
5685
|
});
|
|
5702
5686
|
return retVal;
|
|
5703
5687
|
};
|
|
5704
5688
|
LogicalFile.prototype.filePartsOnCluster = function () {
|
|
5705
5689
|
var _a;
|
|
5706
|
-
return __spreadArray([], (((_a = this.DFUFilePartsOnClusters) === null || _a === void 0 ? void 0 : _a.DFUFilePartsOnCluster) || [])
|
|
5690
|
+
return __spreadArray([], (((_a = this.DFUFilePartsOnClusters) === null || _a === void 0 ? void 0 : _a.DFUFilePartsOnCluster) || []));
|
|
5707
5691
|
};
|
|
5708
5692
|
LogicalFile.prototype.fileParts = function () {
|
|
5709
5693
|
var _a, _b;
|
|
@@ -6150,12 +6134,12 @@
|
|
|
6150
6134
|
__extends(StoreCache, _super);
|
|
6151
6135
|
function StoreCache() {
|
|
6152
6136
|
return _super.call(this, function (obj) {
|
|
6153
|
-
return
|
|
6137
|
+
return obj.BaseUrl + "-" + obj.Name + ":" + obj.UserSpecific + "-" + obj.Namespace;
|
|
6154
6138
|
}) || this;
|
|
6155
6139
|
}
|
|
6156
6140
|
return StoreCache;
|
|
6157
6141
|
}(util.Cache));
|
|
6158
|
-
var _store = new StoreCache();
|
|
6142
|
+
var _store$1 = new StoreCache();
|
|
6159
6143
|
var ValueChangedMessage = /** @class */ (function (_super) {
|
|
6160
6144
|
__extends(ValueChangedMessage, _super);
|
|
6161
6145
|
function ValueChangedMessage(key, value, oldValue) {
|
|
@@ -6204,7 +6188,7 @@
|
|
|
6204
6188
|
Store.attach = function (optsConnection, Name, Namespace, UserSpecific) {
|
|
6205
6189
|
if (Name === void 0) { Name = "HPCCApps"; }
|
|
6206
6190
|
if (UserSpecific === void 0) { UserSpecific = true; }
|
|
6207
|
-
var retVal = _store.get({ BaseUrl: optsConnection.baseUrl, Name: Name, UserSpecific: UserSpecific, Namespace: Namespace }, function () {
|
|
6191
|
+
var retVal = _store$1.get({ BaseUrl: optsConnection.baseUrl, Name: Name, UserSpecific: UserSpecific, Namespace: Namespace }, function () {
|
|
6208
6192
|
return new Store(optsConnection, Name, Namespace, UserSpecific);
|
|
6209
6193
|
});
|
|
6210
6194
|
return retVal;
|
|
@@ -6228,7 +6212,7 @@
|
|
|
6228
6212
|
_this._dispatch.post(new ValueChangedMessage(key, value, oldValue));
|
|
6229
6213
|
}
|
|
6230
6214
|
}).catch(function (e) {
|
|
6231
|
-
console.error("Store.set(\""
|
|
6215
|
+
console.error("Store.set(\"" + key + "\", \"" + value + "\") failed:", e);
|
|
6232
6216
|
});
|
|
6233
6217
|
};
|
|
6234
6218
|
Store.prototype.get = function (key, broadcast) {
|
|
@@ -6247,7 +6231,7 @@
|
|
|
6247
6231
|
}
|
|
6248
6232
|
return response.Value;
|
|
6249
6233
|
}).catch(function (e) {
|
|
6250
|
-
console.error("Store.get("
|
|
6234
|
+
console.error("Store.get(" + key + ") failed:", e);
|
|
6251
6235
|
return undefined;
|
|
6252
6236
|
});
|
|
6253
6237
|
};
|
|
@@ -6297,7 +6281,7 @@
|
|
|
6297
6281
|
_this._dispatch.post(new ValueChangedMessage(key, undefined, oldValue));
|
|
6298
6282
|
}
|
|
6299
6283
|
}).catch(function (e) {
|
|
6300
|
-
console.error("Store.delete("
|
|
6284
|
+
console.error("Store.delete(" + key + ") failed:", e);
|
|
6301
6285
|
});
|
|
6302
6286
|
};
|
|
6303
6287
|
Store.prototype.monitor = function (callback) {
|
|
@@ -6310,7 +6294,7 @@
|
|
|
6310
6294
|
__extends(TargetClusterCache, _super);
|
|
6311
6295
|
function TargetClusterCache() {
|
|
6312
6296
|
return _super.call(this, function (obj) {
|
|
6313
|
-
return
|
|
6297
|
+
return obj.BaseUrl + "-" + obj.Name;
|
|
6314
6298
|
}) || this;
|
|
6315
6299
|
}
|
|
6316
6300
|
return TargetClusterCache;
|
|
@@ -6409,7 +6393,7 @@
|
|
|
6409
6393
|
var _this = this;
|
|
6410
6394
|
if (request === void 0) { request = {}; }
|
|
6411
6395
|
return this.machineConnection.GetTargetClusterInfo(__assign({ TargetClusters: {
|
|
6412
|
-
Item: [
|
|
6396
|
+
Item: [this.Type + ":" + this.Name]
|
|
6413
6397
|
} }, request)).then(function (response) {
|
|
6414
6398
|
var retVal = [];
|
|
6415
6399
|
for (var _i = 0, _a = response.TargetClusterInfoList.TargetClusterInfo; _i < _a.length; _i++) {
|
|
@@ -6575,7 +6559,7 @@
|
|
|
6575
6559
|
}
|
|
6576
6560
|
}
|
|
6577
6561
|
}
|
|
6578
|
-
return
|
|
6562
|
+
return rootProtocol + "//" + ip + ":" + port + "/";
|
|
6579
6563
|
});
|
|
6580
6564
|
};
|
|
6581
6565
|
Topology.prototype.fetchTargetClusters = function () {
|
|
@@ -6720,5 +6704,5 @@
|
|
|
6720
6704
|
|
|
6721
6705
|
Object.defineProperty(exports, '__esModule', { value: true });
|
|
6722
6706
|
|
|
6723
|
-
}));
|
|
6707
|
+
})));
|
|
6724
6708
|
//# sourceMappingURL=index.js.map
|