@hpcc-js/comms 2.93.0 → 2.94.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.
@@ -1,4 +1,4 @@
1
1
  export var PKG_NAME = "@hpcc-js/comms";
2
- export var PKG_VERSION = "2.93.0";
3
- export var BUILD_VERSION = "2.105.13";
2
+ export var PKG_VERSION = "2.94.0";
3
+ export var BUILD_VERSION = "2.106.0";
4
4
  //# sourceMappingURL=__package__.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"__package__.js","sourceRoot":"","sources":["../src/__package__.ts"],"names":[],"mappings":"AAAA,MAAM,CAAC,IAAM,QAAQ,GAAG,gBAAgB,CAAC;AACzC,MAAM,CAAC,IAAM,WAAW,GAAG,QAAQ,CAAC;AACpC,MAAM,CAAC,IAAM,aAAa,GAAG,UAAU,CAAC"}
1
+ {"version":3,"file":"__package__.js","sourceRoot":"","sources":["../src/__package__.ts"],"names":[],"mappings":"AAAA,MAAM,CAAC,IAAM,QAAQ,GAAG,gBAAgB,CAAC;AACzC,MAAM,CAAC,IAAM,WAAW,GAAG,QAAQ,CAAC;AACpC,MAAM,CAAC,IAAM,aAAa,GAAG,SAAS,CAAC"}
@@ -66,17 +66,41 @@ var LogaccessService = /** @class */ (function (_super) {
66
66
  _loop_1 = function (key) {
67
67
  var searchField;
68
68
  if (key in columnMap) {
69
- searchField = columnMap[key];
69
+ if (Object.values(WsLogaccess.LogColumnType).includes(key)) {
70
+ searchField = key;
71
+ }
72
+ else {
73
+ searchField = columnMap[key];
74
+ }
70
75
  }
71
- var logCategory = WsLogaccess.LogAccessType.ByFieldName;
76
+ var logCategory;
72
77
  if (searchField) {
73
78
  switch (searchField) {
79
+ case WsLogaccess.LogColumnType.workunits:
80
+ case "hpcc.log.jobid":
81
+ logCategory = WsLogaccess.LogAccessType.ByJobID;
82
+ break;
83
+ case WsLogaccess.LogColumnType.audience:
74
84
  case "hpcc.log.audience":
75
85
  logCategory = WsLogaccess.LogAccessType.ByTargetAudience;
76
86
  break;
87
+ case WsLogaccess.LogColumnType.class:
88
+ case "hpcc.log.class":
89
+ logCategory = WsLogaccess.LogAccessType.ByLogType;
90
+ break;
91
+ case WsLogaccess.LogColumnType.components:
92
+ case "kubernetes.container.name":
93
+ logCategory = WsLogaccess.LogAccessType.ByComponent;
94
+ break;
95
+ default:
96
+ logCategory = WsLogaccess.LogAccessType.ByFieldName;
97
+ searchField = columnMap[key];
77
98
  }
78
99
  if (Array.isArray(request[key])) {
79
100
  request[key].forEach(function (value) {
101
+ if (logCategory === WsLogaccess.LogAccessType.ByComponent) {
102
+ value += "*";
103
+ }
80
104
  filters.push({
81
105
  LogCategory: logCategory,
82
106
  SearchField: searchField,
@@ -85,10 +109,16 @@ var LogaccessService = /** @class */ (function (_super) {
85
109
  });
86
110
  }
87
111
  else {
112
+ var value = request[key];
113
+ if (logCategory === WsLogaccess.LogAccessType.ByComponent) {
114
+ // append wildcard to end of search value to include ephemeral
115
+ // containers that aren't listed in ECL Watch's filters
116
+ value += "*";
117
+ }
88
118
  filters.push({
89
119
  LogCategory: logCategory,
90
120
  SearchField: searchField,
91
- SearchByValue: request[key]
121
+ SearchByValue: value
92
122
  });
93
123
  }
94
124
  }
@@ -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.93.0",
3
+ "version": "2.94.0",
4
4
  "description": "hpcc-js - Communications",
5
5
  "main": "dist/index.node.js",
6
6
  "module": "dist/index.es6",
@@ -61,8 +61,8 @@
61
61
  "wsdl": "npm-run-all --aggregate-output -c --serial compile-util --parallel wsdl-access wsdl-account wsdl-cloud wsdl-codesign wsdl-dali wsdl-dfu wsdl-dfuxref wsdl-elk wsdl-fileio wsdl-filespray wsdl-logaccess wsdl-packageprocess wsdl-smc wsdl-store wsdl-topology wsdl-workunits"
62
62
  },
63
63
  "dependencies": {
64
- "@hpcc-js/ddl-shim": "^2.20.7",
65
- "@hpcc-js/util": "^2.51.1",
64
+ "@hpcc-js/ddl-shim": "^2.21.0",
65
+ "@hpcc-js/util": "^2.52.0",
66
66
  "@xmldom/xmldom": "0.8.10",
67
67
  "abort-controller": "3.0.0",
68
68
  "node-fetch": "2.7.0",
@@ -71,7 +71,7 @@
71
71
  "undici": "5.28.4"
72
72
  },
73
73
  "devDependencies": {
74
- "@hpcc-js/bundle": "^2.11.5",
74
+ "@hpcc-js/bundle": "^2.12.0",
75
75
  "@types/d3-request": "1.0.9",
76
76
  "@types/d3-time-format": "2.3.4",
77
77
  "@types/node": "^18",
@@ -94,5 +94,5 @@
94
94
  "url": "https://github.com/hpcc-systems/Visualization/issues"
95
95
  },
96
96
  "homepage": "https://github.com/hpcc-systems/Visualization",
97
- "gitHead": "3f1fde38b06c31eb2a91b153244053652305b4bc"
97
+ "gitHead": "99332f074dd1fff0cbb8eae52c5b6c98d6ad5a7a"
98
98
  }
@@ -1,3 +1,3 @@
1
1
  export const PKG_NAME = "@hpcc-js/comms";
2
- export const PKG_VERSION = "2.93.0";
3
- export const BUILD_VERSION = "2.105.13";
2
+ export const PKG_VERSION = "2.94.0";
3
+ export const BUILD_VERSION = "2.106.0";
@@ -117,17 +117,40 @@ export class LogaccessService extends LogaccessServiceBase {
117
117
  for (const key in request) {
118
118
  let searchField;
119
119
  if (key in columnMap) {
120
- searchField = columnMap[key];
120
+ if (Object.values(WsLogaccess.LogColumnType).includes(key as WsLogaccess.LogColumnType)) {
121
+ searchField = key;
122
+ } else {
123
+ searchField = columnMap[key];
124
+ }
121
125
  }
122
- let logCategory = WsLogaccess.LogAccessType.ByFieldName;
126
+ let logCategory;
123
127
  if (searchField) {
124
128
  switch (searchField) {
129
+ case WsLogaccess.LogColumnType.workunits:
130
+ case "hpcc.log.jobid":
131
+ logCategory = WsLogaccess.LogAccessType.ByJobID;
132
+ break;
133
+ case WsLogaccess.LogColumnType.audience:
125
134
  case "hpcc.log.audience":
126
135
  logCategory = WsLogaccess.LogAccessType.ByTargetAudience;
127
136
  break;
137
+ case WsLogaccess.LogColumnType.class:
138
+ case "hpcc.log.class":
139
+ logCategory = WsLogaccess.LogAccessType.ByLogType;
140
+ break;
141
+ case WsLogaccess.LogColumnType.components:
142
+ case "kubernetes.container.name":
143
+ logCategory = WsLogaccess.LogAccessType.ByComponent;
144
+ break;
145
+ default:
146
+ logCategory = WsLogaccess.LogAccessType.ByFieldName;
147
+ searchField = columnMap[key];
128
148
  }
129
149
  if (Array.isArray(request[key])) {
130
150
  request[key].forEach(value => {
151
+ if (logCategory === WsLogaccess.LogAccessType.ByComponent) {
152
+ value += "*";
153
+ }
131
154
  filters.push({
132
155
  LogCategory: logCategory,
133
156
  SearchField: searchField,
@@ -135,10 +158,16 @@ export class LogaccessService extends LogaccessServiceBase {
135
158
  });
136
159
  });
137
160
  } else {
161
+ let value = request[key];
162
+ if (logCategory === WsLogaccess.LogAccessType.ByComponent) {
163
+ // append wildcard to end of search value to include ephemeral
164
+ // containers that aren't listed in ECL Watch's filters
165
+ value += "*";
166
+ }
138
167
  filters.push({
139
168
  LogCategory: logCategory,
140
169
  SearchField: searchField,
141
- SearchByValue: request[key]
170
+ SearchByValue: value
142
171
  });
143
172
  }
144
173
  }
@@ -1,4 +1,4 @@
1
1
  export declare const PKG_NAME = "@hpcc-js/comms";
2
- export declare const PKG_VERSION = "2.93.0";
3
- export declare const BUILD_VERSION = "2.105.13";
2
+ export declare const PKG_VERSION = "2.94.0";
3
+ export declare const BUILD_VERSION = "2.106.0";
4
4
  //# sourceMappingURL=__package__.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"__package__.d.ts","sourceRoot":"","sources":["../src/__package__.ts"],"names":[],"mappings":"AAAA,eAAO,MAAM,QAAQ,mBAAmB,CAAC;AACzC,eAAO,MAAM,WAAW,WAAW,CAAC;AACpC,eAAO,MAAM,aAAa,aAAa,CAAC"}
1
+ {"version":3,"file":"__package__.d.ts","sourceRoot":"","sources":["../src/__package__.ts"],"names":[],"mappings":"AAAA,eAAO,MAAM,QAAQ,mBAAmB,CAAC;AACzC,eAAO,MAAM,WAAW,WAAW,CAAC;AACpC,eAAO,MAAM,aAAa,YAAY,CAAC"}
@@ -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,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,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;AAGD,MAAM,WAAW,OAAO;IACpB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,QAAQ,CAAC,EAAE,MAAM,CAAC;CACrB;AAED,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;CAwJzE"}
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,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,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;AAGD,MAAM,WAAW,OAAO;IACpB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,QAAQ,CAAC,EAAE,MAAM,CAAC;CACrB;AAED,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;CAqLzE"}
@@ -1,4 +1,4 @@
1
1
  export declare const PKG_NAME = "@hpcc-js/comms";
2
- export declare const PKG_VERSION = "2.93.0";
3
- export declare const BUILD_VERSION = "2.105.13";
2
+ export declare const PKG_VERSION = "2.94.0";
3
+ export declare const BUILD_VERSION = "2.106.0";
4
4
  //# sourceMappingURL=__package__.d.ts.map