feat: deploy heroku

Procfile

@@ -0,0 +1 @@
+web: ENGINE_SERVER_PORT=$PORT ./csml-server-linux-amd64

README.md

@@ -83,7 +83,7 @@ To get started with CSML Studio: https://studio.csml.dev
 
 CSML Studio gives you a free playground to experiment with the language as well as options to deploy your chatbots at scale in one-click.
 
-## Self-hosted / local installation
+## Self-hosted / cloud / local installation
 
 CSML is available as a self-hostable web server that you can easily install with one of the options below.
 
@@ -118,6 +118,12 @@ DISABLE_SSL_VERIFY=false
 DEBUG=true
 ```
 
+### Deploy on Heroku
+
+<a href="https://heroku.com/deploy?template=https://github.com/CSML-by-Clevy/csml-engine/tree/masters">
+  <img src="https://www.herokucdn.com/deploy/button.svg" alt="Deploy">
+</a>
+
 ### Using a ready-to-use binary (Linux and MacOS only)
 
 The easiest way to launch a CSML Engine on your own machine is to use one of our pre-built, optimized binaries (available for both MongoDB and Amazon DynamoDB). These binaries are available as executables on each of CSML's releases since v1.3.0.

app.json

@@ -0,0 +1,47 @@
+{
+    "name": "CSML application",
+    "description": "",
+    "repository": "https://github.com/CSML-by-Clevy/csml-engine/tree/feat/deploy-to-heroku",
+    "success_url": "/",
+    "keywords": ["rust", "csml"],
+    "website": "https://www.csml.dev/",
+    "env": {
+        "ENGINE_DB_TYPE": {
+            "value": "mongodb",
+            "required": true
+        },
+        "MONGODB_DATABASE": "csml",
+
+        "MONGODB_HOST": {
+            "value": "localhost",
+            "required": false
+        },
+        "MONGODB_PORT": {
+            "value": "27017",
+            "required": false
+        },
+        "MONGODB_DATABASE": {
+            "value": "csml",
+            "required": false
+        },
+        "MONGODB_USERNAME": {
+            "required": false
+        },
+        "MONGODB_PASSWORD": {
+            "required": false
+        },
+
+        "MONGODB_URI": {
+            "required": false
+        },
+
+        "ENCRYPTION_SECRET": {
+            "required": false
+        }
+    },
+    "buildpacks": [
+        {
+          "url": "https://github.com/CSML-by-Clevy/heroku-buildpack-csml"
+        }
+    ]
+}

csml_engine/CSML/flow.csml

@@ -5,14 +5,16 @@ fn add(var1, var2):
     return 56
 
 start:
-    say val
-    remember val = "42"
+    say "start"
+    if (!test) {
+        say "create test"
+        remember test = 1
+    } else {
+        do test = test + 1
+    }
 
-    remember toto = "tataaa"
-    hold
-
-    goto end
-    // goto toto
+    // goto end
+    goto @flow2
 
 toto:
     do vec = [1, 2]

csml_engine/CSML/flow2.csml

@@ -13,5 +13,12 @@ fn pow(var, exp):
 
 start:
   say "flow 2 -> {{test}}"
-  say Button("end", hola = "hola")
-  goto end
+//   say Button("end", hola = "hola")
+  goto toto
+
+toto:
+    hold
+    if (test < 2) {
+        previous flow
+    }
+    goto end

csml_engine/Cargo.toml

@@ -20,7 +20,7 @@ edition = "2018"
 
 [features]
 mongo = ["mongodb", "bson", "futures"]
-dynamo = ["rusoto_core", "rusoto_dynamodb", "rusoto_s3", "serde_dynamodb"]
+dynamo = ["rusoto_core", "rusoto_dynamodb", "rusoto_s3", "serde_dynamodb", "log", "env_logger"]
 
 [dependencies.mongodb]
 version = "1.2.1"
@@ -60,6 +60,16 @@ default_features = false
 features = ["rustls"]
 optional = true
 
+[dependencies.log]
+version = "0.4.0"
+default_features = false
+optional = true
+
+[dependencies.env_logger]
+version = "0.8.4"
+default_features = false
+optional = true
+
 [dependencies]
 csml_interpreter = { version = "1.6.3", path = "../csml_interpreter" }
 multimap = "0.8.2"
@@ -72,9 +82,9 @@ serde_json = "1.0.64"
 openssl = { version = "0.10.31", features = ["vendored"] }
 base64 = "0.13.0"
 hex = "0.4.2"
-curl = { version = "0.4.34", default-features = false, features = ["mesalink"] }
 tokio = "1.4.0"
 
+curl = { version = "0.4.34", default-features = false, features = ["mesalink"] }
 bincode = "1.3.1"
 
 [[example]]

csml_engine/src/data.rs

@@ -7,6 +7,12 @@ use serde_json::Value;
 pub const DEBUG: &str = "DEBUG";
 pub const DISABLE_SSL_VERIFY: &str = "DISABLE_SSL_VERIFY";
 
+#[derive(Debug, Serialize, Deserialize, Clone)]
+pub struct FlowTrigger {
+    pub flow_id: String,
+    pub step_id: Option<String>
+}
+
 #[derive(Debug, Serialize, Deserialize, Clone)]
 pub struct RunRequest {
     pub bot: Option<CsmlBot>,

csml_engine/src/db_connectors/dynamodb/bot.rs

@@ -90,7 +90,12 @@ fn query_bot_version(
     };
 
     let query = db.client.query(input);
-    let data = db.runtime.block_on(query)?;
+    let data = match db.runtime.block_on(query) {
+        Ok(data) => data,
+        Err(e) => {
+            return Err(EngineError::Manager(format!("query_bot_version {:?}", e)))
+        }
+    };
 
     Ok(data)
 }
@@ -252,7 +257,12 @@ pub fn get_last_bot_version(
     };
 
     let query = db.client.query(input);
-    let data = db.runtime.block_on(query)?;
+    let data = match db.runtime.block_on(query) {
+        Ok(data) => data,
+        Err(e) => {
+            return Err(EngineError::Manager(format!("get_last_bot_version {:?}", e)))
+        }
+    };
 
     // The query returns an array of items (max 1, based on the limit param above).
     // If 0 item is returned it means that there is no open conversation, so simply return None
@@ -417,7 +427,12 @@ fn query_bot_info(
     };
 
     let future = db.client.query(input);
-    let data = db.runtime.block_on(future)?;
+    let data = match db.runtime.block_on(future) {
+        Ok(data) => data,
+        Err(e) => {
+            return Err(EngineError::Manager(format!("query_bot_info {:?}", e)))
+        }
+    };
 
     Ok(data)
 }

csml_engine/src/db_connectors/dynamodb/conversations.rs

@@ -26,6 +26,7 @@ pub fn create_conversation(
     let future = client.put_item(input);
 
     db.runtime.block_on(future)?;
+
     Ok(data.id.to_owned())
 }
 
@@ -176,7 +177,12 @@ fn get_all_open_conversations(
     };
 
     let query = db.client.query(input);
-    let data = db.runtime.block_on(query)?;
+    let data = match db.runtime.block_on(query) {
+        Ok(data) => data,
+        Err(e) => {
+            return Err(EngineError::Manager(format!("get_all_open_conversations {:?}", e)))
+        }
+    };
 
     let keys = match data.items {
         Some(items) => items
@@ -259,7 +265,13 @@ pub fn get_latest_open(
     };
 
     let query = db.client.query(input);
-    let data = db.runtime.block_on(query)?;
+    let data = match db.runtime.block_on(query) {
+        Ok(data) => data,
+        Err(e) => {
+            return Err(EngineError::Manager(format!("get_latest_open {:?}", e)))
+        }
+    };
+
 
     // The query returns an array of items (max 1, based on the limit param above).
     // If 0 item is returned it means that there is no open conversation, so simply return None
@@ -295,7 +307,7 @@ pub fn update_conversation(
 
     // make sure that if the item does not already exist, it is NOT created automatically
     let condition_expr = "#hashKey = :hashVal AND #rangeKey = :rangeVal".to_string();
-    let expr_attr_names = [
+    let expr_attr_names: HashMap<String, String> = [
         ("#hashKey".to_string(), "hash".to_string()),
         ("#rangeKey".to_string(), "range".to_string()),
     ]
@@ -369,9 +381,12 @@ pub fn update_conversation(
     };
 
     let future = db.client.update_item(input);
-    db.runtime.block_on(future)?;
-
-    Ok(())
+    match db.runtime.block_on(future) {
+        Ok(_) => Ok(()),
+        Err(e) => {
+            return Err(EngineError::Manager(format!("update_conversation {:?}", e)))
+        }
+    }
 }
 
 
@@ -421,7 +436,12 @@ fn query_conversation(
     };
 
     let future = db.client.query(input);
-    let data = db.runtime.block_on(future)?;
+    let data = match db.runtime.block_on(future) {
+        Ok(data) => data,
+        Err(e) => {
+            return Err(EngineError::Manager(format!("query_conversation {:?}", e)))
+        }
+    };
 
     Ok(data)
 }
@@ -519,7 +539,7 @@ pub fn get_client_conversations(
     .collect();
 
     let data = query_conversation(
-        client, 
+        client,
         db,
         limit,
         pagination_key,

csml_engine/src/db_connectors/dynamodb/interactions.rs

@@ -54,7 +54,12 @@ pub fn init_interaction(
     };
 
     let future = db.client.put_item(input);
-    db.runtime.block_on(future)?;
+    match db.runtime.block_on(future) {
+        Ok(_) => {},
+        Err(e) => {
+            return Err(EngineError::Manager(format!("init_interaction {:?}", e)))
+        }
+    };
 
     Ok(id.to_string())
 }
@@ -126,7 +131,12 @@ pub fn update_interaction(
     };
 
     let future = db.client.update_item(input);
-    db.runtime.block_on(future)?;
+    match db.runtime.block_on(future) {
+        Ok(_) => (),
+        Err(e) => {
+            return Err(EngineError::Manager(format!("update_interaction {:?}", e)))
+        }
+    };
 
     Ok(())
 }
@@ -176,7 +186,12 @@ fn query_interactions(
     };
 
     let future = db.client.query(input);
-    let data = db.runtime.block_on(future)?;
+    let data = match db.runtime.block_on(future) {
+        Ok(data) => data,
+        Err(e) => {
+            return Err(EngineError::Manager(format!("query_interactions {:?}", e)))
+        }
+    };
 
     Ok(data)
 }

csml_engine/src/db_connectors/dynamodb/memories.rs

@@ -123,7 +123,12 @@ fn query_memories(
     };
 
     let future = db.client.query(input);
-    let data = db.runtime.block_on(future)?;
+    let data = match db.runtime.block_on(future) {
+        Ok(data) => data,
+        Err(e) => {
+            return Err(EngineError::Manager(format!("query_memories {:?}", e)))
+        }
+    };
 
     Ok(data)
 }

csml_engine/src/db_connectors/dynamodb/messages.rs

@@ -130,7 +130,12 @@ fn query_messages(
     };
 
     let future = db.client.query(input);
-    let data = db.runtime.block_on(future)?;
+    let data = match db.runtime.block_on(future) {
+        Ok(data) => data,
+        Err(e) => {
+            return Err(EngineError::Manager(format!("query_messages {:?}", e)))
+        }
+    };
 
     Ok(data)
 }

csml_engine/src/db_connectors/dynamodb/nodes.rs

@@ -61,7 +61,12 @@ pub fn create_node(
 
     let db = get_db(&mut data.db)?;
     let future = db.client.put_item(input);
-    db.runtime.block_on(future)?;
+    match db.runtime.block_on(future) {
+        Ok(_) => (),
+        Err(e) => {
+            return Err(EngineError::Manager(format!("create_node {:?}", e)))
+        }
+    };
 
     Ok(())
 }
@@ -111,7 +116,12 @@ fn query_nodes(
     };
 
     let future = db.client.query(input);
-    let data = db.runtime.block_on(future)?;
+    let data = match db.runtime.block_on(future) {
+        Ok(data) => data,
+        Err(e) => {
+            return Err(EngineError::Manager(format!("query_nodes {:?}", e)))
+        }
+    };
 
     Ok(data)
 }