Merge pull request #53 from yeuai/dev-http-method

Dev http method

Author: drenvir

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "@yeuai/botscript",
-  "version": "1.6.0",
+  "version": "1.6.1",
   "description": "A text-based scripting language and bot engine for Conversational User Interfaces (CUI)",
   "main": "dist/engine",
   "scripts": {

package.json

@@ -122,10 +122,17 @@ export class Struct {
           struct.name = tokens[0];
           struct.options = ['GET', tokens[1]];
         } else if (tokens.length === 3) {
-          const action = /post/i.test(tokens[1]) ? 'post' : 'get';
+          const method = tokens[1];
           struct.name = tokens[0];
-          struct.options = [action, tokens[2]];
+          struct.options = [method, tokens[2]];
         } else {
+          // TODO: support new command definition
+          /**
+           * @ command_name
+           * - url: POST https://command-service.url/api/endpoint
+           * - header: 1
+           * - header: 2
+           */
           throw new Error('invalid command');
         }
         break;

src/engine/struct.ts

@@ -1,4 +1,4 @@
-import axios from 'axios';
+import axios, { Method } from 'axios';
 import { evalSync } from 'jexl';
 import { Struct, Request } from '../common';
 import { TestConditionalCallback, Types } from '../interfaces/types';
@@ -93,12 +93,12 @@ export function evaluate(expr: string, context: any) {
  */
 export function callHttpService(command: Struct, req: Request) {
   const vIsGetMethod = /^get$/i.test(command.options[0]);
+  const url = interpolate(command.options[1], req.variables);
+  const body = vIsGetMethod ? undefined : req.variables;
+  const method = command.options[0] as Method;
   const headers = command.body
     .filter(x => x.split(REGEX_HEADER_SEPARATOR).length === 2)
     .map(x => x.split(REGEX_HEADER_SEPARATOR).map(kv => kv.trim()));
-  const method = vIsGetMethod ? 'GET' : 'POST';
-  const url = interpolate(command.options[1], req.variables);
-  const body = vIsGetMethod ? undefined : req.variables;
 
   logger.info(`Send command request @${command.name}: ${method} ${url}${(method === 'POST' && body) ? ', body=' + JSON.stringify(body) : ''}`);
 

src/lib/utils.ts

@@ -0,0 +1,32 @@
+import { assert } from 'chai';
+import { BotScript, Request } from '../../src/engine';
+
+describe('Command: http method', () => {
+
+  it('should support put, delete method', async () => {
+    const bot = new BotScript();
+
+    bot.parse(`
+    @ service1 put /api/http/put
+
+    @ service2 delete /api/http/delete
+
+    + put me
+    * true @> service1
+    - Result $message
+
+    + delete me
+    * true @> service2
+    - Result $message2
+    `);
+    await bot.init();
+
+    const req = new Request();
+    let res = await bot.handleAsync(req.enter('put me'));
+    assert.match(res.speechResponse, /result ok/i, 'bot response with command executed');
+
+    res = await bot.handleAsync(req.enter('delete me'));
+    assert.match(res.speechResponse, /result ok/i, 'bot response with command executed');
+  });
+
+});

test/command/http-method.spec.ts

@@ -24,8 +24,8 @@ describe('Directive: /plugin', () => {
     await bot.init();
 
     it('should load directive /plugin', async () => {
-      console.log(bot.context.directives);
-      console.log(bot.context.plugins);
+      // console.log(bot.context.directives);
+      // console.log(bot.context.plugins);
       assert.isTrue(bot.context.directives.has('plugin:test'), 'contains directive /plugin');
     });
 

test/directives/plugin.spec.ts

@@ -16,6 +16,14 @@ mock
     intent: 'react_positive',
     entities: [{ id: 1, name: 'John Smith' }],
   })
+  .onPut('/api/http/put').reply(200, {
+    error: 0,
+    message: 'Ok',
+  })
+  .onDelete('/api/http/delete').reply(200, {
+    error: 0,
+    message2: 'Ok',
+  })
   .onGet('/api/data/list').reply(200, {
     people: [{
         name: 'Vũ',