@nsshunt/stsappframework 3.0.4 → 3.0.5

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.
Files changed (15) hide show
  1. package/dist/influxdb/influxDBManager.js +28 -16
  2. package/dist/influxdb/influxDBManager.js.map +1 -1
  3. package/dist/kafka/IMKafkaManager.js +7 -2
  4. package/dist/kafka/IMKafkaManager.js.map +1 -1
  5. package/dist/kafka/kafkamanager.js +3 -2
  6. package/dist/kafka/kafkamanager.js.map +1 -1
  7. package/package.json +1 -1
  8. package/src/influxdb/influxDBManager.ts +27 -15
  9. package/src/kafka/IMKafkaManager.ts +6 -2
  10. package/src/kafka/kafkamanager.ts +4 -3
  11. package/types/influxdb/influxDBManager.d.ts +2 -2
  12. package/types/influxdb/influxDBManager.d.ts.map +1 -1
  13. package/types/kafka/IMKafkaManager.d.ts.map +1 -1
  14. package/types/kafka/kafkamanager.d.ts +1 -1
  15. package/types/kafka/kafkamanager.d.ts.map +1 -1
package/dist/influxdb/influxDBManager.js CHANGED
@@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
3
3
  exports.InfluxDBManager = void 0;
4
4
  /* eslint @typescript-eslint/no-explicit-any: 0, @typescript-eslint/no-unused-vars: 0 */ // --> OFF
5
5
  const influxdb_client_1 = require("@influxdata/influxdb-client");
6
- const http_1 = require("http");
6
+ const https_1 = require("https");
7
7
  const stsconfig_1 = require("@nsshunt/stsconfig");
8
8
  const goptions = (0, stsconfig_1.$Options)();
9
9
  const influxDBManagerService_1 = require("./influxDBManagerService");
@@ -185,7 +185,6 @@ from(bucket: "TestBucket01")
185
185
  const _logPrefix = 'InfluxDBManager:';
186
186
  class InfluxDBManager {
187
187
  #shuttingDown = false;
188
- #options;
189
188
  //#token = process.env.INFLUXDB_TOKEN;
190
189
  #token = '';
191
190
  #url = ''; // 'http://192.168.14.92:8086'
@@ -197,21 +196,34 @@ class InfluxDBManager {
197
196
  #writeDataPointFlushTimeout = null;
198
197
  #agent = null;
199
198
  #influxDBManagerClients = {};
200
- constructor(options) {
201
- this.#options = options;
202
- this.#token = options.token;
203
- this.#url = options.url;
204
- this.#org = options.org;
205
- this.#bucket = options.bucket;
206
- if (options.agent) {
207
- this.#agent = new http_1.Agent({
208
- keepAlive: options.agent.influxDB_keepAlive,
199
+ #options;
200
+ constructor() {
201
+ this.#options = {
202
+ token: goptions.influxDB_APIToken,
203
+ url: goptions.influxDB_Url,
204
+ org: goptions.influxDB_Org,
205
+ bucket: goptions.influxDB_Bucket,
206
+ agent: {
207
+ influxDB_keepAlive: goptions.influxDB_keepAlive,
208
+ influxDB_maxSockets: goptions.influxDB_maxSockets,
209
+ influxDB_maxTotalSockets: goptions.influxDB_maxTotalSockets,
210
+ influxDB_maxFreeSockets: goptions.influxDB_maxFreeSockets,
211
+ influxDB_timeout: goptions.influxDB_timeout,
212
+ }
213
+ };
214
+ this.#token = this.#options.token;
215
+ this.#url = this.#options.url;
216
+ this.#org = this.#options.org;
217
+ this.#bucket = this.#options.bucket;
218
+ if (this.#options.agent) {
219
+ this.#agent = new https_1.Agent({
220
+ keepAlive: this.#options.agent.influxDB_keepAlive,
209
221
  keepAliveMsecs: 20000,
210
- maxSockets: options.agent.influxDB_maxSockets,
211
- maxTotalSockets: options.agent.influxDB_maxTotalSockets,
212
- maxFreeSockets: options.agent.influxDB_maxFreeSockets,
213
- timeout: options.agent.influxDB_timeout,
214
- //.rejectUnauthorized: options.agent.influxDB_rejectUnauthorized, // only for SSL
222
+ maxSockets: this.#options.agent.influxDB_maxSockets,
223
+ maxTotalSockets: this.#options.agent.influxDB_maxTotalSockets,
224
+ maxFreeSockets: this.#options.agent.influxDB_maxFreeSockets,
225
+ timeout: this.#options.agent.influxDB_timeout,
226
+ rejectUnauthorized: this.#options.agent.influxDB_rejectUnauthorized, // only for SSL
215
227
  });
216
228
  this.#client = new influxdb_client_1.InfluxDB({
217
229
  url: this.#url,
package/dist/influxdb/influxDBManager.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"influxDBManager.js","sourceRoot":"","sources":["../../src/influxdb/influxDBManager.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"influxDBManager.js","sourceRoot":"","sources":["../../src/influxdb/influxDBManager.ts"],"names":[],"mappings":"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"}
package/dist/kafka/IMKafkaManager.js CHANGED
@@ -76,8 +76,13 @@ class IMKafkaManager {
76
76
  if (!this.#topics[topic]) {
77
77
  console.log(`Setting up kafka topic: [${topic}] Starting`.yellow);
78
78
  this.#topics[topic] = true;
79
- await this.#km.CreateTopic(topic, 1);
80
- console.log(`Setting up kafka topic: [${topic}] Completed`.yellow);
79
+ const result = await this.#km.CreateTopic(topic, 1);
80
+ if (result) {
81
+ console.log(`Setting up kafka topic: [${topic}] Completed`.yellow);
82
+ }
83
+ else {
84
+ console.log(`Setting up kafka topic: [${topic}] Completed - topic already exists`.cyan);
85
+ }
81
86
  }
82
87
  if (instrumentPayload.instruments[stsinstrumentation_1.Gauge.LOGGER]) {
83
88
  const loggerMessages = [...instrumentPayload.instruments[stsinstrumentation_1.Gauge.LOGGER].val];
package/dist/kafka/IMKafkaManager.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"IMKafkaManager.js","sourceRoot":"","sources":["../../src/kafka/IMKafkaManager.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"IMKafkaManager.js","sourceRoot":"","sources":["../../src/kafka/IMKafkaManager.ts"],"names":[],"mappings":"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"}
package/dist/kafka/kafkamanager.js CHANGED
@@ -125,7 +125,7 @@ class KafkaManager extends stsutils_1.STSOptionsBase {
125
125
  CreateTopic = async (topic, partitions) => {
126
126
  const admin = this.#kafka.admin();
127
127
  await admin.connect();
128
- await admin.createTopics({
128
+ const result = await admin.createTopics({
129
129
  validateOnly: false,
130
130
  waitForLeaders: true,
131
131
  timeout: this.options?.timeout,
@@ -139,7 +139,8 @@ class KafkaManager extends stsutils_1.STSOptionsBase {
139
139
  }
140
140
  ]
141
141
  });
142
- return admin.disconnect();
142
+ await admin.disconnect();
143
+ return result;
143
144
  };
144
145
  }
145
146
  exports.KafkaManager = KafkaManager;
package/dist/kafka/kafkamanager.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"kafkamanager.js","sourceRoot":"","sources":["../../src/kafka/kafkamanager.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"kafkamanager.js","sourceRoot":"","sources":["../../src/kafka/kafkamanager.ts"],"names":[],"mappings":"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"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@nsshunt/stsappframework",
3
- "version": "3.0.4",
3
+ "version": "3.0.5",
4
4
  "description": "",
5
5
  "main": "dist/index.js",
6
6
  "types": "./types/index.d.ts",
package/src/influxdb/influxDBManager.ts CHANGED
@@ -1,6 +1,6 @@
1
1
  /* eslint @typescript-eslint/no-explicit-any: 0, @typescript-eslint/no-unused-vars: 0 */ // --> OFF
2
2
  import { InfluxDB, Point, WriteApi, QueryApi, flux } from '@influxdata/influxdb-client'
3
- import { Agent } from 'http'
3
+ import { Agent } from 'https'
4
4
 
5
5
  import { $Options } from '@nsshunt/stsconfig'
6
6
  import { JSONObject } from '@nsshunt/stsutils'
@@ -193,7 +193,6 @@ const _logPrefix = 'InfluxDBManager:'
193
193
  export class InfluxDBManager
194
194
  {
195
195
  #shuttingDown: boolean = false;
196
- #options: IInfluxDBManagerOptions;
197
196
 
198
197
  //#token = process.env.INFLUXDB_TOKEN;
199
198
  #token = '';
@@ -206,25 +205,38 @@ export class InfluxDBManager
206
205
  #writeDataPointFlushTimeout: NodeJS.Timeout | null = null;
207
206
  #agent: Agent | null = null;
208
207
  #influxDBManagerClients: Record<string, InfluxDBManagerBase> = { };
208
+ #options: IInfluxDBManagerOptions;
209
209
 
210
- constructor(options: IInfluxDBManagerOptions)
210
+ constructor()
211
211
  {
212
- this.#options = options;
212
+ this.#options = {
213
+ token: goptions.influxDB_APIToken,
214
+ url: goptions.influxDB_Url,
215
+ org: goptions.influxDB_Org,
216
+ bucket:goptions.influxDB_Bucket,
217
+ agent: {
218
+ influxDB_keepAlive: goptions.influxDB_keepAlive,
219
+ influxDB_maxSockets: goptions.influxDB_maxSockets,
220
+ influxDB_maxTotalSockets: goptions.influxDB_maxTotalSockets,
221
+ influxDB_maxFreeSockets: goptions.influxDB_maxFreeSockets,
222
+ influxDB_timeout: goptions.influxDB_timeout,
223
+ }
224
+ };
213
225
 
214
- this.#token = options.token;
215
- this.#url = options.url;
216
- this.#org = options.org;
217
- this.#bucket = options.bucket;
226
+ this.#token = this.#options.token;
227
+ this.#url = this.#options.url;
228
+ this.#org = this.#options.org;
229
+ this.#bucket = this.#options.bucket;
218
230
 
219
- if (options.agent) {
231
+ if (this.#options.agent) {
220
232
  this.#agent = new Agent({
221
- keepAlive: options.agent.influxDB_keepAlive,
233
+ keepAlive: this.#options.agent.influxDB_keepAlive,
222
234
  keepAliveMsecs: 20000, //@@
223
- maxSockets: options.agent.influxDB_maxSockets,
224
- maxTotalSockets: options.agent.influxDB_maxTotalSockets,
225
- maxFreeSockets: options.agent.influxDB_maxFreeSockets,
226
- timeout: options.agent.influxDB_timeout,
227
- //.rejectUnauthorized: options.agent.influxDB_rejectUnauthorized, // only for SSL
235
+ maxSockets: this.#options.agent.influxDB_maxSockets,
236
+ maxTotalSockets: this.#options.agent.influxDB_maxTotalSockets,
237
+ maxFreeSockets: this.#options.agent.influxDB_maxFreeSockets,
238
+ timeout: this.#options.agent.influxDB_timeout,
239
+ rejectUnauthorized: this.#options.agent.influxDB_rejectUnauthorized, // only for SSL
228
240
  })
229
241
 
230
242
  this.#client = new InfluxDB({
package/src/kafka/IMKafkaManager.ts CHANGED
@@ -92,8 +92,12 @@ export class IMKafkaManager {
92
92
  if (!this.#topics[topic]) {
93
93
  console.log(`Setting up kafka topic: [${topic}] Starting`.yellow);
94
94
  this.#topics[topic] = true;
95
- await this.#km.CreateTopic(topic, 1);
96
- console.log(`Setting up kafka topic: [${topic}] Completed`.yellow);
95
+ const result = await this.#km.CreateTopic(topic, 1);
96
+ if (result) {
97
+ console.log(`Setting up kafka topic: [${topic}] Completed`.yellow);
98
+ } else {
99
+ console.log(`Setting up kafka topic: [${topic}] Completed - topic already exists`.cyan);
100
+ }
97
101
  }
98
102
 
99
103
  if (instrumentPayload.instruments[Gauge.LOGGER]) {
package/src/kafka/kafkamanager.ts CHANGED
@@ -159,10 +159,10 @@ export class KafkaManager extends STSOptionsBase {
159
159
  return new KafkaConsumer(this.#kafka, uuidv4(), groupId);
160
160
  }
161
161
 
162
- CreateTopic = async (topic: string, partitions: number): Promise<void> => {
162
+ CreateTopic = async (topic: string, partitions: number): Promise<boolean> => {
163
163
  const admin = this.#kafka.admin()
164
164
  await admin.connect()
165
- await admin.createTopics({
165
+ const result = await admin.createTopics({
166
166
  validateOnly: false,
167
167
  waitForLeaders: true,
168
168
  timeout: this.options?.timeout,
@@ -176,6 +176,7 @@ export class KafkaManager extends STSOptionsBase {
176
176
  }
177
177
  ]
178
178
  })
179
- return admin.disconnect()
179
+ await admin.disconnect()
180
+ return result;
180
181
  }
181
182
  }
package/types/influxdb/influxDBManager.d.ts CHANGED
@@ -1,10 +1,10 @@
1
1
  import { JSONObject } from '@nsshunt/stsutils';
2
2
  import { InfluxDBManagerService } from './influxDBManagerService';
3
3
  import { InfluxDBManagerAgent } from './influxDBManagerAgent';
4
- import { IInfluxDBManagerOptions, InstrumentPayload } from './../commonTypes';
4
+ import { InstrumentPayload } from './../commonTypes';
5
5
  export declare class InfluxDBManager {
6
6
  #private;
7
- constructor(options: IInfluxDBManagerOptions);
7
+ constructor();
8
8
  CreateInfluxDBManagerClient(modelType: string): void;
9
9
  get serviceManager(): InfluxDBManagerService;
10
10
  get agentManager(): InfluxDBManagerAgent;
package/types/influxdb/influxDBManager.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"influxDBManager.d.ts","sourceRoot":"","sources":["../../src/influxdb/influxDBManager.ts"],"names":[],"mappings":"AAKA,OAAO,EAAE,UAAU,EAAE,MAAM,mBAAmB,CAAA;AAI9C,OAAO,EAAE,sBAAsB,EAAC,MAAM,0BAA0B,CAAA;AAChE,OAAO,EAAE,oBAAoB,EAAE,MAAM,wBAAwB,CAAA;AAC7D,OAAO,EAAE,uBAAuB,EAAE,iBAAiB,EAAE,MAAM,kBAAkB,CAAA;AAqL7E,qBAAa,eAAe;;gBAiBZ,OAAO,EAAE,uBAAuB;IAkD5C,2BAA2B,CAAC,SAAS,EAAE,MAAM;IAa7C,IAAI,cAAc,IAAI,sBAAsB,CAE3C;IAED,IAAI,YAAY,IAAI,oBAAoB,CAEvC;IAED,KAAK,sBAEJ;IAED,SAAS,sBAuBR;IAQD,sBAAsB,aAAc,GAAG,EAAE,SAUxC;IAGD,kBAAkB,CAAC,eAAe,EAAE,UAAU,EAAE,OAAO,EAAE,MAAM,EAAE,GAAG,UAAU;IAaxE,cAAc,CAAC,iBAAiB,EAAE,iBAAiB,GAAG,OAAO,CAAC,OAAO,CAAC;CAe/E"}
1
+ {"version":3,"file":"influxDBManager.d.ts","sourceRoot":"","sources":["../../src/influxdb/influxDBManager.ts"],"names":[],"mappings":"AAKA,OAAO,EAAE,UAAU,EAAE,MAAM,mBAAmB,CAAA;AAI9C,OAAO,EAAE,sBAAsB,EAAC,MAAM,0BAA0B,CAAA;AAChE,OAAO,EAAE,oBAAoB,EAAE,MAAM,wBAAwB,CAAA;AAC7D,OAAO,EAA2B,iBAAiB,EAAE,MAAM,kBAAkB,CAAA;AAqL7E,qBAAa,eAAe;;;IA+ExB,2BAA2B,CAAC,SAAS,EAAE,MAAM;IAa7C,IAAI,cAAc,IAAI,sBAAsB,CAE3C;IAED,IAAI,YAAY,IAAI,oBAAoB,CAEvC;IAED,KAAK,sBAEJ;IAED,SAAS,sBAuBR;IAQD,sBAAsB,aAAc,GAAG,EAAE,SAUxC;IAGD,kBAAkB,CAAC,eAAe,EAAE,UAAU,EAAE,OAAO,EAAE,MAAM,EAAE,GAAG,UAAU;IAaxE,cAAc,CAAC,iBAAiB,EAAE,iBAAiB,GAAG,OAAO,CAAC,OAAO,CAAC;CAe/E"}
package/types/kafka/IMKafkaManager.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"IMKafkaManager.d.ts","sourceRoot":"","sources":["../../src/kafka/IMKafkaManager.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,iBAAiB,EAAE,MAAM,kBAAkB,CAAA;AAGpD,OAAO,EAAE,YAAY,EAAuB,MAAM,gBAAgB,CAAA;AAWlE,qBAAa,cAAc;;;IAiCvB,IAAI,EAAE,IAAI,YAAY,CAErB;IAED,KAAK,QAAa,QAAQ,IAAI,CAAC,CAG9B;IAED,SAAS,QAAa,QAAQ,IAAI,CAAC,CAclC;IAEK,UAAU,CAAC,iBAAiB,EAAE,iBAAiB,GAAG,OAAO,CAAC,OAAO,CAAC;CA8C3E"}
1
+ {"version":3,"file":"IMKafkaManager.d.ts","sourceRoot":"","sources":["../../src/kafka/IMKafkaManager.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,iBAAiB,EAAE,MAAM,kBAAkB,CAAA;AAGpD,OAAO,EAAE,YAAY,EAAuB,MAAM,gBAAgB,CAAA;AAWlE,qBAAa,cAAc;;;IAiCvB,IAAI,EAAE,IAAI,YAAY,CAErB;IAED,KAAK,QAAa,QAAQ,IAAI,CAAC,CAG9B;IAED,SAAS,QAAa,QAAQ,IAAI,CAAC,CAclC;IAEK,UAAU,CAAC,iBAAiB,EAAE,iBAAiB,GAAG,OAAO,CAAC,OAAO,CAAC;CAkD3E"}
package/types/kafka/kafkamanager.d.ts CHANGED
@@ -22,6 +22,6 @@ export declare class KafkaManager extends STSOptionsBase {
22
22
  constructor(options: IKafkaManagerConfig);
23
23
  CreateProducer(): KafkaProducer;
24
24
  CreateConsumer(groupId: string): KafkaConsumer;
25
- CreateTopic: (topic: string, partitions: number) => Promise<void>;
25
+ CreateTopic: (topic: string, partitions: number) => Promise<boolean>;
26
26
  }
27
27
  //# sourceMappingURL=kafkamanager.d.ts.map
package/types/kafka/kafkamanager.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"kafkamanager.d.ts","sourceRoot":"","sources":["../../src/kafka/kafkamanager.ts"],"names":[],"mappings":"AAqDA,OAAO,EAAE,cAAc,EAAE,MAAM,mBAAmB,CAAA;AAOlD,OAAO,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAA;AAC/C,OAAO,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAA;AAQ/C,MAAM,WAAW,mBAAmB;IAChC,QAAQ,EAAE,MAAM,CAAA;IAChB,OAAO,EAAE,MAAM,EAAE,CAAA;IACjB,YAAY,EAAE,MAAM,CAAA;IACpB,iBAAiB,EAAE,MAAM,CAAA;IACzB,cAAc,EAAE,MAAM,CAAA;IACtB,QAAQ,EAAE,MAAM,CAAA;IAChB,SAAS,CAAC,EAAE,MAAM,CAAA;IAClB,MAAM,EAAE,OAAO,CAAA;IACf,GAAG,CAAC,EAAE;QACJ,kBAAkB,EAAE,OAAO,CAAA;QAC3B,MAAM,EAAE,MAAM,CAAA;QACd,OAAO,EAAE,MAAM,CAAA;QACf,YAAY,EAAE,MAAM,CAAA;KACrB,CAAA;CACJ;AAWD,qBAAa,YAAa,SAAQ,cAAc;;gBAGhC,OAAO,EAAE,mBAAmB;IAuDxC,cAAc,IAAI,aAAa;IAI/B,cAAc,CAAC,OAAO,EAAE,MAAM;IAI9B,WAAW,UAAiB,MAAM,cAAc,MAAM,KAAG,QAAQ,IAAI,CAAC,CAkBrE;CACJ"}
1
+ {"version":3,"file":"kafkamanager.d.ts","sourceRoot":"","sources":["../../src/kafka/kafkamanager.ts"],"names":[],"mappings":"AAqDA,OAAO,EAAE,cAAc,EAAE,MAAM,mBAAmB,CAAA;AAOlD,OAAO,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAA;AAC/C,OAAO,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAA;AAQ/C,MAAM,WAAW,mBAAmB;IAChC,QAAQ,EAAE,MAAM,CAAA;IAChB,OAAO,EAAE,MAAM,EAAE,CAAA;IACjB,YAAY,EAAE,MAAM,CAAA;IACpB,iBAAiB,EAAE,MAAM,CAAA;IACzB,cAAc,EAAE,MAAM,CAAA;IACtB,QAAQ,EAAE,MAAM,CAAA;IAChB,SAAS,CAAC,EAAE,MAAM,CAAA;IAClB,MAAM,EAAE,OAAO,CAAA;IACf,GAAG,CAAC,EAAE;QACJ,kBAAkB,EAAE,OAAO,CAAA;QAC3B,MAAM,EAAE,MAAM,CAAA;QACd,OAAO,EAAE,MAAM,CAAA;QACf,YAAY,EAAE,MAAM,CAAA;KACrB,CAAA;CACJ;AAWD,qBAAa,YAAa,SAAQ,cAAc;;gBAGhC,OAAO,EAAE,mBAAmB;IAuDxC,cAAc,IAAI,aAAa;IAI/B,cAAc,CAAC,OAAO,EAAE,MAAM;IAI9B,WAAW,UAAiB,MAAM,cAAc,MAAM,KAAG,QAAQ,OAAO,CAAC,CAmBxE;CACJ"}