@nsshunt/stsconfig 1.22.1 → 1.24.0

package/dist/stsconfig.js

@@ -53,6 +53,12 @@ function SetupConfig() {
         // Database script(s) folder
         ,
         databasescriptfolder: (process.env.DB_SCRIPT_FOLDER === undefined ? "/var/lib/sts/stsglobalresources/db-scripts" : process.env.DB_SCRIPT_FOLDER)
+        // Computed connection string to be used in development mode.
+        ,
+        connectionString: ''
+        // Default computed connection string for postgres. Database name = postgres. Used by utilites that create and/or update the STS database(s).
+        ,
+        defaultDatabaseConnectionString: ''
         // The maximum pool size for pg. There will be one pool per thread.
         ,
         poolSize: (process.env.POOL_SIZE === undefined ? 500 : parseInt(process.env.POOL_SIZE))
@@ -92,7 +98,7 @@ function SetupConfig() {
         defaultDatabaseMaxExtraDataSize: (process.env.DEFAULT_DATABASE_MAX_EXTRA_DATA_SIZE === undefined ? 2000 : parseInt(process.env.DEFAULT_DATABASE_MAX_EXTRA_DATA_SIZE))
         // STSREST01 Server endpoint
         ,
-        rest01endpoint: (process.env.REST01_ENDPOINT === undefined ? "http://localhost" : process.env.REST01_ENDPOINT)
+        rest01endpoint: (process.env.REST01_ENDPOINT === undefined ? "https://localhost" : process.env.REST01_ENDPOINT)
         // STSREST01 Server port (listen port for the service)
         ,
         rest01hostport: (process.env.REST01_HOST_PORT === undefined ? "3003" : process.env.REST01_HOST_PORT)
@@ -136,7 +142,7 @@ function SetupConfig() {
         rest01clientsecretfile: process.env.REST01_CLIENT_SECRET_FILE
         // STS Instrument Manager Service endpoint
         ,
-        imendpoint: (process.env.IM_ENDPOINT === undefined ? "http://localhost" : process.env.IM_ENDPOINT)
+        imendpoint: (process.env.IM_ENDPOINT === undefined ? "https://localhost" : process.env.IM_ENDPOINT)
         // STS Instrument Manager Service listen port (listen port for the service)
         ,
         imhostport: (process.env.IM_HOST_PORT === undefined ? "3001" : process.env.IM_HOST_PORT)
@@ -178,7 +184,7 @@ function SetupConfig() {
         imclientsecretfile: process.env.IM_CLIENT_SECRET_FILE
         // STS Test Orchestrator Service endpoint
         ,
-        toendpoint: (process.env.TO_ENDPOINT === undefined ? "http://localhost" : process.env.TO_ENDPOINT)
+        toendpoint: (process.env.TO_ENDPOINT === undefined ? "https://localhost" : process.env.TO_ENDPOINT)
         // STS Test Orchestrator Service listen port (listen port for the service)
         ,
         tohostport: (process.env.TO_HOST_PORT === undefined ? "3004" : process.env.TO_HOST_PORT)
@@ -224,7 +230,7 @@ function SetupConfig() {
         //
         // Auth Server endpoint
         ,
-        asendpoint: (process.env.AS_ENDPOINT === undefined ? "http://localhost" : process.env.AS_ENDPOINT)
+        asendpoint: (process.env.AS_ENDPOINT === undefined ? "https://localhost" : process.env.AS_ENDPOINT)
         // Auth Server host port (listen port for the service)
         ,
         ashostport: (process.env.AS_HOST_PORT === undefined ? "3002" : process.env.AS_HOST_PORT)
@@ -307,7 +313,7 @@ function SetupConfig() {
         //
         // STSBroker Server endpoint
         ,
-        brokerendpoint: (process.env.BROKER_ENDPOINT === undefined ? "http://localhost" : process.env.BROKER_ENDPOINT)
+        brokerendpoint: (process.env.BROKER_ENDPOINT === undefined ? "https://localhost" : process.env.BROKER_ENDPOINT)
         // STSBroker Server port (listen port for the service)
         ,
         brokerhostport: (process.env.BROKER_HOST_PORT === undefined ? "3006" : process.env.BROKER_HOST_PORT)
@@ -385,19 +391,19 @@ function SetupConfig() {
         ,
         transport: (process.env.TRANSPORT === undefined ? 'RESTAPI' : process.env.TRANSPORT)
         /*
-        // Instrument Defaults
-        // Logger lines (sliding window size)
-        ,instrumentLoggerSize: (process.env.INSTRUMENT_LOGGER_SIZE === undefined ? 200 : parseInt(process.env.INSTRUMENT_LOGGER_SIZE))
-    
-        // Histoogram bucket sizes (and default labels)
-        ,instrumentHistogramBuckets: (process.env.INSTRUMENT_HISTOGRAM_BUCKETS === undefined ? [ 10, 20, 50, 100, 1000, 5000 ] : JSON.parse(process.env.INSTRUMENT_HISTOGRAM_BUCKETS))
-    
-        // Sample interval (ms)
-        ,instrumentSampleInterval: (process.env.INSTRUMENT_SAMPLE_INTERVAL === undefined ? 1000 : parseInt(process.env.INSTRUMENT_SAMPLE_INTERVAL))
-    
-        // Sample size (number of readings to use for P(x) calculations. Time approx. (Sample Interval / 1000) * Sample Size, i.e. Caluclate P(x) on the observed data for the last 6 minutes.
-        ,instrumentSampleSize: (process.env.INSTRUMENT_SAMPLE_SIZE === undefined ? 600 : parseInt(process.env.INSTRUMENT_SAMPLE_SIZE))
-        */
+    // Instrument Defaults
+    // Logger lines (sliding window size)
+    ,instrumentLoggerSize: (process.env.INSTRUMENT_LOGGER_SIZE === undefined ? 200 : parseInt(process.env.INSTRUMENT_LOGGER_SIZE))
+
+    // Histoogram bucket sizes (and default labels)
+    ,instrumentHistogramBuckets: (process.env.INSTRUMENT_HISTOGRAM_BUCKETS === undefined ? [ 10, 20, 50, 100, 1000, 5000 ] : JSON.parse(process.env.INSTRUMENT_HISTOGRAM_BUCKETS))
+
+    // Sample interval (ms)
+    ,instrumentSampleInterval: (process.env.INSTRUMENT_SAMPLE_INTERVAL === undefined ? 1000 : parseInt(process.env.INSTRUMENT_SAMPLE_INTERVAL))
+
+    // Sample size (number of readings to use for P(x) calculations. Time approx. (Sample Interval / 1000) * Sample Size, i.e. Caluclate P(x) on the observed data for the last 6 minutes.
+    ,instrumentSampleSize: (process.env.INSTRUMENT_SAMPLE_SIZE === undefined ? 600 : parseInt(process.env.INSTRUMENT_SAMPLE_SIZE))
+    */
         // Use secure cookies option when passing back cookies from STS services (such as STSAuth service).
         // This setting will be ignore for production mode. In production mode services will always use secure cookies.
         ,
@@ -467,12 +473,12 @@ function SetupConfig() {
         ,
         ignoresocketio: (process.env.IGNORE_SOCKETIO === undefined ? true : (process.env.IGNORE_SOCKETIO === "true" ? true : false))
         /*
-        // STSModels (library)
-        // -------------------
-        // Define the interval for checking instrumentation updates on a instrumentation model. Entries in the model will be removed after this timeout value (ms) if no
-        // activity has been detected. Default 5 seconds.
-        ,modelPurgeUpdateTimeout: (process.env.MODEL_PURGE_UPDATE_TIMEOUT === undefined ? 5000 : parseInt(process.env.MODEL_PURGE_UPDATE_TIMEOUT))
-        */
+    // STSModels (library)
+    // -------------------
+    // Define the interval for checking instrumentation updates on a instrumentation model. Entries in the model will be removed after this timeout value (ms) if no
+    // activity has been detected. Default 5 seconds.
+    ,modelPurgeUpdateTimeout: (process.env.MODEL_PURGE_UPDATE_TIMEOUT === undefined ? 5000 : parseInt(process.env.MODEL_PURGE_UPDATE_TIMEOUT))
+    */
         // Use command below to create self signed cert;
         // openssl req -nodes -new -x509 -keyout server.key -out server.cert
         // Ref: https://www.geeksforgeeks.org/how-to-create-https-server-with-node-js/
@@ -566,10 +572,11 @@ function SetupConfig() {
 }
 function $Options() {
     if (envOptions === null) {
-        const defconfig = SetupConfig();
-        envOptions = Object.assign(Object.assign({}, defconfig
+        envOptions = SetupConfig();
         // Computed connection string to be used in development mode.
-        ), { connectionString: `postgresql://${defconfig.dbuser}:${defconfig.dbpassword}@${defconfig.dbhost}:${defconfig.dbport}/${defconfig.database}`, defaultDatabaseConnectionString: `postgresql://${defconfig.dbuser}:${defconfig.dbpassword}@${defconfig.dbhost}:${defconfig.dbport}/postgres` });
+        envOptions.connectionString = `postgresql://${envOptions.dbuser}:${envOptions.dbpassword}@${envOptions.dbhost}:${envOptions.dbport}/${envOptions.database}`;
+        // Default computed connection string for postgres. Database name = postgres. Used by utilites that create and/or update the STS database(s).
+        envOptions.defaultDatabaseConnectionString = `postgresql://${envOptions.dbuser}:${envOptions.dbpassword}@${envOptions.dbhost}:${envOptions.dbport}/postgres`;
     }
     return envOptions;
 }

package/dist/stsconfig.js.map

@@ -1 +1 @@
-{"version":3,"file":"stsconfig.js","sourceRoot":"","sources":["../stsconfig.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"stsconfig.js","sourceRoot":"","sources":["../src/stsconfig.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,9 +1,11 @@
 {
   "name": "@nsshunt/stsconfig",
-  "version": "1.22.1",
+  "version": "1.24.0",
   "description": "",
   "main": "dist/index.js",
   "dependencies": {
+    "@tsconfig/node18": "^1.0.0",
+    "@types/debug": "^4.1.7",
     "colors": "^1.4.0",
     "debug": "^4.3.4",
     "dotenv": "^16.0.0"

package/{index.ts → src/index.ts}

@@ -1,4 +1,4 @@
-export interface STSOptions {
+export interface STSOptions extends Record<string, boolean | number | string | undefined> {
 	// ====== Run-Time Environment  =========================================================================
 
 	/**
@@ -44,7 +44,7 @@ export interface STSOptions {
 	/**
      * Database password file
      */
-	dbpasswordfile: string
+	dbpasswordfile?: string
 
 	/**
      * Database host
@@ -64,7 +64,7 @@ export interface STSOptions {
     /**
      * Database connection string to be used in production mode
      */
-	databaseUrl: string
+	databaseUrl?: string
 
 	/**
      * Database script(s) folder
@@ -91,6 +91,16 @@ export interface STSOptions {
 	  */
 	defaultDatabaseMaxExtraDataSize: number
  
+	/**
+	 * Computed connection string to be used in development mode.
+	 */
+	connectionString: string
+
+	/**
+	 * Default computed connection string for postgres. Database name = postgres. Used by utilites that create and/or update the STS database(s).
+	 */
+	defaultDatabaseConnectionString: string
+	
 	// ====== Redis =========================================================================================
 
 	/**
@@ -150,12 +160,12 @@ export interface STSOptions {
 	/**
 	 * STSREST01 API Identifier. This value will be used as the audience parameter on authorization calls (OAuth2 client credentials flow).
 	 */
-	rest01apiidentifier: string
+	rest01apiidentifier?: string
 	
 	/**
 	 * STSREST01 API Identifier file. This value will be used as the audience parameter on authorization calls (OAuth2 client credentials flow).
 	 */
-	rest01apiidentifierfile: string
+	rest01apiidentifierfile?: string
 	
 	/**
 	 * STSREST01 Prometheus metric support
@@ -182,22 +192,22 @@ export interface STSOptions {
 	 * Ref: https://auth0.com/docs/get-started/authentication-and-authorization-flow/client-credentials-flow
 	 * Ref: https://auth0.com/docs/get-started/authentication-and-authorization-flow/call-your-api-using-the-client-credentials-flow
 	 */
-	rest01clientid: string
+	rest01clientid?: string
 	
 	/**
 	 * STSREST01 Server client ID file. Used for oauth2 client credentials flow.
 	 */
-	rest01clientidfile: string
+	rest01clientidfile?: string
 	
 	/**
 	 * STSREST01 Server client secret. Used for oauth2 client credentials flow.
 	 */
-	rest01clientsecret: string
+	rest01clientsecret?: string
 	
 	/**
 	 * STSREST01 Server client secret file. Used for oauth2 client credentials flow.
 	 */
-	rest01clientsecretfile: string
+	rest01clientsecretfile?: string
 	
 	// ====== STS Instrument Manager ==============================================================================================
 
@@ -224,12 +234,12 @@ export interface STSOptions {
 	/**
 	 * Instrument Manager API Identifier. This value will be used as the audience parameter on authorization calls (OAuth2 client credentials flow).
 	 */
-	imapiidentifier: string
+	imapiidentifier?: string
 	
 	/**
 	 * Instrument Manager API Identifier file. This value will be used as the audience parameter on authorization calls (OAuth2 client credentials flow).
 	 */
-	imapiidentifierfile: string
+	imapiidentifierfile?: string
 	
 	/**
 	 * STS Instrument Manager Prometheus metric support
@@ -254,22 +264,22 @@ export interface STSOptions {
 	/**
 	 * STS Instrument Manager Server client ID. Used for oauth2 client credentials flow.
 	 */
-	imclientid: string
+	imclientid?: string
 	
 	/**
 	 * STS Instrument Manager Server client ID file. Used for oauth2 client credentials flow.
 	 */
-	imclientidfile: string
+	imclientidfile?: string
 	
 	/**
 	 * STS Instrument Manager Server client secret. Used for oauth2 client credentials flow.
 	 */
-	imclientsecret: string
+	imclientsecret?: string
 	
 	/**
 	 * STS Instrument Manager Server client secret file. Used for oauth2 client credentials flow.
 	 */
-	imclientsecretfile: string
+	imclientsecretfile?: string
 
 	// ====== STS Test Orchestrator =========================================================================
 
@@ -296,12 +306,12 @@ export interface STSOptions {
 	/**
 	 * Test Orchestrator API Identifier. This value will be used as the audience parameter on authorization calls (OAuth2 client credentials flow).
 	 */
-	toapiidentifier: string
+	toapiidentifier?: string
 	
 	/**
 	 * Test Orchestrator API Identifier file. This value will be used as the audience parameter on authorization calls (OAuth2 client credentials flow).
 	 */
-	toapiidentifierfile: string
+	toapiidentifierfile?: string
 	
 	/**
 	 * STS Test Orchestrator Prometheus metric support
@@ -326,22 +336,22 @@ export interface STSOptions {
 	/**
 	 * STS Test Orchestrator Server client ID. Used for oauth2 client credentials flow.
 	 */
-	toclientid: string
+	toclientid?: string
 	
 	/**
 	 * STS Test Orchestrator Server client ID file. Used for oauth2 client credentials flow.
 	 */
-	toclientidfile: string
+	toclientidfile?: string
 	
 	/**
 	 * STS Test Orchestrator Server client secret. Used for oauth2 client credentials flow.
 	 */
-	toclientsecret: string
+	toclientsecret?: string
 	
 	/**
 	 * STS Test Orchestrator Server client secret file. Used for oauth2 client credentials flow.
 	 */
-	toclientsecretfile: string
+	toclientsecretfile?: string
 	
 	// ====== STS Test Orchestrator =========================================================================
 
@@ -387,27 +397,27 @@ export interface STSOptions {
 	/**
 	 * Auth Server API Identifier file.
 	 */
-	asapiidentifierfile: string
+	asapiidentifierfile?: string
 	
 	/**
 	 * Auth Server OAuth API Identifier.
 	 */
-	asoauthapiidentifier: string
+	asoauthapiidentifier?: string
 	
 	/**
 	 * Auth Server OAuth API Identifier file.
 	 */
-	asoauthapiidentifierfile: string
+	asoauthapiidentifierfile?: string
 	
 	/**
 	 * Auth Server Administration API Identifier.
 	 */
-	asadminapiidentifier: string
+	asadminapiidentifier?: string
 	
 	/**
 	 * Auth Server Administration API Identifier file.
 	 */
-	asadminapiidentifierfile: string
+	asadminapiidentifierfile?: string
 	
 	/**
 	 * Auth Server Prometheus metric support
@@ -432,22 +442,22 @@ export interface STSOptions {
 	/**
 	 * STS Auth Server client ID. Used for oauth2 client credentials flow.
 	 */
-	asclientid: string
+	asclientid?: string
 	
 	/**
 	 * STS Auth Server client ID file. Used for oauth2 client credentials flow.
 	 */
-	asclientidfile: string
+	asclientidfile?: string
 	
 	/**
 	 * STS Auth Server client secret. Used for oauth2 client credentials flow.
 	 */
-	asclientsecret: string
+	asclientsecret?: string
 	
 	/**
 	 * STS Auth Server client secret file. Used for oauth2 client credentials flow.
 	 */
-	asclientsecretfile: string
+	asclientsecretfile?: string
 	
 	/**
 	 * Auth Server - JWKS Public End Point.
@@ -507,12 +517,12 @@ export interface STSOptions {
 	/**
 	 * STSBroker API Identifier. This value will be used as the audience parameter on authorization calls (OAuth2 client credentials flow).
 	 */
-	brokerapiidentifier: string
+	brokerapiidentifier?: string
 	
 	/**
 	 * STSBroker API Identifier file. This value will be used as the audience parameter on authorization calls (OAuth2 client credentials flow).
 	 */
-	brokerapiidentifierfile: string
+	brokerapiidentifierfile?: string
 	
 	/**
 	 * STSBroker Prometheus metric support
@@ -537,22 +547,22 @@ export interface STSOptions {
 	/**
 	 * STSBroker Server client ID. Used for oauth2 client credentials flow.
 	 */
-	brokerclientid: string
+	brokerclientid?: string
 	
 	/**
 	 * STSBroker Server client ID file. Used for oauth2 client credentials flow.
 	 */
-	brokerclientidfile: string
+	brokerclientidfile?: string
 	
 	/**
 	 * STSBroker Server client secret. Used for oauth2 client credentials flow.
 	 */
-	brokerclientsecret: string
+	brokerclientsecret?: string
 	
 	/**
 	 * STSBroker Server client secret file. Used for oauth2 client credentials flow.
 	 */
-	brokerclientsecretfile: string
+	brokerclientsecretfile?: string
 
 	// ====== STS Test Runner Prometheus metric support =====================================================
 
@@ -579,22 +589,22 @@ export interface STSOptions {
 	/**
 	 * STS Test Runner Server client ID. Used for oauth2 client credentials flow.
 	 */
-	trclientid: string
+	trclientid?: string
 	
 	/**
 	 * STS Test Runner Server client ID file. Used for oauth2 client credentials flow.
 	 */
-	trclientidfile: string
+	trclientidfile?: string
 
 	/**
 	 * STS Test Runner Server client secret. Used for oauth2 client credentials flow.
 	 */
-	trclientsecret: string
+	trclientsecret?: string
 	
 	/**
 	 * STS Test Runner Server client secret file. Used for oauth2 client credentials flow.
 	 */
-	trclientsecretfile: string
+	trclientsecretfile?: string
 
 
 
@@ -777,7 +787,7 @@ export interface STSOptions {
 	/**
 	 * File path for JWKS store path config setting (tsjwksstorepath). Use this config item with Docker/Kubernetes secrets.
 	 */
-	tsjwksstorepathfile: string
+	tsjwksstorepathfile?: string
 
 	/**
 	 * File path for JWKS public store data. This file will contain only the public signing keys for the JWKS store.

package/{stsconfig-01.test.ts → src/stsconfig-01.test.ts}

@@ -1,6 +1,7 @@
 import { $Options } from './stsconfig'
+import { STSOptions } from './index'
 
-let goptions = null;
+let goptions: STSOptions;
 
 describe("Test implicit config settings", () =>
 {
@@ -55,7 +56,7 @@ describe("Test implicit config settings", () =>
 	{
 		expect.assertions(14);
 
-		expect(goptions.rest01endpoint).toEqual('http://localhost');
+		expect(goptions.rest01endpoint).toEqual('https://localhost');
 		expect(goptions.rest01hostport).toEqual('3003');
 		expect(goptions.rest01port).toEqual('3003');
 		expect(goptions.rest01apiroot).toEqual('/stsrest01/v1');
@@ -75,7 +76,7 @@ describe("Test implicit config settings", () =>
 	{
 		expect.assertions(14);
 
-		expect(goptions.imendpoint).toEqual('http://localhost');
+		expect(goptions.imendpoint).toEqual('https://localhost');
 		expect(goptions.imhostport).toEqual('3001');
 		expect(goptions.import).toEqual('3001');
 		expect(goptions.imapiroot).toEqual('/stsinstrumentmanager/v1');
@@ -95,7 +96,7 @@ describe("Test implicit config settings", () =>
 	{
 		expect.assertions(14);
 
-		expect(goptions.toendpoint).toEqual('http://localhost');
+		expect(goptions.toendpoint).toEqual('https://localhost');
 		expect(goptions.tohostport).toEqual('3004');
 		expect(goptions.toport).toEqual('3004');
 		expect(goptions.toapiroot).toEqual('/ststestorchestrator/v1');
@@ -115,7 +116,7 @@ describe("Test implicit config settings", () =>
 	{
 		expect.assertions(25);
 
-		expect(goptions.asendpoint).toEqual('http://localhost');
+		expect(goptions.asendpoint).toEqual('https://localhost');
 		expect(goptions.ashostport).toEqual('3002');
 		expect(goptions.asport).toEqual('3002');
 		expect(goptions.asapiroot).toEqual('/stsauth/v1.0');
@@ -160,7 +161,7 @@ describe("Test implicit config settings", () =>
 	{
 		expect.assertions(14);
 
-		expect(goptions.brokerendpoint).toEqual('http://localhost');
+		expect(goptions.brokerendpoint).toEqual('https://localhost');
 		expect(goptions.brokerhostport).toEqual('3006');
 		expect(goptions.brokerport).toEqual('3006');
 		expect(goptions.brokerapiroot).toEqual('/stsbroker/v1.0');

package/{stsconfig-02.test.js → src/stsconfig-02.test.ts}

@@ -1,6 +1,7 @@
 import { $Options } from './stsconfig'
+import { STSOptions } from './index'
 
-let goptions = null;
+let goptions: STSOptions;
 
 describe("Test configured settings", () =>
 {

package/{stsconfig-default.test.js → src/stsconfig-default.test.ts}

@@ -1,6 +1,7 @@
 import { $Options } from './stsconfig'
+import { STSOptions } from './index'
 
-let goptions = null;
+let goptions: STSOptions;
 
 describe("Test explicit default config settings", () =>
 {