diff --git a/boot.js b/boot.js index 7423d359..b3288820 100644 --- a/boot.js +++ b/boot.js @@ -1,20 +1,36 @@ -#! /usr/bin / env node +#!/usr/bin/env node const Fs = require('fs'); const Path = require('path'); 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 = () => { const GBServer = require("./dist/src/app").GBServer + console.log(`${now()} - Running '${GBServer.name}' on '${__dirname}' directory`); process.env.PWD = __dirname; GBServer.run(); } - var processDist = () => { if (!Fs.existsSync('dist')) { - console.log(`Compiling...`); + console.log(`${now()} - Compiling...`); exec(Path.join(__dirname, 'node_modules/.bin/tsc'), (err, stdout, stderr) => { if (err) { console.error(err); @@ -28,8 +44,9 @@ try { } }; + // 2. start running 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) => { if (err) { console.error(err); @@ -41,9 +58,6 @@ try { else { processDist(); } -} -catch (e) { +} catch (e) { console.log(e); } - - diff --git a/packages/core.gbapp/services/GBConfigService.ts b/packages/core.gbapp/services/GBConfigService.ts index f5782140..432da417 100644 --- a/packages/core.gbapp/services/GBConfigService.ts +++ b/packages/core.gbapp/services/GBConfigService.ts @@ -56,9 +56,16 @@ export class GBConfigService { public static init(): any { try { require('dotenv-extended').load({ + encoding: 'utf8', + silent: true, path: '.env', + defaults: '.env.defaults', + schema: '.env.schema', errorOnMissing: true, errorOnExtra: false, + errorOnRegex: true, + includeProcessEnv: false, + assignToProcessEnv: true, overrideProcessEnv: true }); } catch (e) { diff --git a/packages/default.gbui/src/GBUIApp.js b/packages/default.gbui/src/GBUIApp.js index 20df55b4..72f422a8 100644 --- a/packages/default.gbui/src/GBUIApp.js +++ b/packages/default.gbui/src/GBUIApp.js @@ -41,7 +41,7 @@ import GBCss from './components/GBCss.js'; import { DirectLine } from 'botframework-directlinejs'; import { ConnectionStatus } from 'botframework-directlinejs'; import ReactWebChat from 'botframework-webchat'; -import GBPowerBIPlayer from './players/GBPowerBIPlayer.js'; +// import GBPowerBIPlayer from './players/GBPowerBIPlayer.js'; import { UserAgentApplication } from 'msal'; class GBUIApp extends React.Component { @@ -264,7 +264,7 @@ class GBUIApp extends React.Component { /> ); break; - case 'pbi': + /* case 'pbi': playerComponent = ( ); - break; + break; */ case 'login': playerComponent = ( ); } @@ -336,7 +335,17 @@ class GBUIApp extends React.Component { if (!this.state.instance) { sideBar = ''; } - + + return ( +
+ {gbCss} + {sideBar} +
{playerComponent}
+
+
+
+ ); +/* return (
{gbCss} @@ -346,7 +355,7 @@ class GBUIApp extends React.Component { {chat}
- ); + ); */ } } diff --git a/packages/default.gbui/src/players/GBPowerBIPlayer.js b/packages/default.gbui/src/players/GBPowerBIPlayer.js-dont-work-now similarity index 100% rename from packages/default.gbui/src/players/GBPowerBIPlayer.js rename to packages/default.gbui/src/players/GBPowerBIPlayer.js-dont-work-now