matterbridge 2.1.5-dev.6 → 2.1.5-dev.8

package/dist/frontend.js

@@ -134,7 +134,13 @@ export class Frontend {
         this.webSocketServer = new WebSocketServer(hasParameter('ssl') ? { server: this.httpsServer } : { server: this.httpServer });
         this.webSocketServer.on('connection', (ws, request) => {
             const clientIp = request.socket.remoteAddress;
-            AnsiLogger.setGlobalCallback(this.wssSendMessage.bind(this), "debug");
+            let callbackLogLevel = "notice";
+            if (this.matterbridge.matterbridgeInformation.loggerLevel === "info" || this.matterbridge.matterbridgeInformation.matterLoggerLevel === MatterLogLevel.INFO)
+                callbackLogLevel = "info";
+            if (this.matterbridge.matterbridgeInformation.loggerLevel === "debug" || this.matterbridge.matterbridgeInformation.matterLoggerLevel === MatterLogLevel.DEBUG)
+                callbackLogLevel = "debug";
+            AnsiLogger.setGlobalCallback(this.wssSendMessage.bind(this), callbackLogLevel);
+            this.log.debug(`WebSocketServer logger global callback set to ${callbackLogLevel}`);
             this.log.info(`WebSocketServer client "${clientIp}" connected to Matterbridge`);
             ws.on('message', (message) => {
                 this.wsMessageHandler(ws, message);

package/dist/matterbridge.js

@@ -249,6 +249,7 @@ export class Matterbridge extends EventEmitter {
             this.log.logLevel = await this.nodeContext.get('matterbridgeLogLevel', "info");
         }
         MatterbridgeEndpoint.logLevel = this.log.logLevel;
+        this.matterbridgeInformation.loggerLevel = this.log.logLevel;
         if (hasParameter('filelogger') || (await this.nodeContext.get('matterbridgeFileLog', false))) {
             AnsiLogger.setGlobalLogfile(path.join(this.matterbridgeDirectory, this.matterbrideLoggerFile), this.log.logLevel, true);
             this.matterbridgeInformation.fileLogger = true;
@@ -285,6 +286,7 @@ export class Matterbridge extends EventEmitter {
         }
         Logger.format = MatterLogFormat.ANSI;
         Logger.setLogger('default', this.createMatterLogger());
+        this.matterbridgeInformation.matterLoggerLevel = Logger.defaultLogLevel;
         if (hasParameter('matterfilelogger') || (await this.nodeContext.get('matterFileLog', false))) {
             this.matterbridgeInformation.matterFileLogger = true;
             Logger.addLogger('matterfilelogger', await this.createMatterFileLogger(path.join(this.matterbridgeDirectory, this.matterLoggerFile), true), {
@@ -926,6 +928,9 @@ export class Matterbridge extends EventEmitter {
         for (const plugin of this.plugins) {
             await this.removeAllBridgedEndpoints(plugin.name);
         }
+        this.log.debug('Waiting for the MessageExchange to finish...');
+        await new Promise((resolve) => setTimeout(resolve, 1000));
+        this.log.debug('Cleaning up and shutting down...');
         await this.cleanup('unregistered all devices and shutting down...', false);
     }
     async shutdownProcessAndReset() {
@@ -969,6 +974,8 @@ export class Matterbridge extends EventEmitter {
                 }
             }
             this.log.notice(`Stopping matter server nodes in ${this.bridgeMode} mode...`);
+            this.log.debug('Waiting for the MessageExchange to finish...');
+            await new Promise((resolve) => setTimeout(resolve, 1000));
             if (this.bridgeMode === 'bridge') {
                 if (this.serverNode) {
                     await this.stopServerNode(this.serverNode);

package/dist/pluginManager.js

@@ -450,7 +450,7 @@ export class PluginManager {
                 plugin.configJson = config;
                 plugin.schemaJson = await this.loadSchema(plugin);
                 await this.saveToStorage();
-                this.log.notice(`Loaded plugin ${plg}${plugin.name}${nf} type ${typ}${platform.type}${db} (entrypoint ${UNDERLINE}${pluginEntry}${UNDERLINEOFF})`);
+                this.log.notice(`Loaded plugin ${plg}${plugin.name}${nt} type ${typ}${platform.type}${nt} (entrypoint ${UNDERLINE}${pluginEntry}${UNDERLINEOFF})`);
                 if (start)
                     await this.start(plugin, message, false);
                 if (configure)

package/npm-shrinkwrap.json

@@ -1,12 +1,12 @@
 {
   "name": "matterbridge",
-  "version": "2.1.5-dev.6",
+  "version": "2.1.5-dev.8",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "matterbridge",
-      "version": "2.1.5-dev.6",
+      "version": "2.1.5-dev.8",
       "license": "Apache-2.0",
       "dependencies": {
         "@matter/main": "0.12.3",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "matterbridge",
-  "version": "2.1.5-dev.6",
+  "version": "2.1.5-dev.8",
   "description": "Matterbridge plugin manager for Matter",
   "author": "https://github.com/Luligu",
   "license": "Apache-2.0",