Allow to configure plugins used from website

pirquessa · Mar 14, 2020 · 2ab0f1b · 2ab0f1b
1 parent ae4d7d6
commit 2ab0f1b
Show file tree

Hide file tree

Showing 3 changed files with 66 additions and 26 deletions.
diff --git a/clientrobotpi.js b/clientrobotpi.js
@@ -49,14 +49,7 @@ const RL = require("readline");
 const GPIO = require("pigpio").Gpio;
 const I2C = require("i2c-bus");
 const PCA9685 = require("pca9685");
-const PLUGINS = new (require("./plugins"))([
- "./Safety.js",
- "./VideoDiffusion.js",
- // "./AudioDiffusion.js",
- // "./SerialSlave.js",
- // "./TextToSpeech.js",
- "./Gentank.js"
-]);
+const PLUGINS = new (require("./plugins"))();
 
 const VERSION = Math.trunc(FS.statSync(__filename).mtimeMs);
 const PROCESSTIME = Date.now();
@@ -243,6 +236,8 @@ CONF.SERVEURS.forEach(function(serveur, index) {
    conf = data.conf;
    hard = data.hard;
 
+   PLUGINS.onNewConfig(hard, conf);
+
    tx = new TRAME.Tx(conf.TX);
    rx = new TRAME.Rx(conf.TX, conf.RX);
 
@@ -420,7 +415,7 @@ CONF.SERVEURS.forEach(function(serveur, index) {
   }
  });
 
- PLUGINS.apply('registerNewSocket', [sockets[serveur]]);
+ PLUGINS.onReady(PLUGINS.apply.bind(PLUGINS, 'registerNewSocket', [sockets[serveur]]));
 });
 
 PLUGINS.on('dataToServer', (eventName, data) => {

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "vigiclient",
-  "version": "0.5.0",
+  "version": "0.5.1",
   "description": "Raspberry PI robot client for Vigibot.com",
   "main": "clientrobotpi.js",
   "dependencies": {

diff --git a/plugins/index.js b/plugins/index.js
@@ -1,41 +1,86 @@
 const LOGGER = require("../utils/Logger.js").getLogger();
 
 class PluginManager {
-  constructor(pluginPathes) {
-    this.plugins = [];
+  constructor() {
+    this.plugins = null;
+    this.callbackStack = [];
+  }
 
+  init(pluginConfigs) {
     LOGGER.local('PLUGIN | DEBUG | Will instanciate all plugins:');
-    pluginPathes.forEach(pluginPath => {
-      LOGGER.local('PLUGIN | DEBUG | Instanciate plugin: ' + pluginPath);
+
+    var plugins = [];
+    pluginConfigs.forEach(pluginConfig => {
+      LOGGER.local('PLUGIN | DEBUG | Instanciate plugin: ' + pluginConfig.name);
       try {
-        this.plugins.push(new (require(pluginPath))());
+        plugins.push(new (require(pluginConfig.path))());
       }
       catch(e) {
-        LOGGER.local('PLUGIN | ERROR | Fail to instanciate plugin ' + pluginPath + ': ' + e);
+        LOGGER.local('PLUGIN | ERROR | Fail to instanciate plugin ' + pluginPath.name + ': ' + e);
       }
     });
+    this.plugins = plugins;
+    this.callbackStack.forEach(cb => {
+      cb();
+    });
+  }
+
+  onNewConfig(hardwareConfig, remoteConfig) {
+    if (hardwareConfig.PLUGINS !== undefined) {
+      if (this.plugins === null) {
+        var pluginPathes = hardwareConfig.PLUGINS.filter(pluginName => {
+          return /^\w+$/g.test(pluginName);
+        }).map((pluginName => {
+          return {
+            name: pluginName,
+            path: './' + pluginName + '.js'
+          };
+        }));
+
+        this.init(pluginPathes);
+      }
+    }
+    else {
+      LOGGER.local('PLUGIN | ERROR | You need to define the plugins to load !');
+    }
+  }
+
+  onReady(callback) {
+    if (this.plugins === null) {
+      this.callbackStack.push(callback);
+    }
+    else {
+      callback();
+    }
   }
 
   apply(funName, args) {
     //LOGGER.local('Apply ' + funName);
 
     let promises = [];
 
-    this.plugins.forEach(plugin => {
-      try {
-        promises.push(plugin[funName].apply(plugin, args));
-      }
-      catch(e) {
-        LOGGER.local('PLUGIN | ERROR | Fail to apply ' + funName + ' on plugin ' + plugin.name + ': ' + e);
-      }
-    });
+    if (this.plugins !== null) {
+      this.plugins.forEach(plugin => {
+        try {
+          promises.push(plugin[funName].apply(plugin, args));
+        }
+        catch(e) {
+          LOGGER.local('PLUGIN | ERROR | Fail to apply ' + funName + ' on plugin ' + plugin.name + ': ' + e);
+        }
+      });
+    }
+    else {
+      LOGGER.local('PLUGIN | ERROR | Can\'t apply method "' + funName + '" because plugins are not initialized');
+    }
 
     return Promise.all(promises);
   }
 
   on(eventName, listener) {
-    this.plugins.forEach(plugin => {
-      plugin.on(eventName, listener);
+    this.onReady(() => {
+      this.plugins.forEach(plugin => {
+        plugin.on(eventName, listener);
+      });
     });
   }
 }