@theotherwillembotha/node-red-plugincore 0.0.53 → 0.0.55

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

@@ -3,173 +3,82 @@ 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 {
-    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 {
-    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 {
+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 {
-    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 {
     constructor() {
         super("logger");
@@ -183,21 +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;
-LoggerService.loggers = {};
+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/service/MetricsService.js

@@ -328,6 +328,7 @@ class MetricsContainer {
 }
 exports.MetricsContainer = MetricsContainer;
 class MetricsService extends NodeConstructor_1.BaseService {
+    static { this.metrics = {}; }
     constructor() {
         super("MetricsService");
     }
@@ -365,7 +366,6 @@ class MetricsService extends NodeConstructor_1.BaseService {
     }
 }
 exports.MetricsService = MetricsService;
-MetricsService.metrics = {};
 /*
 Quick explanation of how this is supposed to work:
 

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/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,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.HTTPScheme = exports.ReverseProxyClient = exports.ReverseProxyType = void 0;
+exports.HTTPScheme = exports.ReverseProxyType = void 0;
 class ReverseProxyType {
     constructor(id, name) {
         this._id = id;
@@ -14,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) {
@@ -24,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);
@@ -87,6 +87,7 @@ class WebhookServer {
 }
 exports.WebhookServer = WebhookServer;
 class WebhookServerService extends NodeConstructor_1.BaseService {
+    static { this.webhookServers = {}; }
     constructor() {
         super("wehbookserver");
     }
@@ -143,4 +144,3 @@ class WebhookServerService extends NodeConstructor_1.BaseService {
     }
 }
 exports.WebhookServerService = WebhookServerService;
-WebhookServerService.webhookServers = {};

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@theotherwillembotha/node-red-plugincore",
-  "version": "0.0.53",
+  "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,6 +1,7 @@
 "use strict";
 if (window.ScriptEditorLanguageManager === undefined) {
     class ScriptEditorLanguageManager {
+        static { this.counter = 0; }
         static async createLanguage(monaco, template) {
             // generate a language name.
             let langName = "js_variant_" + ScriptEditorLanguageManager.counter;
@@ -325,7 +326,6 @@ if (window.ScriptEditorLanguageManager === undefined) {
             });
         }
     }
-    ScriptEditorLanguageManager.counter = 0;
     class ScriptEditorLanguage {
         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.
@@ -568,6 +568,7 @@ export type DefaultTemplateType = {
     required:boolean;
     minInstances?:number;
     maxInstances?:number;
+    validate?:Function;
 }
 
 export class NodeBuilder {
@@ -715,6 +716,9 @@ export class NodeBuilder {
             case "string": {
                 return `'${value}'`
             }
+            case "function": {
+                return (value as Function).toString();
+            }
             case "object": {
                 if(Array.isArray(value)){
                     return `[${(value as []).map(t => this.serializeProperty(t)).join(", ")}]`

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);
                     }