From 8db6251fb76516eb75b95709af5764e66dcfcd50 Mon Sep 17 00:00:00 2001
From: manuel83 <cUrrent2015>
Date: Wed, 31 Jul 2019 07:58:54 +0200
Subject: [PATCH] changes in plugin controller

---
 .idea/workspace.xml                    | 1088 ++++++++++++++----------
 cbpi/api/decorator.py                  |   32 +-
 cbpi/controller/plugin_controller.py   |  129 ++-
 cbpi/controller/step_controller.py     |   25 +-
 cbpi/controller/system_controller.py   |   14 +
 cbpi/craftbeerpi.py                    |    8 +-
 cbpi/extension/dummysensor/__init__.py |    2 +-
 cbpi/extension/mqtt/__init__.py        |   36 +
 cbpi/extension/mqtt/config.yaml        |    2 +
 cbpi/http_endpoints/http_actor.py      |    2 +-
 cbpi/http_endpoints/http_login.py      |    1 -
 cbpi/http_endpoints/http_plugin.py     |   86 ++
 cbpi/http_endpoints/http_step.py       |   37 +-
 cbpi/mqtt/__init__.py                  |    0
 cbpi/mqtt/mqtt.py                      |   89 --
 cbpi/mqtt/mqtt_matcher.py              |  167 ----
 cbpi_cloud/default_broker.yaml         |   14 +
 cbpi_cloud/repo/plugins.yaml           |   13 +
 cbpi_cloud/run.py                      |   65 ++
 config/plugin_list.txt                 |   15 +-
 craftbeerpi.db                         |  Bin 53248 -> 53248 bytes
 tests/test_step.py                     |   10 +-
 22 files changed, 1028 insertions(+), 807 deletions(-)
 create mode 100644 cbpi/extension/mqtt/__init__.py
 create mode 100644 cbpi/extension/mqtt/config.yaml
 create mode 100644 cbpi/http_endpoints/http_plugin.py
 delete mode 100644 cbpi/mqtt/__init__.py
 delete mode 100644 cbpi/mqtt/mqtt.py
 delete mode 100644 cbpi/mqtt/mqtt_matcher.py
 create mode 100644 cbpi_cloud/default_broker.yaml
 create mode 100644 cbpi_cloud/repo/plugins.yaml
 create mode 100644 cbpi_cloud/run.py

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 17a4feb..077ed7f 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -3,36 +3,20 @@
   <component name="ChangeListManager">
     <list default="true" id="1a245e6a-2e43-4348-8759-dc1b63a4c9c8" name="Default" comment="Lots of changes">
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/cbpi/api/actor.py" beforeDir="false" afterPath="$PROJECT_DIR$/cbpi/api/actor.py" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/cbpi/api/extension.py" beforeDir="false" afterPath="$PROJECT_DIR$/cbpi/api/extension.py" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/cbpi/api/step.py" beforeDir="false" afterPath="$PROJECT_DIR$/cbpi/api/step.py" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/cbpi/cli.py" beforeDir="false" afterPath="$PROJECT_DIR$/cbpi/cli.py" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/cbpi/config/config.yaml" beforeDir="false" afterPath="$PROJECT_DIR$/cbpi/config/config.yaml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/cbpi/controller/actor_controller.py" beforeDir="false" afterPath="$PROJECT_DIR$/cbpi/controller/actor_controller.py" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/cbpi/controller/config_controller.py" beforeDir="false" afterPath="$PROJECT_DIR$/cbpi/controller/config_controller.py" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/cbpi/controller/crud_controller.py" beforeDir="false" afterPath="$PROJECT_DIR$/cbpi/controller/crud_controller.py" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/cbpi/controller/dashboard_controller.py" beforeDir="false" afterPath="$PROJECT_DIR$/cbpi/controller/dashboard_controller.py" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/cbpi/controller/job_controller.py" beforeDir="false" afterPath="$PROJECT_DIR$/cbpi/controller/job_controller.py" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/cbpi/controller/kettle_controller.py" beforeDir="false" afterPath="$PROJECT_DIR$/cbpi/controller/kettle_controller.py" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/cbpi/api/decorator.py" beforeDir="false" afterPath="$PROJECT_DIR$/cbpi/api/decorator.py" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/cbpi/controller/plugin_controller.py" beforeDir="false" afterPath="$PROJECT_DIR$/cbpi/controller/plugin_controller.py" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/cbpi/controller/sensor_controller.py" beforeDir="false" afterPath="$PROJECT_DIR$/cbpi/controller/sensor_controller.py" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/cbpi/controller/step_controller.py" beforeDir="false" afterPath="$PROJECT_DIR$/cbpi/controller/step_controller.py" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/cbpi/controller/system_controller.py" beforeDir="false" afterPath="$PROJECT_DIR$/cbpi/controller/system_controller.py" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/cbpi/craftbeerpi.py" beforeDir="false" afterPath="$PROJECT_DIR$/cbpi/craftbeerpi.py" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/cbpi/database/model.py" beforeDir="false" afterPath="$PROJECT_DIR$/cbpi/database/model.py" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/cbpi/database/orm_framework.py" beforeDir="false" afterPath="$PROJECT_DIR$/cbpi/database/orm_framework.py" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/cbpi/extension/dummyactor/__init__.py" beforeDir="false" afterPath="$PROJECT_DIR$/cbpi/extension/dummyactor/__init__.py" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/cbpi/extension/dummysensor/__init__.py" beforeDir="false" afterPath="$PROJECT_DIR$/cbpi/extension/dummysensor/__init__.py" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/cbpi/extension/dummystep/__init__.py" beforeDir="false" afterPath="$PROJECT_DIR$/cbpi/extension/dummystep/__init__.py" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/cbpi/http_endpoints/http_config.py" beforeDir="false" afterPath="$PROJECT_DIR$/cbpi/http_endpoints/http_config.py" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/cbpi/http_endpoints/http_curd_endpoints.py" beforeDir="false" afterPath="$PROJECT_DIR$/cbpi/http_endpoints/http_curd_endpoints.py" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/cbpi/http_endpoints/http_dashboard.py" beforeDir="false" afterPath="$PROJECT_DIR$/cbpi/http_endpoints/http_dashboard.py" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/cbpi/http_endpoints/http_actor.py" beforeDir="false" afterPath="$PROJECT_DIR$/cbpi/http_endpoints/http_actor.py" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/cbpi/http_endpoints/http_login.py" beforeDir="false" afterPath="$PROJECT_DIR$/cbpi/http_endpoints/http_login.py" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/cbpi/http_endpoints/http_step.py" beforeDir="false" afterPath="$PROJECT_DIR$/cbpi/http_endpoints/http_step.py" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/cbpi/job/_job.py" beforeDir="false" afterPath="$PROJECT_DIR$/cbpi/job/_job.py" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/cbpi/utils/encoder.py" beforeDir="false" afterPath="$PROJECT_DIR$/cbpi/utils/encoder.py" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/cbpi/mqtt/__init__.py" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/cbpi/mqtt/mqtt.py" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/cbpi/mqtt/mqtt_matcher.py" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/config/plugin_list.txt" beforeDir="false" afterPath="$PROJECT_DIR$/config/plugin_list.txt" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/craftbeerpi.db" beforeDir="false" afterPath="$PROJECT_DIR$/craftbeerpi.db" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/sample.py" beforeDir="false" afterPath="$PROJECT_DIR$/sample.py" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/setup.py" beforeDir="false" afterPath="$PROJECT_DIR$/setup.py" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/tests/test_kettle.py" beforeDir="false" afterPath="$PROJECT_DIR$/tests/test_kettle.py" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/tests/test_step.py" beforeDir="false" afterPath="$PROJECT_DIR$/tests/test_step.py" afterDir="false" />
     </list>
     <ignored path="$PROJECT_DIR$/.idea/httpRequests/" />
@@ -44,13 +28,14 @@
   </component>
   <component name="CoverageDataManager">
     <SUITE FILE_PATH="coverage/craftbeerpi4$test_kettle.coverage" NAME="test kettle Coverage Results" MODIFIED="1546020780689" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="" />
+    <SUITE FILE_PATH="coverage/craftbeerpi4$run__1_.coverage" NAME="run (1) Coverage Results" MODIFIED="1564431396428" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$/cbpi_cloud" />
     <SUITE FILE_PATH="coverage/craftbeerpi4$main2.coverage" NAME="main2 Coverage Results" MODIFIED="1546124517142" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$" />
     <SUITE FILE_PATH="coverage/craftbeerpi4$dummy.coverage" NAME="dummy Coverage Results" MODIFIED="1546520051389" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$/tests" />
     <SUITE FILE_PATH="coverage/craftbeerpi4$pytest_in_test_config_py.coverage" NAME="pytest in test_config.py Coverage Results" MODIFIED="1546113553124" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$" />
     <SUITE FILE_PATH="coverage/craftbeerpi4$pytest_for_tests_test_actor.coverage" NAME="pytest for tests.test_actor Coverage Results" MODIFIED="1546724758047" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$" />
     <SUITE FILE_PATH="coverage/craftbeerpi4$pytest_in_tests.coverage" NAME="pytest in tests Coverage Results" MODIFIED="1563993867067" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$" />
     <SUITE FILE_PATH="coverage/craftbeerpi4$test_app.coverage" NAME="test_app Coverage Results" MODIFIED="1563992336652" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$/tests" />
-    <SUITE FILE_PATH="coverage/craftbeerpi4$run.coverage" NAME="run Coverage Results" MODIFIED="1564241249326" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$" />
+    <SUITE FILE_PATH="coverage/craftbeerpi4$run.coverage" NAME="run Coverage Results" MODIFIED="1564552686478" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$" />
     <SUITE FILE_PATH="coverage/craftbeerpi4$py_test_in_tests.coverage" NAME="py.test in tests Coverage Results" MODIFIED="1544486432317" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="" />
     <SUITE FILE_PATH="coverage/craftbeerpi4$pytest_in_test_ws_py.coverage" NAME="pytest in test_ws.py Coverage Results" MODIFIED="1546518348327" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$" />
     <SUITE FILE_PATH="coverage/craftbeerpi4$sample.coverage" NAME="sample Coverage Results" MODIFIED="1564217668352" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$" />
@@ -66,9 +51,10 @@
     <SUITE FILE_PATH="coverage/craftbeerpi4$pytest_for_tests_test_kettle.coverage" NAME="pytest for tests.test_kettle Coverage Results" MODIFIED="1564217673117" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$" />
     <SUITE FILE_PATH="coverage/craftbeerpi4$pytest_for_tests_test_step_StepTestCase_test_process.coverage" NAME="pytest for tests.test_step.StepTestCase.test_process Coverage Results" MODIFIED="1564233350125" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$" />
     <SUITE FILE_PATH="coverage/craftbeerpi4$pytest_for_test_kettle_KettleTestCase.coverage" NAME="pytest for test_kettle.KettleTestCase Coverage Results" MODIFIED="1546357864696" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$" />
-    <SUITE FILE_PATH="coverage/craftbeerpi4$pytest_in_test_step_py.coverage" NAME="pytest in test_step.py Coverage Results" MODIFIED="1564221051802" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$" />
+    <SUITE FILE_PATH="coverage/craftbeerpi4$pytest_in_test_step_py.coverage" NAME="pytest in test_step.py Coverage Results" MODIFIED="1564254616032" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$" />
     <SUITE FILE_PATH="coverage/craftbeerpi4$pytest_for_test_config_ConfigTestCase.coverage" NAME="pytest for test_config.ConfigTestCase Coverage Results" MODIFIED="1546212760017" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$" />
     <SUITE FILE_PATH="coverage/craftbeerpi4$cli.coverage" NAME="cli Coverage Results" MODIFIED="1546636569294" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$/cbpi" />
+    <SUITE FILE_PATH="coverage/craftbeerpi4$run_mqtt.coverage" NAME="run_mqtt Coverage Results" MODIFIED="1564296264980" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$/cbpi_cloud" />
   </component>
   <component name="CoverageViewManager">
     <option name="myElementSize" value="243" />
@@ -109,31 +95,115 @@
   <component name="FileEditorManager">
     <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
       <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/cbpi/controller/sensor_controller.py">
+        <entry file="file://$PROJECT_DIR$/cbpi/controller/plugin_controller.py">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="-270">
-              <caret line="30" column="41" lean-forward="true" selection-start-line="30" selection-start-column="41" selection-end-line="30" selection-end-column="41" />
+            <state relative-caret-position="322">
+              <caret line="86" column="20" selection-start-line="86" selection-start-column="20" selection-end-line="86" selection-end-column="20" />
+              <folding>
+                <element signature="e#0#14#0" expanded="true" />
+              </folding>
             </state>
           </provider>
         </entry>
       </file>
       <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/logs/sensor_1.log">
-          <provider selected="true" editor-type-id="text-editor" />
-        </entry>
-      </file>
-      <file pinned="false" current-in-tab="true">
-        <entry file="file://$PROJECT_DIR$/logs/sensor_2.log">
-          <provider selected="true" editor-type-id="text-editor" />
+        <entry file="file://$PROJECT_DIR$/cbpi/controller/step_controller.py">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="416">
+              <caret line="192" column="29" selection-start-line="192" selection-start-column="29" selection-end-line="192" selection-end-column="29" />
+              <folding>
+                <element signature="e#0#11#0" expanded="true" />
+              </folding>
+            </state>
+          </provider>
         </entry>
       </file>
       <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/cbpi/extension/dummysensor/__init__.py">
+        <entry file="file://$PROJECT_DIR$/cbpi/http_endpoints/http_step.py">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="287">
-              <caret line="137" column="68" selection-start-line="137" selection-start-column="68" selection-end-line="137" selection-end-column="68" />
+            <state relative-caret-position="440">
+              <caret line="186" column="56" lean-forward="true" selection-start-line="186" selection-start-column="56" selection-end-line="186" selection-end-column="56" />
               <folding>
-                <element signature="e#24#38#0" expanded="true" />
+                <element signature="e#0#23#0" expanded="true" />
+              </folding>
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/cbpi/extension/mqtt/__init__.py">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="165">
+              <caret line="15" column="36" selection-start-line="15" selection-start-column="32" selection-end-line="15" selection-end-column="36" />
+              <folding>
+                <element signature="e#0#11#0" expanded="true" />
+              </folding>
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file pinned="false" current-in-tab="true">
+        <entry file="file://$PROJECT_DIR$/cbpi/extension/mqtt/config.yaml">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="15">
+              <caret line="1" column="12" selection-start-line="1" selection-start-column="12" selection-end-line="1" selection-end-column="12" />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/cbpi/http_endpoints/http_sensor.py">
+          <provider selected="true" editor-type-id="text-editor">
+            <state>
+              <folding>
+                <element signature="e#0#14#0" expanded="true" />
+              </folding>
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/cbpi/controller/config_controller.py">
+          <provider selected="true" editor-type-id="text-editor">
+            <state>
+              <folding>
+                <element signature="e#0#14#0" expanded="true" />
+              </folding>
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/cbpi/controller/actor_controller.py">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="154">
+              <caret line="131" column="4" selection-start-line="131" selection-start-column="4" selection-end-line="138" selection-end-column="81" />
+              <folding>
+                <element signature="e#0#14#0" expanded="true" />
+              </folding>
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/cbpi/controller/system_controller.py">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="151">
+              <caret line="26" column="96" selection-start-line="26" selection-start-column="96" selection-end-line="26" selection-end-column="96" />
+              <folding>
+                <element signature="e#0#15#0" expanded="true" />
+              </folding>
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/cbpi/http_endpoints/http_plugin.py">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="389">
+              <caret line="35" column="11" lean-forward="true" selection-start-line="13" selection-start-column="8" selection-end-line="35" selection-end-column="11" />
+              <folding>
+                <element signature="e#0#23#0" expanded="true" />
               </folding>
             </state>
           </provider>
@@ -150,25 +220,6 @@
   </component>
   <component name="FindInProjectRecents">
     <findStrings>
-      <find>print</find>
-      <find>setup_swagger</find>
-      <find>Helo World</find>
-      <find>index_url</find>
-      <find>MY EXT</find>
-      <find>plugin_list</find>
-      <find>Hello</find>
-      <find>config.yaml</find>
-      <find>cbpi-actor</find>
-      <find>StepModel</find>
-      <find>----------- END</find>
-      <find>NORMAL START</find>
-      <find>super</find>
-      <find>_get_manged_fields_as_array</find>
-      <find>_step_done</find>
-      <find>job/step/done</find>
-      <find>step_done</find>
-      <find>STOP CURRENT STEP BEFORE NEXT</find>
-      <find>fire</find>
       <find>RUNNING</find>
       <find>update</find>
       <find>GOON</find>
@@ -180,6 +231,25 @@
       <find>print(</find>
       <find>notif</find>
       <find>sensor111</find>
+      <find>CBPiWebSocket</find>
+      <find>self.ws</find>
+      <find>port</find>
+      <find>load_plugin_list</find>
+      <find>broker</find>
+      <find>client</find>
+      <find>ok_msg</find>
+      <find>mqtt_methods</find>
+      <find>HTTP SENSOR</find>
+      <find>on_message</find>
+      <find>listen</find>
+      <find>on_start</find>
+      <find>initializer</find>
+      <find>plugin_list</find>
+      <find>doe</find>
+      <find>list</find>
+      <find>LIST</find>
+      <find>call</find>
+      <find>handle_action</find>
     </findStrings>
     <replaceStrings>
       <replace />
@@ -206,19 +276,6 @@
   <component name="IdeDocumentHistory">
     <option name="CHANGED_PATHS">
       <list>
-        <option value="$PROJECT_DIR$/cbpi/http_endpoints/http_actor.py" />
-        <option value="$PROJECT_DIR$/cbpi/controller/translation_controller.py" />
-        <option value="$PROJECT_DIR$/cbpi/http_endpoints/http_kettle.py" />
-        <option value="$PROJECT_DIR$/cbpi/extension/comp/__init__.py" />
-        <option value="$PROJECT_DIR$/cbpi/extension/dummylogic/__init__.py" />
-        <option value="$PROJECT_DIR$/tests/test_index.py" />
-        <option value="$PROJECT_DIR$/tests/test_config.py" />
-        <option value="$PROJECT_DIR$/tests/test_dashboard.py" />
-        <option value="$PROJECT_DIR$/cbpi/controller/system_controller.py" />
-        <option value="$PROJECT_DIR$/docs_src/source/standards.rst" />
-        <option value="$PROJECT_DIR$/docs_src/source/conf.py" />
-        <option value="$PROJECT_DIR$/docs_src/source/actor.rst" />
-        <option value="$PROJECT_DIR$/docs_src/source/webapis.rst" />
         <option value="$PROJECT_DIR$/cbpi/api/sensor.py" />
         <option value="$PROJECT_DIR$/cbpi/http_endpoints/http_sensor.py" />
         <option value="$PROJECT_DIR$/cbpi/api/actor.py" />
@@ -235,14 +292,11 @@
         <option value="$PROJECT_DIR$/cbpi/cli.py" />
         <option value="$PROJECT_DIR$/cbpi/controller/job_controller.py" />
         <option value="$PROJECT_DIR$/cbpi/controller/config_controller.py" />
-        <option value="$PROJECT_DIR$/cbpi/http_endpoints/http_step.py" />
         <option value="$PROJECT_DIR$/cbpi/job/_scheduler.py" />
         <option value="$PROJECT_DIR$/sample.py" />
-        <option value="$PROJECT_DIR$/tests/test_step.py" />
         <option value="$PROJECT_DIR$/cbpi/job/_job.py" />
         <option value="$PROJECT_DIR$/cbpi/controller/step_controller_back.py" />
         <option value="$PROJECT_DIR$/cbpi/extension/dummystep/__init__.py" />
-        <option value="$PROJECT_DIR$/cbpi/controller/step_controller.py" />
         <option value="$PROJECT_DIR$/cbpi/controller/dashboard_controller.py" />
         <option value="$PROJECT_DIR$/cbpi/api/step.py" />
         <option value="$PROJECT_DIR$/cbpi/extension/dummyactor/__init__.py" />
@@ -252,11 +306,27 @@
         <option value="$PROJECT_DIR$/cbpi/database/model.py" />
         <option value="$PROJECT_DIR$/cbpi/http_endpoints/http_curd_endpoints.py" />
         <option value="$PROJECT_DIR$/cbpi/http_endpoints/http_dashboard.py" />
-        <option value="$PROJECT_DIR$/cbpi/craftbeerpi.py" />
-        <option value="$PROJECT_DIR$/cbpi/controller/plugin_controller.py" />
         <option value="$PROJECT_DIR$/cbpi/controller/sensor_controller.py" />
         <option value="$APPLICATION_CONFIG_DIR$/consoles/.datagrid/cell" />
+        <option value="$PROJECT_DIR$/tests/test_step.py" />
+        <option value="$PROJECT_DIR$/cbpi_cloud/repo/plugins.json" />
+        <option value="$PROJECT_DIR$/cbpi_cloud/default_broker.yaml" />
+        <option value="$PROJECT_DIR$/cbpi_cloud/run_mqtt.py" />
         <option value="$PROJECT_DIR$/cbpi/extension/dummysensor/__init__.py" />
+        <option value="$PROJECT_DIR$/cbpi/extension/mqtt/__init__.py" />
+        <option value="$PROJECT_DIR$/cbpi_cloud/repo/plugins.yaml" />
+        <option value="$PROJECT_DIR$/cbpi/controller/system_controller.py" />
+        <option value="$PROJECT_DIR$/cbpi_cloud/run.py" />
+        <option value="$PROJECT_DIR$/config/plugin_list.txt" />
+        <option value="$PROJECT_DIR$/cbpi/http_endpoints/http_login.py" />
+        <option value="$PROJECT_DIR$/cbpi/craftbeerpi.py" />
+        <option value="$PROJECT_DIR$/cbpi/http_endpoints/http_actor.py" />
+        <option value="$PROJECT_DIR$/cbpi/api/decorator.py" />
+        <option value="$PROJECT_DIR$/cbpi/http_endpoints/http_plugin.py" />
+        <option value="$PROJECT_DIR$/cbpi/controller/plugin_controller.py" />
+        <option value="$PROJECT_DIR$/cbpi/controller/step_controller.py" />
+        <option value="$PROJECT_DIR$/cbpi/http_endpoints/http_step.py" />
+        <option value="$PROJECT_DIR$/cbpi/extension/mqtt/config.yaml" />
       </list>
     </option>
   </component>
@@ -293,21 +363,14 @@
               <item name="craftbeerpi4" type="b2602c69:ProjectViewProjectNode" />
               <item name="craftbeerpi4" type="462c0819:PsiDirectoryNode" />
               <item name="cbpi" type="462c0819:PsiDirectoryNode" />
-              <item name="controller" type="462c0819:PsiDirectoryNode" />
-              <item name="sensor_controller.py" type="8704e2dd:PyFileNode" />
+              <item name="extension" type="462c0819:PsiDirectoryNode" />
             </path>
             <path>
               <item name="craftbeerpi4" type="b2602c69:ProjectViewProjectNode" />
               <item name="craftbeerpi4" type="462c0819:PsiDirectoryNode" />
               <item name="cbpi" type="462c0819:PsiDirectoryNode" />
-              <item name="controller" type="462c0819:PsiDirectoryNode" />
-              <item name="sensor_controller.py" type="8704e2dd:PyFileNode" />
-              <item name="SensorController" type="dd8bbb05:PyElementNode" />
-            </path>
-            <path>
-              <item name="craftbeerpi4" type="b2602c69:ProjectViewProjectNode" />
-              <item name="craftbeerpi4" type="462c0819:PsiDirectoryNode" />
-              <item name="logs" type="462c0819:PsiDirectoryNode" />
+              <item name="extension" type="462c0819:PsiDirectoryNode" />
+              <item name="mqtt" type="462c0819:PsiDirectoryNode" />
             </path>
             <path>
               <item name="craftbeerpi4" type="b2602c69:ProjectViewProjectNode" />
@@ -329,24 +392,7 @@
               <item name="External Libraries" type="cb654da1:ExternalLibrariesNode" />
               <item name="&lt; Python 3.7.1 virtualenv at ~/cbp42 &gt;" type="70bed36:NamedLibraryElementNode" />
               <item name="python3.7" type="462c0819:PsiDirectoryNode" />
-              <item name="asyncio" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="craftbeerpi4" type="b2602c69:ProjectViewProjectNode" />
-              <item name="External Libraries" type="cb654da1:ExternalLibrariesNode" />
-              <item name="&lt; Python 3.7.1 virtualenv at ~/cbp42 &gt;" type="70bed36:NamedLibraryElementNode" />
-              <item name="python3.7" type="462c0819:PsiDirectoryNode" />
-              <item name="asyncio" type="462c0819:PsiDirectoryNode" />
-              <item name="events.py" type="8704e2dd:PyFileNode" />
-            </path>
-            <path>
-              <item name="craftbeerpi4" type="b2602c69:ProjectViewProjectNode" />
-              <item name="External Libraries" type="cb654da1:ExternalLibrariesNode" />
-              <item name="&lt; Python 3.7.1 virtualenv at ~/cbp42 &gt;" type="70bed36:NamedLibraryElementNode" />
-              <item name="python3.7" type="462c0819:PsiDirectoryNode" />
-              <item name="asyncio" type="462c0819:PsiDirectoryNode" />
-              <item name="events.py" type="8704e2dd:PyFileNode" />
-              <item name="Handle" type="dd8bbb05:PyElementNode" />
+              <item name="subprocess.py" type="8704e2dd:PyFileNode" />
             </path>
             <path>
               <item name="craftbeerpi4" type="b2602c69:ProjectViewProjectNode" />
@@ -361,33 +407,6 @@
               <item name="python3.7" type="462c0819:PsiDirectoryNode" />
               <item name="site-packages" type="462c0819:PsiDirectoryNode" />
             </path>
-            <path>
-              <item name="craftbeerpi4" type="b2602c69:ProjectViewProjectNode" />
-              <item name="External Libraries" type="cb654da1:ExternalLibrariesNode" />
-              <item name="&lt; Python 3.7.1 virtualenv at ~/cbp42 &gt;" type="70bed36:NamedLibraryElementNode" />
-              <item name="python3.7" type="462c0819:PsiDirectoryNode" />
-              <item name="site-packages" type="462c0819:PsiDirectoryNode" />
-              <item name="aiohttp" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="craftbeerpi4" type="b2602c69:ProjectViewProjectNode" />
-              <item name="External Libraries" type="cb654da1:ExternalLibrariesNode" />
-              <item name="&lt; Python 3.7.1 virtualenv at ~/cbp42 &gt;" type="70bed36:NamedLibraryElementNode" />
-              <item name="python3.7" type="462c0819:PsiDirectoryNode" />
-              <item name="site-packages" type="462c0819:PsiDirectoryNode" />
-              <item name="aiohttp" type="462c0819:PsiDirectoryNode" />
-              <item name="web_response.py" type="8704e2dd:PyFileNode" />
-            </path>
-            <path>
-              <item name="craftbeerpi4" type="b2602c69:ProjectViewProjectNode" />
-              <item name="External Libraries" type="cb654da1:ExternalLibrariesNode" />
-              <item name="&lt; Python 3.7.1 virtualenv at ~/cbp42 &gt;" type="70bed36:NamedLibraryElementNode" />
-              <item name="python3.7" type="462c0819:PsiDirectoryNode" />
-              <item name="site-packages" type="462c0819:PsiDirectoryNode" />
-              <item name="aiohttp" type="462c0819:PsiDirectoryNode" />
-              <item name="web_response.py" type="8704e2dd:PyFileNode" />
-              <item name="Response" type="dd8bbb05:PyElementNode" />
-            </path>
             <path>
               <item name="craftbeerpi4" type="b2602c69:ProjectViewProjectNode" />
               <item name="External Libraries" type="cb654da1:ExternalLibrariesNode" />
@@ -421,7 +440,107 @@
               <item name="&lt; Python 3.7.1 virtualenv at ~/cbp42 &gt;" type="70bed36:NamedLibraryElementNode" />
               <item name="python3.7" type="462c0819:PsiDirectoryNode" />
               <item name="site-packages" type="462c0819:PsiDirectoryNode" />
-              <item name="pip" type="462c0819:PsiDirectoryNode" />
+              <item name="aiohttp_auth" type="462c0819:PsiDirectoryNode" />
+              <item name="auth" type="462c0819:PsiDirectoryNode" />
+              <item name="decorators.py" type="8704e2dd:PyFileNode" />
+            </path>
+            <path>
+              <item name="craftbeerpi4" type="b2602c69:ProjectViewProjectNode" />
+              <item name="External Libraries" type="cb654da1:ExternalLibrariesNode" />
+              <item name="&lt; Python 3.7.1 virtualenv at ~/cbp42 &gt;" type="70bed36:NamedLibraryElementNode" />
+              <item name="python3.7" type="462c0819:PsiDirectoryNode" />
+              <item name="site-packages" type="462c0819:PsiDirectoryNode" />
+              <item name="asn1crypto" type="462c0819:PsiDirectoryNode" />
+            </path>
+            <path>
+              <item name="craftbeerpi4" type="b2602c69:ProjectViewProjectNode" />
+              <item name="External Libraries" type="cb654da1:ExternalLibrariesNode" />
+              <item name="&lt; Python 3.7.1 virtualenv at ~/cbp42 &gt;" type="70bed36:NamedLibraryElementNode" />
+              <item name="python3.7" type="462c0819:PsiDirectoryNode" />
+              <item name="site-packages" type="462c0819:PsiDirectoryNode" />
+              <item name="asn1crypto" type="462c0819:PsiDirectoryNode" />
+              <item name="core.py" type="8704e2dd:PyFileNode" />
+            </path>
+            <path>
+              <item name="craftbeerpi4" type="b2602c69:ProjectViewProjectNode" />
+              <item name="External Libraries" type="cb654da1:ExternalLibrariesNode" />
+              <item name="&lt; Python 3.7.1 virtualenv at ~/cbp42 &gt;" type="70bed36:NamedLibraryElementNode" />
+              <item name="python3.7" type="462c0819:PsiDirectoryNode" />
+              <item name="site-packages" type="462c0819:PsiDirectoryNode" />
+              <item name="asn1crypto" type="462c0819:PsiDirectoryNode" />
+              <item name="core.py" type="8704e2dd:PyFileNode" />
+              <item name="SequenceOf" type="dd8bbb05:PyElementNode" />
+            </path>
+            <path>
+              <item name="craftbeerpi4" type="b2602c69:ProjectViewProjectNode" />
+              <item name="External Libraries" type="cb654da1:ExternalLibrariesNode" />
+              <item name="&lt; Python 3.7.1 virtualenv at ~/cbp42 &gt;" type="70bed36:NamedLibraryElementNode" />
+              <item name="python3.7" type="462c0819:PsiDirectoryNode" />
+              <item name="site-packages" type="462c0819:PsiDirectoryNode" />
+              <item name="hbmqtt" type="462c0819:PsiDirectoryNode" />
+            </path>
+            <path>
+              <item name="craftbeerpi4" type="b2602c69:ProjectViewProjectNode" />
+              <item name="External Libraries" type="cb654da1:ExternalLibrariesNode" />
+              <item name="&lt; Python 3.7.1 virtualenv at ~/cbp42 &gt;" type="70bed36:NamedLibraryElementNode" />
+              <item name="python3.7" type="462c0819:PsiDirectoryNode" />
+              <item name="site-packages" type="462c0819:PsiDirectoryNode" />
+              <item name="hbmqtt" type="462c0819:PsiDirectoryNode" />
+              <item name="client.py" type="8704e2dd:PyFileNode" />
+            </path>
+            <path>
+              <item name="craftbeerpi4" type="b2602c69:ProjectViewProjectNode" />
+              <item name="External Libraries" type="cb654da1:ExternalLibrariesNode" />
+              <item name="&lt; Python 3.7.1 virtualenv at ~/cbp42 &gt;" type="70bed36:NamedLibraryElementNode" />
+              <item name="python3.7" type="462c0819:PsiDirectoryNode" />
+              <item name="site-packages" type="462c0819:PsiDirectoryNode" />
+              <item name="hbmqtt" type="462c0819:PsiDirectoryNode" />
+              <item name="client.py" type="8704e2dd:PyFileNode" />
+              <item name="MQTTClient" type="dd8bbb05:PyElementNode" />
+            </path>
+            <path>
+              <item name="craftbeerpi4" type="b2602c69:ProjectViewProjectNode" />
+              <item name="External Libraries" type="cb654da1:ExternalLibrariesNode" />
+              <item name="&lt; Python 3.7.1 virtualenv at ~/cbp42 &gt;" type="70bed36:NamedLibraryElementNode" />
+              <item name="python3.7" type="462c0819:PsiDirectoryNode" />
+              <item name="site-packages" type="462c0819:PsiDirectoryNode" />
+              <item name="voluptuous" type="462c0819:PsiDirectoryNode" />
+            </path>
+            <path>
+              <item name="craftbeerpi4" type="b2602c69:ProjectViewProjectNode" />
+              <item name="External Libraries" type="cb654da1:ExternalLibrariesNode" />
+              <item name="&lt; Python 3.7.1 virtualenv at ~/cbp42 &gt;" type="70bed36:NamedLibraryElementNode" />
+              <item name="python3.7" type="462c0819:PsiDirectoryNode" />
+              <item name="site-packages" type="462c0819:PsiDirectoryNode" />
+              <item name="voluptuous" type="462c0819:PsiDirectoryNode" />
+              <item name="schema_builder.py" type="8704e2dd:PyFileNode" />
+            </path>
+            <path>
+              <item name="craftbeerpi4" type="b2602c69:ProjectViewProjectNode" />
+              <item name="External Libraries" type="cb654da1:ExternalLibrariesNode" />
+              <item name="&lt; Python 3.7.1 virtualenv at ~/cbp42 &gt;" type="70bed36:NamedLibraryElementNode" />
+              <item name="python3.7" type="462c0819:PsiDirectoryNode" />
+              <item name="site-packages" type="462c0819:PsiDirectoryNode" />
+              <item name="voluptuous" type="462c0819:PsiDirectoryNode" />
+              <item name="schema_builder.py" type="8704e2dd:PyFileNode" />
+              <item name="Schema" type="dd8bbb05:PyElementNode" />
+            </path>
+            <path>
+              <item name="craftbeerpi4" type="b2602c69:ProjectViewProjectNode" />
+              <item name="External Libraries" type="cb654da1:ExternalLibrariesNode" />
+              <item name="&lt; Python 3.7.1 virtualenv at ~/cbp42 &gt;" type="70bed36:NamedLibraryElementNode" />
+              <item name="python3.7" type="462c0819:PsiDirectoryNode" />
+              <item name="site-packages" type="462c0819:PsiDirectoryNode" />
+              <item name="yaml" type="462c0819:PsiDirectoryNode" />
+            </path>
+            <path>
+              <item name="craftbeerpi4" type="b2602c69:ProjectViewProjectNode" />
+              <item name="External Libraries" type="cb654da1:ExternalLibrariesNode" />
+              <item name="&lt; Python 3.7.1 virtualenv at ~/cbp42 &gt;" type="70bed36:NamedLibraryElementNode" />
+              <item name="python3.7" type="462c0819:PsiDirectoryNode" />
+              <item name="site-packages" type="462c0819:PsiDirectoryNode" />
+              <item name="yaml" type="462c0819:PsiDirectoryNode" />
+              <item name="__init__.py" type="8704e2dd:PyFileNode" />
             </path>
             <path>
               <item name="craftbeerpi4" type="b2602c69:ProjectViewProjectNode" />
@@ -429,30 +548,6 @@
               <item name="&lt; Python 3.7.1 virtualenv at ~/cbp42 &gt;" type="70bed36:NamedLibraryElementNode" />
               <item name="site-packages" type="462c0819:PsiDirectoryNode" />
             </path>
-            <path>
-              <item name="craftbeerpi4" type="b2602c69:ProjectViewProjectNode" />
-              <item name="External Libraries" type="cb654da1:ExternalLibrariesNode" />
-              <item name="&lt; Python 3.7.1 virtualenv at ~/cbp42 &gt;" type="70bed36:NamedLibraryElementNode" />
-              <item name="site-packages" type="462c0819:PsiDirectoryNode" />
-              <item name="aiohttp" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="craftbeerpi4" type="b2602c69:ProjectViewProjectNode" />
-              <item name="External Libraries" type="cb654da1:ExternalLibrariesNode" />
-              <item name="&lt; Python 3.7.1 virtualenv at ~/cbp42 &gt;" type="70bed36:NamedLibraryElementNode" />
-              <item name="site-packages" type="462c0819:PsiDirectoryNode" />
-              <item name="aiohttp" type="462c0819:PsiDirectoryNode" />
-              <item name="web_response.py" type="8704e2dd:PyFileNode" />
-            </path>
-            <path>
-              <item name="craftbeerpi4" type="b2602c69:ProjectViewProjectNode" />
-              <item name="External Libraries" type="cb654da1:ExternalLibrariesNode" />
-              <item name="&lt; Python 3.7.1 virtualenv at ~/cbp42 &gt;" type="70bed36:NamedLibraryElementNode" />
-              <item name="site-packages" type="462c0819:PsiDirectoryNode" />
-              <item name="aiohttp" type="462c0819:PsiDirectoryNode" />
-              <item name="web_response.py" type="8704e2dd:PyFileNode" />
-              <item name="Response" type="dd8bbb05:PyElementNode" />
-            </path>
             <path>
               <item name="craftbeerpi4" type="b2602c69:ProjectViewProjectNode" />
               <item name="External Libraries" type="cb654da1:ExternalLibrariesNode" />
@@ -482,7 +577,96 @@
               <item name="External Libraries" type="cb654da1:ExternalLibrariesNode" />
               <item name="&lt; Python 3.7.1 virtualenv at ~/cbp42 &gt;" type="70bed36:NamedLibraryElementNode" />
               <item name="site-packages" type="462c0819:PsiDirectoryNode" />
-              <item name="pip" type="462c0819:PsiDirectoryNode" />
+              <item name="aiohttp_auth" type="462c0819:PsiDirectoryNode" />
+              <item name="auth" type="462c0819:PsiDirectoryNode" />
+              <item name="decorators.py" type="8704e2dd:PyFileNode" />
+            </path>
+            <path>
+              <item name="craftbeerpi4" type="b2602c69:ProjectViewProjectNode" />
+              <item name="External Libraries" type="cb654da1:ExternalLibrariesNode" />
+              <item name="&lt; Python 3.7.1 virtualenv at ~/cbp42 &gt;" type="70bed36:NamedLibraryElementNode" />
+              <item name="site-packages" type="462c0819:PsiDirectoryNode" />
+              <item name="asn1crypto" type="462c0819:PsiDirectoryNode" />
+            </path>
+            <path>
+              <item name="craftbeerpi4" type="b2602c69:ProjectViewProjectNode" />
+              <item name="External Libraries" type="cb654da1:ExternalLibrariesNode" />
+              <item name="&lt; Python 3.7.1 virtualenv at ~/cbp42 &gt;" type="70bed36:NamedLibraryElementNode" />
+              <item name="site-packages" type="462c0819:PsiDirectoryNode" />
+              <item name="asn1crypto" type="462c0819:PsiDirectoryNode" />
+              <item name="core.py" type="8704e2dd:PyFileNode" />
+            </path>
+            <path>
+              <item name="craftbeerpi4" type="b2602c69:ProjectViewProjectNode" />
+              <item name="External Libraries" type="cb654da1:ExternalLibrariesNode" />
+              <item name="&lt; Python 3.7.1 virtualenv at ~/cbp42 &gt;" type="70bed36:NamedLibraryElementNode" />
+              <item name="site-packages" type="462c0819:PsiDirectoryNode" />
+              <item name="asn1crypto" type="462c0819:PsiDirectoryNode" />
+              <item name="core.py" type="8704e2dd:PyFileNode" />
+              <item name="SequenceOf" type="dd8bbb05:PyElementNode" />
+            </path>
+            <path>
+              <item name="craftbeerpi4" type="b2602c69:ProjectViewProjectNode" />
+              <item name="External Libraries" type="cb654da1:ExternalLibrariesNode" />
+              <item name="&lt; Python 3.7.1 virtualenv at ~/cbp42 &gt;" type="70bed36:NamedLibraryElementNode" />
+              <item name="site-packages" type="462c0819:PsiDirectoryNode" />
+              <item name="hbmqtt" type="462c0819:PsiDirectoryNode" />
+            </path>
+            <path>
+              <item name="craftbeerpi4" type="b2602c69:ProjectViewProjectNode" />
+              <item name="External Libraries" type="cb654da1:ExternalLibrariesNode" />
+              <item name="&lt; Python 3.7.1 virtualenv at ~/cbp42 &gt;" type="70bed36:NamedLibraryElementNode" />
+              <item name="site-packages" type="462c0819:PsiDirectoryNode" />
+              <item name="hbmqtt" type="462c0819:PsiDirectoryNode" />
+              <item name="client.py" type="8704e2dd:PyFileNode" />
+            </path>
+            <path>
+              <item name="craftbeerpi4" type="b2602c69:ProjectViewProjectNode" />
+              <item name="External Libraries" type="cb654da1:ExternalLibrariesNode" />
+              <item name="&lt; Python 3.7.1 virtualenv at ~/cbp42 &gt;" type="70bed36:NamedLibraryElementNode" />
+              <item name="site-packages" type="462c0819:PsiDirectoryNode" />
+              <item name="hbmqtt" type="462c0819:PsiDirectoryNode" />
+              <item name="client.py" type="8704e2dd:PyFileNode" />
+              <item name="MQTTClient" type="dd8bbb05:PyElementNode" />
+            </path>
+            <path>
+              <item name="craftbeerpi4" type="b2602c69:ProjectViewProjectNode" />
+              <item name="External Libraries" type="cb654da1:ExternalLibrariesNode" />
+              <item name="&lt; Python 3.7.1 virtualenv at ~/cbp42 &gt;" type="70bed36:NamedLibraryElementNode" />
+              <item name="site-packages" type="462c0819:PsiDirectoryNode" />
+              <item name="voluptuous" type="462c0819:PsiDirectoryNode" />
+            </path>
+            <path>
+              <item name="craftbeerpi4" type="b2602c69:ProjectViewProjectNode" />
+              <item name="External Libraries" type="cb654da1:ExternalLibrariesNode" />
+              <item name="&lt; Python 3.7.1 virtualenv at ~/cbp42 &gt;" type="70bed36:NamedLibraryElementNode" />
+              <item name="site-packages" type="462c0819:PsiDirectoryNode" />
+              <item name="voluptuous" type="462c0819:PsiDirectoryNode" />
+              <item name="schema_builder.py" type="8704e2dd:PyFileNode" />
+            </path>
+            <path>
+              <item name="craftbeerpi4" type="b2602c69:ProjectViewProjectNode" />
+              <item name="External Libraries" type="cb654da1:ExternalLibrariesNode" />
+              <item name="&lt; Python 3.7.1 virtualenv at ~/cbp42 &gt;" type="70bed36:NamedLibraryElementNode" />
+              <item name="site-packages" type="462c0819:PsiDirectoryNode" />
+              <item name="voluptuous" type="462c0819:PsiDirectoryNode" />
+              <item name="schema_builder.py" type="8704e2dd:PyFileNode" />
+              <item name="Schema" type="dd8bbb05:PyElementNode" />
+            </path>
+            <path>
+              <item name="craftbeerpi4" type="b2602c69:ProjectViewProjectNode" />
+              <item name="External Libraries" type="cb654da1:ExternalLibrariesNode" />
+              <item name="&lt; Python 3.7.1 virtualenv at ~/cbp42 &gt;" type="70bed36:NamedLibraryElementNode" />
+              <item name="site-packages" type="462c0819:PsiDirectoryNode" />
+              <item name="yaml" type="462c0819:PsiDirectoryNode" />
+            </path>
+            <path>
+              <item name="craftbeerpi4" type="b2602c69:ProjectViewProjectNode" />
+              <item name="External Libraries" type="cb654da1:ExternalLibrariesNode" />
+              <item name="&lt; Python 3.7.1 virtualenv at ~/cbp42 &gt;" type="70bed36:NamedLibraryElementNode" />
+              <item name="site-packages" type="462c0819:PsiDirectoryNode" />
+              <item name="yaml" type="462c0819:PsiDirectoryNode" />
+              <item name="__init__.py" type="8704e2dd:PyFileNode" />
             </path>
           </expand>
           <select />
@@ -502,11 +686,11 @@
   </component>
   <component name="RecentsManager">
     <key name="CopyFile.RECENT_KEYS">
+      <recent name="$PROJECT_DIR$/cbpi/extension/mqtt" />
       <recent name="$PROJECT_DIR$/cbpi/controller" />
       <recent name="$PROJECT_DIR$/cbpi/config" />
       <recent name="$PROJECT_DIR$/docs_src/source" />
       <recent name="$PROJECT_DIR$/cbpi/http_endpoints" />
-      <recent name="$PROJECT_DIR$/cbpi/extension/ui" />
     </key>
     <key name="MoveFile.RECENT_KEYS">
       <recent name="$PROJECT_DIR$/cbpi/extension" />
@@ -555,6 +739,28 @@
     </option>
   </component>
   <component name="RunManager" selected="Python.run">
+    <configuration name="run (1)" type="PythonConfigurationType" factoryName="Python" temporary="true">
+      <module name="craftbeerpi4" />
+      <option name="INTERPRETER_OPTIONS" value="" />
+      <option name="PARENT_ENVS" value="true" />
+      <envs>
+        <env name="PYTHONUNBUFFERED" value="1" />
+      </envs>
+      <option name="SDK_HOME" value="" />
+      <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$/cbpi_cloud" />
+      <option name="IS_MODULE_SDK" value="true" />
+      <option name="ADD_CONTENT_ROOTS" value="true" />
+      <option name="ADD_SOURCE_ROOTS" value="true" />
+      <EXTENSION ID="PythonCoverageRunConfigurationExtension" runner="coverage.py" />
+      <option name="SCRIPT_NAME" value="$PROJECT_DIR$/cbpi_cloud/run.py" />
+      <option name="PARAMETERS" value="" />
+      <option name="SHOW_COMMAND_LINE" value="false" />
+      <option name="EMULATE_TERMINAL" value="false" />
+      <option name="MODULE_MODE" value="false" />
+      <option name="REDIRECT_INPUT" value="false" />
+      <option name="INPUT_FILE" value="" />
+      <method v="2" />
+    </configuration>
     <configuration name="run" type="PythonConfigurationType" factoryName="Python">
       <module name="craftbeerpi4" />
       <option name="INTERPRETER_OPTIONS" value="" />
@@ -577,7 +783,7 @@
       <option name="INPUT_FILE" value="" />
       <method v="2" />
     </configuration>
-    <configuration name="sample" type="PythonConfigurationType" factoryName="Python" temporary="true">
+    <configuration name="run_mqtt" type="PythonConfigurationType" factoryName="Python" temporary="true">
       <module name="craftbeerpi4" />
       <option name="INTERPRETER_OPTIONS" value="" />
       <option name="PARENT_ENVS" value="true" />
@@ -585,12 +791,12 @@
         <env name="PYTHONUNBUFFERED" value="1" />
       </envs>
       <option name="SDK_HOME" value="" />
-      <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" />
+      <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$/cbpi_cloud" />
       <option name="IS_MODULE_SDK" value="true" />
       <option name="ADD_CONTENT_ROOTS" value="true" />
       <option name="ADD_SOURCE_ROOTS" value="true" />
       <EXTENSION ID="PythonCoverageRunConfigurationExtension" runner="coverage.py" />
-      <option name="SCRIPT_NAME" value="$PROJECT_DIR$/sample.py" />
+      <option name="SCRIPT_NAME" value="$PROJECT_DIR$/cbpi_cloud/run_mqtt.py" />
       <option name="PARAMETERS" value="" />
       <option name="SHOW_COMMAND_LINE" value="false" />
       <option name="EMULATE_TERMINAL" value="false" />
@@ -677,22 +883,6 @@
       <option name="_new_targetType" value="&quot;PYTHON&quot;" />
       <method v="2" />
     </configuration>
-    <configuration name="pytest for tests.test_step.StepTestCase.test_crud" type="tests" factoryName="py.test" temporary="true" nameIsGenerated="true">
-      <module name="craftbeerpi4" />
-      <option name="INTERPRETER_OPTIONS" value="" />
-      <option name="PARENT_ENVS" value="true" />
-      <option name="SDK_HOME" value="" />
-      <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" />
-      <option name="IS_MODULE_SDK" value="true" />
-      <option name="ADD_CONTENT_ROOTS" value="true" />
-      <option name="ADD_SOURCE_ROOTS" value="true" />
-      <EXTENSION ID="PythonCoverageRunConfigurationExtension" runner="coverage.py" />
-      <option name="_new_keywords" value="&quot;test_crud&quot;" />
-      <option name="_new_additionalArguments" value="&quot;&quot;" />
-      <option name="_new_target" value="&quot;tests.test_step.StepTestCase.test_crud&quot;" />
-      <option name="_new_targetType" value="&quot;PYTHON&quot;" />
-      <method v="2" />
-    </configuration>
     <configuration name="pytest for tests.test_step.StepTestCase.test_get" type="tests" factoryName="py.test" temporary="true" nameIsGenerated="true">
       <module name="craftbeerpi4" />
       <option name="INTERPRETER_OPTIONS" value="" />
@@ -744,20 +934,20 @@
     <list>
       <item itemvalue="Python.test_app" />
       <item itemvalue="Python.run" />
-      <item itemvalue="Python.sample" />
       <item itemvalue="Python tests.pytest for tests.test_actor" />
       <item itemvalue="Python tests.pytest in test_step.py" />
       <item itemvalue="Python tests.pytest for tests.test_step.StepTestCase.test_process" />
-      <item itemvalue="Python tests.pytest for tests.test_step.StepTestCase.test_crud" />
       <item itemvalue="Python tests.pytest for tests.test_step.StepTestCase.test_get" />
+      <item itemvalue="Python.run (1)" />
+      <item itemvalue="Python.run_mqtt" />
     </list>
     <recent_temporary>
       <list>
-        <item itemvalue="Python tests.pytest for tests.test_step.StepTestCase.test_process" />
+        <item itemvalue="Python.run (1)" />
+        <item itemvalue="Python.run_mqtt" />
         <item itemvalue="Python tests.pytest in test_step.py" />
+        <item itemvalue="Python tests.pytest for tests.test_step.StepTestCase.test_process" />
         <item itemvalue="Python tests.pytest for tests.test_step.StepTestCase.test_get" />
-        <item itemvalue="Python tests.pytest for tests.test_step.StepTestCase.test_crud" />
-        <item itemvalue="Python.sample" />
       </list>
     </recent_temporary>
   </component>
@@ -802,7 +992,7 @@
       <workItem from="1557865115345" duration="642000" />
       <workItem from="1558267960394" duration="706000" />
       <workItem from="1559500167254" duration="104000" />
-      <workItem from="1563709285256" duration="57120000" />
+      <workItem from="1563709285256" duration="80666000" />
     </task>
     <task id="LOCAL-00001" summary="Lots of changes">
       <created>1541288846149</created>
@@ -822,9 +1012,6 @@
     <servers />
   </component>
   <component name="TestHistory">
-    <history-entry file="pytest_for_tests_test_step_StepTestCase_test_get - 2019.07.27 at 11h 47m 03s.xml">
-      <configuration name="pytest for tests.test_step.StepTestCase.test_get" configurationId="tests" />
-    </history-entry>
     <history-entry file="pytest_for_tests_test_step_StepTestCase_test_get - 2019.07.27 at 11h 47m 12s.xml">
       <configuration name="pytest for tests.test_step.StepTestCase.test_get" configurationId="tests" />
     </history-entry>
@@ -852,9 +1039,12 @@
     <history-entry file="pytest_for_tests_test_step_StepTestCase_test_process - 2019.07.27 at 15h 15m 51s.xml">
       <configuration name="pytest for tests.test_step.StepTestCase.test_process" configurationId="tests" />
     </history-entry>
+    <history-entry file="pytest_in_test_step_py - 2019.07.27 at 21h 10m 18s.xml">
+      <configuration name="pytest in test_step.py" configurationId="tests" />
+    </history-entry>
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="328998000" />
+    <option name="totallyTimeSpent" value="352544000" />
   </component>
   <component name="TodoView">
     <todo-panel id="selected-file">
@@ -867,15 +1057,16 @@
   </component>
   <component name="ToolWindowManager">
     <frame x="0" y="23" width="1680" height="972" extended-state="6" />
+    <editor active="true" />
     <layout>
-      <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.24725275" />
+      <window_info content_ui="combo" id="Project" order="0" visible="true" weight="0.24725275" />
       <window_info id="Favorites" order="1" side_tool="true" />
       <window_info anchor="bottom" id="Event Log" order="0" sideWeight="0.2826618" side_tool="true" weight="0.34545454" />
       <window_info anchor="bottom" id="Version Control" order="1" sideWeight="0.4993895" weight="0.32613635" />
-      <window_info anchor="bottom" id="Run" order="2" sideWeight="0.7173382" visible="true" weight="0.24772727" />
+      <window_info active="true" anchor="bottom" id="Run" order="2" sideWeight="0.7173382" visible="true" weight="0.3375" />
       <window_info anchor="bottom" id="Debug" order="3" sideWeight="0.6996337" weight="0.45454547" />
       <window_info anchor="bottom" id="Python Console" order="4" sideWeight="0.49938852" weight="0.32876712" />
-      <window_info anchor="bottom" id="Terminal" order="5" sideWeight="0.49571952" weight="0.5122807" />
+      <window_info anchor="bottom" id="Terminal" order="5" sideWeight="0.49571952" weight="0.41136363" />
       <window_info anchor="bottom" id="TODO" order="6" sideWeight="0.49979618" weight="0.32648402" />
       <window_info anchor="bottom" id="Message" order="7" />
       <window_info anchor="bottom" id="Find" order="8" weight="0.32518336" />
@@ -887,13 +1078,13 @@
       <window_info anchor="bottom" id="Database Console" order="14" sideWeight="0.49979618" weight="0.32876712" />
       <window_info anchor="bottom" id="Concurrent Activities Diagram" order="15" weight="0.40342298" />
       <window_info anchor="right" id="Data View" order="0" />
-      <window_info anchor="right" id="Database" order="1" sideWeight="0.49781278" visible="true" weight="0.16849817" />
+      <window_info anchor="right" id="Database" order="1" sideWeight="0.49781278" weight="0.16849817" />
       <window_info anchor="right" id="Commander" order="2" weight="0.4" />
       <window_info anchor="right" id="Ant Build" order="3" weight="0.25" />
       <window_info anchor="right" content_ui="combo" id="Hierarchy" order="4" weight="0.25" />
       <window_info anchor="right" id="SciView" order="5" weight="0.19282511" />
       <window_info anchor="right" id="Coverage" order="6" sideWeight="0.50218725" side_tool="true" visible="true" weight="0.1607298" />
-      <window_info anchor="right" id="Structure" order="7" sideWeight="0.49979618" weight="0.24236874" />
+      <window_info anchor="right" id="Structure" order="7" sideWeight="0.49979618" visible="true" weight="0.24236874" />
       <window_info anchor="right" x="1332" y="656" width="632" height="505" id="REST Client" order="8" sideWeight="0.49938852" weight="0.18793315" />
     </layout>
   </component>
@@ -927,7 +1118,7 @@
         </line-breakpoint>
         <line-breakpoint enabled="true" suspend="THREAD" type="python-line">
           <url>file://$PROJECT_DIR$/cbpi/craftbeerpi.py</url>
-          <line>41</line>
+          <line>42</line>
           <option name="timeStamp" value="47" />
         </line-breakpoint>
       </breakpoints>
@@ -946,173 +1137,51 @@
     </watches-manager>
   </component>
   <component name="editorHistoryManager">
-    <entry file="file://$PROJECT_DIR$/.gitignore">
+    <entry file="file://$USER_HOME$/cbp42/lib/python3.7/site-packages/aiojobs/aiohttp.py">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="161">
+          <caret line="18" column="4" selection-start-line="18" selection-start-column="4" selection-end-line="18" selection-end-column="4" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$USER_HOME$/cbp42/lib/python3.7/site-packages/hbmqtt/broker.py">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="157">
+          <caret line="296" selection-start-line="296" selection-end-line="296" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/cbpi_cloud/default_broker.yaml">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="90">
+          <caret line="6" column="23" lean-forward="true" selection-start-line="6" selection-start-column="23" selection-end-line="6" selection-end-column="23" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/cbpi/extension/dummystep/config.yaml">
       <provider selected="true" editor-type-id="text-editor" />
     </entry>
-    <entry file="file://$PROJECT_DIR$/cbpi/controller/job_controller.py">
+    <entry file="file://$PROJECT_DIR$/cbpi/mqtt/mqtt.py">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="380">
-          <caret line="41" column="8" selection-start-line="41" selection-start-column="8" selection-end-line="41" selection-end-column="8" />
+        <state relative-caret-position="156">
+          <caret line="40" column="8" selection-start-line="40" selection-start-column="8" selection-end-line="40" selection-end-column="58" />
           <folding>
-            <element signature="e#0#14#0" expanded="true" />
+            <element signature="e#0#50#0" expanded="true" />
           </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/cbpi/job/_scheduler.py">
+    <entry file="file://$USER_HOME$/cbp42/lib/python3.7/site-packages/hbmqtt/client.py">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="327">
-          <caret line="134" lean-forward="true" selection-start-line="134" selection-end-line="134" />
-          <folding>
-            <element signature="e#0#14#0" expanded="true" />
-          </folding>
+        <state relative-caret-position="213">
+          <caret line="116" column="8" selection-start-line="116" selection-start-column="8" selection-end-line="116" selection-end-column="8" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/cbpi/database/orm_framework.py">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="327">
-          <caret line="170" column="8" selection-start-line="170" selection-start-column="8" selection-end-line="170" selection-end-column="8" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/cbpi/database/model.py">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="144">
-          <caret line="132" column="56" selection-start-line="132" selection-start-column="56" selection-end-line="132" selection-end-column="56" />
-          <folding>
-            <element signature="e#0#11#0" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/cbpi/controller/actor_controller.py">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="334">
-          <caret line="156" column="14" selection-start-line="156" selection-start-column="14" selection-end-line="156" selection-end-column="14" />
-          <folding>
-            <element signature="e#0#14#0" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file:///usr/local/Cellar/python/3.7.1/Frameworks/Python.framework/Versions/3.7/lib/python3.7/asyncio/events.py">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="230">
-          <caret line="87" selection-start-line="87" selection-end-line="87" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/cbpi/websocket.py">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="459">
-          <caret line="80" column="17" lean-forward="true" selection-start-line="80" selection-start-column="17" selection-end-line="80" selection-end-column="17" />
-          <folding>
-            <element signature="e#0#14#0" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/cbpi/api/decorator.py">
-      <provider selected="true" editor-type-id="text-editor" />
-    </entry>
-    <entry file="file://$PROJECT_DIR$/sample.py">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="105">
-          <caret line="7" column="16" selection-start-line="7" selection-start-column="16" selection-end-line="7" selection-end-column="16" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/cbpi/api/actor.py">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-11">
-          <folding>
-            <element signature="e#0#23#0" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/cbpi/controller/crud_controller.py">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="669">
-          <caret line="89" column="14" selection-start-line="89" selection-start-column="14" selection-end-line="89" selection-end-column="14" />
-          <folding>
-            <element signature="e#0#13#0" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/cbpi/utils/encoder.py">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="135">
-          <caret line="9" column="27" selection-start-line="9" selection-start-column="27" selection-end-line="9" selection-end-column="27" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/cbpi/utils/__init__.py">
-      <provider selected="true" editor-type-id="text-editor" />
-    </entry>
-    <entry file="file://$PROJECT_DIR$/cbpi/api/sensor.py">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="105">
-          <caret line="7" column="24" lean-forward="true" selection-start-line="7" selection-start-column="24" selection-end-line="7" selection-end-column="24" />
-          <folding>
-            <element signature="e#0#48#0" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/cbpi/api/extension.py">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="150">
-          <caret line="14" column="6" selection-start-line="14" selection-start-column="6" selection-end-line="14" selection-end-column="6" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/cbpi/utils/utils.py">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="165">
-          <caret line="11" column="12" selection-start-line="11" selection-start-column="12" selection-end-line="11" selection-end-column="31" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/tests/test_step.py">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="251">
-          <caret line="40" column="22" selection-start-line="40" selection-start-column="22" selection-end-line="40" selection-end-column="22" />
-          <folding>
-            <element signature="e#0#14#0" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/cbpi/job/_job.py">
+    <entry file="file://$PROJECT_DIR$/cbpi_cloud/run_mqtt.py">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="180">
-          <caret line="116" selection-start-line="116" selection-end-line="116" />
-          <folding>
-            <element signature="e#0#14#0" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/cbpi/controller/system_controller.py">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="173">
-          <caret line="34" column="42" lean-forward="true" selection-start-line="34" selection-start-column="42" selection-end-line="34" selection-end-column="42" />
-          <folding>
-            <element signature="e#0#15#0" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/cbpi/__init__.py">
-      <provider selected="true" editor-type-id="text-editor" />
-    </entry>
-    <entry file="file://$PROJECT_DIR$/cbpi/eventbus.py">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="180">
-          <caret line="113" column="14" selection-start-line="113" selection-start-column="14" selection-end-line="113" selection-end-column="14" />
+          <caret line="12" column="4" selection-start-line="12" selection-start-column="4" selection-end-line="12" selection-end-column="61" />
           <folding>
             <element signature="e#0#14#0" expanded="true" />
           </folding>
@@ -1121,185 +1190,336 @@
     </entry>
     <entry file="file://$PROJECT_DIR$/cbpi/extension/dummystep/__init__.py">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-8">
-          <caret line="2" lean-forward="true" selection-start-line="2" selection-end-line="2" />
+        <state relative-caret-position="303">
+          <caret line="42" selection-start-line="42" selection-end-line="51" selection-end-column="58" />
+          <folding>
+            <element signature="e#0#14#0" expanded="true" />
+          </folding>
         </state>
       </provider>
     </entry>
-    <entry file="das://5067e7fe-480d-4433-bc40-f2d1c38362a2/schema/main/table/step">
-      <provider selected="true" editor-type-id="com.intellij.database.editor.DatabaseTableFileEditorProvider">
-        <state>
-          <filtering enabled="true" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/cbpi/controller/step_controller_back.py">
+    <entry file="file://$PROJECT_DIR$/run.py">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="204">
-          <caret line="222" column="12" lean-forward="true" selection-start-line="222" selection-start-column="12" selection-end-line="222" selection-end-column="56" />
+        <state relative-caret-position="30">
+          <caret line="2" selection-start-line="2" selection-end-line="2" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/logs/app.log">
-      <provider selected="true" editor-type-id="text-editor" />
-    </entry>
-    <entry file="file://$PROJECT_DIR$/cbpi/api/step.py">
+    <entry file="file://$PROJECT_DIR$/cbpi/websocket.py">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="310">
-          <caret line="158" lean-forward="true" selection-start-line="158" selection-end-line="158" />
+        <state relative-caret-position="171">
+          <caret line="19" selection-start-line="19" selection-end-line="19" />
+          <folding>
+            <element signature="e#0#14#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/tests/test_step.py">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="465">
+          <caret line="33" column="57" selection-start-line="33" selection-start-column="53" selection-end-line="33" selection-end-column="57" />
+          <folding>
+            <element signature="e#0#14#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$USER_HOME$/cbp42/lib/python3.7/site-packages/asn1crypto/core.py">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="188">
+          <caret line="4135" column="8" selection-start-line="4135" selection-start-column="8" selection-end-line="4135" selection-end-column="8" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/cbpi_cloud/run.py">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="375">
+          <caret line="51" column="51" selection-start-line="51" selection-start-column="51" selection-end-line="51" selection-end-column="51" />
           <folding>
             <element signature="e#0#11#0" expanded="true" />
           </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/cbpi/api/kettle_logic.py">
+    <entry file="file://$PROJECT_DIR$/cbpi/utils/utils.py">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-260" />
+        <state relative-caret-position="120">
+          <caret line="8" column="4" selection-start-line="8" selection-start-column="4" selection-end-line="8" selection-end-column="4" />
+        </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/cbpi/extension/dummylogic/__init__.py">
+    <entry file="file://$PROJECT_DIR$/MANIFEST.in">
+      <provider selected="true" editor-type-id="text-editor" />
+    </entry>
+    <entry file="file://$PROJECT_DIR$/cbpi/controller/sensor_controller.py">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="415">
-          <caret line="58" lean-forward="true" selection-start-line="58" selection-end-line="58" />
+        <state relative-caret-position="405">
+          <caret line="30" column="41" lean-forward="true" selection-start-line="30" selection-start-column="41" selection-end-line="30" selection-end-column="41" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$USER_HOME$/cbp42/lib/python3.7/site-packages/yaml/__init__.py">
+      <provider selected="true" editor-type-id="text-editor" />
+    </entry>
+    <entry file="file://$PROJECT_DIR$/cbpi_cloud/repo/plugins.yaml">
+      <provider selected="true" editor-type-id="text-editor">
+        <state>
+          <caret selection-end-line="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/cbpi/config/config.yaml">
+      <provider selected="true" editor-type-id="text-editor" />
+    </entry>
+    <entry file="file://$PROJECT_DIR$/config/splash.png">
+      <provider selected="true" editor-type-id="images" />
+    </entry>
+    <entry file="file://$PROJECT_DIR$/cbpi/config/splash.png">
+      <provider selected="true" editor-type-id="images" />
+    </entry>
+    <entry file="file://$PROJECT_DIR$/config/config.yaml">
+      <provider selected="true" editor-type-id="text-editor" />
+    </entry>
+    <entry file="file://$PROJECT_DIR$/config/plugin_list.txt">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="60">
+          <caret line="4" column="29" selection-start-line="4" selection-start-column="29" selection-end-line="4" selection-end-column="29" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/cbpi/config/plugin_list.txt">
+      <provider selected="true" editor-type-id="text-editor">
+        <state>
+          <caret selection-end-column="10" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/cbpi/eventbus.py">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="1695">
+          <caret line="113" column="14" selection-start-line="113" selection-start-column="14" selection-end-line="113" selection-end-column="14" />
           <folding>
             <element signature="e#0#14#0" expanded="true" />
           </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/cbpi/http_endpoints/http_curd_endpoints.py">
+    <entry file="file://$PROJECT_DIR$/cbpi/cli.py">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="554">
-          <caret line="50" column="39" lean-forward="true" selection-start-line="50" selection-start-column="8" selection-end-line="50" selection-end-column="39" />
+        <state relative-caret-position="438">
+          <caret line="90" selection-start-line="90" selection-end-line="90" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/cbpi/http_endpoints/http_actor.py">
+    <entry file="file://$PROJECT_DIR$/cbpi/extension/__init__.py">
+      <provider selected="true" editor-type-id="text-editor" />
+    </entry>
+    <entry file="file://$PROJECT_DIR$/cbpi/extension/comp/static/index2.html">
+      <provider selected="true" editor-type-id="text-editor" />
+    </entry>
+    <entry file="file:///usr/local/Cellar/python/3.7.1/Frameworks/Python.framework/Versions/3.7/lib/python3.7/subprocess.py">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="105">
-          <caret line="7" column="36" selection-start-line="7" selection-start-column="36" selection-end-line="7" selection-end-column="36" />
+        <state relative-caret-position="161">
+          <caret line="344" column="4" selection-start-line="344" selection-start-column="4" selection-end-line="344" selection-end-column="4" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/cbpi/http_endpoints/http_kettle.py">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="120">
+          <caret line="8" column="14" selection-start-line="8" selection-start-column="14" selection-end-line="8" selection-end-column="14" />
           <folding>
             <element signature="e#0#23#0" expanded="true" />
           </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$USER_HOME$/cbp42/lib/python3.7/site-packages/pip/__main__.py">
+    <entry file="file://$PROJECT_DIR$/cbpi/http_endpoints/http_dashboard.py">
       <provider selected="true" editor-type-id="text-editor">
         <state>
           <folding>
-            <element signature="e#0#38#0" expanded="true" />
+            <element signature="e#0#23#0" expanded="true" />
           </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$USER_HOME$/cbp42/lib/python3.7/site-packages/pip/__init__.py">
-      <provider selected="true" editor-type-id="text-editor" />
-    </entry>
-    <entry file="file://$PROJECT_DIR$/cbpi/controller/step_controller.py">
+    <entry file="file://$PROJECT_DIR$/cbpi/craftbeerpi.py">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="116">
-          <caret line="149" column="37" lean-forward="true" selection-start-line="149" selection-start-column="37" selection-end-line="149" selection-end-column="37" />
+        <state relative-caret-position="254">
+          <caret line="100" column="41" lean-forward="true" selection-start-line="100" selection-start-column="41" selection-end-line="100" selection-end-column="41" />
           <folding>
             <element signature="e#0#14#0" expanded="true" />
           </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/cbpi/controller/dashboard_controller.py">
+    <entry file="file://$USER_HOME$/cbp42/lib/python3.7/site-packages/voluptuous/schema_builder.py">
       <provider selected="true" editor-type-id="text-editor">
-        <state>
+        <state relative-caret-position="2625">
+          <caret line="183" column="8" selection-start-line="183" selection-start-column="8" selection-end-line="183" selection-end-column="8" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/cbpi/http_endpoints/http_login.py">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="120">
+          <caret line="8" column="4" selection-start-line="8" selection-start-column="4" selection-end-line="10" selection-end-column="48" />
           <folding>
-            <element signature="e#0#14#0" expanded="true" />
+            <element signature="e#0#23#0" expanded="true" />
           </folding>
         </state>
       </provider>
     </entry>
     <entry file="file://$USER_HOME$/cbp42/lib/python3.7/site-packages/aiohttp_auth/auth/auth.py">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="164">
-          <caret line="26" selection-start-line="26" selection-end-line="26" />
+        <state relative-caret-position="95">
+          <caret line="38" column="10" selection-start-line="38" selection-start-column="10" selection-end-line="38" selection-end-column="10" />
         </state>
       </provider>
     </entry>
-    <entry file="das://5067e7fe-480d-4433-bc40-f2d1c38362a2/schema/main/table/sensor">
-      <provider selected="true" editor-type-id="com.intellij.database.editor.DatabaseTableFileEditorProvider">
+    <entry file="file://$USER_HOME$/cbp42/lib/python3.7/site-packages/aiohttp_auth/auth/decorators.py">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="45">
+          <caret line="5" selection-start-line="5" selection-end-line="32" selection-end-column="18" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/cbpi/http_endpoints/http_actor.py">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="1245">
+          <caret line="83" column="28" lean-forward="true" selection-start-line="71" selection-start-column="8" selection-end-line="83" selection-end-column="28" />
+          <folding>
+            <element signature="e#0#23#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/cbpi/extension/comp/__init__.py">
+      <provider selected="true" editor-type-id="text-editor">
         <state>
-          <filtering enabled="true" />
+          <folding>
+            <element signature="e#0#9#0" expanded="true" />
+          </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$USER_HOME$/cbp42/lib/python3.7/site-packages/aiohttp/web_response.py">
+    <entry file="file://$PROJECT_DIR$/cbpi/http_endpoints/__init__.py">
+      <provider selected="true" editor-type-id="text-editor" />
+    </entry>
+    <entry file="file://$PROJECT_DIR$/cbpi/api/decorator.py">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="212">
-          <caret line="440" column="8" selection-start-line="440" selection-start-column="8" selection-end-line="440" selection-end-column="8" />
+        <state relative-caret-position="645">
+          <caret line="48" column="30" selection-start-line="48" selection-start-column="30" selection-end-line="48" selection-end-column="30" />
+          <folding>
+            <element signature="e#0#27#0" expanded="true" />
+          </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/cbpi/craftbeerpi.py">
+    <entry file="file://$PROJECT_DIR$/cbpi/controller/kettle_controller.py">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="443">
-          <caret line="55" column="69" lean-forward="true" selection-start-line="55" selection-start-column="15" selection-end-line="55" selection-end-column="69" />
+        <state relative-caret-position="-2239">
+          <folding>
+            <element signature="e#0#9#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/cbpi/controller/actor_controller.py">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="154">
+          <caret line="131" column="4" selection-start-line="131" selection-start-column="4" selection-end-line="138" selection-end-column="81" />
           <folding>
             <element signature="e#0#14#0" expanded="true" />
           </folding>
         </state>
       </provider>
     </entry>
+    <entry file="file://$PROJECT_DIR$/cbpi/controller/system_controller.py">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="151">
+          <caret line="26" column="96" selection-start-line="26" selection-start-column="96" selection-end-line="26" selection-end-column="96" />
+          <folding>
+            <element signature="e#0#15#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/cbpi/controller/config_controller.py">
+      <provider selected="true" editor-type-id="text-editor">
+        <state>
+          <folding>
+            <element signature="e#0#14#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/cbpi/controller/step_controller.py">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="416">
+          <caret line="192" column="29" selection-start-line="192" selection-start-column="29" selection-end-line="192" selection-end-column="29" />
+          <folding>
+            <element signature="e#0#11#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/cbpi/http_endpoints/http_sensor.py">
+      <provider selected="true" editor-type-id="text-editor">
+        <state>
+          <folding>
+            <element signature="e#0#14#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/cbpi/http_endpoints/http_plugin.py">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="389">
+          <caret line="35" column="11" lean-forward="true" selection-start-line="13" selection-start-column="8" selection-end-line="35" selection-end-column="11" />
+          <folding>
+            <element signature="e#0#23#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/cbpi/http_endpoints/http_step.py">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="440">
+          <caret line="186" column="56" lean-forward="true" selection-start-line="186" selection-start-column="56" selection-end-line="186" selection-end-column="56" />
+          <folding>
+            <element signature="e#0#23#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
     <entry file="file://$PROJECT_DIR$/cbpi/controller/plugin_controller.py">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="388">
-          <caret line="103" column="21" selection-start-line="103" selection-start-column="21" selection-end-line="103" selection-end-column="21" />
+        <state relative-caret-position="322">
+          <caret line="86" column="20" selection-start-line="86" selection-start-column="20" selection-end-line="86" selection-end-column="20" />
           <folding>
             <element signature="e#0#14#0" expanded="true" />
           </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/cbpi/extension/dummysensor/__init__.py">
+    <entry file="file://$PROJECT_DIR$/cbpi/extension/mqtt/__init__.py">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="287">
-          <caret line="137" column="68" selection-start-line="137" selection-start-column="68" selection-end-line="137" selection-end-column="68" />
+        <state relative-caret-position="165">
+          <caret line="15" column="36" selection-start-line="15" selection-start-column="32" selection-end-line="15" selection-end-column="36" />
           <folding>
-            <element signature="e#24#38#0" expanded="true" />
+            <element signature="e#0#11#0" expanded="true" />
           </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/logs/sensor_2.log.3">
-      <provider selected="true" editor-type-id="text-editor" />
-    </entry>
-    <entry file="file://$PROJECT_DIR$/logs/sensor_2.log.4">
-      <provider selected="true" editor-type-id="text-editor" />
-    </entry>
-    <entry file="file://$PROJECT_DIR$/logs/sensor_2.log.7">
-      <provider selected="true" editor-type-id="text-editor" />
-    </entry>
-    <entry file="file://$PROJECT_DIR$/logs/sensor_2.log.5">
-      <provider selected="true" editor-type-id="text-editor" />
-    </entry>
-    <entry file="file://$PROJECT_DIR$/logs/sensor_2.log.2">
-      <provider selected="true" editor-type-id="text-editor" />
-    </entry>
-    <entry file="file://$PROJECT_DIR$/logs/sensor_2.log.1">
-      <provider selected="true" editor-type-id="text-editor" />
-    </entry>
-    <entry file="file://$PROJECT_DIR$/logs/sensor_3.log">
-      <provider selected="true" editor-type-id="text-editor" />
-    </entry>
-    <entry file="file://$PROJECT_DIR$/cbpi/controller/sensor_controller.py">
+    <entry file="file://$PROJECT_DIR$/cbpi/extension/mqtt/config.yaml">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-270">
-          <caret line="30" column="41" lean-forward="true" selection-start-line="30" selection-start-column="41" selection-end-line="30" selection-end-column="41" />
+        <state relative-caret-position="15">
+          <caret line="1" column="12" selection-start-line="1" selection-start-column="12" selection-end-line="1" selection-end-column="12" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/logs/sensor_1.log">
-      <provider selected="true" editor-type-id="text-editor" />
-    </entry>
-    <entry file="file://$PROJECT_DIR$/logs/sensor_2.log">
-      <provider selected="true" editor-type-id="text-editor" />
-    </entry>
   </component>
 </project>
\ No newline at end of file
diff --git a/cbpi/api/decorator.py b/cbpi/api/decorator.py
index 83a02c8..2913918 100644
--- a/cbpi/api/decorator.py
+++ b/cbpi/api/decorator.py
@@ -1,3 +1,7 @@
+from functools import wraps
+
+from voluptuous import Schema
+
 __all__ = ["request_mapping", "on_startup", "on_event", "on_mqtt_message", "on_websocket_message", "action", "background_task"]
 
 from aiohttp_auth import auth
@@ -9,7 +13,7 @@ def composed(*decs):
         return f
     return deco
 
-def request_mapping(path, name=None, method="GET", auth_required=True):
+def request_mapping(path, name=None, method="GET", auth_required=True, json_schema=None):
 
     def on_http_request(path, name=None):
         def real_decorator(func):
@@ -21,14 +25,34 @@ def request_mapping(path, name=None, method="GET", auth_required=True):
 
         return real_decorator
 
+    def validate_json_body(func):
+
+
+        @wraps(func)
+        async def wrapper(*args):
+
+            if json_schema is not None:
+                data = await args[-1].json()
+                schema = Schema(json_schema)
+                schema(data)
+
+            return await func(*args)
+
+        return wrapper
+
+
+
     if auth_required is True:
         return composed(
-            on_http_request(path,  name),
-            auth.auth_required
+            on_http_request(path, name),
+            auth.auth_required,
+            validate_json_body
+
         )
     else:
         return composed(
-            on_http_request(path, name)
+            on_http_request(path, name),
+            validate_json_body
         )
 
 def on_websocket_message(path, name=None):
diff --git a/cbpi/controller/plugin_controller.py b/cbpi/controller/plugin_controller.py
index 6a45e2b..b5d6a85 100644
--- a/cbpi/controller/plugin_controller.py
+++ b/cbpi/controller/plugin_controller.py
@@ -1,19 +1,15 @@
-import asyncio
 import logging
 import os
 from importlib import import_module
-
+import datetime
 import aiohttp
 import yaml
-from aiohttp import web
-
-from cbpi.api import *
-from cbpi.utils.utils import load_config, json_dumps
-
-logger = logging.getLogger(__name__)
 import subprocess
 import sys
+from cbpi.api import *
+from cbpi.utils.utils import load_config
 
+logger = logging.getLogger(__name__)
 
 class PluginController():
     modules = {}
@@ -21,53 +17,87 @@ class PluginController():
 
     def __init__(self, cbpi):
         self.cbpi = cbpi
-        self.cbpi.register(self, "/plugin")
 
-    @classmethod
+        self.plugins = {}
+        self.plugins = load_config("./config/plugin_list.txt")
+
     async def load_plugin_list(self):
         async with aiohttp.ClientSession() as session:
-            async with session.get('https://raw.githubusercontent.com/Manuel83/craftbeerpi-plugins/master/plugins_v4.yaml') as resp:
+            async with session.get('http://localhost:2202/list') as resp:
                 if (resp.status == 200):
                     data = yaml.load(await resp.text())
+                    self.plugins = data
                     return data
 
+    def installed_plugins(self):
+        return self.plugins
+
+    async def install(self, package_name):
+        async def install(cbpi, plugins, package_name):
+            data = subprocess.check_output([sys.executable, "-m", "pip", "install", package_name])
+            data = data.decode('UTF-8')
+            if package_name not in self.plugins:
+                now = datetime.datetime.now()
+                self.plugins[package_name] = dict(version="1.0", installation_date=now.strftime("%Y-%m-%d %H:%M:%S"))
+                with open('./config/plugin_list.txt', 'w') as outfile:
+                    yaml.dump(self.plugins, outfile, default_flow_style=False)
+            if data.startswith('Requirement already satisfied'):
+                self.cbpi.notify(key="p", message="Plugin already installed ", type="warning")
+            else:
+
+                self.cbpi.notify(key="p", message="Plugin installed ", type="success")
+
+        async with aiohttp.ClientSession() as session:
+            async with session.get('http://localhost:2202/get/%s' % package_name) as resp:
+
+                if (resp.status == 200):
+                    data = await resp.json()
+                    await self.cbpi.job.start_job(install(self.cbpi, self.plugins, data["package_name"]), data["package_name"], "plugins_install")
+                    return True
+                else:
+                    self.cbpi.notify(key="p", message="Failed to install Plugin %s " % package_name, type="danger")
+                    return False
+
+    async def uninstall(self, package_name):
+        async def uninstall(cbpi, plugins, package_name):
+            print("try to uninstall", package_name)
+            try:
+                data = subprocess.check_output([sys.executable, "-m", "pip", "uninstall", "-y", package_name])
+                data = data.decode('UTF-8')
+                if data.startswith("Successfully uninstalled"):
+                    cbpi.notify(key="p", message="Plugin %s Uninstalled" % package_name, type="success")
+                else:
+                    cbpi.notify(key="p", message=data, type="success")
+            except Exception as e:
+                print(e)
+
+        if package_name in self.plugins:
+            print("Uninstall", self.plugins[package_name])
+            await self.cbpi.job.start_job(uninstall(self.cbpi, self.plugins, package_name), package_name, "plugins_uninstall")
+
     def load_plugins(self):
 
         this_directory = os.path.dirname(__file__)
-
         for filename in os.listdir(os.path.join(this_directory, "../extension")):
-
             if os.path.isdir(os.path.join(this_directory, "../extension/") + filename) is False or filename == "__pycache__":
                 continue
             try:
                 logger.info("Trying to load plugin %s" % filename)
-
                 data = load_config(os.path.join(this_directory, "../extension/%s/config.yaml" % filename))
-
                 if (data.get("version") == 4):
-
                     self.modules[filename] = import_module("cbpi.extension.%s" % (filename))
                     self.modules[filename].setup(self.cbpi)
-
                     logger.info("Plugin %s loaded successful" % filename)
                 else:
                     logger.warning("Plugin %s is not supporting version 4" % filename)
 
-
             except Exception as e:
                 print(e)
                 logger.error(e)
 
     def load_plugins_from_evn(self):
 
-        plugins = []
-        this_directory = os.path.dirname(__file__)
-        with open("./config/plugin_list.txt") as f:
-
-            plugins = f.read().splitlines()
-            plugins = list(set(plugins))
-
-        for p in plugins:
+        for p in self.plugins:
             logger.debug("Load Plugin %s" % p)
             try:
                 logger.info("Try to load plugin:  %s " % p)
@@ -79,53 +109,6 @@ class PluginController():
                 logger.error("FAILED to load plugin %s " % p)
                 logger.error(e)
 
-    @on_event("job/plugins_install/done")
-    async def done(self, **kwargs):
-        self.cbpi.notify(key="p", message="Plugin installed ", type="success")
-        print("DONE INSTALL PLUGIN", kwargs)
-
-    @request_mapping(path="/install", method="GET", auth_required=False)
-    async def install_plugin(self, request):
-        """
-                    ---
-                    description: Install Plugin
-                    tags:
-                    - Plugin
-                    produces:
-                    - application/json
-                    responses:
-                        "204":
-                            description: successful operation. Return "pong" text
-                        "405":
-                            description: invalid HTTP Method
-                    """
-
-        async def install(name):
-            await asyncio.sleep(5)
-            subprocess.call([sys.executable, "-m", "pip", "install", name])
-
-        print("OK")
-
-        await self.cbpi.job.start_job(install('requests'), "requests", "plugins_install")
-        return web.Response(status=204)
-
-    @request_mapping(path="/list", method="GET", auth_required=False)
-    async def get_plugins(self, request):
-        """
-            ---
-            description: Get a list of avialable plugins
-            tags:
-            - Plugin
-            produces:
-            - application/json
-            responses:
-                "200":
-                    description: successful operation. Return "pong" text
-                "405":
-                    description: invalid HTTP Method
-            """
-        return web.json_response(await self.load_plugin_list(), dumps=json_dumps)
-
     def register(self, name, clazz) -> None:
         '''
         Register a new actor type
diff --git a/cbpi/controller/step_controller.py b/cbpi/controller/step_controller.py
index c072c05..72a4a5a 100644
--- a/cbpi/controller/step_controller.py
+++ b/cbpi/controller/step_controller.py
@@ -1,9 +1,11 @@
+import json
 import logging
 import time
 
 from cbpi.api import *
 from cbpi.controller.crud_controller import CRUDController
 from cbpi.database.model import StepModel
+from utils.encoder import ComplexEncoder
 
 
 class StepController(CRUDController):
@@ -31,20 +33,7 @@ class StepController(CRUDController):
         else:
             return False
 
-    @on_event("step/action")
-    async def handle_action(self, action, **kwargs):
 
-        '''
-        Event Handler for "step/action".
-        It invokes the provided method name on the current step
-
-
-        :param action: the method name which will be invoked
-        :param kwargs:
-        :return: None
-        '''
-        if self.current_step is not None:
-            self.current_step.__getattribute__(action)()
 
     def _get_manged_fields_as_array(self, type_cfg):
 
@@ -106,7 +95,7 @@ class StepController(CRUDController):
                 self.current_step = next_step
                 # start the step job
                 self.current_job = await self.cbpi.job.start_job(self.current_step.instance.run(), next_step.name, "step")
-                await self.cbpi.bus.fire("step/%s/started" % self.current_step.id)
+                await self.cbpi.bus.fire("step/%s/started" % self.current_step.id, step=next_step)
             else:
                 await self.cbpi.bus.fire("step/brewing/finished")
         else:
@@ -132,6 +121,7 @@ class StepController(CRUDController):
 
             self.current_step.state = "D"
             await self.model.update_state(self.current_step.id, "D", int(time.time()))
+            await self.cbpi.bus.fire("step/%s/done" % self.current_step.id, step=self.current_step)
             self.current_step = None
 
         # start the next step
@@ -197,3 +187,10 @@ class StepController(CRUDController):
 
     async def get_state(self):
         return dict(items=await self.get_all(),types=self.types,is_running=self.is_running(),current_step=self.current_step)
+
+    @on_event(topic="step/action")
+    async def call_action(self, name, parameter, **kwargs) -> None:
+        print(name, parameter)
+        if self.current_step is not None:
+
+            self.current_step.instance.__getattribute__(name)(**parameter)
diff --git a/cbpi/controller/system_controller.py b/cbpi/controller/system_controller.py
index 7928eb3..767bcca 100644
--- a/cbpi/controller/system_controller.py
+++ b/cbpi/controller/system_controller.py
@@ -1,6 +1,7 @@
 import datetime
 import re
 
+import aiohttp
 from aiohttp import web
 import os
 from aiojobs.aiohttp import get_scheduler_from_app
@@ -15,7 +16,20 @@ class SystemController():
     def __init__(self, cbpi):
         self.cbpi = cbpi
         self.service = cbpi.actor
+
         self.cbpi.register(self, "/system")
+        self.cbpi.app.on_startup.append(self.check_for_update)
+
+
+    async def check_for_update(self, app):
+        timeout = aiohttp.ClientTimeout(total=1)
+        async with aiohttp.ClientSession(timeout=timeout) as session:
+            async with session.post('http://localhost:2202/check', json=dict(version=app["cbpi"].version)) as resp:
+                if (resp.status == 200):
+                    data = await resp.json()
+                    print(data)
+
+
 
     @request_mapping("/", method="GET", auth_required=False)
     async def state(self, request):
diff --git a/cbpi/craftbeerpi.py b/cbpi/craftbeerpi.py
index fb8c5b2..7361f2a 100644
--- a/cbpi/craftbeerpi.py
+++ b/cbpi/craftbeerpi.py
@@ -32,6 +32,7 @@ from cbpi.http_endpoints.http_sensor import SensorHttpEndpoints
 from cbpi.http_endpoints.http_step import StepHttpEndpoints
 from cbpi.controller.translation_controller import TranslationController
 from cbpi.http_endpoints.http_translation import TranslationHttpEndpoint
+from http_endpoints.http_plugin import PluginHttpEndpoints
 
 logger = logging.getLogger(__name__)
 
@@ -61,6 +62,8 @@ class CraftBeerPi():
 
     def __init__(self):
 
+        self.version = "4.0.0.1"
+
         self.static_config = load_config("./config/config.yaml")
         self.database_file = "./craftbeerpi.db"
         logger.info("Init CraftBeerPI")
@@ -68,6 +71,7 @@ class CraftBeerPi():
         policy = auth.SessionTktAuthentication(urandom(32), 60, include_ip=True)
         middlewares = [web.normalize_path_middleware(), session_middleware(EncryptedCookieStorage(urandom(32))), auth.auth_middleware(policy), error_middleware]
         self.app = web.Application(middlewares=middlewares)
+        self.app["cbpi"] = self
 
         self._setup_shutdownhook()
         self.initializer = []
@@ -94,7 +98,7 @@ class CraftBeerPi():
         self.http_kettle = KettleHttpEndpoints(self)
         self.http_dashboard = DashBoardHttpEndpoints(self)
         self.http_translation = TranslationHttpEndpoint(self)
-
+        self.http_plugin = PluginHttpEndpoints(self)
         self.notification = NotificationController(self)
         self.login = Login(self)
 
@@ -125,7 +129,7 @@ class CraftBeerPi():
         '''
         self.register_http_endpoints(obj, url_prefix, static)
         self.bus.register_object(obj)
-        #self.ws.register_object(obj)
+       #self.ws.register_object(obj)
         self.job.register_background_task(obj)
         self.register_on_startup(obj)
 
diff --git a/cbpi/extension/dummysensor/__init__.py b/cbpi/extension/dummysensor/__init__.py
index 5dfd20a..4ee82ab 100644
--- a/cbpi/extension/dummysensor/__init__.py
+++ b/cbpi/extension/dummysensor/__init__.py
@@ -82,7 +82,7 @@ class HTTPSensor(CBPiSensor):
 
             try:
                 value = cache.pop(self.key, None)
-                print("HTTP SENSOR READ", value)
+
                 if value is not None:
                     self.log_data(value)
                     await cbpi.bus.fire("sensor/%s/data" % self.id, value=value)
diff --git a/cbpi/extension/mqtt/__init__.py b/cbpi/extension/mqtt/__init__.py
new file mode 100644
index 0000000..e706d8f
--- /dev/null
+++ b/cbpi/extension/mqtt/__init__.py
@@ -0,0 +1,36 @@
+import json
+
+from cbpi.utils.encoder import ComplexEncoder
+from hbmqtt.mqtt.constants import QOS_0
+from hbmqtt.client import MQTTClient
+
+class CBPiMqttClient:
+
+    def __init__(self, cbpi):
+        self.cbpi = cbpi
+        self.cbpi.bus.register("#", self.listen)
+        self.client = None
+        self.cbpi.app.on_startup.append(self.init_client)
+
+
+    async def init_client(self, cbpi):
+
+        self.client = MQTTClient()
+        await self.client.connect('mqtt://localhost:1883')
+
+
+    async def listen(self, topic, **kwargs):
+        if self.client is not None:
+            print(topic, kwargs)
+            await self.client.publish(topic, str.encode(json.dumps(kwargs, cls=ComplexEncoder)), QOS_0)
+
+def setup(cbpi):
+    '''
+    This method is called by the server during startup
+    Here you need to register your plugins at the server
+
+    :param cbpi: the cbpi core
+    :return:
+    '''
+    print("MQTT REGISTER-------------")
+    c = CBPiMqttClient(cbpi)
\ No newline at end of file
diff --git a/cbpi/extension/mqtt/config.yaml b/cbpi/extension/mqtt/config.yaml
new file mode 100644
index 0000000..05eb064
--- /dev/null
+++ b/cbpi/extension/mqtt/config.yaml
@@ -0,0 +1,2 @@
+name: MQTT
+version: 4.1
\ No newline at end of file
diff --git a/cbpi/http_endpoints/http_actor.py b/cbpi/http_endpoints/http_actor.py
index fe6f9cd..25b9759 100644
--- a/cbpi/http_endpoints/http_actor.py
+++ b/cbpi/http_endpoints/http_actor.py
@@ -72,7 +72,7 @@ class ActorHttpEndpoints(HttpCrudEndpoints):
         - in: body
           name: body
           description: Created an actor
-          required: false
+          required: true
           schema:
             type: object
             properties:
diff --git a/cbpi/http_endpoints/http_login.py b/cbpi/http_endpoints/http_login.py
index 7be98cd..04de655 100644
--- a/cbpi/http_endpoints/http_login.py
+++ b/cbpi/http_endpoints/http_login.py
@@ -9,7 +9,6 @@ class Login():
     def __init__(self,cbpi):
         self.cbpi = cbpi
         self.cbpi.register(self, url_prefix="/")
-
         self.db = {cbpi.static_config.get("username", "cbpi"): cbpi.static_config.get("password", "cbpi")}
 
     @request_mapping(path="/logout", name="Logout", method="GET", auth_required=True)
diff --git a/cbpi/http_endpoints/http_plugin.py b/cbpi/http_endpoints/http_plugin.py
new file mode 100644
index 0000000..3d1c41c
--- /dev/null
+++ b/cbpi/http_endpoints/http_plugin.py
@@ -0,0 +1,86 @@
+from aiohttp import web
+from api import request_mapping
+from utils import json_dumps
+
+
+class PluginHttpEndpoints:
+
+    def __init__(self,cbpi):
+        self.cbpi = cbpi
+        self.cbpi.register(self, url_prefix="/plugin")
+
+    @request_mapping(path="/install/", method="POST", auth_required=False, json_schema={"package_name": str})
+    async def install(self, request):
+        """
+        ---
+        description: Install Plugin
+        tags:
+        - Plugin
+        parameters:
+        - in: body
+          name: body
+          description: Install a plugin
+          required: true
+          schema:
+            type: object
+            properties:
+              package_name:
+                type: string
+        produces:
+        - application/json
+        responses:
+            "204":
+                description: successful operation. Return "pong" text
+            "405":
+                description: invalid HTTP Method
+        """
+
+        data = await request.json()
+        return web.Response(status=204) if await self.cbpi.plugin.install(data["package_name"]) is True else web.Response(status=500)
+
+    @request_mapping(path="/uninstall", method="POST", auth_required=False, json_schema={"package_name": str})
+    async def uninstall(self, request):
+        """
+        ---
+        description: Uninstall Plugin
+        tags:
+        - Plugin
+        parameters:
+        - in: body
+          name: body
+          description: Uninstall a plugin
+          required: true
+          schema:
+            type: object
+            properties:
+              package_name:
+                type: string
+        produces:
+        - application/json
+        responses:
+            "204":
+                description: successful operation. Return "pong" text
+            "405":
+                description: invalid HTTP Method
+        """
+
+        data = await request.json()
+        return web.Response(status=204) if await self.cbpi.plugin.uninstall(data["package_name"]) is True else web.Response(status=500)
+
+
+    @request_mapping(path="/list", method="GET", auth_required=False)
+    async def list(self, request):
+        """
+            ---
+            description: Get a list of avialable plugins
+            tags:
+            - Plugin
+            produces:
+            - application/json
+            responses:
+                "200":
+                    description: successful operation. Return "pong" text
+                "405":
+                    description: invalid HTTP Method
+            """
+        return web.json_response(await self.cbpi.plugin.load_plugin_list(), dumps=json_dumps)
diff --git a/cbpi/http_endpoints/http_step.py b/cbpi/http_endpoints/http_step.py
index 194aa9d..84dcd4e 100644
--- a/cbpi/http_endpoints/http_step.py
+++ b/cbpi/http_endpoints/http_step.py
@@ -159,18 +159,35 @@ class StepHttpEndpoints(HttpCrudEndpoints):
         return web.Response(status=204)
 
 
-    @request_mapping(path="/action", auth_required=False)
+    @request_mapping(path="/action", method="POST", auth_required=False, json_schema={"action": str, "parameter": dict})
     async def http_action(self, request):
         """
-        ---
-        description: Call step action
-        tags:
-        - Step
-        responses:
-            "204":
-                description: successful operation
-        """
-        await self.cbpi.bus.fire("step/action", action="test")
+                ---
+                description: Call Step Action
+                tags:
+                - Step
+                parameters:
+                - in: body
+                  name: body
+                  description: Step Action
+                  required: true
+                  schema:
+                    type: object
+                    properties:
+                      action:
+                        type: string
+                      parameter:
+                        type: object
+                produces:
+                - application/json
+                responses:
+                    "204":
+                        description: successful operation
+                    "405":
+                        description: invalid HTTP Method
+                """
+        data = await request.json()
+        await self.cbpi.bus.fire("step/action", name=data["action"], parameter=data["parameter"])
         return web.Response(text="OK")
 
     @request_mapping(path="/start", auth_required=False)
diff --git a/cbpi/mqtt/__init__.py b/cbpi/mqtt/__init__.py
deleted file mode 100644
index e69de29..0000000
diff --git a/cbpi/mqtt/mqtt.py b/cbpi/mqtt/mqtt.py
deleted file mode 100644
index 303dc03..0000000
--- a/cbpi/mqtt/mqtt.py
+++ /dev/null
@@ -1,89 +0,0 @@
-from aiojobs.aiohttp import get_scheduler_from_app
-from cbpi.mqtt_matcher import MQTTMatcher
-from hbmqtt.broker import Broker
-from hbmqtt.client import MQTTClient
-from hbmqtt.mqtt.constants import QOS_1, QOS_0
-from typing import Callable
-
-
-class MQTT():
-    def __init__(self,cbpi):
-
-        self.config = {
-            'listeners': {
-                'default': {
-                    'type': 'tcp',
-                    'bind': '0.0.0.0:1885',
-                },
-                'ws': {
-                    'bind': '0.0.0.0:8081',
-                    'type': 'ws'
-                }
-            },
-            'sys_interval': 10,
-            'topic-check': {
-                'enabled': True,
-                'plugins': [
-                    'topic_taboo'
-                ]
-            },
-            'auth': {
-                'allow-anonymous': True,
-                'password-file': '/Users/manuelfritsch/github/aio_sample.cbpi/user.txt'
-            }
-        }
-
-        self.cbpi = cbpi
-        self.broker = Broker(self.config, plugin_namespace="hbmqtt.broker.plugins")
-        self.client = MQTTClient()
-        self.matcher = MQTTMatcher()
-        self.mqtt_methods = {"test": self.ok_msg, "$SYS/broker/#": self.sysmsg}
-        self.cbpi.app.on_startup.append(self.start_broker)
-        self.count = 0
-
-    def sysmsg(self, msg):
-
-        pass
-
-    def ok_msg(self, msg):
-        self.count = self.count + 1
-
-
-    def publish(self, topic, message):
-
-        self.cbpi.app.loop.create_task(self.client.publish(topic, str.encode(message), QOS_0))
-
-    def register_callback(self, func: Callable, topic) -> None:
-
-        self.mqtt_methods[topic] = func
-
-    async def on_message(self):
-        while True:
-
-            message = await self.client.deliver_message()
-            matched = False
-            packet = message.publish_packet
-
-            #print(message.topic.split('/'))
-            data = packet.payload.data.decode("utf-8")
-
-            for callback in self.matcher.iter_match(message.topic):
-
-                callback(data)
-                matched = True
-
-            if matched == False:
-                print("NO HANDLER", data)
-
-    async def start_broker(self, app):
-
-        await self.broker.start()
-        #
-        await self.client.connect('mqtt://username:manuel@localhost:1885')
-        # await self.client.connect('mqtt://broker.hivemq.com:1883')
-
-        for k, v in self.mqtt_methods.items():
-
-            await self.client.subscribe([(k, QOS_1)])
-            self.matcher[k] = v
-        await get_scheduler_from_app(app).spawn(self.on_message())
diff --git a/cbpi/mqtt/mqtt_matcher.py b/cbpi/mqtt/mqtt_matcher.py
deleted file mode 100644
index cf9637b..0000000
--- a/cbpi/mqtt/mqtt_matcher.py
+++ /dev/null
@@ -1,167 +0,0 @@
-class MQTTMatcher(object):
-
-
-    class Node(object):
-        __slots__ = '_children', '_content'
-
-        def __init__(self):
-            self._children = {}
-            self._content = None
-
-
-    def register(self, key, value):
-        node = self._root
-        for sym in key.split('/'):
-            node = node._children.setdefault(sym, self.Node())
-
-        if not isinstance(node._content, list):
-            node._content = []
-        node._content.append(value)
-
-    def get_callbacks(self, key):
-        try:
-            node = self._root
-            for sym in key.split('/'):
-                node = node._children[sym]
-            if node._content is None:
-                raise KeyError(key)
-            return node._content
-        except KeyError:
-            raise KeyError(key)
-
-    def unregister(self, key, method=None):
-
-        lst = []
-        try:
-            parent, node = None, self._root
-            for k in key.split('/'):
-                parent, node = node, node._children[k]
-                lst.append((parent, k, node))
-            # TODO
-
-            if method is not None:
-                node._content = None
-            else:
-                node._content = None
-        except KeyError:
-            raise KeyError(key)
-        else:  # cleanup
-            for parent, k, node in reversed(lst):
-                if node._children or node._content is not None:
-                    break
-                del parent._children[k]
-
-    def __init__(self):
-        self._root = self.Node()
-
-    def __setitem__(self, key, value):
-
-        node = self._root
-        for sym in key.split('/'):
-
-            node = node._children.setdefault(sym, self.Node())
-
-        if not isinstance(node._content, list):
-            #print("new array")
-            node._content = []
-        node._content.append(value)
-        #node._content = value
-
-    def __getitem__(self, key):
-        try:
-            node = self._root
-            for sym in key.split('/'):
-                node = node._children[sym]
-            if node._content is None:
-                raise KeyError(key)
-            return node._content
-        except KeyError:
-            raise KeyError(key)
-    '''
-    
-    def __delitem__(self, thekey):
-        print("DELETE")
-
-        if isinstance(thekey, tuple):
-            key = thekey[1]
-            methods = thekey[0]
-            print(methods.__module__, methods.__name__)
-        else:
-            methods = None
-            key = thekey
-
-        lst = []
-        try:
-            parent, node = None, self._root
-            for k in key.split('/'):
-                 parent, node = node, node._children[k]
-                 lst.append((parent, k, node))
-            # TODO
-            print(node._content)
-            if methods is not None:
-
-                node._content = None
-            else:
-                node._content = None
-        except KeyError:
-            raise KeyError(key)
-        else:  # cleanup
-            for parent, k, node in reversed(lst):
-                if node._children or node._content is not None:
-                     break
-                del parent._children[k]
-    '''
-    def iter_match(self, topic):
-
-        lst = topic.split('/')
-        normal = not topic.startswith('$')
-        def rec(node, i=0):
-            if i == len(lst):
-                if node._content is not None:
-                    yield node._content
-            else:
-                part = lst[i]
-                if part in node._children:
-                    for content in rec(node._children[part], i + 1):
-                        yield content
-                if '+' in node._children and (normal or i > 0):
-                    for content in rec(node._children['+'], i + 1):
-                        yield content
-            if '#' in node._children and (normal or i > 0):
-                content = node._children['#']._content
-                if content is not None:
-                    yield content
-        return rec(self._root)
-
-
-if __name__ == "__main__":
-    m = MQTTMatcher()
-
-    def test_name():
-        print("actor/1/on")
-
-    def test_name2():
-        print("actor/2/on")
-
-    def test_name3():
-        print("actor/#")
-
-    def test_name4():
-        print("actor/+/on")
-
-
-
-    m.register("actor/1/on", test_name)
-    m.register("actor/1/on", test_name)
-    m.register("actor/1/on", test_name)
-
-
-
-
-    m.unregister("actor/1/on")
-
-    for methods in  m.iter_match("actor/1/on"):
-
-        for f in methods:
-            f()
-
diff --git a/cbpi_cloud/default_broker.yaml b/cbpi_cloud/default_broker.yaml
new file mode 100644
index 0000000..c7d9dc7
--- /dev/null
+++ b/cbpi_cloud/default_broker.yaml
@@ -0,0 +1,14 @@
+listeners:
+  default:
+    type: tcp
+    bind: 0.0.0.0:1883
+sys_interval: 20
+auth:
+  allow-anonymous: true
+plugins:
+  - auth_file
+  - auth_anonymous
+topic-check:
+  enabled': True
+  plugins':
+    - topic_taboo
\ No newline at end of file
diff --git a/cbpi_cloud/repo/plugins.yaml b/cbpi_cloud/repo/plugins.yaml
new file mode 100644
index 0000000..17a2d68
--- /dev/null
+++ b/cbpi_cloud/repo/plugins.yaml
@@ -0,0 +1,13 @@
+SampleActor:
+  description: A sample Actor for CraftBeerPi
+  api: 4.0
+  author: CraftBeerPi11
+  pip: requests
+  repo_url: https://github.com/craftbeerpi/sample_actor
+
+SampleActor2:
+  description: A sample Actor2 for CraftBeerPi
+  api: 4.0
+  author: CraftBeerPi
+  pip: requests
+  repo_url: https://github.com/craftbeerpi/sample_actor
diff --git a/cbpi_cloud/run.py b/cbpi_cloud/run.py
new file mode 100644
index 0000000..1402795
--- /dev/null
+++ b/cbpi_cloud/run.py
@@ -0,0 +1,65 @@
+import yaml
+from aiohttp import web
+
+
+def load_yaml():
+    try:
+        with open('./repo/plugins.yaml', 'rt') as f:
+            data = yaml.load(f)
+        return data
+    except Exception as e:
+        print(e)
+        pass
+
+data = load_yaml()
+
+for k, v in data.items():
+    del v["pip"]
+data2 = load_yaml()
+
+
+async def check(request):
+    peername = request.transport.get_extra_info('peername')
+    if peername is not None:
+        host, port = peername
+        print(host, port)
+    data = await request.json()
+    print(data)
+    return web.json_response(data=dict(latestversion="4.0.0.3"))
+
+async def reload_yaml(request):
+    global data, data2
+
+    file = load_yaml()
+    for k, v in file.items():
+        del v["pip"]
+    data = file
+    data2 = load_yaml()
+
+    return web.json_response(data=data2)
+
+async def get_list(request):
+    print("Request List")
+    return web.json_response(data=data)
+
+async def get_package_name(request):
+    print("Request Package")
+    name = request.match_info.get('plugin_name', None)
+    if name in data2:
+        package_name = data2[name]["pip"]
+    else:
+        package_name = None
+    return web.json_response(data=dict(package_name=package_name))
+
+
+
+
+
+app = web.Application()
+app.add_routes([
+    web.get('/list', get_list),
+    web.post('/check', check),
+    web.get('/reload', reload_yaml),
+    web.get('/get/{plugin_name}', get_package_name)])
+
+web.run_app(app, port=2202)
diff --git a/config/plugin_list.txt b/config/plugin_list.txt
index 40ca454..3e70e1e 100644
--- a/config/plugin_list.txt
+++ b/config/plugin_list.txt
@@ -1,2 +1,13 @@
-cbpi-actor
-cbpi-ui
\ No newline at end of file
+SampleActor:
+  api: 4.0
+  author: CraftBeerPi11
+  description: A sample Actor for CraftBeerPi
+  repo_url: https://github.com/craftbeerpi/sample_actor
+SampleActor2:
+  api: 4.0
+  author: CraftBeerPi
+  description: A sample Actor2 for CraftBeerPi
+  repo_url: https://github.com/craftbeerpi/sample_actor
+requests:
+  installation_date: '2019-07-29 23:02:25'
+  version: '1.0'
diff --git a/craftbeerpi.db b/craftbeerpi.db
index e5d0de52791a0b920b68f972b3952f4281a42eb3..10d69b07e9fc1855c4616ae8c74a56d7aea5237c 100644
GIT binary patch
delta 446
zcmZozz}&Ead4e?KwTUv$jMp|MEaB&1;(x=y|DFHMW*&hD{7Rfm%nXvjiMa(isqBo*
z45A^a#U;GFa~ULg4lD6D@@MiHO%_m4=6=pUn|~|MVV-+Dvo_l(#PQ?;m1r_D$TKnN
zGZmMl7R2Xd7MC#kGpbiBl~fj_Dp@Hg<s=rRrz+J-25~SjGN^Je2|^Sm=jW9a<>xSb
zsIFBF21&_tpqPPVLUC?lPL5Kotk2|&nsSp*soPFY(hcC2X5eCEl;x06mQ@9c%TB(f
z>&U|A#UQ>}UQd9L@%&^1{j4N@i2$I{jIvA|qD)N1#o4JPB{`{#@AFD?awGyVWf;DK
zWEdD2BtRx3>j8<2`*SdG0>zm`5k{$R{-e(tzz@{I%<s;?f0)0O-<^NnW`Tywd~8e0
zV{Mj}PcH0`;s(k$F-mJX^0Tl^p3pBb*{?%ZXlYrjjSVw515lg+Xn-RF^W?@ZvB`S<
WQcN~XlX?1W85t*g^;<8R-~a&Ue|TR2

delta 451
zcmZozz}&Ead4e=!??f4A#@>wyOZYh$`M)#pf9HR^nMdFOze))M0|S?MNNRa;2|FV*
zgJ?)<aS1Q)Tn15IRz?0s{!Bh2KIzGP3d)?uJhvclvyDO=Pc9RqC{uQ7Nl8vB%Lenj
z(wrQgPYn8;oRUCsh%oahn6Ly$m<cM(_>YkVq#S64HYX!UIn)@Y`(X9FbAd8~j0~cj
zoPum1$5hwK`b@s4DL46)y6xm7-2iSc1};WMSq=$hSyiC8?BrXzjx3^z91NS~^#m9h
zXH7QH&q@M%Dvgs<7HE2LG0-_;b{q`Ij$l5;coF0XpfY=)BRDu<ju5j!Rmk{{X&zLe
z7|;L?Ceh;5yyE;KCezJ-^jQP=`CA#7`MDVQx%dzBd+;l77HGK4#}=RwYZIU`xv)cu
z6KFvbqcnpJ<K*^!TOMX^22N>B27U$xM~2CbU1F27`=wZbO6(?g_FMBXaWinB%PyMW
F005x7a!>#O

diff --git a/tests/test_step.py b/tests/test_step.py
index 6e73825..e2ccb9d 100644
--- a/tests/test_step.py
+++ b/tests/test_step.py
@@ -1,13 +1,10 @@
 import asyncio
-from unittest import mock
-
 from aiohttp.test_utils import AioHTTPTestCase, unittest_run_loop
 from cbpi.craftbeerpi import CraftBeerPi
 
 
 class StepTestCase(AioHTTPTestCase):
 
-
     async def get_application(self):
         self.cbpi = CraftBeerPi()
         await self.cbpi.init_serivces()
@@ -71,14 +68,11 @@ class StepTestCase(AioHTTPTestCase):
         if future in done:
             pass
 
-
-
     @unittest_run_loop
     async def test_process(self):
 
         step_ctlr = self.cbpi.step
 
-
         await step_ctlr.clear_all()
         await  step_ctlr.add(**{"name": "Kettle1", "type": "CustomStepCBPi", "config": {"name1": "1", "temp": 99}})
         await  step_ctlr.add(**{"name": "Kettle1", "type": "CustomStepCBPi", "config": {"name1": "1", "temp": 99}})
@@ -97,11 +91,9 @@ class StepTestCase(AioHTTPTestCase):
 
         await self.print_steps()
 
-
-
     async def print_steps(self):
 
         s = await self.cbpi.step.get_all()
         print(s)
         for k, v in s.items():
-            print(k, v.to_json())
\ No newline at end of file
+            print(k, v.to_json())