matterbridge 2.1.6-dev.3 → 2.1.6-dev.5

package/dist/matterbridge.js

@@ -1,13 +1,11 @@
-import { fileURLToPath } from 'url';
-import { promises as fs } from 'fs';
-import { exec, spawn } from 'child_process';
-import EventEmitter from 'events';
-import os from 'os';
-import path from 'path';
-import { randomBytes } from 'crypto';
-import { NodeStorageManager } from './storage/export.js';
+import os from 'node:os';
+import path from 'node:path';
+import { promises as fs } from 'node:fs';
+import EventEmitter from 'node:events';
 import { AnsiLogger, UNDERLINE, UNDERLINEOFF, YELLOW, db, debugStringify, BRIGHT, RESET, er, nf, rs, wr, RED, GREEN, zb, CYAN, nt } from './logger/export.js';
-import { logInterfaces, copyDirectory, getParameter, getIntParameter, hasParameter, getNpmPackageVersion } from './utils/utils.js';
+import { NodeStorageManager } from './storage/export.js';
+import { getParameter, getIntParameter, hasParameter } from './utils/export.js';
+import { logInterfaces, copyDirectory, getNpmPackageVersion, getGlobalNodeModules } from './utils/utils.js';
 import { PluginManager } from './pluginManager.js';
 import { DeviceManager } from './deviceManager.js';
 import { MatterbridgeEndpoint } from './matterbridgeEndpoint.js';
@@ -35,7 +33,8 @@ export class Matterbridge extends EventEmitter {
         totalMemory: '',
         freeMemory: '',
         systemUptime: '',
-        cpuUsed: '',
+        processUptime: '',
+        cpuUsage: '',
         rss: '',
         heapTotal: '',
         heapUsed: '',
@@ -85,6 +84,7 @@ export class Matterbridge extends EventEmitter {
     bridgeMode = '';
     restartMode = '';
     profile = getParameter('profile');
+    shutdown = false;
     edge = true;
     log;
     matterbrideLoggerFile = 'matterbridge' + (getParameter('profile') ? '.' + getParameter('profile') : '') + '.log';
@@ -126,6 +126,12 @@ export class Matterbridge extends EventEmitter {
     constructor() {
         super();
     }
+    emit(eventName, ...args) {
+        return super.emit(eventName, ...args);
+    }
+    on(eventName, listener) {
+        return super.on(eventName, listener);
+    }
     getDevices() {
         return this.devices.array();
     }
@@ -167,6 +173,7 @@ export class Matterbridge extends EventEmitter {
         return Matterbridge.instance;
     }
     async destroyInstance() {
+        this.log.info(`Destroy instance...`);
         const servers = [];
         if (this.bridgeMode === 'bridge') {
             if (this.serverNode)
@@ -179,6 +186,7 @@ export class Matterbridge extends EventEmitter {
             }
         }
         await this.cleanup('destroying instance...', false);
+        this.log.info(`Dispose ${servers.length} MdnsService...`);
         for (const server of servers) {
             await server.env.get(MdnsService)[Symbol.asyncDispose]();
             this.log.info(`Closed ${server.id} MdnsService`);
@@ -436,7 +444,7 @@ export class Matterbridge extends EventEmitter {
       - disable [plugin name]: disable the globally installed plugin with the given name
       - reset [plugin path]:   remove the commissioning for the plugin from the given absolute or relative path (childbridge mode). Shutdown Matterbridge before using it!
       - reset [plugin name]:   remove the commissioning for the globally installed plugin (childbridge mode). Shutdown Matterbridge before using it!${rs}`);
-            this.emit('shutdown');
+            this.shutdown = true;
             return;
         }
         if (hasParameter('list')) {
@@ -465,7 +473,7 @@ export class Matterbridge extends EventEmitter {
                     this.log.info(`  └─ endpoint ${RED}${device.endpoint}${nf} ${typ}${device.endpointName}${nf} ${debugStringify(device.clusterServersId)}`);
                 }
             });
-            this.emit('shutdown');
+            this.shutdown = true;
             return;
         }
         if (hasParameter('logstorage')) {
@@ -475,41 +483,42 @@ export class Matterbridge extends EventEmitter {
                 this.log.info(`${plg}${plugin.name}${nf} storage log`);
                 await plugin.nodeContext?.logStorage();
             }
-            this.emit('shutdown');
+            this.shutdown = true;
             return;
         }
         if (hasParameter('loginterfaces')) {
             this.log.info(`${plg}Matterbridge${nf} network interfaces log`);
             logInterfaces();
-            this.emit('shutdown');
+            this.shutdown = true;
             return;
         }
         if (getParameter('add')) {
             this.log.debug(`Adding plugin ${getParameter('add')}`);
             await this.plugins.add(getParameter('add'));
-            this.emit('shutdown');
+            this.shutdown = true;
             return;
         }
         if (getParameter('remove')) {
             this.log.debug(`Removing plugin ${getParameter('remove')}`);
             await this.plugins.remove(getParameter('remove'));
-            this.emit('shutdown');
+            this.shutdown = true;
             return;
         }
         if (getParameter('enable')) {
             this.log.debug(`Enabling plugin ${getParameter('enable')}`);
             await this.plugins.enable(getParameter('enable'));
-            this.emit('shutdown');
+            this.shutdown = true;
             return;
         }
         if (getParameter('disable')) {
             this.log.debug(`Disabling plugin ${getParameter('disable')}`);
             await this.plugins.disable(getParameter('disable'));
-            this.emit('shutdown');
+            this.shutdown = true;
             return;
         }
         if (hasParameter('factoryreset')) {
             await this.shutdownProcessAndFactoryReset();
+            this.shutdown = true;
             return;
         }
         try {
@@ -521,6 +530,7 @@ export class Matterbridge extends EventEmitter {
         }
         if (hasParameter('reset') && getParameter('reset') === undefined) {
             await this.shutdownProcessAndReset();
+            this.shutdown = true;
             return;
         }
         if (hasParameter('reset') && getParameter('reset') !== undefined) {
@@ -528,20 +538,23 @@ export class Matterbridge extends EventEmitter {
             const plugin = this.plugins.get(getParameter('reset'));
             if (plugin) {
                 const matterStorageManager = await this.matterStorageService?.open(plugin.name);
-                if (!matterStorageManager)
+                if (!matterStorageManager) {
                     this.log.error(`Plugin ${plg}${plugin.name}${er} storageManager not found`);
-                await matterStorageManager?.createContext('events')?.clearAll();
-                await matterStorageManager?.createContext('fabrics')?.clearAll();
-                await matterStorageManager?.createContext('root')?.clearAll();
-                await matterStorageManager?.createContext('sessions')?.clearAll();
-                await matterStorageManager?.createContext('persist')?.clearAll();
-                this.log.info(`Reset commissionig for plugin ${plg}${plugin.name}${nf} done! Remove the device from the controller.`);
+                }
+                else {
+                    await matterStorageManager?.createContext('events')?.clearAll();
+                    await matterStorageManager?.createContext('fabrics')?.clearAll();
+                    await matterStorageManager?.createContext('root')?.clearAll();
+                    await matterStorageManager?.createContext('sessions')?.clearAll();
+                    await matterStorageManager?.createContext('persist')?.clearAll();
+                    this.log.info(`Reset commissionig for plugin ${plg}${plugin.name}${nf} done! Remove the device from the controller.`);
+                }
             }
             else {
                 this.log.warn(`Plugin ${plg}${getParameter('reset')}${wr} not registerd in matterbridge`);
             }
             await this.stopMatterStorage();
-            this.emit('shutdown');
+            this.shutdown = true;
             return;
         }
         if (getIntParameter('frontend') !== 0 || getIntParameter('frontend') === undefined)
@@ -713,6 +726,7 @@ export class Matterbridge extends EventEmitter {
         this.homeDirectory = getParameter('homedir') ?? os.homedir();
         this.matterbridgeInformation.homeDirectory = this.homeDirectory;
         this.log.debug(`Home Directory: ${this.homeDirectory}`);
+        const { fileURLToPath } = await import('node:url');
         const currentFileDirectory = path.dirname(fileURLToPath(import.meta.url));
         this.rootDirectory = path.resolve(currentFileDirectory, '../');
         this.matterbridgeInformation.rootDirectory = this.rootDirectory;
@@ -721,7 +735,9 @@ export class Matterbridge extends EventEmitter {
             this.globalModulesDirectory = this.matterbridgeInformation.globalModulesDirectory = await this.nodeContext.get('globalModulesDirectory', '');
         if (this.globalModulesDirectory === '') {
             try {
-                this.globalModulesDirectory = await this.getGlobalNodeModules();
+                this.execRunningCount++;
+                this.globalModulesDirectory = await getGlobalNodeModules();
+                this.execRunningCount--;
                 this.matterbridgeInformation.globalModulesDirectory = this.globalModulesDirectory;
                 this.log.debug(`Global node_modules Directory: ${this.globalModulesDirectory}`);
                 await this.nodeContext?.set('globalModulesDirectory', this.globalModulesDirectory);
@@ -790,20 +806,6 @@ export class Matterbridge extends EventEmitter {
         const cmdArgs = process.argv.slice(2).join(' ');
         this.log.debug(`Command Line Arguments: ${cmdArgs}`);
     }
-    async getGlobalNodeModules() {
-        return new Promise((resolve, reject) => {
-            this.execRunningCount++;
-            exec('npm root -g', (error, stdout) => {
-                this.execRunningCount--;
-                if (error) {
-                    reject(error);
-                }
-                else {
-                    resolve(stdout.trim());
-                }
-            });
-        });
-    }
     async getMatterbridgeLatestVersion() {
         getNpmPackageVersion('matterbridge')
             .then(async (version) => {
@@ -1195,11 +1197,7 @@ export class Matterbridge extends EventEmitter {
             if (!plugin.enabled)
                 continue;
             if (plugin.type === 'DynamicPlatform') {
-                plugin.locked = true;
-                plugin.storageContext = await this.createServerNodeContext(plugin.name, 'Matterbridge', bridge.code, this.aggregatorVendorId, 'Matterbridge', this.aggregatorProductId, plugin.description);
-                plugin.serverNode = await this.createServerNode(plugin.storageContext, this.port ? this.port++ : undefined, this.passcode ? this.passcode++ : undefined, this.discriminator ? this.discriminator++ : undefined);
-                plugin.aggregatorNode = await this.createAggregatorNode(plugin.storageContext);
-                await plugin.serverNode.add(plugin.aggregatorNode);
+                await this.createDynamicPlugin(plugin);
             }
         }
         await this.startPlugins();
@@ -1252,7 +1250,7 @@ export class Matterbridge extends EventEmitter {
             for (const plugin of this.plugins) {
                 if (!plugin.enabled || plugin.error)
                     continue;
-                if (!plugin.addedDevices || plugin.addedDevices === 0) {
+                if (plugin.type !== 'DynamicPlatform' && (!plugin.addedDevices || plugin.addedDevices === 0)) {
                     this.log.error(`Plugin ${plg}${plugin.name}${er} didn't add any devices to Matterbridge. Verify the plugin configuration.`);
                     continue;
                 }
@@ -1308,6 +1306,7 @@ export class Matterbridge extends EventEmitter {
         this.log.info('Matter node storage closed');
     }
     async createServerNodeContext(pluginName, deviceName, deviceType, vendorId, vendorName, productId, productName, serialNumber) {
+        const { randomBytes } = await import('node:crypto');
         if (!this.matterStorageService)
             throw new Error('No storage service initialized');
         this.log.info(`Creating server node storage context "${pluginName}.persist" for ${pluginName}...`);
@@ -1550,13 +1549,18 @@ export class Matterbridge extends EventEmitter {
         }
     }
     async advertiseServerNode(matterServerNode) {
-        if (matterServerNode && matterServerNode.lifecycle.isCommissioned) {
+        if (matterServerNode) {
             await matterServerNode.env.get(DeviceCommissioner)?.allowBasicCommissioning();
             const { qrPairingCode, manualPairingCode } = matterServerNode.state.commissioning.pairingCodes;
             this.log.notice(`Advertising for ${matterServerNode.id} is now started with the following pairing codes: qrPairingCode ${qrPairingCode}, manualPairingCode ${manualPairingCode}`);
             return { qrPairingCode, manualPairingCode };
         }
-        return undefined;
+    }
+    async stopAdvertiseServerNode(matterServerNode) {
+        if (matterServerNode && matterServerNode.lifecycle.isOnline) {
+            await matterServerNode.env.get(DeviceCommissioner)?.endCommissioning();
+            this.log.notice(`Stopped advertising for ${matterServerNode.id}`);
+        }
     }
     async createAggregatorNode(storageContext) {
         this.log.notice(`Creating ${await storageContext.get('storeId')} aggregator `);
@@ -1628,15 +1632,6 @@ export class Matterbridge extends EventEmitter {
                 plugin.registeredDevices--;
             if (plugin.addedDevices !== undefined)
                 plugin.addedDevices--;
-            if (plugin.registeredDevices === 0 && plugin.addedDevices === 0) {
-                if (plugin.serverNode) {
-                    await this.stopServerNode(plugin.serverNode);
-                    plugin.locked = false;
-                    plugin.aggregatorNode = undefined;
-                    plugin.serverNode = undefined;
-                    this.log.info(`Stopped server node for plugin ${plg}${pluginName}${nf}`);
-                }
-            }
         }
         this.devices.remove(device);
     }
@@ -1695,7 +1690,7 @@ export class Matterbridge extends EventEmitter {
     getVendorIdName = (vendorId) => {
         if (!vendorId)
             return '';
-        let vendorName = '';
+        let vendorName = '(Unknown vendorId)';
         switch (vendorId) {
             case 4937:
                 vendorName = '(AppleHome)';
@@ -1725,15 +1720,13 @@ export class Matterbridge extends EventEmitter {
                 vendorName = '(eWeLink)';
                 break;
             case 65521:
-                vendorName = '(PythonMatterServer)';
-                break;
-            default:
-                vendorName = '(unknown)';
+                vendorName = '(MatterServer)';
                 break;
         }
         return vendorName;
     };
     async spawnCommand(command, args = []) {
+        const { spawn } = await import('node:child_process');
         const cmdLine = command + ' ' + args.join(' ');
         if (process.platform === 'win32' && command === 'npm') {
             const argstring = 'npm ' + args.join(' ');

package/dist/matterbridgeEndpoint.js

@@ -1,6 +1,6 @@
 import { AnsiLogger, BLUE, CYAN, YELLOW, db, debugStringify, er, hk, or, zb } from './logger/export.js';
 import { bridgedNode } from './matterbridgeDeviceTypes.js';
-import { isValidNumber, isValidObject } from './utils/utils.js';
+import { isValidNumber, isValidObject } from './utils/export.js';
 import { MatterbridgeBehavior, MatterbridgeBehaviorDevice, MatterbridgeIdentifyServer, MatterbridgeOnOffServer, MatterbridgeLevelControlServer, MatterbridgeColorControlServer, MatterbridgeWindowCoveringServer, MatterbridgeThermostatServer, MatterbridgeFanControlServer, MatterbridgeDoorLockServer, MatterbridgeModeSelectServer, MatterbridgeValveConfigurationAndControlServer, MatterbridgeSmokeCoAlarmServer, MatterbridgeBooleanStateConfigurationServer, MatterbridgeSwitchServer, } from './matterbridgeBehaviors.js';
 import { addClusterServers, addFixedLabel, addOptionalClusterServers, addRequiredClusterServers, addUserLabel, capitalizeFirstLetter, createUniqueId, getBehavior, getBehaviourTypesFromClusterClientIds, getBehaviourTypesFromClusterServerIds, getDefaultFlowMeasurementClusterServer, getDefaultIlluminanceMeasurementClusterServer, getDefaultPressureMeasurementClusterServer, getDefaultRelativeHumidityMeasurementClusterServer, getDefaultTemperatureMeasurementClusterServer, getDefaultOccupancySensingClusterServer, lowercaseFirstLetter, updateAttribute, getClusterId, getAttributeId, setAttribute, getAttribute, checkNotLatinCharacters, generateUniqueId, subscribeAttribute, } from './matterbridgeEndpointHelpers.js';
 import { Endpoint, Lifecycle, MutableEndpoint, NamedHandler, SupportedBehaviors, VendorId } from '@matter/main';

package/dist/matterbridgeEndpointHelpers.js

@@ -1,5 +1,6 @@
-import { createHash } from 'crypto';
+import { createHash } from 'node:crypto';
 import { BLUE, CYAN, db, debugStringify, er, hk, or, YELLOW, zb } from './logger/export.js';
+import { deepCopy, deepEqual, isValidArray } from './utils/export.js';
 import { MatterbridgeIdentifyServer, MatterbridgeOnOffServer, MatterbridgeLevelControlServer, MatterbridgeColorControlServer, MatterbridgeWindowCoveringServer, MatterbridgeThermostatServer, MatterbridgeFanControlServer, MatterbridgeDoorLockServer, MatterbridgeModeSelectServer, MatterbridgeValveConfigurationAndControlServer, MatterbridgeSmokeCoAlarmServer, MatterbridgeBooleanStateConfigurationServer, } from './matterbridgeBehaviors.js';
 import { Lifecycle } from '@matter/main';
 import { getClusterNameById } from '@matter/main/types';
@@ -73,7 +74,6 @@ import { Pm25ConcentrationMeasurementServer } from '@matter/main/behaviors/pm25-
 import { Pm10ConcentrationMeasurementServer } from '@matter/main/behaviors/pm10-concentration-measurement';
 import { RadonConcentrationMeasurementServer } from '@matter/main/behaviors/radon-concentration-measurement';
 import { TotalVolatileOrganicCompoundsConcentrationMeasurementServer } from '@matter/main/behaviors/total-volatile-organic-compounds-concentration-measurement';
-import { deepCopy, deepEqual, isValidArray } from './utils/utils.js';
 export function capitalizeFirstLetter(name) {
     if (!name)
         return name;

package/dist/matterbridgePlatform.js

@@ -1,8 +1,8 @@
 import { checkNotLatinCharacters } from './matterbridgeEndpointHelpers.js';
-import { isValidArray, isValidObject, isValidString } from './utils/utils.js';
+import { isValidArray, isValidObject, isValidString } from './utils/export.js';
 import { CYAN, db, er, nf, wr } from './logger/export.js';
 import { NodeStorageManager } from './storage/export.js';
-import path from 'path';
+import path from 'node:path';
 export class MatterbridgePlatform {
     matterbridge;
     log;

package/dist/pluginManager.js

@@ -1,10 +1,5 @@
-import { AnsiLogger, BLUE, db, er, nf, nt, rs, UNDERLINE, UNDERLINEOFF, wr } from './logger/export.js';
-import path from 'path';
-import { promises as fs } from 'fs';
-import { pathToFileURL } from 'url';
-import { exec } from 'child_process';
+import { AnsiLogger, UNDERLINE, UNDERLINEOFF, BLUE, db, er, nf, nt, rs, wr } from './logger/export.js';
 import { plg, typ } from './matterbridgeTypes.js';
-import { shelly_config, somfytahoma_config, zigbee2mqtt_config } from './defaultConfigSchema.js';
 export class PluginManager {
     _plugins = new Map();
     nodeContext;
@@ -84,12 +79,14 @@ export class PluginManager {
         return plugins.length;
     }
     async resolve(pluginPath) {
+        const { default: path } = await import('node:path');
+        const { promises } = await import('node:fs');
         if (!pluginPath.endsWith('package.json'))
             pluginPath = path.join(pluginPath, 'package.json');
         let packageJsonPath = path.resolve(pluginPath);
         this.log.debug(`Resolving plugin path ${plg}${packageJsonPath}${db}`);
         try {
-            await fs.access(packageJsonPath);
+            await promises.access(packageJsonPath);
         }
         catch {
             this.log.debug(`Package.json not found at ${plg}${packageJsonPath}${db}`);
@@ -97,7 +94,7 @@ export class PluginManager {
             this.log.debug(`Trying at ${plg}${packageJsonPath}${db}`);
         }
         try {
-            const packageJson = JSON.parse(await fs.readFile(packageJsonPath, 'utf8'));
+            const packageJson = JSON.parse(await promises.readFile(packageJsonPath, 'utf8'));
             if (!packageJson.name) {
                 this.log.error(`Package.json name not found at ${packageJsonPath}`);
                 return null;
@@ -161,9 +158,10 @@ export class PluginManager {
         }
     }
     async parse(plugin) {
-        this.log.debug(`Parsing package.json of plugin ${plg}${plugin.name}${db}`);
+        const { promises } = await import('node:fs');
         try {
-            const packageJson = JSON.parse(await fs.readFile(plugin.path, 'utf8'));
+            this.log.debug(`Parsing package.json of plugin ${plg}${plugin.name}${db}`);
+            const packageJson = JSON.parse(await promises.readFile(plugin.path, 'utf8'));
             if (!packageJson.name)
                 this.log.warn(`Plugin ${plg}${plugin.name}${wr} has no name in package.json`);
             if (!packageJson.version)
@@ -235,6 +233,7 @@ export class PluginManager {
         }
     }
     async enable(nameOrPath) {
+        const { promises } = await import('node:fs');
         if (!nameOrPath || nameOrPath === '')
             return null;
         if (this._plugins.has(nameOrPath)) {
@@ -250,7 +249,7 @@ export class PluginManager {
             return null;
         }
         try {
-            const packageJson = JSON.parse(await fs.readFile(packageJsonPath, 'utf8'));
+            const packageJson = JSON.parse(await promises.readFile(packageJsonPath, 'utf8'));
             const plugin = this._plugins.get(packageJson.name);
             if (!plugin) {
                 this.log.error(`Failed to enable plugin ${plg}${nameOrPath}${er}: plugin not registered`);
@@ -267,6 +266,7 @@ export class PluginManager {
         }
     }
     async disable(nameOrPath) {
+        const { promises } = await import('node:fs');
         if (!nameOrPath || nameOrPath === '')
             return null;
         if (this._plugins.has(nameOrPath)) {
@@ -282,7 +282,7 @@ export class PluginManager {
             return null;
         }
         try {
-            const packageJson = JSON.parse(await fs.readFile(packageJsonPath, 'utf8'));
+            const packageJson = JSON.parse(await promises.readFile(packageJsonPath, 'utf8'));
             const plugin = this._plugins.get(packageJson.name);
             if (!plugin) {
                 this.log.error(`Failed to disable plugin ${plg}${nameOrPath}${er}: plugin not registered`);
@@ -299,6 +299,7 @@ export class PluginManager {
         }
     }
     async remove(nameOrPath) {
+        const { promises } = await import('node:fs');
         if (!nameOrPath || nameOrPath === '')
             return null;
         if (this._plugins.has(nameOrPath)) {
@@ -314,7 +315,7 @@ export class PluginManager {
             return null;
         }
         try {
-            const packageJson = JSON.parse(await fs.readFile(packageJsonPath, 'utf8'));
+            const packageJson = JSON.parse(await promises.readFile(packageJsonPath, 'utf8'));
             const plugin = this._plugins.get(packageJson.name);
             if (!plugin) {
                 this.log.error(`Failed to remove plugin ${plg}${nameOrPath}${er}: plugin not registered`);
@@ -331,6 +332,7 @@ export class PluginManager {
         }
     }
     async add(nameOrPath) {
+        const { promises } = await import('node:fs');
         if (!nameOrPath || nameOrPath === '')
             return null;
         const packageJsonPath = await this.resolve(nameOrPath);
@@ -339,7 +341,7 @@ export class PluginManager {
             return null;
         }
         try {
-            const packageJson = JSON.parse(await fs.readFile(packageJsonPath, 'utf8'));
+            const packageJson = JSON.parse(await promises.readFile(packageJsonPath, 'utf8'));
             if (this._plugins.get(packageJson.name)) {
                 this.log.info(`Plugin ${plg}${nameOrPath}${nf} already registered`);
                 return null;
@@ -351,15 +353,16 @@ export class PluginManager {
             return plugin || null;
         }
         catch (err) {
-            this.log.error(`Failed to parse package.json of plugin ${plg}${nameOrPath}${er}: ${err}`);
+            this.log.error(`Failed to parse package.json of plugin ${plg}${nameOrPath}${er}: ${err instanceof Error ? err.message : err}`);
             return null;
         }
     }
     async install(name) {
+        const { exec } = await import('node:child_process');
         await this.uninstall(name);
         this.log.info(`Installing plugin ${plg}${name}${nf}`);
-        return new Promise((resolve, reject) => {
-            exec(`npm install -g ${name} --omit=dev --force`, (error, stdout, stderr) => {
+        return new Promise((resolve) => {
+            exec(`npm install -g ${name} --omit=dev`, (error, stdout, stderr) => {
                 if (error) {
                     this.log.error(`Failed to install plugin ${plg}${name}${er}: ${error}`);
                     this.log.debug(`Failed to install plugin ${plg}${name}${db}: ${stderr}`);
@@ -389,9 +392,10 @@ export class PluginManager {
         });
     }
     async uninstall(name) {
+        const { exec } = await import('node:child_process');
         this.log.info(`Uninstalling plugin ${plg}${name}${nf}`);
-        return new Promise((resolve, reject) => {
-            exec(`npm uninstall -g ${name} --force`, (error, stdout, stderr) => {
+        return new Promise((resolve) => {
+            exec(`npm uninstall -g ${name}`, (error, stdout, stderr) => {
                 if (error) {
                     this.log.error(`Failed to uninstall plugin ${plg}${name}${er}: ${error}`);
                     this.log.debug(`Failed to uninstall plugin ${plg}${name}${db}: ${stderr}`);
@@ -406,6 +410,8 @@ export class PluginManager {
         });
     }
     async load(plugin, start = false, message = '', configure = false) {
+        const { promises } = await import('node:fs');
+        const { default: path } = await import('node:path');
         if (!plugin.enabled) {
             this.log.error(`Plugin ${plg}${plugin.name}${er} not enabled`);
             return undefined;
@@ -416,8 +422,9 @@ export class PluginManager {
         }
         this.log.info(`Loading plugin ${plg}${plugin.name}${nf} type ${typ}${plugin.type}${nf}`);
         try {
-            const packageJson = JSON.parse(await fs.readFile(plugin.path, 'utf8'));
+            const packageJson = JSON.parse(await promises.readFile(plugin.path, 'utf8'));
             const pluginEntry = path.resolve(path.dirname(plugin.path), packageJson.main);
+            const { pathToFileURL } = await import('node:url');
             const pluginUrl = pathToFileURL(pluginEntry);
             this.log.debug(`Importing plugin ${plg}${plugin.name}${db} from ${pluginUrl.href}`);
             const pluginInstance = await import(pluginUrl.href);
@@ -570,10 +577,13 @@ export class PluginManager {
         return undefined;
     }
     async loadConfig(plugin) {
+        const { default: path } = await import('node:path');
+        const { promises } = await import('node:fs');
+        const { shelly_config, somfytahoma_config, zigbee2mqtt_config } = await import('./defaultConfigSchema.js');
         const configFile = path.join(this.matterbridge.matterbridgeDirectory, `${plugin.name}.config.json`);
         try {
-            await fs.access(configFile);
-            const data = await fs.readFile(configFile, 'utf8');
+            await promises.access(configFile);
+            const data = await promises.readFile(configFile, 'utf8');
             const config = JSON.parse(data);
             this.log.debug(`Loaded config file ${configFile} for plugin ${plg}${plugin.name}${db}.`);
             config.name = plugin.name;
@@ -597,7 +607,7 @@ export class PluginManager {
                 else
                     config = { name: plugin.name, type: plugin.type, debug: false, unregisterOnShutdown: false };
                 try {
-                    await fs.writeFile(configFile, JSON.stringify(config, null, 2), 'utf8');
+                    await promises.writeFile(configFile, JSON.stringify(config, null, 2), 'utf8');
                     this.log.debug(`Created config file ${configFile} for plugin ${plg}${plugin.name}${db}.`);
                     return config;
                 }
@@ -613,13 +623,15 @@ export class PluginManager {
         }
     }
     async saveConfigFromPlugin(plugin) {
+        const { default: path } = await import('node:path');
+        const { promises } = await import('node:fs');
         if (!plugin.platform?.config) {
             this.log.error(`Error saving config file for plugin ${plg}${plugin.name}${er}: config not found`);
             return Promise.reject(new Error(`Error saving config file for plugin ${plg}${plugin.name}${er}: config not found`));
         }
         const configFile = path.join(this.matterbridge.matterbridgeDirectory, `${plugin.name}.config.json`);
         try {
-            await fs.writeFile(configFile, JSON.stringify(plugin.platform.config, null, 2), 'utf8');
+            await promises.writeFile(configFile, JSON.stringify(plugin.platform.config, null, 2), 'utf8');
             this.log.debug(`Saved config file ${configFile} for plugin ${plg}${plugin.name}${db}`);
             return Promise.resolve();
         }
@@ -629,13 +641,15 @@ export class PluginManager {
         }
     }
     async saveConfigFromJson(plugin, config) {
+        const { default: path } = await import('node:path');
+        const { promises } = await import('node:fs');
         if (!config.name || !config.type || config.name !== plugin.name) {
             this.log.error(`Error saving config file for plugin ${plg}${plugin.name}${er}. Wrong config data content:${rs}\n`, config);
             return;
         }
         const configFile = path.join(this.matterbridge.matterbridgeDirectory, `${plugin.name}.config.json`);
         try {
-            await fs.writeFile(configFile, JSON.stringify(config, null, 2), 'utf8');
+            await promises.writeFile(configFile, JSON.stringify(config, null, 2), 'utf8');
             plugin.configJson = config;
             this.log.debug(`Saved config file ${configFile} for plugin ${plg}${plugin.name}${db}`);
         }
@@ -645,10 +659,11 @@ export class PluginManager {
         }
     }
     async loadSchema(plugin) {
+        const { promises } = await import('node:fs');
         const schemaFile = plugin.path.replace('package.json', `${plugin.name}.schema.json`);
         try {
-            await fs.access(schemaFile);
-            const data = await fs.readFile(schemaFile, 'utf8');
+            await promises.access(schemaFile);
+            const data = await promises.readFile(schemaFile, 'utf8');
             const schema = JSON.parse(data);
             schema.title = plugin.description;
             schema.description = plugin.name + ' v. ' + plugin.version + ' by ' + plugin.author;

package/dist/utils/colorUtils.js

@@ -1,4 +1,4 @@
-import { assert } from 'console';
+import { assert } from 'node:console';
 export function hslColorToRgbColor(hue, saturation, luminance) {
     if (hue === 360) {
         hue = 0;

package/dist/utils/export.js

@@ -1,2 +1,4 @@
 export * from './utils.js';
+export * from './parameter.js';
+export * from './isvalid.js';
 export * from './colorUtils.js';

package/dist/utils/isvalid.js

@@ -0,0 +1,50 @@
+export function isValidIpv4Address(ipv4Address) {
+    const ipv4Regex = /^(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)$/;
+    return ipv4Regex.test(ipv4Address);
+}
+export function isValidNumber(value, min, max) {
+    if (value === undefined || value === null || typeof value !== 'number' || Number.isNaN(value))
+        return false;
+    if (min !== undefined && value < min)
+        return false;
+    if (max !== undefined && value > max)
+        return false;
+    return true;
+}
+export function isValidBoolean(value) {
+    return value !== undefined && value !== null && typeof value === 'boolean';
+}
+export function isValidString(value, minLength, maxLength) {
+    if (value === undefined || value === null || typeof value !== 'string')
+        return false;
+    if (minLength !== undefined && value.length < minLength)
+        return false;
+    if (maxLength !== undefined && value.length > maxLength)
+        return false;
+    return true;
+}
+export function isValidObject(value, minLength, maxLength) {
+    if (value === undefined || value === null || typeof value !== 'object' || Array.isArray(value))
+        return false;
+    const keys = Object.keys(value);
+    if (minLength !== undefined && keys.length < minLength)
+        return false;
+    if (maxLength !== undefined && keys.length > maxLength)
+        return false;
+    return true;
+}
+export function isValidArray(value, minLength, maxLength) {
+    if (value === undefined || value === null || !Array.isArray(value))
+        return false;
+    if (minLength !== undefined && value.length < minLength)
+        return false;
+    if (maxLength !== undefined && value.length > maxLength)
+        return false;
+    return true;
+}
+export function isValidNull(value) {
+    return value === null;
+}
+export function isValidUndefined(value) {
+    return value === undefined;
+}