added ephemeral, removed some logs

Author: bsears90

actions/index.js

@@ -2,6 +2,6 @@ module.exports = {
 
 
         enablePlugin : (plugin) => ({type : "PLUGIN_ENABLED", plugin}),
-        provideService : (serviceType, service, provider) => ({type : "SERVICE_PROVIDED", serviceType, service, provider}),
+        provideService : (serviceType, service, provider, ephemeral) => ({type : "SERVICE_PROVIDED", serviceType, service, provider, ephemeral}),
 
 }

config.js

@@ -11,7 +11,6 @@ module.exports = {
         if(typeof config === "function"){
             config = await config();
         }
-        console.log(config, "CONFIG!");
         let pluginConfigs = config.plugins;
         let clientConfigs = pluginConfigs.reduce((acc, plugin) => {
             let pluginPackage = this.getPluginPackage(configPath, plugin)

effects/consume.js

@@ -3,7 +3,6 @@ const GeneratorFunction = (function*(){}).constructor;
 
 
 function* serviceConsumer(channel){
-    console.log(channel);
     if(channel instanceof GeneratorFunction){
         channel = yield call(channel);
     }

pluginbot.js

@@ -37,7 +37,6 @@ class Pluginbot extends PluginbotBase {
                 return resolve("plugin " + pluginName + " already enabled");
             }
             // let imports = this.buildImports(pluginPkgPart);
-            console.log("INSTALLING PLUGIN: ", pluginName);
 
             //todo : switch this to thunk instead of callback?
             this.runSaga(this._install.bind(this), plugin, pluginName, callback);

src/plugin.js

@@ -33,19 +33,18 @@ class Plugin {
 
     }
 
-    static *provideServices(services, provider){
+    static *provideServices(services, provider, ephemeral=false){
         for(let [key, value] of Object.entries(services)){
             if(Array.isArray(value)){
-                yield all(value.map(service => put(provideService(key, service, provider))))
+                yield all(value.map(service => put(provideService(key, service, provider, ephemeral))))
             }else {
                 yield put(provideService(key, value, provider));
             }
         }
     }
 
-    provide(services){
-        console.log("Providing serv!");
-        return call(Plugin.provideServices, services, this)
+    provide(services, options={}){
+        return call(Plugin.provideServices, services, this, options.ephemeral)
     }
 
     //todo: do we need  installation configurations?
@@ -63,7 +62,6 @@ class Plugin {
             } else {
                 yield put({type: "PLUGIN_INSTALLED", pluginName: pluginName});
             }
-            console.log("PLUGIN INSTALLED!", pluginName);
             done();
 
         }catch(error){
@@ -74,7 +72,6 @@ class Plugin {
 
     *enable(channels){
         yield put(enablePlugin(this));
-        console.log("STARTED PLUGIN " + this.name, this.plugin);
         if(this.plugin.run) {
             let run = yield fork(this.plugin.run, this.config, this.provide, channels);
         }

src/pluginbot-base.js

@@ -78,6 +78,10 @@ class PluginbotBase {
                         return state;
                     case "SERVICE_PROVIDED" :
                         let services = state.services[action.serviceType];
+                        //ephemeral services don't stay in store.
+                        if(action.ephemeral){
+                            return state;
+                        }
                         if (services) {
                             services.push(action.service);
                         } else {
@@ -119,9 +123,7 @@ class PluginbotBase {
                 }
 
                 let pluginSaga = function*(consumptionChannels){
-                    console.log("PLUGIN SAGA!");
                     let enablePlugin = yield call(plugin.enable.bind(plugin), consumptionChannels);
-                    console.log("plugin done?");
                     return enablePlugin;
 
                 };
@@ -140,11 +142,9 @@ class PluginbotBase {
 
                 //start enabling all plugins
                 for(let [pluginName, pluginSaga] of Object.entries(rootSaga)){
-                    console.log(pluginName, pluginSaga)
                     pluginTasks[pluginName] = yield fork(pluginSaga, allChannels[pluginName]);
                 }
 
-                console.log("plugins running")
                 resolve(self.plugins);
 
             }));
@@ -167,6 +167,18 @@ class PluginbotBase {
                     action.done(pluginEnabled);
                 })
             }))
+
+            // this.tasks.push(sagaMiddleware.run(function*(){
+            //     yield takeEvery("INSTALL_PLUGIN", function*(action){
+            //         let plugin = action.plugin;
+            //         if(self.plugins[plugin.pluginName]){
+            //             console.error("Plugin " + plugin.name + " is already installed + enabled");
+            //
+            //         }else{
+            //             yield call(self._install.bind(self), plugin.plugin, plugin.pluginName)
+            //         }
+            //     })
+            // }))
         })
     }
 
@@ -190,9 +202,11 @@ class PluginbotBase {
         return (new Proxy({}, channelHandler));
     }
 
-    *_install(pluginFunctions, pluginName, done){
+    //todo: take in plugin object instead of parts .
+    //todo: stop using done?
+    *_install(pluginFunctions, pluginName, done=()=>{}){
         if(this.plugins[pluginName]){
-            console.error("plugin already enabled");
+            console.error("plugin already installed and enabled");
             done();
         }
         try {
@@ -201,12 +215,10 @@ class PluginbotBase {
 
 
                 yield call(this.config.install.bind(this), this._getLazyChannels() , pluginName, pluginFunctions.install);
-                console.log("configured install donner!");
             } else if(pluginFunctions.install) {
                 yield call(pluginFunctions.install);
             }
             yield put({type: "PLUGIN_INSTALLED", pluginName: pluginName});
-            console.log("PLUGIN INSTALLED!", pluginName);
             done();
         }catch(error){
             done(error);