Fixed linter
This commit is contained in:
GermanBluefox committed
1 parent
262704dc00
commit
34ac9d9220
6 files changed
+51
-50
No files matched your search
+4
-3
@@ -88,12 +88,13 @@ class HASS extends node_events_1.EventEmitter {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
else if (response.type === 'auth_required') {
|
else if (response.type === 'auth_required') {
|
||||||
if (!this.options.password) {
|
const password = this.options.password || process.env.SUPERVISOR_TOKEN;
|
||||||
|
if (!password) {
|
||||||
this.emit('error', 'Password required. Connection closed');
|
this.emit('error', 'Password required. Connection closed');
|
||||||
socket.terminate();
|
socket.terminate();
|
||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
setTimeout(() => this.sendAuth(socket, this.options.password), 50);
|
setTimeout(() => this.sendAuth(socket, password), 50);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
else if (response.type === 'auth_ok') {
|
else if (response.type === 'auth_ok') {
|
||||||
@@ -196,7 +197,7 @@ class HASS extends node_events_1.EventEmitter {
|
|||||||
clearTimeout(this.connectTimeout);
|
clearTimeout(this.connectTimeout);
|
||||||
this.connectTimeout = null;
|
this.connectTimeout = null;
|
||||||
}
|
}
|
||||||
this.socket = new ws_1.default(`ws${this.options.secure ? 's' : ''}://${this.options.host}:${this.options.port}/api/websocket`, { perMessageDeflate: false });
|
this.socket = new ws_1.default(`ws${this.options.secure ? 's' : ''}://${this.options.host}:${this.options.port}/${this.options.host === 'supervisor' ? 'core' : 'api'}/websocket`, { perMessageDeflate: false });
|
||||||
this.initSocket(this.socket);
|
this.initSocket(this.socket);
|
||||||
}
|
}
|
||||||
close() {
|
close() {
|
||||||
|
|||||||
@@ -1 +1 @@
|
|||||||
{"version":3,"file":"hass.js","sourceRoot":"","sources":["../../src/lib/hass.ts"],"names":[],"mappings":"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 truncated
|
{"version":3,"file":"hass.js","sourceRoot":"","sources":["../../src/lib/hass.ts"],"names":[],"mappings":";;;;;AAAA,6CAA2C;AAC3C,4CAA2B;AAe3B;;;;;;EAME;AACF,MAAqB,IAAK,SAAQ,0BAAY;IAClC,MAAM,GAAqB,IAAI,CAAC;IACvB,OAAO,CAAc;IACrB,GAAG,CAAkB;IAC9B,SAAS,GAAW,CAAC,CAAC;IACb,QAAQ,GAAgC,EAAE,CAAC;IACpD,UAAU,GAAY,KAAK,CAAC;IAC5B,cAAc,GAAyC,IAAI,CAAC;IAC5D,MAAM,GAAY,KAAK,CAAC;IAEhC,YAAY,OAAoB,EAAE,GAAoB;QAClD,KAAK,EAAE,CAAC;QACR,IAAI,CAAC,OAAO,GAAG;YACX,IAAI,EAAE,OAAO,CAAC,IAAI,IAAI,WAAW;YACjC,IAAI,EAAE,QAAQ,CAAC,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE,EAAE,CAAC,IAAI,IAAI;YAChD,QAAQ,EAAE,OAAO,CAAC,QAAQ;YAC1B,MAAM,EAAE,OAAO,CAAC,MAAM;SACzB,CAAC;QACF,IAAI,CAAC,GAAG,GAAG,GAAG,CAAC;IACnB,CAAC;IAEO,eAAe,CAAC,MAAiB,EAAE,QAAiD;QACxF,IAAI,MAAM,IAAI,OAAO,MAAM,CAAC,IAAI,KAAK,UAAU,EAAE,CAAC;YAC9C,MAAM,EAAE,GAAG,IAAI,CAAC,SAAS,EAAE,CAAC;YAC5B,IAAI,CAAC,QAAQ,CAAC,EAAE,CAAC,GAAG,EAAE,IAAI,EAAE,kBAAkB,EAAE,EAAE,EAAE,IAAI,CAAC,GAAG,EAAE,EAAE,EAAE,EAAE,QAAQ,EAAE,CAAC;YAC/E,MAAM,CAAC,IAAI,CACP,IAAI,CAAC,SAAS,CAAC;gBACX,EAAE;gBACF,IAAI,EAAE,kBAAkB;aAC3B,CAAC,CACL,CAAC;QACN,CAAC;aAAM,CAAC;YACJ,QAAQ,EAAE,CAAC,eAAe,CAAC,CAAC;QAChC,CAAC;IACL,CAAC;IAEO,WAAW,CACf,MAAwB,EACxB,IAAY,EACZ,QAA+D,EAC/D,KAA2B;QAE3B,IAAI,MAAM,IAAI,OAAO,MAAM,CAAC,IAAI,KAAK,UAAU,EAAE,CAAC;YAC9C,MAAM,EAAE,GAAG,IAAI,CAAC,SAAS,EAAE,CAAC;YAC5B,IAAI,CAAC,QAAQ,CAAC,EAAE,CAAC,GAAG,EAAE,IAAI,EAAE,EAAE,EAAE,QAAQ,EAAE,EAAE,EAAE,IAAI,CAAC,GAAG,EAAE,EAAE,CAAC;YAC3D,MAAM,CAAC,IAAI,CACP,IAAI,CAAC,SAAS,CAAC;gBACX,EAAE;gBACF,IAAI;gBACJ,GAAG,KAAK;aACX,CAAC,CACL,CAAC;QACN,CAAC;aAAM,CAAC;YACJ,QAAQ,EAAE,CAAC,eAAe,CAAC,CAAC;QAChC,CAAC;IACL,CAAC;IAEO,QAAQ,CAAC,MAAiB,EAAE,IAAY;QAC5C,IAAI,MAAM,IAAI,OAAO,MAAM,CAAC,IAAI,KAAK,UAAU,EAAE,CAAC;YAC9C,MAAM,CAAC,IAAI,CACP,IAAI,CAAC,SAAS,CAAC;gBACX,IAAI,EAAE,MAAM;gBACZ,YAAY,EAAE,IAAI;aACrB,CAAC,CACL,CAAC;QACN,CAAC;IACL,CAAC;IAEO,UAAU,CAAC,MAAiB;QAChC,MAAM,CAAC,EAAE,CAAC,SAAS,EAAE,CAAC,GAAmB,EAAQ,EAAE;YAC/C,MAAM,MAAM,GAAI,GAAc,CAAC,QAAQ,EAAE,CAAC;YAC1C,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC;YAEvB,MAAM,QAAQ,GAAG,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC;YACpC,IAAI,QAAQ,CAAC,IAAI,KAAK,OAAO,EAAE,CAAC;gBAC5B,IAAI,QAAQ,CAAC,KAAK,EAAE,IAAI,IAAI,QAAQ,CAAC,KAAK,CAAC,UAAU,KAAK,kBAAkB,EAAE,CAAC;oBAC3E,IAAI,QAAQ,CAAC,KAAK,CAAC,IAAI,CAAC,KAAK,KAAK,SAAS,EAAE,CAAC;wBAC1C,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,UAAU,QAAQ,CAAC,KAAK,CAAC,IAAI,CAAC,OAAO,EAAE,CAAC,CAAC;oBAC3D,CAAC;yBAAM,IAAI,QAAQ,CAAC,KAAK,CAAC,IAAI,CAAC,KAAK,KAAK,OAAO,EAAE,CAAC;wBAC/C,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,UAAU,QAAQ,CAAC,KAAK,CAAC,IAAI,CAAC,OAAO,EAAE,CAAC,CAAC;oBAC5D,CAAC;yBAAM,CAAC;wBACJ,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,UAAU,QAAQ,CAAC,KAAK,CAAC,IAAI,CAAC,OAAO,EAAE,CAAC,CAAC;oBAC5D,CAAC;gBACL,CAAC;qBAAM,IAAI,QAAQ,CAAC,KAAK,EAAE,UAAU,KAAK,eAAe,EAAE,CAAC;oBACxD,IAAI,CAAC,IAAI,CAAC,eAAe,EAAE,QAAQ,CAAC,KAAK,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;gBAC9D,CAAC;YACL,CAAC;iBAAM,IAAI,QAAQ,CAAC,IAAI,KAAK,eAAe,EAAE,CAAC;gBAC3C,MAAM,QAAQ,GAAG,IAAI,CAAC,OAAO,CAAC,QAAQ,IAAI,OAAO,CAAC,GAAG,CAAC,gBAAgB,CAAC;gBACvE,IAAI,CAAC,QAAQ,EAAE,CAAC;oBACZ,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,sCAAsC,CAAC,CAAC;oBAC3D,MAAM,CAAC,SAAS,EAAE,CAAC;gBACvB,CAAC;qBAAM,CAAC;oBACJ,UAAU,CAAC,GAAG,EAAE,CAAC,IAAI,CAAC,QAAQ,CAAC,MAAM,EAAE,QAAQ,CAAC,EAAE,EAAE,CAAC,CAAC;gBAC1D,CAAC;YACL,CAAC;iBAAM,IAAI,QAAQ,CAAC,IAAI,KAAK,SAAS,EAAE,CAAC;gBACrC,YAAY,CAAC,GAAG,EAAE,CACd,IAAI,CAAC,eAAe,CAAC,MAAM,EAAE,GAAG,CAAC,EAAE;oBAC/B,IAAI,CAAC,GAAG,EAAE,CAAC;wBACP,IAAI,CAAC,UAAU,GAAG,IAAI,CAAC;wBACvB,IAAI,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC;oBAC3B,CAAC;gBACL,CAAC,CAAC,CACL,CAAC;YACN,CAAC;iBAAM,IAAI,QAAQ,CAAC,EAAE,KAAK,SAAS,EAAE,CAAC;gBACnC,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,mBAAmB,MAAM,EAAE,CAAC,CAAC;YAChD,CAAC;iBAAM,CAAC;gBACJ,IAAI,QAAQ,CAAC,IAAI,KAAK,QAAQ,IAAI,IAAI,CAAC,QAAQ,CAAC,QAAQ,CAAC,EAAE,CAAC,EAAE,CAAC;oBAC3D,IAAI,CAAC,GAAG,CAAC,KAAK,CACV,kBAAkB,IAAI,CAAC,QAAQ,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAC,IAAI,cAAc,QAAQ,CAAC,OAAO,cAAc,IAAI,CAAC,SAAS,CAAC,QAAQ,CAAC,MAAM,CAAC,EAAE,CACjI,CAAC;oBACF,IAAI,OAAO,IAAI,CAAC,QAAQ,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAC,EAAE,KAAK,UAAU,EAAE,CAAC;wBACtD,IAAI,CAAC,QAAQ,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAC,EAAG,CAAC,CAAC,QAAQ,CAAC,OAAO,EAAE,QAAQ,CAAC,MAAM,CAAC,CAAC;wBACnE,OAAO,IAAI,CAAC,QAAQ,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAC;oBACtC,CAAC;gBACL,CAAC;YACL,CAAC;QACL,CAAC,CAAC,CAAC;QAEH,MAAM,CAAC,EAAE,CAAC,OAAO,EAAE,CAAC,GAAU,EAAE,EAAE;YAC9B,IAAI,CAAC,MAAM,GAAG,IAAI,CAAC;YACnB,IAAI,GAAG,EAAE,OAAO,EAAE,OAAO,CAAC,6BAA6B,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC;gBAC9D,uBAAuB;YAC3B,CAAC;iBAAM,CAAC;gBACJ,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,GAAG,CAAC,QAAQ,EAAE,CAAC,CAAC;YACnC,CAAC;QACL,CAAC,CAAC,CAAC;QAEH,MAAM,CAAC,EAAE,CAAC,MAAM,EAAE,GAAG,EAAE;YACnB,oBAAoB;QACxB,CAAC,CAAC,CAAC;QAEH,MAAM,CAAC,EAAE,CAAC,OAAO,EAAE,GAAG,EAAE;YACpB,IAAI,CAAC,MAAM,GAAG,IAAI,CAAC;YACnB,IAAI,IAAI,CAAC,UAAU,EAAE,CAAC;gBAClB,IAAI,CAAC,UAAU,GAAG,KAAK,CAAC;gBACxB,IAAI,CAAC,IAAI,CAAC,cAAc,CAAC,CAAC;YAC9B,CAAC;YACD,IAAI,CAAC,IAAI,CAAC,cAAc,IAAI,CAAC,IAAI,CAAC,MAAM,EAAE,CAAC;gBACvC,IAAI,CAAC,cAAc,GAAG,UAAU,CAAC,GAAG,EAAE;oBAClC,IAAI,CAAC,cAAc,GAAG,IAAI,CAAC;oBAC3B,IAAI,CAAC,OAAO,EAAE,CAAC;gBACnB,CAAC,EAAE,IAAI,CAAC,CAAC;YACb,CAAC;QACL,CAAC,CAAC,CAAC;Line truncated
|
||||||
+27
-6
@@ -562,7 +562,7 @@ class HassAdapter extends adapter_core_1.Adapter {
|
|||||||
await this.setStateAsync('info.connection', false, true);
|
await this.setStateAsync('info.connection', false, true);
|
||||||
this.hass = new hass_1.default(this.config, this.log);
|
this.hass = new hass_1.default(this.config, this.log);
|
||||||
this.hass.on('error', err => this.log.error(err));
|
this.hass.on('error', err => this.log.error(err));
|
||||||
this.hass.on('state_changed', entity => {
|
this.hass.on('state_changed', async (entity) => {
|
||||||
this.log.debug(`HASS-Message: State Changed: ${JSON.stringify(entity)}`);
|
this.log.debug(`HASS-Message: State Changed: ${JSON.stringify(entity)}`);
|
||||||
if (!entity || typeof entity.entity_id !== 'string') {
|
if (!entity || typeof entity.entity_id !== 'string') {
|
||||||
return;
|
return;
|
||||||
@@ -572,7 +572,7 @@ class HassAdapter extends adapter_core_1.Adapter {
|
|||||||
const ts = entity.last_updated ? new Date(entity.last_updated).getTime() : undefined;
|
const ts = entity.last_updated ? new Date(entity.last_updated).getTime() : undefined;
|
||||||
if (entity.state !== undefined) {
|
if (entity.state !== undefined) {
|
||||||
if (this.hassObjects[`${this.namespace}.${id}state`]) {
|
if (this.hassObjects[`${this.namespace}.${id}state`]) {
|
||||||
this.setState(`${id}state`, { val: entity.state, ack: true, lc, ts });
|
await this.setStateAsync(`${id}state`, { val: entity.state, ack: true, lc, ts });
|
||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
this.log.info(`State changed for unknown object ${id}state. Triggering synchronization to resync the objects.`);
|
this.log.info(`State changed for unknown object ${id}state. Triggering synchronization to resync the objects.`);
|
||||||
@@ -580,7 +580,7 @@ class HassAdapter extends adapter_core_1.Adapter {
|
|||||||
}
|
}
|
||||||
// Update boolean state
|
// Update boolean state
|
||||||
if (this.hassObjects[`${this.namespace}.${id}state_boolean`]) {
|
if (this.hassObjects[`${this.namespace}.${id}state_boolean`]) {
|
||||||
this.setState(`${id}state_boolean`, {
|
await this.setStateAsync(`${id}state_boolean`, {
|
||||||
val: entity.state === 'on',
|
val: entity.state === 'on',
|
||||||
ack: true,
|
ack: true,
|
||||||
lc: lc || Date.now(),
|
lc: lc || Date.now(),
|
||||||
@@ -603,7 +603,28 @@ class HassAdapter extends adapter_core_1.Adapter {
|
|||||||
}
|
}
|
||||||
const attrId = attr.replace(this.FORBIDDEN_CHARS, '_').replace(/\.+$/, '_');
|
const attrId = attr.replace(this.FORBIDDEN_CHARS, '_').replace(/\.+$/, '_');
|
||||||
if (this.hassObjects[`${this.namespace}.${id}state`]) {
|
if (this.hassObjects[`${this.namespace}.${id}state`]) {
|
||||||
this.setState(id + attrId, { val, ack: true, lc, ts });
|
const fullAttrId = `${this.namespace}.${id}${attrId}`;
|
||||||
|
if (!this.hassObjects[fullAttrId]) {
|
||||||
|
// Attribute appeared after initial sync — create object dynamically
|
||||||
|
const common = {
|
||||||
|
...knownAttributes[attr],
|
||||||
|
name: attr.replace(/_/g, ' '),
|
||||||
|
read: true,
|
||||||
|
write: false,
|
||||||
|
role: 'state',
|
||||||
|
type: mapTypes[typeof entity.attributes[attr]] ?? 'mixed',
|
||||||
|
};
|
||||||
|
const newObj = {
|
||||||
|
_id: fullAttrId,
|
||||||
|
type: 'state',
|
||||||
|
common,
|
||||||
|
native: { entity_id: entity.entity_id, attr },
|
||||||
|
};
|
||||||
|
this.log.debug(`Creating missing attribute object ${fullAttrId}`);
|
||||||
|
await this.setForeignObjectAsync(fullAttrId, newObj);
|
||||||
|
this.hassObjects[fullAttrId] = newObj;
|
||||||
|
}
|
||||||
|
await this.setStateAsync(id + attrId, { val, ack: true, lc, ts });
|
||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
this.log.info(`State changed for unknown object ${id + attrId}. Triggering synchronization to resync the objects.`);
|
this.log.info(`State changed for unknown object ${id + attrId}. Triggering synchronization to resync the objects.`);
|
||||||
@@ -616,7 +637,7 @@ class HassAdapter extends adapter_core_1.Adapter {
|
|||||||
if (!this.hassConnected) {
|
if (!this.hassConnected) {
|
||||||
this.log.debug('Connected');
|
this.log.debug('Connected');
|
||||||
this.hassConnected = true;
|
this.hassConnected = true;
|
||||||
this.setState('info.connection', true, true);
|
void this.setState('info.connection', true, true);
|
||||||
this.hass.getConfig(err => {
|
this.hass.getConfig(err => {
|
||||||
if (err) {
|
if (err) {
|
||||||
this.log.error(`Cannot read config: ${err}`);
|
this.log.error(`Cannot read config: ${err}`);
|
||||||
@@ -661,7 +682,7 @@ class HassAdapter extends adapter_core_1.Adapter {
|
|||||||
if (this.hassConnected) {
|
if (this.hassConnected) {
|
||||||
this.log.debug('Disconnected');
|
this.log.debug('Disconnected');
|
||||||
this.hassConnected = false;
|
this.hassConnected = false;
|
||||||
this.setState('info.connection', false, true);
|
void this.setState('info.connection', false, true);
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
this.hass.connect();
|
this.hass.connect();
|
||||||
|
|||||||
+1
-1
@@ -1 +1 @@
|
|||||||
{"version":3,"file":"main.js","sourceRoot":"","sources":["../src/main.ts"],"names":[],"mappings":"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 truncated
|
{"version":3,"file":"main.js","sourceRoot":"","sources":["../src/main.ts"],"names":[],"mappings":"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 truncated
|
||||||
+11
-32
@@ -2,7 +2,6 @@
|
|||||||
"common": {
|
"common": {
|
||||||
"name": "hass",
|
"name": "hass",
|
||||||
"version": "2.0.4",
|
"version": "2.0.4",
|
||||||
"title": "Home Assistant",
|
|
||||||
"titleLang": {
|
"titleLang": {
|
||||||
"en": "Home Assistant",
|
"en": "Home Assistant",
|
||||||
"de": "Home Assistant",
|
"de": "Home Assistant",
|
||||||
@@ -122,7 +121,9 @@
|
|||||||
"uk": "Знову показати замасковані поля пароля в конфігурації"
|
"uk": "Знову показати замасковані поля пароля в конфігурації"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"localLink": "http://%host%:8123",
|
"localLinks": {
|
||||||
|
"_default": "http://%host%:8123"
|
||||||
|
},
|
||||||
"platform": "Javascript/Node.js",
|
"platform": "Javascript/Node.js",
|
||||||
"mode": "daemon",
|
"mode": "daemon",
|
||||||
"icon": "hass.png",
|
"icon": "hass.png",
|
||||||
@@ -137,17 +138,11 @@
|
|||||||
"license": "MIT"
|
"license": "MIT"
|
||||||
},
|
},
|
||||||
"extIcon": "https://raw.githubusercontent.com/ioBroker/ioBroker.hass/master/admin/hass.png",
|
"extIcon": "https://raw.githubusercontent.com/ioBroker/ioBroker.hass/master/admin/hass.png",
|
||||||
"keywords": [
|
"keywords": ["HASS", "Home", "assistant"],
|
||||||
"HASS",
|
|
||||||
"Home",
|
|
||||||
"assistant"
|
|
||||||
],
|
|
||||||
"readme": "https://github.com/ioBroker/ioBroker.hass/blob/master/README.md",
|
"readme": "https://github.com/ioBroker/ioBroker.hass/blob/master/README.md",
|
||||||
"loglevel": "info",
|
"loglevel": "info",
|
||||||
"type": "iot-systems",
|
"type": "iot-systems",
|
||||||
"authors": [
|
"authors": ["bluefox <dogafox@gmail.com>"],
|
||||||
"bluefox <dogafox@gmail.com>"
|
|
||||||
],
|
|
||||||
"dependencies": [
|
"dependencies": [
|
||||||
{
|
{
|
||||||
"js-controller": ">=6.0.11"
|
"js-controller": ">=6.0.11"
|
||||||
@@ -170,10 +165,7 @@
|
|||||||
{
|
{
|
||||||
"condition": {
|
"condition": {
|
||||||
"operand": "and",
|
"operand": "and",
|
||||||
"rules": [
|
"rules": ["oldVersion<1.1.0", "newVersion>=1.1.0"]
|
||||||
"oldVersion<1.1.0",
|
|
||||||
"newVersion>=1.1.0"
|
|
||||||
]
|
|
||||||
},
|
},
|
||||||
"title": {
|
"title": {
|
||||||
"en": "Re-enter the password after Update!",
|
"en": "Re-enter the password after Update!",
|
||||||
@@ -202,18 +194,12 @@
|
|||||||
"uk": "Після встановлення цього оновлення пароль/токен, який використовується для доступу до встановлення HASS, потрібно повторно ввести в налаштуваннях екземпляра!"
|
"uk": "Після встановлення цього оновлення пароль/токен, який використовується для доступу до встановлення HASS, потрібно повторно ввести в налаштуваннях екземпляра!"
|
||||||
},
|
},
|
||||||
"level": "warn",
|
"level": "warn",
|
||||||
"buttons": [
|
"buttons": ["agree", "cancel"]
|
||||||
"agree",
|
|
||||||
"cancel"
|
|
||||||
]
|
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"condition": {
|
"condition": {
|
||||||
"operand": "and",
|
"operand": "and",
|
||||||
"rules": [
|
"rules": ["oldVersion<1.2.0", "newVersion>=1.2.0"]
|
||||||
"oldVersion<1.2.0",
|
|
||||||
"newVersion>=1.2.0"
|
|
||||||
]
|
|
||||||
},
|
},
|
||||||
"title": {
|
"title": {
|
||||||
"en": "Important notice!",
|
"en": "Important notice!",
|
||||||
@@ -242,10 +228,7 @@
|
|||||||
"uk": "Нова версія 1.2.x потенційно змінить назви об’єктів, якщо в атрибутах об’єктів використовувалися спеціальні символи, такі як «.», «-» або пробіли! За потреби видаліть старі об’єкти вручну."
|
"uk": "Нова версія 1.2.x потенційно змінить назви об’єктів, якщо в атрибутах об’єктів використовувалися спеціальні символи, такі як «.», «-» або пробіли! За потреби видаліть старі об’єкти вручну."
|
||||||
},
|
},
|
||||||
"level": "warn",
|
"level": "warn",
|
||||||
"buttons": [
|
"buttons": ["agree", "cancel"]
|
||||||
"agree",
|
|
||||||
"cancel"
|
|
||||||
]
|
|
||||||
}
|
}
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
@@ -255,12 +238,8 @@
|
|||||||
"password": "",
|
"password": "",
|
||||||
"secure": false
|
"secure": false
|
||||||
},
|
},
|
||||||
"protectedNative": [
|
"protectedNative": ["password"],
|
||||||
"password"
|
"encryptedNative": ["password"],
|
||||||
],
|
|
||||||
"encryptedNative": [
|
|
||||||
"password"
|
|
||||||
],
|
|
||||||
"objects": [],
|
"objects": [],
|
||||||
"instanceObjects": [
|
"instanceObjects": [
|
||||||
{
|
{
|
||||||
|
|||||||
+7
-7
@@ -619,7 +619,7 @@ class HassAdapter extends Adapter {
|
|||||||
desc: service[s].description,
|
desc: service[s].description,
|
||||||
read: false,
|
read: false,
|
||||||
write: true,
|
write: true,
|
||||||
type: 'mixed' as ioBroker.CommonType,
|
type: 'mixed',
|
||||||
role: 'button',
|
role: 'button',
|
||||||
},
|
},
|
||||||
native: {
|
native: {
|
||||||
@@ -676,7 +676,7 @@ class HassAdapter extends Adapter {
|
|||||||
|
|
||||||
if (entity.state !== undefined) {
|
if (entity.state !== undefined) {
|
||||||
if (this.hassObjects[`${this.namespace}.${id}state`]) {
|
if (this.hassObjects[`${this.namespace}.${id}state`]) {
|
||||||
this.setState(`${id}state`, { val: entity.state, ack: true, lc, ts });
|
await this.setStateAsync(`${id}state`, { val: entity.state, ack: true, lc, ts });
|
||||||
} else {
|
} else {
|
||||||
this.log.info(
|
this.log.info(
|
||||||
`State changed for unknown object ${id}state. Triggering synchronization to resync the objects.`,
|
`State changed for unknown object ${id}state. Triggering synchronization to resync the objects.`,
|
||||||
@@ -685,7 +685,7 @@ class HassAdapter extends Adapter {
|
|||||||
}
|
}
|
||||||
// Update boolean state
|
// Update boolean state
|
||||||
if (this.hassObjects[`${this.namespace}.${id}state_boolean`]) {
|
if (this.hassObjects[`${this.namespace}.${id}state_boolean`]) {
|
||||||
this.setState(`${id}state_boolean`, {
|
await this.setStateAsync(`${id}state_boolean`, {
|
||||||
val: entity.state === 'on',
|
val: entity.state === 'on',
|
||||||
ack: true,
|
ack: true,
|
||||||
lc: lc || Date.now(),
|
lc: lc || Date.now(),
|
||||||
@@ -720,7 +720,7 @@ class HassAdapter extends Adapter {
|
|||||||
read: true,
|
read: true,
|
||||||
write: false,
|
write: false,
|
||||||
role: 'state',
|
role: 'state',
|
||||||
type: (mapTypes[typeof entity.attributes[attr]] ?? 'mixed') as ioBroker.CommonType,
|
type: mapTypes[typeof entity.attributes[attr]] ?? 'mixed',
|
||||||
};
|
};
|
||||||
const newObj: ioBroker.StateObject = {
|
const newObj: ioBroker.StateObject = {
|
||||||
_id: fullAttrId,
|
_id: fullAttrId,
|
||||||
@@ -732,7 +732,7 @@ class HassAdapter extends Adapter {
|
|||||||
await this.setForeignObjectAsync(fullAttrId, newObj);
|
await this.setForeignObjectAsync(fullAttrId, newObj);
|
||||||
this.hassObjects[fullAttrId] = newObj;
|
this.hassObjects[fullAttrId] = newObj;
|
||||||
}
|
}
|
||||||
this.setState(id + attrId, { val, ack: true, lc, ts });
|
await this.setStateAsync(id + attrId, { val, ack: true, lc, ts });
|
||||||
} else {
|
} else {
|
||||||
this.log.info(
|
this.log.info(
|
||||||
`State changed for unknown object ${id + attrId}. Triggering synchronization to resync the objects.`,
|
`State changed for unknown object ${id + attrId}. Triggering synchronization to resync the objects.`,
|
||||||
@@ -747,7 +747,7 @@ class HassAdapter extends Adapter {
|
|||||||
if (!this.hassConnected) {
|
if (!this.hassConnected) {
|
||||||
this.log.debug('Connected');
|
this.log.debug('Connected');
|
||||||
this.hassConnected = true;
|
this.hassConnected = true;
|
||||||
this.setState('info.connection', true, true);
|
void this.setState('info.connection', true, true);
|
||||||
this.hass!.getConfig(err => {
|
this.hass!.getConfig(err => {
|
||||||
if (err) {
|
if (err) {
|
||||||
this.log.error(`Cannot read config: ${err}`);
|
this.log.error(`Cannot read config: ${err}`);
|
||||||
@@ -792,7 +792,7 @@ class HassAdapter extends Adapter {
|
|||||||
if (this.hassConnected) {
|
if (this.hassConnected) {
|
||||||
this.log.debug('Disconnected');
|
this.log.debug('Disconnected');
|
||||||
this.hassConnected = false;
|
this.hassConnected = false;
|
||||||
this.setState('info.connection', false, true);
|
void this.setState('info.connection', false, true);
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
|
|||||||
Reference in new issue
Block a user