Skip to content

Commit

Permalink
merge
Browse files Browse the repository at this point in the history
  • Loading branch information
foxriver76 committed Apr 21, 2024
2 parents 61af9c2 + 8180c4d commit b77e407
Show file tree
Hide file tree
Showing 4 changed files with 32 additions and 29 deletions.
2 changes: 1 addition & 1 deletion LICENSE
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
The MIT License (MIT)

Copyright (c) 2014-2023 bluefox <[email protected]>
Copyright (c) 2014-2024 bluefox <[email protected]>

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
Expand Down
13 changes: 8 additions & 5 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -51,9 +51,9 @@ Every state has the attribute `ack`. It shows the direction of command.

**Example**: we have some home automation adapter (HAA) that has one lamp connected under address `haa.0.lamp1`.
- Lamp can be switched on manually with physical switch or via Wi-Fi with the help of HAA.
- If vis wants to switch the lamp on via Wi-Fi, it should set the new value with ```{value: true, ack: false}```.
- When the lamp is switched on it is normally informing HAA about new state and the value should be immediately overwritten with ```{value: true, ack: true}```.
- If the lamp is switched off manually via physical switch it informs HAA about new state with ```{value: false, ack: true}```.
- If vis wants to switch the lamp on via Wi-Fi, it should set the new value with `{value: true, ack: false}`.
- When the lamp is switched on it is normally informing HAA about new state and the value should be immediately overwritten with `{value: true, ack: true}`.
- If the lamp is switched off manually via physical switch it informs HAA about new state with `{value: false, ack: true}`.

### Quality
Every data point has an attribute `q` - *quality*.
Expand All @@ -72,8 +72,11 @@ It is suggested to use [socket class](https://github.com/ioBroker/socket-client)
### **WORK IN PROGRESS**
* (foxriver76) use `@iobroker/webserver`

### 2.5.11 (2024-02-22)
* (bluefox) Some packages were updated

### 2.5.10 (2023-12-17)
* (foxriver76) updated ws-server to increase file limit to 500 MB
* (foxriver76) updated ws-server to increase the file limit to 500 MB

### 2.5.9 (2023-12-14)
* (joltcoke) Corrected the crash if authentication is enabled
Expand Down Expand Up @@ -117,4 +120,4 @@ It is suggested to use [socket class](https://github.com/ioBroker/socket-client)
## License
The MIT License (MIT)

Copyright (c) 2014-2023 bluefox <[email protected]>
Copyright (c) 2014-2024 bluefox <[email protected]>
28 changes: 14 additions & 14 deletions io-package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"common": {
"name": "ws",
"version": "2.5.10",
"version": "2.5.11",
"title": "Web socket",
"titleLang": {
"en": "Web socket"
Expand All @@ -19,6 +19,19 @@
"zh-cn": "该适配器允许与ioBroker通信不同的Web应用程序"
},
"news": {
"2.5.11": {
"en": "Some packages were updated",
"de": "Einige Pakete wurden aktualisiert",
"ru": "Некоторые пакеты были обновлены",
"pt": "Alguns pacotes foram atualizados",
"nl": "Sommige pakketten werden bijgewerkt",
"fr": "Certains paquets ont été mis à jour",
"it": "Alcuni pacchetti sono stati aggiornati",
"es": "Algunos paquetes se actualizaron",
"pl": "Niektóre pakiety zostały zaktualizowane",
"uk": "Деякі пакети були оновлено",
"zh-cn": "一些软件包已更新"
},
"2.5.10": {
"en": "updated ws-server to increase file limit to 500 MB",
"de": "aktualisiert ws-server, um Dateilimit auf 500 MB zu erhöhen",
Expand Down Expand Up @@ -96,19 +109,6 @@
"pl": "ulepszona klasa gniazd do naprawy przypadków katastrofy",
"uk": "оновлені розетки-класи для фіксації аварійних випадків",
"zh-cn": "b. 升级的火箭弹"
},
"2.5.4": {
"en": "added missing node16 requirement",
"de": "fehlende knoten16 anforderung",
"ru": "добавлено отсутствует требование к node16",
"pt": "requisito adicional node16 faltando",
"nl": "vermiste vereiste",
"fr": "exigence node16 manquante",
"it": "aggiunto mancante node16 requisito",
"es": "nodo16 faltante",
"pl": "zastrzeżenie",
"uk": "доданий відсутній вузол16 вимога",
"zh-cn": "增加未满足要求"
}
},
"authors": [
Expand Down
18 changes: 9 additions & 9 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "iobroker.ws",
"version": "2.5.10",
"version": "2.5.11",
"description": "This adapter allows to communicate different web applications with ioBroker.",
"author": {
"name": "bluefox",
Expand All @@ -20,23 +20,23 @@
},
"dependencies": {
"@iobroker/adapter-core": "^3.1.4",
"@iobroker/socket-classes": "1.4.6",
"@iobroker/webserver": "^1.0.3",
"@iobroker/socket-classes": "1.5.0",
"@iobroker/ws-server": "^2.1.2",
"express-session": "^1.17.3"
"express-session": "^1.18.0"
},
"devDependencies": {
"@alcalzone/release-script": "^3.7.0",
"@alcalzone/release-script-plugin-iobroker": "^3.7.0",
"@alcalzone/release-script-plugin-license": "^3.7.0",
"@foxriver76/eslint-config": "^1.0.4",
"@iobroker/adapter-dev": "^1.2.0",
"@iobroker/legacy-testing": "^1.0.3",
"@iobroker/testing": "^4.1.0",
"@iobroker/ws": "^1.1.2",
"chai": "^4.3.10",
"gulp": "^4.0.2",
"mocha": "^10.2.0"
"@iobroker/adapter-dev": "^1.3.0",
"@iobroker/legacy-testing": "^1.0.9",
"@iobroker/ws": "^1.1.2",
"@iobroker/testing": "^4.1.0",
"mocha": "^10.3.0",
"chai": "^4.4.1"
},
"bugs": {
"url": "https://github.com/ioBroker/ioBroker.ws/issues"
Expand Down

0 comments on commit b77e407

Please sign in to comment.