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.
- package/.devcontainer/devcontainer.json +35 -35
- package/.devcontainer/docker-compose.yml +51 -51
- package/.devcontainer/iobroker/Dockerfile +1 -1
- package/.devcontainer/nginx/nginx.conf +32 -32
- package/.devcontainer/parcel/Dockerfile +8 -8
- package/.devcontainer/parcel/run.sh +6 -6
- package/.eslintignore +1 -1
- package/.eslintrc.json +36 -36
- package/.github/FUNDING.yml +3 -3
- package/.github/stale.yml +13 -13
- package/.github/workflows/test-and-release.yml +151 -151
- package/.travis/wiki.sh +27 -27
- package/LICENSE +21 -21
- package/README.md +385 -353
- package/admin/adapter-settings.js +244 -208
- package/admin/admin.js +2704 -2714
- package/admin/img/R7060.png +0 -0
- package/admin/img/WHD02.png +0 -0
- package/admin/img/ikea_E1812.png +0 -0
- package/admin/img/philips_hue_lom001.png +0 -0
- package/admin/img/tuya_rb280.png +0 -0
- package/admin/index.html +159 -159
- package/admin/index_m.html +1055 -965
- package/admin/moment.min.js +1 -1
- package/admin/shuffle.min.js +2 -2
- package/admin/tab_m.html +1025 -934
- package/admin/vis-network.min.js +26 -26
- package/admin/words.js +106 -106
- package/docs/de/readme.md +27 -27
- package/docs/en/readme.md +30 -30
- package/docs/flashing_via_arduino_(en).md +110 -110
- package/docs/ru/readme.md +28 -28
- package/docs/tutorial/groups-1.png +0 -0
- package/docs/tutorial/groups-2.png +0 -0
- package/docs/tutorial/tab-dev-1.png +0 -0
- package/docs/tutorial/zigbee.png +0 -0
- package/io-package.json +317 -290
- package/lib/backup.js +132 -132
- package/lib/binding.js +325 -325
- package/lib/colors.js +460 -460
- package/lib/commands.js +435 -434
- package/lib/developer.js +148 -144
- package/lib/devices.js +3119 -3109
- package/lib/exclude.js +168 -168
- package/lib/exposes.js +204 -51
- package/lib/groups.js +316 -316
- package/lib/json.js +60 -60
- package/lib/networkmap.js +56 -56
- package/lib/ota.js +153 -153
- package/lib/rgb.js +225 -225
- package/lib/seriallist.js +37 -37
- package/lib/states.js +6381 -6322
- package/lib/statescontroller.js +502 -495
- package/lib/tools.js +54 -54
- package/lib/utils.js +151 -132
- package/lib/zbBaseExtension.js +31 -27
- package/lib/zbDelayedAction.js +151 -146
- package/lib/zbDeviceAvailability.js +306 -304
- package/lib/zbDeviceConfigure.js +148 -143
- package/lib/zbDeviceEvent.js +43 -43
- package/lib/zigbeecontroller.js +856 -822
- package/main.js +113 -39
- package/package.json +74 -73
- package/support/docgen.js +93 -93
|
@@ -1,36 +1,36 @@
|
|
|
1
|
-
// For format details, see https://aka.ms/vscode-remote/devcontainer.json or this file's README at:
|
|
2
|
-
// https://github.com/microsoft/vscode-dev-containers/tree/v0.101.1/containers/docker-existing-docker-compose
|
|
3
|
-
// If you want to run as a non-root user in the container, see .devcontainer/docker-compose.yml.
|
|
4
|
-
{
|
|
5
|
-
"name": "ioBroker Docker Compose",
|
|
6
|
-
|
|
7
|
-
// Update the 'dockerComposeFile' list if you have more compose files or use different names.
|
|
8
|
-
// The .devcontainer/docker-compose.yml file contains any overrides you need/want to make.
|
|
9
|
-
"dockerComposeFile": ["docker-compose.yml"],
|
|
10
|
-
|
|
11
|
-
// The 'service' property is the name of the service for the container that VS Code should
|
|
12
|
-
// use. Update this value and .devcontainer/docker-compose.yml to the real service name.
|
|
13
|
-
"service": "iobroker",
|
|
14
|
-
|
|
15
|
-
// The optional 'workspaceFolder' property is the path VS Code should open by default when
|
|
16
|
-
// connected. This is typically a file mount in .devcontainer/docker-compose.yml
|
|
17
|
-
"workspaceFolder": "/workspace",
|
|
18
|
-
|
|
19
|
-
// Set *default* container specific settings.json values on container create.
|
|
20
|
-
"settings": {},
|
|
21
|
-
|
|
22
|
-
// Add the IDs of extensions you want installed when the container is created.
|
|
23
|
-
"extensions": ["dbaeumer.vscode-eslint", "esbenp.prettier-vscode"],
|
|
24
|
-
|
|
25
|
-
// Uncomment the next line if you want start specific services in your Docker Compose config.
|
|
26
|
-
// "runServices": [],
|
|
27
|
-
|
|
28
|
-
// Uncomment the next line if you want to keep your containers running after VS Code shuts down.
|
|
29
|
-
// "shutdownAction": "none",
|
|
30
|
-
|
|
31
|
-
// When creating the container, delete unnecessary adapters, disable error reporting, set the license as confirmed, and install/update this adapter
|
|
32
|
-
"postCreateCommand": "iob del discovery && iob plugin disable sentry && iob object set system.config common.licenseConfirmed=true && NPM_PACK=$(npm pack) && iob url \"$(pwd)/$NPM_PACK\" --debug && rm \"$NPM_PACK\""
|
|
33
|
-
|
|
34
|
-
// Uncomment to connect as a non-root user. See https://aka.ms/vscode-remote/containers/non-root.
|
|
35
|
-
//"remoteUser": "iobroker"
|
|
1
|
+
// For format details, see https://aka.ms/vscode-remote/devcontainer.json or this file's README at:
|
|
2
|
+
// https://github.com/microsoft/vscode-dev-containers/tree/v0.101.1/containers/docker-existing-docker-compose
|
|
3
|
+
// If you want to run as a non-root user in the container, see .devcontainer/docker-compose.yml.
|
|
4
|
+
{
|
|
5
|
+
"name": "ioBroker Docker Compose",
|
|
6
|
+
|
|
7
|
+
// Update the 'dockerComposeFile' list if you have more compose files or use different names.
|
|
8
|
+
// The .devcontainer/docker-compose.yml file contains any overrides you need/want to make.
|
|
9
|
+
"dockerComposeFile": ["docker-compose.yml"],
|
|
10
|
+
|
|
11
|
+
// The 'service' property is the name of the service for the container that VS Code should
|
|
12
|
+
// use. Update this value and .devcontainer/docker-compose.yml to the real service name.
|
|
13
|
+
"service": "iobroker",
|
|
14
|
+
|
|
15
|
+
// The optional 'workspaceFolder' property is the path VS Code should open by default when
|
|
16
|
+
// connected. This is typically a file mount in .devcontainer/docker-compose.yml
|
|
17
|
+
"workspaceFolder": "/workspace",
|
|
18
|
+
|
|
19
|
+
// Set *default* container specific settings.json values on container create.
|
|
20
|
+
"settings": {},
|
|
21
|
+
|
|
22
|
+
// Add the IDs of extensions you want installed when the container is created.
|
|
23
|
+
"extensions": ["dbaeumer.vscode-eslint", "esbenp.prettier-vscode"],
|
|
24
|
+
|
|
25
|
+
// Uncomment the next line if you want start specific services in your Docker Compose config.
|
|
26
|
+
// "runServices": [],
|
|
27
|
+
|
|
28
|
+
// Uncomment the next line if you want to keep your containers running after VS Code shuts down.
|
|
29
|
+
// "shutdownAction": "none",
|
|
30
|
+
|
|
31
|
+
// When creating the container, delete unnecessary adapters, disable error reporting, set the license as confirmed, and install/update this adapter
|
|
32
|
+
"postCreateCommand": "iob del discovery && iob plugin disable sentry && iob object set system.config common.licenseConfirmed=true && NPM_PACK=$(npm pack) && iob url \"$(pwd)/$NPM_PACK\" --debug && rm \"$NPM_PACK\""
|
|
33
|
+
|
|
34
|
+
// Uncomment to connect as a non-root user. See https://aka.ms/vscode-remote/containers/non-root.
|
|
35
|
+
//"remoteUser": "iobroker"
|
|
36
36
|
}
|
|
@@ -1,51 +1,51 @@
|
|
|
1
|
-
version: '3'
|
|
2
|
-
|
|
3
|
-
services:
|
|
4
|
-
iobroker:
|
|
5
|
-
build: ./iobroker
|
|
6
|
-
container_name: iobroker-zigbee-d
|
|
7
|
-
hostname: iobroker-zigbee-d
|
|
8
|
-
# This port is only internal, so we can work on this while another instance of ioBroker is running on the host
|
|
9
|
-
expose:
|
|
10
|
-
- 8081
|
|
11
|
-
volumes:
|
|
12
|
-
- ..:/workspace
|
|
13
|
-
- iobrokerdata-zigbee-d:/opt/iobroker
|
|
14
|
-
environment:
|
|
15
|
-
- LANG=en_US.UTF-8
|
|
16
|
-
- LANGUAGE=en_US:en
|
|
17
|
-
- LC_ALL=en_US.UTF-8
|
|
18
|
-
- TZ=Europe/Berlin
|
|
19
|
-
- SETGID=1000
|
|
20
|
-
|
|
21
|
-
parcel:
|
|
22
|
-
container_name: parcel-i2c
|
|
23
|
-
build: ./parcel
|
|
24
|
-
expose:
|
|
25
|
-
- 1234
|
|
26
|
-
ports:
|
|
27
|
-
- '1235:1235'
|
|
28
|
-
volumes:
|
|
29
|
-
- ..:/workspace
|
|
30
|
-
environment:
|
|
31
|
-
- CHOKIDAR_USEPOLLING=1
|
|
32
|
-
|
|
33
|
-
# Reverse proxy to load up-to-date admin sources from the repo
|
|
34
|
-
nginx:
|
|
35
|
-
image: nginx:latest
|
|
36
|
-
depends_on:
|
|
37
|
-
- iobroker
|
|
38
|
-
- parcel
|
|
39
|
-
links:
|
|
40
|
-
- iobroker
|
|
41
|
-
- parcel
|
|
42
|
-
container_name: nginx-dvlp
|
|
43
|
-
volumes:
|
|
44
|
-
- ./nginx/nginx.conf:/etc/nginx/nginx.conf
|
|
45
|
-
- ..:/workspace
|
|
46
|
-
ports:
|
|
47
|
-
# Make the ioBroker admin available under http://localhost:8082
|
|
48
|
-
- 8082:80
|
|
49
|
-
|
|
50
|
-
volumes:
|
|
51
|
-
iobrokerdata-zigbee-d:
|
|
1
|
+
version: '3'
|
|
2
|
+
|
|
3
|
+
services:
|
|
4
|
+
iobroker:
|
|
5
|
+
build: ./iobroker
|
|
6
|
+
container_name: iobroker-zigbee-d
|
|
7
|
+
hostname: iobroker-zigbee-d
|
|
8
|
+
# This port is only internal, so we can work on this while another instance of ioBroker is running on the host
|
|
9
|
+
expose:
|
|
10
|
+
- 8081
|
|
11
|
+
volumes:
|
|
12
|
+
- ..:/workspace
|
|
13
|
+
- iobrokerdata-zigbee-d:/opt/iobroker
|
|
14
|
+
environment:
|
|
15
|
+
- LANG=en_US.UTF-8
|
|
16
|
+
- LANGUAGE=en_US:en
|
|
17
|
+
- LC_ALL=en_US.UTF-8
|
|
18
|
+
- TZ=Europe/Berlin
|
|
19
|
+
- SETGID=1000
|
|
20
|
+
|
|
21
|
+
parcel:
|
|
22
|
+
container_name: parcel-i2c
|
|
23
|
+
build: ./parcel
|
|
24
|
+
expose:
|
|
25
|
+
- 1234
|
|
26
|
+
ports:
|
|
27
|
+
- '1235:1235'
|
|
28
|
+
volumes:
|
|
29
|
+
- ..:/workspace
|
|
30
|
+
environment:
|
|
31
|
+
- CHOKIDAR_USEPOLLING=1
|
|
32
|
+
|
|
33
|
+
# Reverse proxy to load up-to-date admin sources from the repo
|
|
34
|
+
nginx:
|
|
35
|
+
image: nginx:latest
|
|
36
|
+
depends_on:
|
|
37
|
+
- iobroker
|
|
38
|
+
- parcel
|
|
39
|
+
links:
|
|
40
|
+
- iobroker
|
|
41
|
+
- parcel
|
|
42
|
+
container_name: nginx-dvlp
|
|
43
|
+
volumes:
|
|
44
|
+
- ./nginx/nginx.conf:/etc/nginx/nginx.conf
|
|
45
|
+
- ..:/workspace
|
|
46
|
+
ports:
|
|
47
|
+
# Make the ioBroker admin available under http://localhost:8082
|
|
48
|
+
- 8082:80
|
|
49
|
+
|
|
50
|
+
volumes:
|
|
51
|
+
iobrokerdata-zigbee-d:
|
|
@@ -1,2 +1,2 @@
|
|
|
1
|
-
FROM buanet/iobroker:latest
|
|
1
|
+
FROM buanet/iobroker:latest
|
|
2
2
|
RUN ln -s /opt/iobroker/node_modules/ /root/.node_modules
|
|
@@ -1,33 +1,33 @@
|
|
|
1
|
-
|
|
2
|
-
worker_processes 1;
|
|
3
|
-
events { worker_connections 1024; }
|
|
4
|
-
|
|
5
|
-
http {
|
|
6
|
-
sendfile on;
|
|
7
|
-
keepalive_timeout 65;
|
|
8
|
-
|
|
9
|
-
server {
|
|
10
|
-
listen 80;
|
|
11
|
-
|
|
12
|
-
location / {
|
|
13
|
-
proxy_redirect off;
|
|
14
|
-
proxy_pass http://iobroker:8081;
|
|
15
|
-
}
|
|
16
|
-
|
|
17
|
-
location /socket.io/ {
|
|
18
|
-
proxy_pass http://iobroker:8081;
|
|
19
|
-
proxy_http_version 1.1;
|
|
20
|
-
proxy_set_header Upgrade $http_upgrade;
|
|
21
|
-
proxy_set_header Connection "Upgrade";
|
|
22
|
-
}
|
|
23
|
-
|
|
24
|
-
location /adapter/i2c/ {
|
|
25
|
-
alias /workspace/admin/;
|
|
26
|
-
}
|
|
27
|
-
|
|
28
|
-
location /adapter/i2c/build/ {
|
|
29
|
-
proxy_redirect off;
|
|
30
|
-
proxy_pass http://parcel:1234/;
|
|
31
|
-
}
|
|
32
|
-
}
|
|
1
|
+
|
|
2
|
+
worker_processes 1;
|
|
3
|
+
events { worker_connections 1024; }
|
|
4
|
+
|
|
5
|
+
http {
|
|
6
|
+
sendfile on;
|
|
7
|
+
keepalive_timeout 65;
|
|
8
|
+
|
|
9
|
+
server {
|
|
10
|
+
listen 80;
|
|
11
|
+
|
|
12
|
+
location / {
|
|
13
|
+
proxy_redirect off;
|
|
14
|
+
proxy_pass http://iobroker:8081;
|
|
15
|
+
}
|
|
16
|
+
|
|
17
|
+
location /socket.io/ {
|
|
18
|
+
proxy_pass http://iobroker:8081;
|
|
19
|
+
proxy_http_version 1.1;
|
|
20
|
+
proxy_set_header Upgrade $http_upgrade;
|
|
21
|
+
proxy_set_header Connection "Upgrade";
|
|
22
|
+
}
|
|
23
|
+
|
|
24
|
+
location /adapter/i2c/ {
|
|
25
|
+
alias /workspace/admin/;
|
|
26
|
+
}
|
|
27
|
+
|
|
28
|
+
location /adapter/i2c/build/ {
|
|
29
|
+
proxy_redirect off;
|
|
30
|
+
proxy_pass http://parcel:1234/;
|
|
31
|
+
}
|
|
32
|
+
}
|
|
33
33
|
}
|
|
@@ -1,9 +1,9 @@
|
|
|
1
|
-
FROM node:12
|
|
2
|
-
|
|
3
|
-
RUN mkdir -p /usr/app
|
|
4
|
-
|
|
5
|
-
COPY *.sh /usr/app/
|
|
6
|
-
|
|
7
|
-
RUN chmod +x /usr/app/*.sh
|
|
8
|
-
|
|
1
|
+
FROM node:12
|
|
2
|
+
|
|
3
|
+
RUN mkdir -p /usr/app
|
|
4
|
+
|
|
5
|
+
COPY *.sh /usr/app/
|
|
6
|
+
|
|
7
|
+
RUN chmod +x /usr/app/*.sh
|
|
8
|
+
|
|
9
9
|
CMD /bin/bash -c "/usr/app/run.sh"
|
|
@@ -1,7 +1,7 @@
|
|
|
1
|
-
#!/bin/bash
|
|
2
|
-
cd /workspace
|
|
3
|
-
|
|
4
|
-
echo "Installing all dependencies..."
|
|
5
|
-
npm install
|
|
6
|
-
|
|
1
|
+
#!/bin/bash
|
|
2
|
+
cd /workspace
|
|
3
|
+
|
|
4
|
+
echo "Installing all dependencies..."
|
|
5
|
+
npm install
|
|
6
|
+
|
|
7
7
|
npm run watch:parcel
|
package/.eslintignore
CHANGED
|
@@ -1,2 +1,2 @@
|
|
|
1
|
-
node_modules/*
|
|
1
|
+
node_modules/*
|
|
2
2
|
test/*
|
package/.eslintrc.json
CHANGED
|
@@ -1,37 +1,37 @@
|
|
|
1
|
-
{
|
|
2
|
-
"env": {
|
|
3
|
-
"es6": true,
|
|
4
|
-
"node": true,
|
|
5
|
-
"mocha": true
|
|
6
|
-
},
|
|
7
|
-
"extends": "eslint:recommended",
|
|
8
|
-
"rules": {
|
|
9
|
-
"indent": [
|
|
10
|
-
"error",
|
|
11
|
-
4,
|
|
12
|
-
{
|
|
13
|
-
"SwitchCase": 1
|
|
14
|
-
}
|
|
15
|
-
],
|
|
16
|
-
"linebreak-style": 0,
|
|
17
|
-
"no-console": "off",
|
|
18
|
-
"no-var": "error",
|
|
19
|
-
"prefer-const": "error",
|
|
20
|
-
"quotes": [
|
|
21
|
-
"error",
|
|
22
|
-
"single",
|
|
23
|
-
{
|
|
24
|
-
"avoidEscape": true,
|
|
25
|
-
"allowTemplateLiterals": true
|
|
26
|
-
}
|
|
27
|
-
],
|
|
28
|
-
"semi": [
|
|
29
|
-
"error",
|
|
30
|
-
"always"
|
|
31
|
-
],
|
|
32
|
-
"no-prototype-builtins": "off"
|
|
33
|
-
},
|
|
34
|
-
"parserOptions": {
|
|
35
|
-
"ecmaVersion": 2019
|
|
36
|
-
}
|
|
1
|
+
{
|
|
2
|
+
"env": {
|
|
3
|
+
"es6": true,
|
|
4
|
+
"node": true,
|
|
5
|
+
"mocha": true
|
|
6
|
+
},
|
|
7
|
+
"extends": "eslint:recommended",
|
|
8
|
+
"rules": {
|
|
9
|
+
"indent": [
|
|
10
|
+
"error",
|
|
11
|
+
4,
|
|
12
|
+
{
|
|
13
|
+
"SwitchCase": 1
|
|
14
|
+
}
|
|
15
|
+
],
|
|
16
|
+
"linebreak-style": 0,
|
|
17
|
+
"no-console": "off",
|
|
18
|
+
"no-var": "error",
|
|
19
|
+
"prefer-const": "error",
|
|
20
|
+
"quotes": [
|
|
21
|
+
"error",
|
|
22
|
+
"single",
|
|
23
|
+
{
|
|
24
|
+
"avoidEscape": true,
|
|
25
|
+
"allowTemplateLiterals": true
|
|
26
|
+
}
|
|
27
|
+
],
|
|
28
|
+
"semi": [
|
|
29
|
+
"error",
|
|
30
|
+
"always"
|
|
31
|
+
],
|
|
32
|
+
"no-prototype-builtins": "off"
|
|
33
|
+
},
|
|
34
|
+
"parserOptions": {
|
|
35
|
+
"ecmaVersion": 2019
|
|
36
|
+
}
|
|
37
37
|
}
|
package/.github/FUNDING.yml
CHANGED
|
@@ -1,3 +1,3 @@
|
|
|
1
|
-
# These are supported funding model platforms
|
|
2
|
-
|
|
3
|
-
custom: ['https://www.paypal.me/goofyk', 'https://paypal.me/
|
|
1
|
+
# These are supported funding model platforms
|
|
2
|
+
|
|
3
|
+
custom: ['https://www.paypal.me/goofyk', 'https://paypal.me/ArthurRupp']
|
package/.github/stale.yml
CHANGED
|
@@ -1,13 +1,13 @@
|
|
|
1
|
-
# Number of days of inactivity before an issue becomes stale
|
|
2
|
-
daysUntilStale: 60
|
|
3
|
-
# Number of days of inactivity before a stale issue is closed
|
|
4
|
-
daysUntilClose: 7
|
|
5
|
-
# Label to use when marking an issue as stale
|
|
6
|
-
staleLabel: stale
|
|
7
|
-
# Comment to post when marking an issue as stale. Set to `false` to disable
|
|
8
|
-
markComment: >
|
|
9
|
-
This issue has been automatically marked as stale because it has not had
|
|
10
|
-
recent activity. It will be closed if no further activity occurs. Thank you
|
|
11
|
-
for your contributions.
|
|
12
|
-
# Comment to post when closing a stale issue. Set to `false` to disable
|
|
13
|
-
closeComment: false
|
|
1
|
+
# Number of days of inactivity before an issue becomes stale
|
|
2
|
+
daysUntilStale: 60
|
|
3
|
+
# Number of days of inactivity before a stale issue is closed
|
|
4
|
+
daysUntilClose: 7
|
|
5
|
+
# Label to use when marking an issue as stale
|
|
6
|
+
staleLabel: stale
|
|
7
|
+
# Comment to post when marking an issue as stale. Set to `false` to disable
|
|
8
|
+
markComment: >
|
|
9
|
+
This issue has been automatically marked as stale because it has not had
|
|
10
|
+
recent activity. It will be closed if no further activity occurs. Thank you
|
|
11
|
+
for your contributions.
|
|
12
|
+
# Comment to post when closing a stale issue. Set to `false` to disable
|
|
13
|
+
closeComment: false
|