Son Goku

- Rebased sql, test, web, defintions, languages, INSTALL, and libs folders.

libs/plugins.js

@@ -17,28 +17,76 @@ module.exports = function(s,config,lang){
             break;
         }
     }
-    //multi plugin connections
-    s.connectedPlugins={}
+    s.connectedPlugins = {}
+    s.connectedDetectorPlugins = {}
+    s.detectorPluginArray = []
+    s.isAtleatOneDetectorPluginConnected = false
+    s.addDetectorPlugin = function(name,d){
+        s.connectedDetectorPlugins[d.plug] = {
+            started: s.timeObject(),
+            id: d.id,
+            plug: d.plug,
+            notice: d.notice,
+            connectionType: d.connectionType
+        }
+        s.resetDetectorPluginArray()
+    }
+    s.removeDetectorPlugin = function(name){
+        delete(s.connectedDetectorPlugins[name])
+        s.resetDetectorPluginArray(name)
+    }
+    s.resetDetectorPluginArray = function(){
+        pluginArray = []
+        Object.keys(s.connectedPlugins).forEach(function(name){
+            var plugin = s.connectedPlugins[name]
+            if(plugin.plugged === true && plugin.type === 'detector'){
+                pluginArray.push(name)
+            }
+        })
+        if(pluginArray.length > 0)s.isAtleatOneDetectorPluginConnected = true
+        s.detectorPluginArray = pluginArray
+    }
+    s.sendToAllDetectors = function(data){
+        s.detectorPluginArray.forEach(function(name){
+            s.connectedPlugins[name].tx(data)
+        })
+    }
+    s.sendDetectorInfoToClient = function(data,txFunction){
+        s.detectorPluginArray.forEach(function(name){
+            var detectorData = Object.assign(data,{
+                notice: s.connectedDetectorPlugins[name].notice,
+                plug: name
+            })
+            txFunction(detectorData)
+        })
+    }
+    // s.sendToDetectorsInChain = function(){
+    //
+    // }
     s.pluginInitiatorSuccess=function(mode,d,cn){
         s.systemLog('pluginInitiatorSuccess',d)
-        if(mode==='client'){
-            //is in client mode (camera.js is client)
-            cn.pluginEngine=d.plug
-            if(!s.connectedPlugins[d.plug]){
-                s.connectedPlugins[d.plug]={plug:d.plug}
+        if(!s.connectedPlugins[d.plug]){
+            s.connectedPlugins[d.plug]={
+                plug: d.plug,
+                type: d.type
             }
+        }
+        s.connectedPlugins[d.plug].plugged = true
+        if(mode==='client'){
+            s.connectedPlugins[d.plug].tx = function(x){return cn.emit('f',x)}
+            //is in client mode (camera.js is client)
+            cn.pluginEngine = d.plug
             s.systemLog('Connected to plugin : Detector - '+d.plug+' - '+d.type)
             switch(d.type){
                 default:case'detector':
-                    s.ocv = {
-                        started: s.timeObject(),
+                    cn.detectorPlugin = d.plug
+                    s.addDetectorPlugin(d.plug,{
                         id: cn.id,
                         plug: d.plug,
                         notice: d.notice,
                         isClientPlugin: true,
                         connectionType: d.connectionType
-                    };
-                    cn.ocv = 1;
+                    })
                     s.tx({f:'detector_plugged',plug:d.plug,notice:d.notice},'CPU')
                 break;
             }
@@ -46,21 +94,18 @@ module.exports = function(s,config,lang){
             //is in host mode (camera.js is client)
             switch(d.type){
                 default:case'detector':
-                    s.ocv = {
-                        started:s.timeObject(),
+                    s.addDetectorPlugin(d.plug,{
                         id:"host",
                         plug:d.plug,
                         notice:d.notice,
                         isHostPlugin:true,
                         connectionType: d.connectionType
-                    };
+                    })
+                    s.tx({f:'detector_plugged',plug:d.plug,notice:d.notice},'CPU')
                 break;
             }
         }
-        s.connectedPlugins[d.plug].plugged=true
         s.tx({f:'readPlugins',ke:d.ke},'CPU')
-        s.ocvTx({f:'api_key',key:d.plug})
-        s.api[d.plug]={pluginEngine:d.plug,permissions:{},details:{},ip:'0.0.0.0'};
     }
     s.pluginInitiatorFail=function(mode,d,cn){
         if(s.connectedPlugins[d.plug])s.connectedPlugins[d.plug].plugged=false
@@ -73,7 +118,10 @@ module.exports = function(s,config,lang){
     }
     if(config.plugins&&config.plugins.length>0){
         config.plugins.forEach(function(v){
-            s.connectedPlugins[v.id]={plug:v.id}
+            s.connectedPlugins[v.id]={
+                plug: v.id,
+                type: v.type
+            }
             if(v.enabled===false){return}
             if(v.mode==='host'){
                 //is in host mode (camera.js is client)
@@ -102,7 +150,13 @@ module.exports = function(s,config,lang){
                 socket.on('ocv',s.pluginEventController);
                 socket.on('disconnect', function(){
                     s.connectedPlugins[v.id].plugged=false
-                    delete(s.api[v.id])
+                    if(v.type === 'detector'){
+                        s.tx({f:'detector_unplugged',plug:v.id},'CPU')
+                        s.removeDetectorPlugin(v.id)
+                        s.sendDetectorInfoToClient({f:'detector_plugged'},function(data){
+                            s.tx(data,'CPU')
+                        })
+                    }
                     s.systemLog('Plugin Disconnected : '+v.id)
                     s.connectedPlugins[v.id].reconnector = setInterval(function(){
                         if(socket.connected===true){