fix(whatsapp.gblib): Enabling Whatsapp.

package.json

@@ -101,7 +101,7 @@
     "simple-git": "1.113.0",
     "sqlite3": "4.0.8",
     "strict-password-generator": "1.1.2",
-    "swagger-client": "3.8.25",
+    "swagger-client": "^2.1.18",
     "tedious": "6.1.1",
     "temperature-js": "0.1.0",
     "ts-node": "8.1.0",

packages/admin.gbapp/dialogs/AdminDialog.ts

@@ -36,6 +36,7 @@
 
 'use strict';
 
+var crypto = require('crypto')
 import { WaterfallDialog } from 'botbuilder-dialogs';
 import { GBMinInstance, IGBDialog } from 'botlib';
 import urlJoin = require('url-join');
@@ -205,11 +206,11 @@ export class AdminDialog extends IGBDialog {
 
           const url = `https://login.microsoftonline.com/${
             min.instance.authenticatorTenant
-          }/oauth2/authorize?client_id=${min.instance.authenticatorClientId}&response_type=code&redirect_uri=${urlJoin(
-            min.instance.botEndpoint,
-            min.instance.botId,
-            '/token'
-          )}&state=${state}&response_mode=query`;
+            }/oauth2/authorize?client_id=${min.instance.authenticatorClientId}&response_type=code&redirect_uri=${urlJoin(
+              min.instance.botEndpoint,
+              min.instance.botId,
+              '/token'
+            )}&state=${state}&response_mode=query`;
 
           await step.context.sendActivity(Messages[locale].consent(url));
 

packages/core.gbapp/services/GBAPIService.ts

@@ -35,6 +35,7 @@
 import { TurnContext } from 'botbuilder';
 import { WaterfallStepContext } from 'botbuilder-dialogs';
 import { GBLog, GBMinInstance } from 'botlib';
+import * as crypto from 'crypto';
 import * as request from 'request-promise-native';
 import urlJoin = require('url-join');
 import { GBAdminService } from '../../admin.gbapp/services/GBAdminService';
@@ -104,7 +105,7 @@ class SysClass {
   public async httpGet(url: string, qs) {
 
     const options = {
-        uri: urlJoin(url , qs)
+      uri: urlJoin(url, qs)
     };
 
     return request.get(options);
@@ -132,7 +133,10 @@ export class DialogClass {
   }
 
   public async hear(cb) {
-    const idCallback = crypto.getRandomValues(new Uint32Array(16))[0];
+    function random(low, high) {
+      return Math.random() * (high - low) + low
+    }
+    const idCallback = random(0, 120000000);E
     this.min.cbMap[idCallback] = cb;
     await this.step.beginDialog('/hear', { id: idCallback });
   }

packages/core.gbapp/services/GBDeployer.ts

@@ -242,7 +242,7 @@ export class GBDeployer {
       case '.gbdialog':
         const vm = new GBVMService();
 
-        return vm.loadDialogPackage(localPath, min, this.core, this);
+        await vm.loadDialogPackage(localPath, min, this.core, this);
 
       default:
         const err = GBError.create(`Unhandled package type: ${packageType}.`);
@@ -375,6 +375,8 @@ export class GBDeployer {
         // Already Handled
       } else if (Path.extname(filename) === '.gbdialog') {
         // Already Handled
+      } else if (Path.extname(filename) === '.gbignore') {
+        // Ignored
       } else {
         // Unknown package format.
         const err = new Error(`Package type not handled: ${filename}.`);

packages/core.gbapp/services/GBMinService.ts

@@ -141,7 +141,7 @@ export class GBMinService {
 
         // Install default VBA module.
 
-        // DISABLED: deployer.deployPackage(min, 'packages/default.gbdialog');
+        deployer.deployPackage(min, 'packages/default.gbdialog');
 
         // Call the loadBot context.activity for all packages.
 
@@ -336,6 +336,7 @@ export class GBMinService {
     min.instance = await this.core.loadInstance(min.botId);
     min.cbMap = {};
     min.scriptMap = {};
+    min.sandBoxMap = {};
     min.userProfile = conversationState.createProperty('userProfile');
     const dialogState = conversationState.createProperty('dialogState');
 
@@ -396,7 +397,7 @@ export class GBMinService {
     await adapter.processActivity(req, res, async context => {
       // Get loaded user state
       const step = await min.dialogs.createContext(context);
-      step.context.activity.locale = 'en-US';
+      step.context.activity.locale = 'pt-BR';
 
       try {
         const user = await min.userProfile.get(context, {});

packages/core.gbapp/services/GBVMService.ts

@@ -163,9 +163,9 @@ export class GBVMService extends GBService {
       let parsedCode = code;
       const hearExp = /(\w+).*hear.*\(\)/;
 
-      let match1 = hearExp.exec(code);
+      let match1;
 
-      while (match1 !== undefined) {
+      while ((match1 = hearExp.exec(code))) {
         let pos = 0;
 
         // Writes async body.
@@ -185,9 +185,8 @@ export class GBVMService extends GBService {
 
         let right = 0;
         let left = 1;
-        let match2 = /\{|\}/.exec(tempCode);
-
-        while (match2 !== undefined) {
+        let match2;
+        while ((match2 = /\{|\}/.exec(tempCode))) {
           const c = tempCode.substring(match2.index, match2.index + 1);
 
           if (c === '}') {
@@ -202,7 +201,6 @@ export class GBVMService extends GBService {
           if (left === right) {
             break;
           }
-          match1 = hearExp.exec(code);
         }
 
         parsedCode += code.substring(start + match1[0].length + 1, pos + match1[0].length);
@@ -212,19 +210,19 @@ export class GBVMService extends GBService {
         // A interaction will be made for each hear.
 
         code = parsedCode;
-        match2 = /\{|\}/.exec(tempCode);
       }
 
       parsedCode = this.handleThisAndAwait(parsedCode);
 
-      parsedCode = beautify(parsedCode, { indent_size: 2, space_in_empty_paren: true });
+      parsedCode = beautify(parsedCode, { indent_size: 2, space_in_empty_paren: true })
       fs.writeFileSync(jsfile, parsedCode);
 
       const sandbox: DialogClass = new DialogClass(min, deployer);
       const context = vm.createContext(sandbox);
       vm.runInContext(parsedCode, context);
       min.sandBoxMap[mainName] = sandbox;
       GBLog.info(`[GBVMService] Finished loading of ${filename}`);
+
     }
   }
 
@@ -259,9 +257,6 @@ export class GBVMService extends GBService {
           return await step.prompt('textPrompt', {});
         },
         async step => {
-          min.sandbox.context = step.context;
-          min.sandbox.step = step;
-
           const cbId = step.activeDialog.state.cbId;
           const cb = min.cbMap[cbId];
           cb.bind({ step: step, context: step.context });

packages/whatsapp.gblib/index.ts

@@ -58,7 +58,7 @@ export class GBWhatsappPackage implements IGBPackage {
         min.instance.whatsappServiceKey,
         min.instance.whatsappServiceNumber,
         min.instance.whatsappServiceUrl,
-        min.instance.whatsappServiceWebhookUrl
+        min.instance.botId
       );
     }
   }

packages/whatsapp.gblib/services/WhatsappDirectLine.ts

@@ -12,7 +12,6 @@ import { GBServer } from '../../../src/app';
 export class WhatsappDirectLine extends GBService {
   public pollInterval = 1000;
   public directLineClientName = 'DirectLineClient';
-  public directLineSpecUrl = 'https://docs.botframework.com/en-us/restapi/directline3/swagger.json';
 
   public directLineClient: any;
   public whatsappServiceKey: string;
@@ -39,15 +38,16 @@ export class WhatsappDirectLine extends GBService {
     this.whatsappServiceNumber = whatsappServiceNumber;
     this.whatsappServiceUrl = whatsappServiceUrl;
     this.whatsappServiceWebhookUrl = whatsappServiceWebhookUrl;
+    var fs = require('fs')
 
-    this.directLineClient = rp(this.directLineSpecUrl)
-      .then(spec => {
-        return new Swagger({
-          spec: JSON.parse(spec.trim()),
-          usePromise: true
-        });
-      })
+    this.directLineClient =
+      new Swagger({
+        spec: JSON.parse(fs.readFileSync('directline-3.0.json', 'utf8')),
+        usePromise: true
+      });
+    this.directLineClient
       .then(async client => {
+
         client.clientAuthorizations.add(
           'AuthorizationBotConnector',
           new Swagger.ApiKeyAuthorization('Authorization', `Bearer ${directLineSecret}`, 'header')
@@ -72,11 +72,6 @@ export class WhatsappDirectLine extends GBService {
         } catch (error) {
           GBLog.error(`Error initializing 3rd party Whatsapp provider(1) ${error}`);
         }
-
-        return client;
-      })
-      .catch(err => {
-        GBLog.error(`Error initializing 3rd party Whatsapp provider(2) ${err}`);
       });
   }
 
@@ -158,7 +153,7 @@ export class WhatsappDirectLine extends GBService {
     if (activities && activities.length) {
       // Ignore own messages.
 
-      activities = activities.filter(m => m.from.id === 'GeneralBots' && m.type === 'message');
+      activities = activities.filter(m => m.from.id === this.botId && m.type === 'message');
 
       if (activities.length) {
         // Print other messages.
@@ -215,5 +210,12 @@ export class WhatsappDirectLine extends GBService {
         'cache-control': 'no-cache'
       }
     };
+
+    try {
+      const result = request.post(options);
+      GBLog.info(result);
+    } catch (error) {
+      GBLog.error(`Error sending message to Whatsapp provider ${error}`);
+    }
   }
 }

tsconfig.json

@@ -12,19 +12,30 @@
     "resolveJsonModule": true,
     "outDir": "./dist",
     "paths": {
-      "*": ["types/*"],
-      "botlib/*": ["node_modules/botlib/*"],
-      "pragmatismo-io-framework/*": ["node_modules/pragmatismo-io-framework/*"]
+      "*": [
+        "types/*"
+      ],
+      "botlib/*": [
+        "node_modules/botlib/*"
+      ],
+      "pragmatismo-io-framework/*": [
+        "node_modules/pragmatismo-io-framework/*"
+      ]
     },
     "sourceMap": true,
     "target": "es6",
-    "typeRoots": ["node_modules/@types"]
+    "typeRoots": [
+      "node_modules/@types"
+    ]
   },
   "include": [
     "test/**/*",
     "src/**/*",
     "packages/*.gbapp/**/*",
     "packages/*.gblib/**/*"
   ],
-  "exclude": ["dist", "node_modules"]
-}
+  "exclude": [
+    "dist",
+    "node_modules"
+  ]
+}