iobroker.drag-indicator 2.5.1 → 2.6.0

package/README.md

@@ -21,6 +21,9 @@ e.g. you can use it for power or temperature values.
 	Placeholder for the next version (at the beginning of the line):
 	### **WORK IN PROGRESS**
 -->
+### 2.6.0 (2026-04-05)
+* (BenAhrdt) implement device Manager
+
 ### 2.5.1 (2026-02-28)
 * (BenAhrdt) update dependecies
 

package/admin/jsonTab.json

@@ -0,0 +1,34 @@
+{
+	"i18n": true,
+	"type": "tabs",
+	"tabsStyle": {
+		"width": "calc(100% - 100px)"
+	},
+	"items":{
+		"_deviceManager": {
+			"type": "panel",
+			"label": "devices",
+			"items": {
+				"_dm": {
+					"type": "deviceManager",
+					"sm": 12,
+					"style": {
+						"width": "100%",
+						"height": "100%",
+						"overflow": "hidden"
+					}
+				}
+			},
+			"style": {
+				"width": "100%",
+				"height": "100%",
+				"overflow": "hidden"
+			},
+			"innerStyle": {
+				"width": "100%",
+				"height": "100%",
+				"overflow": "hidden"
+			}
+		}
+    }
+}

package/io-package.json

@@ -1,8 +1,21 @@
 {
   "common": {
     "name": "drag-indicator",
-    "version": "2.5.1",
+    "version": "2.6.0",
     "news": {
+      "2.6.0": {
+        "en": "implement device Manager",
+        "de": "gerät Manager implementieren",
+        "ru": "реализовать Device Manager",
+        "pt": "implementar o gerenciador de dispositivos",
+        "nl": "apparaatbeheer implementeren",
+        "fr": "implémenter le gestionnaire de périphériques",
+        "it": "implementare il dispositivo Manager",
+        "es": "implementar dispositivo Manager",
+        "pl": "zaimplementuj menedżera urządzeń",
+        "uk": "реалізація диспетчера пристроїв",
+        "zh-cn": "执行设备管理器"
+      },
       "2.5.1": {
         "en": "update dependecies",
         "de": "aktualisierung der abhängigkeiten",
@@ -80,19 +93,6 @@
         "pl": "* Update Dependences: \"js- controller\": \"> = 5.0.19\"\nSprawdź system przed zainstalowaniem nowej wersji",
         "uk": "* Оновлення залежностей: \"js-controller\": \">=5.0.19\"\nПеревірити систему до встановлення нової версії",
         "zh-cn": "* 更新属:\"js-controller\":\">=5.0.19\"\n在安装新版本前检查您的系统"
-      },
-      "2.1.6": {
-        "en": "correct changes for check and service bot",
-        "de": "korrekte änderungen für check und service bot",
-        "ru": "правильные изменения для проверки и обслуживания бота",
-        "pt": "alterações corretas para check e service bot",
-        "nl": "correcte wijzigingen voor controle en service bot",
-        "fr": "corrects changements pour vérifier et service bot",
-        "it": "modifiche corrette per check e service bot",
-        "es": "cambios correctos para cheque y servicio bot",
-        "pl": "poprawne zmiany dla bota czekowego i serwisowego",
-        "uk": "правильні зміни для перевірки та обслуговування бота",
-        "zh-cn": "检查和服务机器人的正确更改"
       }
     },
     "titleLang": {
@@ -146,9 +146,21 @@
     "compact": true,
     "connectionType": "local",
     "dataSource": "poll",
+    "supportedMessages": {
+      "deviceManager": true
+    },
     "adminUI": {
       "config": "json",
-      "custom": "json"
+      "custom": "json",
+      "tab": "json"
+    },
+    "adminTab": {
+      "link": "jsonTab.json",
+      "singleton": false,
+      "name": {
+        "en": "BDCounter",
+        "de": "BDCounter"
+      }
     },
     "supportCustoms": true,
     "globalDependencies": [

package/lib/modules/deviceManager/deviceManager.js

@@ -0,0 +1,170 @@
+'use strict';
+const lodash = require('lodash');
+
+const { DeviceManagement } = require('@iobroker/dm-utils');
+
+/**
+ * DeviceManager Class
+ */
+class GridVisDeviceManagement extends DeviceManagement {
+    /**
+     * Initialize Class with Adapter
+     *
+     * @param adapter Adapter Reference
+     */
+    constructor(adapter) {
+        super(adapter);
+        this.adapter = adapter;
+    }
+
+    /**
+     * List all devices
+     *
+     * @param context Context of loadDevices
+     */
+    async loadDevices(context) {
+        context.setTotalDevices(Object.keys(this.adapter.objectStore.devices).length);
+        const sortedDevices = Object.fromEntries(
+            Object.entries(this.adapter.objectStore.devices).sort(([, a], [, b]) => {
+                const nameA = a.object?.common?.name?.toLowerCase() || '';
+                const nameB = b.object?.common?.name?.toLowerCase() || '';
+                return nameA.localeCompare(nameB);
+            }),
+        );
+        for (const [deviceId, deviceValue] of Object.entries(sortedDevices)) {
+            const identifier = deviceValue.object.common.desc;
+            const res = {
+                id: deviceId,
+                identifier:
+                    identifier < 27
+                        ? identifier
+                        : `${identifier.substring(0, 13)} ... ${identifier.substring(identifier.length - 13)}`,
+                name:
+                    deviceValue.object.common.name !== undefined && deviceValue.object.common.name !== ''
+                        ? deviceValue.object.common.name
+                        : deviceId,
+                hasDetails: true,
+                color: 'white',
+                backgroundColor: this.adapter.activeStates[deviceValue.object.common.desc] ? 'primary' : 'black',
+                icon: this.adapter.activeStates[deviceValue.object.common.desc]
+                    ? `/adapter/${this.adapter.name}/drag-indicator.png`
+                    : `/adapter/${this.adapter.name}/drag-indicator-inactive.png`,
+            };
+            res.customInfo = {
+                id: deviceId,
+                schema: {
+                    type: 'panel',
+                    items: {},
+                },
+            };
+            for (const [key, value] of Object.entries(deviceValue)) {
+                if (key === 'object') {
+                    continue;
+                }
+                let lastIdPart = value.object._id.substring(value.object._id.lastIndexOf('.') + 1);
+                let card = {
+                    name: ` ${lastIdPart}`,
+                };
+                card = lodash.merge(card, value.object.native?.card);
+                const preLabel = card.preLabel ?? '';
+                let label = '';
+                if (card.name) {
+                    label = card.name;
+                } else if (card.label) {
+                    label = card.label;
+                } else {
+                    label = value.object._id.substring(value.object._id.lastIndexOf('.') + 1);
+                }
+                res.customInfo.schema.items[`_${value.object._id}`] = {
+                    type: 'state',
+                    oid: value.object._id,
+                    foreign: true,
+                    control: label === ' reset' ? 'button' : 'number',
+                    label: preLabel + label,
+                    digits: card.digits ?? 1,
+                };
+            }
+            const items = res.customInfo.schema.items;
+
+            const sortedEntries = Object.entries(items).sort(([, a], [, b]) => {
+                return a.label.localeCompare(b.label, 'de');
+            });
+
+            // 2. Array → Objekt
+            res.customInfo.schema.items = Object.fromEntries(sortedEntries);
+            context.addDevice(res);
+        }
+    }
+
+    /**
+     * @param {string} id ID from device
+     * @returns {Promise<import('@iobroker/dm-utils').DeviceDetails>} return the right value
+     */
+    // eslint-disable-next-line @typescript-eslint/ban-ts-comment
+    // @ts-expect-error
+    async getDeviceDetails(id) {
+        // eslint-disable-next-line jsdoc/check-tag-names
+        /** @type {Record<string, import('@iobroker/dm-utils').ConfigItemAny>} */
+        const sourceItems = {};
+        // eslint-disable-next-line jsdoc/check-tag-names
+        /** @type {Record<string, import('@iobroker/dm-utils').ConfigItemAny>} */
+        const deviceObjectItems = {};
+        const data = {};
+
+        sourceItems[`Header`] = {
+            newLine: true,
+            type: 'header',
+            text: `sourceStates`,
+            size: 3,
+        };
+        // Replace
+        const usedId = this.adapter.objectStore.devices[id].object.common.desc;
+        sourceItems[`source`] = {
+            newLine: true,
+            type: 'state',
+            control: 'number',
+            label: usedId,
+            oid: usedId,
+            foreign: true,
+        };
+
+        // Devices Object
+        deviceObjectItems['DeviceObjectHeader'] = {
+            newLine: true,
+            type: 'header',
+            text: 'DeviceObject',
+            size: 3,
+        };
+        deviceObjectItems['DeviceObject'] = {
+            type: 'text',
+            readOnly: true,
+            minRows: 30,
+            maxRows: 30,
+        };
+        data.DeviceObject = JSON.stringify(this.adapter.objectStore.devices[id], null, 2);
+
+        // eslint-disable-next-line jsdoc/check-tag-names
+        /** @type {import('@iobroker/dm-utils').JsonFormSchema} */
+        const schema = {
+            type: 'tabs',
+            tabsStyle: {
+                minWidth: 850,
+            },
+            items: {},
+        };
+        schema.items.sourceItems = {
+            type: 'panel',
+            label: 'sourceStates',
+            items: sourceItems,
+        };
+        schema.items.deviceObtectItems = {
+            type: 'panel',
+            label: 'deviceObject',
+            items: deviceObjectItems,
+        };
+        // return the schema
+        return { id, schema, data };
+    }
+}
+
+module.exports = GridVisDeviceManagement;

package/lib/modules/objectStore.js

@@ -0,0 +1,149 @@
+'use strict';
+
+/**
+ * Objectstore Class
+ */
+class objectStoreClass {
+    /**
+     * Initalize Class with Adapter
+     *
+     * @param adapter Adapter Reference
+     */
+    constructor(adapter) {
+        this.adapter = adapter;
+
+        // Objects
+        this.devices = {};
+        this.currentIds = {};
+        this.startCondition = `${this.adapter.namespace}.observed_Values.`;
+    }
+
+    /**
+     *  Funktion to get Devicestructure
+     *
+     */
+    async generateStoreObjects() {
+        const activeFunction = 'objectStore.js - generateDeviceObjects';
+        this.adapter.log.silly(`Function ${activeFunction} started.`);
+        try {
+            // Get the States
+            const adapterObjects = await this.adapter.getAdapterObjectsAsync();
+            for (const adapterObject of Object.values(adapterObjects)) {
+                if (adapterObject._id.startsWith(this.startCondition)) {
+                    await this.initDeviceObject(adapterObject._id, { payload: { object: adapterObject } });
+                }
+            }
+        } catch (error) {
+            this.adapter.log.error(`error at ${activeFunction}:  ${error}`);
+        }
+    }
+
+    /********************************************************************************************************************************
+     * ******************************************************************************************************************************
+     * *************************************************************************************************************************** */
+
+    /**
+     * @param id id, for wich the structure is to build
+     * @param options eg. payload wich is set to last element in id
+     */
+    async initDeviceObject(id, options = {}) {
+        const activeFunction = 'objectStore.js - initLoraWanObject';
+        this.adapter.log.silly(`Function ${activeFunction} started.`);
+        try {
+            let { strip = 3, payload } = options;
+            // Get global values
+            const deviceObject = this.devices;
+            const idObject = this.currentIds;
+
+            const parts = id.split('.').slice(strip);
+            let node = deviceObject;
+            for (let i = 0; i < parts.length; i++) {
+                const key = parts[i];
+                const isLast = i === parts.length - 1;
+
+                if (isLast) {
+                    if (payload !== undefined) {
+                        // Assign object, if not present
+                        node[key] ??= {};
+                        idObject[id] ??= node[key];
+                        // Assign payload entries
+                        for (const [name, value] of Object.entries(payload)) {
+                            node[key][name] = value;
+                        }
+
+                        // Following only type state
+                        if (node[key].object?.type === 'state') {
+                            // Get state, if not present
+                            if (!node[key].state) {
+                                if (node[key].object._id) {
+                                    const state = await this.adapter.getStateAsync(node[key].object._id);
+                                    node[key].state = state;
+                                }
+                            }
+                        }
+                    } else {
+                        node[key] ??= {};
+                        idObject[id] ??= node[key];
+                    }
+                } else {
+                    node[key] ??= {};
+                    node = node[key];
+                }
+            }
+        } catch (error) {
+            this.adapter.log.error(`error at ${activeFunction}:  ${error} - id: ${id}`);
+        }
+    }
+
+    /**
+     * @param id id, for wich the structure is to build
+     * @param options eg. payload wich is set to last element in id
+     */
+    async updateDeviceObject(id, options = {}) {
+        const activeFunction = 'objectStore.js - initLoraWanObject';
+        this.adapter.log.silly(`Function ${activeFunction} started.`);
+        try {
+            let { strip = 3, payload } = options;
+            // Get global values
+            const deviceObject = this.devices;
+            const idObject = this.currentIds;
+
+            const parts = id.split('.').slice(strip);
+            let node = deviceObject;
+            const deviceId = parts[0];
+            if (!deviceObject[deviceId]) {
+                await this.initDeviceObject(id, options);
+                return;
+            }
+            for (let i = 0; i < parts.length; i++) {
+                const key = parts[i];
+                const isLast = i === parts.length - 1;
+
+                if (isLast) {
+                    if (payload !== undefined) {
+                        // Assign object, if not present
+                        node[key] ??= {};
+                        idObject[id] ??= node[key];
+                        // Assign payload entries
+                        for (const [name, value] of Object.entries(payload)) {
+                            node[key][name] = value;
+                        }
+                    } else {
+                        node[key] ??= {};
+                        idObject[id] ??= node[key];
+                    }
+                } else {
+                    node[key] ??= {};
+                    node = node[key];
+                }
+            }
+        } catch (error) {
+            this.adapter.log.error(`error at ${activeFunction}:  ${error} - id: ${id}`);
+        }
+    }
+    /********************************************************************************************************************************
+     * ******************************************************************************************************************************
+     * *************************************************************************************************************************** */
+}
+
+module.exports = objectStoreClass;

package/main.js

@@ -1,5 +1,6 @@
 'use strict';
-
+const objectStoreClass = require('./lib/modules/objectStore');
+const DragindicatorDeviceManagement = require('./lib/modules/deviceManager/deviceManager');
 /*
  * Created with @iobroker/create-adapter v2.1.1
  */
@@ -8,10 +9,10 @@
 // you need to create an adapter
 const utils = require('@iobroker/adapter-core');
 const schedule = require('node-schedule');
-const { isDeepStrictEqual } = require('util');
+const { isDeepStrictEqual } = require('node:util');
 
 // Load your modules here, e.g.:
-// const fs = require("fs");
+// const fs = require("node:fs");
 
 class DragIndicator extends utils.Adapter {
     /**
@@ -25,7 +26,7 @@ class DragIndicator extends utils.Adapter {
         this.on('ready', this.onReady.bind(this));
         this.on('stateChange', this.onStateChange.bind(this));
         this.on('objectChange', this.onObjectChange.bind(this));
-        // this.on("message", this.onMessage.bind(this));
+        this.on('message', this.onMessage.bind(this));
         this.on('unload', this.onUnload.bind(this));
 
         this.subscribecounterId = 'info.subscribedStatesCount';
@@ -52,6 +53,11 @@ class DragIndicator extends utils.Adapter {
      */
     async onReady() {
         // Initialize your adapter here
+        // Generate Object Store
+        this.objectStore = new objectStoreClass(this);
+        await this.objectStore.generateStoreObjects();
+        // Device Manager
+        this.deviceManagement = new DragindicatorDeviceManagement(this);
 
         //Read all states with custom configuration
         const customStateArray = await this.getObjectViewAsync('system', 'custom', {});
@@ -86,6 +92,7 @@ class DragIndicator extends utils.Adapter {
         }
 
         this.subscribeForeignObjects('*');
+        this.subscribeStates('*');
         this.setState(this.subscribecounterId, this.subscribecounter, true);
     }
 
@@ -124,6 +131,7 @@ class DragIndicator extends utils.Adapter {
             type: 'channel',
             common: {
                 name: customInfo.channelName,
+                desc: id,
             },
             native: {},
         });
@@ -253,6 +261,10 @@ class DragIndicator extends utils.Adapter {
     async onObjectChange(id, obj) {
         if (obj) {
             try {
+                // Internal ObjectStore
+                if (id.startsWith(this.objectStore?.startCondition)) {
+                    await this.objectStore?.updateDeviceObject(id, { payload: { object: obj } });
+                }
                 if (!obj.common.custom || !obj.common.custom[this.namespace]) {
                     if (this.activeStates[id]) {
                         this.clearStateArrayElement(id, false);
@@ -310,6 +322,10 @@ class DragIndicator extends utils.Adapter {
      */
     async onStateChange(id, state) {
         if (state) {
+            // Internal ObjectStore
+            if (id.startsWith(this.objectStore?.startCondition)) {
+                await this.objectStore?.updateDeviceObject(id, { payload: { state: state } });
+            }
             // Check if state.val is reachable
             if (state.val !== undefined && state.val !== null) {
                 // Check Changes in Foreign states
@@ -377,17 +393,23 @@ class DragIndicator extends utils.Adapter {
     //  * Using this method requires "common.messagebox" property to be set to true in io-package.json
     //  * @param {ioBroker.Message} obj
     //  */
-    // onMessage(obj) {
-    // 	if (typeof obj === "object" && obj.message) {
-    // 		if (obj.command === "send") {
-    // 			// e.g. send email or pushover or whatever
-    // 			this.log.debug("send command");
+    onMessage(obj) {
+        if (obj.command?.startsWith('dm:')) {
+            // Handled by Device Manager class itself, so ignored here
+            return;
+        }
+        if (typeof obj === 'object' && obj.message) {
+            if (obj.command === 'send') {
+                // e.g. send email or pushover or whatever
+                this.log.debug('send command');
 
-    // 			// Send response in callback if required
-    // 			if (obj.callback) this.sendTo(obj.from, obj.command, "Message received", obj.callback);
-    // 		}
-    // 	}
-    // }
+                // Send response in callback if required
+                if (obj.callback) {
+                    this.sendTo(obj.from, obj.command, 'Message received', obj.callback);
+                }
+            }
+        }
+    }
 }
 
 if (require.main !== module) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "iobroker.drag-indicator",
-  "version": "2.5.1",
+  "version": "2.6.0",
   "description": "Shows the min and max of a selected value",
   "author": {
     "name": "BenAhrdt",
@@ -24,6 +24,8 @@
   },
   "dependencies": {
     "@iobroker/adapter-core": "^3.3.2",
+    "@iobroker/dm-utils": "^3.0.17",
+    "lodash": "^4.17.21",
     "node-schedule": "^2.1.1"
   },
   "devDependencies": {
@@ -34,7 +36,7 @@
     "@iobroker/adapter-dev": "^1.5.0",
     "@iobroker/eslint-config": "^2.2.0",
     "@iobroker/testing": "^5.2.2",
-    "@types/node": "^25.0.3",
+    "@types/node": "^25.5.2",
     "@types/proxyquire": "^1.3.31",
     "proxyquire": "^2.1.3",
     "typescript": "~5.9.3"