From f8635b4cef841901d5cfdd4d9e573fde2f30e806 Mon Sep 17 00:00:00 2001 From: Tomer <57483589+tomer-w@users.noreply.github.com> Date: Sat, 7 Sep 2024 19:25:53 +0300 Subject: [PATCH 1/8] Improve logger performance --- package-lock.json | 4 ++-- package.json | 2 +- src/lib/logger.ts | 9 +++++---- src/lib/types.ts | 9 +++++---- 4 files changed, 13 insertions(+), 11 deletions(-) diff --git a/package-lock.json b/package-lock.json index 33a9e4c463ad6..ee297710fa480 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "zigbee-herdsman-converters", - "version": "20.12.1", + "version": "20.12.2", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "zigbee-herdsman-converters", - "version": "20.12.1", + "version": "20.12.2", "license": "MIT", "dependencies": { "axios": "^1.7.7", diff --git a/package.json b/package.json index 6ef7bf310c001..c399f9687f3c0 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "zigbee-herdsman-converters", - "version": "20.12.1", + "version": "20.12.2", "description": "Collection of device converters to be used with zigbee-herdsman", "main": "index.js", "types": "index.d.ts", diff --git a/src/lib/logger.ts b/src/lib/logger.ts index 920c05f958560..7663802a4fa56 100644 --- a/src/lib/logger.ts +++ b/src/lib/logger.ts @@ -1,10 +1,11 @@ import {Logger} from './types'; export let logger: Logger = { - debug: (message, namespace) => console.debug(`${namespace}: ${message}`), - info: (message, namespace) => console.info(`${namespace}: ${message}`), - warning: (message, namespace) => console.warn(`${namespace}: ${message}`), - error: (message, namespace) => console.error(`${namespace}: ${message}`), + isEnabled: (level, namespace) => true, + debug: (messageOrLambda, namespace) => console.debug(`${namespace}: ${(typeof messageOrLambda === "string") ? messageOrLambda : messageOrLambda()}`), + info: (messageOrLambda, namespace) => console.info(`${namespace}: ${(typeof messageOrLambda === "string") ? messageOrLambda : messageOrLambda()}`), + warning: (messageOrLambda, namespace) => console.warn(`${namespace}: ${(typeof messageOrLambda === "string") ? messageOrLambda : messageOrLambda()}`), + error: (messageOrLambda, namespace) => console.error(`${namespace}: ${(typeof messageOrLambda === "string") ? messageOrLambda : messageOrLambda()}`), }; export function setLogger(l: Logger): void { diff --git a/src/lib/types.ts b/src/lib/types.ts index 0ebf948cbd639..523b71cd07b0b 100644 --- a/src/lib/types.ts +++ b/src/lib/types.ts @@ -7,10 +7,11 @@ import type {FrameControl} from 'zigbee-herdsman/dist/zspec/zcl/definition/tstyp import * as exposes from './exposes'; export interface Logger { - debug: (message: string, namespace: string) => void; - info: (message: string, namespace: string) => void; - warning: (message: string, namespace: string) => void; - error: (message: string, namespace: string) => void; + isEnabled: (level: string, namespace: string) => boolean; + debug: (messageOrLambda: string | (() => string), namespace: string) => void; + info: (messageOrLambda: string | (() => string), namespace: string) => void; + warning: (messageOrLambda: string | (() => string), namespace: string) => void; + error: (messageOrLambda: string | (() => string), namespace: string) => void; } export type Range = [number, number]; From b74d622bcf7b8c1d95e4433a5b33f183998075cc Mon Sep 17 00:00:00 2001 From: Tomer <57483589+tomer-w@users.noreply.github.com> Date: Sat, 7 Sep 2024 20:04:38 +0300 Subject: [PATCH 2/8] Align package versions --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index c399f9687f3c0..fd2ba19074ab8 100644 --- a/package.json +++ b/package.json @@ -51,7 +51,7 @@ "iconv-lite": "^0.6.3", "semver": "^7.6.3", "tar-stream": "^3.1.7", - "zigbee-herdsman": "^0.57.3" + "zigbee-herdsman": "^0.57.4" }, "devDependencies": { "@types/buffer-crc32": "^0.2.4", From 3bbe7e186dcfd1ec4ec6789d936f2b362b3e3a41 Mon Sep 17 00:00:00 2001 From: Tomer <57483589+tomer-w@users.noreply.github.com> Date: Sat, 7 Sep 2024 21:07:32 +0300 Subject: [PATCH 3/8] Fix eslint issue --- src/lib/logger.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/lib/logger.ts b/src/lib/logger.ts index 7663802a4fa56..c347f7b85b7ee 100644 --- a/src/lib/logger.ts +++ b/src/lib/logger.ts @@ -1,7 +1,7 @@ import {Logger} from './types'; export let logger: Logger = { - isEnabled: (level, namespace) => true, + isEnabled: () => true, debug: (messageOrLambda, namespace) => console.debug(`${namespace}: ${(typeof messageOrLambda === "string") ? messageOrLambda : messageOrLambda()}`), info: (messageOrLambda, namespace) => console.info(`${namespace}: ${(typeof messageOrLambda === "string") ? messageOrLambda : messageOrLambda()}`), warning: (messageOrLambda, namespace) => console.warn(`${namespace}: ${(typeof messageOrLambda === "string") ? messageOrLambda : messageOrLambda()}`), From 85d791176e1a5b9e875654b792e95f262aff354a Mon Sep 17 00:00:00 2001 From: Tomer <57483589+tomer-w@users.noreply.github.com> Date: Sun, 8 Sep 2024 08:31:24 +0300 Subject: [PATCH 4/8] Align built-in logger with the main implementation --- src/lib/logger.ts | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/lib/logger.ts b/src/lib/logger.ts index c347f7b85b7ee..7ab805f1fe91a 100644 --- a/src/lib/logger.ts +++ b/src/lib/logger.ts @@ -2,10 +2,10 @@ import {Logger} from './types'; export let logger: Logger = { isEnabled: () => true, - debug: (messageOrLambda, namespace) => console.debug(`${namespace}: ${(typeof messageOrLambda === "string") ? messageOrLambda : messageOrLambda()}`), - info: (messageOrLambda, namespace) => console.info(`${namespace}: ${(typeof messageOrLambda === "string") ? messageOrLambda : messageOrLambda()}`), - warning: (messageOrLambda, namespace) => console.warn(`${namespace}: ${(typeof messageOrLambda === "string") ? messageOrLambda : messageOrLambda()}`), - error: (messageOrLambda, namespace) => console.error(`${namespace}: ${(typeof messageOrLambda === "string") ? messageOrLambda : messageOrLambda()}`), + debug: (messageOrLambda, namespace) => console.debug(`${namespace}: ${(typeof messageOrLambda === "function") ? messageOrLambda() : messageOrLambda}`), + info: (messageOrLambda, namespace) => console.info(`${namespace}: ${(typeof messageOrLambda === "function") ? messageOrLambda() : messageOrLambda}`), + warning: (messageOrLambda, namespace) => console.warn(`${namespace}: ${(typeof messageOrLambda === "function") ? messageOrLambda() : messageOrLambda}`), + error: (messageOrLambda, namespace) => console.error(`${namespace}: ${(typeof messageOrLambda === "function") ? messageOrLambda() : messageOrLambda}`), }; export function setLogger(l: Logger): void { From 3abbbee2673000ef3633837a69be12f90592a61d Mon Sep 17 00:00:00 2001 From: Tomer <57483589+tomer-w@users.noreply.github.com> Date: Sun, 8 Sep 2024 09:26:32 +0300 Subject: [PATCH 5/8] Revert zigbee-herdsman package version so tests will run --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index fd2ba19074ab8..c399f9687f3c0 100644 --- a/package.json +++ b/package.json @@ -51,7 +51,7 @@ "iconv-lite": "^0.6.3", "semver": "^7.6.3", "tar-stream": "^3.1.7", - "zigbee-herdsman": "^0.57.4" + "zigbee-herdsman": "^0.57.3" }, "devDependencies": { "@types/buffer-crc32": "^0.2.4", From fd3b072b0414eab057a1aaaab278147f3fb5da91 Mon Sep 17 00:00:00 2001 From: Tomer <57483589+tomer-w@users.noreply.github.com> Date: Sun, 8 Sep 2024 09:28:33 +0300 Subject: [PATCH 6/8] Fix prettier issue --- src/lib/logger.ts | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/src/lib/logger.ts b/src/lib/logger.ts index 7ab805f1fe91a..c3813b252e637 100644 --- a/src/lib/logger.ts +++ b/src/lib/logger.ts @@ -1,11 +1,15 @@ import {Logger} from './types'; export let logger: Logger = { - isEnabled: () => true, - debug: (messageOrLambda, namespace) => console.debug(`${namespace}: ${(typeof messageOrLambda === "function") ? messageOrLambda() : messageOrLambda}`), - info: (messageOrLambda, namespace) => console.info(`${namespace}: ${(typeof messageOrLambda === "function") ? messageOrLambda() : messageOrLambda}`), - warning: (messageOrLambda, namespace) => console.warn(`${namespace}: ${(typeof messageOrLambda === "function") ? messageOrLambda() : messageOrLambda}`), - error: (messageOrLambda, namespace) => console.error(`${namespace}: ${(typeof messageOrLambda === "function") ? messageOrLambda() : messageOrLambda}`), + isEnabled: () => true, + debug: (messageOrLambda, namespace) => + console.debug(`${namespace}: ${typeof messageOrLambda === 'function' ? messageOrLambda() : messageOrLambda}`), + info: (messageOrLambda, namespace) => + console.info(`${namespace}: ${typeof messageOrLambda === 'function' ? messageOrLambda() : messageOrLambda}`), + warning: (messageOrLambda, namespace) => + console.warn(`${namespace}: ${typeof messageOrLambda === 'function' ? messageOrLambda() : messageOrLambda}`), + error: (messageOrLambda, namespace) => + console.error(`${namespace}: ${typeof messageOrLambda === 'function' ? messageOrLambda() : messageOrLambda}`), }; export function setLogger(l: Logger): void { From 81a7014b5532aa0611f4b1e1c0328352ca65b8ca Mon Sep 17 00:00:00 2001 From: Tomer <57483589+tomer-w@users.noreply.github.com> Date: Mon, 9 Sep 2024 11:37:57 +0300 Subject: [PATCH 7/8] Fix CR comments --- src/lib/logger.ts | 1 - src/lib/types.ts | 1 - 2 files changed, 2 deletions(-) diff --git a/src/lib/logger.ts b/src/lib/logger.ts index c3813b252e637..aa09cb5afaf8f 100644 --- a/src/lib/logger.ts +++ b/src/lib/logger.ts @@ -1,7 +1,6 @@ import {Logger} from './types'; export let logger: Logger = { - isEnabled: () => true, debug: (messageOrLambda, namespace) => console.debug(`${namespace}: ${typeof messageOrLambda === 'function' ? messageOrLambda() : messageOrLambda}`), info: (messageOrLambda, namespace) => diff --git a/src/lib/types.ts b/src/lib/types.ts index 523b71cd07b0b..a4630de81d414 100644 --- a/src/lib/types.ts +++ b/src/lib/types.ts @@ -7,7 +7,6 @@ import type {FrameControl} from 'zigbee-herdsman/dist/zspec/zcl/definition/tstyp import * as exposes from './exposes'; export interface Logger { - isEnabled: (level: string, namespace: string) => boolean; debug: (messageOrLambda: string | (() => string), namespace: string) => void; info: (messageOrLambda: string | (() => string), namespace: string) => void; warning: (messageOrLambda: string | (() => string), namespace: string) => void; From b956d673d3c6d0ea0cf32a9f1edb620849c70156 Mon Sep 17 00:00:00 2001 From: Tomer <57483589+tomer-w@users.noreply.github.com> Date: Mon, 9 Sep 2024 12:39:08 +0300 Subject: [PATCH 8/8] Revert package changes --- package-lock.json | 4 ++-- package.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package-lock.json b/package-lock.json index ee297710fa480..33a9e4c463ad6 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "zigbee-herdsman-converters", - "version": "20.12.2", + "version": "20.12.1", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "zigbee-herdsman-converters", - "version": "20.12.2", + "version": "20.12.1", "license": "MIT", "dependencies": { "axios": "^1.7.7", diff --git a/package.json b/package.json index c399f9687f3c0..6ef7bf310c001 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "zigbee-herdsman-converters", - "version": "20.12.2", + "version": "20.12.1", "description": "Collection of device converters to be used with zigbee-herdsman", "main": "index.js", "types": "index.d.ts",