GeneralBots/botserver
2
1
Fork 0
Code Issues Pull requests 1 Projects Releases 323 Packages Wiki Activity Actions

feat(gbdialog): The first VBA code is run.

Browse source
This commit is contained in:
Rodrigo Rodriguez (pragmatismo.io) 2018-11-30 17:30:48 -02:00
parent 9379dec1b0
commit f0a0cd36be
6 changed files with 118 additions and 60 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
packages/core.gbapp/services/GBAPIService.ts
View file

@ -47,14 +47,15 @@ export class DialogClass {
this.min = min;
}
public async hear(text: string): Promise<any> {
// await this.context.beginDialog('textPrompt', text);
public hear(text: string) {
// TODO: await this.context.beginDialog('textPrompt', text);
}
public talk(text: string) {
this.context.sendActivity(text);
}
/**
* Generic function to call any REST API.
*/
@ -66,5 +67,7 @@ export class DialogClass {
/**
* Generic function to call any REST API.
*/
public post(url: string, data) {}
public post(url: string, data) {
}
}

3
packages/core.gbapp/services/GBMinService.ts
View file

@ -484,7 +484,8 @@ export class GBMinService {
// Checks for /admin request.
if (context.activity.text === 'vba') {
min.sandbox.context = context;
min.sandbox['chat'](min.sandbox);
min.sandbox['bot'].bind(min.sandbox);
min.sandbox['bot']();
} else if (context.activity.text === 'admin') {
await step.beginDialog('/admin');

40
packages/core.gbapp/services/GBVMService.ts
View file

@ -36,10 +36,12 @@ import { GBMinInstance, IGBCoreService } from 'botlib';
import * as fs from 'fs';
import { DialogClass } from './GBAPIService';
import { GBDeployer } from './GBDeployer';
import { TSCompiler } from './TSCompiler';
const util = require('util');
const logger = require('../../../src/logger');
const vm = require('vm');
const UrlJoin = require('url-join');
const vb2ts = require('vbscript-to-typescript/dist/converter');
/**
* @fileoverview Virtualization services for emulation of BASIC.
@ -55,16 +57,38 @@ export class GBVMService implements IGBCoreService {
deployer: GBDeployer,
localPath: string
): Promise<void> {
const path = 'packages/default.gbdialog';
const file = 'bot.vbs';
const source = UrlJoin(path, file);
localPath = UrlJoin(localPath, 'bot.vbs.js');
const code: string = fs.readFileSync(localPath, 'utf8');
const sandbox: DialogClass = new DialogClass(min);
const context = vm.createContext(sandbox);
vm.runInContext(code, context);
// Example when handled through fs.watch() listener
fs.watchFile(source, async (curr, prev) => {
await this.run(source, path, localPath, min, deployer, filename);
});
await this.run(source, path, localPath, min, deployer, filename);
}
await deployer.deployScriptToStorage(min.instanceId, filename);
logger.info(`[GBVMService] Finished loading of ${filename}`);
private async run(source: any, path: string, localPath: string, min: any, deployer: GBDeployer, filename: string) {
// Converts VBS into TS.
min.sandbox = sandbox;
vb2ts.convertFile(source);
// Convert TS into JS.
const tsfile = `bot.ts`;
const tsc = new TSCompiler();
tsc.compile([UrlJoin(path, tsfile)]);
// Run JS into the GB context.
const jsfile = `bot.js`;
localPath = UrlJoin(path, jsfile);
if (fs.existsSync(localPath)) {
let code: string = fs.readFileSync(localPath, 'utf8');
code = code.replace(/^.*exports.*$/gm, '');
const sandbox: DialogClass = new DialogClass(min);
const context = vm.createContext(sandbox);
vm.runInContext(code, context);
min.sandbox = sandbox;
await deployer.deployScriptToStorage(min.instanceId, filename);
logger.info(`[GBVMService] Finished loading of ${filename}`);
}
}
}

74
packages/core.gbapp/services/TSCompiler.ts Normal file
View file

@ -0,0 +1,74 @@
/*****************************************************************************\
| ( )_ _ |
| _ _ _ __ _ _ __ ___ ___ _ _ | ,_)(_) ___ ___ _ |
| ( '_`\ ( '__)/'_` ) /'_ `\/' _ ` _ `\ /'_` )| | | |/',__)/' _ `\ /'_`\ |
| | (_) )| | ( (_| |( (_) || ( ) ( ) |( (_| || |_ | |\__, \| ( ) |( (_) ) |
| | ,__/'(_) `\__,_)`\__ |(_) (_) (_)`\__,_)`\__)(_)(____/(_) (_)`\___/' |
| | | ( )_) | |
| (_) \___/' |
| |
| General Bots Copyright (c) Pragmatismo.io. All rights reserved. |
| Licensed under the AGPL-3.0. |
| |
| According to our dual licensing model, this program can be used either |
| under the terms of the GNU Affero General Public License, version 3, |
| or under a proprietary license. |
| |
| The texts of the GNU Affero General Public License with an additional |
| permission and of our proprietary license can be found at and |
| in the LICENSE file you have received along with this program. |
| |
| This program is distributed in the hope that it will be useful, |
| but WITHOUT ANY WARRANTY, without even the implied warranty of |
| MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
| GNU Affero General Public License for more details. |
| |
| "General Bots" is a registered trademark of Pragmatismo.io. |
| The licensing of the program under the AGPLv3 does not imply a |
| trademark license. Therefore any rights, title and interest in |
| our trademarks remain entirely with us. |
| |
\*****************************************************************************/
/**
* @fileoverview General Bots server core.
*/
'use strict';
import * as ts from 'typescript';
const logger = require('../../../src/logger');
export class TSCompiler {
public compile(
fileNames: string[],
options: ts.CompilerOptions = {
noEmitOnError: false,
noImplicitAny: true,
target: ts.ScriptTarget.ES5,
module: ts.ModuleKind.None,
moduleResolution: ts.ModuleResolutionKind.Classic,
noEmitHelpers: true,
maxNodeModuleJsDepth: 0,
esModuleInterop: false
}
) {
const program = ts.createProgram(fileNames, options);
const emitResult = program.emit();
const allDiagnostics = ts.getPreEmitDiagnostics(program).concat(emitResult.diagnostics);
allDiagnostics.forEach(diagnostic => {
if (diagnostic.file) {
const { line, character } = diagnostic.file.getLineAndCharacterOfPosition(diagnostic.start!);
const message = ts.flattenDiagnosticMessageText(diagnostic.messageText, '\n');
logger.error(`${diagnostic.file.fileName} (${line + 1},${character + 1}): ${message}`);
} else {
logger.error(`${ts.flattenDiagnosticMessageText(diagnostic.messageText, '\n')}`);
}
});
return emitResult;
}
}

12
packages/default.gbdialog/bot.vbs
View file

@ -1,5 +1,4 @@
<%
'****************************************************************************
' ( )_ _
' _ _ _ __ _ _ __ ___ ___ _ _ | ,_)(_) ___ ___ _
@ -31,13 +30,10 @@
' our trademarks remain entirely with us.
'
'****************************************************************************
function ICanSendEmails()
bot.say ("Please, what's your e-mail address?")
email = bot.expectEmail()
bot.sendMail (email, "Hello", "I'm sending a General Bots VBA e-mail.")
end function
this.talk ("Please, what's your e-mail address?")
let email = this.hear()
this.talk("Thanks, sending e-mail to: " + email);
this.sendEmail(email, "Message from VBA Bot", "Yes, I can send e-mails.");
%>

40
packages/default.gbdialog/bot.vbs.js
View file

@ -1,40 +0,0 @@
function chat(bot) {
//****************************************************************************
// ( )_ _
// _ _ _ __ _ _ __ ___ ___ _ _ | ,_)(_) ___ ___ _
// ( //_`\ ( //__)///_` ) ///_ `\/// _ ` _ `\ ///_` )| | | |///,__)/// _ `\ ///_`\
// | (_) )| | ( (_| |( (_) || ( ) ( ) |( (_| || |_ | |\__, \| ( ) |( (_) )
// | ,__///(_) `\__,_)`\__ |(_) (_) (_)`\__,_)`\__)(_)(____/(_) (_)`\___///
// | | ( )_) |
// (_) \___///
//
// General Bots Copyright (c) Pragmatismo.io. All rights reserved.
// Licensed under the AGPL-3.0.
//
// According to our dual licensing model, this program can be used either
// under the terms of the GNU Affero General Public License, version 3,
// or under a proprietary license.
//
// The texts of the GNU Affero General Public License with an additional
// permission and of our proprietary license can be found at and
// in the LICENSE file you have received along with this program.
//
// This program is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY, without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU Affero General Public License for more details.
//
// "General Bots" is a registered trademark of Pragmatismo.io.
// The licensing of the program under the AGPLv3 does not imply a
// trademark license. Therefore any rights, title and interest in
// our trademarks remain entirely with us.
//
//****************************************************************************
bot.talk('Please, what is your e-mail?');
//email = bot.expectEmail();
//bot.talk('Thanks, sending e-mail to: ' + email);
//bot.sendEmail(to, 'Message from VBA Bot', 'Yes, I can send e-mails.');
}