@nsshunt/stsappframework 3.3.116 → 3.3.118
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/logger/socketClientLogPublisher.js +7 -7
- package/dist/logger/socketClientLogPublisher.js.map +1 -1
- package/dist/logger/stsTransportLoggerSocket.js +4 -1
- package/dist/logger/stsTransportLoggerSocket.js.map +1 -1
- package/package.json +10 -10
- package/types/logger/socketClientLogPublisher.d.ts +6 -1
- package/types/logger/socketClientLogPublisher.d.ts.map +1 -1
- package/types/logger/stsTransportLoggerSocket.d.ts +2 -0
- package/types/logger/stsTransportLoggerSocket.d.ts.map +1 -1
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { createAgentManager
|
|
1
|
+
import { createAgentManager } from '@nsshunt/stsutils';
|
|
2
2
|
import chalk from 'chalk';
|
|
3
3
|
import { SocketIoClient } from '@nsshunt/stssocketioutils';
|
|
4
4
|
import { randomUUID } from 'node:crypto';
|
|
@@ -7,12 +7,12 @@ import http from 'node:http';
|
|
|
7
7
|
import https from 'node:https';
|
|
8
8
|
const SOCKET_NAMESPACE = 'stsinstrumentmanager/stsmonitor';
|
|
9
9
|
export class SocketClientLogPublisher extends SocketIoClient {
|
|
10
|
+
#options;
|
|
10
11
|
#id;
|
|
11
|
-
#rooms;
|
|
12
12
|
#agentManager;
|
|
13
|
-
constructor(
|
|
13
|
+
constructor(options) {
|
|
14
14
|
super('STSAppFramework:SocketClientLogPublisher');
|
|
15
|
-
this.#
|
|
15
|
+
this.#options = options;
|
|
16
16
|
this.#agentManager = createAgentManager({
|
|
17
17
|
agentOptions: {
|
|
18
18
|
keepAlive: false, // Use basic defaults. This agent will not use keep-alive.
|
|
@@ -35,7 +35,7 @@ export class SocketClientLogPublisher extends SocketIoClient {
|
|
|
35
35
|
//const url = `https://stscore.stsmda.org:${goptions.import}/${SOCKET_NAMESPACE}/`;
|
|
36
36
|
this.LogDebugMessage(chalk.cyan(`${this.logPrefix}SetupSocket() url: [${url}]`));
|
|
37
37
|
this.WithAddress(url)
|
|
38
|
-
.WithLogger(
|
|
38
|
+
.WithLogger(this.#options.logger)
|
|
39
39
|
.WithAgentManager(this.#agentManager)
|
|
40
40
|
.SetupSocket();
|
|
41
41
|
}
|
|
@@ -46,8 +46,8 @@ export class SocketClientLogPublisher extends SocketIoClient {
|
|
|
46
46
|
return `STSAppFramework:SocketClientLogPublisher:`;
|
|
47
47
|
}
|
|
48
48
|
SocketConnect(socket) {
|
|
49
|
-
this.LogDebugMessage(chalk.magenta(`${this.logPrefix}SocketConnect(): Socket ID: [${socket.id}], Joining Room: [${this.#rooms}]`));
|
|
50
|
-
socket.emit('__STSjoinRoom', this.#rooms);
|
|
49
|
+
this.LogDebugMessage(chalk.magenta(`${this.logPrefix}SocketConnect(): Socket ID: [${socket.id}], Joining Room: [${this.#options.rooms}]`));
|
|
50
|
+
socket.emit('__STSjoinRoom', this.#options.rooms);
|
|
51
51
|
}
|
|
52
52
|
SocketError(error) {
|
|
53
53
|
this.LogErrorMessage(chalk.red(`${this.logPrefix}SocketError(): Error: [${error}]`));
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"socketClientLogPublisher.js","sourceRoot":"","sources":["../../src/logger/socketClientLogPublisher.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,kBAAkB,
|
|
1
|
+
{"version":3,"file":"socketClientLogPublisher.js","sourceRoot":"","sources":["../../src/logger/socketClientLogPublisher.ts"],"names":[],"mappings":"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"}
|
|
@@ -7,7 +7,10 @@ export class STSTransportLoggerSocket extends Transport {
|
|
|
7
7
|
constructor(opts) {
|
|
8
8
|
super(opts);
|
|
9
9
|
this.#options = opts;
|
|
10
|
-
this.#socketIoClient = new SocketClientLogPublisher(
|
|
10
|
+
this.#socketIoClient = new SocketClientLogPublisher({
|
|
11
|
+
logger: opts.logger,
|
|
12
|
+
rooms: [...opts.rooms]
|
|
13
|
+
});
|
|
11
14
|
this.#socketIoClient.socket?.emit('__STSjoinRoom', this.#options.rooms);
|
|
12
15
|
}
|
|
13
16
|
log(info, callback) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"stsTransportLoggerSocket.js","sourceRoot":"","sources":["../../src/logger/stsTransportLoggerSocket.ts"],"names":[],"mappings":"AAAA,kDAAkD,CAAE,UAAU;AAC9D,OAAO,SAAqC,MAAM,mBAAmB,CAAA;AAIrE,OAAO,EAAE,wBAAwB,EAAE,MAAM,+BAA+B,CAAA;
|
|
1
|
+
{"version":3,"file":"stsTransportLoggerSocket.js","sourceRoot":"","sources":["../../src/logger/stsTransportLoggerSocket.ts"],"names":[],"mappings":"AAAA,kDAAkD,CAAE,UAAU;AAC9D,OAAO,SAAqC,MAAM,mBAAmB,CAAA;AAIrE,OAAO,EAAE,wBAAwB,EAAE,MAAM,+BAA+B,CAAA;AAQxE,MAAM,OAAO,wBAAyB,SAAQ,SAAS;IACnD,QAAQ,CAAmC;IAC3C,eAAe,CAAgF;IAE/F,YAAY,IAAsC;QAC9C,KAAK,CAAC,IAAI,CAAC,CAAC;QACZ,IAAI,CAAC,QAAQ,GAAG,IAAI,CAAC;QACrB,IAAI,CAAC,eAAe,GAAG,IAAI,wBAAwB,CAAC;YAChD,MAAM,EAAE,IAAI,CAAC,MAAM;YACnB,KAAK,EAAE,CAAE,GAAG,IAAI,CAAC,KAAK,CAAE;SAC3B,CAAC,CAAC;QACH,IAAI,CAAC,eAAe,CAAC,MAAM,EAAE,IAAI,CAAC,eAAe,EAAE,IAAI,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC;IAC5E,CAAC;IAED,GAAG,CAAC,IAAS,EAAE,QAAa;QACxB,IAAI,CAAC,eAAe,CAAC,MAAM,EAAE,IAAI,CAAC,iBAAiB,EAAE,IAAI,CAAC,QAAQ,CAAC,KAAK,EAAE;YACtE,OAAO,EAAE,YAAY;YACrB,OAAO,EAAE;gBACL,KAAK,EAAE,IAAI,CAAC,KAAK;gBACjB,OAAO,EAAE,IAAI,CAAC,OAAO;gBACrB,QAAQ,EAAE,IAAI,CAAC,GAAG,EAAE;aACvB;SACJ,CAAC,CAAC;QACH,IAAI,CAAC,IAAI,CAAC,QAAQ,EAAE,IAAI,CAAC,CAAC;QAC1B,QAAQ,EAAE,CAAC;IACf,CAAC;CACJ"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@nsshunt/stsappframework",
|
|
3
|
-
"version": "3.3.
|
|
3
|
+
"version": "3.3.118",
|
|
4
4
|
"description": "",
|
|
5
5
|
"type": "module",
|
|
6
6
|
"main": "dist/index.js",
|
|
@@ -35,21 +35,21 @@
|
|
|
35
35
|
"@types/cookie-parser": "^1.4.10",
|
|
36
36
|
"@types/debug": "^4.1.13",
|
|
37
37
|
"@types/express": "^5.0.6",
|
|
38
|
-
"@types/node": "^25.
|
|
39
|
-
"@typescript-eslint/eslint-plugin": "^8.59.
|
|
40
|
-
"@typescript-eslint/parser": "^8.59.
|
|
38
|
+
"@types/node": "^25.8.0",
|
|
39
|
+
"@typescript-eslint/eslint-plugin": "^8.59.3",
|
|
40
|
+
"@typescript-eslint/parser": "^8.59.3",
|
|
41
41
|
"eslint": "^10.3.0",
|
|
42
42
|
"globals": "^17.6.0",
|
|
43
43
|
"typescript": "^6.0.3",
|
|
44
|
-
"vite": "^8.0.
|
|
45
|
-
"vitest": "^4.1.
|
|
44
|
+
"vite": "^8.0.13",
|
|
45
|
+
"vitest": "^4.1.6"
|
|
46
46
|
},
|
|
47
47
|
"dependencies": {
|
|
48
48
|
"@grpc/grpc-js": "^1.14.3",
|
|
49
|
-
"@grpc/proto-loader": "^0.8.
|
|
49
|
+
"@grpc/proto-loader": "^0.8.1",
|
|
50
50
|
"@nsshunt/stsconfig": "^1.27.66",
|
|
51
51
|
"@nsshunt/stsdatamanagement": "^1.18.188",
|
|
52
|
-
"@nsshunt/stsinstrumentmanagerclient": "^1.0.
|
|
52
|
+
"@nsshunt/stsinstrumentmanagerclient": "^1.0.30",
|
|
53
53
|
"@nsshunt/stsobservability": "^1.0.159",
|
|
54
54
|
"@nsshunt/stssocketioutils": "^2.0.49",
|
|
55
55
|
"@nsshunt/stsutils": "^1.19.104",
|
|
@@ -57,7 +57,7 @@
|
|
|
57
57
|
"@socket.io/redis-streams-adapter": "^0.3.1",
|
|
58
58
|
"@types/on-headers": "^1.0.4",
|
|
59
59
|
"@types/pidusage": "^2.0.5",
|
|
60
|
-
"axios": "^1.16.
|
|
60
|
+
"axios": "^1.16.1",
|
|
61
61
|
"chalk": "^5.6.2",
|
|
62
62
|
"cookie-parser": "^1.4.7",
|
|
63
63
|
"cors": "^2.8.6",
|
|
@@ -71,7 +71,7 @@
|
|
|
71
71
|
"prom-client": "^15.1.3",
|
|
72
72
|
"socket.io": "^4.8.3",
|
|
73
73
|
"socket.io-adapter": "^2.5.6",
|
|
74
|
-
"systeminformation": "^5.31.
|
|
74
|
+
"systeminformation": "^5.31.6",
|
|
75
75
|
"tiny-emitter": "^2.1.0",
|
|
76
76
|
"winston-transport": "^4.9.0"
|
|
77
77
|
},
|
|
@@ -1,8 +1,13 @@
|
|
|
1
1
|
import { Socket } from 'socket.io-client';
|
|
2
|
+
import { ISTSLogger } from '@nsshunt/stsutils';
|
|
2
3
|
import { SocketIoClient, STSDefaultClientToServerEvents, STSDefaultServerToClientEvents } from '@nsshunt/stssocketioutils';
|
|
4
|
+
export interface ISocketClientLogPublisherOptions {
|
|
5
|
+
rooms: string[];
|
|
6
|
+
logger: ISTSLogger;
|
|
7
|
+
}
|
|
3
8
|
export declare class SocketClientLogPublisher extends SocketIoClient<STSDefaultServerToClientEvents, STSDefaultClientToServerEvents> {
|
|
4
9
|
#private;
|
|
5
|
-
constructor(
|
|
10
|
+
constructor(options: ISocketClientLogPublisherOptions);
|
|
6
11
|
get id(): string;
|
|
7
12
|
get logPrefix(): string;
|
|
8
13
|
protected SocketConnect(socket: Socket<STSDefaultServerToClientEvents, STSDefaultClientToServerEvents>): void;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"socketClientLogPublisher.d.ts","sourceRoot":"","sources":["../../src/logger/socketClientLogPublisher.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,MAAM,EAAE,MAAM,kBAAkB,CAAA;
|
|
1
|
+
{"version":3,"file":"socketClientLogPublisher.d.ts","sourceRoot":"","sources":["../../src/logger/socketClientLogPublisher.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,MAAM,EAAE,MAAM,kBAAkB,CAAA;AAEzC,OAAO,EAAqC,UAAU,EAAE,MAAM,mBAAmB,CAAA;AAIjF,OAAO,EAAE,cAAc,EAAE,8BAA8B,EAAE,8BAA8B,EAAE,MAAM,2BAA2B,CAAA;AAW1H,MAAM,WAAW,gCAAgC;IAC7C,KAAK,EAAE,MAAM,EAAE,CAAA;IACf,MAAM,EAAE,UAAU,CAAA;CACrB;AAED,qBAAa,wBAAyB,SAAQ,cAAc,CAAC,8BAA8B,EAAE,8BAA8B,CAAC;;gBAK5G,OAAO,EAAE,gCAAgC;IA+BrD,IAAI,EAAE,WAEL;IAED,IAAI,SAAS,WAEZ;IAED,SAAS,CAAC,aAAa,CAAC,MAAM,EAAE,MAAM,CAAC,8BAA8B,EAAE,8BAA8B,CAAC,GAAG,IAAI;IAK7G,SAAS,CAAC,WAAW,CAAC,KAAK,EAAE,KAAK,GAAG,IAAI;IAIzC,SAAS,CAAC,iBAAiB,CAAC,MAAM,EAAE,MAAM,CAAC,8BAA8B,EAAE,8BAA8B,CAAC,GAAG,IAAI;IAIjH,SAAS,CAAC,kBAAkB,CAAC,KAAK,EAAE,KAAK,GAAG,IAAI;IAIhD,SAAS,CAAC,gBAAgB,CAAC,MAAM,EAAE,MAAM,GAAG,IAAI;CAGnD"}
|
|
@@ -1,6 +1,8 @@
|
|
|
1
1
|
import Transport, { TransportStreamOptions } from 'winston-transport';
|
|
2
|
+
import { ISTSLogger } from '@nsshunt/stsutils';
|
|
2
3
|
export interface ISTSTransportLoggerSocketOptions extends TransportStreamOptions {
|
|
3
4
|
rooms: string[];
|
|
5
|
+
logger: ISTSLogger;
|
|
4
6
|
}
|
|
5
7
|
export declare class STSTransportLoggerSocket extends Transport {
|
|
6
8
|
#private;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"stsTransportLoggerSocket.d.ts","sourceRoot":"","sources":["../../src/logger/stsTransportLoggerSocket.ts"],"names":[],"mappings":"AACA,OAAO,SAAS,EAAE,EAAE,sBAAsB,EAAE,MAAM,mBAAmB,CAAA;
|
|
1
|
+
{"version":3,"file":"stsTransportLoggerSocket.d.ts","sourceRoot":"","sources":["../../src/logger/stsTransportLoggerSocket.ts"],"names":[],"mappings":"AACA,OAAO,SAAS,EAAE,EAAE,sBAAsB,EAAE,MAAM,mBAAmB,CAAA;AAKrE,OAAO,EAAE,UAAU,EAAE,MAAM,mBAAmB,CAAA;AAE9C,MAAM,WAAW,gCAAiC,SAAQ,sBAAsB;IAC5E,KAAK,EAAE,MAAM,EAAE,CAAA;IACf,MAAM,EAAE,UAAU,CAAA;CACrB;AAED,qBAAa,wBAAyB,SAAQ,SAAS;;gBAIvC,IAAI,EAAE,gCAAgC;IAUlD,GAAG,CAAC,IAAI,EAAE,GAAG,EAAE,QAAQ,EAAE,GAAG;CAY/B"}
|