@theotherwillembotha/node-red-plugincore 0.0.50 → 0.0.51

package/src/core/metrics/node/TimerMetricConfigNode.html

@@ -88,23 +88,23 @@
 <script type="text/html" template-section="onIncludeEditForm">
     <div id="TimerMetricConfig">
         <div class="form-row">
-            <label class="towb_editorlabel" for="node-config-input-name"><i class="fa fa-tag"></i> Name</label>
+            <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-description"><i class="fa fa-tag"></i> Description</label>
+            <label class="towb_editorlabel" for="node-config-input-description"><i class="fa fa-info-circle"></i> Description</label>
             <input type="text" id="node-config-input-description" />
         </div>
 
         <div class="form-row">
-            <label class="towb_editorlabel" for="node-config-input-metricType"><i class="fa fa-tag"></i> Type</label>
+            <label class="towb_editorlabel" for="node-config-input-metricType"><i class="fa fa-bar-chart"></i> Type</label>
             <input class="towb_editorfield" type="text" id="node-config-input-metricType" />
         </div>
 
         <div class="metrictype metrictype_histogram">
             <div class="form-row">
-                <label class="towb_editorlabel" for="node-config-input-buckettype"><i class="fa fa-tag"></i> Bucket Type</label>
+                <label class="towb_editorlabel" for="node-config-input-buckettype"><i class="fa fa-sliders"></i> Bucket Type</label>
                 <input class="towb_editorfield" type="text" id="node-config-input-buckettype" />
             </div>
 
@@ -114,37 +114,37 @@
 
             <div class="metricsconfig_buckets metricsconfig_buckets_manual">
                 <div class="form-row">
-                    <label class="towb_editorlabel" for="node-config-input-buckettype_manual_intervals"><i class="fa fa-tag"></i> Buckets</label>
+                    <label class="towb_editorlabel" for="node-config-input-buckettype_manual_intervals"><i class="fa fa-sliders"></i> Buckets</label>
                     <input type="text" id="node-config-input-buckettype_manual_intervals" placeholder="0.001, 0.01, 0.1, 1, 2, 5", value="0.001, 0.01, 0.1, 1, 2, 5"/>
                 </div>
             </div>
 
             <div class="metricsconfig_buckets metricsconfig_buckets_linear">
                 <div class="form-row">
-                    <label class="towb_editorlabel" for="node-config-input-buckettype_linear_start"><i class="fa fa-tag"></i> Start</label>
+                    <label class="towb_editorlabel" for="node-config-input-buckettype_linear_start"><i class="fa fa-sliders"></i> Start</label>
                     <input class="towb_editorfield_short" type="text" id="node-config-input-buckettype_linear_start" placeholder="0.000", value="0.000"/>
                 </div>
                 <div class="form-row">
-                    <label class="towb_editorlabel" for="node-config-input-buckettype_linear_inteval"><i class="fa fa-tag"></i> Interval</label>
+                    <label class="towb_editorlabel" for="node-config-input-buckettype_linear_interval"><i class="fa fa-sliders"></i> Interval</label>
                     <input class="towb_editorfield_short" type="text" id="node-config-input-buckettype_linear_interval" placeholder="10", value="10"/>
                 </div>
                 <div class="form-row">
-                    <label class="towb_editorlabel" for="node-config-input-buckettype_linear_count"><i class="fa fa-tag"></i> Count</label>
+                    <label class="towb_editorlabel" for="node-config-input-buckettype_linear_count"><i class="fa fa-sliders"></i> Count</label>
                     <input class="towb_editorfield_short" type="text" id="node-config-input-buckettype_linear_count" placeholder="10", value="10"/>
                 </div>
             </div>
 
             <div class="metricsconfig_buckets metricsconfig_buckets_exponential">
                 <div class="form-row">
-                    <label class="towb_editorlabel" for="node-config-input-buckettype_exponential_start"><i class="fa fa-tag"></i> Start</label>
+                    <label class="towb_editorlabel" for="node-config-input-buckettype_exponential_start"><i class="fa fa-sliders"></i> Start</label>
                     <input class="towb_editorfield_short" type="text" id="node-config-input-buckettype_exponential_start" placeholder="1", value="1"/>
                 </div>
                 <div class="form-row">
-                    <label class="towb_editorlabel" for="node-config-input-buckettype_exponential_factor"><i class="fa fa-tag"></i> Factor</label>
+                    <label class="towb_editorlabel" for="node-config-input-buckettype_exponential_factor"><i class="fa fa-sliders"></i> Factor</label>
                     <input class="towb_editorfield_short" type="text" id="node-config-input-buckettype_exponential_factor" placeholder="2", value="2"/>
                 </div>
                 <div class="form-row">
-                    <label class="towb_editorlabel" for="node-config-input-buckettype_exponential_count"><i class="fa fa-tag"></i> Count</label>
+                    <label class="towb_editorlabel" for="node-config-input-buckettype_exponential_count"><i class="fa fa-sliders"></i> Count</label>
                     <input class="towb_editorfield_short" type="text" id="node-config-input-buckettype_exponential_count" placeholder="10", value="10"/>
                 </div>
             </div>
@@ -152,7 +152,7 @@
 
         <div class="metrictype metrictype_summary">
             <div class="form-row">
-                <label class="towb_editorlabel" for="node-config-input-percentiletype"><i class="fa fa-tag"></i> Percentile Type</label>
+                <label class="towb_editorlabel" for="node-config-input-percentiletype"><i class="fa fa-sliders"></i> Percentile Type</label>
                 <input type="text" id="node-config-input-percentiletype" />
             </div>
 
@@ -162,7 +162,7 @@
 
             <div class="metricsconfig_percentiles metricsconfig_percentiles_manual">
                 <div class="form-row">
-                    <label class="towb_editorlabel" for="node-config-input-percentiletype_manual_intervals"><i class="fa fa-tag"></i> Percentiles</label>
+                    <label class="towb_editorlabel" for="node-config-input-percentiletype_manual_intervals"><i class="fa fa-sliders"></i> Percentiles</label>
                     <input class="towb_editorfield" type="text" id="node-config-input-percentiletype_manual_intervals" placeholder="0.01, 0.1, 0.9, 0.99", value="0.01, 0.1, 0.9, 0.99"/>
                 </div>
             </div>

package/src/core/metrics/service/MetricsService.ts

@@ -415,18 +415,18 @@ export class MetricsContainer {
     return counter;
   }
 
-  public guage(config: GaugeMetricConfig): GaugeMetric {
-    var guageId = `gauge_${config.node.id}`;
-    var gauge:GaugeMetric = this.gauges[guageId];
+  public gauge(config: GaugeMetricConfig): GaugeMetric {
+    var gaugeId = `gauge_${config.node.id}`;
+    var gauge:GaugeMetric = this.gauges[gaugeId];
     if(gauge){
       // check if the config has changed much.
       if(!deepEqual(gauge.config(), config)){
-        this._registry.removeSingleMetric(guageId);
-        this.gauges[guageId] = (gauge = new GaugeMetric(guageId, config, this._registry));
+        this._registry.removeSingleMetric(gaugeId);
+        this.gauges[gaugeId] = (gauge = new GaugeMetric(gaugeId, config, this._registry));
       }
     }
     else{
-      this.gauges[guageId] = (gauge = new GaugeMetric(guageId, config, this._registry));
+      this.gauges[gaugeId] = (gauge = new GaugeMetric(gaugeId, config, this._registry));
     }
     return gauge;
   }

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

@@ -28,7 +28,7 @@
     <!-- CounterMetric -->
     <div id="section_countermetricconfig">
         <div class="form-row">
-            <label for="node-input-counterConfig"><i class="fa fa-tag"></i> Counter</label>
+            <label class="towb_editorlabel" for="node-input-counterConfig"><i class="fa fa-bar-chart"></i> Counter</label>
             <input type="text" id="node-input-counterConfig" />
         </div>
     </div>

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

@@ -27,7 +27,7 @@
     <!-- GaugeMetric -->
     <div id="section_gaugemetricconfig">
         <div class="form-row">
-            <label for="node-input-gaugeConfig"><i class="fa fa-tag"></i> Gauge</label>
+            <label class="towb_editorlabel" for="node-input-gaugeConfig"><i class="fa fa-bar-chart"></i> Gauge</label>
             <input type="text" id="node-input-gaugeConfig" />
         </div>
     </div>

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

@@ -27,7 +27,7 @@
 
     <div id="section_timermetricconfig">
         <div class="form-row">
-            <label for="node-input-timerConfig"><i class="fa fa-tag"></i> Timer</label>
+            <label class="towb_editorlabel" for="node-input-timerConfig"><i class="fa fa-clock-o"></i> Timer</label>
             <input type="text" id="node-input-timerConfig" />
         </div>
     </div>

package/src/core/other/node/DelegatedConfigReferenceNode.html

@@ -0,0 +1 @@
+<!-- This section is intentionally left blank -->

package/src/core/other/node/DelegatedConfigReferenceNode.ts

@@ -0,0 +1,70 @@
+
+/**
+ * DelegatedConfigReferenceNode — a framework-internal sentinel type.
+ *
+ * PROBLEM
+ * Node-RED's reference counter (the usage count shown on config nodes in the
+ * Config sidebar) is driven by `updateConfigNodeUsers()` in nodes.js. That
+ * function only tracks a property as a config-node reference when two conditions
+ * are met:
+ *   1. `defaults[property].type` is set to a registered node type name.
+ *   2. That node type's `category` equals `"config"`.
+ *
+ * When a node property can reference *any* of several config-node types (e.g.
+ * ConsoleLoggerConfigNode, RestLoggerConfigNode, LokiLoggerConfigNode, or a
+ * future third-party logger), there is no single concrete type to declare.
+ * Leaving `type` blank causes the counter to stay at zero even when references
+ * exist, and the config node is incorrectly flagged as unused.
+ *
+ * WORKAROUND
+ * Register this no-op node with `category: "config"` so that its type name can
+ * be used as the `type` value in `addDefault(...)` calls where the referenced
+ * config node type is not known ahead of time (open/delegated reference).
+ * `updateConfigNodeUsers` will then pass both gates, look up the config node by
+ * its actual runtime ID, and correctly increment the counter.
+ *
+ * USAGE
+ * In a template or node's onCompose section, declare the property like this:
+ *
+ *   .addDefault("myProp", { value: '', required: false, type: "DelegatedConfigReferenceNode" })
+ *
+ * Because the property name intentionally does NOT match the `node-input-X` /
+ * `node-config-input-X` naming convention, Node-RED will NOT auto-initialise
+ * the form element or auto-save the value. You must therefore:
+ *   - Read  the stored value manually in `onIncludeEditPrepare`
+ *             e.g. $("#my-selector").val(node.myProp);
+ *   - Write it back manually in `onIncludeEditSave`
+ *             e.g. node.myProp = $("#my-selector").val();
+ *
+ * LONG-TERM
+ * A proper fix would be a Node-RED PR to make `updateConfigNodeUsers` use the
+ * already-parsed `_type.types` array (set by `parseNodePropertyTypeString`) so
+ * that pipe-separated multi-type strings such as
+ * "ConsoleLoggerConfigNode|RestLoggerConfigNode" work natively.
+ * Until that PR is accepted, this sentinel type is the recommended workaround
+ * within this framework.
+ *
+ * NOTE: This node has no UI, no edit form, and no runtime behaviour. It cannot
+ * be instantiated by users and should never appear as a flow node.
+ */
+
+import { Node } from "node-red";
+import { ConfigNode, ConfigNodeConfig } from "../../NodeConstructor"
+import { SourceUtility } from "../../NodeGenerator";
+import { NodeDescription } from "../../tagging/NodeDescriptionDecorator";
+
+interface DelegatedConfigReferenceNodeConfig extends ConfigNodeConfig {}
+
+@NodeDescription({
+    id:"DelegatedConfigReferenceNode",
+    name:"DelegatedConfigReferenceNode",
+    group:"config",
+    sourceFile:SourceUtility.getSourcePath("/build/", "/src/") + "DelegatedConfigReferenceNode.html",
+    package: "@theotherwillembotha/node-red-plugincore",
+})
+export class DelegatedConfigReferenceNode extends ConfigNode<DelegatedConfigReferenceNodeConfig> {
+    
+    constructor(node: Node, config: DelegatedConfigReferenceNodeConfig){
+        super(node, config);
+    }
+}

package/src/core/tagging/NodeDescriptionDecorator.ts

@@ -14,7 +14,7 @@ export type NodeDescriptionConfig = {
 
 export function NodeDescription(config:NodeDescriptionConfig) {
     return function(target: any) {
-        let descriptor:NodeDescriptor = new NodeDescriptor(config.group, config.id, config.sourceFile, config.package);
+        let descriptor:NodeDescriptor = new NodeDescriptor(config.group, config.id, config.name, config.sourceFile, config.package);
         
         if(config.templates){
             for(let template of config.templates){

package/src/core/tagging/service/NodeTypeService.ts

@@ -22,7 +22,7 @@ export class NodeTypeService extends BaseService {
             let types = this.getNodeTypesForTag(tag).map( type => {
                 let description = type.getNodeDescriptor();
                 return {
-                    "id": description.name(),
+                    "id": description.id(),
                     "name": description.name(),
                 };
             })

package/src/core/webhook/node/WebhookServerConfigNode.html

@@ -18,25 +18,25 @@
 </div>
 
 
-<script type="text/html" template-section="onIncludeEditForm">\
+<script type="text/html" template-section="onIncludeEditForm">
     <div id="WebhookServerConfig">
         <div class="form-row">
-            <label for="node-config-input-name"><i class="fa fa-tag"></i> Name</label>
+            <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 for="node-config-input-port"><i class="fa fa-tag"></i> Port</label>
+            <label class="towb_editorlabel" for="node-config-input-port"><i class="fa fa-plug"></i> Port</label>
             <input type="number" id="node-config-input-port" />
         </div>
 
         <div class="form-row">
-            <label for="node-config-input-externalHost"><i class="fa fa-tag"></i> External Host</label>
+            <label class="towb_editorlabel" for="node-config-input-externalHost"><i class="fa fa-globe"></i> External Host</label>
             <input type="text" id="node-config-input-externalHost" />
         </div>
 
         <div class="form-row">
-            <label for="node-config-input-externalPort"><i class="fa fa-tag"></i> External Port</label>
+            <label class="towb_editorlabel" for="node-config-input-externalPort"><i class="fa fa-plug"></i> External Port</label>
             <input type="number" id="node-config-input-externalPort" />
         </div>
         <!-- add a button here to autmatically find an open port --> 

package/src/core/webhook/template/WebhookTemplate.html

@@ -133,6 +133,12 @@ node
         return types;
     }
 
+    getProxyTypes().then(types => {
+        if(types.length === 0){
+            $("#section_reverseproxy_feature").hide();
+        }
+    });
+
     let getProxies = async () => {
         let proxies = [];
 
@@ -335,17 +341,17 @@ node
         
         <div class="editorgroupborder">
             <div class="form-row nomargin">
-                <label for="{{defaults.webhook}}">Server</label>
+                <label class="towb_editorlabel" for="{{defaults.webhook}}"><i class="fa fa-server"></i> Server</label>
                 <input id="{{defaults.webhook}}" placeholder="webhook" />
             </div>
-            
+
             <div class="form-row">
-                <label for="{{defaults.webhookPath}}">Path</label>
+                <label class="towb_editorlabel" for="{{defaults.webhookPath}}"><i class="fa fa-link"></i> Path</label>
                 <input type="text" id="{{defaults.webhookPath}}" placeholder="/example" />
             </div>
 
             <div class="form-row">
-                <label for="{{defaults.webhookAuth}}">Authentication</label>
+                <label class="towb_editorlabel" for="{{defaults.webhookAuth}}"><i class="fa fa-lock"></i> Authentication</label>
                 <input type="text" id="{{defaults.webhookAuth}}" placeholder="none" />
             </div>
 
@@ -354,33 +360,34 @@ node
 
             <div class="webhookauth webhookauth-basic">
                 <div class="form-row">
-                    <label for="{{defaults.webhookAuth_basic_username}}">Auth Username:</label>
+                    <label class="towb_editorlabel" for="{{defaults.webhookAuth_basic_username}}"><i class="fa fa-user"></i> Username</label>
                     <input type="text" id="{{defaults.webhookAuth_basic_username}}" placeholder="testUser" />
                 </div>
 
                 <div class="form-row">
-                    <label for="{{defaults.webhookAuth_basic_password}}">Auth Password:</label>
+                    <label class="towb_editorlabel" for="{{defaults.webhookAuth_basic_password}}"><i class="fa fa-key"></i> Password</label>
                     <input type="password" id="{{defaults.webhookAuth_basic_password}}" placeholder="password" />
                 </div>
             </div>
 
             <div class="webhookauth webhookauth-apikey">
                 <div class="form-row">
-                    <label for="{{defaults.webhookAuth_apikey_mechanism}}">APIKey Mechanism:</label>
+                    <label class="towb_editorlabel" for="{{defaults.webhookAuth_apikey_mechanism}}"><i class="fa fa-exchange"></i> Mechanism</label>
                     <input type="text" id="{{defaults.webhookAuth_apikey_mechanism}}"/>
                 </div>
 
                 <div class="form-row">
-                    <label for="{{defaults.webhookAuth_apikey_key}}">APIKey Key:</label>
+                    <label class="towb_editorlabel" for="{{defaults.webhookAuth_apikey_key}}"><i class="fa fa-id-badge"></i> APIKey name</label>
                     <input type="text" id="{{defaults.webhookAuth_apikey_key}}" placeholder="x-api-key" />
                 </div>
 
                 <div class="form-row">
-                    <label for="{{defaults.webhookAuth_apikey_value}}">APIKey Value</label>
+                    <label class="towb_editorlabel" for="{{defaults.webhookAuth_apikey_value}}"><i class="fa fa-lock"></i> APIKey value</label>
                     <input type="text" id="{{defaults.webhookAuth_apikey_value}}" placeholder="testvalue" />
                 </div>
             </div>
 
+            <div id="section_reverseproxy_feature">
             <div class="form-row">
                 <label>Reverse Proxy</label>
                 <input type="checkbox" id="{{defaults.reverseProxies_enabled}}" style="width:20px; margin-right:5px;" />
@@ -392,8 +399,9 @@ node
                     <ol id="reverseproxylist_table" class="theotherwillembotha-compact-table"></ol>
                 </div>
             </div>
+            </div>
+
 
-            
         </div>
     </div>
 </script>

package/src/index.ts

@@ -4,7 +4,6 @@ export * from "./core/NodeConstructor";
 
 // LOGGER
 export * from "./core/logger/service/LoggerService";
-export * from "./core/logger/node/LoggerConfigNode";
 export * from "./core/logger/template/LoggerTemplate";
 export * from "./core/logger/node/ConsoleLoggerConfigNode";
 export * from "./core/logger/node/RestLoggerConfigNode";
@@ -25,8 +24,8 @@ export * from "./core/metrics/template/TimerMetricTemplate";
 export * from "./core/tagging/service/NodeTypeService";
 export * from "./core/tagging/NodeDescriptionDecorator";
 
-
 // OTHER
+export * from "./core/other/node/DelegatedConfigReferenceNode";
 export * from "./core/other/service/InputService";
 export * from "./core/other/service/SettingsService";
 export * from "./core/other/template/BasicTemplate";

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

@@ -1,30 +0,0 @@
-import { Node } from "node-red";
-import { ConfigNode, ConfigNodeConfig, NodeDescriptor } from "../../NodeConstructor";
-import { Log, LoggerRegistration } from "../service/LoggerService";
-import { ApiKeyMechanismType, Level, PlatformType, RestAuthType } from "../service/LoggerServiceTypes";
-interface LoggerConfigNodeConfig extends ConfigNodeConfig {
-    id: string;
-    platform: PlatformType;
-    level: Level;
-    platfrom: PlatformType;
-    template: string;
-    platform_rest_url: string;
-    platform_rest_auth_type: RestAuthType;
-    platform_rest_auth_basic_username: string;
-    platform_rest_auth_basic_password: string;
-    platform_rest_auth_apikey_mechanism: ApiKeyMechanismType;
-    platform_rest_auth_apikey_name: string;
-    platform_rest_auth_apikey_value: string;
-    platform_loki_host: string;
-    platform_loki_userid?: string;
-    platform_loki_authtoken?: string;
-    platform_loki_tenantID?: string;
-}
-export declare class LoggerConfigNode extends ConfigNode<LoggerConfigNodeConfig> {
-    private _logger;
-    constructor(node: Node, config: LoggerConfigNodeConfig);
-    registerLogger(registration: LoggerRegistration): Log;
-    static getNodeDescriptor(): NodeDescriptor;
-}
-export {};
-//# sourceMappingURL=LoggerConfigNode.d.ts.map

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

@@ -1 +0,0 @@
-{"version":3,"file":"LoggerConfigNode.d.ts","sourceRoot":"","sources":["../../../../src/core/logger/node/LoggerConfigNode.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,IAAI,EAAE,MAAM,UAAU,CAAC;AAChC,OAAO,EAAE,UAAU,EAAE,gBAAgB,EAAE,cAAc,EAAE,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;AAEvG,UAAU,sBAAuB,SAAQ,gBAAgB;IAErD,EAAE,EAAE,MAAM,CAAC;IACX,QAAQ,EAAE,YAAY,CAAC;IACvB,KAAK,EAAC,KAAK,CAAC;IACZ,QAAQ,EAAC,YAAY,CAAC;IACtB,QAAQ,EAAC,MAAM,CAAC;IAEhB,iBAAiB,EAAE,MAAM,CAAC;IAC1B,uBAAuB,EAAE,YAAY,CAAC;IACtC,iCAAiC,EAAC,MAAM,CAAC;IACzC,iCAAiC,EAAC,MAAM,CAAC;IACzC,mCAAmC,EAAC,mBAAmB,CAAC;IACxD,8BAA8B,EAAC,MAAM,CAAC;IACtC,+BAA+B,EAAC,MAAM,CAAC;IAEvC,kBAAkB,EAAC,MAAM,CAAC;IAC1B,oBAAoB,CAAC,EAAC,MAAM,CAAC;IAC7B,uBAAuB,CAAC,EAAC,MAAM,CAAC;IAChC,sBAAsB,CAAC,EAAC,MAAM,CAAA;CACjC;AAED,qBAAa,gBAAiB,SAAQ,UAAU,CAAC,sBAAsB,CAAC;IAEpE,OAAO,CAAC,OAAO,CAAkB;gBAErB,IAAI,EAAE,IAAI,EAAE,MAAM,EAAE,sBAAsB;IAgD/C,cAAc,CAAC,YAAY,EAAC,kBAAkB,GAAE,GAAG;WAI1C,iBAAiB,IAAG,cAAc;CASrD"}