@theotherwillembotha/node-red-plugincore 0.0.53 → 0.0.55

package/README.md

@@ -16,7 +16,11 @@ This framework is the foundation for a growing set of Node-RED plugins. The foll
 | Plugin | Description |
 |--------|-------------|
 | [@theotherwillembotha/node-red-telemetry](https://github.com/theotherwillembotha/nodered_telemetry) | Ready-to-use flow nodes for structured logging and Prometheus metrics — Logger, Counter, Gauge, and Timer nodes that attach to the config nodes provided by this package. |
+| [@theotherwillembotha/node-red-loki](https://github.com/theotherwillembotha/nodered_loki) | Grafana Loki logger config node. Extends the logging infrastructure provided by this package with a Loki transport, enabling log delivery directly to a Loki instance from any node built with the `@Logger` decorator. |
 | [@theotherwillembotha/node-red-nginxproxymanager](https://github.com/theotherwillembotha/nodered_nginxproxymanager) | Node-RED nodes for managing Nginx Proxy Manager hosts directly from your flows. Includes a config node that registers as a reverse proxy provider, an Update Host node for creating and updating proxy entries, and a Get Hosts node for retrieving the current host list. |
+| [@theotherwillembotha/node-red-circuitbreaker](https://github.com/theotherwillembotha/nodered_circuitbreaker) | Circuit Breaker nodes for building resilient flows. Detects faults in external integrations using configurable fault and trip functions, routes messages based on breaker state, and supports event-driven recovery flows. |
+| [@theotherwillembotha/node-red-temporal](https://github.com/theotherwillembotha/nodered_temporal) | Date/time transformation nodes powered by the TC39 Temporal API. Parse, convert, adjust, and format date/time values across timezones using named presets or Moment.js-style custom format strings. |
+| [@theotherwillembotha/node-red-zookeeper](https://github.com/theotherwillembotha/nodered_zookeeper) | Apache ZooKeeper integration nodes. Subscribe to ZooKeeper node change events, read node values on demand, and write data to ZooKeeper nodes from your flows. |
 
 Additional plugins will be listed here as they are published.
 
@@ -40,7 +44,7 @@ Config nodes are shared resources configured once and referenced across your flo
 
 #### Logging
 
-Three logger backends are supported. All expose the same interface and are interchangeable — any node built with the `@Logger` decorator can use any of them.
+Two logger backends are built in. Additional backends are available as separate plugins (see the [plugin ecosystem](#plugin-ecosystem) table above). All expose the same interface and are interchangeable — any node built with the `@Logger` decorator can use any of them.
 
 **Console Logger** — writes structured log output to stdout via Winston. Ideal for development and containerised deployments that forward stdout to a log aggregator.
 
@@ -50,11 +54,7 @@ Three logger backends are supported. All expose the same interface and are inter
 
 ![REST Logger Config](documentation/RestLoggerConfigNode.png)
 
-**Loki Logger** — pushes log entries to a Grafana Loki instance via the Loki HTTP API. Supports multi-tenant deployments via the Tenant ID field.
-
-![Loki Logger Config](documentation/LokiLoggerConfigNode.png)
-
-All three loggers share a **Level** selector (debug, info, warn, error) and a **Template** field — a Handlebars template that controls the shape of each log entry. The default `message:{{msg}}` passes the raw message through; you can customise it to include only the fields you care about.
+All loggers share a **Level** selector (debug, info, warn, error) and a **Template** field — a Handlebars template that controls the shape of each log entry. The default `message:{{msg}}` passes the raw message through; you can customise it to include only the fields you care about.
 
 #### Metrics
 
@@ -318,6 +318,61 @@ The `template` string provides the TypeScript context that the Monaco language s
 
 ---
 
+### Node HTML file — template sections
+
+Each node's `.html` file is divided into named sections using the `template-section` attribute. The build pipeline reads these sections and assembles them into the correct slots in the generated Node-RED registration call. Sections from multiple templates (e.g. `LoggerTemplate`, `MetricsTemplate`) are merged automatically in the order they were registered.
+
+```html
+<script type="text/javascript" template-section="onCompose"> ... </script>
+<div template-section="onIncludeOnce"> ... </div>
+<script type="text/javascript" template-section="onIncludeEditPrepare"> ... </script>
+<script type="text/html" template-section="onIncludeEditForm"> ... </script>
+<script type="text/javascript" template-section="onIncludeEditSave"> ... </script>
+<script type="text/javascript" template-section="onIncludeEditCancel"> ... </script>
+<script type="text/javascript" template-section="onIncludeEditDelete"> ... </script>
+<script type="text/markdown" template-section="onIncludeDocumentation"> ... </script>
+```
+
+#### Section reference
+
+| Section | When it runs | Typical use |
+|---------|-------------|-------------|
+| `onCompose` | At **build time**, inside a `NodeBuilder` context | Call `node.addDefault(...)`, `node.setLabel(...)`, `node.setColor(...)`, `node.setIcon(...)`, `node.addOutputs(...)`, etc. to configure the node definition that will be written into the generated `Nodes.js`. This section is **not** shipped to the browser. |
+| `onIncludeOnce` | Injected into the browser **once** per page load | Global styles (`<style>`), shared helper functions, and cached resource fetches (e.g. timezone or format lists). Everything here is shared across all node instances of this type. Wrap scripts in `<script>` tags inside a `<div>`. |
+| `onIncludeEditPrepare` | Runs when the **node editor dialog opens** (Node-RED `oneditprepare`) | Initialise `typedInput` widgets, bind event listeners, fetch async data, restore saved state. `this` refers to the node being edited — assign it to a local variable (e.g. `let node = this`) before any async code. |
+| `onIncludeEditForm` | The **HTML form** rendered inside the editor dialog | `<div class="form-row">` blocks containing `<label>` and `<input>` elements. Use `id="node-input-<fieldName>"` for regular nodes or `id="node-config-input-<fieldName>"` for config nodes. Include hidden `<input type="hidden">` fields for `typedInput` type tracking. |
+| `onIncludeEditSave` | Runs when the user clicks **Done** (Node-RED `oneditsave`) | Read widget values back into the node object before it is serialised. Most `typedInput` widgets save automatically via the `node-input-*` naming convention; use this section for anything that does not. |
+| `onIncludeEditCancel` | Runs when the user clicks **Cancel** (Node-RED `oneditcancel`) | Clean up resources that were created in `onIncludeEditPrepare` — e.g. call `.dispose()` on Monaco editor instances to avoid memory leaks. |
+| `onIncludeEditDelete` | Runs when the node is **deleted** from the canvas | Release any persistent resources tied to this node instance. Rarely needed for most nodes. |
+| `onIncludeDocumentation` | Rendered in the Node-RED **help panel** (sidebar Info tab) | Markdown content describing the node's behaviour, fields, and examples. Supports standard GitHub-flavoured markdown including tables, code blocks, and blockquotes. |
+
+#### `onCompose` — NodeBuilder API
+
+The `onCompose` script runs at build time with `node` bound to a `NodeBuilder` instance. The following methods are available:
+
+| Method | Description |
+|--------|-------------|
+| `node.addDefault(name, options)` | Register a config field. `options`: `{ value, required, validate? }`. The optional `validate` function is serialised as-is into the generated `defaults` block and runs in the browser editor. |
+| `node.setLabel(fn)` | Set a function that returns the node's palette label at runtime. |
+| `node.setPaletteLabel(label)` | Set the fixed palette label. |
+| `node.setColor(color)` | Set the node's palette colour (hex string). |
+| `node.setIcon(icon)` | Set the node's palette icon filename (relative to the plugin's `icons/` directory). |
+| `node.setLabelStyle(style)` | Set the CSS class for the palette label (e.g. `node_label_white`). |
+| `node.setInput(label)` | Add an input port with the given label. |
+| `node.addOutputs(labels)` | Add one or more output ports. Pass a string array for multiple labelled outputs. |
+
+#### Data flow through the edit lifecycle
+
+```
+oneditprepare  →  [user edits]  →  oneditsave   (Done clicked)
+                                →  oneditcancel  (Cancel clicked)
+                                →  oneditdelete  (node deleted)
+```
+
+Values flow through `node-input-<field>` (or `node-config-input-<field>`) named inputs. Node-RED automatically saves and restores these between sessions. Fields not following this convention must be manually read in `onIncludeEditSave` and written in `onIncludeEditPrepare`.
+
+---
+
 ### Registering nodes for generation
 
 Create a `GenerateNodes.ts` at the root of your `src/` directory. This is the composition root — register every service, template, and node, then call `.generate()` to emit the two Node-RED entry files (`Nodes.js` and `Plugins.js`).
@@ -326,7 +381,7 @@ Create a `GenerateNodes.ts` at the root of your `src/` directory. This is the co
 import { NodeGenerator } from "@theotherwillembotha/node-red-plugincore";
 import {
     LoggerService, LoggerTemplate,
-    ConsoleLoggerConfigNode, RestLoggerConfigNode, LokiLoggerConfigNode
+    ConsoleLoggerConfigNode, RestLoggerConfigNode
 } from "@theotherwillembotha/node-red-plugincore";
 import { MyNode } from "./nodes/MyNode";
 
@@ -335,7 +390,6 @@ new NodeGenerator("./src/")
     .registerTemplate(LoggerTemplate)
     .registerNode(ConsoleLoggerConfigNode)
     .registerNode(RestLoggerConfigNode)
-    .registerNode(LokiLoggerConfigNode)
     .registerNode(MyNode)
     .generate("./build/Nodes", "./build/Plugins");
 

package/build/GenerateNodes.js

@@ -29,7 +29,6 @@ new index_js_1.NodeGenerator("./src/core/")
     .registerNode(DelegatedConfigReferenceNode_js_1.DelegatedConfigReferenceNode)
     .registerNode(index_js_1.ConsoleLoggerConfigNode)
     .registerNode(index_js_1.RestLoggerConfigNode)
-    .registerNode(index_js_1.LokiLoggerConfigNode)
     .registerNode(index_js_5.MetricsConfigNode)
     .registerNode(index_js_5.CounterMetricConfigNode)
     .registerNode(index_js_5.GaugeMetricConfigNode)

package/build/Nodes.html

@@ -366,147 +366,6 @@ Mustache/Handlebars templates build the message string POSTed to the endpoint.
 - [Mustache — Wikipedia](https://en.wikipedia.org/wiki/Mustache_(template_system))
 - [Mustache — Playground](https://jgonggrijp.gitlab.io/wontache/playground.html)
 </script>
-<script type="text/javascript">
-    RED.nodes.registerType('LokiLoggerConfigNode', {
-      category: 'config',
-      label: function() {
-        return this.name
-      },
-      paletteLabel: 'Loki Logger Config Node',
-      defaults: {
-        name: {
-          value: 'Logger Example',
-          required: true
-        },
-        template: {
-          value: 'message:{{msg}}',
-          required: true
-        },
-        level: {
-          value: 'info',
-          required: true
-        },
-        loki_host: {},
-        loki_tenantid: {},
-        loki_userid: {},
-        loki_authtoken: {},
-      },
-      oneditprepare: function() {
-        // **** LokiLoggerConfigNode **** //
-        {
-          let node = this;
-          let levelSelection = $("#node-config-input-level");
-          levelSelection.typedInput({
-            type: "level",
-            types: [{
-              value: "level",
-              options: [{
-                value: "DEBUG",
-                label: "debug"
-              }, {
-                value: "INFO",
-                label: "info"
-              }, {
-                value: "WARNING",
-                label: "warning"
-              }, {
-                value: "ERROR",
-                label: "error"
-              }, ]
-            }]
-          });
-          this.editor = RED.editor.createEditor({
-            id: 'node-config-input-templateEditor',
-            mode: 'ace/mode/handlebars',
-            value: this.template
-          });
-        }
-      },
-      oneditsave: function() {
-        // **** LokiLoggerConfigNode **** //
-        {
-          let node = this;
-          this.template = this.editor.getValue();
-          this.editor.destroy();
-          delete this.editor;
-        }
-      },
-      oneditcancel: function() {},
-      oneditdelete: function() {},
-    });
-
-</script>
-
-
-<script type="text/html" data-template-name='LokiLoggerConfigNode'>
-    <div id='section_LokiLoggerConfigNode'>
-        <div id="LoggerConfig">
-            <div class="form-row">
-                <label class="towb_editorlabel" for="node-config-input-name"><i class="fa fa-font"></i> Name</label>
-                <input type="text" id="node-config-input-name" />
-            </div>
-
-            <div class="form-row">
-                <label class="towb_editorlabel" for="node-config-input-level"><i class="fa fa-signal"></i> Level</label>
-                <input type="text" id="node-config-input-level" />
-            </div>
-
-            <div class="form-row">
-                <label class="towb_editorlabel" for="node-config-input-loki_host"><i class="fa fa-server"></i> Host</label>
-                <input class="required" type="text" id="node-config-input-loki_host" />
-            </div>
-            <div class="form-row">
-                <label class="towb_editorlabel" for="node-config-input-loki_tenantid"><i class="fa fa-building-o"></i> Tenant ID</label>
-                <input class="" type="text" id="node-config-input-loki_tenantid" />
-            </div>
-            <div class="form-row">
-                <label class="towb_editorlabel" for="node-config-input-loki_userid"><i class="fa fa-user"></i> Username</label>
-                <input class="" type="text" id="node-config-input-loki_userid" />
-            </div>
-            <div class="form-row">
-                <label class="towb_editorlabel" for="node-config-input-loki_authtoken"><i class="fa fa-key"></i> Auth Token</label>
-                <input class="" type="password" id="node-config-input-loki_authtoken" />
-            </div>
-
-            <div class="form-row">
-                <label class="towb_editorlabel" for="node-config-input-templateEditor"><i class="fa fa-code"></i> Template</label>
-                <div style="height: 250px; min-height:150px;" class="node-text-editor" id="node-config-input-templateEditor"></div>
-            </div>
-        </div>
-
-    </div>
-</script>
-
-<script type="text/markdown" data-help-name='LokiLoggerConfigNode'>
-Pushes log messages to a Grafana Loki instance using the Loki HTTP API.
-
-### Properties
-: *name*        (string)    : A descriptive name for this logger configuration.
-: *level*       (level)     : The minimum log level. Messages below this threshold are suppressed. Options: DEBUG, INFO, WARNING, ERROR.
-: *host*        (string)    : The base URL of the Loki instance, including port (e.g. `http://localhost:3100`).
-: *tenant ID*   (string)    : The tenant identifier for multi-tenant Loki deployments (`X-Scope-OrgID` header). Leave blank for single-tenant deployments.
-: *username*    (string)    : Username for Loki authentication.
-: *auth token*  (string)    : Authentication token or password for Loki.
-: *template*    (mustache)  : A Mustache/Handlebars template that formats the log message body.
-
-### Mustache Templating
-Mustache/Handlebars templates build the message string pushed to Loki.
-
-#### Provided Properties
-: *msg*         (object)    : The Node-RED message object passed through the node.
-: *currentTime* (string)    : The current time in ISO 8601 format.
-
-#### Helpers
-: *json*        (helper)    : Serialises an object to a JSON string using `JSON.stringify`.
-
-#### Examples
-- `{{{json msg}}}` — serialises the full message object as JSON.
-
-#### References
-- [Grafana Loki — HTTP API](https://grafana.com/docs/loki/latest/reference/loki-http-api/)
-- [Mustache — Wikipedia](https://en.wikipedia.org/wiki/Mustache_(template_system))
-- [Mustache — Playground](https://jgonggrijp.gitlab.io/wontache/playground.html)
-</script>
 <!-- webhook -->
 <script type="text/javascript">
     // CSS

package/build/Nodes.js

@@ -12,7 +12,6 @@ const NodeManager = require("@theotherwillembotha/node-red-plugincore").NodeMana
 const DelegatedConfigReferenceNode = require("@theotherwillembotha/node-red-plugincore").DelegatedConfigReferenceNode;
 const ConsoleLoggerConfigNode = require("@theotherwillembotha/node-red-plugincore").ConsoleLoggerConfigNode;
 const RestLoggerConfigNode = require("@theotherwillembotha/node-red-plugincore").RestLoggerConfigNode;
-const LokiLoggerConfigNode = require("@theotherwillembotha/node-red-plugincore").LokiLoggerConfigNode;
 const MetricsConfigNode = require("@theotherwillembotha/node-red-plugincore").MetricsConfigNode;
 const CounterMetricConfigNode = require("@theotherwillembotha/node-red-plugincore").CounterMetricConfigNode;
 const GaugeMetricConfigNode = require("@theotherwillembotha/node-red-plugincore").GaugeMetricConfigNode;
@@ -23,7 +22,6 @@ let manager = new NodeManager(RED);
     manager.registerNodeType("DelegatedConfigReferenceNode", DelegatedConfigReferenceNode);
     manager.registerNodeType("ConsoleLoggerConfigNode", ConsoleLoggerConfigNode);
     manager.registerNodeType("RestLoggerConfigNode", RestLoggerConfigNode);
-    manager.registerNodeType("LokiLoggerConfigNode", LokiLoggerConfigNode);
     manager.registerNodeType("MetricsConfigNode", MetricsConfigNode);
     manager.registerNodeType("CounterMetricConfigNode", CounterMetricConfigNode);
     manager.registerNodeType("GaugeMetricConfigNode", GaugeMetricConfigNode);

package/build/Plugins.js

@@ -46,7 +46,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);
@@ -54,7 +54,7 @@ module.exports = function (RED) {
                     
                     // stopping flows on redeployment.
                     if ("runtime-state" === event?.id && event?.payload?.state === "stop" && event?.payload?.deploy) {
-                        console.log("REDEPLOY!");
+                        //console.log("REDEPLOY!");
                         const flows = await runtime.flows.getFlows({});
                         await plugin.instance.onDeploy(flows);
                     }

package/build/core/NodeConstructor.d.ts

@@ -135,6 +135,7 @@ export type DefaultTemplateType = {
     required: boolean;
     minInstances?: number;
     maxInstances?: number;
+    validate?: Function;
 };
 export declare class NodeBuilder {
     private _name;

package/build/core/NodeConstructor.d.ts.map

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

package/build/core/NodeConstructor.js

@@ -269,6 +269,7 @@ let runPostConstructInitializers = function (instance) {
 };
 // ************************************************
 class NodeManager {
+    static { this.PLUGINID = "node-red-contrib-theotherwillembotha/services-plugin"; }
     constructor(RED) {
         this.typeBacklog = [];
         NodeManager._RED = RED;
@@ -317,7 +318,7 @@ class NodeManager {
             console.error(`Type "${typeName}" has no associated type. Make sure that it was exported and included in the index.js file!`);
         }
         let nodeConstructor = function (config) {
-            console.log("constructing node", typeName);
+            //console.log("constructing node", typeName);
             try {
                 // instantiate the node.
                 NodeManager.RED.nodes.createNode(this, config);
@@ -362,7 +363,6 @@ class NodeManager {
     }
 }
 exports.NodeManager = NodeManager;
-NodeManager.PLUGINID = "node-red-contrib-theotherwillembotha/services-plugin";
 class BaseService {
     constructor(name) {
         this._name = name;
@@ -529,6 +529,9 @@ class NodeBuilder {
             case "string": {
                 return `'${value}'`;
             }
+            case "function": {
+                return value.toString();
+            }
             case "object": {
                 if (Array.isArray(value)) {
                     return `[${value.map(t => this.serializeProperty(t)).join(", ")}]`;

package/build/core/NodeGenerator.js

@@ -38,6 +38,13 @@ const fs = __importStar(require("fs"));
 const NodeConstructor_1 = require("./NodeConstructor");
 const templatePropertyKeys = ["onIncludeOnce", "onIncludeDefaults", "onIncludeEditPrepare", "onIncludeEditPrepare", "onIncludeEditSave", "onIncludeEditForm"];
 class NodeGenerator {
+    static { this.headerWidth = 50; }
+    static { this.warning = `
+    This file was automatically generated using the NODERED Core utility.
+    Any modifications to his file will be overwritten the next time the code is regenerated.
+        
+    You have been warned.
+    `; }
     constructor(rootFolder) {
         this._nodes = {};
         this._services = [];
@@ -200,7 +207,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);
@@ -208,7 +215,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);
                     }
@@ -240,13 +247,6 @@ module.exports = function (RED) {
     }
 }
 exports.NodeGenerator = NodeGenerator;
-NodeGenerator.headerWidth = 50;
-NodeGenerator.warning = `
-    This file was automatically generated using the NODERED Core utility.
-    Any modifications to his file will be overwritten the next time the code is regenerated.
-        
-    You have been warned.
-    `;
 class TypeUtility {
     constructor() { }
     static getPrototypes(t) {

package/build/core/logger/LoggerDecorator.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"LoggerDecorator.d.ts","sourceRoot":"","sources":["../../../src/core/logger/LoggerDecorator.ts"],"names":[],"mappings":"AAKA,wBAAgB,MAAM,CAAC,KAAK,CAAC,EAAC,MAAM,GAAE,QAAQ,CAmG7C"}
+{"version":3,"file":"LoggerDecorator.d.ts","sourceRoot":"","sources":["../../../src/core/logger/LoggerDecorator.ts"],"names":[],"mappings":"AAIA,wBAAgB,MAAM,CAAC,KAAK,CAAC,EAAC,MAAM,GAAE,QAAQ,CAuG7C"}

package/build/core/logger/LoggerDecorator.js

@@ -2,41 +2,40 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Logger = Logger;
 const NodeConstructor_1 = require("../NodeConstructor");
+const LoggerService_1 = require("./service/LoggerService");
 function Logger(debug) {
     return function (target, propertyKey) {
         // if the type is a string, then its probably defined in the local (core) module.
         if (typeof propertyKey === "string") {
             const valueSymbol = Symbol(`_${String(propertyKey)}_value`);
+            //console.log("BINDING:", "target", target, "propertyKey", propertyKey );
             Object.defineProperty(target, propertyKey, {
                 get: function () {
+                    //console.log("setting logger on node " + this.name() + " (localized)");
                     if (!this[valueSymbol]) {
-                        let node = this;
-                        //console.log("setting logger on node " + node.name() + " (localized)");
-                        let config = node.config();
-                        let logger;
-                        if (config.logEnabled) {
-                            let registration = {
+                        try {
+                            let node = this;
+                            let config = node.config();
+                            if (!config.logEnabled) {
+                                return this[valueSymbol] = LoggerService_1.DoNothingAppender.get();
+                            }
+                            // get the logger config node.
+                            let loggerConfigNode = NodeConstructor_1.NodeManager.RED.nodes.getNode(config.logger).node();
+                            let loggerTemplateConfig = {
                                 id: config.id,
                                 flow: node.flow(),
                                 type: node.type(),
                                 name: node.name(),
-                                enabled: config.logEnabled,
-                                override: config.logTemplateOverrideEnabled,
-                                template: config.logTemplateOverride
+                                level: loggerConfigNode.config().level,
+                                template: (config.logTemplateOverrideEnabled) ? config.logTemplateOverride : loggerConfigNode.config().template,
                             };
                             // get a reference to the loggerService.
-                            try {
-                                logger = NodeConstructor_1.NodeManager.RED.nodes.getNode(config.logger).node().registerLogger(registration);
-                            }
-                            catch (e) {
-                                console.log("failed getting logger ", config.logger, e);
-                                logger = { log() { } };
-                            }
+                            return this[valueSymbol] = loggerConfigNode.registerTemplate(loggerTemplateConfig);
                         }
-                        else {
-                            logger = { log() { } };
+                        catch (e) {
+                            console.log(`failed getting logger "${this?.config()?.logger}"`, e);
+                            return this[valueSymbol] = LoggerService_1.DoNothingAppender.get();
                         }
-                        this[valueSymbol] = logger;
                     }
                     return this[valueSymbol];
                 },
@@ -47,39 +46,36 @@ function Logger(debug) {
         }
         else {
             let property = propertyKey;
-            //property.addInitializer(() => {
             property.addInitializer(function () {
                 let node = this;
                 const valueSymbol = Symbol(`_${String(property.name)}_value`);
+                //console.log("ADDING INITIALIZER:", "node", node, "property.name", property.name );
                 Object.defineProperty(node, property.name, {
                     get: function () {
+                        //console.log("setting logger on node " + node.name()+ " (externalized)");
                         if (!this[valueSymbol]) {
-                            //console.log("setting logger on node " + node.name()+ " (externalized)");
-                            let config = node.config();
-                            let logger;
-                            if (config.logEnabled) {
-                                let registration = {
+                            try {
+                                let config = node.config();
+                                if (!config.logEnabled) {
+                                    return this[valueSymbol] = LoggerService_1.DoNothingAppender.get();
+                                }
+                                // get the logger config node.
+                                let loggerConfigNode = NodeConstructor_1.NodeManager.RED.nodes.getNode(config.logger).node();
+                                let loggerTemplateConfig = {
                                     id: config.id,
                                     flow: node.flow(),
                                     type: node.type(),
                                     name: node.name(),
-                                    enabled: config.logEnabled,
-                                    override: config.logTemplateOverrideEnabled,
-                                    template: config.logTemplateOverride
+                                    level: loggerConfigNode?.config().level ?? 'info',
+                                    template: (config.logTemplateOverrideEnabled) ? config.logTemplateOverride : (loggerConfigNode?.config().template ?? 'message:{{msg}}'),
                                 };
                                 // get a reference to the loggerService.
-                                try {
-                                    logger = NodeConstructor_1.NodeManager.RED.nodes.getNode(config.logger).node().registerLogger(registration);
-                                }
-                                catch (e) {
-                                    console.log("failed getting logger ", config.logger, e);
-                                    logger = { log() { } };
-                                }
+                                return this[valueSymbol] = loggerConfigNode.registerTemplate(loggerTemplateConfig);
                             }
-                            else {
-                                logger = { log() { } };
+                            catch (e) {
+                                console.log("failed getting logger ", e);
+                                return this[valueSymbol] = LoggerService_1.DoNothingAppender.get();
                             }
-                            this[valueSymbol] = logger;
                         }
                         return this[valueSymbol];
                     },

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

@@ -1,16 +1,20 @@
 import { Node } from "node-red";
-import { ConfigNode, ConfigNodeConfig } from "../../NodeConstructor";
-import { Log, LoggerRegistration } from "../service/LoggerService";
-import { Level } from "../service/LoggerServiceTypes";
-interface ConsoleLoggerConfigNodeConfig extends ConfigNodeConfig {
-    id: string;
+import { LoggerConfigNodeConfig, BaseLoggerConfig, AbstractLogger, LoggerConfigNode, Log, Level } from "../service/LoggerService";
+import { LoggerTemplateConfig } from "../template/LoggerTemplate";
+interface ConsoleLoggerConfigNodeConfig extends LoggerConfigNodeConfig {
     level: Level;
     template: string;
 }
-export declare class ConsoleLoggerConfigNode extends ConfigNode<ConsoleLoggerConfigNodeConfig> {
+export declare class ConsoleLoggerConfigNode extends LoggerConfigNode<ConsoleLoggerConfigNodeConfig, ConsoleLogger> {
     private _logger;
     constructor(node: Node, config: ConsoleLoggerConfigNodeConfig);
-    registerLogger(registration: LoggerRegistration): Log;
+    protected logger(): ConsoleLogger;
+}
+export interface ConsoleLoggerConfig extends BaseLoggerConfig {
+}
+declare class ConsoleLogger extends AbstractLogger<ConsoleLoggerConfig> {
+    constructor(config: ConsoleLoggerConfig);
+    protected createLogger(config: LoggerTemplateConfig): Log;
 }
 export {};
 //# sourceMappingURL=ConsoleLoggerConfigNode.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"ConsoleLoggerConfigNode.d.ts","sourceRoot":"","sources":["../../../../src/core/logger/node/ConsoleLoggerConfigNode.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,IAAI,EAAE,MAAM,UAAU,CAAC;AAChC,OAAO,EAAE,UAAU,EAAE,gBAAgB,EAAE,MAAM,uBAAuB,CAAA;AACpE,OAAO,EAAa,GAAG,EAAE,kBAAkB,EAAiB,MAAM,0BAA0B,CAAA;AAE5F,OAAO,EAAE,KAAK,EAAgB,MAAM,+BAA+B,CAAC;AAGpE,UAAU,6BAA8B,SAAQ,gBAAgB;IAC5D,EAAE,EAAE,MAAM,CAAC;IACX,KAAK,EAAC,KAAK,CAAC;IACZ,QAAQ,EAAC,MAAM,CAAC;CACnB;AAED,qBASa,uBAAwB,SAAQ,UAAU,CAAC,6BAA6B,CAAC;IAElF,OAAO,CAAC,OAAO,CAAkB;gBAErB,IAAI,EAAE,IAAI,EAAE,MAAM,EAAE,6BAA6B;IAetD,cAAc,CAAC,YAAY,EAAC,kBAAkB,GAAE,GAAG;CAG7D"}
+{"version":3,"file":"ConsoleLoggerConfigNode.d.ts","sourceRoot":"","sources":["../../../../src/core/logger/node/ConsoleLoggerConfigNode.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,IAAI,EAAE,MAAM,UAAU,CAAC;AAChC,OAAO,EAAiB,sBAAsB,EAAE,gBAAgB,EAAE,cAAc,EAAU,gBAAgB,EAAE,GAAG,EAAE,KAAK,EAAE,MAAM,0BAA0B,CAAA;AAGxJ,OAAO,EAAE,oBAAoB,EAAE,MAAM,4BAA4B,CAAC;AAElE,UAAU,6BAA8B,SAAQ,sBAAsB;IAClE,KAAK,EAAC,KAAK,CAAC;IACZ,QAAQ,EAAC,MAAM,CAAC;CACnB;AAED,qBASa,uBAAwB,SAAQ,gBAAgB,CAAC,6BAA6B,EAAE,aAAa,CAAC;IAEvG,OAAO,CAAC,OAAO,CAAiB;gBAEpB,IAAI,EAAE,IAAI,EAAE,MAAM,EAAE,6BAA6B;IAgB7D,SAAS,CAAC,MAAM,IAAG,aAAa;CAGnC;AAED,MAAM,WAAW,mBAAoB,SAAQ,gBAAgB;CAE5D;AAED,cAAM,aAAc,SAAQ,cAAc,CAAC,mBAAmB,CAAC;gBAE/C,MAAM,EAAC,mBAAmB;IAItC,SAAS,CAAC,YAAY,CAAC,MAAM,EAAE,oBAAoB,GAAG,GAAG;CAG5D"}