@theotherwillembotha/node-red-plugincore 0.0.54 → 0.1.0

package/build/core/logger/service/LoggerService.js

@@ -3,185 +3,83 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.LoggerService = exports.NewLogger = exports.LogImplementation = void 0;
+exports.DoNothingAppender = exports.LoggerConfigNode = exports.LoggerService = exports.AbstractLogger = exports.Log = exports.ApiKeyMechanismType = exports.RestAuthType = exports.Level = void 0;
 const NodeConstructor_1 = require("../../NodeConstructor");
 const handlebars_1 = __importDefault(require("handlebars"));
-const winston_1 = require("winston");
-const winston_loki_1 = __importDefault(require("winston-loki"));
-const whatwg_url_1 = require("whatwg-url");
 const LoggerTemplate_1 = require("../template/LoggerTemplate");
 var network = require('network');
-const deep_equal_1 = __importDefault(require("deep-equal"));
-const LoggerServiceTypes_1 = require("./LoggerServiceTypes");
 // helper for serializing json objects inside handlebars tags.
 // you can then convert it like this: {{{json myobject}}}
 handlebars_1.default.registerHelper('json', function (context) {
     return JSON.stringify(context);
 });
-class LogImplementation {
-    root;
-    config;
-    template;
-    tagMap;
-    constructor(root, config) {
-        this.root = root;
-        this.config = config;
-        this.template = (config.override && config.template) ? handlebars_1.default.compile(config.template) : undefined;
-        this.tagMap = {
-            instance: LoggerService.instanceID,
-            flow: config.flow,
+var Level;
+(function (Level) {
+    Level["DEBUG"] = "DEBUG";
+    Level["INFO"] = "INFO";
+    Level["WARNING"] = "WARNING";
+    Level["ERROR"] = "ERROR";
+})(Level || (exports.Level = Level = {}));
+var RestAuthType;
+(function (RestAuthType) {
+    RestAuthType["none"] = "none";
+    RestAuthType["basic"] = "basic";
+    RestAuthType["apikey"] = "apikey";
+})(RestAuthType || (exports.RestAuthType = RestAuthType = {}));
+var ApiKeyMechanismType;
+(function (ApiKeyMechanismType) {
+    ApiKeyMechanismType["header"] = "header";
+    ApiKeyMechanismType["queryparam"] = "queryparam";
+    ApiKeyMechanismType["matrixparam"] = "matrixparam";
+})(ApiKeyMechanismType || (exports.ApiKeyMechanismType = ApiKeyMechanismType = {}));
+class Log {
+    constructor(config) {
+        this._config = config;
+        this.template = handlebars_1.default.compile(config.template);
+        this.tags = {
+            id: config.id,
             node: config.name,
             type: config.type,
-            id: config.id,
-        };
-    }
-    log(message) {
-        // enrich the logged content with additional properties.
-        let content = {
-            currentTime: new Date().toISOString(),
-            msg: message,
+            flow: config.flow,
+            instance: LoggerService.instanceID
         };
-        // send typ the logger.
-        this.root.log(this, content);
-    }
-    serialize(content) {
-        return !!this.template ? this.template(content) : this.root.serialize(content);
     }
-    getTags() {
-        return this.tagMap;
-    }
-}
-exports.LogImplementation = LogImplementation;
-class NewLogger {
-    _config;
-    template;
-    constructor(config) {
-        this._config = config;
-        this.template = handlebars_1.default.compile(config.template);
+    config() {
+        return this._config;
     }
-    log(reference, content) {
+    log(payload) {
         try {
-            // step 1, attempt to serialize the content.
-            let serializedContent = reference.serialize(content);
-            // step 2, get the tags.
-            let tags = reference.getTags();
-            // step 3. write to the logger.
-            this.writeToLog(serializedContent, tags);
+            // step 1. serialize the payload using the template engine.
+            let message = (payload instanceof String) ? payload : this.template({ msg: payload });
+            // step 2. write to the log appender.
+            this.writeToLog(this.config().level, message, this.tags);
         }
-        catch (exception) {
-            console.log(exception.message);
+        catch (e) {
+            console.log(e);
         }
     }
-    register(registration) {
-        return new LogImplementation(this, registration);
-    }
-    serialize(content) {
-        return this.template(content);
-    }
-    config() {
-        return this._config;
-    }
-}
-exports.NewLogger = NewLogger;
-class ConsoleLogger extends NewLogger {
-    constructor(config) {
-        super(config);
-    }
-    writeToLog(serializedContent, tags) {
-        console.log(tags, serializedContent);
-    }
 }
-class LokiLogger extends NewLogger {
-    logger;
+exports.Log = Log;
+class AbstractLogger {
     constructor(config) {
-        super(config);
-        let transportConfig = {
-            host: config.host,
-            json: true,
-            format: winston_1.format.json(),
-            headers: {
-                "X-Scope-OrgID": (config.tenantid) ? config.tenantid : undefined
-            },
-            replaceTimestamp: true,
-            onConnectionError: (err) => console.error(err),
-            basicAuth: (config.userid && config.authtoken)
-                ? `${config.userid}:${config.authtoken}`
-                : undefined
-        };
-        this.logger = (0, winston_1.createLogger)({
-            level: this.config().level.toString().toLowerCase(),
-            format: winston_1.format.json(),
-            defaultMeta: {},
-            transports: [
-                new winston_loki_1.default(transportConfig),
-            ],
-        });
+        this._appenders = {};
+        this._config = config;
     }
-    writeToLog(serializedContent, tags) {
-        this.logger.log({ message: serializedContent, level: this.logger.level, labels: tags });
+    config() {
+        return this._config;
     }
-}
-class RestLogger extends NewLogger {
-    logger;
-    constructor(config) {
-        super(config);
-        let hosturl = (0, whatwg_url_1.parseURL)(config.url);
-        if (!hosturl) {
-            throw Error("could not parse url: " + config.url);
+    registerTemplate(config) {
+        let appender = this._appenders[config.id];
+        if (appender) {
+            return appender;
         }
-        let httpOptions = {};
-        let httpParams = {
-            host: hosturl.host?.toString(),
-            path: "/" + (hosturl.path ? [...hosturl.path].join("/") : "") + (hosturl.query ? ("?" + hosturl.query) : ""),
-            port: (hosturl.port) ? hosturl.port : undefined,
-            ssl: hosturl.scheme.toLowerCase() === "https",
-            headers: {},
-        };
-        httpParams.options = httpOptions;
-        if (config.ignoresslerror) {
-            httpOptions.rejectUnauthorized = false;
-        }
-        if (config.auth_type === LoggerServiceTypes_1.RestAuthType.none) { }
-        if (config.auth_type === LoggerServiceTypes_1.RestAuthType.basic) {
-            httpParams.auth = {
-                username: config.auth_basic_username,
-                password: config.auth_basic_password
-            };
-        }
-        if (config.auth_type === LoggerServiceTypes_1.RestAuthType.apikey) {
-            if (config.auth_apikey_mechanism === LoggerServiceTypes_1.ApiKeyMechanismType.header) {
-                httpParams.headers[config.auth_apikey_name] = config.auth_apikey_value;
-            }
-            if (config.auth_apikey_mechanism === LoggerServiceTypes_1.ApiKeyMechanismType.matrixparam) {
-                httpParams.path = httpParams.path?.replace(`:${config.auth_apikey_name}`, config.auth_apikey_value);
-            }
-            if (config.auth_apikey_mechanism === LoggerServiceTypes_1.ApiKeyMechanismType.queryparam) {
-                httpParams.path = httpParams.path + (httpParams.path?.includes("?") ? "&" : "?") + config.auth_apikey_name + "=" + config.auth_apikey_value;
-            }
-        }
-        ;
-        this.logger = (0, winston_1.createLogger)({
-            level: config.level.toString().toLowerCase(),
-            format: winston_1.format.json(),
-            defaultMeta: {},
-            transports: [
-                new winston_1.transports.Http(httpParams),
-            ],
-        });
-    }
-    writeToLog(serializedContent, tags) {
-        this.logger.log({ level: this.logger.level, message: serializedContent, labels: tags });
+        let _this = this;
+        this._appenders[config.id] = appender = this.createLogger(config);
+        return appender;
     }
 }
-let LoggerTypes = {
-    console: ConsoleLogger,
-    loki: LokiLogger,
-    rest: RestLogger
-};
+exports.AbstractLogger = AbstractLogger;
 class LoggerService extends NodeConstructor_1.BaseService {
-    static instanceID;
-    static loggers = {};
-    red;
     constructor() {
         super("logger");
     }
@@ -194,20 +92,33 @@ class LoggerService extends NodeConstructor_1.BaseService {
         });
     }
     deinit(red) { }
-    static get(config) {
-        let logger = this.loggers[config.id];
-        if (logger) {
-            if (!(0, deep_equal_1.default)(config, logger.config())) {
-                this.loggers[config.id] = (logger = new (LoggerTypes[config.type])(config));
-            }
-        }
-        else {
-            this.loggers[config.id] = (logger = new (LoggerTypes[config.type])(config));
-        }
-        return logger;
-    }
     static getServiceDescriptor() {
         return new NodeConstructor_1.ServiceDescriptor("@theotherwillembotha/loggerservice", "LoggerService", "services-plugin", "@theotherwillembotha/node-red-plugincore", LoggerService, [LoggerTemplate_1.LoggerTemplate]);
     }
 }
 exports.LoggerService = LoggerService;
+class LoggerConfigNode extends NodeConstructor_1.ConfigNode {
+    constructor(node, config) {
+        super(node, config);
+    }
+    registerTemplate(config) {
+        return this.logger().registerTemplate(config);
+    }
+}
+exports.LoggerConfigNode = LoggerConfigNode;
+class DoNothingAppender extends Log {
+    static { this.instance = new DoNothingAppender(); }
+    static get() {
+        return DoNothingAppender.instance;
+    }
+    constructor() {
+        super({ flow: "", id: "", level: "", name: "", template: "", type: "" });
+    }
+    log(payload) {
+        // do nothing.
+    }
+    writeToLog(level, message, tags) {
+        // do nothing.
+    }
+}
+exports.DoNothingAppender = DoNothingAppender;

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

@@ -1,10 +1,18 @@
 import { BaseNodeConfig, Template, TemplateDescriptor } from "../../NodeConstructor";
-export interface LoggerTemplateConfig extends BaseNodeConfig {
+export interface LoggerTemplateNodeConfig extends BaseNodeConfig {
     logEnabled: boolean;
     logger: string;
     logTemplateOverrideEnabled: boolean;
     logTemplateOverride: string;
 }
+export type LoggerTemplateConfig = {
+    id: string;
+    flow: string;
+    type: string;
+    name: string;
+    template: string;
+    level: string;
+};
 export declare class LoggerTemplate extends Template {
     static getTemplateDescriptor(): TemplateDescriptor;
 }

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":"AAqBA,QAAA,MAAM,OAAO,KAoFD,CAAC;AAGb,OAAO,EACH,OAAO,EACV,CAAA"}

package/build/core/webhook/WebhookDecorator.js

@@ -1,17 +1,24 @@
 "use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Webhook = void 0;
-const LoggerServiceTypes_1 = require("../logger/service/LoggerServiceTypes");
+const os_1 = __importDefault(require("os"));
+const LoggerService_1 = require("../logger/service/LoggerService");
 const NodeConstructor_1 = require("../NodeConstructor");
+const ReverseProxyTypeService_1 = require("./service/ReverseProxyTypeService");
+// In-memory registry: nodeId → managed proxy host entries from the last deploy.
+const managedProxyHosts = new Map();
 const Webhook = (0, NodeConstructor_1.createPostConstructDecorator)('Webhook')
     .withInitLogic(async (instance, propertyKey, webhookconfig) => {
     //console.log(`Registering webhook callback`,  "PROPERTYKEY", propertyKey, "WEBHOOK CONFIG", webhookconfig, "THIS", this);
     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,
@@ -21,20 +28,50 @@ const Webhook = (0, NodeConstructor_1.createPostConstructDecorator)('Webhook')
     let webhookServer = NodeConstructor_1.NodeManager.RED.nodes.getNode(nodeConfig.webhook).node().server();
     webhookServer.attach(endpointConfig, (request, respponse) => instance[propertyKey](request, respponse));
     if (nodeConfig.reverseProxies_enabled) {
+        let targetPort = webhookServer.config().port;
+        let targetHost = os_1.default.hostname();
+        let nodeId = nodeConfig.id;
+        let newlyManaged = [];
         await Promise.all(nodeConfig.reverseProxies_connections.map(async (proxy) => {
             try {
-                // get a n instance of reverseProxNode.
-                let reverseProxyNode = NodeConstructor_1.NodeManager.RED.nodes.getNode(proxy.proxy).node();
                 // TODO: ReverseProxyConfigNodes need to become their own subtype of config nodes so we can enforce the ".client()" method.
+                let reverseProxyNode = NodeConstructor_1.NodeManager.RED.nodes.getNode(proxy.proxy).node();
+                let proxyClient = reverseProxyNode.client();
+                let hosts = await proxyClient.getHosts();
+                let matchingHost = hosts.find(h => h.domainNames?.includes(proxy.domainname));
+                if (!matchingHost) {
+                    await proxyClient.updateHost({ domainNames: [proxy.domainname], forwardHost: targetHost, forwardPort: targetPort, scheme: ReverseProxyTypeService_1.HTTPScheme.HTTP });
+                    // Fetch again to get the assigned ID of the newly created entry.
+                    let updatedHosts = await proxyClient.getHosts();
+                    matchingHost = updatedHosts.find(h => h.domainNames?.includes(proxy.domainname));
+                }
+                else if (matchingHost.forwardHost !== targetHost || matchingHost.forwardPort !== targetPort) {
+                    await proxyClient.updateHost({ id: matchingHost.id, forwardHost: targetHost, forwardPort: targetPort, scheme: ReverseProxyTypeService_1.HTTPScheme.HTTP });
+                }
+                if (matchingHost?.id !== undefined) {
+                    newlyManaged.push({ proxyNodeId: proxy.proxy, hostId: matchingHost.id });
+                }
+            }
+            catch (e) {
+                console.error(e);
+            }
+        }));
+        // Remove any stale proxy host entries that were managed last deploy but are no longer in the current config.
+        let previouslyManaged = managedProxyHosts.get(nodeId) ?? [];
+        let newHostIds = new Set(newlyManaged.map(m => m.hostId));
+        await Promise.all(previouslyManaged
+            .filter(m => !newHostIds.has(m.hostId))
+            .map(async (stale) => {
+            try {
+                let reverseProxyNode = NodeConstructor_1.NodeManager.RED.nodes.getNode(stale.proxyNodeId).node();
                 let proxyClient = reverseProxyNode.client();
-                console.log("List of known hosts: ", await proxyClient.getHosts());
-                //console.log("ADD REVERSE PROXY:" + proxy.proxy + " to " + node.id(), proxyClient);
+                await proxyClient.deleteHost(stale.hostId);
             }
             catch (e) {
-                console.log(e);
+                console.error(e);
             }
-            return Promise.resolve();
         }));
+        managedProxyHosts.set(nodeId, newlyManaged);
     }
     // register a close listener to the node.
     node.node().on("close", () => {

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

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

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;IACzC,UAAU,CAAC,EAAE,EAAE,MAAM,GAAE,OAAO,CAAC,IAAI,CAAC,CAAC;CACxC;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;IA8CpF,MAAM,CAAC,aAAa,EAAC,cAAc;IAoBnC,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;WAuCvD,GAAG,CAAE,MAAM,EAAC,mBAAmB,GAAG,aAAa;WAS7C,oBAAoB,IAAG,iBAAiB;CAU3D"}