@nsshunt/stsappframework 2.19.139 → 2.19.141

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.
@@ -38,6 +38,7 @@ const http_status_codes_1 = require("http-status-codes");
38
38
  const log_1 = require("./log");
39
39
  const stspublisherserver_1 = require("@nsshunt/stspublisherserver");
40
40
  const worker_threads_1 = require("worker_threads");
41
+ const os_1 = __importDefault(require("os"));
41
42
  class ProcessBase extends stsutils_1.STSOptionsBase {
42
43
  constructor(options) {
43
44
  super(options);
@@ -46,6 +47,11 @@ class ProcessBase extends stsutils_1.STSOptionsBase {
46
47
  _ProcessBase_socketIoHelper.set(this, null);
47
48
  _ProcessBase_accessLayer.set(this, null);
48
49
  _ProcessBase_logEx.set(this, null);
50
+ /*
51
+ CreateServiceProcessContext(serviceName: string, serviceVersion: string, serviceInstanceId: string,
52
+ hostName: string, processId: number, parentProcessId: number): IServiceProcessContext {
53
+ }
54
+ */
49
55
  _ProcessBase_ServiceCollectorWorkerFactory.set(this, {
50
56
  createWorker: () => {
51
57
  const mainpath = require.resolve('@nsshunt/stsappframework');
@@ -144,6 +150,7 @@ class ProcessBase extends stsutils_1.STSOptionsBase {
144
150
  clearInterval(__classPrivateFieldGet(this, _ProcessBase_systemInformationInterval, "f"));
145
151
  __classPrivateFieldSet(this, _ProcessBase_systemInformationInterval, null, "f");
146
152
  });
153
+ this.options.serviceProcessContext = (0, stspublisherserver_1.CreateServiceProcessContext)(options.serviceName, options.serviceVersion, options.serviceInstanceId, os_1.default.hostname(), process.pid, options.isMaster ? process.pid : process.ppid);
147
154
  }
148
155
  get options() {
149
156
  return super.options;
@@ -1 +1 @@
1
- {"version":3,"file":"processbase.js","sourceRoot":"","sources":["../processbase.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"processbase.js","sourceRoot":"","sources":["../processbase.ts"],"names":[],"mappings":"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"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@nsshunt/stsappframework",
3
- "version": "2.19.139",
3
+ "version": "2.19.141",
4
4
  "description": "",
5
5
  "main": "dist/index.js",
6
6
  "types": "./types/index.d.ts",
package/processbase.ts CHANGED
@@ -17,10 +17,12 @@ import { log, logFunction } from './log'
17
17
  import { SocketIoHelper } from './socketioHelper'
18
18
 
19
19
  import { PublishInstrumentController, IPublishInstrumentControllerOptions, InstrumentDefinitions,
20
- IWorkerFactory, InstrumentPayloadType, TransportType, IPublishTransportRESTServerOptions } from '@nsshunt/stspublisherserver'
20
+ IWorkerFactory, InstrumentPayloadType, TransportType, IPublishTransportRESTServerOptions, CreateServiceProcessContext } from '@nsshunt/stspublisherserver'
21
21
 
22
22
  import { Worker } from 'worker_threads';
23
23
 
24
+ import os from 'os';
25
+
24
26
  export abstract class ProcessBase extends STSOptionsBase
25
27
  {
26
28
  #instrumentController: PublishInstrumentController = null;
@@ -32,12 +34,21 @@ export abstract class ProcessBase extends STSOptionsBase
32
34
  constructor(options: ProcessOptions)
33
35
  {
34
36
  super(options);
37
+
38
+ this.options.serviceProcessContext = CreateServiceProcessContext(options.serviceName, options.serviceVersion, options.serviceInstanceId,
39
+ os.hostname(), process.pid, options.isMaster ? process.pid : process.ppid)
35
40
  }
36
41
 
37
42
  override get options(): ProcessOptions {
38
43
  return super.options as ProcessOptions;
39
44
  }
40
45
 
46
+ /*
47
+ CreateServiceProcessContext(serviceName: string, serviceVersion: string, serviceInstanceId: string,
48
+ hostName: string, processId: number, parentProcessId: number): IServiceProcessContext {
49
+ }
50
+ */
51
+
41
52
  #ServiceCollectorWorkerFactory: IWorkerFactory = {
42
53
  createWorker: (): Worker => {
43
54
  const mainpath = require.resolve('@nsshunt/stsappframework');
package/processoptions.ts CHANGED
@@ -116,7 +116,7 @@ export interface ProcessOptions {
116
116
 
117
117
  // Publisher options.
118
118
 
119
- serviceProcessContext: IServiceProcessContext
119
+ serviceProcessContext?: IServiceProcessContext
120
120
 
121
121
  /**
122
122
  * Factory method that adds express routes to the express app object.
@@ -1 +1 @@
1
- {"version":3,"file":"processbase.d.ts","sourceRoot":"","sources":["../processbase.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,KAAK,EAAE,uBAAuB,EAAuD,MAAM,6BAA6B,CAAA;AAEjI,OAAO,EAAE,aAAa,EAAiB,MAAM,4BAA4B,CAAA;AAMzE,OAAO,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAA;AACjD,OAAO,EAAU,cAAc,EAAc,MAAM,mBAAmB,CAAA;AAGtE,OAAO,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAA;AAEjD,OAAO,EAAE,2BAA2B,EAAuC,qBAAqB,EACF,MAAM,6BAA6B,CAAA;AAIjI,8BAAsB,WAAY,SAAQ,cAAc;;gBAQxC,OAAO,EAAE,cAAc;IAKnC,IAAa,OAAO,IAAI,cAAc,CAErC;IA0DD,oBAAoB;IAuBpB,wBAAwB,IAAI,qBAAqB;IAIjD,0BAA0B,IAAI,IAAI;IAIlC,cAAc,aAuCb;IAED,gBAAgB,mBAAoB,KAAK,aAAa,uBAAuB,UAI5E;IAED,IAAI,oBAAoB,gCAEvB;IAED,KAAK,yBASJ;IAED,gBAAgB,CAAC,cAAc,EAAE,KAAK,GAAG,OAAO;IAQhD,gBAAgB,sBAIf;IAED;;;OAGA;IACA,eAAe;IAIf,IAAI,cAAc,IAAI,cAAc,CAGnC;IAED,IAAI,cAAc,CAAC,KAAK,EAAE,cAAc,EAGvC;IAED,IAAI,WAAW,IAAI,aAAa,CAuB/B;CACJ"}
1
+ {"version":3,"file":"processbase.d.ts","sourceRoot":"","sources":["../processbase.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,KAAK,EAAE,uBAAuB,EAAuD,MAAM,6BAA6B,CAAA;AAEjI,OAAO,EAAE,aAAa,EAAiB,MAAM,4BAA4B,CAAA;AAMzE,OAAO,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAA;AACjD,OAAO,EAAU,cAAc,EAAc,MAAM,mBAAmB,CAAA;AAGtE,OAAO,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAA;AAEjD,OAAO,EAAE,2BAA2B,EAAuC,qBAAqB,EAC2B,MAAM,6BAA6B,CAAA;AAM9J,8BAAsB,WAAY,SAAQ,cAAc;;gBAQxC,OAAO,EAAE,cAAc;IAQnC,IAAa,OAAO,IAAI,cAAc,CAErC;IAgED,oBAAoB;IAuBpB,wBAAwB,IAAI,qBAAqB;IAIjD,0BAA0B,IAAI,IAAI;IAIlC,cAAc,aAuCb;IAED,gBAAgB,mBAAoB,KAAK,aAAa,uBAAuB,UAI5E;IAED,IAAI,oBAAoB,gCAEvB;IAED,KAAK,yBASJ;IAED,gBAAgB,CAAC,cAAc,EAAE,KAAK,GAAG,OAAO;IAQhD,gBAAgB,sBAIf;IAED;;;OAGA;IACA,eAAe;IAIf,IAAI,cAAc,IAAI,cAAc,CAGnC;IAED,IAAI,cAAc,CAAC,KAAK,EAAE,cAAc,EAGvC;IAED,IAAI,WAAW,IAAI,aAAa,CAuB/B;CACJ"}
@@ -89,7 +89,7 @@ export interface ProcessOptions {
89
89
  * Determines where logging is output to the logging instrument (if present).
90
90
  */
91
91
  instrumentLogging: boolean;
92
- serviceProcessContext: IServiceProcessContext;
92
+ serviceProcessContext?: IServiceProcessContext;
93
93
  /**
94
94
  * Factory method that adds express routes to the express app object.
95
95
  */
@@ -1 +1 @@
1
- {"version":3,"file":"processoptions.d.ts","sourceRoot":"","sources":["../processoptions.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,sBAAsB,EAAE,MAAM,6BAA6B,CAAA;AAEpE,OAAO,OAAO,MAAM,SAAS,CAAA;AAE7B,MAAM,WAAW,gBAAgB;IAChC,IAAI,GAAG,IAAI,OAAO,CAAC,OAAO,CAAA;CAC1B;AAED;;GAEG;AACH,MAAM,MAAM,mBAAmB,GAAG,CAAC,GAAG,EAAE,OAAO,CAAC,OAAO,KAAK,IAAI,CAAA;AAGhE,MAAM,WAAW,cAAc;IACvB;;GAED;IACH,QAAQ,EAAE,OAAO,CAAA;IAEjB;;OAEG;IACN,iBAAiB,EAAE,MAAM,CAAA;IAItB;;OAEG;IACH,UAAU,EAAE,OAAO,CAAA;IAEnB;;OAEG;IACH,WAAW,EAAE,OAAO,CAAA;IAEvB;;OAEG;IACA,kBAAkB,EAAE,MAAM,CAAA;IAE7B;;OAEG;IACA,0BAA0B,EAAE,MAAM,CAAA;IAElC;;OAEG;IACH,sBAAsB,EAAE,OAAO,CAAA;IAE/B;;OAEG;IACH,SAAS,EAAE,OAAO,CAAA;IAErB;;OAEG;IACA,iBAAiB,EAAE,OAAO,CAAA;IAE7B;;OAEG;IACA,QAAQ,EAAE,MAAM,CAAA;IAEnB;;OAEG;IACA,OAAO,EAAE,MAAM,CAAA;IAEf;;;;;;;;;;;OAWG;IACH,UAAU,EAAE,MAAM,CAAA;IAElB;;OAEG;IACH,IAAI,EAAE,MAAM,CAAA;IAEf;;OAEG;IACA,qBAAqB,EAAE,MAAM,CAAA;IAEhC;;OAEG;IACA,WAAW,EAAE,MAAM,CAAA;IAEnB;;OAEA;IACA,cAAc,EAAE,MAAM,CAAA;IAEtB;;OAEG;IACH,cAAc,EAAE,OAAO,CAAA;IAEvB;;OAEG;IACH,iBAAiB,EAAE,OAAO,CAAA;IAI1B,qBAAqB,EAAE,sBAAsB,CAAA;IAE7C;;OAEG;IACH,yBAAyB,CAAC,EAAE,mBAAmB,CAAA;IAE/C;;;OAGG;IACH,UAAU,EAAE,OAAO,CAAA;IAEnB;;OAEG;IACH,WAAW,EAAE,OAAO,CAAA;IAEpB;;OAEG;IACH,yBAAyB,EAAE,OAAO,CAAA;IAElC,kCAAkC,EAAE,MAAM,CAAA;IAE1C,yBAAyB,EAAE,MAAM,CAAA;CACpC"}
1
+ {"version":3,"file":"processoptions.d.ts","sourceRoot":"","sources":["../processoptions.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,sBAAsB,EAAE,MAAM,6BAA6B,CAAA;AAEpE,OAAO,OAAO,MAAM,SAAS,CAAA;AAE7B,MAAM,WAAW,gBAAgB;IAChC,IAAI,GAAG,IAAI,OAAO,CAAC,OAAO,CAAA;CAC1B;AAED;;GAEG;AACH,MAAM,MAAM,mBAAmB,GAAG,CAAC,GAAG,EAAE,OAAO,CAAC,OAAO,KAAK,IAAI,CAAA;AAGhE,MAAM,WAAW,cAAc;IACvB;;GAED;IACH,QAAQ,EAAE,OAAO,CAAA;IAEjB;;OAEG;IACN,iBAAiB,EAAE,MAAM,CAAA;IAItB;;OAEG;IACH,UAAU,EAAE,OAAO,CAAA;IAEnB;;OAEG;IACH,WAAW,EAAE,OAAO,CAAA;IAEvB;;OAEG;IACA,kBAAkB,EAAE,MAAM,CAAA;IAE7B;;OAEG;IACA,0BAA0B,EAAE,MAAM,CAAA;IAElC;;OAEG;IACH,sBAAsB,EAAE,OAAO,CAAA;IAE/B;;OAEG;IACH,SAAS,EAAE,OAAO,CAAA;IAErB;;OAEG;IACA,iBAAiB,EAAE,OAAO,CAAA;IAE7B;;OAEG;IACA,QAAQ,EAAE,MAAM,CAAA;IAEnB;;OAEG;IACA,OAAO,EAAE,MAAM,CAAA;IAEf;;;;;;;;;;;OAWG;IACH,UAAU,EAAE,MAAM,CAAA;IAElB;;OAEG;IACH,IAAI,EAAE,MAAM,CAAA;IAEf;;OAEG;IACA,qBAAqB,EAAE,MAAM,CAAA;IAEhC;;OAEG;IACA,WAAW,EAAE,MAAM,CAAA;IAEnB;;OAEA;IACA,cAAc,EAAE,MAAM,CAAA;IAEtB;;OAEG;IACH,cAAc,EAAE,OAAO,CAAA;IAEvB;;OAEG;IACH,iBAAiB,EAAE,OAAO,CAAA;IAI1B,qBAAqB,CAAC,EAAE,sBAAsB,CAAA;IAE9C;;OAEG;IACH,yBAAyB,CAAC,EAAE,mBAAmB,CAAA;IAE/C;;;OAGG;IACH,UAAU,EAAE,OAAO,CAAA;IAEnB;;OAEG;IACH,WAAW,EAAE,OAAO,CAAA;IAEpB;;OAEG;IACH,yBAAyB,EAAE,OAAO,CAAA;IAElC,kCAAkC,EAAE,MAAM,CAAA;IAE1C,yBAAyB,EAAE,MAAM,CAAA;CACpC"}