@theotherwillembotha/node-red-plugincore 0.2.0 → 0.3.0

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

@@ -1,4 +1,4 @@
-import { BaseNodeConfig, Template, TemplateDescriptor } from "../../NodeConstructor";
+import { BaseNodeConfig, Template } from "../../NodeConstructor";
 import { RestAuthType, ApiKeyMechanismType } from "../../logger/service/LoggerService";
 export interface WebhookTemplateConfig extends BaseNodeConfig {
     webhook: string;
@@ -17,6 +17,5 @@ export type ReverseproxyConnection = {
     domainname: string;
 };
 export declare class WebhookTemplate extends Template {
-    static getTemplateDescriptor(): TemplateDescriptor;
 }
 //# sourceMappingURL=WebhookTemplate.d.ts.map

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,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,CAKjD;CACJ"}
+{"version":3,"file":"WebhookTemplate.d.ts","sourceRoot":"","sources":["../../../../src/core/webhook/template/WebhookTemplate.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,QAAQ,EAAE,MAAM,uBAAuB,CAAA;AAMhE,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,qBAKa,eAAgB,SAAQ,QAAQ;CAC5C"}

package/build/core/webhook/template/WebhookTemplate.js

@@ -1,12 +1,25 @@
 "use strict";
+var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
+    var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
+    if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
+    else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
+    return c > 3 && r && Object.defineProperty(target, key, r), r;
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.WebhookTemplate = void 0;
 const NodeConstructor_1 = require("../../NodeConstructor");
-const WebhookServerConfigNode_1 = require("../node/WebhookServerConfigNode");
 const NodeGenerator_1 = require("../../NodeGenerator");
-class WebhookTemplate extends NodeConstructor_1.Template {
-    static getTemplateDescriptor() {
-        return new NodeConstructor_1.TemplateDescriptor("webhook", WebhookTemplate, NodeGenerator_1.SourceUtility.getSourcePath("/build/", "/src/") + "WebhookTemplate.html", [WebhookServerConfigNode_1.WebhookServerConfigNode]);
-    }
-}
+const TemplateDescriptionDecorator_1 = require("../../tagging/TemplateDescriptionDecorator");
+const DelegatedConfigReferenceNode_1 = require("../../other/node/DelegatedConfigReferenceNode");
+const WebhookServerConfigNode_1 = require("../node/WebhookServerConfigNode");
+const WebhookServerService_1 = require("../service/WebhookServerService");
+let WebhookTemplate = class WebhookTemplate extends NodeConstructor_1.Template {
+};
 exports.WebhookTemplate = WebhookTemplate;
+exports.WebhookTemplate = WebhookTemplate = __decorate([
+    (0, TemplateDescriptionDecorator_1.TemplateDescription)({
+        name: "webhook",
+        templateFile: NodeGenerator_1.SourceUtility.getSourcePath("/build/", "/src/") + "WebhookTemplate.html",
+        dependencies: [DelegatedConfigReferenceNode_1.DelegatedConfigReferenceNode, WebhookServerConfigNode_1.WebhookServerConfigNode, WebhookServerService_1.WebhookServerService],
+    })
+], WebhookTemplate);

package/build/index.d.ts

@@ -19,6 +19,7 @@ export * from "./core/state/template/StateTemplate";
 export * from "./core/tagging/service/NodeTypeService";
 export * from "./core/tagging/NodeDescriptionDecorator";
 export * from "./core/tagging/ServiceDescriptionDecorator";
+export * from "./core/tagging/TemplateDescriptionDecorator";
 export * from "./core/ui/template/UIHelperTemplate";
 export * from "./core/ui/template/ScriptEditorTemplate";
 export * from "./core/other/node/DelegatedConfigReferenceNode";

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;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,mCAAmC,CAAC;AAClD,cAAc,mCAAmC,CAAC;AAClD,cAAc,2CAA2C,CAAC;AAC1D,cAAc,qCAAqC,CAAC;AAGpD,cAAc,wCAAwC,CAAC;AACvD,cAAc,yCAAyC,CAAC;AACxD,cAAc,4CAA4C,CAAC;AAG3D,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,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,mCAAmC,CAAC;AAClD,cAAc,mCAAmC,CAAC;AAClD,cAAc,2CAA2C,CAAC;AAC1D,cAAc,qCAAqC,CAAC;AAGpD,cAAc,wCAAwC,CAAC;AACvD,cAAc,yCAAyC,CAAC;AACxD,cAAc,4CAA4C,CAAC;AAC3D,cAAc,6CAA6C,CAAC;AAG5D,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

@@ -39,6 +39,7 @@ __exportStar(require("./core/state/template/StateTemplate"), exports);
 __exportStar(require("./core/tagging/service/NodeTypeService"), exports);
 __exportStar(require("./core/tagging/NodeDescriptionDecorator"), exports);
 __exportStar(require("./core/tagging/ServiceDescriptionDecorator"), exports);
+__exportStar(require("./core/tagging/TemplateDescriptionDecorator"), exports);
 // UI
 __exportStar(require("./core/ui/template/UIHelperTemplate"), exports);
 __exportStar(require("./core/ui/template/ScriptEditorTemplate"), exports);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@theotherwillembotha/node-red-plugincore",
-  "version": "0.2.0",
+  "version": "0.3.0",
   "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",
@@ -60,7 +60,6 @@
     "js-beautify": "^1.15.4",
     "jsdom": "^29.1.1",
     "markdown-it": "^14.1.0",
-    "network": "^0.7.0",
     "reflect-metadata": "^0.2.2"
   },
   "node-red": {

package/src/GenerateNodes.ts

@@ -1,42 +1,16 @@
 
-import { DelegatedConfigReferenceNode } from "./core/other/node/DelegatedConfigReferenceNode.js";
+import { NodeGenerator } from "./index.js"
 import { NodeTypeService } from "./core/tagging/service/NodeTypeService.js";
-import { NodeGenerator, SettingsService, BasicTemplate, SettingsTemplate, TimerMetricTemplate, UIHelperTemplate, ScriptEditorTemplate } from "./index.js"
-import { WebhookServerConfigNode, WebhookServerService, WebhookTemplate,  } from "./index.js"
-
-import {LoggerService, LoggerTemplate } from "./index.js";
-
-import { MetricsService, MetricsTemplate, CounterMetricTemplate, GaugeMetricTemplate} from "./index.js";
-import { StateService, StateTemplate, InternalStateConfigNode } from "./index.js";
 
+// Plugincore is a build framework — it has no leaf nodes of its own.
+// Infrastructure nodes (DelegatedConfigReferenceNode, config nodes, etc.)
+// are pulled in automatically via template dependencies when downstream
+// packages register their nodes.
+//
+// NodeTypeService is the one service that must always be present because
+// it powers the tag registry used by NodeManager at runtime.
 new NodeGenerator("./src/core/")
-    // services.
-    .registerService(LoggerService)
-    .registerService(MetricsService)
-    .registerService(SettingsService)
-    .registerService(WebhookServerService)
     .registerService(NodeTypeService)
-    .registerService(StateService)
-
-    // templates.
-    .registerTemplate(BasicTemplate)
-    .registerTemplate(LoggerTemplate)
-    .registerTemplate(SettingsTemplate)
-    .registerTemplate(MetricsTemplate)
-    .registerTemplate(CounterMetricTemplate)
-    .registerTemplate(GaugeMetricTemplate)
-    .registerTemplate(TimerMetricTemplate)
-    .registerTemplate(WebhookTemplate)
-    .registerTemplate(UIHelperTemplate)
-    .registerTemplate(ScriptEditorTemplate)
-    .registerTemplate(StateTemplate)
-
-    // nodes
-    .registerNode(DelegatedConfigReferenceNode)
-    .registerNode(WebhookServerConfigNode)
-    .registerNode(InternalStateConfigNode)
-
-    // done.
-    .generate("./build/Nodes", "./build/Plugins");
+    .generate("./build/Nodes", "./build/Plugins", "@theotherwillembotha/node-red-plugincore");
 
 process.exit(0);

package/src/core/NodeConstructor.ts

@@ -581,8 +581,7 @@ export class NodeBuilder {
         }));
     }
 
-    public buildDeferredType(): string {
-        // Apply shadow defaults (same side-effect as buildType)
+    private applyShaddowDefaults(): void {
         let shaddowDefaults = Object.entries(this._defaults).filter(([name, template]) => template.type && template.type.endsWith("[]"));
         if (shaddowDefaults.length > 0) {
             this.addIncludeEditSave(this._name + "_shaddowDefaults",
@@ -596,8 +595,10 @@ export class NodeBuilder {
                 `}`
             );
         }
+    }
 
-        const registerTypeBody = `{
+    private buildRegisterTypeBody(): string {
+        return `{
             category: '${this._category}',
             ${(this._category !== "config" && this._icon) ? `icon: '${this._icon}',` : ""}
             ${(this._category !== "config" && this._color) ? `color: '${this._color}',` : ""}
@@ -624,6 +625,11 @@ export class NodeBuilder {
                 ${this._onIncludeEditDelete.map(entry => this.serializeJavaScript(entry.source, entry.script)).join("")}
             },
         }`;
+    }
+
+    public buildDeferredType(): string {
+        this.applyShaddowDefaults();
+        const registerTypeBody = this.buildRegisterTypeBody();
 
         return getBeautify().html_beautify(`
         <script type="text/javascript">
@@ -637,6 +643,16 @@ export class NodeBuilder {
         </script>`, beautifyOptions);
     }
 
+    public buildStandardType(): string {
+        this.applyShaddowDefaults();
+        const registerTypeBody = this.buildRegisterTypeBody();
+
+        return getBeautify().html_beautify(`
+        <script type="text/javascript">
+            RED.nodes.registerType('${this._name}', ${registerTypeBody});
+        </script>`, beautifyOptions);
+    }
+
     private serializeProperty(value:any):string{
         switch(typeof value){
             case "boolean": {
@@ -710,52 +726,14 @@ export class NodeBuilder {
         return script;
     }
 
-    public buildType():string{ 
-        // compose the shaddow defaults if need be.
-        let shaddowDefaults = Object.entries(this._defaults).filter(([name, template]) => template.type && template.type.endsWith("[]"));
-        if(shaddowDefaults.length > 0){
-            this.addIncludeEditSave(this._name + "_shaddowDefaults", 
-                `{ let node = this; ` + 
-                    shaddowDefaults
-                    .map(([name, template]) => `
-                    for(let i = 0; i < ${template.maxInstances}; i++){
-                        node["_${name}_" + i] = (node.${name}[i] || {}).proxy || "";
-                    }`)
-                    .join("\n\n") + 
-                `}`
-            );
-        }
+    public buildType():string{
+        this.applyShaddowDefaults();
+        const registerTypeBody = this.buildRegisterTypeBody();
 
         return getBeautify().html_beautify(`
         ${this._onIncludeOnce.map(entry => this.serializeHTML(entry.source, entry.script)).join("")}
         <script type="text/javascript">
-            RED.nodes.registerType('${this._name}',{      
-                category: '${this._category}',
-                ${(this._category !== "config" && this._icon) ? `icon: '${this._icon}',` : ""}
-                ${(this._category !== "config" && this._color) ? `color: '${this._color}',` : ""}
-                ${(this._category !== "config" && this._labelStyle) ? `labelStyle: '${this._labelStyle}',` : ""}
-                ${(this._label) ? `label: ${this._label},` : ""}
-                ${this._paletteLabel ? `paletteLabel: '${this._paletteLabel}',` : ""}
-                ${(this._category !== "config") ? `inputs:${this._inputs ? "1" : "0"},` : ""}
-                ${(this._category !== "config") ? `inputLabels:(i) => '${this._inputs}',` : ""}
-                ${(this._category !== "config") ? `outputs:${this._outputs.length},` : ""}
-                ${(this._category !== "config") ? `outputLabels:(i) => ${this.serializeProperty(this._outputs)}[i],` : ""}
-                defaults: {
-                    ${Object.entries(this._defaults).map(([key, value]) => this.serializeDefault(key, value)).join("\n")}
-                },
-                oneditprepare: function() {
-                    ${this._onIncludeEditPrepare.map(entry => this.serializeJavaScript(entry.source, entry.script)).join("")}
-                },
-                oneditsave: function() {
-                    ${this._onIncludeEditSave.map(entry => this.serializeJavaScript(entry.source, entry.script)).join("")}
-                },
-                oneditcancel: function() {
-                    ${this._onIncludeEditCancel.map(entry => this.serializeJavaScript(entry.source, entry.script)).join("")}
-                },
-                oneditdelete: function() {
-                    ${this._onIncludeEditDelete.map(entry => this.serializeJavaScript(entry.source, entry.script)).join("")}
-                },
-            });
+            RED.nodes.registerType('${this._name}', ${registerTypeBody});
         </script>`, beautifyOptions);
     };
 

package/src/core/NodeGenerator.ts

@@ -58,12 +58,10 @@ class NodeGenerator {
 
     public registerTemplate(template: ITemplateClass): NodeGenerator {
         try{
-            // verify that we dont already have this template.
             let descriptor = template.getTemplateDescriptor();
             if(!this._templates.map(t => t.name()).includes(descriptor.name())){
                 this._templates.push(descriptor);
-                // FIXME: skip recursive dependency resolution for now.
-                // descriptor.dependencies().forEach(dependency => this.addDependency(dependency));
+                descriptor.dependencies().forEach(dependency => this.addDependency(dependency));
             }
         }
         catch(error){
@@ -75,14 +73,14 @@ class NodeGenerator {
 
     public registerNode(node:INodeClass):NodeGenerator{
         try{
-            // verify that we have dont already have this node.
             let descriptor = node.getNodeDescriptor();
             if(!this._nodes[descriptor.id()]){
                 this._nodes[descriptor.id()] = {nodeClass:node, descriptor:descriptor};
-                // skip the recursive dependencies for now.
-                //descriptor.dependencies().forEach(dependency => this.addDependency(dependency));
+                // resolve templates declared in @NodeDescription
+                descriptor.templates().forEach(t => this.registerTemplate(t.template));
+                // resolve explicit dependencies (services, nodes, templates)
+                descriptor.dependencies().forEach(dependency => this.addDependency(dependency));
             }
-
         }
         catch(error){
             console.log("ERROR:", error);
@@ -90,13 +88,12 @@ class NodeGenerator {
         return this;
     }
 
-    public registerService(service: IServiceClass):NodeGenerator { 
+    public registerService(service: IServiceClass):NodeGenerator {
         try{
             let descriptor = service.getServiceDescriptor();
             if(!this._services.map(s => s.name()).includes(descriptor.name())){
                 this._services.push(descriptor);
-                // FIXME: skip recursive dependency resolution for now.
-                //descriptor.dependencies().forEach(dependency => this.addDependency(dependency));
+                descriptor.dependencies().forEach(dependency => this.addDependency(dependency));
             }
         }
         catch(error){
@@ -105,19 +102,22 @@ class NodeGenerator {
         return this;
     }
 
-    public generate(nodesOutputFile:string, pluginsOutputFile:string){
-        // STEP 1. Write an empty Nodes.html.
-        // Client-side node type definitions live in Plugins.html (generated below)
-        // to prevent HTML-scanning conflicts when multiple plugins bundle the same
-        // plugincore infrastructure nodes.
-        fs.writeFileSync(nodesOutputFile + ".html", `
-<!--
-${NodeGenerator.warning}
-Client-side node type definitions have been moved to Plugins.html to prevent
-duplicate type registration conflicts when multiple plugins share the same
-plugincore infrastructure nodes.
--->
-        `);
+    public generate(nodesOutputFile:string, pluginsOutputFile:string, packageName:string){
+        // Partition nodes into owned (belongs to this package) vs shared (from dependencies).
+        // Owned nodes get standard registerType + data-template-name in Nodes.html so that
+        // Node-RED's registry maps them to this module (enabling palette icons, flow library
+        // detection, etc.). Shared nodes keep the deferred pattern in Plugins.html to avoid
+        // HTML-scanning conflicts when multiple plugins bundle the same infrastructure nodes.
+        const allNodes = Object.values(this._nodes);
+        const ownedNodes = allNodes.filter(node => node.descriptor.package() === packageName);
+        const sharedNodes = allNodes.filter(node => node.descriptor.package() !== packageName);
+
+        console.log(`\nPackage: ${packageName}`);
+        console.log(`  Owned nodes (→ Nodes.html):   ${ownedNodes.map(n => n.descriptor.id()).join(', ') || '(none)'}`);
+        console.log(`  Shared nodes (→ Plugins.html): ${sharedNodes.map(n => n.descriptor.id()).join(', ') || '(none)'}\n`);
+
+        // STEP 1. Generate Nodes.html with standard client-side definitions for owned nodes.
+        this.generateNodesHtml(nodesOutputFile + ".html", ownedNodes);
 
         // Step 3. compose the JS structure for each of the nodes.
         // 1. get a list of the files to import.
@@ -258,17 +258,71 @@ module.exports = function (RED) {
         fs.writeFileSync(pluginsOutputFile + ".js", output);
         console.log(`Done building ${this._services.length} services\n${this._services.map(service => " - " + service.name() + "\n").join("")}\n`);
 
-        // STEP 4. Generate Plugins.html with deferred client-side node definitions.
-        // All nodes are registered via registry:node-set-added so that:
-        //   a) registerType is only called after typeToId/nodeSets are populated, and
-        //   b) data-template-name declarations are absent from Nodes.html, avoiding
-        //      the HTML-scanning conflict that causes Node-RED to reject an entire
-        //      plugin when a second package declares the same node type.
+        // STEP 4. Generate Plugins.html with deferred client-side definitions for shared nodes.
+        this.generatePluginsHtml(pluginsOutputFile + ".html", sharedNodes);
+    }
+
+    private generateNodesHtml(filePath: string, nodes: {nodeClass: INodeClass, descriptor: NodeDescriptor}[]): void {
+        if (nodes.length === 0) {
+            fs.writeFileSync(filePath, `
+<!--
+${NodeGenerator.warning}
+No owned nodes in this package. Shared nodes are registered via Plugins.html.
+-->
+            `);
+            console.log(`Nodes.html: no owned nodes\n`);
+            return;
+        }
+
+        const seenOnce = new Set<string>();
+        const onceHtmlParts: string[] = [];
+        const nodeParts: string[] = [];
+
+        nodes.forEach(node => {
+            console.log(`Building Nodes.html for: ${node.descriptor.id()}`);
+            const nb = buildNodeBuilder(node.nodeClass);
+
+            nb.buildOnceHtml().forEach(({source, html}) => {
+                if (!seenOnce.has(source)) {
+                    seenOnce.add(source);
+                    onceHtmlParts.push(html);
+                }
+            });
+
+            nodeParts.push([
+                nb.buildStandardType(),
+                nb.buildHtml(),
+                nb.buildDocumentation()
+            ].join('\n\n'));
+        });
+
+        fs.writeFileSync(filePath, `
+<!--
+${NodeGenerator.warning}
+-->
+${onceHtmlParts.join('\n')}
+${nodeParts.join('\n\n')}
+        `);
+        console.log(`Done building Nodes.html (${nodes.length} owned nodes)\n`);
+    }
+
+    private generatePluginsHtml(filePath: string, nodes: {nodeClass: INodeClass, descriptor: NodeDescriptor}[]): void {
+        if (nodes.length === 0) {
+            fs.writeFileSync(filePath, `
+<!--
+${NodeGenerator.warning}
+No shared nodes in this package. All nodes are registered via Nodes.html.
+-->
+            `);
+            console.log(`Plugins.html: no shared nodes\n`);
+            return;
+        }
+
         const seenOnce = new Set<string>();
         const onceHtmlParts: string[] = [];
         const nodePluginParts: string[] = [];
 
-        Object.values(this._nodes).forEach(node => {
+        nodes.forEach(node => {
             console.log(`Building Plugins.html for: ${node.descriptor.id()}`);
             const nb = buildNodeBuilder(node.nodeClass);
 
@@ -286,14 +340,14 @@ module.exports = function (RED) {
             ].join('\n\n'));
         });
 
-        fs.writeFileSync(pluginsOutputFile + ".html", `
+        fs.writeFileSync(filePath, `
 <!--
 ${NodeGenerator.warning}
 -->
 ${onceHtmlParts.join('\n')}
 ${nodePluginParts.join('\n\n')}
         `);
-        console.log(`Done building Plugins.html\n`);
+        console.log(`Done building Plugins.html (${nodes.length} shared nodes)\n`);
     }
 
     private static generateHeader(node:NodeDescriptor){
@@ -320,7 +374,7 @@ class TypeUtility {
     private constructor(){}
 
     private static getPrototypes(t:INamedType):string[] {
-        if(!t.name){
+        if(!t || !t.name){
             return [];
         }
         else{

package/src/core/logger/service/LoggerService.ts

@@ -1,4 +1,5 @@
 
+import * as os from 'os';
 import {BaseService, ConfigNodeConfig, ConfigNode } from "../../NodeConstructor";
 import { ServiceDescription } from "../../tagging/ServiceDescriptionDecorator";
 import { NodeAPI, NodeAPISettingsWithData, Node } from "node-red";
@@ -6,7 +7,18 @@ import { LoggerTemplate, LoggerTemplateConfig } from "../template/LoggerTemplate
 
 // Build-time / optional runtime deps - lazy so they are never required at bundle load time.
 function getHandlebars(): any { return require('handlebars'); }
-function getNetwork(): any { return require('network'); }
+
+function getLocalIpAddress(): string {
+    const interfaces = os.networkInterfaces();
+    for (const name of Object.keys(interfaces)) {
+        for (const iface of interfaces[name] ?? []) {
+            if (iface.family === 'IPv4' && !iface.internal) {
+                return iface.address;
+            }
+        }
+    }
+    return '127.0.0.1';
+}
 
 let _helpersRegistered = false;
 function ensureHelpersRegistered(): void {
@@ -134,7 +146,15 @@ export abstract class AbstractLogger<BaseLoggerConfig>{
 })
 export class LoggerService extends BaseService {
 
-    public static instanceID:string;
+    // Backed by a global so the value is shared across separately-bundled copies
+    // of plugincore (Nodes.js and Plugins.js each inline their own copy).
+    public static get instanceID(): string {
+        return (global as any).__plugincore_instance_id__ ?? '';
+    }
+    public static set instanceID(value: string) {
+        (global as any).__plugincore_instance_id__ = value;
+    }
+
     private red!: NodeAPI<NodeAPISettingsWithData>;
 
     constructor(){
@@ -143,12 +163,7 @@ export class LoggerService extends BaseService {
 
     public init(red: NodeAPI<NodeAPISettingsWithData>): void | Promise<void> {
         this.red = red;
-
-        return new Promise<void>((resolve) => {
-            getNetwork().get_active_interface((_err:any, obj:any) => {
-                LoggerService.instanceID = obj.ip_address;
-            });
-        });
+        LoggerService.instanceID = getLocalIpAddress();
     }
 
     public deinit(red: NodeAPI<NodeAPISettingsWithData>): void | Promise<void> {}

package/src/core/logger/template/LoggerTemplate.ts

@@ -1,5 +1,8 @@
 import { SourceUtility } from "../../NodeGenerator";
-import { BaseNodeConfig, Template, TemplateDescriptor } from "../../NodeConstructor"
+import { BaseNodeConfig, Template } from "../../NodeConstructor"
+import { TemplateDescription } from "../../tagging/TemplateDescriptionDecorator";
+import { DelegatedConfigReferenceNode } from "../../other/node/DelegatedConfigReferenceNode";
+import { LoggerService } from "../service/LoggerService";
 
 // TODO: we need to prefix logger teplate properties with logtemplate_
 export interface LoggerTemplateNodeConfig extends BaseNodeConfig{
@@ -18,15 +21,10 @@ export type LoggerTemplateConfig = {
     level:string;
 }
 
+@TemplateDescription({
+    name: "logger",
+    templateFile: SourceUtility.getSourcePath("/build/", "/src/") + "LoggerTemplate.html",
+    dependencies: [DelegatedConfigReferenceNode, LoggerService],
+})
 export class LoggerTemplate extends Template {
-
-    
-    static getTemplateDescriptor(): TemplateDescriptor {
-        return new TemplateDescriptor(
-            "logger", 
-            LoggerTemplate, 
-            SourceUtility.getSourcePath("/build/", "/src/") + "LoggerTemplate.html",
-            [], 
-        )
-    }
 }

package/src/core/metrics/template/CounterMetricTemplate.ts

@@ -1,15 +1,12 @@
 import { SourceUtility } from "../../NodeGenerator";
-import { Template,  TemplateDescriptor } from "../../NodeConstructor"
+import { Template } from "../../NodeConstructor"
+import { TemplateDescription } from "../../tagging/TemplateDescriptionDecorator";
 import { CounterMetricConfigNode } from "../node/CounterMetricConfigNode";
 
+@TemplateDescription({
+    name: "countermetric",
+    templateFile: SourceUtility.getSourcePath("/build/", "/src/") + "CounterMetricTemplate.html",
+    dependencies: [CounterMetricConfigNode],
+})
 export class CounterMetricTemplate extends Template {
-
-    
-    public static getTemplateDescriptor(): TemplateDescriptor {
-        return new TemplateDescriptor(
-            "countermetric", 
-            CounterMetricTemplate, 
-            SourceUtility.getSourcePath("/build/", "/src/") + "CounterMetricTemplate.html",
-            [CounterMetricConfigNode]);
-    }
-}
+}

package/src/core/metrics/template/GaugeMetricTemplate.ts

@@ -1,15 +1,12 @@
 import { SourceUtility } from "../../NodeGenerator";
-import { Template,  TemplateDescriptor } from "../../NodeConstructor"
+import { Template } from "../../NodeConstructor"
+import { TemplateDescription } from "../../tagging/TemplateDescriptionDecorator";
 import { GaugeMetricConfigNode } from "../node/GaugeMetricConfigNode";
 
+@TemplateDescription({
+    name: "gaugemetric",
+    templateFile: SourceUtility.getSourcePath("/build/", "/src/") + "GaugeMetricTemplate.html",
+    dependencies: [GaugeMetricConfigNode],
+})
 export class GaugeMetricTemplate extends Template {
-
-    
-    public static getTemplateDescriptor(): TemplateDescriptor {
-        return new TemplateDescriptor(
-            "gaugemetric",
-            GaugeMetricTemplate, 
-            SourceUtility.getSourcePath("/build/", "/src/") + "GaugeMetricTemplate.html",
-            [GaugeMetricConfigNode]);
-    }
-}
+}

package/src/core/metrics/template/MetricsTemplate.ts

@@ -1,17 +1,17 @@
 import { SourceUtility } from "../../NodeGenerator";
-import { BaseNodeConfig, Template, TemplateDescriptor } from "../../NodeConstructor"
+import { BaseNodeConfig, Template } from "../../NodeConstructor"
+import { TemplateDescription } from "../../tagging/TemplateDescriptionDecorator";
+import { DelegatedConfigReferenceNode } from "../../other/node/DelegatedConfigReferenceNode";
+import { MetricsService } from "../service/MetricsService";
 import { MetricsReference } from "../service/MetricsService";
 
 export interface MetricsTemplateConfig extends BaseNodeConfig, MetricsReference {
 }
 
+@TemplateDescription({
+    name: "metrics",
+    templateFile: SourceUtility.getSourcePath("/build/", "/src/") + "MetricsTemplate.html",
+    dependencies: [DelegatedConfigReferenceNode, MetricsService],
+})
 export class MetricsTemplate extends Template {
-
-    public static getTemplateDescriptor(): TemplateDescriptor {
-        return new TemplateDescriptor(
-            "metrics",
-            MetricsTemplate,
-            SourceUtility.getSourcePath("/build/", "/src/") + "MetricsTemplate.html",
-            []);
-    }
 }

package/src/core/metrics/template/TimerMetricTemplate.ts

@@ -1,14 +1,12 @@
 import { SourceUtility } from "../../NodeGenerator";
-import { Template,  TemplateDescriptor } from "../../NodeConstructor"
+import { Template } from "../../NodeConstructor"
+import { TemplateDescription } from "../../tagging/TemplateDescriptionDecorator";
 import { TimerMetricConfigNode } from "../node/TimerMetricConfigNode";
 
+@TemplateDescription({
+    name: "timermetric",
+    templateFile: SourceUtility.getSourcePath("/build/", "/src/") + "TimerMetricTemplate.html",
+    dependencies: [TimerMetricConfigNode],
+})
 export class TimerMetricTemplate extends Template {
-    
-    public static getTemplateDescriptor(): TemplateDescriptor {
-        return new TemplateDescriptor(
-            "timermetric",
-            TimerMetricTemplate, 
-            SourceUtility.getSourcePath("/build/", "/src/") + "TimerMetricTemplate.html",
-            [TimerMetricConfigNode]);
-    }
-}
+}