iobroker.zigbee 1.5.6 → 1.6.8

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 (64) hide show
  1. package/.devcontainer/devcontainer.json +35 -35
  2. package/.devcontainer/docker-compose.yml +51 -51
  3. package/.devcontainer/iobroker/Dockerfile +1 -1
  4. package/.devcontainer/nginx/nginx.conf +32 -32
  5. package/.devcontainer/parcel/Dockerfile +8 -8
  6. package/.devcontainer/parcel/run.sh +6 -6
  7. package/.eslintignore +1 -1
  8. package/.eslintrc.json +36 -36
  9. package/.github/FUNDING.yml +3 -3
  10. package/.github/stale.yml +13 -13
  11. package/.github/workflows/test-and-release.yml +151 -151
  12. package/.travis/wiki.sh +27 -27
  13. package/LICENSE +21 -21
  14. package/README.md +385 -353
  15. package/admin/adapter-settings.js +244 -208
  16. package/admin/admin.js +2704 -2714
  17. package/admin/img/R7060.png +0 -0
  18. package/admin/img/WHD02.png +0 -0
  19. package/admin/img/ikea_E1812.png +0 -0
  20. package/admin/img/philips_hue_lom001.png +0 -0
  21. package/admin/img/tuya_rb280.png +0 -0
  22. package/admin/index.html +159 -159
  23. package/admin/index_m.html +1055 -965
  24. package/admin/moment.min.js +1 -1
  25. package/admin/shuffle.min.js +2 -2
  26. package/admin/tab_m.html +1025 -934
  27. package/admin/vis-network.min.js +26 -26
  28. package/admin/words.js +106 -106
  29. package/docs/de/readme.md +27 -27
  30. package/docs/en/readme.md +30 -30
  31. package/docs/flashing_via_arduino_(en).md +110 -110
  32. package/docs/ru/readme.md +28 -28
  33. package/docs/tutorial/groups-1.png +0 -0
  34. package/docs/tutorial/groups-2.png +0 -0
  35. package/docs/tutorial/tab-dev-1.png +0 -0
  36. package/docs/tutorial/zigbee.png +0 -0
  37. package/io-package.json +317 -290
  38. package/lib/backup.js +132 -132
  39. package/lib/binding.js +325 -325
  40. package/lib/colors.js +460 -460
  41. package/lib/commands.js +435 -434
  42. package/lib/developer.js +148 -144
  43. package/lib/devices.js +3119 -3109
  44. package/lib/exclude.js +168 -168
  45. package/lib/exposes.js +204 -51
  46. package/lib/groups.js +316 -316
  47. package/lib/json.js +60 -60
  48. package/lib/networkmap.js +56 -56
  49. package/lib/ota.js +153 -153
  50. package/lib/rgb.js +225 -225
  51. package/lib/seriallist.js +37 -37
  52. package/lib/states.js +6381 -6322
  53. package/lib/statescontroller.js +502 -495
  54. package/lib/tools.js +54 -54
  55. package/lib/utils.js +151 -132
  56. package/lib/zbBaseExtension.js +31 -27
  57. package/lib/zbDelayedAction.js +151 -146
  58. package/lib/zbDeviceAvailability.js +306 -304
  59. package/lib/zbDeviceConfigure.js +148 -143
  60. package/lib/zbDeviceEvent.js +43 -43
  61. package/lib/zigbeecontroller.js +856 -822
  62. package/main.js +113 -39
  63. package/package.json +74 -73
  64. package/support/docgen.js +93 -93
package/lib/backup.js CHANGED
@@ -1,133 +1,133 @@
1
- 'use strict';
2
-
3
- const fs = require('fs');
4
- const pathLib = require('path');
5
-
6
- class Backup {
7
- constructor(adapter) {
8
- this.adapter = adapter;
9
- this.adapter.on('message', this.onMessage.bind(this));
10
- this.inProgress = new Set();
11
- }
12
-
13
- start(zbController, stController) {
14
- this.zbController = zbController;
15
- this.stController = stController;
16
- }
17
-
18
- stop() {
19
- delete this.zbController;
20
- delete this.stController;
21
- }
22
-
23
- info(msg) {
24
- this.adapter.log.info(msg);
25
- }
26
-
27
- warn(msg) {
28
- this.adapter.log.info(msg);
29
- }
30
-
31
- error(msg) {
32
- this.adapter.log.error(msg);
33
- }
34
-
35
- debug(msg) {
36
- this.adapter.log.debug(msg);
37
- }
38
-
39
- onMessage(obj) {
40
- if (typeof obj === 'object' && obj.command) {
41
- switch (obj.command) {
42
- case 'listbackups':
43
- this.listbackups(obj);
44
- break;
45
- case 'restore':
46
- this.restore(obj);
47
- break;
48
- }
49
- }
50
- }
51
-
52
- async configure (zigbeeOptions) {
53
- this.zigbeeOptions = zigbeeOptions;
54
- this.backup(zigbeeOptions);
55
- }
56
-
57
- backup(options) {
58
- // backup prior database and nv data before start adapter
59
- const files = [];
60
- if (fs.existsSync(pathLib.join(options.dbDir, options.backupPath))) files.push(options.backupPath);
61
- if (fs.existsSync(pathLib.join(options.dbDir, options.dbPath))) files.push(options.dbPath);
62
- if (files.length == 0) return;
63
-
64
- const d = new Date();
65
- const backup_name = `${d.getFullYear()}_${('0' + (d.getMonth() + 1)).slice(-2)}_${('0' + d.getDate()).slice(-2)}-`+
66
- `${('0' + d.getHours()).slice(-2)}_${('0' + d.getMinutes()).slice(-2)}_${('0' + d.getSeconds()).slice(-2)}`;
67
- const tar = require('tar');
68
- const name = pathLib.join(options.dbDir, `backup_${backup_name}.tar.gz`);
69
- const f = fs.createWriteStream(name);
70
- f.on('finish', () => {
71
- this.debug(`Backup ${name} success`);
72
- });
73
- f.on('error', err => {
74
- this.error(`Cannot pack backup ${name}: ` + err);
75
- });
76
- try {
77
- tar.create({gzip: true, p: false, cwd: options.dbDir}, files).pipe(f);
78
- } catch (err) {
79
- this.error(`Cannot pack backup ${name}: ` + err);
80
- }
81
- }
82
-
83
- listBackupsFiles() {
84
- const dir = this.zigbeeOptions.dbDir;
85
- const result = [];
86
- if (fs.existsSync(dir)) {
87
- const files = fs.readdirSync(dir);
88
- for (let i = 0; i < files.length; i++) {
89
- if (files[i].match(/\.tar\.gz$/i)) {
90
- result.push(files[i]);
91
- }
92
- }
93
- return result;
94
- } else {
95
- return result;
96
- }
97
- }
98
-
99
- // eslint-disable-next-line no-unused-vars
100
- async listbackups(obj) {
101
-
102
- }
103
-
104
- async restore(options, name) {
105
- if (fs.existsSync(pathLib.join(options.dbDir, name))) {
106
- try {
107
- this.log.info('Stop herdsman');
108
- if (this.reconnectTimer) clearTimeout(this.reconnectTimer);
109
- this.callPluginMethod('stop');
110
- if (this.zbController) {
111
- await this.zbController.stop();
112
- }
113
- const tar = require('tar');
114
- try {
115
- tar.extract({file: name, cwd: options.dbDir}, err => {
116
- if (err) {
117
- this.log.error(`Cannot extract from file ${name}: ${err}`);
118
- } else {
119
- this.log.info(`Extract from file ${name} success`);
120
- }
121
- this.doConnect();
122
- });
123
- } catch (err) {
124
- this.log.error(`Cannot extrack backup ${name}: ${err}`);
125
- }
126
- } catch (error) {
127
- this.log.error(`Stop herdsman error (${error.stack})`);
128
- }
129
- }
130
- }
131
- }
132
-
1
+ 'use strict';
2
+
3
+ const fs = require('fs');
4
+ const pathLib = require('path');
5
+
6
+ class Backup {
7
+ constructor(adapter) {
8
+ this.adapter = adapter;
9
+ this.adapter.on('message', this.onMessage.bind(this));
10
+ this.inProgress = new Set();
11
+ }
12
+
13
+ start(zbController, stController) {
14
+ this.zbController = zbController;
15
+ this.stController = stController;
16
+ }
17
+
18
+ stop() {
19
+ delete this.zbController;
20
+ delete this.stController;
21
+ }
22
+
23
+ info(msg) {
24
+ this.adapter.log.info(msg);
25
+ }
26
+
27
+ warn(msg) {
28
+ this.adapter.log.info(msg);
29
+ }
30
+
31
+ error(msg) {
32
+ this.adapter.log.error(msg);
33
+ }
34
+
35
+ debug(msg) {
36
+ this.adapter.log.debug(msg);
37
+ }
38
+
39
+ onMessage(obj) {
40
+ if (typeof obj === 'object' && obj.command) {
41
+ switch (obj.command) {
42
+ case 'listbackups':
43
+ this.listbackups(obj);
44
+ break;
45
+ case 'restore':
46
+ this.restore(obj);
47
+ break;
48
+ }
49
+ }
50
+ }
51
+
52
+ async configure (zigbeeOptions) {
53
+ this.zigbeeOptions = zigbeeOptions;
54
+ this.backup(zigbeeOptions);
55
+ }
56
+
57
+ backup(options) {
58
+ // backup prior database and nv data before start adapter
59
+ const files = [];
60
+ if (fs.existsSync(pathLib.join(options.dbDir, options.backupPath))) files.push(options.backupPath);
61
+ if (fs.existsSync(pathLib.join(options.dbDir, options.dbPath))) files.push(options.dbPath);
62
+ if (files.length == 0) return;
63
+
64
+ const d = new Date();
65
+ const backup_name = `${d.getFullYear()}_${('0' + (d.getMonth() + 1)).slice(-2)}_${('0' + d.getDate()).slice(-2)}-`+
66
+ `${('0' + d.getHours()).slice(-2)}_${('0' + d.getMinutes()).slice(-2)}_${('0' + d.getSeconds()).slice(-2)}`;
67
+ const tar = require('tar');
68
+ const name = pathLib.join(options.dbDir, `backup_${backup_name}.tar.gz`);
69
+ const f = fs.createWriteStream(name);
70
+ f.on('finish', () => {
71
+ this.debug(`Backup ${name} success`);
72
+ });
73
+ f.on('error', err => {
74
+ this.error(`Cannot pack backup ${name}: ` + err);
75
+ });
76
+ try {
77
+ tar.create({gzip: true, p: false, cwd: options.dbDir}, files).pipe(f);
78
+ } catch (err) {
79
+ this.error(`Cannot pack backup ${name}: ` + err);
80
+ }
81
+ }
82
+
83
+ listBackupsFiles() {
84
+ const dir = this.zigbeeOptions.dbDir;
85
+ const result = [];
86
+ if (fs.existsSync(dir)) {
87
+ const files = fs.readdirSync(dir);
88
+ for (let i = 0; i < files.length; i++) {
89
+ if (files[i].match(/\.tar\.gz$/i)) {
90
+ result.push(files[i]);
91
+ }
92
+ }
93
+ return result;
94
+ } else {
95
+ return result;
96
+ }
97
+ }
98
+
99
+ // eslint-disable-next-line no-unused-vars
100
+ async listbackups(obj) {
101
+
102
+ }
103
+
104
+ async restore(options, name) {
105
+ if (fs.existsSync(pathLib.join(options.dbDir, name))) {
106
+ try {
107
+ this.log.info('Stop herdsman');
108
+ if (this.reconnectTimer) clearTimeout(this.reconnectTimer);
109
+ this.callPluginMethod('stop');
110
+ if (this.zbController) {
111
+ await this.zbController.stop();
112
+ }
113
+ const tar = require('tar');
114
+ try {
115
+ tar.extract({file: name, cwd: options.dbDir}, err => {
116
+ if (err) {
117
+ this.log.error(`Cannot extract from file ${name}: ${err}`);
118
+ } else {
119
+ this.log.info(`Extract from file ${name} success`);
120
+ }
121
+ this.doConnect();
122
+ });
123
+ } catch (err) {
124
+ this.log.error(`Cannot extrack backup ${name}: ${err}`);
125
+ }
126
+ } catch (error) {
127
+ this.log.error(`Stop herdsman error (${error.stack})`);
128
+ }
129
+ }
130
+ }
131
+ }
132
+
133
133
  module.exports = Backup;