@nsshunt/stsappframework 3.0.24 → 3.0.25

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 (6) hide show
  1. package/dist/instrumentationsubscriber.js +15 -9
  2. package/dist/instrumentationsubscriber.js.map +1 -1
  3. package/package.json +1 -1
  4. package/src/instrumentationsubscriber.ts +15 -10
  5. package/types/instrumentationsubscriber.d.ts +2 -14
  6. package/types/instrumentationsubscriber.d.ts.map +1 -1
package/dist/instrumentationsubscriber.js CHANGED
@@ -214,21 +214,27 @@ class InstrumentationSubscriber extends stsutils_1.STSOptionsBase {
214
214
  }
215
215
  }
216
216
  }
217
- UnSubscribe(subscription) {
218
- if (subscription.subscriptionKey.topic.localeCompare(commonTypes_1.SubscriptionTopic.LogProcessing) === 0) {
219
- this.#UnSubscribeKafka(subscription);
217
+ UnSubscribe(subscriptionKey) {
218
+ const combinedKey = this.#GetInternalSubscriptionKey(subscriptionKey);
219
+ if (!this.#subscriptions[combinedKey]) {
220
+ console.log(`UnSubscribe(): Warning, combinedKey: [${combinedKey}] does not exist within subscription records`.magenta);
220
221
  }
221
- delete this.#subscriptions[subscription.combinedKey];
222
- if (Object.keys(this.#subscriptions).length === 0) {
223
- if (this.#interval) {
224
- clearInterval(this.#interval);
225
- this.#interval = null;
222
+ else {
223
+ if (subscriptionKey.topic.localeCompare(commonTypes_1.SubscriptionTopic.LogProcessing) === 0) {
224
+ this.#UnSubscribeKafka(this.#subscriptions[combinedKey]);
225
+ }
226
+ delete this.#subscriptions[combinedKey];
227
+ if (Object.keys(this.#subscriptions).length === 0) {
228
+ if (this.#interval) {
229
+ clearInterval(this.#interval);
230
+ this.#interval = null;
231
+ }
226
232
  }
227
233
  }
228
234
  }
229
235
  #UnSubscribeAll() {
230
236
  for (const [, subscription] of Object.entries(this.#subscriptions)) {
231
- this.UnSubscribe(subscription);
237
+ this.UnSubscribe(subscription.subscriptionKey);
232
238
  }
233
239
  }
234
240
  async Start() {
package/dist/instrumentationsubscriber.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"instrumentationsubscriber.js","sourceRoot":"","sources":["../src/instrumentationsubscriber.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"instrumentationsubscriber.js","sourceRoot":"","sources":["../src/instrumentationsubscriber.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.24",
3
+ "version": "3.0.25",
4
4
  "description": "",
5
5
  "main": "dist/index.js",
6
6
  "types": "./types/index.d.ts",
package/src/instrumentationsubscriber.ts CHANGED
@@ -237,23 +237,28 @@ export class InstrumentationSubscriber extends STSOptionsBase {
237
237
  }
238
238
  }
239
239
 
240
- UnSubscribe(subscription: ISubscription) {
241
- if (subscription.subscriptionKey.topic.localeCompare(SubscriptionTopic.LogProcessing) === 0) {
242
- this.#UnSubscribeKafka(subscription);
243
- }
244
- delete this.#subscriptions[subscription.combinedKey];
240
+ UnSubscribe(subscriptionKey: ISubscriptionKey) {
241
+ const combinedKey = this.#GetInternalSubscriptionKey(subscriptionKey);
242
+ if (!this.#subscriptions[combinedKey]) {
243
+ console.log(`UnSubscribe(): Warning, combinedKey: [${combinedKey}] does not exist within subscription records`.magenta);
244
+ } else {
245
+ if (subscriptionKey.topic.localeCompare(SubscriptionTopic.LogProcessing) === 0) {
246
+ this.#UnSubscribeKafka(this.#subscriptions[combinedKey]);
247
+ }
248
+ delete this.#subscriptions[combinedKey];
245
249
 
246
- if (Object.keys(this.#subscriptions).length === 0) {
247
- if (this.#interval) {
248
- clearInterval(this.#interval);
249
- this.#interval = null;
250
+ if (Object.keys(this.#subscriptions).length === 0) {
251
+ if (this.#interval) {
252
+ clearInterval(this.#interval);
253
+ this.#interval = null;
254
+ }
250
255
  }
251
256
  }
252
257
  }
253
258
 
254
259
  #UnSubscribeAll() {
255
260
  for (const [, subscription] of Object.entries(this.#subscriptions)) {
256
- this.UnSubscribe(subscription);
261
+ this.UnSubscribe(subscription.subscriptionKey);
257
262
  }
258
263
  }
259
264
 
package/types/instrumentationsubscriber.d.ts CHANGED
@@ -1,16 +1,5 @@
1
- import { ISubscriptionPayload, IKafkaConsumer, ISubscriptionKey } from './commonTypes';
1
+ import { ISubscriptionPayload, ISubscriptionKey } from './commonTypes';
2
2
  import { STSOptionsBase } from '@nsshunt/stsutils';
3
- declare interface IKafkaSubscription {
4
- kafkaTopic: string;
5
- kafkaGroupId: string;
6
- kafkaConsumer: IKafkaConsumer;
7
- }
8
- declare interface ISubscription {
9
- combinedKey: string;
10
- subscriptionKey: ISubscriptionKey;
11
- kafka?: IKafkaSubscription;
12
- cb: (payload: ISubscriptionPayload) => void;
13
- }
14
3
  export interface IInstrumentationSubscriberOptions {
15
4
  SubscriptionInterval: number;
16
5
  }
@@ -18,9 +7,8 @@ export declare class InstrumentationSubscriber extends STSOptionsBase {
18
7
  #private;
19
8
  constructor(options: IInstrumentationSubscriberOptions);
20
9
  Subscribe(subscriptionKey: ISubscriptionKey, cb: (payload: ISubscriptionPayload) => void): void;
21
- UnSubscribe(subscription: ISubscription): void;
10
+ UnSubscribe(subscriptionKey: ISubscriptionKey): void;
22
11
  Start(): Promise<void>;
23
12
  Stop(): Promise<void>;
24
13
  }
25
- export {};
26
14
  //# sourceMappingURL=instrumentationsubscriber.d.ts.map
package/types/instrumentationsubscriber.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"instrumentationsubscriber.d.ts","sourceRoot":"","sources":["../src/instrumentationsubscriber.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,oBAAoB,EAAiC,cAAc,EAAE,gBAAgB,EAAE,MAAM,eAAe,CAAA;AAOrH,OAAO,EAAE,cAAc,EAAE,MAAM,mBAAmB,CAAC;AAGnD,OAAO,WAAW,kBAAkB;IAChC,UAAU,EAAE,MAAM,CAAA;IAClB,YAAY,EAAE,MAAM,CAAA;IACpB,aAAa,EAAE,cAAc,CAAA;CAChC;AAED,OAAO,WAAW,aAAa;IAC3B,WAAW,EAAE,MAAM,CAAA;IACnB,eAAe,EAAE,gBAAgB,CAAA;IACjC,KAAK,CAAC,EAAE,kBAAkB,CAAA;IAC1B,EAAE,EAAE,CAAC,OAAO,EAAE,oBAAoB,KAAK,IAAI,CAAA;CAC9C;AAID,MAAM,WAAW,iCAAiC;IAC9C,oBAAoB,EAAE,MAAM,CAAA;CAC/B;AAED,qBAAa,yBAA0B,SAAQ,cAAc;;gBAO7C,OAAO,EAAE,iCAAiC;IAyKtD,SAAS,CAAC,eAAe,EAAE,gBAAgB,EAAE,EAAE,EAAE,CAAC,OAAO,EAAE,oBAAoB,KAAK,IAAI;IAkCxF,WAAW,CAAC,YAAY,EAAE,aAAa;IAoBjC,KAAK;IAIL,IAAI;CAIb"}
1
+ {"version":3,"file":"instrumentationsubscriber.d.ts","sourceRoot":"","sources":["../src/instrumentationsubscriber.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,oBAAoB,EAAiD,gBAAgB,EAAE,MAAM,eAAe,CAAA;AAOrH,OAAO,EAAE,cAAc,EAAE,MAAM,mBAAmB,CAAC;AAkBnD,MAAM,WAAW,iCAAiC;IAC9C,oBAAoB,EAAE,MAAM,CAAA;CAC/B;AAED,qBAAa,yBAA0B,SAAQ,cAAc;;gBAO7C,OAAO,EAAE,iCAAiC;IAyKtD,SAAS,CAAC,eAAe,EAAE,gBAAgB,EAAE,EAAE,EAAE,CAAC,OAAO,EAAE,oBAAoB,KAAK,IAAI;IAkCxF,WAAW,CAAC,eAAe,EAAE,gBAAgB;IAyBvC,KAAK;IAIL,IAAI;CAIb"}