diff --git a/lib/extension/bridge.js b/lib/extension/bridge.js index aaf14724..763552e5 100644 --- a/lib/extension/bridge.js +++ b/lib/extension/bridge.js @@ -559,7 +559,8 @@ class Bridge extends Extension { coordinator: this.coordinatorVersion, network: utils.toSnakeCase(await this.zigbee.getNetworkParameters()), log_level: logger.getLevel(), - permit_join: await this.zigbee.getPermitJoin(), + permit_join: this.zigbee.getPermitJoin(), + permit_join_timeout: this.zigbee.getPermitJoinTimeout(), restart_required: this.restartRequired, config, config_schema: settings.schema, diff --git a/lib/extension/legacy/bridgeLegacy.js b/lib/extension/legacy/bridgeLegacy.js index 20b018cb..827b29d9 100644 --- a/lib/extension/legacy/bridgeLegacy.js +++ b/lib/extension/legacy/bridgeLegacy.js @@ -382,7 +382,7 @@ class BridgeLegacy extends Extension { coordinator, network: await this.zigbee.getNetworkParameters(), log_level: logger.getLevel(), - permit_join: await this.zigbee.getPermitJoin(), + permit_join: this.zigbee.getPermitJoin(), }; await this.mqtt.publish(topic, stringify(payload), {retain: true, qos: 0}); diff --git a/lib/zigbee.js b/lib/zigbee.js index 433db19d..a7d340f0 100644 --- a/lib/zigbee.js +++ b/lib/zigbee.js @@ -141,10 +141,14 @@ class Zigbee extends events.EventEmitter { } } - async getPermitJoin() { + getPermitJoin() { return this.herdsman.getPermitJoin(); } + getPermitJoinTimeout() { + return this.herdsman.getPermitJoinTimeout(); + } + getClients() { return this.herdsman.getDevices().filter((device) => device.type !== 'Coordinator'); } diff --git a/test/stub/zigbeeHerdsman.js b/test/stub/zigbeeHerdsman.js index c42cd071..adc8d7c3 100644 --- a/test/stub/zigbeeHerdsman.js +++ b/test/stub/zigbeeHerdsman.js @@ -221,6 +221,7 @@ const mock = { return Object.values(groups).find((d) => d.groupID === groupID); }), getPermitJoin: jest.fn().mockReturnValue(false), + getPermitJoinTimeout: jest.fn().mockReturnValue(undefined), reset: jest.fn(), createGroup: jest.fn().mockImplementation((groupID) => { const group = new Group(groupID, []);