Skip to content

Commit

Permalink
chore: release v2.2.2
Browse files Browse the repository at this point in the history
* (arteck) dependency update
arteck committed Oct 22, 2024
1 parent 9e251db commit 1aa5291
Showing 9 changed files with 1,675 additions and 9,775 deletions.
75 changes: 41 additions & 34 deletions .eslintrc.json
Original file line number Diff line number Diff line change
@@ -1,35 +1,42 @@
{
"env": {
"es6": true,
"node": true,
"mocha": true
},
"extends": "eslint:recommended",
"rules": {
"indent": [
"error",
4,
{
"SwitchCase": 1
}
],
"no-console": "off",
"no-var": "error",
"prefer-const": "error",
"quotes": [
"error",
"single",
{
"avoidEscape": true,
"allowTemplateLiterals": true
}
],
"semi": [
"error",
"always"
]
},
"parserOptions": {
"ecmaVersion": 2018
}
}
"root": true,
"env": {
"es6": true,
"node": true,
"mocha": true
},
"extends": ["eslint:recommended"],
"plugins": [],
"rules": {
"indent": [
"error",
4,
{
"SwitchCase": 1
}
],
"no-console": "off",
"no-unused-vars": [
"error",
{
"ignoreRestSiblings": true,
"argsIgnorePattern": "^_"
}
],
"no-var": "error",
"no-trailing-spaces": "error",
"prefer-const": "error",
"quotes": [
"error",
"single",
{
"avoidEscape": true,
"allowTemplateLiterals": true
}
],
"semi": ["error", "always"]
},
"parserOptions": {
"ecmaVersion": 2018
}
}
3 changes: 3 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
@@ -34,6 +34,9 @@ bulb LBxxx


## Changelog
### 2.2.2 (2024-10-22)
* (arteck) dependency update

### 2.2.1 (2024-10-18)
* (arteck) experimental crash correction (bug)

134 changes: 67 additions & 67 deletions admin/words.js
Original file line number Diff line number Diff line change
@@ -2,71 +2,71 @@
'use strict';

systemDictionary = {
"active": {
"en": "Active",
"de": "Aktiviert",
"ru": "Актив",
"pt": "Active",
"nl": "Active",
"fr": "Active",
"it": "Active",
"es": "Active",
"pl": "Active"
},
"addresses": {
"en": "addresses to monitoring",
"de": "Adresse für Monitoring",
"ru": "Список IP адресов для мониторинга",
"pt": "addresses to monitoring",
"nl": "addresses to monitoring",
"fr": "addresses to monitoring",
"it": "addresses to monitoring",
"es": "addresses to monitoring",
"pl": "addresses to monitoring"
},
"interval": {
"en": "Polling interval[sec]",
"de": "Abfrage Intervall[sec]",
"ru": "Интервал опроса в секундах",
"pt": "Polling interval[sec]",
"nl": "Polling interval[sec]",
"fr": "Polling interval[sec]",
"it": "Polling interval[sec]",
"es": "Polling interval[sec]",
"pl": "Polling interval[sec]"
},
"ipaddress": {
"en": "IP Address",
"de": "IP Adresse",
"ru": "IP Адрес",
"pt": "IP Address",
"nl": "IP Address",
"fr": "IP Address",
"it": "IP Address",
"es": "IP Address",
"pl": "IP Address"
},
"name": {
"en": "Name",
"de": "Name",
"ru": "Имя",
"pt": "Name",
"nl": "Name",
"fr": "Name",
"it": "Name",
"es": "Name",
"pl": "Name"
},
"settings": {
"en": "Adapter settings",
"de": "Adapter-Einstellungen",
"ru": "Настройки драйвера",
"pt": "Adapter settings",
"nl": "Adapter settings",
"fr": "Adapter settings",
"it": "Adapter settings",
"es": "Adapter settings",
"pl": "Adapter settings"
},
'active': {
'en': 'Active',
'de': 'Aktiviert',
'ru': 'Актив',
'pt': 'Active',
'nl': 'Active',
'fr': 'Active',
'it': 'Active',
'es': 'Active',
'pl': 'Active'
},
'addresses': {
'en': 'addresses to monitoring',
'de': 'Adresse für Monitoring',
'ru': 'Список IP адресов для мониторинга',
'pt': 'addresses to monitoring',
'nl': 'addresses to monitoring',
'fr': 'addresses to monitoring',
'it': 'addresses to monitoring',
'es': 'addresses to monitoring',
'pl': 'addresses to monitoring'
},
'interval': {
'en': 'Polling interval[sec]',
'de': 'Abfrage Intervall[sec]',
'ru': 'Интервал опроса в секундах',
'pt': 'Polling interval[sec]',
'nl': 'Polling interval[sec]',
'fr': 'Polling interval[sec]',
'it': 'Polling interval[sec]',
'es': 'Polling interval[sec]',
'pl': 'Polling interval[sec]'
},
'ipaddress': {
'en': 'IP Address',
'de': 'IP Adresse',
'ru': 'IP Адрес',
'pt': 'IP Address',
'nl': 'IP Address',
'fr': 'IP Address',
'it': 'IP Address',
'es': 'IP Address',
'pl': 'IP Address'
},

'name': {
'en': 'Name',
'de': 'Name',
'ru': 'Имя',
'pt': 'Name',
'nl': 'Name',
'fr': 'Name',
'it': 'Name',
'es': 'Name',
'pl': 'Name'
},
'settings': {
'en': 'Adapter settings',
'de': 'Adapter-Einstellungen',
'ru': 'Настройки драйвера',
'pt': 'Adapter settings',
'nl': 'Adapter settings',
'fr': 'Adapter settings',
'it': 'Adapter settings',
'es': 'Adapter settings',
'pl': 'Adapter settings'
},
};
54 changes: 54 additions & 0 deletions eslint.config.cjs
Original file line number Diff line number Diff line change
@@ -0,0 +1,54 @@
const globals = require('globals');
const js = require('@eslint/js');

const { FlatCompat } = require('@eslint/eslintrc');

const compat = new FlatCompat({
baseDirectory: __dirname,
recommendedConfig: js.configs.recommended,
allConfig: js.configs.all,
});

module.exports = [
{
ignores: ['.dev-server/**'],
},
...compat.extends('eslint:recommended', 'plugin:prettier/recommended'),
{
languageOptions: {
globals: {
...globals.node,
...globals.mocha,
},

ecmaVersion: 2022,
sourceType: 'commonjs',

parserOptions: {
ecmaFeatures: {
jsx: true,
},
},
},

rules: {
indent: ['error', 4, { SwitchCase: 1 }],

'prettier/prettier': ['off', { endOfLine: 'auto' }],
'no-unused-vars': 'off',
'no-console': 'off',
'no-var': 'error',
'no-trailing-spaces': 'error',
'prefer-const': 'warn',

quotes: [
'error',
'single',
{
avoidEscape: true,
allowTemplateLiterals: true,
},
],
},
},
];
475 changes: 0 additions & 475 deletions gulpfile.js

This file was deleted.

19 changes: 14 additions & 5 deletions io-package.json
Original file line number Diff line number Diff line change
@@ -1,8 +1,21 @@
{
"common": {
"name": "hs100",
"version": "2.2.1",
"version": "2.2.2",
"news": {
"2.2.2": {
"en": "dependency update",
"de": "aktualisierung der abhängigkeit",
"ru": "обновление",
"pt": "atualização de dependência",
"nl": "afhankelijkheidsupdate",
"fr": "mise à jour de la dépendance",
"it": "aggiornamento della dipendenza",
"es": "actualización de la dependencia",
"pl": "aktualizacja zależności",
"uk": "оновлення залежності",
"zh-cn": "依赖性更新"
},
"2.2.1": {
"en": "experimental crash correction (bug)",
"de": "experimentelle crashkorrektur (bug)",
@@ -44,10 +57,6 @@
"2.1.2": {
"en": "js-sontroller 4.x ledstate",
"de": "js-sontroller 4.x ledstate"
},
"2.0.7": {
"en": "dept update",
"de": "dept update"
}
},
"title": "hs100",
68 changes: 34 additions & 34 deletions main.js
Original file line number Diff line number Diff line change
@@ -90,11 +90,11 @@ class hs100Controll extends utils.Adapter {
if (state) {
// The state was changed

let tmp = id.split('.');
let dp = tmp.pop();
const tmp = id.split('.');
const dp = tmp.pop();

let idx = tmp.pop();
let ip = idx.replace(/[_\s]+/g, '.');
const idx = tmp.pop();
const ip = idx.replace(/[_\s]+/g, '.');

this.setDevice(ip, dp, state);

@@ -112,7 +112,7 @@ class hs100Controll extends utils.Adapter {
const device = await client.getDevice({host: ip});

if (device.model.search(/LB/i) != -1) {
let lightstate = device.sysInfo.light_state;
const lightstate = device.sysInfo.light_state;

if (state && state.ack != null) {
if (!state.ack) {
@@ -152,15 +152,15 @@ class hs100Controll extends utils.Adapter {
async getInfos() {
this.log.debug(`get Information`);

let devices = this.config.devices;
const devices = this.config.devices;

try {
for (const i in devices) {
if (devices[i].active) {
this.updateDevice(devices[i]);
}
}

if (!_requestInterval) {
_requestInterval= setInterval(async () => {
await this.getInfos();
@@ -241,14 +241,14 @@ class hs100Controll extends utils.Adapter {
async hs_getDayStats(result,ip_state,dev_name) {
const dat = new Date();

let jahr = dat.getFullYear();
let monat = dat.getMonth() + 1; // von 0 - 11 also +1
let tag = dat.getDate();
const jahr = dat.getFullYear();
const monat = dat.getMonth() + 1; // von 0 - 11 also +1
const tag = dat.getDate();

try {
result.emeter.getDayStats(jahr, monat).then((resultDayStats) => {

let dayList = resultDayStats.day_list;
const dayList = resultDayStats.day_list;
let energy_v = 0;
for (let i = 0; i < dayList.length; i++) {
if (dayList[i].day === tag) {
@@ -288,26 +288,26 @@ class hs100Controll extends utils.Adapter {
async hs_getMonthStats(result,ip_state,dev_name) {
const dat = new Date();

let jahr = dat.getFullYear();
let monat = dat.getMonth() + 1; // von 0 - 11 also +1
const jahr = dat.getFullYear();
const monat = dat.getMonth() + 1; // von 0 - 11 also +1

try {
result.emeter.getMonthStats(jahr).then((resultMonthStats) => {
let mothList = resultMonthStats.month_list;
const mothList = resultMonthStats.month_list;
let energy_v = 0;
if (mothList != undefined) {
for (let i = 0; i < mothList.length; i++) {
if (mothList[i].month === monat) {
if (mothList[i].energy != undefined) {
energy_v = mothList[i].energy;
break;
} else {
energy_v = mothList[i].energy_wh / 1000;
break;
}
}
}
this.setForeignState(`${this.namespace}.${ip_state}.totalMonthNow`, parseFloat(energy_v) || 0, true);
for (let i = 0; i < mothList.length; i++) {
if (mothList[i].month === monat) {
if (mothList[i].energy != undefined) {
energy_v = mothList[i].energy;
break;
} else {
energy_v = mothList[i].energy_wh / 1000;
break;
}
}
}
this.setForeignState(`${this.namespace}.${ip_state}.totalMonthNow`, parseFloat(energy_v) || 0, true);
}
});
} catch (err) {
@@ -325,8 +325,8 @@ class hs100Controll extends utils.Adapter {

try {
result.emeter.getRealtime().then((resultRealtime) => {
if (typeof resultRealtime != "undefined") {
if (hs_hw_ver == "2.0" || hs_hw_ver == "3.0") {
if (typeof resultRealtime != 'undefined') {
if (hs_hw_ver == '2.0' || hs_hw_ver == '3.0') {
hs_current = resultRealtime.current_ma;

if (resultRealtime.power_mw > 0) {
@@ -342,7 +342,7 @@ class hs100Controll extends utils.Adapter {
}
} else {
hs_current = resultRealtime.current;
hs_power = resultRealtime.power;
hs_power = resultRealtime.power;
hs_voltage = Math.ceil(resultRealtime.voltage);
}

@@ -390,15 +390,16 @@ class hs100Controll extends utils.Adapter {
}

async cre_state(ip, devName) {
let hs_model;
let hs_name;;

try {
this.log.debug('create_state for IP : ' + ip);

let hs_name;

const result = await client.getDevice({host: ip});

if (result) {
const hs_model = result.model;
hs_model = result.model;
let hs_state = result.sysInfo.relay_state;

const ip_state = await this.ip_replace(ip);
@@ -526,7 +527,7 @@ class hs100Controll extends utils.Adapter {
type: 'number',
read: true,
write: false,
unit: "W",
unit: 'W',
def: 0,
role: 'value',
desc: 'power value'
@@ -667,7 +668,6 @@ class hs100Controll extends utils.Adapter {

if (this.config.devices === undefined) {
this.log.debug(`initialization undefined No one IP configured`);
callback();
}

interval = parseInt(this.config.interval * 1000, 10);
10,613 changes: 1,459 additions & 9,154 deletions package-lock.json

Large diffs are not rendered by default.

9 changes: 3 additions & 6 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "iobroker.hs100",
"version": "2.2.1",
"version": "2.2.2",
"description": "switch tp-plink plugs and bulbs ",
"author": {
"name": "Arthur Rupp",
@@ -38,14 +38,11 @@
"@types/sinon": "^17.0.3",
"@types/sinon-chai": "^3.2.10",
"axios": "^1.7.7",
"chai": "^4.3.7",
"chai": "^4.4.1",
"chai-as-promised": "^8.0.0",
"eslint": "^8.50.0",
"eslint": "^9.9.1",
"eslint-config-prettier": "^9.1.0",
"eslint-plugin-prettier": "^5.2.1",
"gulp": "^4.0.2",
"gulp-jsdoc3": "^3.0.0",
"gulp-replace": "^1.1.4",
"mocha": "^10.2.0"
},
"main": "main.js",

0 comments on commit 1aa5291

Please sign in to comment.