remove CounterTable and CounterClient modules; add CounterServer and update library version

CounterServer/form.json

@@ -0,0 +1,24 @@
+{
+    "elements": [
+        {
+            "type": "SelectInstance",
+            "name": "Connector",
+            "caption": "DB-Connector",
+            "validModules": ["{7B420C9A-F0FF-4C65-925D-6FEE0D8F1A55}"]
+        },
+        {
+            "type": "SelectVariable",
+            "name": "SourceJSON",
+            "caption": "JSON-Datenquelle",
+            "validVariableTypes": [3]
+        },
+        {
+            "type": "NumberSpinner",
+            "name": "UpdateTime",
+            "caption": "Aktualisierungszeit (Sekunden)",
+            "digits": 0
+        }
+    ],
+    "actions": [],
+    "status": []
+}

CounterServer/module.json

@@ -0,0 +1,14 @@
+{
+    "id": "{D0DA85AB-1BAD-C36C-A3FD-1C2660F96F1C}",
+    "name": "CounterServer",
+    "type": 3,
+    "vendor": "J.H. Artworks",
+    "aliases":
+    [
+    ],
+    "url": "https://jh-artworks.com",
+    "parentRequirements": [],
+    "childRequirements": [],
+    "implemented": [],
+    "prefix": "SECS"
+}

CounterServer/module.php

@@ -0,0 +1,166 @@
+<?php
+
+class CounterServer extends IPSModule
+{
+    public function Create()
+    {
+        parent::Create();
+
+        $this->RegisterPropertyInteger('Connector', 0);
+        $this->RegisterPropertyInteger('SourceJSON', 0);
+        $this->RegisterPropertyInteger('UpdateTime', 60);
+
+        $this->RegisterTimer('Update', 0, 'SECT_checkTable($_IPS[\'TARGET\']);');
+    }
+
+    public function ApplyChanges()
+    {
+        parent::ApplyChanges();
+
+        $updateTime = $this->ReadPropertyInteger('UpdateTime');
+        if ($updateTime < 1) {
+            $updateTime = 60;
+        }
+
+        $this->SetTimerInterval('Update', $updateTime * 1000);
+        $this->checkTable();
+    }
+
+    public function checkTable()
+    {
+        $sqlId = $this->ReadPropertyInteger('Connector');
+        $jsonVar = $this->ReadPropertyInteger('SourceJSON');
+
+        if ($sqlId <= 0 || $jsonVar <= 0) {
+            IPS_LogMessage('CounterTable', 'Config fehlt.');
+            return;
+        }
+
+        $jsonString = GetValueString($jsonVar);
+        if ($jsonString === '') {
+            return;
+        }
+
+        $payload = json_decode($jsonString, true);
+        if (!is_array($payload)) {
+            IPS_LogMessage('CounterTable', 'JSON Fehler');
+            return;
+        }
+
+        $clientId = (string)$this->InstanceID;
+        $clientName = IPS_GetName($this->InstanceID);
+
+        $timestamp = $payload['timestamp'] ?? date('Y-m-d H:i:s');
+        $counters = $payload['counters'] ?? [];
+
+        foreach ($counters as $c) {
+
+            $counterId = $c['id'] ?? '';
+            if ($counterId === '') continue;
+
+            $counterName = $c['name'] ?? $counterId;
+            $type = $c['type'] ?? 'other';
+            $unit = $c['unit'] ?? 'kWh';
+            $projectId = isset($c['project_id']) ? (int)$c['project_id'] : 'NULL';
+
+            // ---------- UPSERT ----------
+            $sql = "
+                INSERT INTO meter_devices
+                (project_id, client_id, counter_id, meter_uuid, meter_name, external_id, meter_type, billing_unit, description, is_active)
+                VALUES
+                (
+                    " . ($projectId === 'NULL' ? 'NULL' : $projectId) . ",
+                    '" . $this->esc($clientId) . "',
+                    '" . $this->esc($counterId) . "',
+                    '" . $this->esc($clientId . '_' . $counterId) . "',
+                    '" . $this->esc($counterName) . "',
+                    '" . $this->esc($counterId) . "',
+                    '" . $this->esc($type) . "',
+                    '" . $this->esc($unit) . "',
+                    '" . $this->esc('Client: ' . $clientName) . "',
+                    1
+                )
+                ON DUPLICATE KEY UPDATE
+                    meter_name = VALUES(meter_name),
+                    meter_type = VALUES(meter_type),
+                    billing_unit = VALUES(billing_unit),
+                    is_active = 1
+            ";
+
+            MySQL_ExecuteSimple($sqlId, $sql);
+
+            // ---------- GET meter_id ----------
+            $sqlGet = "
+                SELECT id FROM meter_devices
+                WHERE client_id = '" . $this->esc($clientId) . "'
+                AND counter_id = '" . $this->esc($counterId) . "'
+                LIMIT 1
+            ";
+
+            $res = MySQL_ExecuteSimple($sqlId, $sqlGet);
+
+            if (!is_array($res) || count($res) === 0) {
+                IPS_LogMessage('CounterTable', 'Kein meter_id gefunden');
+                continue;
+            }
+
+            $meterId = (int)$res[0]['id'];
+
+            // ---------- INSERT measurement ----------
+            $sqlInsert = "
+                INSERT INTO meter_measurements
+                (
+                    meter_id, measured_at,
+                    total_value, consumption_value,
+                    power_value, flow_value,
+                    current_value, voltage_value,
+                    temperature_in_value, temperature_out_value,
+                    pressure_in_value, pressure_out_value,
+                    frequency_value, power_factor
+                )
+                VALUES
+                (
+                    " . $meterId . ",
+                    '" . $this->esc($timestamp) . "',
+                    " . $this->f($c, 'total_value') . ",
+                    " . $this->f($c, 'consumption_value') . ",
+                    " . $this->f($c, 'power_value') . ",
+                    " . $this->f($c, 'flow_value') . ",
+                    " . $this->f($c, 'current_value') . ",
+                    " . $this->f($c, 'voltage_value') . ",
+                    " . $this->f($c, 'temperature_in_value') . ",
+                    " . $this->f($c, 'temperature_out_value') . ",
+                    " . $this->f($c, 'pressure_in_value') . ",
+                    " . $this->f($c, 'pressure_out_value') . ",
+                    " . $this->f($c, 'frequency_value') . ",
+                    " . $this->f($c, 'power_factor') . "
+                )
+            ";
+
+            MySQL_ExecuteSimple($sqlId, $sqlInsert);
+        }
+    }
+
+    private function f($arr, $key)
+    {
+        if (!isset($arr[$key]) || $arr[$key] === '' || $arr[$key] === null) {
+            return 'NULL';
+        }
+
+        if (is_numeric($arr[$key])) {
+            return str_replace(',', '.', (string)$arr[$key]);
+        }
+
+        return 'NULL';
+    }
+
+    private function esc($v)
+    {
+        return str_replace(
+            ['\\', "'", '"'],
+            ['\\\\', "\\'", '\\"'],
+            $v
+        );
+    }
+}
+?>