@nsshunt/stsappframework 3.1.1 → 3.1.4
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/index.js +1 -1
- package/dist/index.js.map +1 -1
- package/dist/masterprocessbase.js +7 -0
- package/dist/masterprocessbase.js.map +1 -1
- package/dist/middleware/serverNetworkMiddleware.js +25 -29
- package/dist/middleware/serverNetworkMiddleware.js.map +1 -1
- package/dist/server.js +2 -1
- package/dist/server.js.map +1 -1
- package/dist/singleprocessbase.js +7 -1
- package/dist/singleprocessbase.js.map +1 -1
- package/dist/{stsAppFrameworkTransportWinston.js → stsTransportLoggerWinston.js} +5 -7
- package/dist/stsTransportLoggerWinston.js.map +1 -0
- package/dist/testing/appConfig.js +1 -1
- package/dist/testing/appConfig.js.map +1 -1
- package/dist/vitesttesting/appConfig.js +94 -0
- package/dist/vitesttesting/appConfig.js.map +1 -0
- package/dist/vitesttesting/appSingleWSS.js +73 -0
- package/dist/vitesttesting/appSingleWSS.js.map +1 -0
- package/dist/vitesttesting/server.js +16 -0
- package/dist/vitesttesting/server.js.map +1 -0
- package/dist/{testing → vitesttesting}/singleservertest.test.js +5 -111
- package/dist/vitesttesting/singleservertest.test.js.map +1 -0
- package/dist/vitesttesting/wsevents.js +3 -0
- package/dist/vitesttesting/wsevents.js.map +1 -0
- package/dist/workerprocessbase.js +7 -1
- package/dist/workerprocessbase.js.map +1 -1
- package/package.json +1 -1
- package/src/commonTypes.ts +2 -2
- package/src/index.ts +1 -1
- package/src/masterprocessbase.ts +7 -1
- package/src/middleware/serverNetworkMiddleware.ts +28 -29
- package/src/server.ts +2 -1
- package/src/singleprocessbase.ts +8 -1
- package/src/stsTransportLoggerWinston.ts +24 -0
- package/src/testing/appConfig.ts +1 -1
- package/src/vitesttesting/appConfig.ts +110 -0
- package/src/vitesttesting/appSingleWSS.ts +82 -0
- package/src/vitesttesting/server.ts +18 -0
- package/src/{testing → vitesttesting}/singleservertest.test.ts +7 -128
- package/src/vitesttesting/wsevents.ts +33 -0
- package/src/workerprocessbase.ts +8 -1
- package/types/commonTypes.d.ts +2 -2
- package/types/commonTypes.d.ts.map +1 -1
- package/types/index.d.ts +1 -1
- package/types/index.d.ts.map +1 -1
- package/types/masterprocessbase.d.ts.map +1 -1
- package/types/middleware/serverNetworkMiddleware.d.ts +2 -1
- package/types/middleware/serverNetworkMiddleware.d.ts.map +1 -1
- package/types/server.d.ts.map +1 -1
- package/types/singleprocessbase.d.ts +1 -1
- package/types/singleprocessbase.d.ts.map +1 -1
- package/types/stsTransportLoggerWinston.d.ts +11 -0
- package/types/stsTransportLoggerWinston.d.ts.map +1 -0
- package/types/vitesttesting/appConfig.d.ts +3 -0
- package/types/vitesttesting/appConfig.d.ts.map +1 -0
- package/types/vitesttesting/appSingleWSS.d.ts +8 -0
- package/types/vitesttesting/appSingleWSS.d.ts.map +1 -0
- package/types/vitesttesting/server.d.ts +6 -0
- package/types/vitesttesting/server.d.ts.map +1 -0
- package/types/vitesttesting/singleservertest.test.d.ts.map +1 -0
- package/types/vitesttesting/wsevents.d.ts +18 -0
- package/types/vitesttesting/wsevents.d.ts.map +1 -0
- package/types/workerprocessbase.d.ts +1 -1
- package/types/workerprocessbase.d.ts.map +1 -1
- package/dist/stsAppFrameworkTransportWinston.js.map +0 -1
- package/dist/testing/singleservertest.test.js.map +0 -1
- package/dist/workerprocessbase.test.js +0 -42
- package/dist/workerprocessbase.test.js.map +0 -1
- package/src/stsAppFrameworkTransportWinston.ts +0 -28
- package/src/workerprocessbase.test.ts +0 -47
- package/types/stsAppFrameworkTransportWinston.d.ts +0 -12
- package/types/stsAppFrameworkTransportWinston.d.ts.map +0 -1
- package/types/testing/singleservertest.test.d.ts.map +0 -1
- package/types/workerprocessbase.test.d.ts +0 -2
- package/types/workerprocessbase.test.d.ts.map +0 -1
- /package/types/{testing → vitesttesting}/singleservertest.test.d.ts +0 -0
|
@@ -0,0 +1,110 @@
|
|
|
1
|
+
import { v4 as uuidv4 } from 'uuid';
|
|
2
|
+
import express from 'express';
|
|
3
|
+
|
|
4
|
+
import { $Options } from '@nsshunt/stsconfig'
|
|
5
|
+
const goptions = $Options()
|
|
6
|
+
|
|
7
|
+
import { ProcessOptions, IProcessBase, STSServerType } from './..'
|
|
8
|
+
|
|
9
|
+
import { STSExpressRouteFactory } from './server'
|
|
10
|
+
|
|
11
|
+
import winston from 'winston'
|
|
12
|
+
|
|
13
|
+
/*
|
|
14
|
+
// nid: `${goptions.rest01servicename} @ ${goptions.rest01serviceversion} | ${this.options.globalServiceData.serviceInstanceId} @ ${os.hostname()} ^ ${process.pid} @ ${(cluster.isMaster ? process.pid : process.ppid)}`,
|
|
15
|
+
// <serviceId> <serviceInstanceId> <serviceInstanceProcessId>
|
|
16
|
+
// <serviceName> <serviceVersion> <sid> <hostName> <pid> <ppid>
|
|
17
|
+
// << ............... Static Nid ............... >> << ............... Dynamic Nid ............... >>
|
|
18
|
+
// Note: The final nid will NOT contain the NID_SEPERATOR character. This will be replaced with the SEPERATOR character.
|
|
19
|
+
const Context = (isMaster, serviceInstanceId) => {
|
|
20
|
+
return {
|
|
21
|
+
nid: `\
|
|
22
|
+
${goptions.rest01servicename}${ModelDelimeter.COMPONENT_SEPERATOR}${goptions.rest01serviceversion}\
|
|
23
|
+
${ModelDelimeter.SEPERATOR}\
|
|
24
|
+
${serviceInstanceId}${ModelDelimeter.COMPONENT_SEPERATOR}${os.hostname()}\
|
|
25
|
+
${ModelDelimeter.NID_SEPERATOR}\
|
|
26
|
+
${process.pid}${ModelDelimeter.COMPONENT_SEPERATOR}${(isMaster ? process.pid : process.ppid)}`
|
|
27
|
+
}
|
|
28
|
+
}
|
|
29
|
+
*/
|
|
30
|
+
|
|
31
|
+
export function ServiceConfigOptions(clusterMode: boolean, isMaster: boolean): ProcessOptions {
|
|
32
|
+
winston.format.combine(
|
|
33
|
+
winston.format.colorize(),
|
|
34
|
+
winston.format.simple()
|
|
35
|
+
);
|
|
36
|
+
|
|
37
|
+
const logger = winston.createLogger({
|
|
38
|
+
level: 'silly',
|
|
39
|
+
format: winston.format.combine(
|
|
40
|
+
winston.format.colorize(),
|
|
41
|
+
winston.format.simple()
|
|
42
|
+
),
|
|
43
|
+
transports: [
|
|
44
|
+
new winston.transports.Console()
|
|
45
|
+
]
|
|
46
|
+
});
|
|
47
|
+
|
|
48
|
+
const publisherLogger = winston.createLogger({
|
|
49
|
+
level: 'info',
|
|
50
|
+
format: winston.format.combine(
|
|
51
|
+
winston.format.colorize(),
|
|
52
|
+
winston.format.simple()
|
|
53
|
+
),
|
|
54
|
+
transports: [
|
|
55
|
+
new winston.transports.Console()
|
|
56
|
+
]
|
|
57
|
+
});
|
|
58
|
+
|
|
59
|
+
if (isMaster === true) {
|
|
60
|
+
const serviceInstanceId = uuidv4();
|
|
61
|
+
const data: ProcessOptions = {
|
|
62
|
+
serverType: STSServerType.EXPRESS_TLS,
|
|
63
|
+
clusterMode: clusterMode,
|
|
64
|
+
wssServer: true,
|
|
65
|
+
useLatency: true,
|
|
66
|
+
httpsServerKeyPath: goptions.httpsserverkeypath,
|
|
67
|
+
httpsServerCertificatePath: goptions.httpsservercertpath,
|
|
68
|
+
processExitOnTerminate: true,
|
|
69
|
+
serviceInstanceId: serviceInstanceId,
|
|
70
|
+
useDatabase: false,
|
|
71
|
+
|
|
72
|
+
isMaster: isMaster,
|
|
73
|
+
endpoint: goptions.rest01endpoint,
|
|
74
|
+
apiRoot: goptions.rest01apiroot,
|
|
75
|
+
listenPort: goptions.rest01hostport,
|
|
76
|
+
port: goptions.rest01port,
|
|
77
|
+
prometheusSupport: goptions.rest01prometheussupport,
|
|
78
|
+
prometheusClusterPort: goptions.rest01prometheusclusterport,
|
|
79
|
+
serviceName: goptions.rest01servicename,
|
|
80
|
+
serviceVersion: goptions.rest01serviceversion,
|
|
81
|
+
consoleLogging: true,
|
|
82
|
+
instrumentLogging: true,
|
|
83
|
+
|
|
84
|
+
instrumentationObservationInterval: goptions.instrumentationObservationInterval,
|
|
85
|
+
instrumentationTimeWindow: goptions.instrumentationTimeWindow,
|
|
86
|
+
|
|
87
|
+
useRedisAdaptor: false,
|
|
88
|
+
//workerExec: './dist/testing/app.js',
|
|
89
|
+
|
|
90
|
+
logger: logger,
|
|
91
|
+
publisherLogger: publisherLogger
|
|
92
|
+
}
|
|
93
|
+
|
|
94
|
+
if (!clusterMode) {
|
|
95
|
+
data.expressServerRouteFactory = (app: express.Express, stsApp: IProcessBase) => {
|
|
96
|
+
return new STSExpressRouteFactory(app, stsApp);
|
|
97
|
+
}
|
|
98
|
+
}
|
|
99
|
+
|
|
100
|
+
return data;
|
|
101
|
+
} else {
|
|
102
|
+
const data: ProcessOptions = JSON.parse(process.env['STS_GSD_SII'] as string) as ProcessOptions;
|
|
103
|
+
data.expressServerRouteFactory = (app: express.Express, stsApp: IProcessBase) => {
|
|
104
|
+
return new STSExpressRouteFactory(app, stsApp);
|
|
105
|
+
}
|
|
106
|
+
data.logger = logger;
|
|
107
|
+
data.publisherLogger = publisherLogger;
|
|
108
|
+
return data;
|
|
109
|
+
}
|
|
110
|
+
}
|
|
@@ -0,0 +1,82 @@
|
|
|
1
|
+
/* eslint @typescript-eslint/no-explicit-any: 0 */ // --> OFF
|
|
2
|
+
import chalk from 'chalk';
|
|
3
|
+
|
|
4
|
+
import { SingleProcessBase, STSNamespace, STSRoom, SocketIoServerHelper, STSSocketIONamespace, ProcessOptions } from './../index'
|
|
5
|
+
|
|
6
|
+
import { Socket } from "socket.io";
|
|
7
|
+
|
|
8
|
+
import { InterServerEvents } from './../commonTypes'
|
|
9
|
+
|
|
10
|
+
import { ClientToServerEvents, ServerToClientEvents } from './wsevents'
|
|
11
|
+
|
|
12
|
+
export class AppSingleWSS extends SingleProcessBase
|
|
13
|
+
{
|
|
14
|
+
constructor(options: ProcessOptions)
|
|
15
|
+
{
|
|
16
|
+
super(options);
|
|
17
|
+
this.socketIoServerHelper = new SocketIoServerHelper<ClientToServerEvents, ServerToClientEvents>({
|
|
18
|
+
logger: this.options.logger
|
|
19
|
+
});
|
|
20
|
+
}
|
|
21
|
+
|
|
22
|
+
#LogErrorMessage(message: any) {
|
|
23
|
+
this.options.logger.error(message);
|
|
24
|
+
}
|
|
25
|
+
|
|
26
|
+
#LogInfoMessage(message: any) {
|
|
27
|
+
this.options.logger.info(message);
|
|
28
|
+
}
|
|
29
|
+
|
|
30
|
+
override ProcessStarted() {
|
|
31
|
+
super.ProcessStarted();
|
|
32
|
+
|
|
33
|
+
if (this.socketIoServerHelper) {
|
|
34
|
+
this.socketIoServerHelper.SetupNamespace(this.io as any, STSNamespace.STSMonitor,
|
|
35
|
+
// Auto joinn room list
|
|
36
|
+
[
|
|
37
|
+
STSRoom.STSInstrumentDataRoom,
|
|
38
|
+
STSRoom.STSRunnerRoom,
|
|
39
|
+
'room3'
|
|
40
|
+
],
|
|
41
|
+
true, // Make any connecting client automatically join the room list above
|
|
42
|
+
|
|
43
|
+
// Connect call back when a client connects
|
|
44
|
+
(socket: Socket<ClientToServerEvents, ServerToClientEvents, InterServerEvents>) => {
|
|
45
|
+
this.#LogInfoMessage(chalk.gray(`WorkerProcess.#SendIPCMessageToMaster: Id: [${socket.id}] eventName: [connect]`));
|
|
46
|
+
},
|
|
47
|
+
|
|
48
|
+
// Custom client to server events
|
|
49
|
+
(socket: Socket<ClientToServerEvents, ServerToClientEvents, InterServerEvents>) => {
|
|
50
|
+
socket.on('subscribe', (data: any) => {
|
|
51
|
+
socket.emit('subscribeAck', data);
|
|
52
|
+
});
|
|
53
|
+
socket.on('unsubscribe', (data: any) => {
|
|
54
|
+
socket.emit('unsubscribeAck', data);
|
|
55
|
+
});
|
|
56
|
+
socket.on('subscribeKeepAlive', (data: any) => {
|
|
57
|
+
socket.emit('subscribeKeepAliveAck', data);
|
|
58
|
+
});
|
|
59
|
+
socket.on('done', () => {
|
|
60
|
+
socket.emit('doneAck');
|
|
61
|
+
});
|
|
62
|
+
socket.on('compute', (arg: number, cb) => {
|
|
63
|
+
const res = arg * 2;
|
|
64
|
+
cb(res.toString());
|
|
65
|
+
});
|
|
66
|
+
socket.on('compute2', (arg, cb) => {
|
|
67
|
+
cb({data: arg*2});
|
|
68
|
+
});
|
|
69
|
+
})
|
|
70
|
+
} else {
|
|
71
|
+
throw new Error('WorkerProcess:WorkerStarted(): this.socketIoHelper is null')
|
|
72
|
+
}
|
|
73
|
+
return null;
|
|
74
|
+
}
|
|
75
|
+
|
|
76
|
+
get stsMonitorNamespace(): STSSocketIONamespace | null {
|
|
77
|
+
if (this.socketIoServerHelper !== null) {
|
|
78
|
+
return this.socketIoServerHelper.GetSTSSocketIONamespace(STSNamespace.STSMonitor);
|
|
79
|
+
}
|
|
80
|
+
return null;
|
|
81
|
+
}
|
|
82
|
+
}
|
|
@@ -0,0 +1,18 @@
|
|
|
1
|
+
import express from 'express';
|
|
2
|
+
|
|
3
|
+
import { STSLatencyRoute, IProcessBase } from './..'
|
|
4
|
+
|
|
5
|
+
import { $Options } from '@nsshunt/stsconfig'
|
|
6
|
+
const goptions = $Options()
|
|
7
|
+
|
|
8
|
+
export class STSExpressRouteFactory
|
|
9
|
+
{
|
|
10
|
+
constructor(app: express.Express, stsApp: IProcessBase)
|
|
11
|
+
{
|
|
12
|
+
const stslatency = new STSLatencyRoute(stsApp);
|
|
13
|
+
|
|
14
|
+
// Note: This MUST come first as the latency end point is on the same path as the reosurce path.
|
|
15
|
+
// If stsresourceRouter came first, it would think that /latency was a resource name.
|
|
16
|
+
app.use(`${goptions.rest01apiroot}`, stslatency.router);
|
|
17
|
+
}
|
|
18
|
+
}
|
|
@@ -7,7 +7,9 @@ import chalk from 'chalk';
|
|
|
7
7
|
import axios, { AxiosError, AxiosResponse } from 'axios';
|
|
8
8
|
|
|
9
9
|
import { Sleep } from '@nsshunt/stsutils'
|
|
10
|
-
import { SingleProcessBase, MasterProcessBase } from './..'
|
|
10
|
+
//import { SingleProcessBase, MasterProcessBase } from './..'
|
|
11
|
+
|
|
12
|
+
import { AppSingleWSS } from './appSingleWSS'
|
|
11
13
|
|
|
12
14
|
import { ServiceConfigOptions } from './appConfig'
|
|
13
15
|
|
|
@@ -22,27 +24,12 @@ import { SocketIoClientHelper, ISocketIoClientHelperOptions } from '@nsshunt/sts
|
|
|
22
24
|
|
|
23
25
|
import { STSNamespace } from './../index'
|
|
24
26
|
|
|
25
|
-
//const { Kafka } = require('kafkajs')
|
|
26
|
-
|
|
27
|
-
//import { DockerComposeEnvironment, Wait, AlwaysPullPolicy } from 'testcontainers'
|
|
28
|
-
|
|
29
27
|
import { ServerToClientEvents, ClientToServerEvents } from './wsevents'
|
|
30
28
|
import { Socket } from 'socket.io-client'
|
|
31
|
-
//import { TimeSeriesBucketTimestamp } from 'redis';
|
|
32
29
|
|
|
33
30
|
describe("Single Server Test", () =>
|
|
34
31
|
{
|
|
35
|
-
|
|
36
|
-
const kafka = new Kafka({
|
|
37
|
-
clientId: 'my-app',
|
|
38
|
-
brokers: ['192.168.14.92:9092']
|
|
39
|
-
//brokers: ['localhost:9092', 'kafka2:9092'],
|
|
40
|
-
})
|
|
41
|
-
let producer: any;
|
|
42
|
-
let environment: any;
|
|
43
|
-
*/
|
|
44
|
-
|
|
45
|
-
let app: SingleProcessBase | MasterProcessBase | null = null;
|
|
32
|
+
let app: AppSingleWSS | null = null;
|
|
46
33
|
let httpsAgent: https.Agent | null = null;
|
|
47
34
|
|
|
48
35
|
const endpoint = 'https://localhost'
|
|
@@ -58,8 +45,6 @@ describe("Single Server Test", () =>
|
|
|
58
45
|
}
|
|
59
46
|
}
|
|
60
47
|
|
|
61
|
-
// Use ServerToClientEvents<true> when the client will pass a request to server with a call back expected with a timeout
|
|
62
|
-
//@@const socketUtils = new SocketIoClientHelper<ServerToClientEvents<true>, ClientToServerEvents>(socketUtilsoptions);
|
|
63
48
|
const socketUtils = new SocketIoClientHelper<ServerToClientEvents, ClientToServerEvents>(socketUtilsoptions);
|
|
64
49
|
|
|
65
50
|
const instrumentManagerAddress =
|
|
@@ -122,92 +107,11 @@ describe("Single Server Test", () =>
|
|
|
122
107
|
}
|
|
123
108
|
}
|
|
124
109
|
|
|
125
|
-
/* eslint-disable @typescript-eslint/no-explicit-any, @typescript-eslint/no-unused-vars */
|
|
126
|
-
/*
|
|
127
|
-
const socketDetail: ISocketDetail = socketUtils.SetupClientSideSocket('STSUITerm', instrumentManagerAddress, [
|
|
128
|
-
{
|
|
129
|
-
eventName: 'hello',
|
|
130
|
-
eventCb: (socket: any, data: any): void => {
|
|
131
|
-
debug(`Received: [hello:${data}]`);
|
|
132
|
-
}
|
|
133
|
-
},
|
|
134
|
-
{
|
|
135
|
-
eventName: 'goodbye',
|
|
136
|
-
eventCb: (socket: any, data: any) => {
|
|
137
|
-
debug(`Received: [goodbye:${data}]`);
|
|
138
|
-
}
|
|
139
|
-
},
|
|
140
|
-
{
|
|
141
|
-
eventName: 'registerEcho',
|
|
142
|
-
eventCb: (socket: any, data: any) => {
|
|
143
|
-
debug(`Received: [registerEcho:${JSON.stringify(data)}]`);
|
|
144
|
-
}
|
|
145
|
-
},
|
|
146
|
-
{
|
|
147
|
-
eventName: STSEvent.connect,
|
|
148
|
-
eventCb: (socket: STSClientSocket, data: any) => {
|
|
149
|
-
socket.emit('joinRoom', STSRoom.STSInstrumentDataRoom);
|
|
150
|
-
}
|
|
151
|
-
},
|
|
152
|
-
{
|
|
153
|
-
eventName: 'sts_connect_reply',
|
|
154
|
-
eventCb: (socket: STSClientSocket, data: any) => {
|
|
155
|
-
debug(`Received: [sts_connect_reply:${JSON.stringify(data)}]`);
|
|
156
|
-
}
|
|
157
|
-
}
|
|
158
|
-
]);
|
|
159
|
-
*/
|
|
160
|
-
|
|
161
110
|
beforeAll(async () =>
|
|
162
111
|
{
|
|
163
|
-
|
|
164
|
-
const composeFilePath = "/home/marcusbettens/projects/stsappframework/src/testing";
|
|
165
|
-
const composeFile = "docker-compose.yml";
|
|
166
|
-
try {
|
|
167
|
-
environment = await new DockerComposeEnvironment(composeFilePath, composeFile)
|
|
168
|
-
.withWaitStrategy("kafka", Wait.forLogMessage("[KafkaServer id=1001] started (kafka.server.KafkaServer)"))
|
|
169
|
-
.withPullPolicy(new AlwaysPullPolicy())
|
|
170
|
-
.up()
|
|
171
|
-
} catch (error) {
|
|
172
|
-
this.#LogErrorMessage(error)
|
|
173
|
-
throw error;
|
|
174
|
-
}
|
|
175
|
-
|
|
176
|
-
*/
|
|
177
|
-
|
|
178
|
-
/*
|
|
179
|
-
producer = kafka.producer()
|
|
180
|
-
await producer.connect()
|
|
181
|
-
*/
|
|
182
|
-
|
|
183
|
-
/*
|
|
184
|
-
process.env.AS_ENDPOINT = testHelper.authHost;
|
|
185
|
-
process.env.AS_HOST_PORT = testHelper.authPort;
|
|
186
|
-
process.env.AS_PORT = testHelper.authPort;
|
|
187
|
-
|
|
188
|
-
$ResetOptions();
|
|
189
|
-
//goptions = $Options()
|
|
190
|
-
|
|
191
|
-
//goptions.asendpoint = testHelper.authHost;
|
|
192
|
-
//goptions.asport = testHelper.authPort;
|
|
193
|
-
*/
|
|
194
|
-
|
|
195
|
-
const clusterMode = true;
|
|
196
|
-
|
|
197
|
-
if (clusterMode) {
|
|
198
|
-
const appOptions = ServiceConfigOptions(clusterMode, true);
|
|
199
|
-
appOptions.processExitOnTerminate = false;
|
|
200
|
-
app = new MasterProcessBase(appOptions)
|
|
201
|
-
} else {
|
|
202
|
-
const appOptions = ServiceConfigOptions(clusterMode, true);
|
|
203
|
-
appOptions.processExitOnTerminate = false;
|
|
204
|
-
app = new SingleProcessBase(appOptions)
|
|
205
|
-
}
|
|
206
|
-
|
|
207
|
-
const appOptions = ServiceConfigOptions(true, true);
|
|
112
|
+
const appOptions = ServiceConfigOptions(false, true);
|
|
208
113
|
appOptions.processExitOnTerminate = false;
|
|
209
|
-
|
|
210
|
-
app = new MasterProcessBase(appOptions)
|
|
114
|
+
app = new AppSingleWSS(appOptions)
|
|
211
115
|
await app.SetupServer();
|
|
212
116
|
await Sleep(3000);
|
|
213
117
|
}, 60000);
|
|
@@ -216,23 +120,8 @@ describe("Single Server Test", () =>
|
|
|
216
120
|
{
|
|
217
121
|
await Sleep(500);
|
|
218
122
|
|
|
219
|
-
// Kafka disconnect
|
|
220
|
-
//await producer.disconnect()
|
|
221
|
-
|
|
222
|
-
//@@await environment.down();
|
|
223
|
-
|
|
224
|
-
//await (app as SingleProcessBase).TerminateApplication();
|
|
225
123
|
await Sleep(1000);
|
|
226
124
|
app = null;
|
|
227
|
-
|
|
228
|
-
/*
|
|
229
|
-
|
|
230
|
-
await testHelper.StopAuthService();
|
|
231
|
-
await testHelper.StopDatabase();
|
|
232
|
-
await testHelper.StopNetwork();
|
|
233
|
-
|
|
234
|
-
await Sleep(2000);
|
|
235
|
-
*/
|
|
236
125
|
}, 15000);
|
|
237
126
|
|
|
238
127
|
test('Testing Module', async () =>
|
|
@@ -245,16 +134,6 @@ describe("Single Server Test", () =>
|
|
|
245
134
|
const num = 50;
|
|
246
135
|
expect.assertions(num * 2);
|
|
247
136
|
for (let i=0; i < num; i++) {
|
|
248
|
-
|
|
249
|
-
/*
|
|
250
|
-
const retValKafka = await producer.send({
|
|
251
|
-
topic: 'topic-name2',
|
|
252
|
-
messages: [
|
|
253
|
-
{ key: 'key1', value: `hello world - ${i}` },
|
|
254
|
-
],
|
|
255
|
-
})
|
|
256
|
-
*/
|
|
257
|
-
|
|
258
137
|
const retVal = await getLatency();
|
|
259
138
|
const retValObj = retVal?.data.data;
|
|
260
139
|
expect(retValObj).toMatch('Ping Completed At:');
|
|
@@ -272,6 +151,7 @@ describe("Single Server Test", () =>
|
|
|
272
151
|
// The address defines the namespace to connect to (i.e. io.of('/address'))
|
|
273
152
|
instrumentManagerAddress,
|
|
274
153
|
// Connected call back
|
|
154
|
+
// eslint-disable-next-line @typescript-eslint/no-unused-vars
|
|
275
155
|
(socket: Socket<ServerToClientEvents, ClientToServerEvents>) => {
|
|
276
156
|
debug(chalk.green(`connected - 1`));
|
|
277
157
|
expect(1).toEqual(1);
|
|
@@ -330,7 +210,6 @@ describe("Single Server Test", () =>
|
|
|
330
210
|
}
|
|
331
211
|
});
|
|
332
212
|
|
|
333
|
-
|
|
334
213
|
while (!complete) {
|
|
335
214
|
await Sleep(100);
|
|
336
215
|
}
|
|
@@ -0,0 +1,33 @@
|
|
|
1
|
+
/* eslint @typescript-eslint/no-explicit-any: 0 */ // --> OFF
|
|
2
|
+
import { STSDefaultServerToClientEvents, STSDefaultClientToServerEvents } from '@nsshunt/stssocketio-client'
|
|
3
|
+
|
|
4
|
+
// Syntax sugar from socket.io
|
|
5
|
+
// https://socket.io/docs/v4/typescript/#emitting-with-a-timeout
|
|
6
|
+
//type WithTimeoutAck<isSender extends boolean, args extends any[]> = isSender extends true ? [Error, ...args] : args;
|
|
7
|
+
|
|
8
|
+
//export interface ServerToClientEvents<isSender extends boolean = false> extends STSServerToClientEvents {
|
|
9
|
+
export interface ServerToClientEvents extends STSDefaultServerToClientEvents {
|
|
10
|
+
/*
|
|
11
|
+
noArg: () => void;
|
|
12
|
+
basicEmit: (a: number, b: string, c: Buffer) => void;
|
|
13
|
+
withAck: (d: string, callback: (e: number) => void) => void;
|
|
14
|
+
*/
|
|
15
|
+
|
|
16
|
+
subscribeAck: (data: any) => void;
|
|
17
|
+
unsubscribeAck: (data: any) => void;
|
|
18
|
+
subscribeKeepAliveAck: (data: any) => void;
|
|
19
|
+
doneAck: () => void;
|
|
20
|
+
}
|
|
21
|
+
|
|
22
|
+
//export interface ClientToServerEvents<isSender extends boolean = false> extends STSClientToServerEvents {
|
|
23
|
+
export interface ClientToServerEvents extends STSDefaultClientToServerEvents {
|
|
24
|
+
subscribe: (data: any) => void;
|
|
25
|
+
unsubscribe: (data: any) => void;
|
|
26
|
+
subscribeKeepAlive: (data: any) => void;
|
|
27
|
+
done: () => void;
|
|
28
|
+
|
|
29
|
+
//compute: (arg: number, callback: (...args: WithTimeoutAck<isSender, [string]>) => void) => void;
|
|
30
|
+
//compute2: (arg: number, callback: (...args: WithTimeoutAck<isSender, [{ data: any}]>) => void) => void;
|
|
31
|
+
compute: (arg: number, callback: (data: string) => void) => void;
|
|
32
|
+
compute2: (arg: number, callback: (data: { data: any}) => void) => void;
|
|
33
|
+
}
|
package/src/workerprocessbase.ts
CHANGED
|
@@ -13,6 +13,8 @@ import { ServerProcessBase } from './serverprocessbase'
|
|
|
13
13
|
|
|
14
14
|
import { v4 as uuidv4 } from 'uuid';
|
|
15
15
|
|
|
16
|
+
import { STSTransportLoggerWinston } from './stsTransportLoggerWinston'
|
|
17
|
+
|
|
16
18
|
/**
|
|
17
19
|
* todo
|
|
18
20
|
* @typedef {Object} options - todo
|
|
@@ -28,7 +30,12 @@ export class WorkerProcessBase extends ServerProcessBase implements IWorkerProce
|
|
|
28
30
|
}
|
|
29
31
|
|
|
30
32
|
WorkerStarted() {
|
|
31
|
-
|
|
33
|
+
const transport = new STSTransportLoggerWinston({
|
|
34
|
+
stsApp: this
|
|
35
|
+
});
|
|
36
|
+
setTimeout(() => {
|
|
37
|
+
(this.options.logger as any).add(transport);
|
|
38
|
+
}, 0);
|
|
32
39
|
}
|
|
33
40
|
|
|
34
41
|
// eslint-disable-next-line @typescript-eslint/no-explicit-any, @typescript-eslint/no-unused-vars
|
package/types/commonTypes.d.ts
CHANGED
|
@@ -60,7 +60,7 @@ export interface IMasterProcessBase extends IProcessBase {
|
|
|
60
60
|
export interface ISingleProcessBase extends IProcessBase {
|
|
61
61
|
get httpServer(): any;
|
|
62
62
|
CollectAdditionalTelemetry(): void;
|
|
63
|
-
ProcessStarted():
|
|
63
|
+
ProcessStarted(): void;
|
|
64
64
|
get io(): any;
|
|
65
65
|
ProcessTerminating(): Promise<void>;
|
|
66
66
|
get expressServer(): any;
|
|
@@ -70,7 +70,7 @@ export interface ISingleProcessBase extends IProcessBase {
|
|
|
70
70
|
}
|
|
71
71
|
export interface IWorkerProcessBase extends IProcessBase {
|
|
72
72
|
get httpServer(): any;
|
|
73
|
-
WorkerStarted():
|
|
73
|
+
WorkerStarted(): void;
|
|
74
74
|
ReceivedMessageFromMaster(msg: any): void;
|
|
75
75
|
CollectAdditionalTelemetry(): void;
|
|
76
76
|
get io(): any;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"commonTypes.d.ts","sourceRoot":"","sources":["../src/commonTypes.ts"],"names":[],"mappings":";;AACA,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,WAAW,CAAC;AAEtD,OAAO,EAAE,cAAc,EAAE,UAAU,EAAE,UAAU,EAAE,MAAM,mBAAmB,CAAA;AAC1E,OAAO,EAAE,6BAA6B,EAAE,qBAAqB,EAAE,MAAM,6BAA6B,CAAA;AAClG,OAAO,EAAE,uBAAuB,EAAE,KAAK,EAAE,cAAc,EAAE,MAAM,6BAA6B,CAAA;AAC5F,OAAO,EAAE,aAAa,EAAE,MAAM,4BAA4B,CAAA;AAC1D,OAAO,EAAE,8BAA8B,EAAE,8BAA8B,EAAE,MAAM,6BAA6B,CAAA;AAC5G,OAAO,EAAE,QAAQ,EAAE,QAAQ,EAAE,MAAM,SAAS,CAAA;AAE5C,oBAAY,iBAAiB;IACzB,SAAS,cAAc;IACvB,YAAY,iBAAiB;CAChC;AAED,MAAM,WAAW,iBAAiB;IACjC,eAAe,EAAE,OAAO,CAAC;IACzB,EAAE,EAAE,MAAM,CAAC;IACR,OAAO,EAAE,iBAAiB,CAAC;IAC9B,aAAa,CAAC,EAAE,UAAU,CAAC;IACxB,cAAc,CAAC,EAAE,UAAU,CAAA;CAC9B;AAED,MAAM,WAAW,UAAU;IAC1B,iBAAiB,EAAE,iBAAiB,CAAA;IACpC,EAAE,EAAE,MAAM,IAAI,CAAC;IACf,OAAO,EAAE,MAAM,CAAC,OAAO,CAAA;CACvB;AAED,MAAM,MAAM,WAAW,GAAG,MAAM,CAAC,MAAM,EAAE,UAAU,CAAC,CAAA;AAIpD,MAAM,WAAW,YAAa,SAAQ,cAAc;IAChD,oBAAoB,IAAI,IAAI,CAAA;IAC5B,wBAAwB,IAAI,qBAAqB,CAAA;IACjD,0BAA0B,IAAI,IAAI,CAAA;IAClC,cAAc,EAAE,MAAM,IAAI,CAAA;IAC1B,gBAAgB,EAAE,CAAC,cAAc,EAAE,KAAK,EAAE,SAAS,EAAE,uBAAuB,KAAK,IAAI,CAAA;IACrF,IAAI,oBAAoB,IAAI,6BAA6B,GAAG,IAAI,CAAA;IAEhE,KAAK,EAAE,CAAC,OAAO,EAAE,GAAG,KAAK,IAAI,CAAA;IAC7B,eAAe,CAAC,OAAO,EAAE,GAAG,GAAG,IAAI,CAAA;IACnC,cAAc,CAAC,OAAO,EAAE,GAAG,GAAG,IAAI,CAAA;IAClC,4BAA4B,CAAC,OAAO,EAAE,GAAG,GAAG,IAAI,CAAA;IAChD,gBAAgB,CAAC,cAAc,EAAE,KAAK,GAAG,OAAO,CAAA;IAChD,gBAAgB,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,CAAA;IAErC,eAAe,IAAI,GAAG,CAAA;IACtB,IAAI,oBAAoB,IAAI,qBAAqB,CAAC,8BAA8B,EAAE,8BAA8B,CAAC,GAAG,IAAI,CAAA;IACxH,IAAI,oBAAoB,CAAC,KAAK,EAAE,qBAAqB,CAAC,8BAA8B,EAAE,8BAA8B,CAAC,GAAG,IAAI,EAAC;IAC7H,iBAAiB,IAAI,OAAO,CAAC,IAAI,CAAC,CAAA;IAClC,IAAI,WAAW,IAAI,aAAa,GAAG,IAAI,CAAA;IACvC,IAAI,YAAY,IAAI,OAAO,CAAA;CAC9B;AAED,MAAM,WAAW,kBAAmB,SAAQ,YAAY;IAEpD,kBAAkB,CAAC,SAAS,EAAE,MAAM,EAAE,GAAG,EAAE,GAAG,GAAG,GAAG,CAAA;IACpD,WAAW,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,CAAA;IAChC,aAAa,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,CAAA;IAElC,UAAU,EAAE,CAAC,EAAE,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,CAAC,OAAO,EAAE,OAAO,EAAE,GAAG,EAAE,WAAW,EAAE,OAAO,EAAE,YAAY,EAAE,OAAO,KAAK,OAAO,CAAA;IACtH,WAAW,EAAE,CAAC,MAAM,EAAE,MAAM,CAAC,OAAO,EAAE,OAAO,CAAC,EAAE,OAAO,KAAK,IAAI,CAAA;IAChE,UAAU,EAAE,MAAM,IAAI,CAAA;IACtB,UAAU,EAAE,MAAM,IAAI,CAAA;IAEtB,SAAS,EAAE,CAAC,OAAO,EAAE,GAAG,KAAK,MAAM,CAAA;IACnC,aAAa,IAAI,IAAI,CAAA;IAErB,sBAAsB,EAAE,CAAC,OAAO,EAAE,GAAG,EAAE,IAAI,EAAE,GAAG,KAAK,IAAI,CAAA;IAEzD,kBAAkB,IAAI,OAAO,CAAC,IAAI,CAAC,CAAA;CACtC;AAED,MAAM,WAAW,kBAAmB,SAAQ,YAAY;IAEpD,IAAI,UAAU,IAAI,GAAG,CAAA;IACrB,0BAA0B,IAAI,IAAI,CAAA;IAClC,cAAc,IAAI,
|
|
1
|
+
{"version":3,"file":"commonTypes.d.ts","sourceRoot":"","sources":["../src/commonTypes.ts"],"names":[],"mappings":"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"}
|
package/types/index.d.ts
CHANGED
|
@@ -21,5 +21,5 @@ export * from './influxdb/influxDBManagerAgent';
|
|
|
21
21
|
export * from './publishertransports/publishTransportUtils';
|
|
22
22
|
export * from './instrumentationsubscriber';
|
|
23
23
|
export * from './stsTransportWinston';
|
|
24
|
-
export * from './
|
|
24
|
+
export * from './stsTransportLoggerWinston';
|
|
25
25
|
//# sourceMappingURL=index.d.ts.map
|
package/types/index.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,cAAc,eAAe,CAAA;AAC7B,cAAc,kBAAkB,CAAA;AAChC,cAAc,YAAY,CAAA;AAC1B,cAAc,iBAAiB,CAAA;AAC/B,cAAc,iBAAiB,CAAA;AAC/B,cAAc,qBAAqB,CAAA;AACnC,cAAc,qBAAqB,CAAA;AACnC,cAAc,qBAAqB,CAAA;AACnC,cAAc,qBAAqB,CAAA;AACnC,cAAc,wBAAwB,CAAA;AACtC,cAAc,wBAAwB,CAAA;AACtC,cAAc,mBAAmB,CAAA;AACjC,cAAc,sBAAsB,CAAA;AACpC,cAAc,uBAAuB,CAAA;AACrC,cAAc,uBAAuB,CAAA;AACrC,cAAc,wBAAwB,CAAA;AACtC,cAAc,4BAA4B,CAAA;AAC1C,cAAc,gCAAgC,CAAA;AAC9C,cAAc,mCAAmC,CAAA;AACjD,cAAc,iCAAiC,CAAA;AAC/C,cAAc,6CAA6C,CAAA;AAC3D,cAAc,6BAA6B,CAAA;AAC3C,cAAc,uBAAuB,CAAA;AACrC,cAAc,
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,cAAc,eAAe,CAAA;AAC7B,cAAc,kBAAkB,CAAA;AAChC,cAAc,YAAY,CAAA;AAC1B,cAAc,iBAAiB,CAAA;AAC/B,cAAc,iBAAiB,CAAA;AAC/B,cAAc,qBAAqB,CAAA;AACnC,cAAc,qBAAqB,CAAA;AACnC,cAAc,qBAAqB,CAAA;AACnC,cAAc,qBAAqB,CAAA;AACnC,cAAc,wBAAwB,CAAA;AACtC,cAAc,wBAAwB,CAAA;AACtC,cAAc,mBAAmB,CAAA;AACjC,cAAc,sBAAsB,CAAA;AACpC,cAAc,uBAAuB,CAAA;AACrC,cAAc,uBAAuB,CAAA;AACrC,cAAc,wBAAwB,CAAA;AACtC,cAAc,4BAA4B,CAAA;AAC1C,cAAc,gCAAgC,CAAA;AAC9C,cAAc,mCAAmC,CAAA;AACjD,cAAc,iCAAiC,CAAA;AAC/C,cAAc,6CAA6C,CAAA;AAC3D,cAAc,6BAA6B,CAAA;AAC3C,cAAc,uBAAuB,CAAA;AACrC,cAAc,6BAA6B,CAAA"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"masterprocessbase.d.ts","sourceRoot":"","sources":["../src/masterprocessbase.ts"],"names":[],"mappings":";;;;AAyBA,OAAO,EAAE,cAAc,EAAiB,MAAM,kBAAkB,CAAA;AAChE,OAAO,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC;AAC5C,OAAO,EAAE,kBAAkB,EAAE,MAAM,eAAe,CAAC;AAEnD,OAAO,EAAE,qBAAqB,EAAE,MAAM,6BAA6B,CAAA;
|
|
1
|
+
{"version":3,"file":"masterprocessbase.d.ts","sourceRoot":"","sources":["../src/masterprocessbase.ts"],"names":[],"mappings":";;;;AAyBA,OAAO,EAAE,cAAc,EAAiB,MAAM,kBAAkB,CAAA;AAChE,OAAO,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC;AAC5C,OAAO,EAAE,kBAAkB,EAAE,MAAM,eAAe,CAAC;AAEnD,OAAO,EAAE,qBAAqB,EAAE,MAAM,6BAA6B,CAAA;AAKnE,qBAAa,iBAAkB,SAAQ,WAAY,YAAW,kBAAkB;;gBAkBhE,OAAO,EAAE,cAAc;IAmB1B,0BAA0B,IAAI,IAAI;IAQlC,wBAAwB,IAAI,qBAAqB;IAS1D;;;OAGA;IAEA,kBAAkB,CAAC,QAAQ,EAAE,MAAM,EAAE,GAAG,EAAE,GAAG;IAmI7C,WAAW,sBAKV;IAgCD,UAAU,OAAQ,MAAM,+CAA+C,GAAG,eAAe,OAAO,gBAAgB,OAAO,KAAG,OAAO,CA6BhI;IAED,WAAW,WAAY,OAAO,OAAO,YAAY,OAAO,KAAG,IAAI,CAkB9D;IAUD,UAAU,QAAO,IAAI,CAIpB;IAED,UAAU,QAAO,IAAI,CAIpB;IAGD,SAAS,YAAa,GAAG,KAAG,MAAM,CAOjC;IAwFD,aAAa,IAAI,IAAI;IASrB,IAAa,YAAY,IAAI,OAAO,CAEnC;IAED,kBAAkB,QAAa,QAAQ,IAAI,CAAC,CAE3C;IAED,aAAa,sBA0KZ;IAED,sBAAsB,YAAa,GAAG,QAAQ,GAAG,UAahD;CACJ"}
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
/// <reference types="node" />
|
|
2
2
|
import { Request, Response, NextFunction } from 'express';
|
|
3
3
|
import { Socket } from 'node:net';
|
|
4
|
-
import { STSOptionsBase } from '@nsshunt/stsutils';
|
|
4
|
+
import { ISTSLogger, STSOptionsBase } from '@nsshunt/stsutils';
|
|
5
5
|
export declare enum ServerNetworkMiddlewareEventName {
|
|
6
6
|
UpdateInstrument_SERVER_NET_VAL = "UpdateInstrument_SERVER_NET_VAL"
|
|
7
7
|
}
|
|
@@ -21,6 +21,7 @@ export type ServerNetworkMiddlewareEventFunc = (data: ISocketRecord) => void;
|
|
|
21
21
|
export interface IServerNetworkMiddleware {
|
|
22
22
|
name: string;
|
|
23
23
|
outputDebug: boolean;
|
|
24
|
+
logger: ISTSLogger;
|
|
24
25
|
}
|
|
25
26
|
export declare class ServerNetworkMiddleware extends STSOptionsBase {
|
|
26
27
|
#private;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"serverNetworkMiddleware.d.ts","sourceRoot":"","sources":["../../src/middleware/serverNetworkMiddleware.ts"],"names":[],"mappings":";AAEA,OAAO,EAAE,OAAO,EAAE,QAAQ,EAAE,YAAY,EAAE,MAAM,SAAS,CAAA;AACzD,OAAO,EAAE,MAAM,EAAE,MAAM,UAAU,CAAA;AAIjC,OAAO,EAAE,cAAc,EAAE,MAAM,mBAAmB,CAAC;
|
|
1
|
+
{"version":3,"file":"serverNetworkMiddleware.d.ts","sourceRoot":"","sources":["../../src/middleware/serverNetworkMiddleware.ts"],"names":[],"mappings":";AAEA,OAAO,EAAE,OAAO,EAAE,QAAQ,EAAE,YAAY,EAAE,MAAM,SAAS,CAAA;AACzD,OAAO,EAAE,MAAM,EAAE,MAAM,UAAU,CAAA;AAIjC,OAAO,EAAE,UAAU,EAAE,cAAc,EAAE,MAAM,mBAAmB,CAAC;AAM/D,oBAAY,gCAAgC;IACxC,+BAA+B,oCAAoC;CACtE;AAED,MAAM,WAAW,aAAa;IAC1B,EAAE,EAAE,MAAM,CAAA;IACV,MAAM,EAAE,MAAM,CAAC;IACf,gBAAgB,EAAE,MAAM,CAAA;IACxB,mBAAmB,EAAE,MAAM,CAAA;IAC3B,aAAa,EAAE,MAAM,CAAA;IACrB,gBAAgB,EAAE,MAAM,CAAA;IACxB,gBAAgB,EAAE,MAAM,CAAA;IACxB,mBAAmB,EAAE,MAAM,CAAA;IAC3B,WAAW,EAAE,MAAM,CAAA;IACnB,SAAS,EAAE,MAAM,CAAA;CACpB;AAED,MAAM,MAAM,gCAAgC,GAAG,CAAC,IAAI,EAAE,aAAa,KAAK,IAAI,CAAC;AAE7E,MAAM,WAAW,wBAAwB;IACrC,IAAI,EAAE,MAAM,CAAA;IACZ,WAAW,EAAE,OAAO,CAAA;IACpB,MAAM,EAAE,UAAU,CAAA;CACrB;AAED,qBAAa,uBAAwB,SAAQ,cAAc;;gBAM3C,OAAO,EAAE,wBAAwB;IAQ7C,EAAE,CAAC,SAAS,EAAE,gCAAgC,EAAE,UAAU,EAAE,gCAAgC;IAI5F,eAAe,WAAY,MAAM,KAAG,aAAa,GAAG,IAAI,CAOvD;IAED,kBAAkB,wBAAyB,aAAa,aAAa,MAAM,OAAO,OAAO,UAoBxF;IAmBD,UAAU,QAAS,OAAO,OAAO,QAAQ,QAAQ,YAAY,UAqI5D;CACJ"}
|
package/types/server.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"server.d.ts","sourceRoot":"","sources":["../src/server.ts"],"names":[],"mappings":"AACA,OAAgB,EAAE,OAAO,EAAmC,MAAM,SAAS,CAAC;AAO5E,OAAO,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAA;AAKjD,OAAO,EAAE,YAAY,EAAE,MAAM,eAAe,CAAA;AAK5C,qBAAa,gBAAgB;;gBAIb,OAAO,EAAE,cAAc,EAAE,MAAM,EAAE,YAAY;
|
|
1
|
+
{"version":3,"file":"server.d.ts","sourceRoot":"","sources":["../src/server.ts"],"names":[],"mappings":"AACA,OAAgB,EAAE,OAAO,EAAmC,MAAM,SAAS,CAAC;AAO5E,OAAO,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAA;AAKjD,OAAO,EAAE,YAAY,EAAE,MAAM,eAAe,CAAA;AAK5C,qBAAa,gBAAgB;;gBAIb,OAAO,EAAE,cAAc,EAAE,MAAM,EAAE,YAAY;IAmHzD,IAAI,GAAG,IAAI,OAAO,CAGjB;CACJ"}
|
|
@@ -16,7 +16,7 @@ export declare class SingleProcessBase extends ServerProcessBase implements ISin
|
|
|
16
16
|
* @returns UIController instance to manage a console based user interface associated for this node application. Null for no capability.
|
|
17
17
|
*/
|
|
18
18
|
GetUIController(): any;
|
|
19
|
-
ProcessStarted():
|
|
19
|
+
ProcessStarted(): void;
|
|
20
20
|
SetupServer(): Promise<boolean>;
|
|
21
21
|
SetupServerEx: () => Promise<void>;
|
|
22
22
|
TerminateApplication(): Promise<void>;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"singleprocessbase.d.ts","sourceRoot":"","sources":["../src/singleprocessbase.ts"],"names":[],"mappings":"AAQA,OAAO,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAA;AACjD,OAAO,EAAE,kBAAkB,EAAE,MAAM,eAAe,CAAC;AACnD,OAAO,EAAE,qBAAqB,EAAE,MAAM,6BAA6B,CAAA;AAEnE,OAAO,EAAE,iBAAiB,EAAE,MAAM,qBAAqB,CAAA;
|
|
1
|
+
{"version":3,"file":"singleprocessbase.d.ts","sourceRoot":"","sources":["../src/singleprocessbase.ts"],"names":[],"mappings":"AAQA,OAAO,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAA;AACjD,OAAO,EAAE,kBAAkB,EAAE,MAAM,eAAe,CAAC;AACnD,OAAO,EAAE,qBAAqB,EAAE,MAAM,6BAA6B,CAAA;AAEnE,OAAO,EAAE,iBAAiB,EAAE,MAAM,qBAAqB,CAAA;AAMvD,MAAM,MAAM,OAAO,GAAG,CAAC,MAAM,EAAE,GAAG,EAAE,IAAI,EAAE,GAAG,KAAK,IAAI,CAAA;AAEtD,qBAAa,iBAAkB,SAAQ,iBAAkB,YAAW,kBAAkB;IAElF;;;OAGA;gBACY,OAAO,EAAE,cAAc;IAI1B,0BAA0B,IAAI,IAAI;IAWlC,wBAAwB,IAAI,qBAAqB;IAS1D;;;OAGA;IACS,eAAe,IAAI,GAAG;IAI/B,cAAc;IASd,WAAW,IAAI,OAAO,CAAC,OAAO,CAAC;IAmB/B,aAAa,sBAiCZ;IAEK,oBAAoB;IAKjB,kBAAkB,QAAa,QAAQ,IAAI,CAAC,CAEpD;CACJ"}
|
|
@@ -0,0 +1,11 @@
|
|
|
1
|
+
import Transport, { TransportStreamOptions } from 'winston-transport';
|
|
2
|
+
import { IProcessBase } from './commonTypes';
|
|
3
|
+
export interface ISTSTransportLoggerWinstonOptions extends TransportStreamOptions {
|
|
4
|
+
stsApp: IProcessBase;
|
|
5
|
+
}
|
|
6
|
+
export declare class STSTransportLoggerWinston extends Transport {
|
|
7
|
+
#private;
|
|
8
|
+
constructor(opts: ISTSTransportLoggerWinstonOptions);
|
|
9
|
+
log(info: any, callback: any): void;
|
|
10
|
+
}
|
|
11
|
+
//# sourceMappingURL=stsTransportLoggerWinston.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"stsTransportLoggerWinston.d.ts","sourceRoot":"","sources":["../src/stsTransportLoggerWinston.ts"],"names":[],"mappings":"AACA,OAAO,SAAS,EAAE,EAAE,sBAAsB,EAAE,MAAM,mBAAmB,CAAA;AAErE,OAAO,EAAE,YAAY,EAAE,MAAM,eAAe,CAAA;AAE5C,MAAM,WAAW,iCAAkC,SAAQ,sBAAsB;IAC7E,MAAM,EAAE,YAAY,CAAA;CACvB;AAED,qBAAa,yBAA0B,SAAQ,SAAS;;gBAIxC,IAAI,EAAE,iCAAiC;IAKnD,GAAG,CAAC,IAAI,EAAE,GAAG,EAAE,QAAQ,EAAE,GAAG;CAK/B"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"appConfig.d.ts","sourceRoot":"","sources":["../../src/vitesttesting/appConfig.ts"],"names":[],"mappings":"AAMA,OAAO,EAAE,cAAc,EAA+B,MAAM,MAAM,CAAA;AAwBlE,wBAAgB,oBAAoB,CAAC,WAAW,EAAE,OAAO,EAAE,QAAQ,EAAE,OAAO,GAAG,cAAc,CA+E5F"}
|
|
@@ -0,0 +1,8 @@
|
|
|
1
|
+
import { SingleProcessBase, STSSocketIONamespace, ProcessOptions } from './../index';
|
|
2
|
+
export declare class AppSingleWSS extends SingleProcessBase {
|
|
3
|
+
#private;
|
|
4
|
+
constructor(options: ProcessOptions);
|
|
5
|
+
ProcessStarted(): null;
|
|
6
|
+
get stsMonitorNamespace(): STSSocketIONamespace | null;
|
|
7
|
+
}
|
|
8
|
+
//# sourceMappingURL=appSingleWSS.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"appSingleWSS.d.ts","sourceRoot":"","sources":["../../src/vitesttesting/appSingleWSS.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,iBAAiB,EAA+C,oBAAoB,EAAE,cAAc,EAAE,MAAM,YAAY,CAAA;AAQjI,qBAAa,YAAa,SAAQ,iBAAiB;;gBAEnC,OAAO,EAAE,cAAc;IAgB1B,cAAc;IA8CvB,IAAI,mBAAmB,IAAI,oBAAoB,GAAG,IAAI,CAKrD;CACJ"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"server.d.ts","sourceRoot":"","sources":["../../src/vitesttesting/server.ts"],"names":[],"mappings":"AAAA,OAAO,OAAO,MAAM,SAAS,CAAC;AAE9B,OAAO,EAAmB,YAAY,EAAE,MAAM,MAAM,CAAA;AAKpD,qBAAa,sBAAsB;gBAEnB,GAAG,EAAE,OAAO,CAAC,OAAO,EAAE,MAAM,EAAE,YAAY;CAQzD"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"singleservertest.test.d.ts","sourceRoot":"","sources":["../../src/vitesttesting/singleservertest.test.ts"],"names":[],"mappings":""}
|