@theotherwillembotha/node-red-loki 0.0.55 → 0.1.0

package/build/Nodes.js

@@ -9,10 +9,14 @@
 */
 "use strict";
 const NodeManager = require("@theotherwillembotha/node-red-plugincore").NodeManager;
+const LokiServiceConfigNode = require("@theotherwillembotha/node-red-loki").LokiServiceConfigNode;
 const LokiLoggerConfigNode = require("@theotherwillembotha/node-red-loki").LokiLoggerConfigNode;
+const LokiQueryNode = require("@theotherwillembotha/node-red-loki").LokiQueryNode;
 module.exports = (RED) => {
 let manager = new NodeManager(RED);
+    manager.registerNodeType("LokiServiceConfigNode", LokiServiceConfigNode);
     manager.registerNodeType("LokiLoggerConfigNode", LokiLoggerConfigNode);
+    manager.registerNodeType("LokiQueryNode", LokiQueryNode);
 }        
         
         

package/build/Plugins.js

@@ -9,12 +9,12 @@
 */
 "use strict";
 const runtime = require("node-red").runtime;
-
+const LokiService = require("@theotherwillembotha/node-red-loki").LokiService;
 
 module.exports = function (RED) {
 
     // 1. make a list of all the plugins that need to be installed.
-    let pluginList =  []
+    let pluginList =  [LokiService]
         .map(service => service.getServiceDescriptor())
         .filter(plugin => !RED.plugins.get(plugin.id()));
 
@@ -26,7 +26,6 @@ module.exports = function (RED) {
             let plugin = RED.plugins.get(pluginID);
 
             if(addedPlugin && plugin.instantiate && !plugin.instance){
-                console.log("Deploying instance of: " + plugin.id);
                 plugin.instance = new plugin.class();
                 
                 // instantiate the plugin.

package/build/index.js

@@ -14,4 +14,7 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
     for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
 };
 Object.defineProperty(exports, "__esModule", { value: true });
+__exportStar(require("./loki/service/LokiService"), exports);
+__exportStar(require("./loki/node/LokiServiceConfigNode"), exports);
 __exportStar(require("./loki/node/LokiLoggerConfigNode"), exports);
+__exportStar(require("./loki/node/LokiQueryNode"), exports);

package/build/loki/node/LokiLoggerConfigNode.js

@@ -17,18 +17,19 @@ const node_red_plugincore_1 = require("@theotherwillembotha/node-red-plugincore"
 const node_red_plugincore_2 = require("@theotherwillembotha/node-red-plugincore");
 const winston_1 = require("winston");
 const winston_loki_1 = __importDefault(require("winston-loki"));
+const LokiServiceConfigNode_1 = require("./LokiServiceConfigNode");
 let LokiLoggerConfigNode = class LokiLoggerConfigNode extends node_red_plugincore_1.LoggerConfigNode {
     constructor(node, config) {
         super(node, config);
+        const serviceNode = node_red_plugincore_1.NodeManager.RED.nodes.getNode(config.lokiservice).node();
         const loggerConfig = {
             id: this.id(),
             type: "LOKI",
             template: config.template,
             level: config.level,
-            host: config.loki_host,
-            userid: config.loki_userid,
-            authtoken: config.loki_authtoken,
-            tenantid: config.loki_tenantid,
+            host: serviceNode.url(),
+            basicAuth: serviceNode.basicAuth(),
+            tenantid: serviceNode.tenantId(),
         };
         this._logger = new LokiLogger(loggerConfig);
     }
@@ -44,7 +45,7 @@ exports.LokiLoggerConfigNode = LokiLoggerConfigNode = __decorate([
         group: "config",
         sourceFile: node_red_plugincore_2.SourceUtility.getSourcePath("/build/", "/src/") + "LokiLoggerConfigNode.html",
         package: "@theotherwillembotha/node-red-loki",
-        dependencies: [node_red_plugincore_1.LoggerService],
+        dependencies: [node_red_plugincore_1.LoggerService, LokiServiceConfigNode_1.LokiServiceConfigNode],
         tags: ["LoggerType"]
     }),
     __metadata("design:paramtypes", [Object, Object])
@@ -64,9 +65,7 @@ class LokiLogger extends node_red_plugincore_1.AbstractLogger {
             format: winston_1.format.json(),
             replaceTimestamp: true,
             onConnectionError: (err) => console.error(`[LokiLogger] connection error (host: ${config.host}):`, err),
-            basicAuth: (config.userid && config.authtoken)
-                ? `${config.userid}:${config.authtoken}`
-                : undefined
+            basicAuth: config.basicAuth,
         };
         if (config.tenantid) {
             transportConfig.headers["X-Scope-OrgID"] = config.tenantid;

package/build/loki/node/LokiQueryNode.js

@@ -0,0 +1,128 @@
+"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;
+};
+var __metadata = (this && this.__metadata) || function (k, v) {
+    if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
+};
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.LokiQueryNode = void 0;
+const axios_1 = __importDefault(require("axios"));
+const node_red_plugincore_1 = require("@theotherwillembotha/node-red-plugincore");
+const node_red_plugincore_2 = require("@theotherwillembotha/node-red-plugincore");
+const LokiServiceConfigNode_1 = require("./LokiServiceConfigNode");
+const MAX_LOG_LINES = 1000;
+const MAX_RESPONSE_BYTES = 10 * 1024 * 1024; // 10 MB
+/**
+ * Parses a time value into an RFC3339 string suitable for the Loki query_range API.
+ *
+ * Accepts:
+ *  - Nanosecond epoch integer strings (e.g. "1700000000000000000")
+ *  - Relative durations          (e.g. "1h", "30m", "7d", "2w")
+ *  - RFC3339 / parseable dates   (e.g. "2024-01-01T00:00:00Z")
+ */
+function parseTime(value) {
+    if (/^\d{16,}$/.test(value)) {
+        // Nanosecond epoch - convert to ms for Date
+        return new Date(Number(BigInt(value) / 1000000n)).toISOString();
+    }
+    const durationMatch = value.match(/^(\d+)(ms|s|m|h|d|w)$/i);
+    if (durationMatch) {
+        const n = parseInt(durationMatch[1]);
+        const unit = durationMatch[2].toLowerCase();
+        const msPerUnit = { ms: 1, s: 1000, m: 60000, h: 3600000, d: 86400000, w: 604800000 };
+        return new Date(Date.now() - n * msPerUnit[unit]).toISOString();
+    }
+    return new Date(value).toISOString();
+}
+let LokiQueryNode = class LokiQueryNode extends node_red_plugincore_1.BaseNode {
+    constructor(node, config) {
+        super(node, config);
+        this._serviceNode = node_red_plugincore_1.NodeManager.RED.nodes.getNode(config.lokiservice).node();
+    }
+    async onInput(message, _errorHandler) {
+        const query = message.query ?? this.config().query;
+        const startRaw = message.start ?? this.config().start;
+        const endRaw = message.end ?? this.config().end;
+        const endType = message.end ? undefined : this.config().end_type;
+        const start = parseTime(startRaw);
+        const end = (endType === "now" || (!endRaw && !message.end)) ? new Date().toISOString() : parseTime(endRaw);
+        const outputpath = this.config().outputpath || "payload";
+        const batchMode = this.config().batchMode === true;
+        const url = this._serviceNode.url().replace(/\/$/, "") + "/loki/api/v1/query_range";
+        try {
+            const response = await axios_1.default.get(url, {
+                headers: this._serviceNode.headers(),
+                params: { query, start, end, limit: MAX_LOG_LINES },
+                maxContentLength: MAX_RESPONSE_BYTES,
+                maxBodyLength: MAX_RESPONSE_BYTES,
+            });
+            const streams = response.data?.data?.result ?? [];
+            if (batchMode) {
+                const results = [];
+                for (const stream of streams) {
+                    const labels = stream.stream ?? {};
+                    for (const [ts_ns, line] of (stream.values ?? [])) {
+                        results.push({
+                            timestamp: new Date(Number(BigInt(ts_ns) / 1000000n)).toISOString(),
+                            line,
+                            labels,
+                        });
+                    }
+                }
+                const out = { ...message };
+                out[outputpath] = results;
+                this.node().send(out);
+            }
+            else {
+                for (const stream of streams) {
+                    const labels = stream.stream ?? {};
+                    for (const [ts_ns, line] of (stream.values ?? [])) {
+                        const out = { ...message };
+                        out[outputpath] = {
+                            timestamp: new Date(Number(BigInt(ts_ns) / 1000000n)).toISOString(),
+                            line,
+                            labels,
+                        };
+                        this.node().send(out);
+                    }
+                }
+            }
+        }
+        catch (e) {
+            _errorHandler(e);
+        }
+    }
+};
+exports.LokiQueryNode = LokiQueryNode;
+__decorate([
+    (0, node_red_plugincore_2.Logger)(),
+    __metadata("design:type", node_red_plugincore_2.Log)
+], LokiQueryNode.prototype, "log", void 0);
+__decorate([
+    (0, node_red_plugincore_1.onInput)(),
+    __metadata("design:type", Function),
+    __metadata("design:paramtypes", [Object, Function]),
+    __metadata("design:returntype", Promise)
+], LokiQueryNode.prototype, "onInput", null);
+exports.LokiQueryNode = LokiQueryNode = __decorate([
+    (0, node_red_plugincore_1.NodeDescription)({
+        id: "LokiQueryNode",
+        name: "Loki Query",
+        group: "loki",
+        sourceFile: node_red_plugincore_1.SourceUtility.getSourcePath("/build/", "/src/") + "LokiQueryNode.html",
+        package: "@theotherwillembotha/node-red-loki",
+        templates: [
+            { template: node_red_plugincore_2.LoggerTemplate, config: {} }
+        ],
+        dependencies: [LokiServiceConfigNode_1.LokiServiceConfigNode],
+        tags: ["Loki"]
+    }),
+    __metadata("design:paramtypes", [Object, Object])
+], LokiQueryNode);

package/build/loki/node/LokiServiceConfigNode.js

@@ -0,0 +1,52 @@
+"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;
+};
+var __metadata = (this && this.__metadata) || function (k, v) {
+    if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.LokiServiceConfigNode = void 0;
+const node_red_plugincore_1 = require("@theotherwillembotha/node-red-plugincore");
+let LokiServiceConfigNode = class LokiServiceConfigNode extends node_red_plugincore_1.ConfigNode {
+    constructor(node, config) {
+        super(node, config);
+    }
+    url() {
+        return this.config().url;
+    }
+    basicAuth() {
+        const { userid, authtoken } = this.config();
+        return (userid && authtoken) ? `${userid}:${authtoken}` : undefined;
+    }
+    tenantId() {
+        return this.config().tenantid || undefined;
+    }
+    headers() {
+        const h = {};
+        const auth = this.basicAuth();
+        if (auth) {
+            h['Authorization'] = 'Basic ' + Buffer.from(auth).toString('base64');
+        }
+        const tenant = this.tenantId();
+        if (tenant) {
+            h['X-Scope-OrgID'] = tenant;
+        }
+        return h;
+    }
+};
+exports.LokiServiceConfigNode = LokiServiceConfigNode;
+exports.LokiServiceConfigNode = LokiServiceConfigNode = __decorate([
+    (0, node_red_plugincore_1.NodeDescription)({
+        id: "LokiServiceConfigNode",
+        name: "Loki Service",
+        group: "config",
+        sourceFile: node_red_plugincore_1.SourceUtility.getSourcePath("/build/", "/src/") + "LokiServiceConfigNode.html",
+        package: "@theotherwillembotha/node-red-loki",
+        tags: ["Loki"]
+    }),
+    __metadata("design:paramtypes", [Object, Object])
+], LokiServiceConfigNode);

package/build/loki/service/LokiService.js

@@ -0,0 +1,43 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.LokiService = void 0;
+const axios_1 = __importDefault(require("axios"));
+const node_red_plugincore_1 = require("@theotherwillembotha/node-red-plugincore");
+class LokiService extends node_red_plugincore_1.BaseService {
+    constructor() {
+        super("LokiService");
+    }
+    init(red) {
+        this.red = red;
+        this.red.httpAdmin.post("/lokiservice/testconnection", this.red.auth.needsPermission("inject.write"), async (request, response) => {
+            const { url, userid, authtoken, tenantid } = request.body;
+            try {
+                const headers = {};
+                if (userid && authtoken) {
+                    headers['Authorization'] = 'Basic ' + Buffer.from(`${userid}:${authtoken}`).toString('base64');
+                }
+                if (tenantid) {
+                    headers['X-Scope-OrgID'] = tenantid;
+                }
+                await axios_1.default.get(url.replace(/\/$/, '') + '/loki/api/v1/labels', {
+                    headers,
+                    timeout: 5000,
+                });
+                response.json({ success: true });
+            }
+            catch (e) {
+                const message = e.response?.data?.message ?? e.response?.data ?? e.message;
+                response.json({ success: false, error: String(message) });
+            }
+        });
+    }
+    deinit(_red) { }
+    async onDeploy(_flowDeployment) { }
+    static getServiceDescriptor() {
+        return new node_red_plugincore_1.ServiceDescriptor("@theotherwillembotha/lokiservice", "LokiService", "services-plugin", "@theotherwillembotha/node-red-loki", LokiService, []);
+    }
+}
+exports.LokiService = LokiService;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@theotherwillembotha/node-red-loki",
-  "version": "0.0.55",
-  "description": "Grafana Loki logger config node for Node-RED. Built on @theotherwillembotha/node-red-plugincore.",
+  "version": "0.1.0",
+  "description": "Grafana Loki integration for Node-RED ( service config, logger, and LogQL query node). Built on @theotherwillembotha/node-red-plugincore.",
   "main": "./build/index.js",
   "exports": "./build/index.js",
   "author": "Willem Botha (@theotherwillembotha)",
@@ -15,12 +15,14 @@
   ],
   "scripts": {
     "test": "echo \"Error: no test specified\" && exit 1",
-    "build": "npm run clean && tsc && npm run generate-nodes",
+    "build": "npm run clean && tsc && npm run generate-nodes && npm run copy-files",
     "clean": "rm -rf ./build",
-    "generate-nodes": "node build/GenerateNodes.js"
+    "generate-nodes": "node build/GenerateNodes.js",
+    "copy-files": "cp -r ./icons ./build/"
   },
   "files": [
     "build/",
+    "documentation/",
     "LICENSE",
     "README.md"
   ],
@@ -37,7 +39,8 @@
     "nodered": ">=4.0.0"
   },
   "dependencies": {
-    "@theotherwillembotha/node-red-plugincore": "^0.0.55",
+    "@theotherwillembotha/node-red-plugincore": "^0.1.0",
+    "axios": "^1.7.0",
     "winston": "^3.17.0",
     "winston-loki": "^6.1.3"
   },