WIP: some clean-up and debug additions

This commit is contained in:
Joao Antonio Ferreira 2019-12-30 12:51:11 -03:00
parent 4cfb0904ef
commit 77582a7de2
4 changed files with 45 additions and 15 deletions

32
boot.js
View file

@ -1,20 +1,36 @@
#! /usr/bin / env node #!/usr/bin/env node
const Fs = require('fs'); const Fs = require('fs');
const Path = require('path'); const Path = require('path');
const { exec } = require('child_process'); const { exec } = require('child_process');
try { // display version of Node JS being used at runtime and others runtime attributes
console.log(`process.version = ${process.version}`);
console.log(`process.env = ${process.env}`);
console.log(`process.platform = ${process.platform}`);
console.log(`process.release = ${process.release}`);
console.log(`process.argv = ${process.argv}`);
console.log(`process.env.USER = ${process.env.USER}`);
console.log(`process.env.PATH = ${process.env.PATH.split(':').join('\n')}`);
console.log(`process.env.PWD = ${process.env.PWD}`);
console.log(`process.env.HOME = ${process.env.HOME}`);
console.log(`process.debugPort = ${process.debugPort}`);
var now = () => {
return (new Date()).toISOString().replace(/T/, ' ').replace(/\..+/, '') + ' UTC';
}
try {
// 1. define functions: run and processDist
var run = () => { var run = () => {
const GBServer = require("./dist/src/app").GBServer const GBServer = require("./dist/src/app").GBServer
console.log(`${now()} - Running '${GBServer.name}' on '${__dirname}' directory`);
process.env.PWD = __dirname; process.env.PWD = __dirname;
GBServer.run(); GBServer.run();
} }
var processDist = () => { var processDist = () => {
if (!Fs.existsSync('dist')) { if (!Fs.existsSync('dist')) {
console.log(`Compiling...`); console.log(`${now()} - Compiling...`);
exec(Path.join(__dirname, 'node_modules/.bin/tsc'), (err, stdout, stderr) => { exec(Path.join(__dirname, 'node_modules/.bin/tsc'), (err, stdout, stderr) => {
if (err) { if (err) {
console.error(err); console.error(err);
@ -28,8 +44,9 @@ try {
} }
}; };
// 2. start running
if (!Fs.existsSync('node_modules')) { if (!Fs.existsSync('node_modules')) {
console.log(`Installing modules for the first time, please wait...`); console.log(`${now()} - Installing modules for the first time, please wait...`);
exec('npm install', (err, stdout, stderr) => { exec('npm install', (err, stdout, stderr) => {
if (err) { if (err) {
console.error(err); console.error(err);
@ -41,9 +58,6 @@ try {
else { else {
processDist(); processDist();
} }
} } catch (e) {
catch (e) {
console.log(e); console.log(e);
} }

View file

@ -56,9 +56,16 @@ export class GBConfigService {
public static init(): any { public static init(): any {
try { try {
require('dotenv-extended').load({ require('dotenv-extended').load({
encoding: 'utf8',
silent: true,
path: '.env', path: '.env',
defaults: '.env.defaults',
schema: '.env.schema',
errorOnMissing: true, errorOnMissing: true,
errorOnExtra: false, errorOnExtra: false,
errorOnRegex: true,
includeProcessEnv: false,
assignToProcessEnv: true,
overrideProcessEnv: true overrideProcessEnv: true
}); });
} catch (e) { } catch (e) {

View file

@ -41,7 +41,7 @@ import GBCss from './components/GBCss.js';
import { DirectLine } from 'botframework-directlinejs'; import { DirectLine } from 'botframework-directlinejs';
import { ConnectionStatus } from 'botframework-directlinejs'; import { ConnectionStatus } from 'botframework-directlinejs';
import ReactWebChat from 'botframework-webchat'; import ReactWebChat from 'botframework-webchat';
import GBPowerBIPlayer from './players/GBPowerBIPlayer.js'; // import GBPowerBIPlayer from './players/GBPowerBIPlayer.js';
import { UserAgentApplication } from 'msal'; import { UserAgentApplication } from 'msal';
class GBUIApp extends React.Component { class GBUIApp extends React.Component {
@ -264,7 +264,7 @@ class GBUIApp extends React.Component {
/> />
); );
break; break;
case 'pbi': /* case 'pbi':
playerComponent = ( playerComponent = (
<GBPowerBIPlayer <GBPowerBIPlayer
app={this} app={this}
@ -273,7 +273,7 @@ class GBUIApp extends React.Component {
}} }}
/> />
); );
break; break; */
case 'login': case 'login':
playerComponent = ( playerComponent = (
<GBLoginPlayer <GBLoginPlayer
@ -328,7 +328,6 @@ class GBUIApp extends React.Component {
directLine={this.state.line} directLine={this.state.line}
user={this.getUser()} user={this.getUser()}
bot={{ id: 'bot@gb', name: 'Bot' }} bot={{ id: 'bot@gb', name: 'Bot' }}
// speechOptions={speechOptions}
/> />
); );
} }
@ -337,6 +336,16 @@ class GBUIApp extends React.Component {
sideBar = ''; sideBar = '';
} }
return (
<div>
{gbCss}
{sideBar}
<div className="player">{playerComponent}</div>
<div className="webchat">
</div>
</div>
);
/*
return ( return (
<div> <div>
{gbCss} {gbCss}
@ -346,7 +355,7 @@ class GBUIApp extends React.Component {
{chat} {chat}
</div> </div>
</div> </div>
); ); */
} }
} }