matterbridge 2.1.6-dev.3 → 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);
@@ -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/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>