@nsshunt/stsappframework 3.0.8 → 3.0.9
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/processbase.js +20 -11
- package/dist/processbase.js.map +1 -1
- package/dist/publishertransports/publishTransportDirect.js +75 -0
- package/dist/publishertransports/publishTransportDirect.js.map +1 -0
- package/package.json +2 -2
- package/src/processbase.ts +24 -13
- package/src/publishertransports/publishTransportDirect.ts +95 -0
- package/types/processbase.d.ts.map +1 -1
- package/types/publishertransports/publishTransportDirect.d.ts +9 -0
- package/types/publishertransports/publishTransportDirect.d.ts.map +1 -0
package/dist/processbase.js
CHANGED
|
@@ -26,6 +26,7 @@ const stspublisherserver_1 = require("@nsshunt/stspublisherserver");
|
|
|
26
26
|
const worker_threads_1 = require("worker_threads");
|
|
27
27
|
const os_1 = __importDefault(require("os"));
|
|
28
28
|
//import ProcessBrokerWorker from './processbrokerworker.js?worker'
|
|
29
|
+
const publishTransportDirect_1 = require("./publishertransports/publishTransportDirect");
|
|
29
30
|
class ProcessBase extends stsutils_1.STSOptionsBase {
|
|
30
31
|
#instrumentController = null;
|
|
31
32
|
#systemInformationInterval = null;
|
|
@@ -125,16 +126,9 @@ class ProcessBase extends stsutils_1.STSOptionsBase {
|
|
|
125
126
|
if (!this.options.serviceProcessContext) {
|
|
126
127
|
return;
|
|
127
128
|
}
|
|
128
|
-
|
|
129
|
-
|
|
130
|
-
|
|
131
|
-
consoleLogging: this.options.consoleLogging,
|
|
132
|
-
instrumentLogging: this.options.instrumentLogging,
|
|
133
|
-
httpServer: (this.options.serverType === processoptions_1.STSServerType.EXPRESS || this.options.serverType === processoptions_1.STSServerType.EXPRESS_TLS),
|
|
134
|
-
instrumentationObservationInterval: this.options.instrumentationObservationInterval,
|
|
135
|
-
instrumentationTimeWindow: this.options.instrumentationTimeWindow,
|
|
136
|
-
instrumentDefinitions: this.GetAdditionalInstruments(),
|
|
137
|
-
publishTransportOptions: {
|
|
129
|
+
let publisherTransport;
|
|
130
|
+
if (goptions.observabilityMetricsInfluxDBMode.localeCompare('PROXY') === 0) {
|
|
131
|
+
const publishTransportOptions = {
|
|
138
132
|
transportType: stspublisherserver_1.TransportType.RESTAPI,
|
|
139
133
|
url: `${goptions.imendpoint}:${goptions.import}${goptions.imapiroot}/publishmessage`,
|
|
140
134
|
publishdebug: goptions.publishdebug,
|
|
@@ -147,7 +141,22 @@ class ProcessBase extends stsutils_1.STSOptionsBase {
|
|
|
147
141
|
timeout: goptions.timeout,
|
|
148
142
|
rejectUnauthorized: goptions.isProduction // Allows self signed certs in non production mode(s)
|
|
149
143
|
}
|
|
150
|
-
}
|
|
144
|
+
};
|
|
145
|
+
publisherTransport = new stspublisherserver_1.PublishTransportRESTServerV2(publishTransportOptions);
|
|
146
|
+
}
|
|
147
|
+
else {
|
|
148
|
+
publisherTransport = new publishTransportDirect_1.PublishTransportDirect();
|
|
149
|
+
}
|
|
150
|
+
const instrumentControllerOptions = {
|
|
151
|
+
processContext: this.options.serviceProcessContext,
|
|
152
|
+
//payloadType: InstrumentPayloadType.service,
|
|
153
|
+
consoleLogging: this.options.consoleLogging,
|
|
154
|
+
instrumentLogging: this.options.instrumentLogging,
|
|
155
|
+
httpServer: (this.options.serverType === processoptions_1.STSServerType.EXPRESS || this.options.serverType === processoptions_1.STSServerType.EXPRESS_TLS),
|
|
156
|
+
instrumentationObservationInterval: this.options.instrumentationObservationInterval,
|
|
157
|
+
instrumentationTimeWindow: this.options.instrumentationTimeWindow,
|
|
158
|
+
instrumentDefinitions: this.GetAdditionalInstruments(),
|
|
159
|
+
publisherTransport
|
|
151
160
|
};
|
|
152
161
|
this.#instrumentController = new stspublisherserver_1.PublishInstrumentControllerV2(instrumentControllerOptions);
|
|
153
162
|
}
|
package/dist/processbase.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"processbase.js","sourceRoot":"","sources":["../src/processbase.ts"],"names":[],"mappings":";;;;;;AAAA,wFAAwF,CAAE,UAAU;AACpG,wDAA+B;AAC/B,qCAA2C;AAC3C,0DAA6B;AAC7B,gEAAkC;AAClC,oDAA2B;AAC3B,0EAAkC,CAAC,gCAAgC;AACnE,uCAAoD;AAEpD,kDAA+B;AAC/B,MAAM,KAAK,GAAG,IAAA,eAAW,EAAC,QAAQ,OAAO,CAAC,GAAG,cAAc,CAAC,CAAC;AAE7D,oEAAyJ;AAEzJ,kEAAiG;AAEjG,kDAA6C;AAC7C,MAAM,QAAQ,GAAG,IAAA,oBAAQ,GAAE,CAAA;AAE3B,qDAAgE;AAChE,gDAA8D;AAC9D,yDAA+C;AAE/C,
|
|
1
|
+
{"version":3,"file":"processbase.js","sourceRoot":"","sources":["../src/processbase.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,75 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
/* eslint @typescript-eslint/no-explicit-any: 0, @typescript-eslint/no-unused-vars: 0 */ // --> OFF
|
|
3
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
4
|
+
exports.PublishTransportDirect = void 0;
|
|
5
|
+
const IMKafkaManager_1 = require("./../kafka/IMKafkaManager");
|
|
6
|
+
const influxDBManager_1 = require("./../influxdb/influxDBManager");
|
|
7
|
+
const stsutils_1 = require("@nsshunt/stsutils");
|
|
8
|
+
class PublishTransportDirect {
|
|
9
|
+
#influxDBManager;
|
|
10
|
+
#IMkafkaManager;
|
|
11
|
+
constructor() {
|
|
12
|
+
this.#influxDBManager = new influxDBManager_1.InfluxDBManager();
|
|
13
|
+
this.#IMkafkaManager = new IMKafkaManager_1.IMKafkaManager();
|
|
14
|
+
this.#IMkafkaManager.Start();
|
|
15
|
+
}
|
|
16
|
+
//@@ none of this should be required - all the data should be in the payload - check and delete if not ...
|
|
17
|
+
#GetContext(nid) {
|
|
18
|
+
// Return null if no context is required
|
|
19
|
+
//return null;
|
|
20
|
+
if (nid === stsutils_1.ModelDelimeter.ROOT) {
|
|
21
|
+
return { root: stsutils_1.ModelDelimeter.ROOT };
|
|
22
|
+
}
|
|
23
|
+
const context = { nid };
|
|
24
|
+
const idsplit = nid.split(stsutils_1.ModelDelimeter.SEPERATOR);
|
|
25
|
+
const serviceId = idsplit[0];
|
|
26
|
+
const serviceInstanceId = idsplit[1].split(stsutils_1.ModelDelimeter.NID_SEPERATOR)[0];
|
|
27
|
+
const serviceInstanceProcessId = idsplit[1].split(stsutils_1.ModelDelimeter.NID_SEPERATOR)[1];
|
|
28
|
+
const serviceIdSplit = serviceId.split(stsutils_1.ModelDelimeter.COMPONENT_SEPERATOR);
|
|
29
|
+
const serviceName = serviceIdSplit[0]; // Defined in .env or environment variable
|
|
30
|
+
const serviceVersion = serviceIdSplit[1]; // Defined in .env or environment variable
|
|
31
|
+
context.serviceId = serviceId; // Service name and the service version
|
|
32
|
+
if (typeof serviceInstanceId != 'undefined') {
|
|
33
|
+
const serviceInstanceIdSplit = serviceInstanceId.split(stsutils_1.ModelDelimeter.COMPONENT_SEPERATOR);
|
|
34
|
+
const sid = serviceInstanceIdSplit[0];
|
|
35
|
+
const hostName = serviceInstanceIdSplit[1];
|
|
36
|
+
context.serviceInstanceId = serviceInstanceId; // Service unique id and the host name
|
|
37
|
+
context.sid = sid; // Service unique id only, does not include host
|
|
38
|
+
context.hostName = hostName; // Service Instance Host Name
|
|
39
|
+
if (typeof serviceInstanceProcessId != 'undefined') {
|
|
40
|
+
const serviceInstanceProcessIdSplit = serviceInstanceProcessId.split(stsutils_1.ModelDelimeter.COMPONENT_SEPERATOR);
|
|
41
|
+
const pid = parseInt(serviceInstanceProcessIdSplit[0]);
|
|
42
|
+
const ppid = parseInt(serviceInstanceProcessIdSplit[1]);
|
|
43
|
+
const isMaster = (pid === ppid ? true : false);
|
|
44
|
+
context.serviceInstanceProcessId = serviceInstanceProcessId; // Service Instance OS Process ID (parent process id)
|
|
45
|
+
context.pid = pid; // Service Instance OS Process ID (parent process id)
|
|
46
|
+
context.ppid = ppid; // Service Instance OS Parent Process ID if worker. Will be pid if parent process.
|
|
47
|
+
context.isMaster = isMaster; // True if is Master Process
|
|
48
|
+
context.isWorker = !isMaster; // True if is Worker Process
|
|
49
|
+
context.serviceName = serviceName; // Defined in .env or environment variable
|
|
50
|
+
context.serviceVersion = serviceVersion; // Defined in .env or environment variable
|
|
51
|
+
context.serviceInstanceId = serviceInstanceId; // unique service id with host
|
|
52
|
+
}
|
|
53
|
+
}
|
|
54
|
+
return context;
|
|
55
|
+
}
|
|
56
|
+
// Returns true for success or false for failure.
|
|
57
|
+
Publish = async (payload) => {
|
|
58
|
+
try {
|
|
59
|
+
const updatedContext = this.#GetContext(payload.context.nid);
|
|
60
|
+
payload.context = updatedContext;
|
|
61
|
+
//this.#SendIPCMessageToMaster(InstrumentManagerEventName.UPDATE_INSTRUMENT_DATA, instrumentPayload)
|
|
62
|
+
this.#influxDBManager.OutputInfluxDB(payload);
|
|
63
|
+
this.#IMkafkaManager.OutputLogs(payload);
|
|
64
|
+
return true;
|
|
65
|
+
}
|
|
66
|
+
catch (error) {
|
|
67
|
+
return false;
|
|
68
|
+
}
|
|
69
|
+
};
|
|
70
|
+
async Close() {
|
|
71
|
+
return true;
|
|
72
|
+
}
|
|
73
|
+
}
|
|
74
|
+
exports.PublishTransportDirect = PublishTransportDirect;
|
|
75
|
+
//# sourceMappingURL=publishTransportDirect.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"publishTransportDirect.js","sourceRoot":"","sources":["../../src/publishertransports/publishTransportDirect.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.
|
|
3
|
+
"version": "3.0.9",
|
|
4
4
|
"description": "",
|
|
5
5
|
"main": "dist/index.js",
|
|
6
6
|
"types": "./types/index.d.ts",
|
|
@@ -50,7 +50,7 @@
|
|
|
50
50
|
"@nsshunt/stsconfig": "^1.25.56",
|
|
51
51
|
"@nsshunt/stsdatamanagement": "^1.17.126",
|
|
52
52
|
"@nsshunt/stsinstrumentation": "^7.0.1",
|
|
53
|
-
"@nsshunt/stspublisherserver": "^2.0.
|
|
53
|
+
"@nsshunt/stspublisherserver": "^2.0.5",
|
|
54
54
|
"@nsshunt/stssocketio-client": "^0.0.23",
|
|
55
55
|
"@nsshunt/stsutils": "^1.16.11",
|
|
56
56
|
"@socket.io/cluster-adapter": "^0.2.2",
|
package/src/processbase.ts
CHANGED
|
@@ -22,8 +22,8 @@ import { STSOptionsBase, JSONObject } from '@nsshunt/stsutils'
|
|
|
22
22
|
import { StatusCodes } from 'http-status-codes'
|
|
23
23
|
|
|
24
24
|
import { PublishInstrumentControllerV2, IPublishInstrumentControllerOptionsV2, InstrumentDefinitions,
|
|
25
|
-
IWorkerFactory,
|
|
26
|
-
CreateServiceProcessContext } from '@nsshunt/stspublisherserver'
|
|
25
|
+
IWorkerFactory, TransportType, IPublishTransportRESTServerOptions,
|
|
26
|
+
CreateServiceProcessContext, PublishTransportRESTServerV2, IPublisherTransport } from '@nsshunt/stspublisherserver'
|
|
27
27
|
|
|
28
28
|
//import { PublishCollectorInProcessWorkerFactory } from './processcollectorinprocessworker'
|
|
29
29
|
|
|
@@ -40,6 +40,8 @@ type logFunction = (msg: any) => void
|
|
|
40
40
|
|
|
41
41
|
//import ProcessBrokerWorker from './processbrokerworker.js?worker'
|
|
42
42
|
|
|
43
|
+
import { PublishTransportDirect } from './publishertransports/publishTransportDirect'
|
|
44
|
+
|
|
43
45
|
export abstract class ProcessBase extends STSOptionsBase implements IProcessBase
|
|
44
46
|
{
|
|
45
47
|
#instrumentController: PublishInstrumentControllerV2 | null = null;
|
|
@@ -162,16 +164,10 @@ export abstract class ProcessBase extends STSOptionsBase implements IProcessBase
|
|
|
162
164
|
return;
|
|
163
165
|
}
|
|
164
166
|
|
|
165
|
-
|
|
166
|
-
|
|
167
|
-
|
|
168
|
-
|
|
169
|
-
instrumentLogging: this.options.instrumentLogging,
|
|
170
|
-
httpServer: (this.options.serverType === STSServerType.EXPRESS || this.options.serverType === STSServerType.EXPRESS_TLS),
|
|
171
|
-
instrumentationObservationInterval: this.options.instrumentationObservationInterval,
|
|
172
|
-
instrumentationTimeWindow: this.options.instrumentationTimeWindow,
|
|
173
|
-
instrumentDefinitions: this.GetAdditionalInstruments(),
|
|
174
|
-
publishTransportOptions: {
|
|
167
|
+
let publisherTransport: IPublisherTransport
|
|
168
|
+
|
|
169
|
+
if (goptions.observabilityMetricsInfluxDBMode.localeCompare('PROXY') === 0) {
|
|
170
|
+
const publishTransportOptions: IPublishTransportRESTServerOptions = {
|
|
175
171
|
transportType: TransportType.RESTAPI,
|
|
176
172
|
url: `${goptions.imendpoint}:${goptions.import}${goptions.imapiroot}/publishmessage`,
|
|
177
173
|
publishdebug: goptions.publishdebug,
|
|
@@ -184,7 +180,22 @@ export abstract class ProcessBase extends STSOptionsBase implements IProcessBase
|
|
|
184
180
|
timeout: goptions.timeout,
|
|
185
181
|
rejectUnauthorized: goptions.isProduction // Allows self signed certs in non production mode(s)
|
|
186
182
|
}
|
|
187
|
-
}
|
|
183
|
+
};
|
|
184
|
+
publisherTransport = new PublishTransportRESTServerV2(publishTransportOptions);
|
|
185
|
+
} else {
|
|
186
|
+
publisherTransport = new PublishTransportDirect();
|
|
187
|
+
}
|
|
188
|
+
|
|
189
|
+
const instrumentControllerOptions: IPublishInstrumentControllerOptionsV2 = {
|
|
190
|
+
processContext: this.options.serviceProcessContext,
|
|
191
|
+
//payloadType: InstrumentPayloadType.service,
|
|
192
|
+
consoleLogging: this.options.consoleLogging,
|
|
193
|
+
instrumentLogging: this.options.instrumentLogging,
|
|
194
|
+
httpServer: (this.options.serverType === STSServerType.EXPRESS || this.options.serverType === STSServerType.EXPRESS_TLS),
|
|
195
|
+
instrumentationObservationInterval: this.options.instrumentationObservationInterval,
|
|
196
|
+
instrumentationTimeWindow: this.options.instrumentationTimeWindow,
|
|
197
|
+
instrumentDefinitions: this.GetAdditionalInstruments(),
|
|
198
|
+
publisherTransport
|
|
188
199
|
}
|
|
189
200
|
|
|
190
201
|
this.#instrumentController = new PublishInstrumentControllerV2(instrumentControllerOptions);
|
|
@@ -0,0 +1,95 @@
|
|
|
1
|
+
/* eslint @typescript-eslint/no-explicit-any: 0, @typescript-eslint/no-unused-vars: 0 */ // --> OFF
|
|
2
|
+
|
|
3
|
+
//import Debug from "debug";
|
|
4
|
+
//const debug = Debug(`proc:${process.pid}:PublishRESTServer`);
|
|
5
|
+
|
|
6
|
+
import { IPublisherTransport, IInstrumentPayload } from '@nsshunt/stspublisherserver'
|
|
7
|
+
import { IMKafkaManager } from './../kafka/IMKafkaManager'
|
|
8
|
+
import { InfluxDBManager } from './../influxdb/influxDBManager'
|
|
9
|
+
import { ServiceProcessContext } from './../commonTypes'
|
|
10
|
+
|
|
11
|
+
import { ModelDelimeter } from '@nsshunt/stsutils'
|
|
12
|
+
|
|
13
|
+
export class PublishTransportDirect implements IPublisherTransport
|
|
14
|
+
{
|
|
15
|
+
#influxDBManager: InfluxDBManager;
|
|
16
|
+
#IMkafkaManager: IMKafkaManager;
|
|
17
|
+
|
|
18
|
+
constructor()
|
|
19
|
+
{
|
|
20
|
+
this.#influxDBManager = new InfluxDBManager();
|
|
21
|
+
this.#IMkafkaManager = new IMKafkaManager();
|
|
22
|
+
this.#IMkafkaManager.Start();
|
|
23
|
+
}
|
|
24
|
+
|
|
25
|
+
//@@ none of this should be required - all the data should be in the payload - check and delete if not ...
|
|
26
|
+
#GetContext(nid: string): ServiceProcessContext {
|
|
27
|
+
// Return null if no context is required
|
|
28
|
+
//return null;
|
|
29
|
+
if (nid === ModelDelimeter.ROOT) {
|
|
30
|
+
return { root: ModelDelimeter.ROOT };
|
|
31
|
+
}
|
|
32
|
+
const context: ServiceProcessContext = { nid };
|
|
33
|
+
const idsplit = nid.split(ModelDelimeter.SEPERATOR);
|
|
34
|
+
|
|
35
|
+
const serviceId = idsplit[0];
|
|
36
|
+
const serviceInstanceId = idsplit[1].split(ModelDelimeter.NID_SEPERATOR)[0];
|
|
37
|
+
const serviceInstanceProcessId = idsplit[1].split(ModelDelimeter.NID_SEPERATOR)[1];
|
|
38
|
+
|
|
39
|
+
const serviceIdSplit = serviceId.split(ModelDelimeter.COMPONENT_SEPERATOR);
|
|
40
|
+
const serviceName =serviceIdSplit[0]; // Defined in .env or environment variable
|
|
41
|
+
const serviceVersion = serviceIdSplit[1]; // Defined in .env or environment variable
|
|
42
|
+
|
|
43
|
+
context.serviceId = serviceId; // Service name and the service version
|
|
44
|
+
|
|
45
|
+
if (typeof serviceInstanceId != 'undefined') {
|
|
46
|
+
const serviceInstanceIdSplit = serviceInstanceId.split(ModelDelimeter.COMPONENT_SEPERATOR);
|
|
47
|
+
const sid = serviceInstanceIdSplit[0];
|
|
48
|
+
const hostName = serviceInstanceIdSplit[1];
|
|
49
|
+
|
|
50
|
+
context.serviceInstanceId = serviceInstanceId; // Service unique id and the host name
|
|
51
|
+
context.sid = sid; // Service unique id only, does not include host
|
|
52
|
+
context.hostName = hostName; // Service Instance Host Name
|
|
53
|
+
|
|
54
|
+
if (typeof serviceInstanceProcessId != 'undefined') {
|
|
55
|
+
const serviceInstanceProcessIdSplit = serviceInstanceProcessId.split(ModelDelimeter.COMPONENT_SEPERATOR);
|
|
56
|
+
const pid = parseInt(serviceInstanceProcessIdSplit[0]);
|
|
57
|
+
const ppid = parseInt(serviceInstanceProcessIdSplit[1]);
|
|
58
|
+
const isMaster = (pid === ppid ? true : false);
|
|
59
|
+
|
|
60
|
+
context.serviceInstanceProcessId = serviceInstanceProcessId; // Service Instance OS Process ID (parent process id)
|
|
61
|
+
context.pid = pid; // Service Instance OS Process ID (parent process id)
|
|
62
|
+
context.ppid = ppid; // Service Instance OS Parent Process ID if worker. Will be pid if parent process.
|
|
63
|
+
context.isMaster = isMaster; // True if is Master Process
|
|
64
|
+
context.isWorker = !isMaster; // True if is Worker Process
|
|
65
|
+
context.serviceName = serviceName; // Defined in .env or environment variable
|
|
66
|
+
context.serviceVersion = serviceVersion; // Defined in .env or environment variable
|
|
67
|
+
context.serviceInstanceId = serviceInstanceId; // unique service id with host
|
|
68
|
+
}
|
|
69
|
+
}
|
|
70
|
+
|
|
71
|
+
return context;
|
|
72
|
+
}
|
|
73
|
+
|
|
74
|
+
// Returns true for success or false for failure.
|
|
75
|
+
Publish = async (payload: IInstrumentPayload): Promise<boolean> =>
|
|
76
|
+
{
|
|
77
|
+
try {
|
|
78
|
+
const updatedContext = this.#GetContext(payload.context.nid);
|
|
79
|
+
payload.context = updatedContext as any;
|
|
80
|
+
|
|
81
|
+
//this.#SendIPCMessageToMaster(InstrumentManagerEventName.UPDATE_INSTRUMENT_DATA, instrumentPayload)
|
|
82
|
+
this.#influxDBManager.OutputInfluxDB(payload);
|
|
83
|
+
this.#IMkafkaManager.OutputLogs(payload);
|
|
84
|
+
|
|
85
|
+
return true;
|
|
86
|
+
} catch (error)
|
|
87
|
+
{
|
|
88
|
+
return false;
|
|
89
|
+
}
|
|
90
|
+
}
|
|
91
|
+
|
|
92
|
+
async Close(): Promise<boolean> {
|
|
93
|
+
return true;
|
|
94
|
+
}
|
|
95
|
+
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"processbase.d.ts","sourceRoot":"","sources":["../src/processbase.ts"],"names":[],"mappings":"AAKA,OAAO,MAAM,MAAM,QAAQ,CAAA;AAO3B,OAAO,EAAE,KAAK,EAAE,uBAAuB,EAA+E,MAAM,6BAA6B,CAAA;AAEzJ,OAAO,EAAE,aAAa,EAAyC,MAAM,4BAA4B,CAAA;AAKjG,OAAO,EAAE,cAAc,EAAiB,MAAM,kBAAkB,CAAA;AAChE,OAAO,EAAE,cAAc,EAAc,MAAM,mBAAmB,CAAA;AAG9D,OAAO,EAAE,6BAA6B,EAAyC,qBAAqB,
|
|
1
|
+
{"version":3,"file":"processbase.d.ts","sourceRoot":"","sources":["../src/processbase.ts"],"names":[],"mappings":"AAKA,OAAO,MAAM,MAAM,QAAQ,CAAA;AAO3B,OAAO,EAAE,KAAK,EAAE,uBAAuB,EAA+E,MAAM,6BAA6B,CAAA;AAEzJ,OAAO,EAAE,aAAa,EAAyC,MAAM,4BAA4B,CAAA;AAKjG,OAAO,EAAE,cAAc,EAAiB,MAAM,kBAAkB,CAAA;AAChE,OAAO,EAAE,cAAc,EAAc,MAAM,mBAAmB,CAAA;AAG9D,OAAO,EAAE,6BAA6B,EAAyC,qBAAqB,EAEhB,MAAM,6BAA6B,CAAA;AAQvH,OAAO,EAAE,YAAY,EAAE,qBAAqB,EAAE,MAAM,eAAe,CAAA;AAGnE,OAAO,EAAE,8BAA8B,EAAE,8BAA8B,EAAE,MAAM,6BAA6B,CAAA;AAQ5G,8BAAsB,WAAY,SAAQ,cAAe,YAAW,YAAY;;gBAShE,OAAO,EAAE,cAAc;IAUnC,IAAa,OAAO,IAAI,cAAc,CAErC;IAED,IAAI,YAAY,IAAI,OAAO,CAE1B;IA2FD,oBAAoB;IA2CpB,wBAAwB,IAAI,qBAAqB;IAIjD,0BAA0B,IAAI,IAAI;IAIlC,cAAc,aAuCb;IAED,gBAAgB,mBAAoB,KAAK,aAAa,uBAAuB,UAI5E;IAED,IAAI,oBAAoB,IAAI,6BAA6B,GAAG,IAAI,CAE/D;IAED,KAAK,YAAa,GAAG,UASpB;IAED,gBAAgB,CAAC,cAAc,EAAE,KAAK,GAAG,OAAO;IAQhD,gBAAgB,sBAMf;IAED;;;OAGA;IACA,eAAe,IAAI,GAAG;IAItB,IAAI,oBAAoB,IAAI,qBAAqB,CAAC,8BAA8B,EAAE,8BAA8B,CAAC,GAAG,IAAI,CAGvH;IAED,IAAI,oBAAoB,CAAC,KAAK,EAAE,qBAAqB,CAAC,8BAA8B,EAAE,8BAA8B,CAAC,GAAG,IAAI,EAG3H;IAgBK,iBAAiB;IAOvB,IAAI,WAAW,IAAI,aAAa,GAAG,IAAI,CAyBtC;IAED,UAAU,QAAa,QAAQ,MAAM,CAAC,CAkBrC;IAED,kBAAkB,sBA0BjB;IAED,eAAe,WAAY,GAAG,kBAQ5B;CACL"}
|
|
@@ -0,0 +1,9 @@
|
|
|
1
|
+
|
|
2
|
+
import { IPublisherTransport, IInstrumentPayload } from '@nsshunt/stspublisherserver';
|
|
3
|
+
export declare class PublishTransportDirect implements IPublisherTransport {
|
|
4
|
+
#private;
|
|
5
|
+
constructor();
|
|
6
|
+
Publish: (payload: IInstrumentPayload) => Promise<boolean>;
|
|
7
|
+
Close(): Promise<boolean>;
|
|
8
|
+
}
|
|
9
|
+
//# sourceMappingURL=publishTransportDirect.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"publishTransportDirect.d.ts","sourceRoot":"","sources":["../../src/publishertransports/publishTransportDirect.ts"],"names":[],"mappings":";AAKA,OAAO,EAAE,mBAAmB,EAAE,kBAAkB,EAAE,MAAM,6BAA6B,CAAA;AAOrF,qBAAa,sBAAuB,YAAW,mBAAmB;;;IA8D9D,OAAO,YAAmB,kBAAkB,KAAG,QAAQ,OAAO,CAAC,CAe9D;IAEK,KAAK,IAAI,OAAO,CAAC,OAAO,CAAC;CAGlC"}
|