Skip to content

Commit

Permalink
Merge branch 'master' of https://github.com/zwave-js/zwave-js-ui into…
Browse files Browse the repository at this point in the history
… scheduler-fix
  • Loading branch information
robertsLando committed Aug 1, 2023
2 parents 65363ee + 538cd31 commit 78af4e2
Show file tree
Hide file tree
Showing 14 changed files with 3,153 additions and 3,020 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ jobs:

strategy:
matrix:
node-version: [16.x, 18.x, 19.x]
node-version: [16.x, 18.x, 20.x]

steps:
- name: Checkout Z-Wave JS UI
Expand Down
60 changes: 60 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,65 @@


# [8.22.0](https://github.com/zwave-js/zwave-js-ui/compare/v8.21.2...v8.22.0) (2023-07-31)


### Bug Fixes

* **ui:** hide lastSeen from statistics arrows tooltip ([7859795](https://github.com/zwave-js/zwave-js-ui/commit/78597959cb3993e2a80829a258030300780747d7))
* **ui:** remove `check` action for failed nodes ([#3200](https://github.com/zwave-js/zwave-js-ui/issues/3200)) ([d6fc4d1](https://github.com/zwave-js/zwave-js-ui/commit/d6fc4d16c9c76a644d9b7062868f9cd140991331))
* **ui:** return routes set not working without a priority route ([#3188](https://github.com/zwave-js/zwave-js-ui/issues/3188)) ([be2ece4](https://github.com/zwave-js/zwave-js-ui/commit/be2ece42968127d33488642121a6d3314b499d81))


### Features

* allow to abort health checks and show steps results ([#3199](https://github.com/zwave-js/zwave-js-ui/issues/3199)) ([cc6ddce](https://github.com/zwave-js/zwave-js-ui/commit/cc6ddce00f1f319b1625b08deb28ea274559291b))
* bump zwave-js@11.8 and @zwave-js/server to 1.30.0 ([#3195](https://github.com/zwave-js/zwave-js-ui/issues/3195)) ([bffa740](https://github.com/zwave-js/zwave-js-ui/commit/bffa74001c45185aa7f1f3f956053a6e13aea698))

## [8.21.2](https://github.com/zwave-js/zwave-js-ui/compare/v8.21.1...v8.21.2) (2023-07-25)


### Bug Fixes

* typo on log ([1f01867](https://github.com/zwave-js/zwave-js-ui/commit/1f018677a512124e74fc9f5a4f0feaf83e9f07df))


### Features

* bump zwave-js@11.6.0 ([#3186](https://github.com/zwave-js/zwave-js-ui/issues/3186)) ([0ebf8a0](https://github.com/zwave-js/zwave-js-ui/commit/0ebf8a05c34e44c5cd30cb1b6c1f4e8b839c190b))

## [8.21.1](https://github.com/zwave-js/zwave-js-ui/compare/v8.21.0...v8.21.1) (2023-07-21)


### Bug Fixes

* misleading controller OTW error message ([1b7eadb](https://github.com/zwave-js/zwave-js-ui/commit/1b7eadbf40129dea92543951b45c49e191ae4575)), closes [#3181](https://github.com/zwave-js/zwave-js-ui/issues/3181)
* prevent edge case on zwave client restart ([#3180](https://github.com/zwave-js/zwave-js-ui/issues/3180)) ([01dd87b](https://github.com/zwave-js/zwave-js-ui/commit/01dd87ba70999fb192748965e859a5ce57c0bffb))


### Features

* bump zwave-js@11.5.1 ([#3179](https://github.com/zwave-js/zwave-js-ui/issues/3179)) ([edfdb00](https://github.com/zwave-js/zwave-js-ui/commit/edfdb003a205d2e1c8287006ea1b8141369764f4))
* bump zwave-js@11.5.3 ([259a0a3](https://github.com/zwave-js/zwave-js-ui/commit/259a0a3ae62019a321426ca13be5be77d24f7622))

# [8.21.0](https://github.com/zwave-js/zwave-js-ui/compare/v8.20.0...v8.21.0) (2023-07-18)


### Bug Fixes

* add `destroyed` flag to client to prevent edge case on reconnect ([e83b146](https://github.com/zwave-js/zwave-js-ui/commit/e83b1464fefc33dae13ccaf7e994d44a04c009c1))
* minor typo in ping and heal messages ([#3170](https://github.com/zwave-js/zwave-js-ui/issues/3170)) ([3c7be58](https://github.com/zwave-js/zwave-js-ui/commit/3c7be58d3d288e53e945207735d51ff1e464fdbf))
* **ui:** cleaner alert message on NVM backup ([52d7766](https://github.com/zwave-js/zwave-js-ui/commit/52d7766432304470a1fb6f0105322462f65c0d62))
* **ui:** warn user before healing a node ([edc0125](https://github.com/zwave-js/zwave-js-ui/commit/edc0125800d97d31a996b0903de2e610d172f32f)), closes [#3175](https://github.com/zwave-js/zwave-js-ui/issues/3175)
* user callbacks on the server are set too early when recovering from a serial disconnect ([2a8bf03](https://github.com/zwave-js/zwave-js-ui/commit/2a8bf03334a0e6fa468190b509edfbaa80eefb8b)), closes [#3174](https://github.com/zwave-js/zwave-js-ui/issues/3174)


### Features

* bump zwave-js@11.5.0 ([06ac54a](https://github.com/zwave-js/zwave-js-ui/commit/06ac54a17f998a38423fa069df616373a08635d3))
* cache recently executed driver functions ([36b915c](https://github.com/zwave-js/zwave-js-ui/commit/36b915c42d2dc706d3eea65a273bdc88b123dd8e)), closes [#3160](https://github.com/zwave-js/zwave-js-ui/issues/3160)
* exponential backoff when restarting driver ([#3173](https://github.com/zwave-js/zwave-js-ui/issues/3173)) ([1f0f63c](https://github.com/zwave-js/zwave-js-ui/commit/1f0f63ce45bc2c6dcbafb2e4b889ef9b1f15908f))
* use new `lastSeen` zwaveNode prop ([#3178](https://github.com/zwave-js/zwave-js-ui/issues/3178)) ([9851875](https://github.com/zwave-js/zwave-js-ui/commit/985187537fb1321cf9f88e58824aae2a95e672b7))

# [8.20.0](https://github.com/zwave-js/zwave-js-ui/compare/v8.19.0...v8.20.0) (2023-07-12)


Expand Down
13 changes: 5 additions & 8 deletions app.ts
Original file line number Diff line number Diff line change
Expand Up @@ -262,12 +262,7 @@ export async function startServer(host: string, port: number | string) {
await startGateway(settings)
}

interface Snippet {
name: string
content: string
}

const defaultSnippets: Snippet[] = []
const defaultSnippets: utils.Snippet[] = []

async function loadSnippets() {
const localSnippetsDir = utils.joinPath(false, 'snippets')
Expand All @@ -291,7 +286,7 @@ async function isSnippet(file: string): Promise<boolean> {

async function getSnippets() {
const files = await readdir(snippetsDir)
const snippets: Snippet[] = []
const snippets: utils.Snippet[] = []
for (const file of files) {
const filePath = path.join(snippetsDir, file)

Expand All @@ -302,7 +297,9 @@ async function getSnippets() {
})
}
}
return [...defaultSnippets, ...snippets]

const snippetsCache = gw.zwave?.cacheSnippets ?? []
return [...snippetsCache, ...defaultSnippets, ...snippets]
}

/**
Expand Down
4 changes: 2 additions & 2 deletions lib/MqttClient.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
'use strict'

import mqtt, { Client } from 'mqtt'
import mqtt, { MqttClient as Client } from 'mqtt'
import { allSettled, parseJSON, sanitizeTopic } from './utils'
import { module } from './logger'
import { version as appVersion } from '../package.json'
Expand Down Expand Up @@ -347,7 +347,7 @@ class MqttClient extends TypedEventEmitter<MqttClientEventCallbacks> {
rejectUnauthorized: !config.allowSelfsigned,
will: {
topic: this.getClientTopic(MqttClient.STATUS_TOPIC),
payload: JSON.stringify({ value: false }),
payload: JSON.stringify({ value: false }) as any,
qos: this.config.qos,
retain: this.config.retain,
},
Expand Down
Loading

0 comments on commit 78af4e2

Please sign in to comment.