fixes for JSONVault search path

Author: alaa-eddine

packages/cli/bundle-stats.html

@@ -1,6 +1,6 @@
 {
     "name": "@smythos/cli",
-    "version": "0.3.0",
+    "version": "0.3.1",
     "description": "SmythOS SRE Command Line Interface",
     "keywords": [
         "smythos",

packages/cli/package.json

@@ -206,14 +206,14 @@ const zeroDepConfig = {
             keepNames: true, // Keep all names
         }),
         // Bundle size visualization
-        visualizer({
-            filename: './bundle-stats.html',
-            open: true, // automatically opens in browser
-            gzipSize: true,
-            brotliSize: true,
-            template: 'treemap', // treemap, sunburst, or network
-            title: 'CLI Bundle Size Report',
-        }),
+        // visualizer({
+        //     filename: './bundle-stats.html',
+        //     open: true, // automatically opens in browser
+        //     gzipSize: true,
+        //     brotliSize: true,
+        //     template: 'treemap', // treemap, sunburst, or network
+        //     title: 'CLI Bundle Size Report',
+        // }),
         // No terser plugin - no compression at all
     ],
 };

packages/cli/rollup.config.js

@@ -1,6 +1,6 @@
 {
     "name": "@smythos/sre",
-    "version": "1.6.11",
+    "version": "1.6.12",
     "description": "Smyth Runtime Environment",
     "author": "Alaa-eddine KADDOURI",
     "license": "MIT",

packages/core/package.json

@@ -83,12 +83,13 @@ export function findSmythPath(_path: string = '', callback?: (smythDir: string,
 export function findValidResourcePath(listOfLocations: string[], callback?: (dir: string, success?: boolean, nextDir?: string) => void) {
     let found = '';
     for (let location of listOfLocations) {
-        found = findSmythPath(location, (dir, success, nextDir) => {
+        findSmythPath(location, (dir, success, nextDir) => {
             callback?.(dir, success, nextDir);
             if (success) {
                 found = dir;
             }
         });
+        if (found) return found;
     }
     return found;
 }

packages/core/src/helpers/Sysconfig.helper.ts

@@ -227,6 +227,26 @@ export class TemplateStringHelper {
     //     });
     // }
 }
+/**
+ * A helper function that takes an object and a property string and returns the value of the property
+ * @param obj the object to get the property from
+ * @param propertyString the property string to get the value from
+ * @returns the value of the property
+ */
+export function JSONExpression(obj, propertyString) {
+    const properties = propertyString.split(/\.|\[|\]\.|\]\[|\]/).filter(Boolean);
+    let currentProperty = obj;
+
+    for (let property of properties) {
+        if (currentProperty === undefined || currentProperty === null) {
+            return undefined;
+        }
+
+        currentProperty = currentProperty[property];
+    }
+
+    return currentProperty;
+}
 
 /**
  * a helper function that takes a string and escape it

packages/core/src/helpers/TemplateString.helper.ts

@@ -11,7 +11,7 @@ import fs from 'fs';
 import * as readlineSync from 'readline-sync';
 import { VaultConnector } from '../VaultConnector';
 
-const console = Logger('JSONFileVault');
+const logger = Logger('JSONFileVault');
 
 export type JSONFileVaultConfig = {
     file?: string;
@@ -44,19 +44,19 @@ export class JSONFileVault extends VaultConnector {
         if (_vaultFile && fs.existsSync(_vaultFile)) {
             return _vaultFile;
         }
-        console.warn('Vault file not found in:', _vaultFile);
+        logger.warn('Vault file not found in:', _vaultFile);
 
         let found = '';
 
         const relativeSearchLocations = ['vault.json', 'vault/vault.json', '.sre/vault.json'];
         found = findValidResourcePath(relativeSearchLocations, (dir, success, nextDir) => {
             if (!success) {
-                console.warn('Vault file not found in:', nextDir);
+                logger.warn('Vault file not found in:', nextDir);
             }
         });
 
         if (found) {
-            console.warn('Using alternative vault file found in : ', found);
+            logger.warn('Using alternative vault file found in : ', found);
             return found;
         }
 
@@ -75,7 +75,7 @@ export class JSONFileVault extends VaultConnector {
             hideEchoBack: true,
             mask: '*',
         });
-        console.info('Master key entered');
+        logger.info('Master key entered');
         return masterKey;
     }
 
@@ -96,7 +96,7 @@ export class JSONFileVault extends VaultConnector {
         return value.replace(envVarPattern, (match, envVarName) => {
             const envValue = process.env[envVarName];
             if (envValue === undefined) {
-                console.warn(`Environment variable ${envVarName} not found, keeping original value: ${match}`);
+                logger.warn(`Environment variable ${envVarName} not found, keeping original value: ${match}`);
                 return match;
             }
             return envValue;
@@ -175,8 +175,8 @@ export class JSONFileVault extends VaultConnector {
                     this.vaultData = JSON.parse(fs.readFileSync(vaultFile).toString());
                 }
             } catch (e) {
-                console.error('Error parsing vault file:', e);
-                console.error('!!! Vault features might not work properly !!!');
+                logger.error('Error parsing vault file:', e);
+                logger.error('!!! Vault features might not work properly !!!');
                 this.vaultData = {};
             }
 
@@ -197,6 +197,7 @@ export class JSONFileVault extends VaultConnector {
     }
 
     private initFileWatcher() {
+        if (!this.vaultFile || !fs.existsSync(this.vaultFile)) return;
         this.watcher = chokidar.watch(this.vaultFile, {
             persistent: false, // Don't keep the process running
             ignoreInitial: true,

packages/core/src/subsystems/Security/Vault.service/connectors/JSONFileVault.class.ts

@@ -1,6 +1,6 @@
 {
     "name": "@smythos/sdk",
-    "version": "1.2.5",
+    "version": "1.2.6",
     "description": "SRE SDK",
     "keywords": [
         "smythos",