@amigo9090/ih-libiec61850-node 1.0.50 → 1.0.52

package/examples/test2.js

@@ -1,229 +1,193 @@
 const { MmsClient } = require('../build/Release/addon_iec61850');
 const util = require('util');
 
-const client = new MmsClient((event, data) => {
-    console.log(`Event: ${event}, Data: ${util.inspect(data, { depth: null })}`);
+// Вспомогательные функции
+const now = () => Date.now();
 
-    if (event === 'conn' && data.event === 'opened') {
-        console.log('Connection opened, browsing data model...');
-        handleConnectionOpened();
-    }
+function logWithTime(...args) {
+    const timestamp = new Date().toISOString();
+    console.log(`[${timestamp}]`, ...args);
+}
 
-    if (event === 'data' && data.type === 'data') {
-        if (data.event === 'logicalDevices') {
-            console.log(`Logical Devices received: ${util.inspect(data.logicalDevices, { depth: null })}`);
-        } else if (data.event === 'dataSetDirectory') {
-            console.log(`DataSet Directory for ${data.logicalNodeRef}: ${util.inspect(data.dataSets, { depth: null })}`);
-        } else if (data.event === 'dataModel') {
-            console.log(`Data Model received: ${util.inspect(data.dataModel, { depth: null })}`);
-        } else if (data.event === 'dataSet') {
-            console.log(`DataSet received for ${data.datasetRef}: ${util.inspect(data.value, { depth: null })}`);
-        } else if (data.event === 'multipleDataSets') {
-            console.log(`Multiple DataSets received for ${util.inspect(data.datasetRefs, { depth: null })}:`);
-            data.values.forEach((value, index) => {
-                if (value.isValid !== false) {
-                    console.log(` DataSet[${index}]: ${data.datasetRefs[index]}, Value: ${util.inspect(value, { depth: null })}`);
-                } else {
-                    console.log(` DataSet[${index}]: ${data.datasetRefs[index]}, Error: ${value.errorReason}`);
-                }
-            });
-        } else if (data.event === 'report') {
-            console.log(`Report received for ${data.rcbRef} (rptId: ${data.rptId}):`);
-            if (data.timestamp) {
-                console.log(` Timestamp: ${data.timestamp}`);
-            }
-            Object.entries(data.values).forEach(([ref, value], index) => {
-                const reason = data.reasons[ref];
-                if (reason && reason !== 0) {
-                    console.log(` ${ref}: ${util.inspect(value, { depth: null })}, Reason: ${reason}`);
-                }
-            });
-        } else if (data.event === 'batchData') {
-            console.log(`Batch Data received for ${util.inspect(data.dataRefs, { depth: null })}:`);
-            data.values.forEach((result, index) => {
-                if (result.isValid) {
-                    console.log(` dataRef[${index}]: ${data.dataRefs[index]}, Value: ${util.inspect(result.value, { depth: null })}`);
-                } else {
-                    console.log(` dataRef[${index}]: ${data.dataRefs[index]}, Error: ${result.errorReason}`);
-                }
+const client = new MmsClient((event, data) => {
+    const eventTime = now();
+    logWithTime(`Event: ${event}, Data type: ${data.type || 'N/A'}, event: ${data.event || 'N/A'}`);
+
+    if (event === 'data' && data.event === 'report') {
+        logWithTime(`>>> REPORT RECEIVED for ${data.rcbRef}, timestamp: ${data.timestamp || 'none'}`);
+        if (data.values) {
+            const refs = Object.keys(data.values);
+            logWithTime(`    Report contains ${refs.length} elements`);
+            refs.slice(0, 3).forEach(ref => {
+                logWithTime(`    ${ref}: ${util.inspect(data.values[ref], { depth: 1 })}`);
             });
-        } else {
-            console.log(`Data received for ${data.dataRef || 'undefined'}: ${util.inspect(data.value, { depth: null })}`);
         }
     }
 
-    if (event === 'data' && data.type === 'error') {
-        console.error(`Error received: ${data.reason}`);
+    if (event === 'data' && data.event === 'multipleDataSets') {
+        logWithTime(`>>> POLL RESULT for ${data.datasetRefs}`);
     }
 
-    if (event === 'conn' && data.event === 'reconnecting') {
-        console.error(`Reconnection failed: ${data.reason}`);
-        if (data.reason.includes('attempt 3')) {
-            throw new Error('Max reconnection attempts reached');
-        }
+    if (event === 'conn' && data.event === 'opened') {
+        logWithTime('Connection opened, starting diagnostics...');
+        runDiagnostics().catch(err => logWithTime('Diagnostics error:', err));
     }
 
-    if (event === 'data' && data.type === 'control') {
-        if (data.event === 'reportingEnabled') {
-            console.log(`Reporting enabled for ${data.rcbRef}`);
-        } else if (data.event === 'reportingDisabled') {
-            console.log(`Reporting disabled for ${data.rcbRef}`);
-        } else if (data.event === 'dataSetCreated') {
-            console.log(`DataSet created: ${data.datasetRef}`);
-        } else if (data.event === 'dataSetDeleted') {
-            console.log(`DataSet deleted: ${data.datasetRef}`);
-        } else if (data.event === 'stateChanged') {
-            console.log(`Connection state changed: ${data.state}, isConnected: ${data.isConnected}`);
-        }
+    if (event === 'data' && data.type === 'error') {
+        logWithTime(`!!! ERROR: ${data.reason}`);
     }
 
     if (event === 'conn' && data.event === 'stateChanged') {
-        console.log(`Connection state changed: ${data.state}, isConnected: ${data.isConnected}`);
+        logWithTime(`Connection state changed: ${data.state}, isConnected: ${data.isConnected}`);
     }
 });
 
 const sleep = ms => new Promise(resolve => setTimeout(resolve, ms));
 
-async function handleConnectionOpened() {
+async function runDiagnostics() {
     try {
+        // 1. Получаем модель данных
+        logWithTime('Step 1: Browsing data model...');
+        const browseStart = now();
         const dataModel = await client.browseDataModel();
-        console.log('Data Model:', util.inspect(dataModel, { depth: null }));
-
-        const dataSets = [];
-        dataModel.forEach(ld => {
-            ld.logicalNodes.forEach(ln => {
-                ln.dataSets.forEach(ds => {
-                    console.log(`Found dataset: ${ds.reference}`);
-                    dataSets.push(ds);
-                });
-            });
-        });
-
-        //для теста
-        const dataModel2 = await client.TestDebug();
-
-        console.log('\nЧтение значений DataSet...');
-        const datasetRefs = dataSets.map(ds => ds.reference);
-        console.log('Calling readDataSetValues...');
-        const readResults = await client.readDataSetValues(datasetRefs);
-        console.log('readDataSetValues returned');
-      
-
-        readResults.forEach((res, idx) => {
-            const ds = dataSets[idx];
-            console.log(`\nDataSet: ${res.datasetRef}`);
-            if (!res.isValid) {
-                console.error('  Ошибка:', res.errorReason);
-                return;
+        logWithTime(`Browse completed in ${now() - browseStart} ms`);
+
+        // Диагностический вывод структуры
+        logWithTime('Data model structure (first 2 nodes):', 
+            util.inspect(dataModel.slice(0, 2), { depth: 4, colors: true }));
+
+        // 2. Ищем подходящие DataSet и отчеты
+        let targetDataset = null;
+        let targetReport = null;
+
+        // Сначала ищем DataSet (берём первый)
+        for (const ln of dataModel) {
+            if (ln.dataSets && ln.dataSets.length > 0) {
+                targetDataset = ln.dataSets[0];
+                logWithTime(`Found dataset: ${targetDataset.reference}`);
+                break;
             }
+        }
+
+        if (!targetDataset) {
+            logWithTime('No datasets found, cannot proceed.');
+            return;
+        }
 
-            console.log(`  Значений: ${res.count}, Удаляемые: ${res.isDeletable}`);
+        // Теперь ищем отчёт, который ссылается на этот DataSet
+        for (const ln of dataModel) {
+            if (!ln.reports || ln.reports.length === 0) continue;
             
-            // Функция для рекурсивного вывода вложенных структур
-            const printValue = (value, indent = '  ') => {
-                if (value && typeof value === 'object' && !Array.isArray(value)) {
-                    Object.entries(value).forEach(([key, val]) => {
-                        if (val && typeof val === 'object' && !Array.isArray(val)) {
-                            console.log(`${indent}${key}: {`);
-                            printValue(val, indent + '  ');
-                            console.log(`${indent}}`);
-                        } else if (Array.isArray(val)) {
-                            console.log(`${indent}${key}: [`);
-                            val.forEach((item, i) => {
-                                console.log(`${indent}  [${i}]:`);
-                                printValue(item, indent + '    ');
-                            });
-                            console.log(`${indent}]`);
-                        } else {
-                            console.log(`${indent}${key}: ${util.inspect(val, { colors: true })}`);
-                        }
-                    });
-                } else {
-                    console.log(`${indent}${util.inspect(value, { colors: true })}`);
+            for (const report of ln.reports) {
+                logWithTime(`Getting details for report ${report.reference}...`);
+                try {
+                    const details = await client.browseDataModel(report.reference);
+                    if (details.datasetRef === targetDataset.reference) {
+                        targetReport = details;
+                        logWithTime(`Found matching report: ${report.reference} (dataset: ${details.datasetRef})`);
+                        break;
+                    }
+                } catch (err) {
+                    logWithTime(`Error getting details for report ${report.reference}: ${err.message}`);
                 }
-            };
-
-            Object.entries(res.values).forEach(([ref, value]) => {
-                console.log(`  ${ref}:`);
-                printValue(value, '    ');
-            });
-        });
-
-        console.log('Reading data...');
-        const dataRefs = [
-            'WAGO61850ServerDevice/XCBR1.Pos[ST]',
-            'WAGO61850ServerDevice/GGIO1.Ind1.stVal',
-            'WAGO61850ServerDevice/CALH12.GrAlm.stVal'
-        ];
-        const readRefResult = await client.readData(dataRefs); 
-        console.log("readRefResult " + util.inspect(readRefResult, { depth: null }));
-
-        /*const rcbRef = 'WAGO61850ServerDevice/LLN0.RP.ReportBlock0101';
-        const dataSetRef = 'WAGO61850ServerDevice/LLN0.DataSet01';
-        console.log(`Enabling reporting for ${rcbRef} with dataset ${dataSetRef}`);
-        await client.enableReporting(rcbRef, dataSetRef);*/
-
-        const rcbRef2 = 'WAGO61850ServerDevice/LLN0.RP.ReportBlock0201';
-        const dataSetRef2 = 'WAGO61850ServerDevice/LLN0.DataSet02';
-        console.log(`Enabling reporting for ${rcbRef2} with dataset ${dataSetRef2}`);
-        await client.enableReporting(rcbRef2, dataSetRef2);
-
-        /*console.log('Reading data...');
-        const dataRefs = [
-            'A01LD0/Q1_XCBR1.Pos[ST]',
-            'A01LD0/In_GGIO1.Ind1',
-            'A01LD0/CALH1.GrAlm.stVal'
-        ];
-        const readRefResult = await client.readData(dataRefs); 
-        console.log("readRefResult " + util.inspect(readRefResult, { depth: null }));
-
-        const rcbRef = 'A01LD0/LLN0.RP.repTI1';
-        const dataSetRef = 'A01LD0/LLN0.TI_ASU';
-        console.log(`Enabling reporting for ${rcbRef} with dataset ${dataSetRef}`);
-        await client.enableReporting(rcbRef, dataSetRef);
-
-        const rcbRef2 = 'A01LD0/LLN0.BR.repTS1';
-        const dataSetRef2 = 'A01LD0/LLN0.TS_ASU';
-        console.log(`Enabling reporting for ${rcbRef2} with dataset ${dataSetRef2}`);
-        await client.enableReporting(rcbRef2, dataSetRef2);*/
-
-    } catch (err) {
-        console.error('Error in handleConnectionOpened:', err.message);
-    }
-}
+            }
+            if (targetReport) break;
+        }
 
-async function main() {
-    try {
-        console.log('Starting client...');
-        await client.connect({
-            ip: '192.168.0.142',
-            port: 102,
-            clientID: 'mms_client1',
-            reconnectDelay: 2
-        });
+        // Если не нашли подходящий, возьмём любой отчёт с datasetRef
+        if (!targetReport) {
+            for (const ln of dataModel) {
+                if (!ln.reports || ln.reports.length === 0) continue;
+                for (const report of ln.reports) {
+                    try {
+                        const details = await client.browseDataModel(report.reference);
+                        if (details.datasetRef) {
+                            targetReport = details;
+                            logWithTime(`Found any report with dataset: ${report.reference} (dataset: ${details.datasetRef})`);
+                            break;
+                        }
+                    } catch (err) {
+                        logWithTime(`Error getting details for report ${report.reference}: ${err.message}`);
+                    }
+                }
+                if (targetReport) break;
+            }
+        }
 
-        await sleep(5000);
+        // 3. Первичное чтение и кэширование DataSet (readDataSetModel)
+        logWithTime(`Step 2: Caching dataset ${targetDataset.reference}...`);
+        const cacheStart = now();
+        await client.readDataSetModel([targetDataset.reference]);
+        logWithTime(`Caching completed in ${now() - cacheStart} ms`);
+
+        // 4. Включаем отчёт, если найден
+        if (targetReport) {
+            logWithTime(`Step 3: Enabling report ${targetReport.reference} with dataset ${targetReport.datasetRef}...`);
+            const enableStart = now();
+            await client.enableReporting(targetReport.reference, targetReport.datasetRef);
+            logWithTime(`Reporting enabled in ${now() - enableStart} ms`);
+        } else {
+            logWithTime('No suitable report found, skipping report enabling.');
+        }
 
-        console.log('Waiting for data and reports...');
-        await sleep(15000);
+        // 5. Запускаем цикл поллинга (10 итераций с интервалом 2 сек)
+        logWithTime('Step 4: Starting polling loop (10 iterations, 2 sec interval)...');
+        for (let i = 0; i < 10; i++) {
+            logWithTime(`--- Poll iteration ${i+1} ---`);
+
+            const pollStart = now();
+            try {
+                const pollResults = await client.pollDataSetValues([targetDataset.reference]);
+                const pollEnd = now();
+                logWithTime(`Poll completed in ${pollEnd - pollStart} ms`);
+
+                if (pollResults && pollResults[0]) {
+                    const res = pollResults[0];
+                    if (res.isValid) {
+                        logWithTime(`  Read time (µs): ${res.readTimeMicros}, Process time (µs): ${res.processTimeMicros}`);
+                        logWithTime(`  Values count: ${res.count}`);
+                        // Выводим первые 3 значения для проверки
+                        const entries = Object.entries(res.values).slice(0, 3);
+                        entries.forEach(([ref, val]) => {
+                            logWithTime(`    ${ref}: ${util.inspect(val, { depth: 2 })}`);
+                        });
+                    } else {
+                        logWithTime(`  Poll error: ${res.errorReason}`);
+                    }
+                }
+            } catch (err) {
+                logWithTime(`Poll exception: ${err.message}`);
+            }
 
-        /*const rcbRef = 'WAGO61850ServerDevice/LLN0.RP.ReportBlock0101';
-        console.log(`Disabling reporting for ${rcbRef}`);
-        await client.disableReporting(rcbRef);*/
+            await sleep(2000);
+        }
 
-        const rcbRef2 = 'WAGO61850ServerDevice/LLN0.RP.ReportBlock0201';
-        console.log(`Disabling reporting for ${rcbRef2}`);
-        await client.disableReporting(rcbRef2);
+        // 6. Отключаем отчёт
+        if (targetReport) {
+            logWithTime('Step 5: Disabling report...');
+            const disableStart = now();
+            await client.disableReporting(targetReport.reference);
+            logWithTime(`Report disabled in ${now() - disableStart} ms`);
+        }
 
-        console.log('Client status:', client.getStatus());
-        console.log('Closing client...');
+        logWithTime('Diagnostics completed. Closing client...');
         await client.close();
-        console.log('Client closed.');
+        logWithTime('Client closed.');
 
     } catch (err) {
-        console.error('Main error:', err.message);
-        await client.close().catch(e => console.error('Close error:', e.message));
+        logWithTime(`Fatal error in diagnostics: ${err.stack}`);
     }
 }
 
-main().catch(err => console.error('Fatal error:', err.message));
+// Подключаемся к устройству (без .catch, так как connect не возвращает Promise)
+logWithTime('Starting client...');
+try {
+    client.connect({
+        ip: '192.168.0.106',
+        port: 102,
+        clientID: 'mms_client1',
+        reconnectDelay: 2
+    });
+} catch (err) {
+    logWithTime('Connection error:', err);
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@amigo9090/ih-libiec61850-node",
-  "version": "1.0.50",
+  "version": "1.0.52",
   "description": "Node.js addon for IEC 61850 client (MMS, GOOSE) using libiec61850",
   "main": "index.js",
   "keywords": [