Added webhook pre-script functionality

samtecspg · May 28, 2020 · 12d6e1b · 12d6e1b
1 parent b7a4318
commit 12d6e1b
Show file tree

Hide file tree

Showing 10 changed files with 103 additions and 3 deletions.
diff --git a/api/lib/models/webhook.model.js b/api/lib/models/webhook.model.js
@@ -23,6 +23,7 @@ class WebhookModel {
             webhookUser: Joi.string().allow(''),
             webhookPassword: Joi.string().allow(''),
             postScript: Joi.string().trim().allow(''),
+            preScript: Joi.string().trim().allow(''),
             creationDate: Joi
                 .string(),
             modificationDate: Joi

diff --git a/api/lib/services/agent/agent.converse-generate-response-fallback.service.js b/api/lib/services/agent/agent.converse-generate-response-fallback.service.js
@@ -39,6 +39,21 @@ module.exports = async function ({ CSO }) {
             ];
             webhook = await globalService.findInModelPath({ modelPath, isFindById: false, isSingleResult: true, skip: 0, limit: -1 });
         }
+        if (webhook.preScript) {
+            const vm = new VM({
+                timeout: 1000,
+                sandbox: {
+                    CSO
+                }
+            });
+
+            const script = new VMScript(webhook.preScript);
+            try {
+                CSO = vm.run(script);
+            } catch (err) {
+                console.error(`Failed to execute preScript of the webhook ${webhook.webhookKey}`, err);
+            }
+        }
         const webhookResponse = await agentService.converseCallWebhook({
             url: webhook.webhookUrl,
             templatePayload: webhook.webhookPayload,

diff --git a/api/lib/services/agent/agent.converse-generate-response-welcome.service.js b/api/lib/services/agent/agent.converse-generate-response-welcome.service.js
@@ -39,6 +39,21 @@ module.exports = async function ({ CSO }) {
             ];
             webhook = await globalService.findInModelPath({ modelPath, isFindById: false, isSingleResult: true, skip: 0, limit: -1 });
         }
+        if (webhook.preScript) {
+            const vm = new VM({
+                timeout: 1000,
+                sandbox: {
+                    CSO
+                }
+            });
+
+            const script = new VMScript(webhook.preScript);
+            try {
+                CSO = vm.run(script);
+            } catch (err) {
+                console.error(`Failed to execute preScript of the webhook ${webhook.webhookKey}`, err);
+            }
+        }
         const webhookResponse = await agentService.converseCallWebhook({
             url: webhook.webhookUrl,
             templatePayload: webhook.webhookPayload,

diff --git a/api/lib/services/agent/agent.converse-generate-response.service.js b/api/lib/services/agent/agent.converse-generate-response.service.js
@@ -96,6 +96,21 @@ module.exports = async function ({ actionData, CSO }) {
             ];
             webhook = await globalService.findInModelPath({ modelPath, isFindById: false, isSingleResult: true });
         }
+        if (webhook.preScript) {
+            const vm = new VM({
+                timeout: 1000,
+                sandbox: {
+                    CSO
+                }
+            });
+
+            const script = new VMScript(webhook.preScript);
+            try {
+                CSO = vm.run(script);
+            } catch (err) {
+                console.error(`Failed to execute preScript of the webhook ${webhook.webhookKey}`, err);
+            }
+        }
         const webhookResponse = await agentService.converseCallWebhook({
             url: webhook.webhookUrl,
             templatePayload: webhook.webhookPayload,

diff --git a/api/lib/services/agent/agent.test.train.service.js b/api/lib/services/agent/agent.test.train.service.js
@@ -84,6 +84,9 @@ const upsertResultAction = function (result, sayingAction, recognizedAction, say
         condition = 'good';
     }
 
+    if (recognizedAction.indexOf('+__+') !== -1 || sayingAction.indexOf('+__+') !== -1) {
+        const a = 1;
+    }
     let actionIndex = result.actions.findIndex(action => { return action.actionName === sayingAction })
     if (actionIndex === -1) {
         result.actions.push({
@@ -117,7 +120,7 @@ const upsertResultKeywords = function (result, sayingKeywords, recognizedKeyword
                     recognizedKeyword.keyword == sayingKeyword.keyword
             });
         let condition = 'bad';
-        if (recognizedKeywordsIndex !== -1) {
+        if (recognizedKeywordsIndex !== -1 && recognizedKeywords.length !== 0) {
             condition = 'good';
         } else {
             errorPresent = true;

diff --git a/api/lib/validators/agent.validator.js b/api/lib/validators/agent.validator.js
@@ -352,7 +352,8 @@ class AgentValidate {
                     }),
                     webhookUser: WebhookSchema.webhookUser,
                     webhookPassword: WebhookSchema.webhookPassword,
-                    postScript: WebhookSchema.postScript
+                    postScript: WebhookSchema.postScript,
+                    preScript: WebhookSchema.preScript
                 };
             })()
         };
@@ -379,6 +380,7 @@ class AgentValidate {
                     webhookUser: WebhookSchema.webhookUser,
                     webhookPassword: WebhookSchema.webhookPassword,
                     postScript: WebhookSchema.postScript,
+                    preScript: WebhookSchema.preScript,
                     creationDate: WebhookSchema.creationDate,
                     modificationDate: WebhookSchema.modificationDate
                 };
@@ -407,7 +409,8 @@ class AgentValidate {
                     }),
                     webhookUser: WebhookSchema.webhookUser,
                     webhookPassword: WebhookSchema.webhookPassword,
-                    postScript: WebhookSchema.postScript
+                    postScript: WebhookSchema.postScript,
+                    preScript: WebhookSchema.preScript
                 };
             })()
         };
@@ -435,6 +438,7 @@ class AgentValidate {
                     webhookUser: WebhookSchema.webhookUser,
                     webhookPassword: WebhookSchema.webhookPassword,
                     postScript: WebhookSchema.postScript,
+                    preScript: WebhookSchema.preScript,
                     creationDate: WebhookSchema.creationDate,
                     modificationDate: WebhookSchema.modificationDate
                 };
@@ -973,6 +977,7 @@ class AgentValidate {
                             webhookUser: WebhookSchema.webhookUser,
                             webhookPassword: WebhookSchema.webhookPassword,
                             postScript: WebhookSchema.postScript,
+                            preScript: WebhookSchema.preScript,
                             creationDate: WebhookSchema.creationDate,
                             modificationDate: WebhookSchema.modificationDate
                         },
@@ -1059,6 +1064,7 @@ class AgentValidate {
                                 webhookUser: WebhookSchema.webhookUser,
                                 webhookPassword: WebhookSchema.webhookPassword,
                                 postScript: WebhookSchema.postScript,
+                                preScript: WebhookSchema.preScript,
                                 creationDate: ActionSchema.creationDate,
                                 modificationDate: ActionSchema.modificationDate
                             },

diff --git a/api/server/plugins/redis/models/webhook.redis-model.js b/api/server/plugins/redis/models/webhook.redis-model.js
@@ -29,6 +29,9 @@ const schema = {
     postScript: {
         type: 'string'
     },
+    preScript: {
+        type: 'string'
+    },
     creationDate: {
         type: 'timestamp'
     },

diff --git a/ui/app/components/WebhookSettings/index.js b/ui/app/components/WebhookSettings/index.js
@@ -381,6 +381,42 @@ export class WebhookSettings extends React.Component {
             ]
             : null}
         </Grid>
+        <Grid key="grid-editor-prescript" item xs={12}>
+          <Grid className={classes.bodyTitleContainer} item xs={12}>
+            <Typography variant="h2">
+              <FormattedMessage {...messages.preScript} />
+            </Typography>
+          </Grid>
+          <AceEditor
+            key="preScript"
+            width="100%"
+            height="300px"
+            mode={'javascript'}
+            theme="terminal"
+            name="preScript"
+            readOnly={isReadOnly}
+            onLoad={this.onLoad}
+            onChange={this.props.onChangeWebhookData.bind(null, 'preScript')}
+            fontSize={14}
+            showPrintMargin
+            showGutter
+            highlightActiveLine
+            value={webhook.preScript}
+            editorProps={{
+              $blockScrolling: Infinity,
+            }}
+            setOptions={{
+              useWorker: false,
+              showLineNumbers: true,
+              tabSize: 2,
+            }}
+          />
+          {this.props.errorState.postScript ? (
+            <Typography key="preScriptError" variant="caption" className={classes.errorLabel}>
+              <FormattedMessage {...messages.preScriptError} />
+            </Typography>
+          ) : null}
+        </Grid>
         <Grid key="grid-editor-postscript" item xs={12}>
           <Grid className={classes.bodyTitleContainer} item xs={12}>
             <Typography variant="h2">

diff --git a/ui/app/components/WebhookSettings/messages.js b/ui/app/components/WebhookSettings/messages.js
@@ -103,4 +103,8 @@ export default defineMessages({
     id: 'app.components.WebhookSettings.postScript',
     defaultMessage: 'Postscript',
   },
+  preScript: {
+    id: 'app.components.WebhookSettings.preScript',
+    defaultMessage: 'Prescript',
+  },
 });
diff --git a/ui/app/containers/App/reducer.js b/ui/app/containers/App/reducer.js
@@ -586,6 +586,7 @@ const initialState = Immutable({
     webhookPayloadType: 'None',
     webhookPayload: '',
     postScript: '',
+    preScript: '',
     webhookHeaders: [],
     webhookUser: '',
     webhookPassword: '',
@@ -660,6 +661,7 @@ const initialState = Immutable({
     webhookPayloadType: 'None',
     webhookPayload: '',
     postScript: '',
+    preScript: '',
     webhookHeaders: [],
     webhookUser: '',
     webhookPassword: '',