@theotherwillembotha/node-red-plugincore 0.0.54 → 0.0.55

package/build/core/logger/template/LoggerTemplate.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"LoggerTemplate.d.ts","sourceRoot":"","sources":["../../../../src/core/logger/template/LoggerTemplate.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,cAAc,EAAE,QAAQ,EAAE,kBAAkB,EAAE,MAAM,uBAAuB,CAAA;AAEpF,MAAM,WAAW,oBAAqB,SAAQ,cAAc;IACxD,UAAU,EAAC,OAAO,CAAC;IACnB,MAAM,EAAC,MAAM,CAAC;IACd,0BAA0B,EAAC,OAAO,CAAC;IACnC,mBAAmB,EAAC,MAAM,CAAC;CAC9B;AAED,qBAAa,cAAe,SAAQ,QAAQ;IAGxC,MAAM,CAAC,qBAAqB,IAAI,kBAAkB;CAQrD"}
+{"version":3,"file":"LoggerTemplate.d.ts","sourceRoot":"","sources":["../../../../src/core/logger/template/LoggerTemplate.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,cAAc,EAAE,QAAQ,EAAE,kBAAkB,EAAE,MAAM,uBAAuB,CAAA;AAGpF,MAAM,WAAW,wBAAyB,SAAQ,cAAc;IAC5D,UAAU,EAAC,OAAO,CAAC;IACnB,MAAM,EAAC,MAAM,CAAC;IACd,0BAA0B,EAAC,OAAO,CAAC;IACnC,mBAAmB,EAAC,MAAM,CAAC;CAC9B;AAED,MAAM,MAAM,oBAAoB,GAAG;IAC/B,EAAE,EAAC,MAAM,CAAC;IACV,IAAI,EAAC,MAAM,CAAC;IACZ,IAAI,EAAC,MAAM,CAAC;IACZ,IAAI,EAAC,MAAM,CAAC;IACZ,QAAQ,EAAC,MAAM,CAAC;IAChB,KAAK,EAAC,MAAM,CAAC;CAChB,CAAA;AAED,qBAAa,cAAe,SAAQ,QAAQ;IAGxC,MAAM,CAAC,qBAAqB,IAAI,kBAAkB;CAQrD"}

package/build/core/metrics/node/CounterMetricConfigNode.js

@@ -17,8 +17,6 @@ const MetricsConfigNode_1 = require("./MetricsConfigNode");
 const MetricsTemplate_1 = require("../template/MetricsTemplate");
 const NodeDescriptionDecorator_1 = require("../../tagging/NodeDescriptionDecorator");
 let CounterMetricConfigNode = class CounterMetricConfigNode extends NodeConstructor_1.ConfigNode {
-    _metrics;
-    _counter;
     constructor(node, config) {
         super(node, config);
         let _this = this;

package/build/core/metrics/node/GaugeMetricConfigNode.js

@@ -17,8 +17,6 @@ const MetricsConfigNode_1 = require("./MetricsConfigNode");
 const MetricsTemplate_1 = require("../template/MetricsTemplate");
 const NodeDescriptionDecorator_1 = require("../../tagging/NodeDescriptionDecorator");
 let GaugeMetricConfigNode = class GaugeMetricConfigNode extends NodeConstructor_1.ConfigNode {
-    _metrics;
-    _gauge;
     constructor(node, config) {
         super(node, config);
         let _this = this;

package/build/core/metrics/node/MetricsConfigNode.js

@@ -19,7 +19,6 @@ const WebhookServerService_1 = require("../../webhook/service/WebhookServerServi
 const prom_client_1 = require("prom-client");
 const NodeDescriptionDecorator_1 = require("../../tagging/NodeDescriptionDecorator");
 let MetricsConfigNode = class MetricsConfigNode extends NodeConstructor_1.ConfigNode {
-    _metrics;
     constructor(node, config) {
         super(node, config);
         let _this = this;

package/build/core/metrics/node/TimerMetricConfigNode.js

@@ -18,8 +18,6 @@ const MetricsTemplate_1 = require("../template/MetricsTemplate");
 const MetricsDecorator_1 = require("../MetricsDecorator");
 const NodeDescriptionDecorator_1 = require("../../tagging/NodeDescriptionDecorator");
 let TimerMetricConfigNode = class TimerMetricConfigNode extends NodeConstructor_1.ConfigNode {
-    _metrics;
-    _timer;
     constructor(node, config) {
         super(node, config);
         let _this = this;

package/build/core/metrics/service/MetricsService.js

@@ -41,8 +41,6 @@ const NodeConstructor_1 = require("../../NodeConstructor");
 const prom_client_1 = __importStar(require("prom-client"));
 const deep_equal_1 = __importDefault(require("deep-equal"));
 class Metric {
-    _config;
-    _labels;
     constructor(config) {
         this._config = config;
         this._labels = { flow: config.node.flow, type: config.node.type, name: config.node.name, id: config.node.id, metric: config.metricname };
@@ -56,11 +54,9 @@ class Metric {
 }
 exports.Metric = Metric;
 class CounterMetric extends Metric {
-    counter;
-    internalCounter;
-    subscribers = {};
     constructor(id, config, registry) {
         super(config);
+        this.subscribers = {};
         this.counter = new prom_client_1.Counter({
             name: id,
             help: (config.metricdescription) ? config.metricdescription : config.metricname,
@@ -90,11 +86,10 @@ class CounterMetric extends Metric {
 }
 exports.CounterMetric = CounterMetric;
 class GaugeMetric extends Metric {
-    collector = 0;
-    gauge;
-    subscribers = {};
     constructor(id, config, registry) {
         super(config);
+        this.collector = 0;
+        this.subscribers = {};
         let _this = this;
         this.gauge = new prom_client_1.default.Gauge({
             name: id,
@@ -142,10 +137,9 @@ var BucketType;
     BucketType["exponential"] = "exponential";
 })(BucketType || (exports.BucketType = BucketType = {}));
 class HistogramMetric extends Metric {
-    histogram;
-    subscribers = {};
     constructor(id, config, registry) {
         super(config);
+        this.subscribers = {};
         // Build the Histogram Config.
         let histogramConfig = {
             name: id,
@@ -188,8 +182,6 @@ class HistogramMetric extends Metric {
 }
 exports.HistogramMetric = HistogramMetric;
 class HistogramState {
-    _values;
-    _average;
     constructor(values) {
         this._values = values;
         let sum = this._values.find(value => value.metricName?.endsWith("_sum"))?.value;
@@ -201,8 +193,6 @@ class HistogramState {
     }
 }
 class SummaryState {
-    _values;
-    _average;
     constructor(values) {
         this._values = values;
         let sum = this._values.find(value => value.metricName?.endsWith("_sum"))?.value;
@@ -219,10 +209,9 @@ var PercentileType;
     PercentileType["manual"] = "manual";
 })(PercentileType || (exports.PercentileType = PercentileType = {}));
 class SummaryMetric extends Metric {
-    summary;
-    subscribers = {};
     constructor(id, config, registry) {
         super(config);
+        this.subscribers = {};
         let summaryConfig = {
             name: id,
             help: (config.metricdescription) ? config.metricdescription : config.metricname,
@@ -257,13 +246,11 @@ class SummaryMetric extends Metric {
 }
 exports.SummaryMetric = SummaryMetric;
 class MetricsContainer {
-    _config;
-    _registry;
-    counters = {};
-    histograms = {};
-    gauges = {};
-    summaries = {};
     constructor(config) {
+        this.counters = {};
+        this.histograms = {};
+        this.gauges = {};
+        this.summaries = {};
         this._config = config;
         // create a registry with the config.
         this._registry = new prom_client_1.default.Registry();
@@ -341,8 +328,7 @@ class MetricsContainer {
 }
 exports.MetricsContainer = MetricsContainer;
 class MetricsService extends NodeConstructor_1.BaseService {
-    static metrics = {};
-    red;
+    static { this.metrics = {}; }
     constructor() {
         super("MetricsService");
     }

package/build/core/other/service/SettingsService.js

@@ -38,8 +38,6 @@ class SettingsService extends NodeConstructor_1.BaseService {
 }
 exports.SettingsService = SettingsService;
 class Settings {
-    _settings;
-    _config;
     constructor(settings, config) {
         this._settings = settings;
         this._config = config;

package/build/core/tagging/service/NodeTypeService.js

@@ -3,10 +3,9 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.NodeTypeService = void 0;
 const NodeConstructor_1 = require("../../NodeConstructor");
 class NodeTypeService extends NodeConstructor_1.BaseService {
-    red;
-    nodeTypes = {};
     constructor() {
         super("nodetypes");
+        this.nodeTypes = {};
     }
     init(red) {
         this.red = red;

package/build/core/webhook/WebhookDecorator.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"WebhookDecorator.d.ts","sourceRoot":"","sources":["../../../src/core/webhook/WebhookDecorator.ts"],"names":[],"mappings":"AAYA,QAAA,MAAM,OAAO,KAoDD,CAAC;AAGb,OAAO,EACH,OAAO,EACV,CAAA"}
+{"version":3,"file":"WebhookDecorator.d.ts","sourceRoot":"","sources":["../../../src/core/webhook/WebhookDecorator.ts"],"names":[],"mappings":"AAYA,QAAA,MAAM,OAAO,KAkDD,CAAC;AAGb,OAAO,EACH,OAAO,EACV,CAAA"}

package/build/core/webhook/WebhookDecorator.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Webhook = void 0;
-const LoggerServiceTypes_1 = require("../logger/service/LoggerServiceTypes");
+const LoggerService_1 = require("../logger/service/LoggerService");
 const NodeConstructor_1 = require("../NodeConstructor");
 const Webhook = (0, NodeConstructor_1.createPostConstructDecorator)('Webhook')
     .withInitLogic(async (instance, propertyKey, webhookconfig) => {
@@ -9,9 +9,9 @@ const Webhook = (0, NodeConstructor_1.createPostConstructDecorator)('Webhook')
     let node = instance;
     let nodeConfig = node.config();
     // create the authentication.
-    let authentication = (nodeConfig.webhookAuth === LoggerServiceTypes_1.RestAuthType.basic) ? { type: LoggerServiceTypes_1.RestAuthType.basic, username: nodeConfig.webhookAuth_basic_username, password: nodeConfig.webhookAuth_basic_password } :
-        (nodeConfig.webhookAuth === LoggerServiceTypes_1.RestAuthType.apikey) ? { type: LoggerServiceTypes_1.RestAuthType.apikey, mechanism: nodeConfig.webhookAuth_apikey_mechanism, key: nodeConfig.webhookAuth_apikey_key, value: nodeConfig.webhookAuth_apikey_value } :
-            { type: LoggerServiceTypes_1.RestAuthType.none };
+    let authentication = (nodeConfig.webhookAuth === LoggerService_1.RestAuthType.basic) ? { type: LoggerService_1.RestAuthType.basic, username: nodeConfig.webhookAuth_basic_username, password: nodeConfig.webhookAuth_basic_password } :
+        (nodeConfig.webhookAuth === LoggerService_1.RestAuthType.apikey) ? { type: LoggerService_1.RestAuthType.apikey, mechanism: nodeConfig.webhookAuth_apikey_mechanism, key: nodeConfig.webhookAuth_apikey_key, value: nodeConfig.webhookAuth_apikey_value } :
+            { type: LoggerService_1.RestAuthType.none };
     // register a callback listener to the webserver.
     let endpointConfig = {
         path: nodeConfig.webhookPath,

package/build/core/webhook/node/WebhookServerConfigNode.js

@@ -15,7 +15,6 @@ const NodeGenerator_1 = require("../../NodeGenerator");
 const WebhookServerService_1 = require("../service/WebhookServerService");
 const NodeDescriptionDecorator_1 = require("../../tagging/NodeDescriptionDecorator");
 let WebhookServerConfigNode = class WebhookServerConfigNode extends NodeConstructor_1.ConfigNode {
-    _server;
     constructor(node, config) {
         super(node, config);
         let _this = this;

package/build/core/webhook/service/ReverseProxyTypeService.d.ts

@@ -9,8 +9,6 @@ export interface ProxyManagerClient {
     updateHost(data: Partial<HostEntry>): Promise<void>;
     getHosts(): Promise<Partial<HostEntry>[]>;
 }
-export declare abstract class ReverseProxyClient {
-}
 export type HostEntry = {
     id: number;
     domainNames: string[];

package/build/core/webhook/service/ReverseProxyTypeService.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ReverseProxyTypeService.d.ts","sourceRoot":"","sources":["../../../../src/core/webhook/service/ReverseProxyTypeService.ts"],"names":[],"mappings":"AAGA,8BAAsB,gBAAgB;IAElC,OAAO,CAAC,GAAG,CAAS;IACpB,OAAO,CAAC,KAAK,CAAS;gBAEV,EAAE,EAAC,MAAM,EAAE,IAAI,EAAC,MAAM;IAK3B,EAAE,IAAG,MAAM;IAGX,IAAI,IAAG,MAAM;CAGvB;AAED,MAAM,WAAW,kBAAkB;IAC/B,UAAU,CAAC,IAAI,EAAE,OAAO,CAAC,SAAS,CAAC,GAAE,OAAO,CAAC,IAAI,CAAC,CAAC;IACnD,QAAQ,IAAG,OAAO,CAAC,OAAO,CAAC,SAAS,CAAC,EAAE,CAAC,CAAC;CAC5C;AAED,8BAAsB,kBAAkB;CAEvC;AAED,MAAM,MAAM,SAAS,GAAG;IACpB,EAAE,EAAC,MAAM,CAAC;IACV,WAAW,EAAC,MAAM,EAAE,CAAC;IACrB,MAAM,EAAC,UAAU,CAAC;IAClB,WAAW,EAAC,MAAM,CAAC;IACnB,WAAW,EAAC,MAAM,CAAC;IACnB,UAAU,EAAC,MAAM,CAAC;IAClB,WAAW,EAAC,OAAO,CAAC;IACpB,mBAAmB,EAAC,OAAO,CAAC;IAC5B,gBAAgB,EAAC,OAAO,CAAC;CAC5B,CAAA;AAED,oBAAY,UAAU;IAClB,IAAI,SAAS;IACb,KAAK,UAAU;CAClB"}
+{"version":3,"file":"ReverseProxyTypeService.d.ts","sourceRoot":"","sources":["../../../../src/core/webhook/service/ReverseProxyTypeService.ts"],"names":[],"mappings":"AAGA,8BAAsB,gBAAgB;IAElC,OAAO,CAAC,GAAG,CAAS;IACpB,OAAO,CAAC,KAAK,CAAS;gBAEV,EAAE,EAAC,MAAM,EAAE,IAAI,EAAC,MAAM;IAK3B,EAAE,IAAG,MAAM;IAGX,IAAI,IAAG,MAAM;CAGvB;AAED,MAAM,WAAW,kBAAkB;IAC/B,UAAU,CAAC,IAAI,EAAE,OAAO,CAAC,SAAS,CAAC,GAAE,OAAO,CAAC,IAAI,CAAC,CAAC;IACnD,QAAQ,IAAG,OAAO,CAAC,OAAO,CAAC,SAAS,CAAC,EAAE,CAAC,CAAC;CAC5C;AAED,MAAM,MAAM,SAAS,GAAG;IACpB,EAAE,EAAC,MAAM,CAAC;IACV,WAAW,EAAC,MAAM,EAAE,CAAC;IACrB,MAAM,EAAC,UAAU,CAAC;IAClB,WAAW,EAAC,MAAM,CAAC;IACnB,WAAW,EAAC,MAAM,CAAC;IACnB,UAAU,EAAC,MAAM,CAAC;IAClB,WAAW,EAAC,OAAO,CAAC;IACpB,mBAAmB,EAAC,OAAO,CAAC;IAC5B,gBAAgB,EAAC,OAAO,CAAC;CAC5B,CAAA;AAED,oBAAY,UAAU;IAClB,IAAI,SAAS;IACb,KAAK,UAAU;CAClB"}

package/build/core/webhook/service/ReverseProxyTypeService.js

@@ -1,9 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.HTTPScheme = exports.ReverseProxyClient = exports.ReverseProxyType = void 0;
+exports.HTTPScheme = exports.ReverseProxyType = void 0;
 class ReverseProxyType {
-    _id;
-    _name;
     constructor(id, name) {
         this._id = id;
         this._name = name;
@@ -16,9 +14,6 @@ class ReverseProxyType {
     }
 }
 exports.ReverseProxyType = ReverseProxyType;
-class ReverseProxyClient {
-}
-exports.ReverseProxyClient = ReverseProxyClient;
 var HTTPScheme;
 (function (HTTPScheme) {
     HTTPScheme["HTTP"] = "http";

package/build/core/webhook/service/WebhookServerService.d.ts

@@ -1,7 +1,7 @@
 import { BaseService, FlowDeployment, ServiceDescriptor } from "../../NodeConstructor";
 import { NodeAPI, NodeAPISettingsWithData } from "node-red";
 import { Request, Response } from "express";
-import { ApiKeyMechanismType, RestAuthType } from "../../logger/service/LoggerServiceTypes";
+import { ApiKeyMechanismType, RestAuthType } from "../../logger/service/LoggerService";
 export declare enum EndpointMethodType {
     GET = "GET",
     POST = "POST"

package/build/core/webhook/service/WebhookServerService.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"WebhookServerService.d.ts","sourceRoot":"","sources":["../../../../src/core/webhook/service/WebhookServerService.ts"],"names":[],"mappings":"AACA,OAAO,EAAC,WAAW,EAAE,cAAc,EAAE,iBAAiB,EAAE,MAAM,uBAAuB,CAAC;AACtF,OAAO,EAAE,OAAO,EAAE,uBAAuB,EAAE,MAAM,UAAU,CAAC;AAG5D,OAAgB,EAAU,OAAO,EAAE,QAAQ,EAAC,MAAM,SAAS,CAAC;AAE5D,OAAO,EAAE,mBAAmB,EAAE,YAAY,EAAE,MAAM,yCAAyC,CAAC;AAI5F,oBAAY,kBAAkB;IAC1B,GAAG,QAAQ;IACX,IAAI,SAAS;CAChB;AAED,MAAM,MAAM,sBAAsB,GAAG;IACjC,IAAI,EAAC,YAAY,CAAC,IAAI,CAAC;CAC1B,CAAA;AAED,MAAM,MAAM,yBAAyB,GAAG;IACpC,IAAI,EAAC,YAAY,CAAC,KAAK,CAAA;IACvB,QAAQ,EAAC,MAAM,CAAC;IAChB,QAAQ,EAAC,MAAM,CAAC;CACnB,CAAA;AAED,MAAM,MAAM,0BAA0B,GAAG;IACrC,IAAI,EAAC,YAAY,CAAC,MAAM,CAAC;IACzB,SAAS,EAAC,mBAAmB,CAAC;IAC9B,GAAG,EAAC,MAAM,CAAC;IACX,KAAK,EAAC,MAAM,CAAC;CAChB,CAAA;AAED,MAAM,MAAM,cAAc,GAAG;IACzB,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,EAAC,kBAAkB,EAAE,CAAC;IAC7B,cAAc,EAAE,sBAAsB,GAAG,yBAAyB,GAAG,0BAA0B,CAAC;CACnG,CAAA;AAED,qBAAa,aAAa;IAEtB,OAAO,CAAC,OAAO,CAAsB;IACrC,OAAO,CAAC,IAAI,CAAU;IACtB,OAAO,CAAC,SAAS,CAAS;gBAEP,MAAM,EAAC,mBAAmB;IAQtC,MAAM,CAAC,QAAQ,EAAC,cAAc,EAAE,QAAQ,EAAC,CAAC,OAAO,EAAC,OAAO,EAAE,QAAQ,EAAC,QAAQ,KAAK,GAAG;IA+CpF,MAAM,CAAC,aAAa,EAAC,cAAc;IAsBnC,MAAM,IAAG,mBAAmB;CAGtC;AAED,MAAM,MAAO,mBAAmB,GAAG;IAC/B,EAAE,EAAC,MAAM,CAAA;IACT,IAAI,EAAE,MAAM,CAAC;IACb,YAAY,EAAC,MAAM,CAAC;IACpB,YAAY,EAAC,MAAM,CAAC;CACvB,CAAA;AAED,qBAAa,oBAAqB,SAAQ,WAAW;IAEjD,OAAO,CAAC,MAAM,CAAC,cAAc,CAAmC;;IAMzD,IAAI,CAAC,GAAG,EAAE,OAAO,CAAC,uBAAuB,CAAC,GAAG,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC;IAIjE,MAAM,CAAC,GAAG,EAAE,OAAO,CAAC,uBAAuB,CAAC,GAAG,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC;IAInE,QAAQ,CAAC,cAAc,EAAE,cAAc,GAAG,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC;WAyCvD,GAAG,CAAE,MAAM,EAAC,mBAAmB,GAAG,aAAa;WAS7C,oBAAoB,IAAG,iBAAiB;CAU3D"}
+{"version":3,"file":"WebhookServerService.d.ts","sourceRoot":"","sources":["../../../../src/core/webhook/service/WebhookServerService.ts"],"names":[],"mappings":"AACA,OAAO,EAAC,WAAW,EAAE,cAAc,EAAE,iBAAiB,EAAE,MAAM,uBAAuB,CAAC;AACtF,OAAO,EAAE,OAAO,EAAE,uBAAuB,EAAE,MAAM,UAAU,CAAC;AAG5D,OAAgB,EAAU,OAAO,EAAE,QAAQ,EAAC,MAAM,SAAS,CAAC;AAE5D,OAAO,EAAE,mBAAmB,EAAE,YAAY,EAAE,MAAM,oCAAoC,CAAC;AAIvF,oBAAY,kBAAkB;IAC1B,GAAG,QAAQ;IACX,IAAI,SAAS;CAChB;AAED,MAAM,MAAM,sBAAsB,GAAG;IACjC,IAAI,EAAC,YAAY,CAAC,IAAI,CAAC;CAC1B,CAAA;AAED,MAAM,MAAM,yBAAyB,GAAG;IACpC,IAAI,EAAC,YAAY,CAAC,KAAK,CAAA;IACvB,QAAQ,EAAC,MAAM,CAAC;IAChB,QAAQ,EAAC,MAAM,CAAC;CACnB,CAAA;AAED,MAAM,MAAM,0BAA0B,GAAG;IACrC,IAAI,EAAC,YAAY,CAAC,MAAM,CAAC;IACzB,SAAS,EAAC,mBAAmB,CAAC;IAC9B,GAAG,EAAC,MAAM,CAAC;IACX,KAAK,EAAC,MAAM,CAAC;CAChB,CAAA;AAED,MAAM,MAAM,cAAc,GAAG;IACzB,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,EAAC,kBAAkB,EAAE,CAAC;IAC7B,cAAc,EAAE,sBAAsB,GAAG,yBAAyB,GAAG,0BAA0B,CAAC;CACnG,CAAA;AAED,qBAAa,aAAa;IAEtB,OAAO,CAAC,OAAO,CAAsB;IACrC,OAAO,CAAC,IAAI,CAAU;IACtB,OAAO,CAAC,SAAS,CAAS;gBAEP,MAAM,EAAC,mBAAmB;IAQtC,MAAM,CAAC,QAAQ,EAAC,cAAc,EAAE,QAAQ,EAAC,CAAC,OAAO,EAAC,OAAO,EAAE,QAAQ,EAAC,QAAQ,KAAK,GAAG;IA+CpF,MAAM,CAAC,aAAa,EAAC,cAAc;IAsBnC,MAAM,IAAG,mBAAmB;CAGtC;AAED,MAAM,MAAO,mBAAmB,GAAG;IAC/B,EAAE,EAAC,MAAM,CAAA;IACT,IAAI,EAAE,MAAM,CAAC;IACb,YAAY,EAAC,MAAM,CAAC;IACpB,YAAY,EAAC,MAAM,CAAC;CACvB,CAAA;AAED,qBAAa,oBAAqB,SAAQ,WAAW;IAEjD,OAAO,CAAC,MAAM,CAAC,cAAc,CAAmC;;IAMzD,IAAI,CAAC,GAAG,EAAE,OAAO,CAAC,uBAAuB,CAAC,GAAG,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC;IAIjE,MAAM,CAAC,GAAG,EAAE,OAAO,CAAC,uBAAuB,CAAC,GAAG,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC;IAInE,QAAQ,CAAC,cAAc,EAAE,cAAc,GAAG,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC;WAyCvD,GAAG,CAAE,MAAM,EAAC,mBAAmB,GAAG,aAAa;WAS7C,oBAAoB,IAAG,iBAAiB;CAU3D"}

package/build/core/webhook/service/WebhookServerService.js

@@ -8,7 +8,7 @@ const NodeConstructor_1 = require("../../NodeConstructor");
 const WebhookServerConfigNode_1 = require("../node/WebhookServerConfigNode");
 const WebhookTemplate_1 = require("../template/WebhookTemplate");
 const express_1 = __importDefault(require("express"));
-const LoggerServiceTypes_1 = require("../../logger/service/LoggerServiceTypes");
+const LoggerService_1 = require("../../logger/service/LoggerService");
 var bodyParser = require('body-parser');
 var EndpointMethodType;
 (function (EndpointMethodType) {
@@ -16,9 +16,6 @@ var EndpointMethodType;
     EndpointMethodType["POST"] = "POST";
 })(EndpointMethodType || (exports.EndpointMethodType = EndpointMethodType = {}));
 class WebhookServer {
-    _config;
-    _app;
-    _listener;
     constructor(config) {
         this._config = config;
         this._app = (0, express_1.default)();
@@ -27,19 +24,19 @@ class WebhookServer {
     }
     attach(endpoint, callback) {
         let authenticator;
-        if (endpoint.authentication.type === LoggerServiceTypes_1.RestAuthType.none) {
+        if (endpoint.authentication.type === LoggerService_1.RestAuthType.none) {
             authenticator = (request, response) => Promise.resolve(true);
         }
-        if (endpoint.authentication.type === LoggerServiceTypes_1.RestAuthType.basic) {
+        if (endpoint.authentication.type === LoggerService_1.RestAuthType.basic) {
             let header = "Basic " + Buffer.from(`${endpoint.authentication.username}:${endpoint.authentication.password}`).toString("base64");
             authenticator = (request, response) => {
                 return Promise.resolve(header === request.headers.authorization);
             };
         }
-        if (endpoint.authentication.type === LoggerServiceTypes_1.RestAuthType.apikey) {
+        if (endpoint.authentication.type === LoggerService_1.RestAuthType.apikey) {
             let auth = endpoint.authentication;
             authenticator = (request, response) => {
-                if (auth.mechanism === LoggerServiceTypes_1.ApiKeyMechanismType.header) {
+                if (auth.mechanism === LoggerService_1.ApiKeyMechanismType.header) {
                     return Promise.resolve(request.headers[auth.key] === auth.value);
                 }
                 console.log("No APIKEY Authentication Handler Implementation for Type: " + auth.mechanism);
@@ -90,7 +87,7 @@ class WebhookServer {
 }
 exports.WebhookServer = WebhookServer;
 class WebhookServerService extends NodeConstructor_1.BaseService {
-    static webhookServers = {};
+    static { this.webhookServers = {}; }
     constructor() {
         super("wehbookserver");
     }

package/build/core/webhook/template/WebhookTemplate.d.ts

@@ -1,5 +1,5 @@
 import { BaseNodeConfig, Template, TemplateDescriptor } from "../../NodeConstructor";
-import { ApiKeyMechanismType, RestAuthType } from "../../logger/service/LoggerServiceTypes";
+import { RestAuthType, ApiKeyMechanismType } from "../../logger/service/LoggerService";
 export interface WebhookTemplateConfig extends BaseNodeConfig {
     webhook: string;
     webhookPath: string;

package/build/core/webhook/template/WebhookTemplate.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"WebhookTemplate.d.ts","sourceRoot":"","sources":["../../../../src/core/webhook/template/WebhookTemplate.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,QAAQ,EAAE,kBAAkB,EAAE,MAAM,uBAAuB,CAAA;AAGpF,OAAO,EAAE,mBAAmB,EAAE,YAAY,EAAE,MAAM,yCAAyC,CAAC;AAE5F,MAAM,WAAW,qBAAsB,SAAQ,cAAc;IACzD,OAAO,EAAC,MAAM,CAAC;IACf,WAAW,EAAC,MAAM,CAAC;IACnB,WAAW,EAAC,YAAY,CAAC;IACzB,0BAA0B,EAAC,MAAM,CAAC;IAClC,0BAA0B,EAAC,MAAM,CAAC;IAClC,4BAA4B,EAAC,mBAAmB,CAAC;IACjD,sBAAsB,EAAC,MAAM,CAAC;IAC9B,wBAAwB,EAAC,MAAM,CAAC;IAEhC,sBAAsB,EAAC,OAAO,CAAC;IAC/B,0BAA0B,EAAC,sBAAsB,EAAE,CAAC;CACvD;AAED,MAAM,MAAM,sBAAsB,GAAG;IACjC,KAAK,EAAC,MAAM,CAAC;IACb,UAAU,EAAC,MAAM,CAAA;CACpB,CAAA;AAED,qBAAa,eAAgB,SAAQ,QAAQ;IAEzC,MAAM,CAAC,qBAAqB,IAAI,kBAAkB;CAMrD"}
+{"version":3,"file":"WebhookTemplate.d.ts","sourceRoot":"","sources":["../../../../src/core/webhook/template/WebhookTemplate.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,QAAQ,EAAE,kBAAkB,EAAE,MAAM,uBAAuB,CAAA;AAGpF,OAAO,EAAE,YAAY,EAAE,mBAAmB,EAAE,MAAM,oCAAoC,CAAC;AAEvF,MAAM,WAAW,qBAAsB,SAAQ,cAAc;IACzD,OAAO,EAAC,MAAM,CAAC;IACf,WAAW,EAAC,MAAM,CAAC;IACnB,WAAW,EAAC,YAAY,CAAC;IACzB,0BAA0B,EAAC,MAAM,CAAC;IAClC,0BAA0B,EAAC,MAAM,CAAC;IAClC,4BAA4B,EAAC,mBAAmB,CAAC;IACjD,sBAAsB,EAAC,MAAM,CAAC;IAC9B,wBAAwB,EAAC,MAAM,CAAC;IAEhC,sBAAsB,EAAC,OAAO,CAAC;IAC/B,0BAA0B,EAAC,sBAAsB,EAAE,CAAC;CACvD;AAED,MAAM,MAAM,sBAAsB,GAAG;IACjC,KAAK,EAAC,MAAM,CAAC;IACb,UAAU,EAAC,MAAM,CAAA;CACpB,CAAA;AAED,qBAAa,eAAgB,SAAQ,QAAQ;IAEzC,MAAM,CAAC,qBAAqB,IAAI,kBAAkB;CAMrD"}

package/build/index.d.ts

@@ -2,10 +2,9 @@ export * from "./core/Utils";
 export * from "./core/NodeGenerator";
 export * from "./core/NodeConstructor";
 export * from "./core/logger/service/LoggerService";
-export * from "./core/logger/template/LoggerTemplate";
 export * from "./core/logger/node/ConsoleLoggerConfigNode";
 export * from "./core/logger/node/RestLoggerConfigNode";
-export * from "./core/logger/node/LokiLoggerConfigNode";
+export * from "./core/logger/template/LoggerTemplate";
 export * from "./core/metrics/service/MetricsService";
 export * from "./core/metrics/template/MetricsTemplate";
 export * from "./core/metrics/template/CounterMetricTemplate";

package/build/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,cAAc,cAAc,CAAC;AAC7B,cAAc,sBAAsB,CAAC;AACrC,cAAc,wBAAwB,CAAC;AAGvC,cAAc,qCAAqC,CAAC;AACpD,cAAc,uCAAuC,CAAC;AACtD,cAAc,4CAA4C,CAAC;AAC3D,cAAc,yCAAyC,CAAC;AACxD,cAAc,yCAAyC,CAAC;AAGxD,cAAc,uCAAuC,CAAC;AACtD,cAAc,yCAAyC,CAAC;AACxD,cAAc,+CAA+C,CAAC;AAC9D,cAAc,6CAA6C,CAAC;AAC5D,cAAc,uCAAuC,CAAC;AACtD,cAAc,6CAA6C,CAAC;AAC5D,cAAc,2CAA2C,CAAC;AAC1D,cAAc,2CAA2C,CAAC;AAC1D,cAAc,6CAA6C,CAAC;AAG5D,cAAc,wCAAwC,CAAC;AACvD,cAAc,yCAAyC,CAAC;AAGxD,cAAc,qCAAqC,CAAC;AACpD,cAAc,yCAAyC,CAAC;AAGxD,cAAc,gDAAgD,CAAC;AAC/D,cAAc,mCAAmC,CAAC;AAClD,cAAc,sCAAsC,CAAC;AACrD,cAAc,qCAAqC,CAAC;AACpD,cAAc,wCAAwC,CAAC;AAGvD,cAAc,yCAAyC,CAAC;AACxD,cAAc,6CAA6C,CAAC;AAC5D,cAAc,6CAA6C,CAAC;AAG5D,cAAc,gDAAgD,CAAC;AAG/D,cAAc,+BAA+B,CAAC;AAC9C,cAAc,iCAAiC,CAAC;AAChD,cAAc,iCAAiC,CAAC;AAChD,cAAc,6BAA6B,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,cAAc,cAAc,CAAC;AAC7B,cAAc,sBAAsB,CAAC;AACrC,cAAc,wBAAwB,CAAC;AAGvC,cAAc,qCAAqC,CAAC;AACpD,cAAc,4CAA4C,CAAC;AAC3D,cAAc,yCAAyC,CAAC;AACxD,cAAc,uCAAuC,CAAC;AAItD,cAAc,uCAAuC,CAAC;AACtD,cAAc,yCAAyC,CAAC;AACxD,cAAc,+CAA+C,CAAC;AAC9D,cAAc,6CAA6C,CAAC;AAC5D,cAAc,uCAAuC,CAAC;AACtD,cAAc,6CAA6C,CAAC;AAC5D,cAAc,2CAA2C,CAAC;AAC1D,cAAc,2CAA2C,CAAC;AAC1D,cAAc,6CAA6C,CAAC;AAG5D,cAAc,wCAAwC,CAAC;AACvD,cAAc,yCAAyC,CAAC;AAGxD,cAAc,qCAAqC,CAAC;AACpD,cAAc,yCAAyC,CAAC;AAGxD,cAAc,gDAAgD,CAAC;AAC/D,cAAc,mCAAmC,CAAC;AAClD,cAAc,sCAAsC,CAAC;AACrD,cAAc,qCAAqC,CAAC;AACpD,cAAc,wCAAwC,CAAC;AAGvD,cAAc,yCAAyC,CAAC;AACxD,cAAc,6CAA6C,CAAC;AAC5D,cAAc,6CAA6C,CAAC;AAG5D,cAAc,gDAAgD,CAAC;AAG/D,cAAc,+BAA+B,CAAC;AAC9C,cAAc,iCAAiC,CAAC;AAChD,cAAc,iCAAiC,CAAC;AAChD,cAAc,6BAA6B,CAAC"}

package/build/index.js

@@ -19,10 +19,9 @@ __exportStar(require("./core/NodeGenerator"), exports);
 __exportStar(require("./core/NodeConstructor"), exports);
 // LOGGER
 __exportStar(require("./core/logger/service/LoggerService"), exports);
-__exportStar(require("./core/logger/template/LoggerTemplate"), exports);
 __exportStar(require("./core/logger/node/ConsoleLoggerConfigNode"), exports);
 __exportStar(require("./core/logger/node/RestLoggerConfigNode"), exports);
-__exportStar(require("./core/logger/node/LokiLoggerConfigNode"), exports);
+__exportStar(require("./core/logger/template/LoggerTemplate"), exports);
 // METRICS
 __exportStar(require("./core/metrics/service/MetricsService"), exports);
 __exportStar(require("./core/metrics/template/MetricsTemplate"), exports);

package/build/resources/editorLanguageExtension.js

@@ -1,7 +1,7 @@
 "use strict";
 if (window.ScriptEditorLanguageManager === undefined) {
     class ScriptEditorLanguageManager {
-        static counter = 0;
+        static { this.counter = 0; }
         static async createLanguage(monaco, template) {
             // generate a language name.
             let langName = "js_variant_" + ScriptEditorLanguageManager.counter;
@@ -327,7 +327,6 @@ if (window.ScriptEditorLanguageManager === undefined) {
         }
     }
     class ScriptEditorLanguage {
-        name;
         constructor(name) {
             this.name = name;
         }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@theotherwillembotha/node-red-plugincore",
-  "version": "0.0.54",
+  "version": "0.0.55",
   "description": "A core framework for building production-grade Node-RED plugins, with built-in support for structured logging, metrics, and webhook ingestion.",
   "author": "Willem Botha (@theotherwillembotha)",
   "license": "ISC",
@@ -40,6 +40,9 @@
     "README.md"
   ],
   "homepage": "https://github.com/theotherwillembotha/nodered_plugincore#readme",
+  "publishConfig": {
+    "access": "public"
+  },
   "engines": {
     "node": ">=18",
     "nodered": ">=4.0.0"
@@ -65,8 +68,7 @@
     "prom-client": "^15.1.3",
     "reflect-metadata": "^0.2.2",
     "whatwg-url": "^16.0.1",
-    "winston": "^3.17.0",
-    "winston-loki": "^6.1.3"
+    "winston": "^3.17.0"
   },
   "node-red": {
     "version": ">=4.0.0",

package/resources/editorLanguageExtension.js

@@ -1,7 +1,7 @@
 "use strict";
 if (window.ScriptEditorLanguageManager === undefined) {
     class ScriptEditorLanguageManager {
-        static counter = 0;
+        static { this.counter = 0; }
         static async createLanguage(monaco, template) {
             // generate a language name.
             let langName = "js_variant_" + ScriptEditorLanguageManager.counter;
@@ -327,7 +327,6 @@ if (window.ScriptEditorLanguageManager === undefined) {
         }
     }
     class ScriptEditorLanguage {
-        name;
         constructor(name) {
             this.name = name;
         }

package/src/GenerateNodes.ts

@@ -1,7 +1,7 @@
 
 import { DelegatedConfigReferenceNode } from "./core/other/node/DelegatedConfigReferenceNode.js";
 import { NodeTypeService } from "./core/tagging/service/NodeTypeService.js";
-import { NodeGenerator, SettingsService, BasicTemplate, SettingsTemplate, TimerMetricTemplate, ConsoleLoggerConfigNode, RestLoggerConfigNode, LokiLoggerConfigNode, UIHelperTemplate, ScriptEditorTemplate } from "./index.js"
+import { NodeGenerator, SettingsService, BasicTemplate, SettingsTemplate, TimerMetricTemplate, ConsoleLoggerConfigNode, RestLoggerConfigNode, UIHelperTemplate, ScriptEditorTemplate } from "./index.js"
 import { WebhookServerConfigNode, WebhookServerService, WebhookTemplate,  } from "./index.js"
 
 import {LoggerService, LoggerTemplate } from "./index.js";
@@ -33,7 +33,7 @@ new NodeGenerator("./src/core/")
     .registerNode(DelegatedConfigReferenceNode)
     .registerNode(ConsoleLoggerConfigNode)
     .registerNode(RestLoggerConfigNode)
-    .registerNode(LokiLoggerConfigNode)
+
     .registerNode(MetricsConfigNode)
     .registerNode(CounterMetricConfigNode)
     .registerNode(GaugeMetricConfigNode)

package/src/core/NodeConstructor.ts

@@ -432,7 +432,7 @@ export class NodeManager{
         }
 
         let nodeConstructor = function(this: any, config: BaseNodeConfig | NodeDef){
-            console.log("constructing node", typeName);
+            //console.log("constructing node", typeName);
 
             try{
                 // instantiate the node.

package/src/core/NodeGenerator.ts

@@ -211,7 +211,7 @@ module.exports = function (RED) {
                 RED.events.on('runtime-event', async (event) => {
                     // startup deployment.
                     if ("runtime-deploy" === event?.id && startupDeployment) {
-                        console.log("STARTUP DEPLOYMENT");
+                        //console.log("STARTUP DEPLOYMENT");
                         startupDeployment = false;
                         const flows = await runtime.flows.getFlows({});
                         await plugin.instance.onDeploy(flows);
@@ -219,7 +219,7 @@ module.exports = function (RED) {
                     
                     // stopping flows on redeployment.
                     if ("runtime-state" === event?.id && event?.payload?.state === "stop" && event?.payload?.deploy) {
-                        console.log("REDEPLOY!");
+                        //console.log("REDEPLOY!");
                         const flows = await runtime.flows.getFlows({});
                         await plugin.instance.onDeploy(flows);
                     }

package/src/core/logger/LoggerDecorator.ts

@@ -1,7 +1,6 @@
 import { BaseNode, NodeManager } from "../NodeConstructor";
-import { Log, LoggerRegistration } from "./service/LoggerService";
-import { LoggerTemplateConfig } from "./template/LoggerTemplate";
-
+import { AbstractLogger, Log, BaseLoggerConfig, DoNothingAppender, LoggerConfigNode, LoggerConfigNodeConfig } from "./service/LoggerService";
+import { LoggerTemplateConfig, LoggerTemplateNodeConfig } from "./template/LoggerTemplate";
 
 export function Logger(debug?:string):Function {
 
@@ -10,41 +9,43 @@ export function Logger(debug?:string):Function {
     // if the type is a string, then its probably defined in the local (core) module.
     if(typeof propertyKey ===  "string"){
       const valueSymbol = Symbol(`_${String(propertyKey)}_value`);
+
+      //console.log("BINDING:", "target", target, "propertyKey", propertyKey );
       
       Object.defineProperty(target, propertyKey, {
         get: function() {
+
+          //console.log("setting logger on node " + this.name() + " (localized)");
           
           if(!this[valueSymbol]){
-              let node = this as BaseNode<LoggerTemplateConfig>;
-              //console.log("setting logger on node " + node.name() + " (localized)");
-              let config = node.config();
-              let logger;
 
-              if(config.logEnabled){
-                let registration:LoggerRegistration = {
+              try{
+                let node = this as BaseNode<LoggerTemplateNodeConfig>;
+                let config = node.config();
+
+                if(!config.logEnabled){
+                  return this[valueSymbol] = DoNothingAppender.get();
+                }
+
+                // get the logger config node.
+                let loggerConfigNode:LoggerConfigNode<LoggerConfigNodeConfig, AbstractLogger<BaseLoggerConfig>> =(NodeManager.RED.nodes.getNode(config.logger) as any).node();
+
+                let loggerTemplateConfig:LoggerTemplateConfig = {
                   id:config.id,
                   flow:node.flow(),
                   type:node.type(),
                   name:node.name(),
-                  enabled:config.logEnabled,
-                  override:config.logTemplateOverrideEnabled,
-                  template:config.logTemplateOverride
+                  level:loggerConfigNode.config().level,
+                  template: (config.logTemplateOverrideEnabled) ? config.logTemplateOverride : loggerConfigNode.config().template,
                 };
-              
+
                 // get a reference to the loggerService.
-                try{
-                  logger = (NodeManager.RED.nodes.getNode(config.logger) as any).node().registerLogger(registration) as Log;
-                }
-                catch(e){
-                  console.log("failed getting logger ", config.logger, e);
-                  logger = { log(){} };
-                }
+                return this[valueSymbol] = loggerConfigNode.registerTemplate(loggerTemplateConfig);
               }
-              else{
-                logger = { log(){} };
+              catch(e){
+                console.log(`failed getting logger "${this?.config()?.logger}"`, e);
+                return this[valueSymbol] = DoNothingAppender.get();
               }
-
-              this[valueSymbol] = logger;
           }
           return this[valueSymbol];
         },
@@ -55,43 +56,45 @@ export function Logger(debug?:string):Function {
     }
     else{
       let property = propertyKey as any;
-      //property.addInitializer(() => {
-      property.addInitializer(function(this:BaseNode<LoggerTemplateConfig>){
-        let node = this as BaseNode<LoggerTemplateConfig>
+
+      property.addInitializer(function(this:BaseNode<LoggerTemplateNodeConfig>){
+        let node = this as BaseNode<LoggerTemplateNodeConfig>
         const valueSymbol = Symbol(`_${String(property.name)}_value`);
+
+        //console.log("ADDING INITIALIZER:", "node", node, "property.name", property.name );
+
         Object.defineProperty(node, property.name, {
           get: function() {
+
+            //console.log("setting logger on node " + node.name()+ " (externalized)");
             
             if(!this[valueSymbol]){
-                //console.log("setting logger on node " + node.name()+ " (externalized)");
+              try{
                 let config = node.config();
-                let logger;
-
-                if(config.logEnabled){
-                  let registration:LoggerRegistration = {
-                    id:config.id,
-                    flow:node.flow(),
-                    type:node.type(),
-                    name:node.name(),
-                    enabled:config.logEnabled,
-                    override:config.logTemplateOverrideEnabled,
-                    template:config.logTemplateOverride
-                  };
-                
-                  // get a reference to the loggerService.
-                  try{
-                    logger = (NodeManager.RED.nodes.getNode(config.logger) as any).node().registerLogger(registration) as Log;
-                  }
-                  catch(e){
-                    console.log("failed getting logger ", config.logger, e);
-                    logger = { log(){} };
-                  }
-                }
-                else{
-                  logger = { log(){} };
+
+                if(!config.logEnabled){
+                  return this[valueSymbol] = DoNothingAppender.get();
                 }
 
-                this[valueSymbol] = logger;
+                // get the logger config node.
+                let loggerConfigNode:LoggerConfigNode<LoggerConfigNodeConfig, AbstractLogger<BaseLoggerConfig>> =(NodeManager.RED.nodes.getNode(config.logger) as any).node();
+
+                let loggerTemplateConfig:LoggerTemplateConfig = {
+                  id:config.id,
+                  flow:node.flow(),
+                  type:node.type(),
+                  name:node.name(),
+                  level: loggerConfigNode?.config().level ?? 'info',
+                  template: (config.logTemplateOverrideEnabled) ? config.logTemplateOverride : (loggerConfigNode?.config().template ?? 'message:{{msg}}'),
+                };
+
+                // get a reference to the loggerService.
+                return this[valueSymbol] = loggerConfigNode.registerTemplate(loggerTemplateConfig);
+              }
+              catch(e){
+                console.log("failed getting logger ", e);
+                return this[valueSymbol] = DoNothingAppender.get();
+              }
             }
             return this[valueSymbol];
           },