@nsshunt/stsappframework 2.19.208 → 2.19.210
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/singleprocessbase.js +6 -20
- package/dist/singleprocessbase.js.map +1 -1
- package/dist/workerprocessbase.js +2 -2
- package/dist/workerprocessbase.js.map +1 -1
- package/package.json +2 -1
- package/src/singleprocessbase.ts +8 -46
- package/src/workerprocessbase.ts +5 -26
- package/types/singleprocessbase.d.ts +0 -2
- package/types/singleprocessbase.d.ts.map +1 -1
- package/types/workerprocessbase.d.ts.map +1 -1
- package/dist/tcpclientserver/app.js +0 -15
- package/dist/tcpclientserver/app.js.map +0 -1
- package/dist/tcpclientserver/appConfig.js +0 -61
- package/dist/tcpclientserver/appConfig.js.map +0 -1
- package/run.sh +0 -24
- package/src/tcpclientserver/app.ts +0 -9
- package/src/tcpclientserver/appConfig.ts +0 -66
- package/types/tcpclientserver/app.d.ts +0 -2
- package/types/tcpclientserver/app.d.ts.map +0 -1
- package/types/tcpclientserver/appConfig.d.ts +0 -3
- package/types/tcpclientserver/appConfig.d.ts.map +0 -1
|
@@ -4,26 +4,13 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
4
4
|
};
|
|
5
5
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
6
|
exports.SingleProcessBase = void 0;
|
|
7
|
-
const systeminformation_1 = __importDefault(require("systeminformation")); // https://systeminformation.io/
|
|
8
|
-
const os_1 = __importDefault(require("os"));
|
|
9
|
-
const numCPUs = os_1.default.cpus().length;
|
|
10
7
|
const stsconfig_1 = require("@nsshunt/stsconfig");
|
|
11
8
|
const goptions = (0, stsconfig_1.$Options)();
|
|
12
9
|
const stsinstrumentation_1 = require("@nsshunt/stsinstrumentation");
|
|
13
10
|
const server_1 = require("./server");
|
|
14
11
|
const serverprocessbase_1 = require("./serverprocessbase");
|
|
12
|
+
const systeminformation_1 = __importDefault(require("systeminformation")); // https://systeminformation.io/
|
|
15
13
|
class SingleProcessBase extends serverprocessbase_1.ServerProcessBase {
|
|
16
|
-
#masterProcessExitTime = goptions.masterProcessExitTime;
|
|
17
|
-
#io = null;
|
|
18
|
-
#redisClient = null;
|
|
19
|
-
#expressServer = null;
|
|
20
|
-
#shuttingDown = false;
|
|
21
|
-
#additionalInstruments = null;
|
|
22
|
-
#siValueObject = {
|
|
23
|
-
currentLoad: 'currentLoad'
|
|
24
|
-
};
|
|
25
|
-
#httpServer = null;
|
|
26
|
-
#Terminate = null;
|
|
27
14
|
/**
|
|
28
15
|
*
|
|
29
16
|
* @param {SingleProcessBaseOptions} options
|
|
@@ -31,11 +18,11 @@ class SingleProcessBase extends serverprocessbase_1.ServerProcessBase {
|
|
|
31
18
|
constructor(options) {
|
|
32
19
|
super(options);
|
|
33
20
|
}
|
|
34
|
-
get httpServer() {
|
|
35
|
-
return this.#httpServer;
|
|
36
|
-
}
|
|
37
21
|
CollectAdditionalTelemetry() {
|
|
38
|
-
|
|
22
|
+
const siValueObject = {
|
|
23
|
+
currentLoad: 'currentLoad'
|
|
24
|
+
};
|
|
25
|
+
systeminformation_1.default.get(siValueObject).then(data => {
|
|
39
26
|
this.UpdateInstrument(stsinstrumentation_1.Gauge.CPU_SYSTEM_LOAD_GAUGE, {
|
|
40
27
|
val: data.currentLoad.currentLoad
|
|
41
28
|
});
|
|
@@ -81,7 +68,7 @@ class SingleProcessBase extends serverprocessbase_1.ServerProcessBase {
|
|
|
81
68
|
SetupServerEx = async () => {
|
|
82
69
|
this.ProcessStartup();
|
|
83
70
|
if (this.options.expressServerRouteFactory || this.options.expressServerRouteStaticFactory) {
|
|
84
|
-
this
|
|
71
|
+
this.expressServer = new server_1.STSExpressServer(this.options, this);
|
|
85
72
|
}
|
|
86
73
|
this.LogEx(`Service instance starting. Instance Id: [${this.options.serviceInstanceId}]`);
|
|
87
74
|
this.LogEx(`Master process:${process.pid} started`);
|
|
@@ -106,7 +93,6 @@ class SingleProcessBase extends serverprocessbase_1.ServerProcessBase {
|
|
|
106
93
|
};
|
|
107
94
|
async TerminateApplication() {
|
|
108
95
|
await this.Terminate(false, false, 'SIGINT');
|
|
109
|
-
this.#Terminate = null;
|
|
110
96
|
}
|
|
111
97
|
}
|
|
112
98
|
exports.SingleProcessBase = SingleProcessBase;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"singleprocessbase.js","sourceRoot":"","sources":["../src/singleprocessbase.ts"],"names":[],"mappings":";;;;;;
|
|
1
|
+
{"version":3,"file":"singleprocessbase.js","sourceRoot":"","sources":["../src/singleprocessbase.ts"],"names":[],"mappings":"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"}
|
|
@@ -6,12 +6,12 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
6
6
|
exports.WorkerProcessBase = void 0;
|
|
7
7
|
const debug_1 = __importDefault(require("debug"));
|
|
8
8
|
const debug = (0, debug_1.default)(`proc:${process.pid}`);
|
|
9
|
-
const colors_1 = __importDefault(require("colors"));
|
|
10
9
|
const stsinstrumentation_1 = require("@nsshunt/stsinstrumentation");
|
|
11
|
-
const uuid_1 = require("uuid");
|
|
12
10
|
const commonTypes_1 = require("./commonTypes");
|
|
13
11
|
const server_1 = require("./server");
|
|
14
12
|
const serverprocessbase_1 = require("./serverprocessbase");
|
|
13
|
+
const uuid_1 = require("uuid");
|
|
14
|
+
const colors_1 = __importDefault(require("colors"));
|
|
15
15
|
/**
|
|
16
16
|
* todo
|
|
17
17
|
* @typedef {Object} options - todo
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"workerprocessbase.js","sourceRoot":"","sources":["../src/workerprocessbase.ts"],"names":[],"mappings":";;;;;;AAAA,kDAA+B;AAC/B,MAAM,KAAK,GAAG,IAAA,eAAW,EAAC,QAAQ,OAAO,CAAC,GAAG,EAAE,CAAC,CAAC;AAGjD,
|
|
1
|
+
{"version":3,"file":"workerprocessbase.js","sourceRoot":"","sources":["../src/workerprocessbase.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.
|
|
3
|
+
"version": "2.19.210",
|
|
4
4
|
"description": "",
|
|
5
5
|
"main": "dist/index.js",
|
|
6
6
|
"types": "./types/index.d.ts",
|
|
@@ -42,6 +42,7 @@
|
|
|
42
42
|
"typescript": "^5.0.4"
|
|
43
43
|
},
|
|
44
44
|
"dependencies": {
|
|
45
|
+
"@nsshunt/stsappframework": "^2.19.209",
|
|
45
46
|
"@nsshunt/stsconfig": "^1.25.46",
|
|
46
47
|
"@nsshunt/stsdatamanagement": "^1.17.97",
|
|
47
48
|
"@nsshunt/stsinstrumentation": "^6.11.84",
|
package/src/singleprocessbase.ts
CHANGED
|
@@ -1,55 +1,20 @@
|
|
|
1
|
-
import fs from "fs"
|
|
2
|
-
import si from 'systeminformation' // https://systeminformation.io/
|
|
3
|
-
|
|
4
|
-
import os from 'os';
|
|
5
|
-
const numCPUs = os.cpus().length;
|
|
6
|
-
|
|
7
|
-
import { Server, ServerOptions } from "socket.io";
|
|
8
|
-
|
|
9
|
-
import { createServer as createServerHttps } from 'https'
|
|
10
|
-
import { createServer } from 'http'
|
|
11
|
-
|
|
12
|
-
import { Sleep } from '@nsshunt/stsutils';
|
|
13
|
-
|
|
14
|
-
import colors from 'colors'
|
|
15
|
-
|
|
16
1
|
import { $Options } from '@nsshunt/stsconfig'
|
|
17
2
|
const goptions = $Options()
|
|
18
3
|
|
|
19
4
|
import { Gauge, GaugeTypes, InstrumentGaugeOptions, InstrumentGaugeTelemetry } from '@nsshunt/stsinstrumentation'
|
|
20
5
|
|
|
21
|
-
import { ProcessOptions
|
|
22
|
-
import { ProcessBase } from './processbase';
|
|
6
|
+
import { ProcessOptions } from './processoptions'
|
|
23
7
|
import { ISingleProcessBase } from './commonTypes';
|
|
24
|
-
|
|
25
8
|
import { InstrumentDefinitions } from '@nsshunt/stspublisherserver'
|
|
26
|
-
|
|
27
|
-
import { GetFirstNetworkInterface } from './network.js';
|
|
28
|
-
|
|
29
9
|
import { STSExpressServer } from './server'
|
|
30
|
-
|
|
31
|
-
import { createAdapter } from "@socket.io/redis-streams-adapter";
|
|
32
|
-
|
|
33
|
-
import { createClient, RedisClientType } from 'redis';
|
|
34
|
-
|
|
35
10
|
import { ServerProcessBase } from './serverprocessbase'
|
|
36
11
|
|
|
12
|
+
import si from 'systeminformation' // https://systeminformation.io/
|
|
13
|
+
|
|
37
14
|
export type EventCb = (socket: any, data: any) => void
|
|
38
15
|
|
|
39
16
|
export class SingleProcessBase extends ServerProcessBase implements ISingleProcessBase
|
|
40
17
|
{
|
|
41
|
-
#masterProcessExitTime = goptions.masterProcessExitTime;
|
|
42
|
-
#io: any = null;
|
|
43
|
-
#redisClient: RedisClientType | null = null;
|
|
44
|
-
#expressServer: STSExpressServer | null = null;
|
|
45
|
-
#shuttingDown = false;
|
|
46
|
-
#additionalInstruments = null;
|
|
47
|
-
#siValueObject = {
|
|
48
|
-
currentLoad: 'currentLoad'
|
|
49
|
-
}
|
|
50
|
-
#httpServer: any = null;
|
|
51
|
-
#Terminate: any = null;
|
|
52
|
-
|
|
53
18
|
/**
|
|
54
19
|
*
|
|
55
20
|
* @param {SingleProcessBaseOptions} options
|
|
@@ -58,13 +23,11 @@ export class SingleProcessBase extends ServerProcessBase implements ISingleProce
|
|
|
58
23
|
super(options)
|
|
59
24
|
}
|
|
60
25
|
|
|
61
|
-
get httpServer()
|
|
62
|
-
{
|
|
63
|
-
return this.#httpServer;
|
|
64
|
-
}
|
|
65
|
-
|
|
66
26
|
override CollectAdditionalTelemetry(): void {
|
|
67
|
-
|
|
27
|
+
const siValueObject = {
|
|
28
|
+
currentLoad: 'currentLoad'
|
|
29
|
+
}
|
|
30
|
+
si.get(siValueObject).then(data => {
|
|
68
31
|
this.UpdateInstrument(Gauge.CPU_SYSTEM_LOAD_GAUGE, {
|
|
69
32
|
val: data.currentLoad.currentLoad
|
|
70
33
|
} as InstrumentGaugeTelemetry);
|
|
@@ -115,7 +78,7 @@ export class SingleProcessBase extends ServerProcessBase implements ISingleProce
|
|
|
115
78
|
this.ProcessStartup();
|
|
116
79
|
|
|
117
80
|
if (this.options.expressServerRouteFactory || this.options.expressServerRouteStaticFactory) {
|
|
118
|
-
this
|
|
81
|
+
this.expressServer = new STSExpressServer(this.options, this);
|
|
119
82
|
}
|
|
120
83
|
|
|
121
84
|
this.LogEx(`Service instance starting. Instance Id: [${this.options.serviceInstanceId}]`);
|
|
@@ -149,6 +112,5 @@ export class SingleProcessBase extends ServerProcessBase implements ISingleProce
|
|
|
149
112
|
async TerminateApplication()
|
|
150
113
|
{
|
|
151
114
|
await this.Terminate(false, false, 'SIGINT');
|
|
152
|
-
this.#Terminate = null;
|
|
153
115
|
}
|
|
154
116
|
}
|
package/src/workerprocessbase.ts
CHANGED
|
@@ -1,38 +1,17 @@
|
|
|
1
1
|
import debugModule from 'debug'
|
|
2
2
|
const debug = debugModule(`proc:${process.pid}`);
|
|
3
3
|
|
|
4
|
-
import fs from "fs"
|
|
5
|
-
import colors from 'colors'
|
|
6
|
-
|
|
7
|
-
import { createAdapter as clusterCreateAdapter } from '@socket.io/cluster-adapter'
|
|
8
|
-
import { createAdapter } from "@socket.io/redis-streams-adapter";
|
|
9
4
|
|
|
10
5
|
import { Gauge, InstrumentGaugeTelemetry } from '@nsshunt/stsinstrumentation'
|
|
11
|
-
import { JSONObject
|
|
12
|
-
|
|
13
|
-
import { ProcessOptions, STSServerType } from './processoptions'
|
|
14
|
-
import { ProcessBase } from './processbase';
|
|
15
|
-
|
|
16
|
-
import { register, Counter, collectDefaultMetrics, AggregatorRegistry } from 'prom-client'
|
|
17
|
-
|
|
18
|
-
import { createServer as createServerHttps } from 'https'
|
|
19
|
-
import { createServer } from 'http'
|
|
20
|
-
import tls from 'node:tls'
|
|
21
|
-
import net from 'node:net'
|
|
22
|
-
|
|
23
|
-
import { Server, ServerOptions } from "socket.io";
|
|
24
|
-
|
|
25
|
-
import { v4 as uuidv4 } from 'uuid';
|
|
26
|
-
|
|
6
|
+
import { JSONObject } from '@nsshunt/stsutils'
|
|
7
|
+
import { ProcessOptions } from './processoptions'
|
|
27
8
|
import { IPCMessage, IPCMessages, IPCMessagePayload, IPCMessageCommand, IWorkerProcessBase, ISocketIoHelper } from './commonTypes'
|
|
28
9
|
import { STSExpressServer } from './server';
|
|
29
|
-
import { Express } from 'express'
|
|
30
|
-
|
|
31
|
-
import { createClient, RedisClientType } from 'redis';
|
|
32
|
-
|
|
33
10
|
import { ServerProcessBase } from './serverprocessbase'
|
|
34
11
|
|
|
35
|
-
import
|
|
12
|
+
import { v4 as uuidv4 } from 'uuid';
|
|
13
|
+
|
|
14
|
+
import colors from 'colors'
|
|
36
15
|
|
|
37
16
|
/**
|
|
38
17
|
* todo
|
|
@@ -4,13 +4,11 @@ import { InstrumentDefinitions } from '@nsshunt/stspublisherserver';
|
|
|
4
4
|
import { ServerProcessBase } from './serverprocessbase';
|
|
5
5
|
export type EventCb = (socket: any, data: any) => void;
|
|
6
6
|
export declare class SingleProcessBase extends ServerProcessBase implements ISingleProcessBase {
|
|
7
|
-
#private;
|
|
8
7
|
/**
|
|
9
8
|
*
|
|
10
9
|
* @param {SingleProcessBaseOptions} options
|
|
11
10
|
*/
|
|
12
11
|
constructor(options: ProcessOptions);
|
|
13
|
-
get httpServer(): any;
|
|
14
12
|
CollectAdditionalTelemetry(): void;
|
|
15
13
|
GetAdditionalInstruments(): InstrumentDefinitions;
|
|
16
14
|
/**
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"singleprocessbase.d.ts","sourceRoot":"","sources":["../src/singleprocessbase.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"singleprocessbase.d.ts","sourceRoot":"","sources":["../src/singleprocessbase.ts"],"names":[],"mappings":"AAKA,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;AAIvD,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;IAId,WAAW,IAAI,OAAO,CAAC,OAAO,CAAC;IAmB/B,aAAa,sBAiCZ;IAEK,oBAAoB;CAI7B"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"workerprocessbase.d.ts","sourceRoot":"","sources":["../src/workerprocessbase.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"workerprocessbase.d.ts","sourceRoot":"","sources":["../src/workerprocessbase.ts"],"names":[],"mappings":"AAKA,OAAO,EAAE,UAAU,EAAE,MAAM,mBAAmB,CAAA;AAC9C,OAAO,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAA;AACjD,OAAO,EAAiE,kBAAkB,EAAmB,MAAM,eAAe,CAAA;AAElI,OAAO,EAAE,iBAAiB,EAAE,MAAM,qBAAqB,CAAA;AAMvD;;;;GAIG;AACH,qBAAa,iBAAkB,SAAQ,iBAAkB,YAAW,kBAAkB;;gBAKtE,OAAO,EAAE,cAAc;IAInC,aAAa;IAKb,yBAAyB,CAAC,GAAG,EAAE,GAAG;IAIzB,0BAA0B,IAAI,IAAI;IAwC3C,SAAS,YAAmB,GAAG,KAAG,QAAQ,MAAM,CAAC,CAUhD;IAGD,YAAY,aAAoB,MAAM,WAAW,GAAG,KAAG,QAAQ,UAAU,CAAC,CAWzE;IAED,kBAAkB,QAAa,QAAQ,IAAI,CAAC,CAE3C;IAED,WAAW,sBAMV;IAED,aAAa,sBAmEX;CACL"}
|
|
@@ -1,15 +0,0 @@
|
|
|
1
|
-
"use strict";
|
|
2
|
-
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
3
|
-
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
4
|
-
};
|
|
5
|
-
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
|
-
const appConfig_js_1 = require("./appConfig.js");
|
|
7
|
-
const index_1 = require("./../index");
|
|
8
|
-
const cluster_1 = __importDefault(require("cluster"));
|
|
9
|
-
if (cluster_1.default.isPrimary) {
|
|
10
|
-
new index_1.MasterProcessBase((0, appConfig_js_1.ServiceConfigOptions)(cluster_1.default.isPrimary)).SetupServer();
|
|
11
|
-
}
|
|
12
|
-
else {
|
|
13
|
-
new index_1.WorkerProcessBase((0, appConfig_js_1.ServiceConfigOptions)(cluster_1.default.isPrimary)).SetupServer();
|
|
14
|
-
}
|
|
15
|
-
//# sourceMappingURL=app.js.map
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"app.js","sourceRoot":"","sources":["../../src/tcpclientserver/app.ts"],"names":[],"mappings":";;;;;AAAA,iDAAqD;AACrD,sCAAiE;AACjE,sDAA8B;AAE9B,IAAI,iBAAO,CAAC,SAAS,EAAE;IACnB,IAAI,yBAAiB,CAAC,IAAA,mCAAoB,EAAC,iBAAO,CAAC,SAAS,CAAC,CAAC,CAAC,WAAW,EAAE,CAAC;CAChF;KAAM;IACH,IAAI,yBAAiB,CAAC,IAAA,mCAAoB,EAAC,iBAAO,CAAC,SAAS,CAAC,CAAC,CAAC,WAAW,EAAE,CAAC;CAChF"}
|
|
@@ -1,61 +0,0 @@
|
|
|
1
|
-
"use strict";
|
|
2
|
-
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.ServiceConfigOptions = void 0;
|
|
4
|
-
const uuid_1 = require("uuid");
|
|
5
|
-
const stsconfig_1 = require("@nsshunt/stsconfig");
|
|
6
|
-
const goptions = (0, stsconfig_1.$Options)();
|
|
7
|
-
const index_1 = require("./../index");
|
|
8
|
-
/*
|
|
9
|
-
// nid: `${goptions.rest01servicename} @ ${goptions.rest01serviceversion} | ${this.options.globalServiceData.serviceInstanceId} @ ${os.hostname()} ^ ${process.pid} @ ${(cluster.isMaster ? process.pid : process.ppid)}`,
|
|
10
|
-
// <serviceId> <serviceInstanceId> <serviceInstanceProcessId>
|
|
11
|
-
// <serviceName> <serviceVersion> <sid> <hostName> <pid> <ppid>
|
|
12
|
-
// << ............... Static Nid ............... >> << ............... Dynamic Nid ............... >>
|
|
13
|
-
// Note: The final nid will NOT contain the NID_SEPERATOR character. This will be replaced with the SEPERATOR character.
|
|
14
|
-
const Context = (isMaster, serviceInstanceId) => {
|
|
15
|
-
return {
|
|
16
|
-
nid: `\
|
|
17
|
-
${goptions.rest01servicename}${ModelDelimeter.COMPONENT_SEPERATOR}${goptions.rest01serviceversion}\
|
|
18
|
-
${ModelDelimeter.SEPERATOR}\
|
|
19
|
-
${serviceInstanceId}${ModelDelimeter.COMPONENT_SEPERATOR}${os.hostname()}\
|
|
20
|
-
${ModelDelimeter.NID_SEPERATOR}\
|
|
21
|
-
${process.pid}${ModelDelimeter.COMPONENT_SEPERATOR}${(isMaster ? process.pid : process.ppid)}`
|
|
22
|
-
}
|
|
23
|
-
}
|
|
24
|
-
*/
|
|
25
|
-
function ServiceConfigOptions(isMaster) {
|
|
26
|
-
if (isMaster === true) {
|
|
27
|
-
const serviceInstanceId = (0, uuid_1.v4)();
|
|
28
|
-
const data = {
|
|
29
|
-
serverType: index_1.STSServerType.TCPRAW_TLS,
|
|
30
|
-
wssServer: false,
|
|
31
|
-
useLatency: false,
|
|
32
|
-
httpsServerKeyPath: goptions.httpsserverkeypath,
|
|
33
|
-
httpsServerCertificatePath: goptions.httpsservercertpath,
|
|
34
|
-
processExitOnTerminate: true,
|
|
35
|
-
serviceInstanceId: serviceInstanceId,
|
|
36
|
-
useDatabase: true,
|
|
37
|
-
useInstrumentationWorkers: true,
|
|
38
|
-
isMaster: isMaster,
|
|
39
|
-
endpoint: goptions.rest01endpoint,
|
|
40
|
-
apiRoot: goptions.rest01apiroot,
|
|
41
|
-
listenPort: goptions.rest01hostport,
|
|
42
|
-
port: goptions.rest01port,
|
|
43
|
-
prometheusSupport: false,
|
|
44
|
-
prometheusClusterPort: goptions.rest01prometheusclusterport,
|
|
45
|
-
serviceName: goptions.rest01servicename,
|
|
46
|
-
serviceVersion: goptions.rest01serviceversion,
|
|
47
|
-
consoleLogging: true,
|
|
48
|
-
instrumentLogging: true,
|
|
49
|
-
instrumentationObservationInterval: goptions.instrumentationObservationInterval,
|
|
50
|
-
instrumentationTimeWindow: goptions.instrumentationTimeWindow,
|
|
51
|
-
useRedisAdaptor: false
|
|
52
|
-
};
|
|
53
|
-
return data;
|
|
54
|
-
}
|
|
55
|
-
else {
|
|
56
|
-
const data = JSON.parse(process.env['STS_GSD_SII']);
|
|
57
|
-
return data;
|
|
58
|
-
}
|
|
59
|
-
}
|
|
60
|
-
exports.ServiceConfigOptions = ServiceConfigOptions;
|
|
61
|
-
//# sourceMappingURL=appConfig.js.map
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"appConfig.js","sourceRoot":"","sources":["../../src/tcpclientserver/appConfig.ts"],"names":[],"mappings":";;;AAAA,+BAAoC;AAGpC,kDAA6C;AAC7C,MAAM,QAAQ,GAAG,IAAA,oBAAQ,GAAE,CAAA;AAE3B,sCAAwE;AAExE;;;;;;;;;;;;;;;;EAgBE;AAEF,SAAgB,oBAAoB,CAAC,QAAiB;IAClD,IAAI,QAAQ,KAAK,IAAI,EAAE;QACnB,MAAM,iBAAiB,GAAG,IAAA,SAAM,GAAE,CAAC;QACnC,MAAM,IAAI,GAAmB;YACzB,UAAU,EAAE,qBAAa,CAAC,UAAU;YAEpC,SAAS,EAAE,KAAK;YAChB,UAAU,EAAE,KAAK;YACjB,kBAAkB,EAAE,QAAQ,CAAC,kBAAkB;YAC/C,0BAA0B,EAAE,QAAQ,CAAC,mBAAmB;YACxD,sBAAsB,EAAE,IAAI;YAC5B,iBAAiB,EAAE,iBAAiB;YACpC,WAAW,EAAE,IAAI;YACjB,yBAAyB,EAAE,IAAI;YAE/B,QAAQ,EAAE,QAAQ;YAClB,QAAQ,EAAE,QAAQ,CAAC,cAAc;YACjC,OAAO,EAAE,QAAQ,CAAC,aAAa;YAC/B,UAAU,EAAE,QAAQ,CAAC,cAAc;YACnC,IAAI,EAAE,QAAQ,CAAC,UAAU;YAEzB,iBAAiB,EAAE,KAAK;YACxB,qBAAqB,EAAE,QAAQ,CAAC,2BAA2B;YAE3D,WAAW,EAAE,QAAQ,CAAC,iBAAiB;YACvC,cAAc,EAAE,QAAQ,CAAC,oBAAoB;YAC7C,cAAc,EAAE,IAAI;YACpB,iBAAiB,EAAE,IAAI;YAEvB,kCAAkC,EAAE,QAAQ,CAAC,kCAAkC;YAC/E,yBAAyB,EAAE,QAAQ,CAAC,yBAAyB;YAE7D,eAAe,EAAE,KAAK;SACzB,CAAA;QACD,OAAO,IAAI,CAAC;KACf;SAAM;QACH,MAAM,IAAI,GAAmB,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,GAAG,CAAC,aAAa,CAAW,CAAmB,CAAC;QAChG,OAAO,IAAI,CAAC;KACf;AACL,CAAC;AAvCD,oDAuCC"}
|
package/run.sh
DELETED
|
@@ -1,24 +0,0 @@
|
|
|
1
|
-
#!/bin/sh
|
|
2
|
-
# openssl req -nodes -new -x509 -keyout server.key -out server.cert
|
|
3
|
-
clear; \
|
|
4
|
-
export STS_PROJ_ROOT=./..; \
|
|
5
|
-
STSENVFILE=$STS_PROJ_ROOT/stsglobalresources/.env \
|
|
6
|
-
DB_SCRIPT_FOLDER=$STS_PROJ_ROOT/stsglobalresources/db-scripts \
|
|
7
|
-
REST01_PORT=3003 \
|
|
8
|
-
REST01_HOST_PORT=3003 \
|
|
9
|
-
REST01_SERVICE_NAME="STSRest01-3003" \
|
|
10
|
-
REST01_API_IDENTIFIER="https://stsmda.com.au/stsrest01api/v1.0/" \
|
|
11
|
-
REST01_ENDPOINT="https://stsrest.stsmda.org" \
|
|
12
|
-
MAX_CPU=4 \
|
|
13
|
-
AS_ENDPOINT=https://stscore.stsmda.org \
|
|
14
|
-
AS_HOST_PORT=3002 \
|
|
15
|
-
AS_PORT=3002 \
|
|
16
|
-
DB_HOST=localhost \
|
|
17
|
-
DB_PORT=5432 \
|
|
18
|
-
DB_PASSWORD=postgres \
|
|
19
|
-
HTTPS_SERVER_KEY_PATH=/etc/letsencrypt/live/stsmda.org/privkey.pem \
|
|
20
|
-
HTTPS_SERVER_CERT_PATH=/etc/letsencrypt/live/stsmda.org/fullchain.pem \
|
|
21
|
-
DEBUG=zzproc* \
|
|
22
|
-
PUBLISH_DEBUG=false \
|
|
23
|
-
UV_THREADPOOL_SIZE=64 \
|
|
24
|
-
node dist/tcpclientserver/app
|
|
@@ -1,9 +0,0 @@
|
|
|
1
|
-
import { ServiceConfigOptions } from './appConfig.js'
|
|
2
|
-
import { MasterProcessBase, WorkerProcessBase } from './../index'
|
|
3
|
-
import cluster from 'cluster';
|
|
4
|
-
|
|
5
|
-
if (cluster.isPrimary) {
|
|
6
|
-
new MasterProcessBase(ServiceConfigOptions(cluster.isPrimary)).SetupServer();
|
|
7
|
-
} else {
|
|
8
|
-
new WorkerProcessBase(ServiceConfigOptions(cluster.isPrimary)).SetupServer();
|
|
9
|
-
}
|
|
@@ -1,66 +0,0 @@
|
|
|
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 './../index'
|
|
8
|
-
|
|
9
|
-
/*
|
|
10
|
-
// nid: `${goptions.rest01servicename} @ ${goptions.rest01serviceversion} | ${this.options.globalServiceData.serviceInstanceId} @ ${os.hostname()} ^ ${process.pid} @ ${(cluster.isMaster ? process.pid : process.ppid)}`,
|
|
11
|
-
// <serviceId> <serviceInstanceId> <serviceInstanceProcessId>
|
|
12
|
-
// <serviceName> <serviceVersion> <sid> <hostName> <pid> <ppid>
|
|
13
|
-
// << ............... Static Nid ............... >> << ............... Dynamic Nid ............... >>
|
|
14
|
-
// Note: The final nid will NOT contain the NID_SEPERATOR character. This will be replaced with the SEPERATOR character.
|
|
15
|
-
const Context = (isMaster, serviceInstanceId) => {
|
|
16
|
-
return {
|
|
17
|
-
nid: `\
|
|
18
|
-
${goptions.rest01servicename}${ModelDelimeter.COMPONENT_SEPERATOR}${goptions.rest01serviceversion}\
|
|
19
|
-
${ModelDelimeter.SEPERATOR}\
|
|
20
|
-
${serviceInstanceId}${ModelDelimeter.COMPONENT_SEPERATOR}${os.hostname()}\
|
|
21
|
-
${ModelDelimeter.NID_SEPERATOR}\
|
|
22
|
-
${process.pid}${ModelDelimeter.COMPONENT_SEPERATOR}${(isMaster ? process.pid : process.ppid)}`
|
|
23
|
-
}
|
|
24
|
-
}
|
|
25
|
-
*/
|
|
26
|
-
|
|
27
|
-
export function ServiceConfigOptions(isMaster: boolean): ProcessOptions {
|
|
28
|
-
if (isMaster === true) {
|
|
29
|
-
const serviceInstanceId = uuidv4();
|
|
30
|
-
const data: ProcessOptions = {
|
|
31
|
-
serverType: STSServerType.TCPRAW_TLS,
|
|
32
|
-
|
|
33
|
-
wssServer: false,
|
|
34
|
-
useLatency: false,
|
|
35
|
-
httpsServerKeyPath: goptions.httpsserverkeypath,
|
|
36
|
-
httpsServerCertificatePath: goptions.httpsservercertpath,
|
|
37
|
-
processExitOnTerminate: true,
|
|
38
|
-
serviceInstanceId: serviceInstanceId,
|
|
39
|
-
useDatabase: true,
|
|
40
|
-
useInstrumentationWorkers: true,
|
|
41
|
-
|
|
42
|
-
isMaster: isMaster,
|
|
43
|
-
endpoint: goptions.rest01endpoint,
|
|
44
|
-
apiRoot: goptions.rest01apiroot,
|
|
45
|
-
listenPort: goptions.rest01hostport,
|
|
46
|
-
port: goptions.rest01port,
|
|
47
|
-
|
|
48
|
-
prometheusSupport: false,
|
|
49
|
-
prometheusClusterPort: goptions.rest01prometheusclusterport,
|
|
50
|
-
|
|
51
|
-
serviceName: goptions.rest01servicename,
|
|
52
|
-
serviceVersion: goptions.rest01serviceversion,
|
|
53
|
-
consoleLogging: true,
|
|
54
|
-
instrumentLogging: true,
|
|
55
|
-
|
|
56
|
-
instrumentationObservationInterval: goptions.instrumentationObservationInterval,
|
|
57
|
-
instrumentationTimeWindow: goptions.instrumentationTimeWindow,
|
|
58
|
-
|
|
59
|
-
useRedisAdaptor: false
|
|
60
|
-
}
|
|
61
|
-
return data;
|
|
62
|
-
} else {
|
|
63
|
-
const data: ProcessOptions = JSON.parse(process.env['STS_GSD_SII'] as string) as ProcessOptions;
|
|
64
|
-
return data;
|
|
65
|
-
}
|
|
66
|
-
}
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"app.d.ts","sourceRoot":"","sources":["../../src/tcpclientserver/app.ts"],"names":[],"mappings":""}
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"appConfig.d.ts","sourceRoot":"","sources":["../../src/tcpclientserver/appConfig.ts"],"names":[],"mappings":"AAMA,OAAO,EAAE,cAAc,EAA+B,MAAM,YAAY,CAAA;AAoBxE,wBAAgB,oBAAoB,CAAC,QAAQ,EAAE,OAAO,GAAG,cAAc,CAuCtE"}
|