@theotherwillembotha/node-red-plugincore 0.0.54 → 0.0.55

package/build/core/logger/node/RestLoggerConfigNode.d.ts

@@ -1,13 +1,14 @@
 import { Node } from "node-red";
-import { ConfigNode, ConfigNodeConfig } from "../../NodeConstructor";
-import { Log, LoggerRegistration } from "../service/LoggerService";
-import { ApiKeyMechanismType, Level, PlatformType, RestAuthType } from "../service/LoggerServiceTypes";
+import { ConfigNodeConfig } from "../../NodeConstructor";
+import { LoggerConfigNode, AbstractLogger, BaseLoggerConfig, Log } from "../service/LoggerService";
+import { ApiKeyMechanismType, Level, RestAuthType } from "../service/LoggerService";
+import { LoggerTemplateConfig } from "../template/LoggerTemplate";
 interface RestLoggerConfigNodeConfig extends ConfigNodeConfig {
     id: string;
-    platform: PlatformType;
     level: Level;
     template: string;
     rest_url: string;
+    rest_ignoresslerror: boolean;
     rest_auth_type: RestAuthType;
     rest_auth_basic_username: string;
     rest_auth_basic_password: string;
@@ -15,10 +16,25 @@ interface RestLoggerConfigNodeConfig extends ConfigNodeConfig {
     rest_auth_apikey_name: string;
     rest_auth_apikey_value: string;
 }
-export declare class RestLoggerConfigNode extends ConfigNode<RestLoggerConfigNodeConfig> {
+export declare class RestLoggerConfigNode extends LoggerConfigNode<RestLoggerConfigNodeConfig, RestLogger> {
     private _logger;
     constructor(node: Node, config: RestLoggerConfigNodeConfig);
-    registerLogger(registration: LoggerRegistration): Log;
+    protected logger(): RestLogger;
+}
+declare class RestLogger extends AbstractLogger<RestLoggerConfig> {
+    private winston;
+    constructor(config: RestLoggerConfig);
+    protected createLogger(config: LoggerTemplateConfig): Log;
+}
+interface RestLoggerConfig extends BaseLoggerConfig {
+    url: string;
+    ignoresslerror: boolean;
+    auth_type: RestAuthType;
+    auth_basic_username: string;
+    auth_basic_password: string;
+    auth_apikey_mechanism: ApiKeyMechanismType;
+    auth_apikey_name: string;
+    auth_apikey_value: string;
 }
 export {};
 //# sourceMappingURL=RestLoggerConfigNode.d.ts.map

package/build/core/logger/node/RestLoggerConfigNode.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"RestLoggerConfigNode.d.ts","sourceRoot":"","sources":["../../../../src/core/logger/node/RestLoggerConfigNode.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,IAAI,EAAE,MAAM,UAAU,CAAC;AAChC,OAAO,EAAE,UAAU,EAAE,gBAAgB,EAAkB,MAAM,uBAAuB,CAAA;AACpF,OAAO,EAAa,GAAG,EAAE,kBAAkB,EAAmC,MAAM,0BAA0B,CAAA;AAE9G,OAAO,EAAE,mBAAmB,EAAE,KAAK,EAAE,YAAY,EAAE,YAAY,EAAE,MAAM,+BAA+B,CAAC;AAGvG,UAAU,0BAA2B,SAAQ,gBAAgB;IAEzD,EAAE,EAAE,MAAM,CAAC;IACX,QAAQ,EAAE,YAAY,CAAC;IACvB,KAAK,EAAC,KAAK,CAAC;IACZ,QAAQ,EAAC,MAAM,CAAC;IAEhB,QAAQ,EAAE,MAAM,CAAC;IACjB,cAAc,EAAE,YAAY,CAAC;IAC7B,wBAAwB,EAAC,MAAM,CAAC;IAChC,wBAAwB,EAAC,MAAM,CAAC;IAChC,0BAA0B,EAAC,mBAAmB,CAAC;IAC/C,qBAAqB,EAAC,MAAM,CAAC;IAC7B,sBAAsB,EAAC,MAAM,CAAC;CACjC;AAED,qBASa,oBAAqB,SAAQ,UAAU,CAAC,0BAA0B,CAAC;IAE5E,OAAO,CAAC,OAAO,CAAkB;gBAErB,IAAI,EAAE,IAAI,EAAE,MAAM,EAAE,0BAA0B;IA0BnD,cAAc,CAAC,YAAY,EAAC,kBAAkB,GAAE,GAAG;CAG7D"}
+{"version":3,"file":"RestLoggerConfigNode.d.ts","sourceRoot":"","sources":["../../../../src/core/logger/node/RestLoggerConfigNode.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,IAAI,EAAE,MAAM,UAAU,CAAC;AAChC,OAAO,EAAC,gBAAgB,EAAE,MAAM,uBAAuB,CAAA;AACvD,OAAO,EAAiB,gBAAgB,EAAE,cAAc,EAAE,gBAAgB,EAAU,GAAG,EAAE,MAAM,0BAA0B,CAAA;AAEzH,OAAO,EAAE,mBAAmB,EAAE,KAAK,EAAE,YAAY,EAAE,MAAM,0BAA0B,CAAC;AAEpF,OAAO,EAAE,oBAAoB,EAAE,MAAM,4BAA4B,CAAC;AAKlE,UAAU,0BAA2B,SAAQ,gBAAgB;IAEzD,EAAE,EAAE,MAAM,CAAC;IACX,KAAK,EAAC,KAAK,CAAC;IACZ,QAAQ,EAAC,MAAM,CAAC;IAEhB,QAAQ,EAAE,MAAM,CAAC;IACjB,mBAAmB,EAAC,OAAO,CAAC;IAC5B,cAAc,EAAE,YAAY,CAAC;IAC7B,wBAAwB,EAAC,MAAM,CAAC;IAChC,wBAAwB,EAAC,MAAM,CAAC;IAChC,0BAA0B,EAAC,mBAAmB,CAAC;IAC/C,qBAAqB,EAAC,MAAM,CAAC;IAC7B,sBAAsB,EAAC,MAAM,CAAC;CACjC;AAED,qBASa,oBAAqB,SAAQ,gBAAgB,CAAC,0BAA0B,EAAE,UAAU,CAAC;IAE9F,OAAO,CAAC,OAAO,CAAc;gBAEjB,IAAI,EAAE,IAAI,EAAE,MAAM,EAAE,0BAA0B;IAyB1D,SAAS,CAAC,MAAM,IAAG,UAAU;CAGhC;AAED,cAAM,UAAW,SAAQ,cAAc,CAAC,gBAAgB,CAAC;IAErD,OAAO,CAAC,OAAO,CAAQ;gBAEX,MAAM,EAAC,gBAAgB;IA8DnC,SAAS,CAAC,YAAY,CAAC,MAAM,EAAE,oBAAoB,GAAG,GAAG;CAG5D;AAoBD,UAAU,gBAAiB,SAAQ,gBAAgB;IAC/C,GAAG,EAAE,MAAM,CAAC;IACZ,cAAc,EAAC,OAAO,CAAC;IACvB,SAAS,EAAE,YAAY,CAAC;IACxB,mBAAmB,EAAC,MAAM,CAAC;IAC3B,mBAAmB,EAAC,MAAM,CAAC;IAC3B,qBAAqB,EAAC,mBAAmB,CAAC;IAC1C,gBAAgB,EAAC,MAAM,CAAC;IACxB,iBAAiB,EAAC,MAAM,CAAC;CAC5B"}

package/build/core/logger/node/RestLoggerConfigNode.js

@@ -10,37 +10,36 @@ var __metadata = (this && this.__metadata) || function (k, v) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.RestLoggerConfigNode = void 0;
-const NodeConstructor_1 = require("../../NodeConstructor");
 const LoggerService_1 = require("../service/LoggerService");
 const NodeGenerator_1 = require("../../NodeGenerator");
-const LoggerServiceTypes_1 = require("../service/LoggerServiceTypes");
+const LoggerService_2 = require("../service/LoggerService");
 const NodeDescriptionDecorator_1 = require("../../tagging/NodeDescriptionDecorator");
-let RestLoggerConfigNode = class RestLoggerConfigNode extends NodeConstructor_1.ConfigNode {
-    _logger;
+const whatwg_url_1 = require("whatwg-url");
+const winston_1 = require("winston");
+let RestLoggerConfigNode = class RestLoggerConfigNode extends LoggerService_1.LoggerConfigNode {
     constructor(node, config) {
         super(node, config);
         let _this = this;
         // instantiate the logger.
-        let loggerConfig;
-        if (config.platform === LoggerServiceTypes_1.PlatformType.rest) {
-            loggerConfig = {
-                id: this.id(),
-                type: LoggerServiceTypes_1.PlatformType.rest,
-                template: config.template,
-                level: config.level,
-                url: config.rest_url,
-                auth_type: config.rest_auth_type,
-                auth_basic_username: config.rest_auth_basic_username,
-                auth_basic_password: config.rest_auth_basic_password,
-                auth_apikey_mechanism: config.rest_auth_apikey_mechanism,
-                auth_apikey_name: config.rest_auth_apikey_name,
-                auth_apikey_value: config.rest_auth_apikey_value,
-            };
-        }
-        this._logger = LoggerService_1.LoggerService.get(loggerConfig);
+        let loggerConfig = {
+            id: this.id(),
+            type: "REST",
+            level: config.level,
+            template: config.template,
+            // additional properties.
+            url: config.rest_url,
+            ignoresslerror: config.rest_ignoresslerror,
+            auth_type: config.rest_auth_type,
+            auth_basic_username: config.rest_auth_basic_username,
+            auth_basic_password: config.rest_auth_basic_password,
+            auth_apikey_mechanism: config.rest_auth_apikey_mechanism,
+            auth_apikey_name: config.rest_auth_apikey_name,
+            auth_apikey_value: config.rest_auth_apikey_value,
+        };
+        this._logger = new RestLogger(loggerConfig);
     }
-    registerLogger(registration) {
-        return this._logger.register(registration);
+    logger() {
+        return this._logger;
     }
 };
 exports.RestLoggerConfigNode = RestLoggerConfigNode;
@@ -56,3 +55,74 @@ exports.RestLoggerConfigNode = RestLoggerConfigNode = __decorate([
     }),
     __metadata("design:paramtypes", [Object, Object])
 ], RestLoggerConfigNode);
+class RestLogger extends LoggerService_1.AbstractLogger {
+    constructor(config) {
+        super(config);
+        // get the url.
+        let hosturl = (0, whatwg_url_1.parseURL)(config.url);
+        if (!hosturl) {
+            throw Error("could not parse url: " + config.url);
+        }
+        // get the options
+        let httpOptions = {};
+        // get the params.
+        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;
+        // add the ignore ssl error flag if need be.
+        if (config.ignoresslerror) {
+            httpOptions.rejectUnauthorized = false;
+        }
+        // configure "none" authentication.
+        if (config.auth_type === LoggerService_2.RestAuthType.none) { }
+        // configure "basic" authentication.
+        if (config.auth_type === LoggerService_2.RestAuthType.basic) {
+            httpParams.auth = {
+                username: config.auth_basic_username,
+                password: config.auth_basic_password
+            };
+        }
+        // configure "apikey" authentication.
+        if (config.auth_type === LoggerService_2.RestAuthType.apikey) {
+            if (config.auth_apikey_mechanism === LoggerService_2.ApiKeyMechanismType.header) {
+                httpParams.headers[config.auth_apikey_name] = config.auth_apikey_value;
+            }
+            if (config.auth_apikey_mechanism === LoggerService_2.ApiKeyMechanismType.matrixparam) {
+                httpParams.path = httpParams.path?.replace(`:${config.auth_apikey_name}`, config.auth_apikey_value);
+            }
+            if (config.auth_apikey_mechanism === LoggerService_2.ApiKeyMechanismType.queryparam) {
+                httpParams.path = httpParams.path + (httpParams.path?.includes("?") ? "&" : "?") + config.auth_apikey_name + "=" + config.auth_apikey_value;
+            }
+        }
+        ;
+        this.winston = (0, winston_1.createLogger)({
+            level: config.level.toString().toLowerCase(),
+            format: winston_1.format.json(),
+            defaultMeta: {},
+            transports: [
+                new winston_1.transports.Http(httpParams),
+            ],
+        });
+    }
+    createLogger(config) {
+        return new RestAppender(config, this.winston);
+    }
+}
+class RestAppender extends LoggerService_1.Log {
+    constructor(config, winston) {
+        super(config);
+        this.winston = winston;
+    }
+    writeToLog(level, message, tags) {
+        this.winston.log({
+            level: level,
+            message: message,
+            labels: tags
+        });
+    }
+}

package/build/core/logger/service/LoggerService.d.ts

@@ -1,88 +1,79 @@
-import { BaseService, ServiceDescriptor } from "../../NodeConstructor";
-import { NodeAPI, NodeAPISettingsWithData } from "node-red";
-import { ApiKeyMechanismType, Level, PlatformType, RestAuthType } from "./LoggerServiceTypes";
-type TagMap = {
-    instance: string;
-    flow: string;
+import { BaseService, ServiceDescriptor, ConfigNodeConfig, ConfigNode } from "../../NodeConstructor";
+import { NodeAPI, NodeAPISettingsWithData, Node } from "node-red";
+import { LoggerTemplateConfig } from "../template/LoggerTemplate";
+export declare enum Level {
+    DEBUG = "DEBUG",
+    INFO = "INFO",
+    WARNING = "WARNING",
+    ERROR = "ERROR"
+}
+export declare enum RestAuthType {
+    none = "none",
+    basic = "basic",
+    apikey = "apikey"
+}
+export declare enum ApiKeyMechanismType {
+    header = "header",
+    queryparam = "queryparam",
+    matrixparam = "matrixparam"
+}
+export type TagMap = {
+    id: string;
     node: string;
     type: string;
-    id: string;
-};
-export type Log = {
-    log(message: {
-        [key: string]: any;
-    } | string): void;
+    flow: string;
+    instance: string;
 };
-export declare class LogImplementation implements Log {
-    private root;
-    private config;
-    private template?;
-    private tagMap;
-    constructor(root: NewLogger<any>, config: LoggerRegistration);
-    log(message: {
+export declare abstract class Log {
+    private _config;
+    private template;
+    private tags;
+    protected constructor(config: LoggerTemplateConfig);
+    protected config(): LoggerTemplateConfig;
+    log(payload: {
         [key: string]: any;
     } | string): void;
-    serialize(content: {
-        [key: string]: any;
-    }): string;
-    getTags(): TagMap;
+    protected abstract writeToLog(level: string, message: string, tags: {
+        [key: string]: string | boolean | number;
+    }): void;
 }
-export interface BaseLoggerConfig {
+export type BaseLoggerConfig = {
     id: string;
-    type: PlatformType;
+    type: string;
     level: Level;
     template: string;
-}
-export declare abstract class NewLogger<ConfigType extends BaseLoggerConfig> {
+};
+export declare abstract class AbstractLogger<BaseLoggerConfig> {
     private _config;
-    private template;
-    constructor(config: ConfigType);
-    log(reference: LogImplementation, content: {
-        [key: string]: any;
-    }): void;
-    register(registration: LoggerRegistration): Log;
-    serialize(content: any): string;
-    config(): ConfigType;
-    protected abstract writeToLog(serializedContent: string, tags: TagMap): void;
-}
-export interface ConsoleLoggerConfig extends BaseLoggerConfig {
-}
-export interface LokiLoggerConfig extends BaseLoggerConfig {
-    type: PlatformType.loki;
-    host: string;
-    userid?: string;
-    authtoken?: string;
-    tenantid?: string;
-}
-export interface RestLoggerConfig extends BaseLoggerConfig {
-    type: PlatformType.rest;
-    url: string;
-    ignoresslerror: boolean;
-    auth_type: RestAuthType;
-    auth_basic_username: string;
-    auth_basic_password: string;
-    auth_apikey_mechanism: ApiKeyMechanismType;
-    auth_apikey_name: string;
-    auth_apikey_value: string;
+    private _appenders;
+    constructor(config: BaseLoggerConfig);
+    config(): BaseLoggerConfig;
+    registerTemplate(config: LoggerTemplateConfig): Log;
+    protected abstract createLogger(config: LoggerTemplateConfig): Log;
 }
 export declare class LoggerService extends BaseService {
     static instanceID: string;
-    private static loggers;
     private red;
     constructor();
     init(red: NodeAPI<NodeAPISettingsWithData>): void | Promise<void>;
     deinit(red: NodeAPI<NodeAPISettingsWithData>): void | Promise<void>;
-    static get<ConfigType extends BaseLoggerConfig>(config: ConfigType): NewLogger<ConfigType>;
     static getServiceDescriptor(): ServiceDescriptor;
 }
-export type LoggerRegistration = {
-    id: string;
-    flow: string;
-    type: string;
-    name: string;
-    enabled: boolean;
-    template?: string;
-    override?: boolean;
-};
-export {};
+export type LoggerConfigNodeConfig = ConfigNodeConfig & BaseLoggerConfig & {};
+export declare abstract class LoggerConfigNode<CNC extends LoggerConfigNodeConfig, LoggerType extends AbstractLogger<BaseLoggerConfig>> extends ConfigNode<CNC> {
+    protected constructor(node: Node, config: CNC);
+    protected abstract logger(): LoggerType;
+    registerTemplate(config: LoggerTemplateConfig): Log;
+}
+export declare class DoNothingAppender extends Log {
+    private static instance;
+    static get(): any;
+    private constructor();
+    log(payload: {
+        [key: string]: any;
+    } | string): void;
+    protected writeToLog(level: string, message: string, tags: {
+        [key: string]: string | boolean | number;
+    }): void;
+}
 //# sourceMappingURL=LoggerService.d.ts.map

package/build/core/logger/service/LoggerService.d.ts.map

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

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