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

fix(basic.gblib): update ChatServices.ts #420

Closed
eltociear wants to merge 2540 commits from patch-1 into main
pull from: patch-1
merge into: GeneralBots:main
Conversation 1 Commits 2540 Files changed 292 +6 -7
2 changed files with 6 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files
Showing only changes of commit 41ceedfc00 - Show all commits

6
packages/basic.gblib/services/SystemKeywords.ts
View file

@ -344,7 +344,7 @@ export class SystemKeywords {
// Checks if it is a GBFILE.
if (data.data) {
if (data.data) {
const gbfile = data.data;
let { baseUrl, client } = await GBDeployer.internalGetDriveClient(this.min);
@ -1249,9 +1249,9 @@ export class SystemKeywords {
// Determines full path at source and destination.
const root = urlJoin(`/${botId}.gbai/${botId}.gbdata`);
const root = urlJoin(`/${botId}.gbai/${botId}.gbdrive`);
const srcPath = urlJoin(root, src);
const dstPath = urlJoin(`/${botId}.gbai/${botId}.gbdata`, dest);
const dstPath = urlJoin(`/${botId}.gbai/${botId}.gbdrive`, dest);
// Checks if the destination contains subfolders that
// need to be created.

7
src/app.ts
View file

@ -126,17 +126,16 @@ export class GBServer {
const azureDeployer: AzureDeployerService = await AzureDeployerService.createInstance(deployer);
const adminService: GBAdminService = new GBAdminService(core);
if (process.env.NODE_ENV === 'development' && !process.env.BOT_URL) {
const proxy = GBConfigService.get('REVERSE_PROXY');
if (process.env.NODE_ENV === 'development' ) {
const proxy = GBConfigService.get('BOT_URL');
if (proxy !== undefined) {
GBServer.globals.publicAddress = proxy;
} else {
// Ensure that local development proxy is setup.
GBLog.info(`Establishing a development local proxy (ngrok)...`);
GBLog.info(`Establishing a development local proxy (proxy) on BOT_URL...`);
GBServer.globals.publicAddress = await core.ensureProxy(port);
}
process.env.BOT_URL = GBServer.globals.publicAddress;
} else {
const serverAddress = process.env.BOT_URL;
GBLog.info(`Defining server address at ${serverAddress}...`);