@nsshunt/stsappframework 2.19.130 → 2.19.132

package/dist/src/miniapp/app.js

@@ -0,0 +1,21 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+const appConfig_js_1 = require("./appConfig.js");
+const appmaster_1 = require("./appmaster");
+const appworker_1 = require("./appworker");
+const stsutils_1 = require("@nsshunt/stsutils");
+const cluster_1 = __importDefault(require("cluster"));
+if (cluster_1.default.isPrimary) {
+    const serviceConfig = (0, appConfig_js_1.ServiceConfigOptions)(true);
+    stsutils_1.$stsgd.app = new appmaster_1.AppMaster(serviceConfig);
+    stsutils_1.$stsgd.app.SetupServer();
+}
+else {
+    const serviceConfig = (0, appConfig_js_1.ServiceConfigOptions)(false);
+    stsutils_1.$stsgd.app = new appworker_1.WorkerProcess(serviceConfig);
+    stsutils_1.$stsgd.app.SetupServer();
+}
+//# sourceMappingURL=app.js.map

package/dist/src/miniapp/app.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"app.js","sourceRoot":"","sources":["../../../src/miniapp/app.ts"],"names":[],"mappings":";;;;;AAAA,iDAAqD;AACrD,2CAAuC;AACvC,2CAA2C;AAC3C,gDAA0C;AAC1C,sDAA8B;AAM9B,IAAI,iBAAO,CAAC,SAAS,EACrB;IACI,MAAM,aAAa,GAAG,IAAA,mCAAoB,EAAC,IAAI,CAAC,CAAC;IACjD,iBAAM,CAAC,GAAG,GAAG,IAAI,qBAAS,CAAC,aAAa,CAAC,CAAC;IAC1C,iBAAM,CAAC,GAAG,CAAC,WAAW,EAAE,CAAC;CAC5B;KACD;IACI,MAAM,aAAa,GAAG,IAAA,mCAAoB,EAAC,KAAK,CAAC,CAAC;IAClD,iBAAM,CAAC,GAAG,GAAG,IAAI,yBAAa,CAAC,aAAa,CAAC,CAAC;IAC9C,iBAAM,CAAC,GAAG,CAAC,WAAW,EAAE,CAAC;CAC5B"}

package/dist/src/miniapp/appConfig.js

@@ -0,0 +1,76 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.ServiceConfigOptions = void 0;
+const stsconfig_1 = require("@nsshunt/stsconfig");
+const goptions = (0, stsconfig_1.$Options)();
+const uuid_1 = require("uuid");
+const stsmodels_1 = require("@nsshunt/stsmodels");
+const os_1 = __importDefault(require("os"));
+// nid: `${goptions.rest01servicename} @ ${goptions.rest01serviceversion}  |  ${this.options.globalServiceData.serviceInstanceId} @ ${os.hostname()}   ^   ${process.pid} @ ${(cluster.isMaster ? process.pid : process.ppid)}`,
+//                        <serviceId>                                                                 <serviceInstanceId>                                                       <serviceInstanceProcessId>
+//              <serviceName>                    <serviceVersion>                                  <sid>                              <hostName>               <pid>                                     <ppid>
+//                                                  << ............... Static Nid ............... >>                                                                    << ............... Dynamic Nid ............... >>
+// Note: The final nid will NOT contain the NID_SEPERATOR character. This will be replaced with the SEPERATOR character.
+const Context = (isMaster, serviceInstanceId) => {
+    return {
+        nid: `\
+${goptions.imservicename}${stsmodels_1.ModelDelimeter.COMPONENT_SEPERATOR}${goptions.imserviceversion}\
+${stsmodels_1.ModelDelimeter.SEPERATOR}\
+${serviceInstanceId}${stsmodels_1.ModelDelimeter.COMPONENT_SEPERATOR}${os_1.default.hostname()}\
+${stsmodels_1.ModelDelimeter.NID_SEPERATOR}\
+${process.pid}${stsmodels_1.ModelDelimeter.COMPONENT_SEPERATOR}${(isMaster ? process.pid : process.ppid)}`
+    };
+};
+const ServiceConfigOptions = (isMaster) => {
+    //AddSchemas();
+    if (isMaster === true) {
+        const serviceInstanceId = (0, uuid_1.v4)();
+        const checkParams = [
+            ['imservicename', goptions.imservicename],
+            ['imserviceversion', goptions.imserviceversion],
+            ['hostname', os_1.default.hostname()],
+            ['serviceInstanceId', serviceInstanceId]
+        ];
+        // CHeck for invalid strings
+        stsmodels_1.STSModelUtils.CheckValidChar(checkParams);
+        const data = {
+            // Service details
+            httpServer: true,
+            httpsServer: true,
+            wssServer: true,
+            useLatency: true,
+            httpsServerKeyPath: goptions.httpsserverkeypath,
+            httpsServerCertificatePath: goptions.httpsservercertpath,
+            processExitOnTerminate: true,
+            serviceInstanceId: serviceInstanceId,
+            useDatabase: false,
+            useInstrumentationWorkers: true,
+            isMaster: isMaster,
+            endpoint: goptions.imendpoint,
+            apiRoot: goptions.imapiroot,
+            listenPort: goptions.imhostport,
+            port: goptions.import,
+            prometheusSupport: goptions.imprometheussupport,
+            prometheusClusterPort: goptions.imprometheusclusterport,
+            serviceName: goptions.imservicename,
+            serviceVersion: goptions.imserviceversion,
+            consoleLogging: true,
+            instrumentLogging: true,
+            serviceProcessContext: Context(isMaster, serviceInstanceId),
+            expressServerFactory: null
+        };
+        return data;
+    }
+    else {
+        const data = JSON.parse(process.env['STS_GSD_SII']);
+        // Recompute the context for this worker process
+        data.serviceProcessContext = Context(isMaster, data.serviceInstanceId);
+        data.expressServerFactory = null;
+        return data;
+    }
+};
+exports.ServiceConfigOptions = ServiceConfigOptions;
+//# sourceMappingURL=appConfig.js.map

package/dist/src/miniapp/appConfig.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"appConfig.js","sourceRoot":"","sources":["../../../src/miniapp/appConfig.ts"],"names":[],"mappings":";;;;;;AAAA,kDAA6C;AAC7C,MAAM,QAAQ,GAAG,IAAA,oBAAQ,GAAE,CAAA;AAE3B,+BAAoC;AACpC,kDAAmE;AACnE,4CAAoB;AAKpB,gOAAgO;AAChO,0MAA0M;AAC1M,+MAA+M;AAC/M,yNAAyN;AACzN,wHAAwH;AAExH,MAAM,OAAO,GAAG,CAAC,QAAiB,EAAE,iBAAyB,EAAyB,EAAE;IACpF,OAAO;QACH,GAAG,EAAE;EACX,QAAQ,CAAC,aAAa,GAAG,0BAAc,CAAC,mBAAmB,GAAG,QAAQ,CAAC,gBAAgB;EACvF,0BAAc,CAAC,SAAS;EACxB,iBAAiB,GAAG,0BAAc,CAAC,mBAAmB,GAAG,YAAE,CAAC,QAAQ,EAAE;EACtE,0BAAc,CAAC,aAAa;EAC5B,OAAO,CAAC,GAAG,GAAG,0BAAc,CAAC,mBAAmB,GAAG,CAAC,QAAQ,CAAC,CAAC,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE;KACzF,CAAC;AACN,CAAC,CAAA;AAEM,MAAM,oBAAoB,GAAG,CAAC,QAAiB,EAA2B,EAAE;IAC/E,eAAe;IAEf,IAAI,QAAQ,KAAK,IAAI,EAAE;QACnB,MAAM,iBAAiB,GAAG,IAAA,SAAM,GAAE,CAAC;QAEnC,MAAM,WAAW,GAAG;YAChB,CAAE,eAAe,EAAE,QAAQ,CAAC,aAAa,CAAE;YAC3C,CAAE,kBAAkB,EAAE,QAAQ,CAAC,gBAAgB,CAAE;YACjD,CAAE,UAAU,EAAE,YAAE,CAAC,QAAQ,EAAE,CAAE;YAC7B,CAAE,mBAAmB,EAAE,iBAAiB,CAAE;SAC7C,CAAC;QAEF,4BAA4B;QAC5B,yBAAa,CAAC,cAAc,CAAC,WAAW,CAAC,CAAC;QAE1C,MAAM,IAAI,GAA4B;YAClC,kBAAkB;YAClB,UAAU,EAAE,IAAI;YAChB,WAAW,EAAE,IAAI;YACjB,SAAS,EAAE,IAAI;YACf,UAAU,EAAE,IAAI;YAChB,kBAAkB,EAAE,QAAQ,CAAC,kBAAkB;YAC/C,0BAA0B,EAAE,QAAQ,CAAC,mBAAmB;YACxD,sBAAsB,EAAE,IAAI;YAC5B,iBAAiB,EAAE,iBAAiB;YACpC,WAAW,EAAE,KAAK;YAClB,yBAAyB,EAAE,IAAI;YAE/B,QAAQ,EAAE,QAAQ;YAClB,QAAQ,EAAE,QAAQ,CAAC,UAAU;YAC7B,OAAO,EAAE,QAAQ,CAAC,SAAS;YAC3B,UAAU,EAAE,QAAQ,CAAC,UAAU;YAC/B,IAAI,EAAE,QAAQ,CAAC,MAAM;YACrB,iBAAiB,EAAE,QAAQ,CAAC,mBAAmB;YAC/C,qBAAqB,EAAE,QAAQ,CAAC,uBAAuB;YACvD,WAAW,EAAE,QAAQ,CAAC,aAAa;YACnC,cAAc,EAAE,QAAQ,CAAC,gBAAgB;YACzC,cAAc,EAAE,IAAI;YACpB,iBAAiB,EAAE,IAAI;YAEvB,qBAAqB,EAAE,OAAO,CAAC,QAAQ,EAAE,iBAAiB,CAAC;YAE3D,oBAAoB,EAAE,IAAI;SAC7B,CAAA;QACD,OAAO,IAAI,CAAC;KACf;SAAM;QACH,MAAM,IAAI,GAAG,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,GAAG,CAAC,aAAa,CAAC,CAAmB,CAAC;QACtE,gDAAgD;QAChD,IAAI,CAAC,qBAAqB,GAAG,OAAO,CAAC,QAAQ,EAAE,IAAI,CAAC,iBAAiB,CAAC,CAAC;QACvE,IAAI,CAAC,oBAAoB,GAAG,IAAI,CAAA;QAChC,OAAO,IAAI,CAAC;KACf;AACL,CAAC,CAAA;AArDY,QAAA,oBAAoB,wBAqDhC"}

package/dist/src/miniapp/appmaster.js

@@ -0,0 +1,17 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.AppMaster = void 0;
+const index_1 = require("./../../index");
+class AppMaster extends index_1.MasterProcessBase {
+    constructor(serviceConfig) {
+        super(serviceConfig);
+    }
+    MasterStarted() {
+        console.log('started...');
+    }
+    ProcessTerminating() {
+        console.log('terminated...');
+    }
+}
+exports.AppMaster = AppMaster;
+//# sourceMappingURL=appmaster.js.map

package/dist/src/miniapp/appmaster.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"appmaster.js","sourceRoot":"","sources":["../../../src/miniapp/appmaster.ts"],"names":[],"mappings":";;;AACA,yCAAiD;AAIjD,MAAa,SAAU,SAAQ,yBAAiB;IAE5C,YAAY,aAAa;QAErB,KAAK,CAAC,aAAa,CAAC,CAAC;IACzB,CAAC;IAED,aAAa;QACT,OAAO,CAAC,GAAG,CAAC,YAAY,CAAC,CAAA;IAC7B,CAAC;IAED,kBAAkB;QACd,OAAO,CAAC,GAAG,CAAC,eAAe,CAAC,CAAA;IAChC,CAAC;CACJ;AAdD,8BAcC"}

package/dist/src/miniapp/appworker.js

@@ -0,0 +1,14 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.WorkerProcess = void 0;
+const index_1 = require("./../../index");
+class WorkerProcess extends index_1.WorkerProcessBase {
+    constructor(options) {
+        super(options);
+    }
+    WorkerStarted() {
+        console.log('worker started...');
+    }
+}
+exports.WorkerProcess = WorkerProcess;
+//# sourceMappingURL=appworker.js.map

package/dist/src/miniapp/appworker.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"appworker.js","sourceRoot":"","sources":["../../../src/miniapp/appworker.ts"],"names":[],"mappings":";;;AAAA,yCAAiD;AAEjD,MAAa,aAAc,SAAQ,yBAAiB;IAEhD,YAAY,OAAO;QAEf,KAAK,CAAC,OAAO,CAAC,CAAC;IACnB,CAAC;IAED,aAAa;QAET,OAAO,CAAC,GAAG,CAAC,mBAAmB,CAAC,CAAA;IACpC,CAAC;CACJ;AAXD,sCAWC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nsshunt/stsappframework",
-  "version": "2.19.130",
+  "version": "2.19.132",
   "description": "",
   "main": "dist/index.js",
   "types": "./types/index.d.ts",
@@ -36,7 +36,7 @@
   },
   "dependencies": {
     "@nsshunt/stsconfig": "^1.25.36",
-    "@nsshunt/stsdatamanagement": "^1.17.52",
+    "@nsshunt/stsdatamanagement": "^1.17.53",
     "@nsshunt/stsinstrumentation": "^6.11.79",
     "@nsshunt/stspublisherserver": "^1.15.31",
     "@nsshunt/stsutils": "^1.15.40",

package/src/miniapp/app.ts

@@ -0,0 +1,21 @@
+import { ServiceConfigOptions } from './appConfig.js'
+import { AppMaster } from './appmaster'
+import { WorkerProcess } from './appworker'
+import { $stsgd } from '@nsshunt/stsutils'
+import cluster from 'cluster';
+//import https from 'node:https'
+//import axios from 'axios'
+
+import * as streamex from 'node:stream'
+
+if (cluster.isPrimary)
+{
+    const serviceConfig = ServiceConfigOptions(true);
+    $stsgd.app = new AppMaster(serviceConfig);
+    $stsgd.app.SetupServer();
+} else
+{
+    const serviceConfig = ServiceConfigOptions(false);
+    $stsgd.app = new WorkerProcess(serviceConfig);
+    $stsgd.app.SetupServer();
+}

package/src/miniapp/appConfig.ts

@@ -0,0 +1,81 @@
+import { $Options } from '@nsshunt/stsconfig'
+const goptions = $Options()
+
+import { v4 as uuidv4 } from 'uuid';
+import { STSModelUtils, ModelDelimeter } from '@nsshunt/stsmodels';
+import os from 'os';
+
+import { ServiceProcessContext } from '@nsshunt/stspublisherserver'
+import { ProcessOptions } from './../../index'
+
+// nid: `${goptions.rest01servicename} @ ${goptions.rest01serviceversion}  |  ${this.options.globalServiceData.serviceInstanceId} @ ${os.hostname()}   ^   ${process.pid} @ ${(cluster.isMaster ? process.pid : process.ppid)}`,
+//                        <serviceId>                                                                 <serviceInstanceId>                                                       <serviceInstanceProcessId>
+//              <serviceName>                    <serviceVersion>                                  <sid>                              <hostName>               <pid>                                     <ppid>
+//                                                  << ............... Static Nid ............... >>                                                                    << ............... Dynamic Nid ............... >>
+// Note: The final nid will NOT contain the NID_SEPERATOR character. This will be replaced with the SEPERATOR character.
+
+const Context = (isMaster: boolean, serviceInstanceId: string): ServiceProcessContext => {
+    return {
+        nid: `\
+${goptions.imservicename}${ModelDelimeter.COMPONENT_SEPERATOR}${goptions.imserviceversion}\
+${ModelDelimeter.SEPERATOR}\
+${serviceInstanceId}${ModelDelimeter.COMPONENT_SEPERATOR}${os.hostname()}\
+${ModelDelimeter.NID_SEPERATOR}\
+${process.pid}${ModelDelimeter.COMPONENT_SEPERATOR}${(isMaster ? process.pid : process.ppid)}`
+    };
+}
+
+export const ServiceConfigOptions = (isMaster: boolean): Partial<ProcessOptions> => {
+    //AddSchemas();
+
+    if (isMaster === true) {
+        const serviceInstanceId = uuidv4();
+
+        const checkParams = [
+            [ 'imservicename', goptions.imservicename ], 
+            [ 'imserviceversion', goptions.imserviceversion ],
+            [ 'hostname', os.hostname() ],
+            [ 'serviceInstanceId', serviceInstanceId ]
+        ];
+
+        // CHeck for invalid strings
+        STSModelUtils.CheckValidChar(checkParams);
+
+        const data: Partial<ProcessOptions> = {
+            // Service details
+            httpServer: true,
+            httpsServer: true,
+            wssServer: true,
+            useLatency: true,
+            httpsServerKeyPath: goptions.httpsserverkeypath,
+            httpsServerCertificatePath: goptions.httpsservercertpath,
+            processExitOnTerminate: true,
+            serviceInstanceId: serviceInstanceId,
+            useDatabase: false,
+            useInstrumentationWorkers: true,
+
+            isMaster: isMaster,
+            endpoint: goptions.imendpoint,
+            apiRoot: goptions.imapiroot,
+            listenPort: goptions.imhostport,
+            port: goptions.import,
+            prometheusSupport: goptions.imprometheussupport,
+            prometheusClusterPort: goptions.imprometheusclusterport,
+            serviceName: goptions.imservicename,
+            serviceVersion: goptions.imserviceversion,
+            consoleLogging: true,
+            instrumentLogging: true,
+
+            serviceProcessContext: Context(isMaster, serviceInstanceId),
+
+            expressServerFactory: null
+        }
+        return data;
+    } else {
+        const data = JSON.parse(process.env['STS_GSD_SII']) as ProcessOptions;
+        // Recompute the context for this worker process
+        data.serviceProcessContext = Context(isMaster, data.serviceInstanceId);
+        data.expressServerFactory = null
+        return data;
+    }
+}

package/src/miniapp/appmaster.ts

@@ -0,0 +1,20 @@
+import { STSMasterModel, ModelNode } from '@nsshunt/stsmodels'
+import { MasterProcessBase } from './../../index'
+
+import _cloneDeep from 'lodash/cloneDeep'
+
+export class AppMaster extends MasterProcessBase
+{
+    constructor(serviceConfig)
+    {
+        super(serviceConfig);
+    }
+
+    MasterStarted() {
+        console.log('started...')
+    }
+
+    ProcessTerminating() {
+        console.log('terminated...')
+    }
+}

package/src/miniapp/appworker.ts

@@ -0,0 +1,14 @@
+import { WorkerProcessBase } from './../../index'
+
+export class WorkerProcess extends WorkerProcessBase
+{
+    constructor(options)
+    {
+        super(options);
+    }
+
+    WorkerStarted()
+    {
+        console.log('worker started...')
+    }
+}

package/types/src/miniapp/app.d.ts

@@ -0,0 +1,2 @@
+export {};
+//# sourceMappingURL=app.d.ts.map

package/types/src/miniapp/app.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"app.d.ts","sourceRoot":"","sources":["../../../src/miniapp/app.ts"],"names":[],"mappings":""}

package/types/src/miniapp/appConfig.d.ts

@@ -0,0 +1,3 @@
+import { ProcessOptions } from './../../index';
+export declare const ServiceConfigOptions: (isMaster: boolean) => Partial<ProcessOptions>;
+//# sourceMappingURL=appConfig.d.ts.map

package/types/src/miniapp/appConfig.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"appConfig.d.ts","sourceRoot":"","sources":["../../../src/miniapp/appConfig.ts"],"names":[],"mappings":"AAQA,OAAO,EAAE,cAAc,EAAE,MAAM,eAAe,CAAA;AAmB9C,eAAO,MAAM,oBAAoB,aAAc,OAAO,KAAG,QAAQ,cAAc,CAqD9E,CAAA"}

package/types/src/miniapp/appmaster.d.ts

@@ -0,0 +1,7 @@
+import { MasterProcessBase } from './../../index';
+export declare class AppMaster extends MasterProcessBase {
+    constructor(serviceConfig: any);
+    MasterStarted(): void;
+    ProcessTerminating(): void;
+}
+//# sourceMappingURL=appmaster.d.ts.map

package/types/src/miniapp/appmaster.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"appmaster.d.ts","sourceRoot":"","sources":["../../../src/miniapp/appmaster.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,iBAAiB,EAAE,MAAM,eAAe,CAAA;AAIjD,qBAAa,SAAU,SAAQ,iBAAiB;gBAEhC,aAAa,KAAA;IAKzB,aAAa;IAIb,kBAAkB;CAGrB"}

package/types/src/miniapp/appworker.d.ts

@@ -0,0 +1,6 @@
+import { WorkerProcessBase } from './../../index';
+export declare class WorkerProcess extends WorkerProcessBase {
+    constructor(options: any);
+    WorkerStarted(): void;
+}
+//# sourceMappingURL=appworker.d.ts.map

package/types/src/miniapp/appworker.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"appworker.d.ts","sourceRoot":"","sources":["../../../src/miniapp/appworker.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAE,MAAM,eAAe,CAAA;AAEjD,qBAAa,aAAc,SAAQ,iBAAiB;gBAEpC,OAAO,KAAA;IAKnB,aAAa;CAIhB"}