@synetic/et 1.0.1 → 1.2.0

package/.idea/inspectionProfiles/Project_Default.xml

@@ -0,0 +1,131 @@
+<component name="InspectionProjectProfileManager">
+  <profile version="1.0">
+    <option name="myName" value="Project Default" />
+    <inspection_tool class="ForgottenDebugOutputInspection" enabled="true" level="ERROR" enabled_by_default="true">
+      <option name="configuration">
+        <list>
+          <option value="\Codeception\Util\Debug::debug" />
+          <option value="\Codeception\Util\Debug::pause" />
+          <option value="\Doctrine\Common\Util\Debug::dump" />
+          <option value="\Doctrine\Common\Util\Debug::export" />
+          <option value="\Illuminate\Support\Debug\Dumper::dump" />
+          <option value="\Symfony\Component\Debug\Debug::enable" />
+          <option value="\Symfony\Component\Debug\DebugClassLoader::enable" />
+          <option value="\Symfony\Component\Debug\ErrorHandler::register" />
+          <option value="\Symfony\Component\Debug\ExceptionHandler::register" />
+          <option value="\TYPO3\CMS\Core\Utility\DebugUtility::debug" />
+          <option value="\Zend\Debug\Debug::dump" />
+          <option value="\Zend\Di\Display\Console::export" />
+          <option value="dd" />
+          <option value="debug_print_backtrace" />
+          <option value="debug_zval_dump" />
+          <option value="dpm" />
+          <option value="dpq" />
+          <option value="dsm" />
+          <option value="dump" />
+          <option value="dvm" />
+          <option value="error_log" />
+          <option value="kpr" />
+          <option value="phpinfo" />
+          <option value="print_r" />
+          <option value="var_dump" />
+          <option value="var_export" />
+          <option value="wp_die" />
+          <option value="xdebug_break" />
+          <option value="xdebug_call_class" />
+          <option value="xdebug_call_file" />
+          <option value="xdebug_call_function" />
+          <option value="xdebug_call_line" />
+          <option value="xdebug_code_coverage_started" />
+          <option value="xdebug_debug_zval" />
+          <option value="xdebug_debug_zval_stdout" />
+          <option value="xdebug_dump_superglobals" />
+          <option value="xdebug_enable" />
+          <option value="xdebug_get_code_coverage" />
+          <option value="xdebug_get_collected_errors" />
+          <option value="xdebug_get_declared_vars" />
+          <option value="xdebug_get_function_stack" />
+          <option value="xdebug_get_headers" />
+          <option value="xdebug_get_monitored_functions" />
+          <option value="xdebug_get_profiler_filename" />
+          <option value="xdebug_get_stack_depth" />
+          <option value="xdebug_get_tracefile_name" />
+          <option value="xdebug_is_enabled" />
+          <option value="xdebug_memory_usage" />
+          <option value="xdebug_peak_memory_usage" />
+          <option value="xdebug_print_function_stack" />
+          <option value="xdebug_start_code_coverage" />
+          <option value="xdebug_start_error_collection" />
+          <option value="xdebug_start_function_monitor" />
+          <option value="xdebug_start_trace" />
+          <option value="xdebug_stop_code_coverage" />
+          <option value="xdebug_stop_error_collection" />
+          <option value="xdebug_stop_function_monitor" />
+          <option value="xdebug_stop_trace" />
+          <option value="xdebug_time_index" />
+          <option value="xdebug_var_dump" />
+        </list>
+      </option>
+      <option name="migratedIntoUserSpace" value="true" />
+    </inspection_tool>
+    <inspection_tool class="PhpFullyQualifiedNameUsageInspection" enabled="true" level="WEAK WARNING" enabled_by_default="true">
+      <option name="IGNORE_GLOBAL_NAMESPACE" value="true" />
+    </inspection_tool>
+    <inspection_tool class="PhpMissingStrictTypesDeclarationInspection" enabled="true" level="WEAK WARNING" enabled_by_default="true" />
+    <inspection_tool class="SecurityAdvisoriesInspection" enabled="true" level="WARNING" enabled_by_default="true">
+      <option name="optionConfiguration">
+        <list>
+          <option value="barryvdh/laravel-debugbar" />
+          <option value="behat/behat" />
+          <option value="brianium/paratest" />
+          <option value="codeception/codeception" />
+          <option value="codedungeon/phpunit-result-printer" />
+          <option value="composer/composer" />
+          <option value="doctrine/coding-standard" />
+          <option value="filp/whoops" />
+          <option value="friendsofphp/php-cs-fixer" />
+          <option value="humbug/humbug" />
+          <option value="infection/infection" />
+          <option value="jakub-onderka/php-parallel-lint" />
+          <option value="johnkary/phpunit-speedtrap" />
+          <option value="kalessil/production-dependencies-guard" />
+          <option value="mikey179/vfsStream" />
+          <option value="mockery/mockery" />
+          <option value="mybuilder/phpunit-accelerator" />
+          <option value="orchestra/testbench" />
+          <option value="pdepend/pdepend" />
+          <option value="phan/phan" />
+          <option value="phing/phing" />
+          <option value="phpcompatibility/php-compatibility" />
+          <option value="phpmd/phpmd" />
+          <option value="phpro/grumphp" />
+          <option value="phpspec/phpspec" />
+          <option value="phpspec/prophecy" />
+          <option value="phpstan/phpstan" />
+          <option value="phpunit/phpunit" />
+          <option value="povils/phpmnd" />
+          <option value="roave/security-advisories" />
+          <option value="satooshi/php-coveralls" />
+          <option value="sebastian/phpcpd" />
+          <option value="slevomat/coding-standard" />
+          <option value="spatie/phpunit-watcher" />
+          <option value="squizlabs/php_codesniffer" />
+          <option value="sstalle/php7cc" />
+          <option value="symfony/debug" />
+          <option value="symfony/maker-bundle" />
+          <option value="symfony/phpunit-bridge" />
+          <option value="symfony/var-dumper" />
+          <option value="vimeo/psalm" />
+          <option value="wimg/php-compatibility" />
+          <option value="wp-coding-standards/wpcs" />
+          <option value="yiisoft/yii2-coding-standards" />
+          <option value="yiisoft/yii2-debug" />
+          <option value="yiisoft/yii2-gii" />
+          <option value="zendframework/zend-coding-standard" />
+          <option value="zendframework/zend-debug" />
+          <option value="zendframework/zend-test" />
+        </list>
+      </option>
+    </inspection_tool>
+  </profile>
+</component>

package/.idea/jsLibraryMappings.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="JavaScriptLibraryMappings">
+    <includedPredefinedLibrary name="Node.js Core" />
+  </component>
+</project>

package/.idea/modules.xml

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="ProjectModuleManager">
+    <modules>
+      <module fileurl="file://$PROJECT_DIR$/.idea/node.iml" filepath="$PROJECT_DIR$/.idea/node.iml" />
+    </modules>
+  </component>
+</project>

package/.idea/node.iml

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module type="WEB_MODULE" version="4">
+  <component name="NewModuleRootManager">
+    <content url="file://$MODULE_DIR$" />
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+  </component>
+</module>

package/.idea/vcs.xml

@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="CommitMessageInspectionProfile">
+    <profile version="1.0">
+      <inspection_tool class="CommitFormat" enabled="true" level="WARNING" enabled_by_default="true" />
+      <inspection_tool class="CommitNamingConvention" enabled="true" level="WARNING" enabled_by_default="true" />
+    </profile>
+  </component>
+  <component name="VcsDirectoryMappings">
+    <mapping directory="$PROJECT_DIR$/../.." vcs="Git" />
+  </component>
+</project>

package/README.md

@@ -1,5 +1,9 @@
 # ET node collector
 
+Requirements:
+
+- Node >=16
+
 should be run using:
 
 `npx run synetic/et phonehome`
@@ -7,4 +11,4 @@ should be run using:
 with the correct environment variables:
 
 SYNETIC_ET_KEY
-SYNETIC_ET_HOME (defaults to 'http://mission-control.test/phonehome')
+SYNETIC_ET_HOME

package/index.js

@@ -5,13 +5,13 @@ const { encrypt } = require('./lib/encypt');
 const { collect } = require('./lib/collector')
 const KEY = process.env.SYNETIC_ET_KEY || '';
 
-const HOME_URL = process.env.SYNETIC_ET_HOME || 'http://mission-control.test/phonehome';
+const HOME_URL = process.env.SYNETIC_ET_HOME || '';
 
 const phoneHome = () => {
     console.log(`collecting information to phone home (${HOME_URL})`);
     const data = collect();
     const payload = {
-        version: '0.0.1',
+        version: '1.1.0',
         data: encrypt(JSON.stringify(data), KEY)
     }
 
@@ -24,7 +24,11 @@ const phoneHome = () => {
         process.exit();
     }
 
-    axios.post(HOME_URL, payload)
+    axios.post(HOME_URL, payload, {
+        headers: {
+            'User-Agent': 'Synetic/ET (NodeJS)'
+        }
+    })
         .then(() => {
             console.log('ET phoned home succesfully')
         })

package/lib/collector.js

@@ -1,36 +1,63 @@
 const fs = require('fs');
 const os = require('os');
 
+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 getPackageVersionString('react');
     }
     return '';
 }
 
-const packageJsonLock = () => {
+const getPackageJsonLock = () => {
     const packageJson = fs.readFileSync(`${process.cwd()}/package-lock.json`)
     return JSON.parse(packageJson);
 }
-const packageJson = () => {
-    const packageJson = fs.readFileSync(`${process.cwd()}/package-lock.json`)
+const getPackageJson = () => {
+    const packageJson = fs.readFileSync(`${process.cwd()}/package.json`)
     return JSON.parse(packageJson);
 }
 
 const data = {
-    version: {
-        engine: `nodejs ${process.version}`,
-        framework: framework()
+    environment: {
+        version: process.env.APP_ENV || process.env.LAGOON_ENVIRONMENT || process.env.LAGOON_ENVIRONMENT_TYPE || ''
+    },
+    engine: {
+        version: `nodejs ${process.version}`,
     },
-    nodeMeta: {
-        // packages: packageJsonLock().packages,
+    framework: {
+        version: framework(),
+        meta: {
+            packages: getLockFilePackages(),
+        }
     },
-    systemMeta: {
-        identifier: os.hostname(),
-        ip: '',
-        uptime: os.uptime(),
-        cpuCount: os.cpus().length,
-        load: os.loadavg()
+    system: {
+        version: os.release(),
+        meta: {
+            identifier: os.hostname(),
+            ip: '',
+            uptime: os.uptime(),
+            cpuCount: os.cpus().length,
+            load: os.loadavg()
+        }
     }
 }
 

package/lib/encypt.js

@@ -1,31 +1,37 @@
 const crypto = require('crypto');
-const CYPHER = 'aes-128-cbc';
+
+const CIPHER = 'aes-128-cbc';
 const HMAC_CIPHER = 'sha512';
 const KEYPAD_CHAR = '*';
 
-const keyLength =  crypto.getCipherInfo(CYPHER).ivLength;
-const ensureKeyLength = (string) => string.substring(0, keyLength).padEnd(keyLength, KEYPAD_CHAR)
-
 const signHmacSha512 = (text, key) => {
     let hmac = crypto.createHmac(HMAC_CIPHER, key);
-    return hmac.update(Buffer.from(text, 'utf-8')).digest('hex')
+    return hmac.update(Buffer.from(text)).digest('hex')
 }
 
-const encrypt = (text, secretString) => {
-    const paddedSecretKey = ensureKeyLength(secretString);
-    const ivResource = crypto.randomBytes(keyLength);
-    const cipher = crypto.createCipheriv(CYPHER, Buffer.from(paddedSecretKey, 'utf-8'), ivResource);
-    const value = Buffer.concat([cipher.update(text), cipher.final()]).toString('hex');
-    const iv = ivResource.toString('base64')
-    return Buffer.from(JSON.stringify({
+const getCipherInfo = (cipher) => {
+    if (crypto.getCipherInfo) {
+        return crypto.getCipherInfo(cipher).ivLength;
+    }
+    return 16;
+};
+
+module.exports = {
+    encrypt: (text, secretString) => {
+        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);
+
+        const value = Buffer.concat([encryptor.update(text), encryptor.final()]).toString('base64');
+        const iv = ivBuffer.toString('base64')
+
+        return Buffer.from(JSON.stringify({
             iv,
             value,
             mac: signHmacSha512(`${iv}${value}`, paddedSecretKey),
             tag: ''
-        }), 'utf-8')
-        .toString('base64');
-};
-
-module.exports = {
-    encrypt
+        }))
+            .toString('base64');
+    }
 };

package/package.json

@@ -1,17 +1,18 @@
 {
     "name": "@synetic/et",
-    "version": "1.0.1",
+    "version": "1.2.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",