new(all): TRUE multicloud.

packages/basic.gblib/services/GBVMService.ts

@@ -106,6 +106,7 @@ export class GBVMService extends GBService {
   }
 
   public async loadDialog(filename: string, folder: string, min: GBMinInstance) {
+
     const wordFile = filename;
     const vbsFile = filename.substr(0, filename.indexOf('docx')) + 'vbs';
     const fullVbsFile = urlJoin(folder, vbsFile);
@@ -113,7 +114,6 @@ export class GBVMService extends GBService {
     const interval = 3000; // If compiled is older 30 seconds, then recompile.
     let writeVBS = true;
 
-
     // TODO: #412.
     // const subscription = {
     //   changeType: 'created,updated',
@@ -140,26 +140,9 @@ export class GBVMService extends GBService {
     let mainName = GBVMService.getMethodNameFromVBSFilename(filename);
     min.scriptMap[filename] = mainName;
 
-    if (writeVBS) {
+    if (writeVBS && GBConfigService.get('STORAGE_NAME')) {
       let text = await this.getTextFromWord(folder, wordFile);
 
-      // Pre process SET SCHEDULE calls.
-
-      const schedules = GBVMService.getSetScheduleKeywordArgs(text);
-
-      const s = new ScheduleServices();
-      await s.deleteScheduleIfAny(min, mainName);
-
-      let i = 1;
-      await CollectionUtil.asyncForEach(schedules, async (syntax) => {
-
-        if (s) {
-            await s.createOrUpdateSchedule(min, syntax, `${mainName};${i++}`);
-        }
-      });
-
-      text = text.replace(/^\s*SET SCHEDULE (.*)/gim, '');
-
       // Write VBS file without pragma keywords.
 
       Fs.writeFileSync(urlJoin(folder, vbsFile), text);
@@ -167,32 +150,7 @@ export class GBVMService extends GBService {
 
     // Process node_modules install.
 
-    const node_modules = urlJoin(process.env.PWD, folder, 'node_modules');
+    this.processNodeModules(folder, min);
-    if (!Fs.existsSync(node_modules)) {
-      const packageJson = `
-            {
-              "name": "${min.botId}.gbdialog",
-              "version": "1.0.0",
-              "description": "${min.botId} transpiled .gbdialog",
-              "author": "${min.botId} owner.",
-              "license": "ISC",
-              "dependencies": {
-                "yaml": "2.4.2",
-                "encoding": "0.1.13",
-                "isomorphic-fetch": "3.0.0",
-                "punycode": "2.1.1",
-                "@push-rpc/core": "1.8.2",
-                "@push-rpc/http": "1.8.2",
-                "vm2": "3.9.11",
-                "async-retry": "1.3.3"
-              }
-            }`;
-      Fs.writeFileSync(urlJoin(folder, 'package.json'), packageJson);
-
-      GBLogEx.info(min, `BASIC: Installing .gbdialog node_modules for ${min.botId}...`);
-      const npmPath = urlJoin(process.env.PWD, 'node_modules', '.bin', 'npm');
-      child_process.execSync(`${npmPath} install`, { cwd: folder });
-    }
 
     // Hot swap for .vbs files.
 
@@ -220,6 +178,44 @@ export class GBVMService extends GBService {
 
     // Syncronizes Database Objects with the ones returned from "Word".
 
+    this.syncStorageFromTABLE(folder, filename, min, mainName);
+
+    const parsedCode: string = Fs.readFileSync(jsfile, 'utf8');
+    min.sandBoxMap[mainName.toLowerCase().trim()] = parsedCode;
+    return filename;
+  }
+
+  private processNodeModules(folder: string, min: GBMinInstance) {
+    const node_modules = urlJoin(process.env.PWD, folder, 'node_modules');
+    if (!Fs.existsSync(node_modules)) {
+      const packageJson = `
+            {
+              "name": "${min.botId}.gbdialog",
+              "version": "1.0.0",
+              "description": "${min.botId} transpiled .gbdialog",
+              "author": "${min.botId} owner.",
+              "license": "ISC",
+              "dependencies": {
+                "yaml": "2.4.2",
+                "encoding": "0.1.13",
+                "isomorphic-fetch": "3.0.0",
+                "punycode": "2.1.1",
+                "@push-rpc/core": "1.8.2",
+                "@push-rpc/http": "1.8.2",
+                "vm2": "3.9.11",
+                "async-retry": "1.3.3"
+              }
+            }`;
+      Fs.writeFileSync(urlJoin(folder, 'package.json'), packageJson);
+
+      GBLogEx.info(min, `BASIC: Installing .gbdialog node_modules for ${min.botId}...`);
+      const npmPath = urlJoin(process.env.PWD, 'node_modules', '.bin', 'npm');
+      child_process.execSync(`${npmPath} install`, { cwd: folder });
+    }
+  }
+
+  private syncStorageFromTABLE(folder: string, filename: string, min: GBMinInstance, mainName: string) {
+
     const tablesFile = urlJoin(folder, `${filename}.tables.json`);
     let sync = false;
 
@@ -284,7 +280,6 @@ export class GBVMService extends GBService {
       const associations = [];
 
       // Loads storage custom connections.
-
       const path = DialogKeywords.getGBAIPath(min.botId, null);
       const filePath = Path.join('work', path, 'connections.json');
       let connections = null;
@@ -297,23 +292,21 @@ export class GBVMService extends GBService {
         false
       );
 
-      tableDef.forEach(async t => {
+      tableDef.forEach(async (t) => {
 
         const tableName = t.name.trim();
 
         // Determines autorelationship.
-
         Object.keys(t.fields).forEach(key => {
           let obj = t.fields[key];
           obj.type = getTypeBasedOnCondition(obj.type, obj.size);
           if (obj.type.key === "TABLE") {
-            obj.type.key = "BIGINT"
+            obj.type.key = "BIGINT";
             associations.push({ from: tableName, to: obj.type.name });
           }
         });
 
         // Cutom connection for TABLE.
-
         const connectionName = t.connection;
         let con;
 
@@ -327,12 +320,11 @@ export class GBVMService extends GBService {
           const username = con['storageUsername'];
           const password = con['storagePassword'];
 
-          const logging: boolean | Function =
+          const logging: boolean | Function = GBConfigService.get('STORAGE_LOGGING') === 'true'
-            GBConfigService.get('STORAGE_LOGGING') === 'true'
+            ? (str: string): void => {
-              ? (str: string): void => {
+              GBLogEx.info(min, str);
-                GBLogEx.info(min, str);
+            }
-              }
+            : false;
-              : false;
 
           const encrypt: boolean = GBConfigService.get('STORAGE_ENCRYPT') === 'true';
           const acquire = parseInt(GBConfigService.get('STORAGE_ACQUIRE_TIMEOUT'));
@@ -367,10 +359,11 @@ export class GBVMService extends GBService {
           if (!min[connectionName]) {
             GBLogEx.info(min, `Loading custom connection ${connectionName}...`);
             min[connectionName] = new Sequelize(storageName, username, password, sequelizeOptions);
-            min[`llmconnection`] ={
+            min[`llmconnection`] = {
               type: dialect,
               username,
-              database: storageName, password};
+              database: storageName, password
+            };
 
           }
         }
@@ -380,7 +373,6 @@ export class GBVMService extends GBService {
         }
 
         // Field checking, syncs if there is any difference.
-
         const seq = min[connectionName] ? min[connectionName]
           : minBoot.core.sequelize;
 
@@ -389,7 +381,6 @@ export class GBVMService extends GBService {
           const model = seq.models[tableName];
           if (model) {
             // Except Id, checks if has same number of fields.
-
             let equals = 0;
             Object.keys(t.fields).forEach(key => {
               let obj1 = t.fields[key];
@@ -419,7 +410,7 @@ export class GBVMService extends GBService {
           WHERE table_type = 'BASE TABLE'
           ORDER BY table_name ASC`, {
               type: QueryTypes.RAW
-            })[0]
+            })[0];
           }
           else if (con.storageDriver === 'mariadb') {
             tables = await seq.getQueryInterface().showAllTables();
@@ -460,10 +451,6 @@ export class GBVMService extends GBService {
         }
       });
     }
-
-    const parsedCode: string = Fs.readFileSync(jsfile, 'utf8');
-    min.sandBoxMap[mainName.toLowerCase().trim()] = parsedCode;
-    return filename;
   }
 
   public async translateBASIC(mainName, filename: any, min: GBMinInstance) {
@@ -472,6 +459,25 @@ export class GBVMService extends GBService {
 
     let basicCode: string = Fs.readFileSync(filename, 'utf8');
 
+    // Pre process SET SCHEDULE calls.
+
+    const schedules = GBVMService.getSetScheduleKeywordArgs(basicCode);
+
+    const s = new ScheduleServices();
+    await s.deleteScheduleIfAny(min, mainName);
+
+    let i = 1;
+    await CollectionUtil.asyncForEach(schedules, async (syntax) => {
+
+      if (s) {
+          await s.createOrUpdateSchedule(min, syntax, `${mainName};${i++}`);
+      }
+    });
+
+    basicCode = basicCode.replace(/^\s*SET SCHEDULE (.*)/gim, '');
+
+
+
     // Process INCLUDE keyword to include another
     // dialog inside the dialog.
 

packages/core.gbapp/services/GBCoreService.ts

@@ -132,6 +132,12 @@ export class GBCoreService implements IGBCoreService {
       password = GBConfigService.get('STORAGE_PASSWORD');
     } else if (this.dialect === 'sqlite') {
       storage = GBConfigService.get('STORAGE_FILE');
+
+      if (!Fs.existsSync(storage)){
+        process.env.STORAGE_SYNC = 'true';
+      }
+
+
     } else {
       throw new Error(`Unknown dialect: ${this.dialect}.`);
     }
@@ -845,38 +851,36 @@ ENDPOINT_UPDATE=true
 
         const base = Path.join(process.env.PWD, 'templates', 'default.gbai');
 
-        Fs.cpSync(Path.join(base, `default.gbkb`), gbaiPath, {
+        Fs.cpSync(Path.join(base, `default.gbkb`), Path.join(gbaiPath,`default.gbkb`), {
           errorOnExist: false,
           force: true,
           recursive: true
         });
-        Fs.cpSync(Path.join(base, `default.gbot`), gbaiPath, {
+        Fs.cpSync(Path.join(base, `default.gbot`), Path.join(gbaiPath, `default.gbot`), {
           errorOnExist: false,
           force: true,
           recursive: true
         });
-        Fs.cpSync(Path.join(base, `default.gbtheme`), gbaiPath, {
+        Fs.cpSync(Path.join(base, `default.gbtheme`), Path.join(gbaiPath, `default.gbtheme`), {
           errorOnExist: false,
           force: true,
           recursive: true
         });
-        Fs.cpSync(Path.join(base, `default.gbdata`), gbaiPath, {
+        Fs.cpSync(Path.join(base, `default.gbdata`), Path.join(gbaiPath, `default.gbdata`), {
           errorOnExist: false,
           force: true,
           recursive: true
         });
-        Fs.cpSync(Path.join(base, `default.gbdialog`), gbaiPath, {
+        Fs.cpSync(Path.join(base, `default.gbdialog`), Path.join(gbaiPath, `default.gbdialog`), {
           errorOnExist: false,
           force: true,
           recursive: true
         });
-        Fs.cpSync(Path.join(base, `default.gbdrive`), gbaiPath, {
+        Fs.cpSync(Path.join(base, `default.gbdrive`), Path.join(gbaiPath, `default.gbdrive`), {
           errorOnExist: false,
           force: true,
           recursive: true
         });
-
-
       }
     }
   }

packages/core.gbapp/services/GBMinService.ts

@@ -679,6 +679,10 @@ export class GBMinService {
         theme = `default.gbtheme`;
       }
 
+      let logo = this.core.getParam(instance, 'Logo', null);
+
+      logo = logo ? urlJoin(instance.botId, 'cache', logo) : 'images/logo-gb.png';
+
       let config = {
         instanceId: instance.instanceId,
         botId: botId,
@@ -691,7 +695,7 @@ export class GBMinService {
         paramLogoImageWidth: this.core.getParam(instance, 'Logo Image Width', null),
         paramLogoImageHeight: this.core.getParam(instance, 'Logo Image Height', null),
         paramLogoImageType: this.core.getParam(instance, 'Logo Image Type', null),
-        logo: this.core.getParam(instance, 'Logo', null),
+        logo: logo,
         color1: this.core.getParam(instance, 'Color1', null),
         color2: this.core.getParam(instance, 'Color2', null)
       };

packages/default.gbui/src/components/SidebarMenu.js

@@ -49,7 +49,7 @@ class SideBarMenu extends React.Component {
         <div className="tittleSideBarMenu">
           <img
             className="pragmatismoLogo"
-            src={this.props.instance.botId + "/cache/" + this.props.instance.logo}
+            src={this.props.instance.logo}
             alt="General Bots Logo" />
 
         </div>

src/app.ts

@@ -186,7 +186,7 @@ export class GBServer {
 
           // Creates a boot instance or load it from storage.
 
-          let runOnce = false;
+
           if (GBConfigService.get('STORAGE_SERVER')) {
             azureDeployer = await AzureDeployerService.createInstance(deployer);
             await core.initStorage();