@synetic/et 1.0.3 → 1.3.0

package/index.js

@@ -1,5 +1,5 @@
 const axios = require('axios');
-const yargs = require('yargs')
+const argv = require('yargs/yargs')(process.argv.slice(2)).argv;
 
 const { encrypt } = require('./lib/encypt');
 const { collect } = require('./lib/collector')
@@ -7,26 +7,31 @@ const KEY = process.env.SYNETIC_ET_KEY || '';
 
 const HOME_URL = process.env.SYNETIC_ET_HOME || '';
 
-const phoneHome = () => {
+const phoneHome = async () => {
     console.log(`collecting information to phone home (${HOME_URL})`);
-    const data = collect();
+    const data = await collect();
     const payload = {
-        version: '0.0.1',
+        version: '1.3.0',
         data: encrypt(JSON.stringify(data), KEY)
     }
 
-    if (yargs.argv.dryRun) {
+    if (argv.dryRun) {
         console.log('dry running locally');
         console.log(payload);
-        if (yargs.argv.reveal) {
-            console.log(data);
+        if (argv.reveal) {
+            console.log(JSON.stringify(data));
         }
         process.exit();
     }
 
+    if (!HOME_URL || !KEY) {
+        console.log('Missing Phone Home URL or Key.');
+        process.exit(1);
+    }
+
     axios.post(HOME_URL, payload, {
         headers: {
-            'User-Agent': 'Synetic/ET (NodeJS)'
+            'User-Agent': `Synetic/ET ${payload.version} (NodeJS)`
         }
     })
         .then(() => {

package/lib/collector.js

@@ -1,42 +1,164 @@
 const fs = require('fs');
 const os = require('os');
+const Redis = require('ioredis');
+
+const getLockFilePackages = () => {
+    const lock = getPackageJsonLock();
+    const isV1 = lock.lockfileVersion === 1;
+    return isV1 ? lock.dependencies : lock.packages;
+};
+
+const getPackageVersionString = (packageName) => {
+    const packages = getLockFilePackages();
+    return `${packageName} ${(packages[packageName] || packages[`node_modules/${packageName}`]).version}`;
+};
 
 const framework = () => {
-    if (Object.keys(packageJson().dependencies).indexOf('vue') > -1) {
-        return `vue ${packageJsonLock().packages['node_modules/vue'].version}`;
+    const packageJson = getPackageJson();
+
+    if (Object.keys(packageJson.dependencies).indexOf('nuxt') > -1) {
+        return getPackageVersionString('nuxt');
+    }
+    if (Object.keys(packageJson.dependencies).indexOf('vue') > -1) {
+        return getPackageVersionString('vue');
     }
-    if (Object.keys(packageJson().dependencies).indexOf('react') > -1) {
-        return `react ${packageJsonLock().packages['node_modules/react'].version}`;
+    if (Object.keys(packageJson.dependencies).indexOf('react') > -1) {
+        return getPackageVersionString('react');
     }
     return '';
 }
 
-const packageJsonLock = () => {
-    const packageJson = fs.readFileSync(`${process.cwd()}/package-lock.json`)
-    return JSON.parse(packageJson);
+const getPackageJsonLock = () => {
+    try {
+        const packageJson = fs.readFileSync(`${process.cwd()}/package-lock.json`)
+        return JSON.parse(packageJson);
+    } catch (e) {
+        return {};
+    }
 }
-const packageJson = () => {
-    const packageJson = fs.readFileSync(`${process.cwd()}/package-lock.json`)
-    return JSON.parse(packageJson);
+const getPackageJson = () => {
+    try {
+        const packageJson = fs.readFileSync(`${process.cwd()}/package.json`)
+        return JSON.parse(packageJson);
+    } catch (e) {
+        return { dependencies: {} };
+    }
 }
 
-const data = {
-    version: {
-        engine: `nodejs ${process.version}`,
-        framework: framework()
-    },
-    nodeMeta: {
-        packages: packageJsonLock().packages,
-    },
-    systemMeta: {
-        identifier: os.hostname(),
-        ip: '',
-        uptime: os.uptime(),
-        cpuCount: os.cpus().length,
-        load: os.loadavg()
+const getRedisInfo = () => {
+    return new Promise((resolve) => {
+        const host = process.env.REDIS_SERVICE_HOST;
+        const port = process.env.REDIS_SERVICE_PORT;
+        const password = process.env.REDIS_SERVICE_PASSWORD;
+
+        if (!host || !port) {
+            return resolve(null);
+        }
+
+        const redis = new Redis({
+            host: host,
+            port: port,
+            password: password,
+            connectTimeout: 2000,
+            maxRetriesPerRequest: 0,
+            retryStrategy: () => null // Disable retry
+        });
+
+        redis.info()
+            .then((info) => {
+                redis.quit();
+                resolve(parseRedisInfo(info));
+            })
+            .catch((err) => {
+                redis.quit();
+                resolve({ error: err.message });
+            });
+    });
+};
+
+const parseRedisInfo = (infoString) => {
+    if (!infoString) return null;
+    const lines = infoString.split('\r\n');
+    
+    // Check for Redis error
+    if (lines.length > 0 && lines[0].startsWith('-')) {
+        return { error: lines[0].substring(1) };
     }
-}
+
+    const result = {};
+    let currentSection = 'default';
+
+    for (const line of lines) {
+        if (line.trim() === '' || line.startsWith('+') || line.startsWith('$') || line.startsWith('*')) continue;
+        
+        if (line.startsWith('#')) {
+            currentSection = line.substring(1).trim().toLowerCase();
+            result[currentSection] = {};
+            continue;
+        }
+
+        const parts = line.split(':');
+        if (parts.length === 2) {
+            if (!result[currentSection]) {
+                 result[currentSection] = {};
+            }
+            result[currentSection][parts[0]] = parts[1].trim();
+        }
+    }
+    return result;
+};
+
+const collect = async () => {
+    const redisInfo = await getRedisInfo();
+    
+    const services = {};
+    if (redisInfo) {
+        let version = '';
+        if (redisInfo.server && redisInfo.server.redis_version) {
+            version = redisInfo.server.redis_version;
+        }
+        
+        let type = 'redis';
+        if (redisInfo.server && redisInfo.server.server_name === 'valkey') {
+            type = 'valkey';
+        }
+
+        services.redis = {
+            type: type,
+            version: version,
+            meta: redisInfo
+        };
+    }
+
+    const data = {
+        environment: {
+            version: process.env.APP_ENV || process.env.LAGOON_ENVIRONMENT || process.env.LAGOON_ENVIRONMENT_TYPE || ''
+        },
+        engine: {
+            version: `nodejs ${process.version}`,
+        },
+        framework: {
+            version: framework(),
+            meta: {
+                packages: getLockFilePackages(),
+            }
+        },
+        system: {
+            version: os.release(),
+            meta: {
+                identifier: os.hostname(),
+                ip: '',
+                uptime: os.uptime(),
+                cpuCount: os.cpus().length,
+                load: os.loadavg()
+            }
+        },
+        services: services
+    };
+    
+    return data;
+};
 
 module.exports = {
-    collect: () => data,
+    collect,
 };

package/lib/encypt.js

@@ -9,9 +9,16 @@ const signHmacSha512 = (text, key) => {
     return hmac.update(Buffer.from(text)).digest('hex')
 }
 
+const getCipherInfo = (cipher) => {
+    if (crypto.getCipherInfo) {
+        return crypto.getCipherInfo(cipher).ivLength;
+    }
+    return 16;
+};
+
 module.exports = {
     encrypt: (text, secretString) => {
-        const keyLength = crypto.getCipherInfo(CIPHER).ivLength;
+        const keyLength = getCipherInfo(CIPHER);
         const paddedSecretKey = secretString.substring(0, keyLength).padEnd(keyLength, KEYPAD_CHAR);
         const ivBuffer = crypto.randomBytes(keyLength);
         const encryptor = crypto.createCipheriv(CIPHER, Buffer.from(paddedSecretKey), ivBuffer);

package/package.json

@@ -1,20 +1,22 @@
 {
     "name": "@synetic/et",
-    "version": "1.0.3",
+    "version": "1.3.0",
     "description": "The Synetic ET collector for NodeJs",
     "main": "index.js",
     "scripts": {
+        "dev": "./entrypoint.js --dry-run --reveal",
         "start": "./entrypoint.js"
     },
     "bin": "./entrypoint.js",
     "author": "Synetic <info@synetic.nl>",
     "license": "ISC",
     "engines": {
-        "node": ">=16",
-        "npm": ">=8"
+        "node": ">=12",
+        "npm": ">=6"
     },
     "dependencies": {
-        "axios": "^0.27.2",
-        "yargs": "^17.5.1"
+        "axios": "^1.0.0",
+        "ioredis": "^5.9.3",
+        "yargs": "^18.0.0"
     }
 }