iobroker.zigbee 1.8.3 → 1.8.7
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.
- package/README.md +6 -0
- package/admin/adapter-settings.js +244 -0
- package/admin/admin.js +520 -494
- package/admin/index_m.html +1171 -1001
- package/admin/tab_m.html +44 -2
- package/docs/de/img/CC2531.png +0 -0
- package/docs/de/img/CC2538_CC2592_PA.PNG +0 -0
- package/docs/de/img/CC2591.png +0 -0
- package/docs/de/img/boards.jpg +0 -0
- package/docs/de/img/cc26x2r.PNG +0 -0
- package/docs/de/img/results.jpg +0 -0
- package/docs/de/img/sku_429478_2.png +0 -0
- package/docs/de/img/sku_429601_2.png +0 -0
- package/docs/de/readme.md +27 -0
- package/docs/en/img/CC2531.png +0 -0
- package/docs/en/img/CC2591.png +0 -0
- package/docs/en/img/deconz.png +0 -0
- package/docs/en/img/sku_429478_2.png +0 -0
- package/docs/en/img/sku_429601_2.png +0 -0
- package/docs/en/readme.md +30 -0
- package/docs/flashing_via_arduino_(en).md +110 -0
- package/docs/ru/img/CC2531.png +0 -0
- package/docs/ru/img/CC2591.png +0 -0
- package/docs/ru/img/sku_429478_2.png +0 -0
- package/docs/ru/img/sku_429601_2.png +0 -0
- package/docs/ru/readme.md +28 -0
- package/docs/tutorial/CC2530_20190425.zip +0 -0
- package/docs/tutorial/CC2530_CC2591_20190515.zip +0 -0
- package/docs/tutorial/CC2530_CC2592_20190515.zip +0 -0
- package/docs/tutorial/CC2531_20190425.zip +0 -0
- package/docs/tutorial/adm5_1.PNG +0 -0
- package/docs/tutorial/adm5_2.PNG +0 -0
- package/docs/tutorial/cat.PNG +0 -0
- package/docs/tutorial/groups-1.png +0 -0
- package/docs/tutorial/groups-2.png +0 -0
- package/docs/tutorial/inst.PNG +0 -0
- package/docs/tutorial/reflash-finish.PNG +0 -0
- package/docs/tutorial/reflash-step0.png +0 -0
- package/docs/tutorial/reflash-step1.PNG +0 -0
- package/docs/tutorial/reflash-step2.PNG +0 -0
- package/docs/tutorial/settings.png +0 -0
- package/docs/tutorial/tab-dev-1.png +0 -0
- package/docs/tutorial/zigbee.png +0 -0
- package/docs/tutorial/zigbee15.png +0 -0
- package/io-package.json +34 -33
- package/lib/backup.js +2 -2
- package/lib/binding.js +32 -37
- package/lib/colors.js +163 -158
- package/lib/commands.js +100 -91
- package/lib/developer.js +9 -12
- package/lib/devices.js +168 -178
- package/lib/exclude.js +30 -36
- package/lib/exposes.js +168 -143
- package/lib/groups.js +81 -83
- package/lib/json.js +5 -6
- package/lib/networkmap.js +2 -3
- package/lib/ota.js +34 -18
- package/lib/rgb.js +114 -72
- package/lib/seriallist.js +25 -20
- package/lib/statescontroller.js +206 -183
- package/lib/utils.js +29 -23
- package/lib/zbBaseExtension.js +4 -4
- package/lib/zbDelayedAction.js +5 -13
- package/lib/zbDeviceAvailability.js +69 -65
- package/lib/zbDeviceConfigure.js +9 -21
- package/lib/zbDeviceEvent.js +3 -4
- package/lib/zigbeecontroller.js +133 -128
- package/main.js +169 -154
- package/package.json +28 -14
- package/.eslintignore +0 -2
- package/.eslintrc.json +0 -37
- package/.github/FUNDING.yml +0 -3
- package/.github/auto-merge.yml +0 -17
- package/.github/dependabot.yml +0 -24
- package/.github/stale.yml +0 -13
- package/.github/workflows/codeql.yml +0 -41
- package/.github/workflows/dependabot-automerge.yml +0 -22
- package/.github/workflows/test-and-release.yml +0 -149
- package/.releaseconfig.json +0 -3
- package/.travis/wiki.sh +0 -28
- package/.travis.yml +0 -41
- package/gulpfile.js +0 -464
- package/test/integration.js +0 -5
- package/test/mocha.custom.opts +0 -2
- package/test/mocha.setup.js +0 -14
- package/test/package.js +0 -5
- package/test/unit.js +0 -5
package/README.md
CHANGED
|
@@ -133,6 +133,12 @@ You can thank the authors by these links:
|
|
|
133
133
|
|
|
134
134
|
|
|
135
135
|
## Changelog
|
|
136
|
+
### 1.8.7 (2022-12-01)
|
|
137
|
+
* (arteck) fix exposes
|
|
138
|
+
|
|
139
|
+
### 1.8.5 (2022-11-30)
|
|
140
|
+
* (arteck) fix for new code
|
|
141
|
+
|
|
136
142
|
### 1.8.3 (2022-11-30)
|
|
137
143
|
* (arteck) back to old source
|
|
138
144
|
|
|
@@ -0,0 +1,244 @@
|
|
|
1
|
+
/*global $, location, socket, document, window, io, alert, load, systemDictionary, systemLang, translateAll*/
|
|
2
|
+
const path = location.pathname;
|
|
3
|
+
const parts = path.split('/');
|
|
4
|
+
parts.splice(-3);
|
|
5
|
+
|
|
6
|
+
const socket = io.connect('/', { path: parts.join('/') + '/socket.io' });
|
|
7
|
+
var query = (window.location.search || '').replace(/^\?/, '').replace(/#.*$/, '');
|
|
8
|
+
var args = {};
|
|
9
|
+
let theme = null;
|
|
10
|
+
|
|
11
|
+
// parse parameters
|
|
12
|
+
query.trim().split('&').filter(function (t) { return t.trim(); }).forEach(function (b, i) {
|
|
13
|
+
const parts = b.split('=');
|
|
14
|
+
if (!i && parts.length === 1 && !isNaN(parseInt(b, 10))) {
|
|
15
|
+
args.instance = parseInt(b, 10);
|
|
16
|
+
}
|
|
17
|
+
var name = parts[0];
|
|
18
|
+
args[name] = parts.length === 2 ? parts[1] : true;
|
|
19
|
+
|
|
20
|
+
if (name === 'instance') {
|
|
21
|
+
args.instance = parseInt(args.instance, 10) || 0;
|
|
22
|
+
}
|
|
23
|
+
|
|
24
|
+
if (args[name] === 'true') {
|
|
25
|
+
args[name] = true;
|
|
26
|
+
} else if (args[name] === 'false') {
|
|
27
|
+
args[name] = false;
|
|
28
|
+
}
|
|
29
|
+
});
|
|
30
|
+
|
|
31
|
+
var instance = args.instance;
|
|
32
|
+
|
|
33
|
+
let common = null; // common information of adapter
|
|
34
|
+
const host = null; // host object on which the adapter runs
|
|
35
|
+
const changed = false;
|
|
36
|
+
let systemConfig;
|
|
37
|
+
let certs = [];
|
|
38
|
+
let adapter = '';
|
|
39
|
+
const onChangeSupported = false;
|
|
40
|
+
|
|
41
|
+
const tmp = window.location.pathname.split('/');
|
|
42
|
+
adapter = tmp[tmp.length - 2];
|
|
43
|
+
const _adapterInstance = 'system.adapter.' + adapter + '.' + instance;
|
|
44
|
+
|
|
45
|
+
$(document).ready(function () {
|
|
46
|
+
'use strict';
|
|
47
|
+
loadSystemConfig(function () {
|
|
48
|
+
if (typeof translateAll === 'function') translateAll();
|
|
49
|
+
loadSettings(prepareTooltips);
|
|
50
|
+
});
|
|
51
|
+
});
|
|
52
|
+
|
|
53
|
+
|
|
54
|
+
// Read language settings
|
|
55
|
+
function loadSystemConfig(callback) {
|
|
56
|
+
socket.emit('getObject', 'system.config', function (err, res) {
|
|
57
|
+
if (!err && res && res.common) {
|
|
58
|
+
systemLang = res.common.language || systemLang;
|
|
59
|
+
systemConfig = res;
|
|
60
|
+
}
|
|
61
|
+
socket.emit('getObject', 'system.certificates', function (err, res) {
|
|
62
|
+
if (!err && res) {
|
|
63
|
+
if (res.native && res.native.certificates) {
|
|
64
|
+
certs = [];
|
|
65
|
+
for (const c in res.native.certificates) {
|
|
66
|
+
if (res.native.certificates.hasOwnProperty(c) && !res.native.certificates[c]) continue;
|
|
67
|
+
const _cert = {
|
|
68
|
+
name: c,
|
|
69
|
+
type: (res.native.certificates[c].substring(0, '-----BEGIN RSA PRIVATE KEY'.length) === '-----BEGIN RSA PRIVATE KEY' || res.native.certificates[c].substring(0, '-----BEGIN PRIVATE KEY'.length) === '-----BEGIN PRIVATE KEY') ? 'private' : 'public'
|
|
70
|
+
};
|
|
71
|
+
if (_cert.type === 'public') {
|
|
72
|
+
const m = res.native.certificates[c].split('-----END CERTIFICATE-----');
|
|
73
|
+
let count = 0;
|
|
74
|
+
for (let _m = 0; _m < m.length; _m++) {
|
|
75
|
+
if (m[_m].replace(/[\r\n|\r|\n]+/, '').trim()) count++;
|
|
76
|
+
}
|
|
77
|
+
if (count > 1) _cert.type = 'chained';
|
|
78
|
+
}
|
|
79
|
+
|
|
80
|
+
certs.push(_cert);
|
|
81
|
+
}
|
|
82
|
+
}
|
|
83
|
+
}
|
|
84
|
+
if (callback) callback();
|
|
85
|
+
});
|
|
86
|
+
});
|
|
87
|
+
}
|
|
88
|
+
|
|
89
|
+
function loadSettings(callback) {
|
|
90
|
+
socket.emit('getObject', _adapterInstance, function (err, res) {
|
|
91
|
+
if (!err && res && res.native) {
|
|
92
|
+
$('.adapter-instance').html(adapter + '.' + instance);
|
|
93
|
+
$('.adapter-config').html('system.adapter.' + adapter + '.' + instance);
|
|
94
|
+
common = res.common;
|
|
95
|
+
if (res.common && res.common.name) $('.adapter-name').html(res.common.name);
|
|
96
|
+
if (typeof load === 'undefined') {
|
|
97
|
+
alert('Please implement save function in your admin/index.html');
|
|
98
|
+
} else {
|
|
99
|
+
// detect, that we are now in react container (themeNames = ['dark', 'blue', 'colored', 'light'])
|
|
100
|
+
|
|
101
|
+
const _query = query.split('&');
|
|
102
|
+
|
|
103
|
+
for (var q = 0; q < _query.length; q++) {
|
|
104
|
+
if (_query[q].indexOf('react=') !== -1) {
|
|
105
|
+
$('.adapter-container').addClass('react-' + _query[q].substring(6));
|
|
106
|
+
theme = 'react-' + _query[q].substring(6);
|
|
107
|
+
}
|
|
108
|
+
}
|
|
109
|
+
|
|
110
|
+
load(res.native, onChange);
|
|
111
|
+
}
|
|
112
|
+
if (typeof callback === 'function') {
|
|
113
|
+
callback();
|
|
114
|
+
}
|
|
115
|
+
} else {
|
|
116
|
+
if (typeof callback === 'function') {
|
|
117
|
+
callback();
|
|
118
|
+
}
|
|
119
|
+
alert('error loading settings for ' + _adapterInstance + '\n\n' + err);
|
|
120
|
+
}
|
|
121
|
+
});
|
|
122
|
+
}
|
|
123
|
+
|
|
124
|
+
function prepareTooltips() {
|
|
125
|
+
$('.admin-icon').each(function () {
|
|
126
|
+
let id = $(this).data('id');
|
|
127
|
+
if (!id) {
|
|
128
|
+
let $prev = $(this).prev();
|
|
129
|
+
let $input = $prev.find('input');
|
|
130
|
+
if (!$input.length) $input = $prev.find('select');
|
|
131
|
+
if (!$input.length) $input = $prev.find('textarea');
|
|
132
|
+
|
|
133
|
+
if (!$input.length) {
|
|
134
|
+
$prev = $prev.parent();
|
|
135
|
+
$input = $prev.find('input');
|
|
136
|
+
if (!$input.length) $input = $prev.find('select');
|
|
137
|
+
if (!$input.length) $input = $prev.find('textarea');
|
|
138
|
+
}
|
|
139
|
+
if ($input.length) id = $input.attr('id');
|
|
140
|
+
}
|
|
141
|
+
|
|
142
|
+
if (!id) return;
|
|
143
|
+
|
|
144
|
+
let tooltip = '';
|
|
145
|
+
if (systemDictionary['tooltip_' + id]) {
|
|
146
|
+
tooltip = systemDictionary['tooltip_' + id][systemLang] || systemDictionary['tooltip_' + id].en;
|
|
147
|
+
}
|
|
148
|
+
|
|
149
|
+
let icon = '';
|
|
150
|
+
let link = $(this).data('link');
|
|
151
|
+
if (link) {
|
|
152
|
+
if (link === true) {
|
|
153
|
+
if (common.readme) {
|
|
154
|
+
link = common.readme + '#' + id;
|
|
155
|
+
} else {
|
|
156
|
+
link = 'https://github.com/ioBroker/ioBroker.' + common.name + '#' + id;
|
|
157
|
+
}
|
|
158
|
+
}
|
|
159
|
+
if (!link.match('^https?:\/\/')) {
|
|
160
|
+
if (common.readme) {
|
|
161
|
+
link = common.readme + '#' + link;
|
|
162
|
+
} else {
|
|
163
|
+
link = 'https://github.com/ioBroker/ioBroker.' + common.name + '#' + link;
|
|
164
|
+
}
|
|
165
|
+
}
|
|
166
|
+
icon += '<a class="admin-tooltip-link" target="config_help" href="' + link + '" title="' + (tooltip || systemDictionary.htooltip[systemLang]) + '"><img class="admin-tooltip-icon" src="../../img/info.png" /></a>';
|
|
167
|
+
} else if (tooltip) {
|
|
168
|
+
icon += '<img class="admin-tooltip-icon" title="' + tooltip + '" src="../../img/info.png"/>';
|
|
169
|
+
}
|
|
170
|
+
|
|
171
|
+
if (icon) {
|
|
172
|
+
$(this).html(icon);
|
|
173
|
+
}
|
|
174
|
+
});
|
|
175
|
+
$('.admin-text').each(function () {
|
|
176
|
+
let id = $(this).data('id');
|
|
177
|
+
if (!id) {
|
|
178
|
+
let $prev = $(this).prev();
|
|
179
|
+
let $input = $prev.find('input');
|
|
180
|
+
if (!$input.length) $input = $prev.find('select');
|
|
181
|
+
if (!$input.length) $input = $prev.find('textarea');
|
|
182
|
+
if (!$input.length) {
|
|
183
|
+
$prev = $prev.parent();
|
|
184
|
+
$input = $prev.find('input');
|
|
185
|
+
if (!$input.length) $input = $prev.find('select');
|
|
186
|
+
if (!$input.length) $input = $prev.find('textarea');
|
|
187
|
+
}
|
|
188
|
+
if ($input.length) id = $input.attr('id');
|
|
189
|
+
}
|
|
190
|
+
|
|
191
|
+
if (!id) return;
|
|
192
|
+
|
|
193
|
+
// check if translation for this exist
|
|
194
|
+
if (systemDictionary['info_' + id]) {
|
|
195
|
+
$(this).html('<span class="admin-tooltip-text">' + (systemDictionary['info_' + id][systemLang] || systemDictionary['info_' + id].en) + '</span>');
|
|
196
|
+
}
|
|
197
|
+
});
|
|
198
|
+
}
|
|
199
|
+
|
|
200
|
+
|
|
201
|
+
function sendTo(_adapter_instance, command, message, callback) {
|
|
202
|
+
socket.emit('sendTo', (_adapter_instance || adapter + '.' + instance), command, message, callback);
|
|
203
|
+
}
|
|
204
|
+
|
|
205
|
+
function sendToHost(host, command, message, callback) {
|
|
206
|
+
socket.emit('sendToHost', host || common.host, command, message, callback);
|
|
207
|
+
}
|
|
208
|
+
|
|
209
|
+
function onChange(isChanged) {
|
|
210
|
+
//
|
|
211
|
+
}
|
|
212
|
+
|
|
213
|
+
function showMessage(message, title, icon) {
|
|
214
|
+
var $dialogMessage;
|
|
215
|
+
// noinspection JSJQueryEfficiency
|
|
216
|
+
$dialogMessage = $('#dialog-message');
|
|
217
|
+
if (!$dialogMessage.length) {
|
|
218
|
+
$('body').append(
|
|
219
|
+
'<div class="m"><div id="dialog-message" class="modal modal-fixed-footer">' +
|
|
220
|
+
' <div class="modal-content">' +
|
|
221
|
+
' <h6 class="dialog-title title"></h6>' +
|
|
222
|
+
' <p><i class="large material-icons dialog-icon"></i><span class="dialog-text"></span></p>' +
|
|
223
|
+
' </div>' +
|
|
224
|
+
' <div class="modal-footer">' +
|
|
225
|
+
' <a class="modal-action modal-close waves-effect waves-green btn-flat translate">Ok</a>' +
|
|
226
|
+
' </div>' +
|
|
227
|
+
'</div></div>');
|
|
228
|
+
$dialogMessage = $('#dialog-message');
|
|
229
|
+
}
|
|
230
|
+
if (icon) {
|
|
231
|
+
$dialogMessage.find('.dialog-icon')
|
|
232
|
+
.show()
|
|
233
|
+
.html(icon);
|
|
234
|
+
} else {
|
|
235
|
+
$dialogMessage.find('.dialog-icon').hide();
|
|
236
|
+
}
|
|
237
|
+
if (title) {
|
|
238
|
+
$dialogMessage.find('.dialog-title').html(title).show();
|
|
239
|
+
} else {
|
|
240
|
+
$dialogMessage.find('.dialog-title').hide();
|
|
241
|
+
}
|
|
242
|
+
$dialogMessage.find('.dialog-text').html(message);
|
|
243
|
+
$dialogMessage.modal().modal('open');
|
|
244
|
+
}
|