matterbridge 2.1.6-dev.2 → 2.1.6-dev.4

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);
@@ -463,7 +470,7 @@ export class PluginManager {
             }
         }
         catch (err) {
-            this.log.error(`Failed to load plugin ${plg}${plugin.name}${er}: ${err}`);
+            this.log.error(`Failed to load plugin ${plg}${plugin.name}${er}: ${err instanceof Error ? err.message : err}`);
             plugin.error = true;
         }
         return undefined;
@@ -493,7 +500,7 @@ export class PluginManager {
         }
         catch (err) {
             plugin.error = true;
-            this.log.error(`Failed to start plugin ${plg}${plugin.name}${er}: ${err}`);
+            this.log.error(`Failed to start plugin ${plg}${plugin.name}${er}: ${err instanceof Error ? err.message : err}`);
         }
         return undefined;
     }
@@ -543,7 +550,7 @@ export class PluginManager {
             this.log.debug(`Plugin ${plg}${plugin.name}${db} not configured`);
         }
         if (!plugin.platform) {
-            this.log.debug(`*Plugin ${plg}${plugin.name}${db} no platform found`);
+            this.log.debug(`Plugin ${plg}${plugin.name}${db} no platform found`);
             return undefined;
         }
         this.log.info(`Shutting down plugin ${plg}${plugin.name}${nf}: ${reason}...`);
@@ -565,15 +572,18 @@ export class PluginManager {
             return plugin;
         }
         catch (err) {
-            this.log.error(`Failed to shut down plugin ${plg}${plugin.name}${er}: ${err}`);
+            this.log.error(`Failed to shut down plugin ${plg}${plugin.name}${er}: ${err instanceof Error ? err.message : err}`);
         }
         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;
@@ -585,45 +595,43 @@ export class PluginManager {
             return config;
         }
         catch (err) {
-            if (err) {
-                const nodeErr = err;
-                if (nodeErr.code === 'ENOENT') {
-                    let config;
-                    if (plugin.name === 'matterbridge-zigbee2mqtt')
-                        config = zigbee2mqtt_config;
-                    else if (plugin.name === 'matterbridge-somfy-tahoma')
-                        config = somfytahoma_config;
-                    else if (plugin.name === 'matterbridge-shelly')
-                        config = shelly_config;
-                    else
-                        config = { name: plugin.name, type: plugin.type, debug: false, unregisterOnShutdown: false };
-                    try {
-                        await fs.writeFile(configFile, JSON.stringify(config, null, 2), 'utf8');
-                        this.log.debug(`Created config file ${configFile} for plugin ${plg}${plugin.name}${db}.`);
-                        return config;
-                    }
-                    catch (err) {
-                        this.log.error(`Error creating config file ${configFile} for plugin ${plg}${plugin.name}${er}: ${err}`);
-                        return config;
-                    }
+            const nodeErr = err;
+            if (nodeErr.code === 'ENOENT') {
+                let config;
+                if (plugin.name === 'matterbridge-zigbee2mqtt')
+                    config = zigbee2mqtt_config;
+                else if (plugin.name === 'matterbridge-somfy-tahoma')
+                    config = somfytahoma_config;
+                else if (plugin.name === 'matterbridge-shelly')
+                    config = shelly_config;
+                else
+                    config = { name: plugin.name, type: plugin.type, debug: false, unregisterOnShutdown: false };
+                try {
+                    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;
                 }
-                else {
-                    this.log.error(`Error accessing config file ${configFile} for plugin ${plg}${plugin.name}${er}: ${err}`);
-                    return { name: plugin.name, type: plugin.type, debug: false, unregisterOnShutdown: false };
+                catch (err) {
+                    this.log.error(`Error creating config file ${configFile} for plugin ${plg}${plugin.name}${er}: ${err instanceof Error ? err.message : err}`);
+                    return config;
                 }
             }
-            this.log.error(`Error loading config file ${configFile} for plugin ${plg}${plugin.name}${er}: ${err}`);
-            return { name: plugin.name, type: plugin.type, debug: false, unregisterOnShutdown: false };
+            else {
+                this.log.error(`Error accessing config file ${configFile} for plugin ${plg}${plugin.name}${er}: ${err instanceof Error ? err.message : err}`);
+                return { name: plugin.name, type: plugin.type, debug: false, unregisterOnShutdown: false };
+            }
         }
     }
     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();
         }
@@ -633,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}`);
         }
@@ -649,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/frontend/build/asset-manifest.json

@@ -1,7 +1,7 @@
 {
   "files": {
     "main.css": "./static/css/main.cf25d33e.css",
-    "main.js": "./static/js/main.a241d4f0.js",
+    "main.js": "./static/js/main.257513e8.js",
     "static/js/453.abd36b29.chunk.js": "./static/js/453.abd36b29.chunk.js",
     "static/media/roboto-latin-700-normal.woff2": "./static/media/roboto-latin-700-normal.4535474e1cf8598695ad.woff2",
     "static/media/roboto-latin-500-normal.woff2": "./static/media/roboto-latin-500-normal.7077203b1982951ecf76.woff2",
@@ -61,11 +61,11 @@
     "static/media/roboto-greek-ext-400-normal.woff": "./static/media/roboto-greek-ext-400-normal.16eb83b4a3b1ea994243.woff",
     "index.html": "./index.html",
     "main.cf25d33e.css.map": "./static/css/main.cf25d33e.css.map",
-    "main.a241d4f0.js.map": "./static/js/main.a241d4f0.js.map",
+    "main.257513e8.js.map": "./static/js/main.257513e8.js.map",
     "453.abd36b29.chunk.js.map": "./static/js/453.abd36b29.chunk.js.map"
   },
   "entrypoints": [
     "static/css/main.cf25d33e.css",
-    "static/js/main.a241d4f0.js"
+    "static/js/main.257513e8.js"
   ]
 }

package/frontend/build/index.html

@@ -1 +1 @@
-<!doctype html><html lang="en"><head><meta charset="utf-8"/><base href="./"><link rel="icon" href="./matterbridge 32x32.png"/><meta name="viewport" content="width=device-width,initial-scale=1"/><meta name="theme-color" content="#000000"/><title>Matterbridge</title><link rel="manifest" href="./manifest.json"/><script defer="defer" src="./static/js/main.a241d4f0.js"></script><link href="./static/css/main.cf25d33e.css" rel="stylesheet"></head><body><noscript>You need to enable JavaScript to run this app.</noscript><div id="root"></div></body></html>
+<!doctype html><html lang="en"><head><meta charset="utf-8"/><base href="./"><link rel="icon" href="./matterbridge 32x32.png"/><meta name="viewport" content="width=device-width,initial-scale=1"/><meta name="theme-color" content="#000000"/><title>Matterbridge</title><link rel="manifest" href="./manifest.json"/><script defer="defer" src="./static/js/main.257513e8.js"></script><link href="./static/css/main.cf25d33e.css" rel="stylesheet"></head><body><noscript>You need to enable JavaScript to run this app.</noscript><div id="root"></div></body></html>

package/frontend/build/matterbridge.svg

@@ -0,0 +1,50 @@
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 296.2 296.2">
+    <defs>
+        <linearGradient id="lg1" x1="16.6" y1="16.6" x2="279.6" y2="279.6" gradientUnits="userSpaceOnUse">
+            <stop offset="0" stop-color="#00b48d" />
+            <stop offset=".1" stop-color="#3faa77" />
+            <stop offset=".3" stop-color="#234148" />
+            <stop offset=".7" stop-color="#203b44" />
+            <stop offset=".9" stop-color="#ad2e6e" />
+            <stop offset="1" stop-color="#c81b74" />
+        </linearGradient>
+        <linearGradient id="lg2" x1="31.1" y1="31.1" x2="265.1" y2="265.1" gradientUnits="userSpaceOnUse">
+            <stop offset="0" stop-color="#00b48d" />
+            <stop offset=".2" stop-color="#285251" />
+            <stop offset=".4" stop-color="#234148" />
+            <stop offset=".8" stop-color="#203b44" />
+            <stop offset=".9" stop-color="#a8316c" />
+            <stop offset="1" stop-color="#c81b74" />
+        </linearGradient>
+        <linearGradient id="lg3" x1="116.2" y1="143.9" x2="139.8" y2="143.9"
+            gradientUnits="userSpaceOnUse">
+            <stop offset="0" stop-color="#8bc751" />
+            <stop offset="1" stop-color="#0db14b" />
+        </linearGradient>
+        <linearGradient id="lg4" x1="136.1" y1="100.8" x2="159.6" y2="100.8"
+            xlink:href="#lg3" />
+        <linearGradient id="lg5" x1="155.3" y1="143.9" x2="178.9" y2="143.9"
+            xlink:href="#lg3" />
+        <linearGradient id="lg6" x1="46.8" y1="25.7" x2="89.6" y2="74.8" gradientUnits="userSpaceOnUse">
+            <stop offset="0" stop-color="#b1d34a" />
+            <stop offset="1" stop-color="#50b848" />
+        </linearGradient>
+    </defs>
+        <rect width="296.2" height="296.2" rx="56.7" ry="56.7" style="fill:url(#lg1)" />
+        <rect x="16.3" y="16.3" width="263.6" height="263.6" rx="50.5" ry="50.5" style="fill:url(#lg2)" />
+        <circle cx="128" cy="143.9" r="11.8" style="fill:url(#lg3)" />
+        <circle cx="147.8" cy="100.8" r="11.8" style="fill:url(#lg4)" />
+        <path
+            d="m244.6 114.5.4-.5L160 33a17 17 0 0 0-24.7-.5l-86.4 83.3a15 15 0 0 0 9.2 26.9h19.3v-4.7l-13.7-12.7v-.1l83.7-80.8 84.2 81-13.9 12.8v4.5h19.5a15 15 0 0 0 7.4-28.1Z"
+            style="fill:url(#lg3)" />
+        <circle cx="167.1" cy="143.9" r="11.8" style="fill:url(#lg5)" />
+        <path fill="#fff" d="M219 89.3V35.5a10.5 10.5 0 1 0-21 0v33.7l21 20Z" />
+        <path
+            d="M91.4 73.3H83a37 37 0 0 0-14.5-28.4L65 50.2c.1 0 12.6 9 11.7 25.4-5.3-.4-11.2-1.9-16.3-5.3-11.8-7.8-16-23.7-11.9-46 8.7 1.5 34 7 43 22.8 4.1 7.3 4.1 16.1 0 26.2Z"
+            style="fill:url(#lg6)" />
+        <path
+            d="M65.9 80a49.6 49.6 0 0 0 17.8 2.2l16.6-16c1.6-8.3.5-15.7-3.3-22.4C84.6 22 47.8 17.5 46.2 17.4l-3-.4-.6 3c-3.8 18.4-5.9 50.6 23.2 60ZM48.4 24.4c8.7 1.5 34 7 43 22.8 4.1 7.3 4.1 16.1 0 26.2H83a37 37 0 0 0-14.5-28.4l-3.7 5.3c.1 0 12.6 9 11.7 25.4-5.3-.4-11.2-1.9-16.3-5.3-11.9-7.8-16-23.7-11.9-46Z"
+            fill="#1e5857" />
+        <path fill="#fff"
+            d="M250.5 90.5a17.4 17.4 0 1 1 0-34.8 17.4 17.4 0 0 1 0 34.8Zm0-22.7a5.4 5.4 0 0 0 0 10.7 5.3 5.3 0 0 0 0-10.7ZM258.8 148.2a15.9 15.9 0 0 0-9.6 28.5c-.8 4.2-5.4 4.6-5.4 4.6h-26v-43l13.6-13-1.8-2-82.2-79-81.2 78.3-2.5 2.6 13.7 13v42.9H53a21.5 21.5 0 1 0 11.7 15h12.6v18.8c0 7.8 6.4 14.1 14.1 14.1h29.3v14.8H64a10.6 10.6 0 0 0-17.7 8 10.6 10.6 0 0 0 17.6 8h157.6a16.3 16.3 0 1 0 0-16h-84.8V229h66.8c7.8 0 14.2-6.3 14.2-14.1v-19.2h27.6c14.3 0 17.8-12.8 18.5-16.6a15.9 15.9 0 0 0-5-30.9ZM43.7 210.8a10.3 10.3 0 1 1 0-20.6 10.3 10.3 0 0 1 0 20.6Zm192 36a5 5 0 1 1 0 10 5 5 0 0 1 0-10Zm-77-34.8h-22v-34h22v34Zm8.4-79.8c2.7 0 5.2 1 7.2 2.5v-10.4L188 137s2.6 1.3 4.6 1.3h6.7v68c0 3.2-2.6 5.7-5.7 5.7h-19v-34h1.4a7.5 7.5 0 0 0 0-15H120a7.5 7.5 0 0 0 0 15h.7v34h-19.3a5.7 5.7 0 0 1-5.7-5.6v-68.1h6.7c2 0 4.6-1.3 4.6-1.3l13.7-12.7v10.4a11.7 11.7 0 0 1 16 1.6v-13a14.9 14.9 0 0 0-25-10.8s-.1.2-.1.2l-.5.5-6.9 7H92.5l55-53.2 55.1 53.2h-11.8l-7-7c0-.2-.2-.3-.4-.5l-.2-.2a14.8 14.8 0 0 0-25 10.9v12.9c2.2-2.5 5.3-4.1 8.9-4.1Zm91.7 36.7a4.9 4.9 0 1 1 0-9.7 4.9 4.9 0 0 1 0 9.7Z" />
+</svg>