iobroker-ucl 1.0.91 → 1.0.93

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (5) hide show
  1. package/homematicFunctions.js +24 -24
  2. package/homematicFunctions.ts +25 -23
  3. package/package.json +1 -1
  4. package/zigbeeFunctions.js +12 -0
  5. package/zigbeeFunctions.ts +21 -2
package/homematicFunctions.js CHANGED
@@ -1,6 +1,6 @@
1
1
  "use strict";
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
- exports.loadHomematicDevicesAll = exports.loadHomematicDimmer = exports.loadHomematicHeizkoerper = exports.loadHomematicSteckdosen = exports.loadHomematicWindows = exports.loadHomematicFunktschaltaktoren = exports.loadHomematicRauchmelder = exports.loadHomematicTemperatursensoren = exports.loadHomematicAccessPoints = exports.loadHomematicWandtaster = exports.loadHomematicFussbodenheizungen = exports.loadHomematicWandschalter = exports.loadHomematicRollladen = exports.loadHomematicDoors = exports.loadHomematicWetterstationen = exports.loadHomematicPraesenzmelder = exports.loadHomematicWandthermostate = exports.createHomematicDevice = void 0;
3
+ exports.loadHomematicDevicesAll = exports.loadHomematicDimmer = exports.loadHomematicHeizkoerper = exports.loadHomematicSteckdosen = exports.loadHomematicWindows = exports.loadHomematicFunktschaltaktoren = exports.loadHomematicRauchmelder = exports.loadHomematicTemperatursensoren = exports.loadHomematicAccessPoints = exports.loadHomematicWandtaster = exports.loadHomematicFussbodenheizungen = exports.loadHomematicWandschalter = exports.loadHomematicDoors = exports.loadHomematicWetterstationen = exports.loadHomematicPraesenzmelder = exports.loadHomematicWandthermostate = exports.loadHomematicRollladen = exports.createHomematicDevice = void 0;
4
4
  var _a = require('./homematicClasses.js'), HomematicWindow = _a.HomematicWindow, HomematicSteckdose = _a.HomematicSteckdose, HomematicHeizkoerper = _a.HomematicHeizkoerper, HomematicDimmer = _a.HomematicDimmer, HomematicWandthermostat = _a.HomematicWandthermostat, HomematicFussbodenheizung = _a.HomematicFussbodenheizung, HomematicWandschalter = _a.HomematicWandschalter, HomematicDoor = _a.HomematicDoor, HomematicWetterstation = _a.HomematicWetterstation, HomematicAccessPoint = _a.HomematicAccessPoint, HomematicRollladen = _a.HomematicRollladen, HomematicWandtaster = _a.HomematicWandtaster, HomematicTemperatursensor = _a.HomematicTemperatursensor, HomematicRauchmelder = _a.HomematicRauchmelder, HomematicPraesenzmelder = _a.HomematicPraesenzmelder, AbstractHomematic = _a.AbstractHomematic, HomematicFunkschaltaktor = _a.HomematicFunkschaltaktor, deviceHomematicWandthermostat = _a.deviceHomematicWandthermostat, deviceHomematicPraesenzmelder = _a.deviceHomematicPraesenzmelder, deviceHomematicWetterstation = _a.deviceHomematicWetterstation, deviceHomematicDoor = _a.deviceHomematicDoor, deviceHomematicRollladen = _a.deviceHomematicRollladen, deviceHomematicWandschalter = _a.deviceHomematicWandschalter, deviceHomematicFussbodenheizung = _a.deviceHomematicFussbodenheizung, deviceHomematicWandtaster = _a.deviceHomematicWandtaster, deviceHomematicAccessPoint = _a.deviceHomematicAccessPoint, deviceHomematicTemperatursensor = _a.deviceHomematicTemperatursensor, deviceHomematicRauchmelder = _a.deviceHomematicRauchmelder, deviceHomematicFunkSchaltaktor = _a.deviceHomematicFunkSchaltaktor, deviceHomematicWindow = _a.deviceHomematicWindow, deviceHomematicSteckdose = _a.deviceHomematicSteckdose, deviceHomematicHeizkoerper = _a.deviceHomematicHeizkoerper, deviceHomematicDimmer = _a.deviceHomematicDimmer;
5
5
  var attributeRawID = "rawId";
6
6
  var attributeBaseState = "baseState";
@@ -29,6 +29,28 @@ function createDatenpunktSingle(adapter, deviceRawId, attributeType, attributeNa
29
29
  write: true
30
30
  });
31
31
  }
32
+ var cacheRollladenArray = null;
33
+ function loadHomematicRollladen(adapter) {
34
+ if (cacheRollladenArray != null) {
35
+ return cacheRollladenArray;
36
+ }
37
+ // @ts-ignore
38
+ cacheRollladenArray = [];
39
+ adapter.$('state[id=0_userdata.0.devices.homematic.*.*.category]').each(function (datenpunktKey) {
40
+ var datenpunktPraefix = datenpunktKey.replaceAll(".category", "");
41
+ if (adapter.getState(datenpunktKey).val == deviceHomematicRollladen) {
42
+ // @ts-ignore
43
+ cacheRollladenArray.push(new HomematicRollladen(adapter, adapter.getState(datenpunktPraefix + "." + attributeRawID).val, // [0] Device-ID (z.B. 1 --> In der Anzeige wird daraus "H01")
44
+ adapter.getState(datenpunktPraefix + "." + attributeBaseState).val, // [1] Datenpunkt Device (z.B. hm-rpc.1.001B9D898F9CBC)
45
+ adapter.getState(datenpunktPraefix + "." + attributeEtage).val, // [2] Etage/Bereich (z.B. EG)
46
+ adapter.getState(datenpunktPraefix + "." + attributeRaum).val, // [3] Raum/Unterbereich (z.B. Wohnzimmer)
47
+ adapter.getState(datenpunktPraefix + "." + attributeDevice).val // [4] Device (z.B. Stehlampe)
48
+ ));
49
+ }
50
+ });
51
+ return cacheRollladenArray;
52
+ }
53
+ exports.loadHomematicRollladen = loadHomematicRollladen;
32
54
  var cacheWandthermostateArray = null;
33
55
  function loadHomematicWandthermostate(adapter) {
34
56
  if (cacheWandthermostateArray != null) {
@@ -40,7 +62,7 @@ function loadHomematicWandthermostate(adapter) {
40
62
  var datenpunktPraefix = datenpunktKey.replaceAll(".category", "");
41
63
  if (adapter.getState(datenpunktKey).val == deviceHomematicWandthermostat) {
42
64
  // @ts-ignore
43
- homematicArray.push(new HomematicWandthermostat(adapter, adapter.getState(datenpunktPraefix + "." + attributeRawID).val, // [0] Device-ID (z.B. 1 --> In der Anzeige wird daraus "H01")
65
+ cacheWandthermostateArray.push(new HomematicWandthermostat(adapter, adapter.getState(datenpunktPraefix + "." + attributeRawID).val, // [0] Device-ID (z.B. 1 --> In der Anzeige wird daraus "H01")
44
66
  adapter.getState(datenpunktPraefix + "." + attributeBaseState).val, // [1] Datenpunkt Device (z.B. hm-rpc.1.001B9D898F9CBC)
45
67
  adapter.getState(datenpunktPraefix + "." + attributeEtage).val, // [2] Etage/Bereich (z.B. EG)
46
68
  adapter.getState(datenpunktPraefix + "." + attributeRaum).val, // [3] Raum/Unterbereich (z.B. Wohnzimmer)
@@ -117,28 +139,6 @@ function loadHomematicDoors(adapter) {
117
139
  return cacheDoorsArray;
118
140
  }
119
141
  exports.loadHomematicDoors = loadHomematicDoors;
120
- var cacheRollladenArray = null;
121
- function loadHomematicRollladen(adapter) {
122
- if (cacheRollladenArray != null) {
123
- return cacheRollladenArray;
124
- }
125
- // @ts-ignore
126
- cacheRollladenArray = [];
127
- adapter.$('state[id=0_userdata.0.devices.homematic.*.*.category]').each(function (datenpunktKey) {
128
- var datenpunktPraefix = datenpunktKey.replaceAll(".category", "");
129
- if (adapter.getState(datenpunktKey).val == deviceHomematicRollladen) {
130
- // @ts-ignore
131
- cacheRollladenArray.push(new HomematicRollladen(adapter, adapter.getState(datenpunktPraefix + "." + attributeRawID).val, // [0] Device-ID (z.B. 1 --> In der Anzeige wird daraus "H01")
132
- adapter.getState(datenpunktPraefix + "." + attributeBaseState).val, // [1] Datenpunkt Device (z.B. hm-rpc.1.001B9D898F9CBC)
133
- adapter.getState(datenpunktPraefix + "." + attributeEtage).val, // [2] Etage/Bereich (z.B. EG)
134
- adapter.getState(datenpunktPraefix + "." + attributeRaum).val, // [3] Raum/Unterbereich (z.B. Wohnzimmer)
135
- adapter.getState(datenpunktPraefix + "." + attributeDevice).val // [4] Device (z.B. Stehlampe)
136
- ));
137
- }
138
- });
139
- return cacheRollladenArray;
140
- }
141
- exports.loadHomematicRollladen = loadHomematicRollladen;
142
142
  var cacheWandschalterArray = null;
143
143
  function loadHomematicWandschalter(adapter) {
144
144
  if (cacheWandschalterArray != null) {
package/homematicFunctions.ts CHANGED
@@ -30,6 +30,30 @@ function createDatenpunktSingle(adapter: any, deviceRawId, attributeType, attrib
30
30
  });
31
31
  }
32
32
 
33
+ var cacheRollladenArray = null;
34
+ export function loadHomematicRollladen(adapter: any) {
35
+ if (cacheRollladenArray != null) {
36
+ return cacheRollladenArray;
37
+ }
38
+ // @ts-ignore
39
+ cacheRollladenArray = [];
40
+ adapter.$('state[id=0_userdata.0.devices.homematic.*.*.category]').each(datenpunktKey => { // 0_userdata.0.devices.homematic.30.type
41
+ var datenpunktPraefix = datenpunktKey.replaceAll(".category", "");
42
+ if (adapter.getState(datenpunktKey).val == deviceHomematicRollladen) {
43
+ // @ts-ignore
44
+ cacheRollladenArray.push(new HomematicRollladen(adapter,
45
+ adapter.getState(datenpunktPraefix + "." + attributeRawID).val, // [0] Device-ID (z.B. 1 --> In der Anzeige wird daraus "H01")
46
+ adapter.getState(datenpunktPraefix + "." + attributeBaseState).val, // [1] Datenpunkt Device (z.B. hm-rpc.1.001B9D898F9CBC)
47
+ adapter.getState(datenpunktPraefix + "." + attributeEtage).val, // [2] Etage/Bereich (z.B. EG)
48
+ adapter.getState(datenpunktPraefix + "." + attributeRaum).val, // [3] Raum/Unterbereich (z.B. Wohnzimmer)
49
+ adapter.getState(datenpunktPraefix + "." + attributeDevice).val // [4] Device (z.B. Stehlampe)
50
+ ));
51
+ }
52
+ });
53
+ return cacheRollladenArray;
54
+ }
55
+
56
+
33
57
  var cacheWandthermostateArray = null;
34
58
  export function loadHomematicWandthermostate(adapter: any) {
35
59
  if (cacheWandthermostateArray != null) {
@@ -41,7 +65,7 @@ export function loadHomematicWandthermostate(adapter: any) {
41
65
  var datenpunktPraefix = datenpunktKey.replaceAll(".category", "");
42
66
  if (adapter.getState(datenpunktKey).val == deviceHomematicWandthermostat) {
43
67
  // @ts-ignore
44
- homematicArray.push(new HomematicWandthermostat(adapter,
68
+ cacheWandthermostateArray.push(new HomematicWandthermostat(adapter,
45
69
  adapter.getState(datenpunktPraefix + "." + attributeRawID).val, // [0] Device-ID (z.B. 1 --> In der Anzeige wird daraus "H01")
46
70
  adapter.getState(datenpunktPraefix + "." + attributeBaseState).val, // [1] Datenpunkt Device (z.B. hm-rpc.1.001B9D898F9CBC)
47
71
  adapter.getState(datenpunktPraefix + "." + attributeEtage).val, // [2] Etage/Bereich (z.B. EG)
@@ -122,28 +146,6 @@ export function loadHomematicDoors(adapter: any) {
122
146
  return cacheDoorsArray;
123
147
  }
124
148
 
125
- var cacheRollladenArray = null;
126
- export function loadHomematicRollladen(adapter: any) {
127
- if (cacheRollladenArray != null) {
128
- return cacheRollladenArray;
129
- }
130
- // @ts-ignore
131
- cacheRollladenArray = [];
132
- adapter.$('state[id=0_userdata.0.devices.homematic.*.*.category]').each(datenpunktKey => { // 0_userdata.0.devices.homematic.30.type
133
- var datenpunktPraefix = datenpunktKey.replaceAll(".category", "");
134
- if (adapter.getState(datenpunktKey).val == deviceHomematicRollladen) {
135
- // @ts-ignore
136
- cacheRollladenArray.push(new HomematicRollladen(adapter,
137
- adapter.getState(datenpunktPraefix + "." + attributeRawID).val, // [0] Device-ID (z.B. 1 --> In der Anzeige wird daraus "H01")
138
- adapter.getState(datenpunktPraefix + "." + attributeBaseState).val, // [1] Datenpunkt Device (z.B. hm-rpc.1.001B9D898F9CBC)
139
- adapter.getState(datenpunktPraefix + "." + attributeEtage).val, // [2] Etage/Bereich (z.B. EG)
140
- adapter.getState(datenpunktPraefix + "." + attributeRaum).val, // [3] Raum/Unterbereich (z.B. Wohnzimmer)
141
- adapter.getState(datenpunktPraefix + "." + attributeDevice).val // [4] Device (z.B. Stehlampe)
142
- ));
143
- }
144
- });
145
- return cacheRollladenArray;
146
- }
147
149
 
148
150
  var cacheWandschalterArray = null;
149
151
  export function loadHomematicWandschalter(adapter: any) {
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "iobroker-ucl",
3
- "version": "1.0.91",
3
+ "version": "1.0.93",
4
4
  "main": "main.js",
5
5
  "scripts": {
6
6
  "build": "tsc --build",
package/zigbeeFunctions.js CHANGED
@@ -1043,50 +1043,62 @@ exports.loadZigbeeFenstersensor = loadZigbeeFenstersensor;
1043
1043
  var zigbeeAllArray = null;
1044
1044
  function loadZigbeeDevicesAll(adapter) {
1045
1045
  if (zigbeeAllArray != null) {
1046
+ adapter.log("loadZigbeeDevicesAll | Return from cache: " + loadZigbeeDevicesAll.length);
1046
1047
  return zigbeeAllArray;
1047
1048
  }
1048
1049
  // @ts-ignore
1049
1050
  zigbeeAllArray = [];
1051
+ adapter.log("loadZigbeeDevicesAll | Zwischen 1: " + loadZigbeeDevicesAll.length);
1050
1052
  adapter.loadZigbeeSteckdosen(adapter).forEach(function (zigbee) {
1051
1053
  // @ts-ignore
1052
1054
  zigbeeAllArray.push(zigbee);
1053
1055
  });
1056
+ adapter.log("loadZigbeeDevicesAll | Zwischen 2: " + loadZigbeeDevicesAll.length);
1054
1057
  adapter.loadZigbeeBewegungsmelder(adapter).forEach(function (zigbee) {
1055
1058
  // @ts-ignore
1056
1059
  zigbeeAllArray.push(zigbee);
1057
1060
  });
1061
+ adapter.log("loadZigbeeDevicesAll | Zwischen 3: " + loadZigbeeDevicesAll.length);
1058
1062
  adapter.loadZigbeeLampenRGB(adapter).forEach(function (zigbee) {
1059
1063
  // @ts-ignore
1060
1064
  zigbeeAllArray.push(zigbee);
1061
1065
  });
1066
+ adapter.log("loadZigbeeDevicesAll | Zwischen 4: " + loadZigbeeDevicesAll.length);
1062
1067
  adapter.loadZigbeeLampenWeiss(adapter).forEach(function (zigbee) {
1063
1068
  // @ts-ignore
1064
1069
  zigbeeAllArray.push(zigbee);
1065
1070
  });
1071
+ adapter.log("loadZigbeeDevicesAll | Zwischen 5: " + loadZigbeeDevicesAll.length);
1066
1072
  adapter.loadZigbeeRauchmeler(adapter).forEach(function (zigbee) {
1067
1073
  // @ts-ignore
1068
1074
  zigbeeAllArray.push(zigbee);
1069
1075
  });
1076
+ adapter.log("loadZigbeeDevicesAll | Zwischen 6: " + loadZigbeeDevicesAll.length);
1070
1077
  adapter.loadZigbeeWandtaster(adapter).forEach(function (zigbee) {
1071
1078
  // @ts-ignore
1072
1079
  zigbeeAllArray.push(zigbee);
1073
1080
  });
1081
+ adapter.log("loadZigbeeDevicesAll | Zwischen 7: " + loadZigbeeDevicesAll.length);
1074
1082
  adapter.loadZigbeeDosenrelais(adapter).forEach(function (zigbee) {
1075
1083
  // @ts-ignore
1076
1084
  zigbeeAllArray.push(zigbee);
1077
1085
  });
1086
+ adapter.log("loadZigbeeDevicesAll | Zwischen 8: " + loadZigbeeDevicesAll.length);
1078
1087
  adapter.loadZigbeeSchalter(adapter).forEach(function (zigbee) {
1079
1088
  // @ts-ignore
1080
1089
  zigbeeAllArray.push(zigbee);
1081
1090
  });
1091
+ adapter.log("loadZigbeeDevicesAll | Zwischen 9: " + loadZigbeeDevicesAll.length);
1082
1092
  adapter.loadZigbeeRepeater(adapter).forEach(function (zigbee) {
1083
1093
  // @ts-ignore
1084
1094
  zigbeeAllArray.push(zigbee);
1085
1095
  });
1096
+ adapter.log("loadZigbeeDevicesAll | Zwischen 10: " + loadZigbeeDevicesAll.length);
1086
1097
  adapter.loadZigbeeFenstersensor(adapter).forEach(function (zigbee) {
1087
1098
  // @ts-ignore
1088
1099
  zigbeeAllArray.push(zigbee);
1089
1100
  });
1101
+ adapter.log("loadZigbeeDevicesAll | Zwischen 11: " + loadZigbeeDevicesAll.length);
1090
1102
  return zigbeeAllArray;
1091
1103
  }
1092
1104
  exports.loadZigbeeDevicesAll = loadZigbeeDevicesAll;
package/zigbeeFunctions.ts CHANGED
@@ -1199,53 +1199,72 @@ export function loadZigbeeFenstersensor(adapter: any) {
1199
1199
  var zigbeeAllArray = null;
1200
1200
  export function loadZigbeeDevicesAll(adapter: any) {
1201
1201
  if (zigbeeAllArray != null) {
1202
+ adapter.log("loadZigbeeDevicesAll | Return from cache: " + loadZigbeeDevicesAll.length);
1202
1203
  return zigbeeAllArray;
1203
1204
  }
1204
1205
 
1205
1206
  // @ts-ignore
1206
1207
  zigbeeAllArray = [];
1207
-
1208
+ adapter.log("loadZigbeeDevicesAll | Zwischen 1: " + loadZigbeeDevicesAll.length);
1208
1209
  adapter.loadZigbeeSteckdosen(adapter).forEach(zigbee => {
1209
1210
  // @ts-ignore
1210
1211
  zigbeeAllArray.push(zigbee);
1211
1212
  });
1213
+
1214
+ adapter.log("loadZigbeeDevicesAll | Zwischen 2: " + loadZigbeeDevicesAll.length);
1212
1215
  adapter.loadZigbeeBewegungsmelder(adapter).forEach(zigbee => {
1213
1216
  // @ts-ignore
1214
1217
  zigbeeAllArray.push(zigbee);
1215
1218
  });
1219
+
1220
+ adapter.log("loadZigbeeDevicesAll | Zwischen 3: " + loadZigbeeDevicesAll.length);
1216
1221
  adapter.loadZigbeeLampenRGB(adapter).forEach(zigbee => {
1217
1222
  // @ts-ignore
1218
1223
  zigbeeAllArray.push(zigbee);
1219
1224
  });
1225
+
1226
+ adapter.log("loadZigbeeDevicesAll | Zwischen 4: " + loadZigbeeDevicesAll.length);
1220
1227
  adapter.loadZigbeeLampenWeiss(adapter).forEach(zigbee => {
1221
1228
  // @ts-ignore
1222
1229
  zigbeeAllArray.push(zigbee);
1223
1230
  });
1231
+
1232
+ adapter.log("loadZigbeeDevicesAll | Zwischen 5: " + loadZigbeeDevicesAll.length);
1224
1233
  adapter.loadZigbeeRauchmeler(adapter).forEach(zigbee => {
1225
1234
  // @ts-ignore
1226
1235
  zigbeeAllArray.push(zigbee);
1227
1236
  });
1237
+
1238
+ adapter.log("loadZigbeeDevicesAll | Zwischen 6: " + loadZigbeeDevicesAll.length);
1228
1239
  adapter.loadZigbeeWandtaster(adapter).forEach(zigbee => {
1229
1240
  // @ts-ignore
1230
1241
  zigbeeAllArray.push(zigbee);
1231
1242
  });
1243
+
1244
+ adapter.log("loadZigbeeDevicesAll | Zwischen 7: " + loadZigbeeDevicesAll.length);
1232
1245
  adapter.loadZigbeeDosenrelais(adapter).forEach(zigbee => {
1233
1246
  // @ts-ignore
1234
1247
  zigbeeAllArray.push(zigbee);
1235
1248
  });
1249
+
1250
+ adapter.log("loadZigbeeDevicesAll | Zwischen 8: " + loadZigbeeDevicesAll.length);
1236
1251
  adapter.loadZigbeeSchalter(adapter).forEach(zigbee => {
1237
1252
  // @ts-ignore
1238
1253
  zigbeeAllArray.push(zigbee);
1239
1254
  });
1255
+
1256
+ adapter.log("loadZigbeeDevicesAll | Zwischen 9: " + loadZigbeeDevicesAll.length);
1240
1257
  adapter.loadZigbeeRepeater(adapter).forEach(zigbee => {
1241
1258
  // @ts-ignore
1242
1259
  zigbeeAllArray.push(zigbee);
1243
1260
  });
1261
+
1262
+ adapter.log("loadZigbeeDevicesAll | Zwischen 10: " + loadZigbeeDevicesAll.length);
1244
1263
  adapter.loadZigbeeFenstersensor(adapter).forEach(zigbee => {
1245
1264
  // @ts-ignore
1246
1265
  zigbeeAllArray.push(zigbee);
1247
1266
  });
1248
-
1267
+ adapter.log("loadZigbeeDevicesAll | Zwischen 11: " + loadZigbeeDevicesAll.length);
1249
1268
  return zigbeeAllArray;
1250
1269
  }
1251
1270