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

fix(kb.gbapp): Fix importing packages.

Browse source
This commit is contained in:
Rodrigo Rodriguez 2023-09-14 12:02:53 -03:00
parent ac865497f0
commit e39c33b8f7
3 changed files with 11 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
packages/admin.gbapp/services/GBAdminService.ts
View file

@ -170,7 +170,7 @@ export class GBAdminService implements IGBAdminService {
// .gbot packages are handled using storage API, so no download // .gbot packages are handled using storage API, so no download
// of local resources is required. // of local resources is required.
const gbai = DialogKeywords.getGBAIPath(min.instance.botId); const gbai = DialogKeywords.getGBAIPath(min.instance.botId);
await deployer['undeployPackageFromPackageName'](min.instance, packageName);
await deployer['downloadFolder'](min, await deployer['downloadFolder'](min,
Path.join('work', `${gbai}`), Path.join('work', `${gbai}`),
Path.basename(localFolder)); Path.basename(localFolder));

8
packages/core.gbapp/services/GBDeployer.ts
View file

@ -662,6 +662,14 @@ export class GBDeployer implements IGBDeployer {
} }
} }
/**
* Removes the package local files from cache.
*/
public async cleanupPackage(instance: IGBInstance, packageName: string) {
const path = DialogKeywords.getGBAIPath(instance.botId, null, packageName);
const localFolder = Path.join('work', path);
rimraf.sync(localFolder);
}
/** /**
* Removes the package from the storage and local work folders. * Removes the package from the storage and local work folders.

2
packages/kb.gbapp/services/KBService.ts
View file

@ -1019,7 +1019,7 @@ export class KBService implements IGBKBService {
const packageName = Path.basename(localPath); const packageName = Path.basename(localPath);
const instance = await core.loadInstanceByBotId(min.botId); const instance = await core.loadInstanceByBotId(min.botId);
GBLog.info(`[GBDeployer] Importing: ${localPath}`); GBLog.info(`[GBDeployer] Importing: ${localPath}`);
await deployer['cleanupPackage'](min.instance, packageName);
const p = await deployer.deployPackageToStorage(instance.instanceId, packageName); const p = await deployer.deployPackageToStorage(instance.instanceId, packageName);
await this.importKbPackage(min, localPath, p, instance); await this.importKbPackage(min, localPath, p, instance);
GBDeployer.mountGBKBAssets(packageName, min.botId, localPath); GBDeployer.mountGBKBAssets(packageName, min.botId, localPath);