@signageos/lib 23.9.1 → 23.9.2

package/dist/Metrics/metrics.d.ts

@@ -1,84 +1,4 @@
-import { EventEmitter } from 'events';
-export declare const NOT_PREDEFINED_VALUE = "NOT_PREDEFINED_VALUE";
-export type TNOT_PREDEFINED_VALUE = typeof NOT_PREDEFINED_VALUE;
-export type TMetricsConfig<TMetricsTypes extends string = '', TLabelsTypes extends Record<string, readonly string[] | 'NOT_PREDEFINED_VALUE'> = {}> = {
-    [key in TMetricsTypes]: {
-        metric: TMetricsClasses;
-        labels?: Partial<TLabelsTypes>;
-        help?: string;
-        buckets?: number[];
-        method?: 'inc' | 'dec' | 'set' | 'observe';
-        name?: string;
-    };
-};
-export type TMetricsClasses = 'Counter' | 'Histogram' | 'Gauge';
 /**
- * Create instance of a EventEmitter for emitting prometheus metrics ( https://prometheus.io/ )
- *
- * This single common implementation aims to provide a common implementation
- * that all services can use.
- *
- * @param metricsConfig - configuration for all allowed AND required metrics
- * @param prefix - string prefix added to all metrics names
- *
- * -------
- *
- * Metrics configuration
- *
- * 	```typescript
- *  // allowed AND required metrics
- *	type TMetricsEvents = 'metric_counter_inc_with_label' | 'metric_counter_inc_with_label_and_value';
- *
- *	const type1Labels = ['type1_label1', 'type1_label2', 'type1_label3'] as const;
- *
- *  // allowed labels
- *	type TLabelsTypes = {
- *		type1: typeof type1Labels;
- *	};
- *
- *	let metricsConfig: TMetricsConfig<TMetricsEvents, TLabelsTypes> = {
- *		metric_counter_inc_with_label: {
- *			// metrics type (one of Counter, Gauge, Histogram)
- *			metric: Counter,
- *			help: 'metric_counter_inc help',
- *			// metrics method
- *			method: 'inc',
- *			// allowed labels
- *			labels: { type1: type1Labels },
- *			// metrics name - `key` of this configuration is used if not provided (`metric_counter_inc_with_label` in this case)
- *			name: 'some_name',
- *		},
- *	}
- *
- *  const metrics = new Metrics<TMetricsEvents, TLabelsTypes>({ metricsConfig, prefix: 'sos_test_' });
- *
- *  ```
- *
- * -------
- *
- *  Emit metrics:
- *
- *  ```typescript
- *  metrics.emit('metric_counter_inc_with_label', { type1: 'type1_label1' }, 10);
- *  metrics.emit('metric_counter_inc_with_label', { type1: 'type1_label1' });
- *  metrics.emit('metric_counter_inc_with_label', 10);
- *  ```
+ * @deprecated Use `@signageos/metrics` instead.
  */
-export declare class Metrics<TMetricsTypes extends string, TLabelsTypes extends Record<string, readonly string[] | TNOT_PREDEFINED_VALUE>> extends EventEmitter {
-    private metricsConfig;
-    private metrics;
-    private prefix?;
-    constructor({ metricsConfig, prefix }: {
-        metricsConfig: TMetricsConfig<TMetricsTypes, TLabelsTypes>;
-        prefix?: string;
-    });
-    emit(eventName: TMetricsTypes, labels: {
-        [key in keyof TLabelsTypes]?: TLabelsTypes[key][number];
-    }, value?: number, method?: 'inc' | 'dec' | 'set' | 'observe'): boolean;
-    emit(eventName: TMetricsTypes, value?: number): boolean;
-    on(eventName: TMetricsTypes, listener: (labels?: Partial<Record<keyof TLabelsTypes, string>>, value?: number, method?: 'inc' | 'dec' | 'set' | 'observe') => void): this;
-    private getMetricsClass;
-    private registerMetrics;
-    private validateLabels;
-    private getMetricsMethod;
-}
+export * from '@signageos/metrics/dist/metrics';

package/dist/Metrics/metrics.js

@@ -1,19 +1,4 @@
 "use strict";
-var __extends = (this && this.__extends) || (function () {
-    var extendStatics = function (d, b) {
-        extendStatics = Object.setPrototypeOf ||
-            ({ __proto__: [] } instanceof Array && function (d, b) { d.__proto__ = b; }) ||
-            function (d, b) { for (var p in b) if (Object.prototype.hasOwnProperty.call(b, p)) d[p] = b[p]; };
-        return extendStatics(d, b);
-    };
-    return function (d, b) {
-        if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
-        extendStatics(d, b);
-        function __() { this.constructor = d; }
-        d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
-    };
-})();
 var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
     var desc = Object.getOwnPropertyDescriptor(m, k);
@@ -25,231 +10,12 @@ var __createBinding = (this && this.__createBinding) || (Object.create ? (functi
     if (k2 === undefined) k2 = k;
     o[k2] = m[k];
 }));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || function (mod) {
-    if (mod && mod.__esModule) return mod;
-    var result = {};
-    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
-    __setModuleDefault(result, mod);
-    return result;
+var __exportStar = (this && this.__exportStar) || function(m, exports) {
+    for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.Metrics = exports.NOT_PREDEFINED_VALUE = void 0;
-var events_1 = require("events");
-var prom_client_1 = require("prom-client");
-var prometheusClient = __importStar(require("prom-client"));
-exports.NOT_PREDEFINED_VALUE = 'NOT_PREDEFINED_VALUE';
 /**
- * Create instance of a EventEmitter for emitting prometheus metrics ( https://prometheus.io/ )
- *
- * This single common implementation aims to provide a common implementation
- * that all services can use.
- *
- * @param metricsConfig - configuration for all allowed AND required metrics
- * @param prefix - string prefix added to all metrics names
- *
- * -------
- *
- * Metrics configuration
- *
- * 	```typescript
- *  // allowed AND required metrics
- *	type TMetricsEvents = 'metric_counter_inc_with_label' | 'metric_counter_inc_with_label_and_value';
- *
- *	const type1Labels = ['type1_label1', 'type1_label2', 'type1_label3'] as const;
- *
- *  // allowed labels
- *	type TLabelsTypes = {
- *		type1: typeof type1Labels;
- *	};
- *
- *	let metricsConfig: TMetricsConfig<TMetricsEvents, TLabelsTypes> = {
- *		metric_counter_inc_with_label: {
- *			// metrics type (one of Counter, Gauge, Histogram)
- *			metric: Counter,
- *			help: 'metric_counter_inc help',
- *			// metrics method
- *			method: 'inc',
- *			// allowed labels
- *			labels: { type1: type1Labels },
- *			// metrics name - `key` of this configuration is used if not provided (`metric_counter_inc_with_label` in this case)
- *			name: 'some_name',
- *		},
- *	}
- *
- *  const metrics = new Metrics<TMetricsEvents, TLabelsTypes>({ metricsConfig, prefix: 'sos_test_' });
- *
- *  ```
- *
- * -------
- *
- *  Emit metrics:
- *
- *  ```typescript
- *  metrics.emit('metric_counter_inc_with_label', { type1: 'type1_label1' }, 10);
- *  metrics.emit('metric_counter_inc_with_label', { type1: 'type1_label1' });
- *  metrics.emit('metric_counter_inc_with_label', 10);
- *  ```
+ * @deprecated Use `@signageos/metrics` instead.
  */
-var Metrics = /** @class */ (function (_super) {
-    __extends(Metrics, _super);
-    function Metrics(_a) {
-        var metricsConfig = _a.metricsConfig, prefix = _a.prefix;
-        var _this = _super.call(this) || this;
-        _this.metrics = {};
-        _this.metricsConfig = metricsConfig;
-        _this.prefix = prefix;
-        var _loop_1 = function (metricsConfigName) {
-            this_1.on(metricsConfigName, function () {
-                if (process.env.NODE_ENV !== 'test') {
-                    console.error("No registered metrics for: '".concat(metricsConfigName, "'"));
-                }
-            });
-        };
-        var this_1 = this;
-        for (var metricsConfigName in _this.metricsConfig) {
-            _loop_1(metricsConfigName);
-        }
-        _this.registerMetrics({ register: prometheusClient.register });
-        return _this;
-    }
-    Metrics.prototype.emit = function (eventName, labelsOrValueOrMethod, valueOrMethod, method) {
-        if (typeof labelsOrValueOrMethod === 'number') {
-            return _super.prototype.emit.call(this, eventName, undefined, labelsOrValueOrMethod, method);
-        }
-        else if (typeof valueOrMethod === 'number') {
-            return _super.prototype.emit.call(this, eventName, labelsOrValueOrMethod, valueOrMethod, method);
-        }
-        else {
-            return _super.prototype.emit.call(this, eventName, labelsOrValueOrMethod, valueOrMethod, method);
-        }
-    };
-    Metrics.prototype.on = function (eventName, listener) {
-        return _super.prototype.on.call(this, eventName, listener);
-    };
-    Metrics.prototype.getMetricsClass = function (_a) {
-        var className = _a.className;
-        switch (className) {
-            case 'Counter':
-                return prom_client_1.Counter;
-            case 'Gauge':
-                return prom_client_1.Gauge;
-            case 'Histogram':
-                return prom_client_1.Histogram;
-            default:
-                throw new Error("Unknown metrics type: ".concat(className));
-        }
-    };
-    Metrics.prototype.registerMetrics = function (_a) {
-        var _this = this;
-        var register = _a.register;
-        var _loop_2 = function (metricsConfigName) {
-            var metricsName = "".concat(this_2.prefix ? this_2.prefix : '').concat(this_2.metricsConfig[metricsConfigName].name ? this_2.metricsConfig[metricsConfigName].name : metricsConfigName);
-            var metricsMethod = this_2.getMetricsMethod({ metricsConfigName: metricsConfigName });
-            var metricsClass = this_2.getMetricsClass({ className: this_2.metricsConfig[metricsConfigName].metric });
-            this_2.metrics[metricsConfigName] = new metricsClass({
-                name: metricsName,
-                help: this_2.metricsConfig[metricsConfigName].help || '',
-                registers: [register],
-                buckets: this_2.metricsConfig[metricsConfigName].buckets,
-                labelNames: Object.keys(this_2.metricsConfig[metricsConfigName].labels || {}),
-            });
-            if (!this_2.metrics[metricsConfigName][metricsMethod]) {
-                throw new Error("Invalid metrics: ".concat(this_2.metricsConfig[metricsConfigName].metric, " has no ").concat(this_2.metricsConfig[metricsConfigName].method, " method"));
-            }
-            this_2.removeAllListeners(metricsConfigName);
-            this_2.on(metricsConfigName, function (labels, value, method) {
-                try {
-                    _this.validateLabels({ labels: labels, metricsName: metricsConfigName });
-                }
-                catch (validationError) {
-                    console.error(validationError.message);
-                    return;
-                }
-                try {
-                    if (labels !== undefined && value !== undefined) {
-                        _this.metrics[metricsConfigName][method || metricsMethod](labels, value);
-                    }
-                    else if (labels !== undefined) {
-                        _this.metrics[metricsConfigName][method || metricsMethod](labels);
-                    }
-                    else if (value !== undefined) {
-                        _this.metrics[metricsConfigName][method || metricsMethod](value);
-                    }
-                    else {
-                        _this.metrics[metricsConfigName][method || metricsMethod]();
-                    }
-                }
-                catch (metricsError) {
-                    console.error("".concat(metricsConfigName, ": ").concat(metricsError.message));
-                    return;
-                }
-            });
-        };
-        var this_2 = this;
-        for (var metricsConfigName in this.metricsConfig) {
-            _loop_2(metricsConfigName);
-        }
-    };
-    Metrics.prototype.validateLabels = function (_a) {
-        var labels = _a.labels, metricsName = _a.metricsName;
-        if (!labels) {
-            return true;
-        }
-        for (var labelName in labels) {
-            if (this.metricsConfig[metricsName].labels[labelName] === exports.NOT_PREDEFINED_VALUE) {
-                continue;
-            }
-            if (!this.metricsConfig[metricsName].labels[labelName].includes(labels[labelName])) {
-                throw new Error("Unknown label '".concat(labelName, "' for metrics '").concat(metricsName, "'"));
-            }
-        }
-        return true;
-    };
-    Metrics.prototype.getMetricsMethod = function (_a) {
-        var metricsConfigName = _a.metricsConfigName;
-        var errorMessage;
-        var metricClassName = this.metricsConfig[metricsConfigName].metric;
-        if (metricClassName === 'Counter') {
-            if (['inc'].includes(this.metricsConfig[metricsConfigName].method || 'inc')) {
-                return this.metricsConfig[metricsConfigName].method || 'inc';
-            }
-            else {
-                errorMessage = "'method ".concat(this.metricsConfig[metricsConfigName].method, "' not allowed for 'Counter'");
-            }
-        }
-        if (metricClassName === 'Gauge') {
-            if (['inc', 'dec', 'set'].includes(this.metricsConfig[metricsConfigName].method || 'inc')) {
-                return this.metricsConfig[metricsConfigName].method || 'inc';
-            }
-            else {
-                errorMessage = "'method ".concat(this.metricsConfig[metricsConfigName].method, "' not allowed for 'Gaude'");
-            }
-        }
-        if (metricClassName === 'Histogram') {
-            if (['observe'].includes(this.metricsConfig[metricsConfigName].method || 'observe')) {
-                if (!this.metricsConfig[metricsConfigName].buckets) {
-                    errorMessage = "'buckets' configuration is required}";
-                }
-                else {
-                    return this.metricsConfig[metricsConfigName].method || 'observe';
-                }
-            }
-            else {
-                errorMessage = "'method ".concat(this.metricsConfig[metricsConfigName].method, "' not allowed for 'Histogram'");
-            }
-            if (this.metricsConfig[metricsConfigName].metric === 'Histogram' && this.metricsConfig[metricsConfigName].buckets) {
-                return 'observe';
-            }
-        }
-        errorMessage !== null && errorMessage !== void 0 ? errorMessage : (errorMessage = "unknown metrics '".concat(this.metricsConfig[metricsConfigName].metric, "'"));
-        throw new Error("Configuration error for '".concat(metricsConfigName, "' : ").concat(errorMessage));
-    };
-    return Metrics;
-}(events_1.EventEmitter));
-exports.Metrics = Metrics;
+__exportStar(require("@signageos/metrics/dist/metrics"), exports);
 //# sourceMappingURL=metrics.js.map

package/dist/Metrics/metrics.js.map

@@ -1 +1 @@
-{"version":3,"file":"metrics.js","sourceRoot":"","sources":["../../src/Metrics/metrics.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,iCAAsC;AACtC,2CAAkE;AAClE,4DAAgD;AAEnC,QAAA,oBAAoB,GAAG,sBAAsB,CAAC;AAuB3D;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAmDG;AACH;IAGU,2BAAY;IAKrB,iBAAY,EAA0G;YAAxG,aAAa,mBAAA,EAAE,MAAM,YAAA;QAClC,YAAA,MAAK,WAAE,SAAC;QAJD,aAAO,GAA4B,EAAE,CAAC;QAK7C,KAAI,CAAC,aAAa,GAAG,aAAa,CAAC;QACnC,KAAI,CAAC,MAAM,GAAG,MAAM,CAAC;gCAEV,iBAAiB;YAC3B,OAAK,EAAE,CAAC,iBAAiB,EAAE;gBAC1B,IAAI,OAAO,CAAC,GAAG,CAAC,QAAQ,KAAK,MAAM,EAAE,CAAC;oBACrC,OAAO,CAAC,KAAK,CAAC,sCAA+B,iBAAiB,MAAG,CAAC,CAAC;gBACpE,CAAC;YACF,CAAC,CAAC,CAAC;;;QALJ,KAAK,IAAM,iBAAiB,IAAI,KAAI,CAAC,aAAa;oBAAvC,iBAAiB;SAM3B;QAED,KAAI,CAAC,eAAe,CAAC,EAAE,QAAQ,EAAE,gBAAgB,CAAC,QAAQ,EAAE,CAAC,CAAC;;IAC/D,CAAC;IASM,sBAAI,GAAX,UACC,SAAwB,EACxB,qBAA2B,EAC3B,aAA+B,EAC/B,MAA0C;QAE1C,IAAI,OAAO,qBAAqB,KAAK,QAAQ,EAAE,CAAC;YAC/C,OAAO,gBAAK,CAAC,IAAI,YAAC,SAAS,EAAE,SAAS,EAAE,qBAAqB,EAAE,MAAM,CAAC,CAAC;QACxE,CAAC;aAAM,IAAI,OAAO,aAAa,KAAK,QAAQ,EAAE,CAAC;YAC9C,OAAO,gBAAK,CAAC,IAAI,YAAC,SAAS,EAAE,qBAAqB,EAAE,aAAa,EAAE,MAAM,CAAC,CAAC;QAC5E,CAAC;aAAM,CAAC;YACP,OAAO,gBAAK,CAAC,IAAI,YAAC,SAAS,EAAE,qBAAqB,EAAE,aAAa,EAAE,MAAM,CAAC,CAAC;QAC5E,CAAC;IACF,CAAC;IAEM,oBAAE,GAAT,UACC,SAAwB,EACxB,QAAoI;QAEpI,OAAO,gBAAK,CAAC,EAAE,YAAC,SAAS,EAAE,QAAQ,CAAC,CAAC;IACtC,CAAC;IAEO,iCAAe,GAAvB,UAAwB,EAA6C;YAA3C,SAAS,eAAA;QAClC,QAAQ,SAAS,EAAE,CAAC;YACnB,KAAK,SAAS;gBACb,OAAO,qBAAO,CAAC;YAChB,KAAK,OAAO;gBACX,OAAO,mBAAK,CAAC;YACd,KAAK,WAAW;gBACf,OAAO,uBAAS,CAAC;YAClB;gBACC,MAAM,IAAI,KAAK,CAAC,gCAAyB,SAAS,CAAE,CAAC,CAAC;QACxD,CAAC;IACF,CAAC;IACO,iCAAe,GAAvB,UAAwB,EAAoC;QAA5D,iBA8CC;YA9CyB,QAAQ,cAAA;gCACtB,iBAAiB;YAC3B,IAAM,WAAW,GAAG,UAAG,OAAK,MAAM,CAAC,CAAC,CAAC,OAAK,MAAM,CAAC,CAAC,CAAC,EAAE,SAAG,OAAK,aAAa,CAAC,iBAAiB,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,OAAK,aAAa,CAAC,iBAAiB,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,iBAAiB,CAAE,CAAC;YACtK,IAAM,aAAa,GAAG,OAAK,gBAAgB,CAAC,EAAE,iBAAiB,EAAE,iBAAiB,EAAE,CAAC,CAAC;YACtF,IAAM,YAAY,GAAG,OAAK,eAAe,CAAC,EAAE,SAAS,EAAE,OAAK,aAAa,CAAC,iBAAiB,CAAC,CAAC,MAAM,EAAE,CAAC,CAAC;YAEvG,OAAK,OAAO,CAAC,iBAAiB,CAAC,GAAG,IAAI,YAAY,CAAC;gBAClD,IAAI,EAAE,WAAW;gBACjB,IAAI,EAAE,OAAK,aAAa,CAAC,iBAAiB,CAAC,CAAC,IAAI,IAAI,EAAE;gBACtD,SAAS,EAAE,CAAC,QAAQ,CAAC;gBACrB,OAAO,EAAE,OAAK,aAAa,CAAC,iBAAiB,CAAC,CAAC,OAAO;gBACtD,UAAU,EAAE,MAAM,CAAC,IAAI,CAAC,OAAK,aAAa,CAAC,iBAAiB,CAAC,CAAC,MAAM,IAAI,EAAE,CAAC;aAC3E,CAAC,CAAC;YAEH,IAAI,CAAE,OAAK,OAAO,CAAC,iBAAiB,CAAS,CAAC,aAAa,CAAC,EAAE,CAAC;gBAC9D,MAAM,IAAI,KAAK,CACd,2BAAoB,OAAK,aAAa,CAAC,iBAAiB,CAAC,CAAC,MAAM,qBAAW,OAAK,aAAa,CAAC,iBAAiB,CAAC,CAAC,MAAM,YAAS,CAChI,CAAC;YACH,CAAC;YAED,OAAK,kBAAkB,CAAC,iBAAiB,CAAC,CAAC;YAE3C,OAAK,EAAE,CAAC,iBAAiB,EAAE,UAAC,MAAM,EAAE,KAAK,EAAE,MAAM;gBAChD,IAAI,CAAC;oBACJ,KAAI,CAAC,cAAc,CAAC,EAAE,MAAM,QAAA,EAAE,WAAW,EAAE,iBAAiB,EAAE,CAAC,CAAC;gBACjE,CAAC;gBAAC,OAAO,eAAe,EAAE,CAAC;oBAC1B,OAAO,CAAC,KAAK,CAAS,eAAgB,CAAC,OAAO,CAAC,CAAC;oBAChD,OAAO;gBACR,CAAC;gBAED,IAAI,CAAC;oBACJ,IAAI,MAAM,KAAK,SAAS,IAAI,KAAK,KAAK,SAAS,EAAE,CAAC;wBAChD,KAAI,CAAC,OAAO,CAAC,iBAAiB,CAAS,CAAC,MAAM,IAAI,aAAa,CAAC,CAAC,MAAM,EAAE,KAAK,CAAC,CAAC;oBAClF,CAAC;yBAAM,IAAI,MAAM,KAAK,SAAS,EAAE,CAAC;wBAChC,KAAI,CAAC,OAAO,CAAC,iBAAiB,CAAS,CAAC,MAAM,IAAI,aAAa,CAAC,CAAC,MAAM,CAAC,CAAC;oBAC3E,CAAC;yBAAM,IAAI,KAAK,KAAK,SAAS,EAAE,CAAC;wBAC/B,KAAI,CAAC,OAAO,CAAC,iBAAiB,CAAS,CAAC,MAAM,IAAI,aAAa,CAAC,CAAC,KAAK,CAAC,CAAC;oBAC1E,CAAC;yBAAM,CAAC;wBACN,KAAI,CAAC,OAAO,CAAC,iBAAiB,CAAS,CAAC,MAAM,IAAI,aAAa,CAAC,EAAE,CAAC;oBACrE,CAAC;gBACF,CAAC;gBAAC,OAAO,YAAY,EAAE,CAAC;oBACvB,OAAO,CAAC,KAAK,CAAC,UAAG,iBAAiB,eAAa,YAAa,CAAC,OAAO,CAAE,CAAC,CAAC;oBACxE,OAAO;gBACR,CAAC;YACF,CAAC,CAAC,CAAC;;;QA3CJ,KAAK,IAAM,iBAAiB,IAAI,IAAI,CAAC,aAAa;oBAAvC,iBAAiB;SA4C3B;IACF,CAAC;IAEO,gCAAc,GAAtB,UAAuB,EAMtB;YALA,MAAM,YAAA,EACN,WAAW,iBAAA;QAKX,IAAI,CAAC,MAAM,EAAE,CAAC;YACb,OAAO,IAAI,CAAC;QACb,CAAC;QAED,KAAK,IAAM,SAAS,IAAI,MAAM,EAAE,CAAC;YAChC,IAAK,IAAI,CAAC,aAAqB,CAAC,WAAW,CAAC,CAAC,MAAM,CAAC,SAAS,CAAC,KAAK,4BAAoB,EAAE,CAAC;gBACzF,SAAS;YACV,CAAC;YAED,IAAI,CAAE,IAAI,CAAC,aAAqB,CAAC,WAAW,CAAC,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC,QAAQ,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC,EAAE,CAAC;gBAC7F,MAAM,IAAI,KAAK,CAAC,yBAAkB,SAAS,4BAAkB,WAAW,MAAG,CAAC,CAAC;YAC9E,CAAC;QACF,CAAC;QACD,OAAO,IAAI,CAAC;IACb,CAAC;IAEO,kCAAgB,GAAxB,UAAyB,EAA2D;YAAzD,iBAAiB,uBAAA;QAC3C,IAAI,YAAoB,CAAC;QAEzB,IAAM,eAAe,GAAG,IAAI,CAAC,aAAa,CAAC,iBAAiB,CAAC,CAAC,MAAM,CAAC;QAErE,IAAI,eAAe,KAAK,SAAS,EAAE,CAAC;YACnC,IAAI,CAAC,KAAK,CAAC,CAAC,QAAQ,CAAC,IAAI,CAAC,aAAa,CAAC,iBAAiB,CAAC,CAAC,MAAM,IAAI,KAAK,CAAC,EAAE,CAAC;gBAC7E,OAAO,IAAI,CAAC,aAAa,CAAC,iBAAiB,CAAC,CAAC,MAAM,IAAI,KAAK,CAAC;YAC9D,CAAC;iBAAM,CAAC;gBACP,YAAY,GAAG,kBAAW,IAAI,CAAC,aAAa,CAAC,iBAAiB,CAAC,CAAC,MAAM,gCAA6B,CAAC;YACrG,CAAC;QACF,CAAC;QACD,IAAI,eAAe,KAAK,OAAO,EAAE,CAAC;YACjC,IAAI,CAAC,KAAK,EAAE,KAAK,EAAE,KAAK,CAAC,CAAC,QAAQ,CAAC,IAAI,CAAC,aAAa,CAAC,iBAAiB,CAAC,CAAC,MAAM,IAAI,KAAK,CAAC,EAAE,CAAC;gBAC3F,OAAO,IAAI,CAAC,aAAa,CAAC,iBAAiB,CAAC,CAAC,MAAM,IAAI,KAAK,CAAC;YAC9D,CAAC;iBAAM,CAAC;gBACP,YAAY,GAAG,kBAAW,IAAI,CAAC,aAAa,CAAC,iBAAiB,CAAC,CAAC,MAAM,8BAA2B,CAAC;YACnG,CAAC;QACF,CAAC;QAED,IAAI,eAAe,KAAK,WAAW,EAAE,CAAC;YACrC,IAAI,CAAC,SAAS,CAAC,CAAC,QAAQ,CAAC,IAAI,CAAC,aAAa,CAAC,iBAAiB,CAAC,CAAC,MAAM,IAAI,SAAS,CAAC,EAAE,CAAC;gBACrF,IAAI,CAAC,IAAI,CAAC,aAAa,CAAC,iBAAiB,CAAC,CAAC,OAAO,EAAE,CAAC;oBACpD,YAAY,GAAG,sCAAsC,CAAC;gBACvD,CAAC;qBAAM,CAAC;oBACP,OAAO,IAAI,CAAC,aAAa,CAAC,iBAAiB,CAAC,CAAC,MAAM,IAAI,SAAS,CAAC;gBAClE,CAAC;YACF,CAAC;iBAAM,CAAC;gBACP,YAAY,GAAG,kBAAW,IAAI,CAAC,aAAa,CAAC,iBAAiB,CAAC,CAAC,MAAM,kCAA+B,CAAC;YACvG,CAAC;YAED,IAAI,IAAI,CAAC,aAAa,CAAC,iBAAiB,CAAC,CAAC,MAAM,KAAK,WAAW,IAAI,IAAI,CAAC,aAAa,CAAC,iBAAiB,CAAC,CAAC,OAAO,EAAE,CAAC;gBACnH,OAAO,SAAS,CAAC;YAClB,CAAC;QACF,CAAC;QAED,YAAY,aAAZ,YAAY,cAAZ,YAAY,IAAZ,YAAY,GAAK,2BAAoB,IAAI,CAAC,aAAa,CAAC,iBAAiB,CAAC,CAAC,MAAM,MAAG,EAAC;QAErF,MAAM,IAAI,KAAK,CAAC,mCAA4B,iBAAiB,iBAAO,YAAY,CAAE,CAAC,CAAC;IACrF,CAAC;IACF,cAAC;AAAD,CAAC,AAhLD,CAGU,qBAAY,GA6KrB;AAhLY,0BAAO"}
+{"version":3,"file":"metrics.js","sourceRoot":"","sources":["../../src/Metrics/metrics.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA;;GAEG;AACH,kEAAgD"}

package/dist/Metrics/processSocketsMetrics.d.ts

@@ -1,10 +1,4 @@
-import { Registry } from 'prom-client';
-declare const defaultConfig: {
-    prefix: string;
-    registry: Registry | undefined;
-    process: NodeJS.Process;
-};
-export type Config = typeof defaultConfig;
-export declare const metricNames: string[];
-export declare const collectSocketMetrics: (cfg?: Partial<Config>) => void;
-export {};
+/**
+ * @deprecated Use `@signageos/metrics` instead.
+ */
+export * from '@signageos/metrics/dist/processSocketsMetrics';

package/dist/Metrics/processSocketsMetrics.js

@@ -1,92 +1,21 @@
 "use strict";
-var __assign = (this && this.__assign) || function () {
-    __assign = Object.assign || function(t) {
-        for (var s, i = 1, n = arguments.length; i < n; i++) {
-            s = arguments[i];
-            for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p))
-                t[p] = s[p];
-        }
-        return t;
-    };
-    return __assign.apply(this, arguments);
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.collectSocketMetrics = exports.metricNames = void 0;
-var http_1 = require("http");
-var prom_client_1 = require("prom-client");
-var NODEJS_ACTIVE_SOCKETS = 'nodejs_active_sockets';
-var defaultConfig = {
-    prefix: 'sos_',
-    registry: undefined,
-    process: process,
-};
-exports.metricNames = [NODEJS_ACTIVE_SOCKETS];
-var collectSocketMetrics = function (cfg) {
-    if (cfg === void 0) { cfg = {}; }
-    var config = __assign(__assign({}, defaultConfig), cfg);
-    if (typeof config.process._getActiveHandles !== 'function') {
-        return;
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
     }
-    var processExt = process;
-    var registers = config.registry ? [config.registry] : undefined;
-    var namePrefix = config.prefix ? config.prefix : '';
-    var localServerPorts = new Set();
-    var socketMapper = function (socket) {
-        var _a;
-        return socket.localPort
-            ? localServerPorts.has((_a = socket.localPort) !== null && _a !== void 0 ? _a : 0)
-                ? "local:".concat(socket === null || socket === void 0 ? void 0 : socket.localPort)
-                : (socket === null || socket === void 0 ? void 0 : socket.remotePort)
-                    ? "remote:".concat(socket === null || socket === void 0 ? void 0 : socket.remotePort)
-                    : null
-            : null;
-    };
-    var mappers = {
-        TCP: socketMapper,
-        TLSSocket: socketMapper,
-        Socket: socketMapper,
-        Server: function (server) {
-            if (server instanceof http_1.Server) {
-                var address = server.address();
-                if (address && typeof address === 'object') {
-                    localServerPorts.add(address.port);
-                }
-            }
-            // Server will be not accounted in resulted metrics
-            return null;
-        },
-    };
-    function collect() {
-        // prepare
-        this.reset();
-        localServerPorts.clear();
-        // fetch handles
-        var activeHandles = processExt._getActiveHandles();
-        var sockets = activeHandles.reduce(function (acc, handle) {
-            var _a, _b, _c, _d;
-            var name = (_b = (_a = handle === null || handle === void 0 ? void 0 : handle.constructor) === null || _a === void 0 ? void 0 : _a.name) !== null && _b !== void 0 ? _b : 'unknown';
-            var label = (_c = mappers[name]) === null || _c === void 0 ? void 0 : _c.call(mappers, handle);
-            // output only socket-like handles, for the rest class name based accumulator present
-            // in default prom metrics will suffice
-            // we want this extra information (IPs) from socket handles, so we could easyly identify
-            // which kind of connection is hanging
-            if (label) {
-                var key = "".concat(name, ":").concat(label);
-                acc[key] = ((_d = acc[key]) !== null && _d !== void 0 ? _d : 0) + 1;
-            }
-            return acc;
-        }, {});
-        for (var key in sockets) {
-            this.labels({ socket: key }).set(sockets[key]);
-        }
-    }
-    new prom_client_1.Gauge({
-        name: namePrefix + NODEJS_ACTIVE_SOCKETS,
-        help: 'curent counts of sockets by local/remote ports',
-        labelNames: ['socket'],
-        registers: registers,
-        collect: collect,
-    });
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __exportStar = (this && this.__exportStar) || function(m, exports) {
+    for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
 };
-exports.collectSocketMetrics = collectSocketMetrics;
+Object.defineProperty(exports, "__esModule", { value: true });
+/**
+ * @deprecated Use `@signageos/metrics` instead.
+ */
+__exportStar(require("@signageos/metrics/dist/processSocketsMetrics"), exports);
 //# sourceMappingURL=processSocketsMetrics.js.map

package/dist/Metrics/processSocketsMetrics.js.map

@@ -1 +1 @@
-{"version":3,"file":"processSocketsMetrics.js","sourceRoot":"","sources":["../../src/Metrics/processSocketsMetrics.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"processSocketsMetrics.js","sourceRoot":"","sources":["../../src/Metrics/processSocketsMetrics.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA;;GAEG;AACH,gFAA8D"}

package/dist/Service/dbConnections.d.ts

@@ -1,4 +1,4 @@
-import { IAMQPConnection } from '../AMQP/amqpConnectionFactory';
+import { IAMQPConnection } from '@signageos/amqp/dist/amqpConnectionFactory';
 import { IMongodbConnection } from '../MongoDB/mongoDBConnectionFactory';
 import { IRedisConnection } from '../Redis/redisConnectionFactory';
 export interface DBConnections {

package/dist/Service/metrics/connections.js

@@ -1,12 +1,12 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.initDbConnectionsMetrics = initDbConnectionsMetrics;
-var connection_1 = require("../../ThirdParty/connection");
+var amqpConnectionFactory_1 = require("@signageos/amqp/dist/amqpConnectionFactory");
 var mongodb_1 = require("./mongodb");
 var redis_1 = require("./redis");
 function initDbConnectionsMetrics(connections, metricsClient) {
     if (connections.amqp) {
-        initMetricsForDBType(metricsClient, 'amqp', connections.amqp);
+        initMetricsForAMQPConnection(metricsClient, 'amqp', connections.amqp);
     }
     if (connections.redis) {
         (0, redis_1.initRedisDBConnectionsMetrics)(connections.redis);
@@ -15,7 +15,7 @@ function initDbConnectionsMetrics(connections, metricsClient) {
         (0, mongodb_1.initMongoDBConnectionsMetrics)(connections.mongodb);
     }
 }
-function initMetricsForDBType(metricsClient, dbName, connections) {
+function initMetricsForAMQPConnection(metricsClient, dbName, connections) {
     var client = metricsClient.getClient();
     for (var _i = 0, _a = Object.keys(connections); _i < _a.length; _i++) {
         var connName = _a[_i];
@@ -29,18 +29,18 @@ function initMetricsForDBType(metricsClient, dbName, connections) {
             name: metricPrefix + 'close',
             help: "Count of closed ".concat(dbName, " connections for the entire runtime history"),
         });
-        updateMetricWithConnection(connection, openMetric, closeMetric);
+        updateMetricWithAMQPConnection(connection, openMetric, closeMetric);
     }
 }
 /**
  * @deprecated
  * see: packages/lib/src/ThirdParty/connection.ts
  **/
-function updateMetricWithConnection(connection, openMetric, closeMetric) {
-    connection.addListener(connection_1.ThirdPartyConnectionEvent.ConnectionOpen, function () {
+function updateMetricWithAMQPConnection(connection, openMetric, closeMetric) {
+    connection.addListener(amqpConnectionFactory_1.ConnectionEvent.ConnectionOpen, function () {
         openMetric.inc();
     });
-    connection.addListener(connection_1.ThirdPartyConnectionEvent.ConnectionClosed, function () {
+    connection.addListener(amqpConnectionFactory_1.ConnectionEvent.ConnectionClosed, function () {
         closeMetric.inc();
     });
 }

package/dist/Service/metrics/connections.js.map

@@ -1 +1 @@
-{"version":3,"file":"connections.js","sourceRoot":"","sources":["../../../src/Service/metrics/connections.ts"],"names":[],"mappings":";;AAOA,4DAUC;AAfD,0DAA+F;AAE/F,qCAA0D;AAC1D,iCAAwD;AAExD,SAAgB,wBAAwB,CAAC,WAA0B,EAAE,aAA6B;IACjG,IAAI,WAAW,CAAC,IAAI,EAAE,CAAC;QACtB,oBAAoB,CAAC,aAAa,EAAE,MAAM,EAAE,WAAW,CAAC,IAAI,CAAC,CAAC;IAC/D,CAAC;IACD,IAAI,WAAW,CAAC,KAAK,EAAE,CAAC;QACvB,IAAA,qCAA6B,EAAC,WAAW,CAAC,KAAK,CAAC,CAAC;IAClD,CAAC;IACD,IAAI,WAAW,CAAC,OAAO,EAAE,CAAC;QACzB,IAAA,uCAA6B,EAAC,WAAW,CAAC,OAAO,CAAC,CAAC;IACpD,CAAC;AACF,CAAC;AAED,SAAS,oBAAoB,CAAC,aAA6B,EAAE,MAAc,EAAE,WAAkD;IAC9H,IAAM,MAAM,GAAG,aAAa,CAAC,SAAS,EAAE,CAAC;IAEzC,KAAuB,UAAwB,EAAxB,KAAA,MAAM,CAAC,IAAI,CAAC,WAAW,CAAC,EAAxB,cAAwB,EAAxB,IAAwB,EAAE,CAAC;QAA7C,IAAM,QAAQ,SAAA;QAClB,IAAM,UAAU,GAAG,WAAW,CAAC,QAAQ,CAAC,CAAC;QACzC,IAAM,YAAY,GAAG,qCAA8B,MAAM,cAAI,QAAQ,MAAG,CAAC;QAEzE,IAAM,UAAU,GAAG,IAAI,MAAM,CAAC,KAAK,CAAC;YACnC,IAAI,EAAE,YAAY,GAAG,MAAM;YAC3B,IAAI,EAAE,wBAAiB,MAAM,gDAA6C;SAC1E,CAAC,CAAC;QACH,IAAM,WAAW,GAAG,IAAI,MAAM,CAAC,KAAK,CAAC;YACpC,IAAI,EAAE,YAAY,GAAG,OAAO;YAC5B,IAAI,EAAE,0BAAmB,MAAM,gDAA6C;SAC5E,CAAC,CAAC;QAEH,0BAA0B,CAAC,UAAU,EAAE,UAAU,EAAE,WAAW,CAAC,CAAC;IACjE,CAAC;AACF,CAAC;AAED;;;IAGI;AACJ,SAAS,0BAA0B,CAAC,UAAiC,EAAE,UAAiB,EAAE,WAAkB;IAC3G,UAAU,CAAC,WAAW,CAAC,sCAAyB,CAAC,cAAc,EAAE;QAChE,UAAU,CAAC,GAAG,EAAE,CAAC;IAClB,CAAC,CAAC,CAAC;IACH,UAAU,CAAC,WAAW,CAAC,sCAAyB,CAAC,gBAAgB,EAAE;QAClE,WAAW,CAAC,GAAG,EAAE,CAAC;IACnB,CAAC,CAAC,CAAC;AACJ,CAAC"}
+{"version":3,"file":"connections.js","sourceRoot":"","sources":["../../../src/Service/metrics/connections.ts"],"names":[],"mappings":";;AAOA,4DAUC;AAfD,oFAA8F;AAE9F,qCAA0D;AAC1D,iCAAwD;AAExD,SAAgB,wBAAwB,CAAC,WAA0B,EAAE,aAA6B;IACjG,IAAI,WAAW,CAAC,IAAI,EAAE,CAAC;QACtB,4BAA4B,CAAC,aAAa,EAAE,MAAM,EAAE,WAAW,CAAC,IAAI,CAAC,CAAC;IACvE,CAAC;IACD,IAAI,WAAW,CAAC,KAAK,EAAE,CAAC;QACvB,IAAA,qCAA6B,EAAC,WAAW,CAAC,KAAK,CAAC,CAAC;IAClD,CAAC;IACD,IAAI,WAAW,CAAC,OAAO,EAAE,CAAC;QACzB,IAAA,uCAA6B,EAAC,WAAW,CAAC,OAAO,CAAC,CAAC;IACpD,CAAC;AACF,CAAC;AAED,SAAS,4BAA4B,CAAC,aAA6B,EAAE,MAAc,EAAE,WAA4C;IAChI,IAAM,MAAM,GAAG,aAAa,CAAC,SAAS,EAAE,CAAC;IAEzC,KAAuB,UAAwB,EAAxB,KAAA,MAAM,CAAC,IAAI,CAAC,WAAW,CAAC,EAAxB,cAAwB,EAAxB,IAAwB,EAAE,CAAC;QAA7C,IAAM,QAAQ,SAAA;QAClB,IAAM,UAAU,GAAG,WAAW,CAAC,QAAQ,CAAC,CAAC;QACzC,IAAM,YAAY,GAAG,qCAA8B,MAAM,cAAI,QAAQ,MAAG,CAAC;QAEzE,IAAM,UAAU,GAAG,IAAI,MAAM,CAAC,KAAK,CAAC;YACnC,IAAI,EAAE,YAAY,GAAG,MAAM;YAC3B,IAAI,EAAE,wBAAiB,MAAM,gDAA6C;SAC1E,CAAC,CAAC;QACH,IAAM,WAAW,GAAG,IAAI,MAAM,CAAC,KAAK,CAAC;YACpC,IAAI,EAAE,YAAY,GAAG,OAAO;YAC5B,IAAI,EAAE,0BAAmB,MAAM,gDAA6C;SAC5E,CAAC,CAAC;QAEH,8BAA8B,CAAC,UAAU,EAAE,UAAU,EAAE,WAAW,CAAC,CAAC;IACrE,CAAC;AACF,CAAC;AAED;;;IAGI;AACJ,SAAS,8BAA8B,CAAC,UAA2B,EAAE,UAAiB,EAAE,WAAkB;IACzG,UAAU,CAAC,WAAW,CAAC,uCAAe,CAAC,cAAc,EAAE;QACtD,UAAU,CAAC,GAAG,EAAE,CAAC;IAClB,CAAC,CAAC,CAAC;IACH,UAAU,CAAC,WAAW,CAAC,uCAAe,CAAC,gBAAgB,EAAE;QACxD,WAAW,CAAC,GAAG,EAAE,CAAC;IACnB,CAAC,CAAC,CAAC;AACJ,CAAC"}

package/dist/ThirdParty/connection.d.ts

@@ -3,17 +3,6 @@ export declare enum ThirdPartyConnectionEvent {
     ConnectionOpen = "connection_open",
     ConnectionClosed = "connection_closed"
 }
-/**
- * @deprecated
- * This interface was originally meant as abstraction to easier export third party connections to metrics.
- * Now, instead, the remaining connections that implement this interface should be rewritten to export metrics directly,
- * similarly to how MongoDBConnection does it.
- * This interface will be removed in the future.
- */
-export interface IThirdPartyConnection extends IConnection {
-    addListener: (event: ThirdPartyConnectionEvent, listener: () => void) => void;
-    removeListener: (event: ThirdPartyConnectionEvent, listener: () => void) => void;
-}
 export interface IConnection<TExporter = {}> {
     connect: () => Promise<void>;
     close: () => Promise<void>;

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@signageos/lib",
-	"version": "23.9.1",
+	"version": "23.9.2",
 	"main": "./dist",
 	"type": "commonjs",
 	"files": [
@@ -26,7 +26,6 @@
 		"test": "NODE_ENV=test mocha",
 		"test:coverage": "c8 npm run test",
 		"test-connections": "NODE_ENV=test mocha --allow-uncaught --config .mocharc.connections.js",
-		"test-rabbit-connection": "NODE_ENV=test mocha --config .mocharc.connections-rabbit.js",
 		"test:benchmark": "NODE_ENV=test mocha --config .mocharc.benchmark.js",
 		"watch": "tsc --watch",
 		"check": "npm run depcheck && ../../tools/check-deps",
@@ -39,8 +38,10 @@
 	"author": "Michael Zabka <zabka.michael@gmail.com>",
 	"license": "MIT",
 	"dependencies": {
-		"@signageos/core": "0.0.1",
-		"@signageos/lib-ci": "23.9.1",
+		"@signageos/amqp": "0.0.1",
+		"@signageos/core": "0.0.6",
+		"@signageos/lib-ci": "23.9.2",
+		"@signageos/metrics": "0.0.5",
 		"async-lock": "1.4.0",
 		"auth0": "4.4.1",
 		"basic-auth": "2.0.1",
@@ -52,7 +53,6 @@
 		"express-prom-bundle": "8.0.0",
 		"file-type": "16.5.4",
 		"fs-extra": "11.2.0",
-		"generic-pool": "3.1.7",
 		"http-status": "2.0.0",
 		"isomorphic-ws": "4.0.1",
 		"lodash": "4.17.21",
@@ -66,7 +66,6 @@
 		"rsync": "0.6.1",
 		"semver": "7.7.1",
 		"tar": "7.0.1",
-		"timeout-ts": "0.6.0",
 		"tmp": "0.2.1",
 		"ts-brand": "0.0.2",
 		"winston": "3.11.0",
@@ -78,7 +77,6 @@
 		"@aws-sdk/s3-request-presigner": "3.489.0",
 		"aws-sdk": "^2.1472.0",
 		"@influxdata/influxdb-client": "1.16.0",
-		"amqp10": "~3.5.0",
 		"mocha": "^3.1.2",
 		"redis": "^3.1.2",
 		"mongoose": "^8.0.0",
@@ -101,7 +99,6 @@
 		"@faker-js/faker": "8.3.1",
 		"@influxdata/influxdb-client": "1.16.0",
 		"@istanbuljs/nyc-config-typescript": "1.0.2",
-		"@types/amqplib": "0.5.13",
 		"@types/async-lock": "1.4.2",
 		"@types/basic-auth": "1.1.8",
 		"@types/css-tree": "2.3.5",
@@ -129,7 +126,6 @@
 		"@types/tmp": "0.0.33",
 		"@types/webpack": "5.28.1",
 		"@types/ws": "8.5.10",
-		"amqplib": "0.10.3",
 		"assert": "2.1.0",
 		"buffer": "6.0.3",
 		"c8": "8.0.1",

package/dist/AMQP/IAMQPPool.d.ts

@@ -1,5 +0,0 @@
-import { Connection } from 'amqplib';
-import IBasePool from '../Pool/IBasePool';
-export default IAMQPPool;
-interface IAMQPPool extends IBasePool<Connection> {
-}

package/dist/AMQP/IAMQPPool.js

@@ -1,3 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-//# sourceMappingURL=IAMQPPool.js.map