@sap-ux/telemetry 0.6.12 → 0.6.14

package/dist/tooling-telemetry/data-processor.d.ts

@@ -12,12 +12,4 @@ export declare function processToolsSuiteTelemetry(telemetryHelperProperties: Re
  * @returns Common properties
  */
 export declare function getCommonProperties(): Promise<CommonFioriProjectProperties>;
-/**
- * Spawn a command to find out node.js version used for the runtime.
- *
- * @param command command name
- * @param commandArgs command arguments
- * @returns Node.js version
- */
-export declare function spawnCommand(command: string, commandArgs: string[]): Promise<string>;
 //# sourceMappingURL=data-processor.d.ts.map

package/dist/tooling-telemetry/data-processor.js

@@ -5,30 +5,16 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.processToolsSuiteTelemetry = processToolsSuiteTelemetry;
 exports.getCommonProperties = getCommonProperties;
-exports.spawnCommand = spawnCommand;
 const btp_utils_1 = require("@sap-ux/btp-utils");
+const nodejs_utils_1 = require("@sap-ux/nodejs-utils");
 const ui5_config_1 = require("@sap-ux/ui5-config");
 const axios_1 = __importDefault(require("axios"));
 const fs_1 = __importDefault(require("fs"));
 const path_1 = __importDefault(require("path"));
 const yaml_1 = __importDefault(require("yaml"));
-/**
- * Import with Tree shaking behaviour '@sap/ux-project-access/dist/project/utils'
- * performance optimization to remove unreachable code automatically from esbuild.
- * Esbuild will only bundle parts of your packages that you actually use
- *
- * Note: Without Tree shaking import '@sap/ux-project-access'
- * packages consuming telemetry need to add dependencies manually (for ex: sap/cds)
- * Further, size of generated .vsix will be increased by esbuild
- */
-const info_1 = require("@sap-ux/project-access/dist/project/info");
-const search_1 = require("@sap-ux/project-access/dist/project/search");
-const cap_1 = require("@sap-ux/project-access/dist/project/cap");
-const types_1 = require("./types");
-const child_process_1 = require("child_process");
-const os_1 = __importDefault(require("os"));
-const config_state_1 = require("./config-state");
 const project_access_1 = require("@sap-ux/project-access");
+const config_state_1 = require("./config-state");
+const types_1 = require("./types");
 /**
  * Collect commone properties that needs to be added to telemetry event.
  *
@@ -56,7 +42,7 @@ async function getCommonProperties() {
     commonProperties[types_1.CommonProperties.InternlVsExternal] = getInternalVsExternal();
     commonProperties[types_1.CommonProperties.InternlVsExternalBackwardCompatible] =
         commonProperties[types_1.CommonProperties.InternlVsExternal];
-    commonProperties[types_1.CommonProperties.NodeVersion] = (await getProcessVersions()).node;
+    commonProperties[types_1.CommonProperties.NodeVersion] = await getOSNodeVersion();
     return commonProperties;
 }
 /**
@@ -98,14 +84,14 @@ async function getAppProperties(appPath) {
     }
     const templateType = await getTemplateType(appPath);
     const deployTarget = await getDeployTarget(appPath);
-    const applicationType = await (0, info_1.getAppType)(appPath);
+    const applicationType = await (0, project_access_1.getAppType)(appPath);
     let odataSource = await getODataSource(appPath);
     // Correct logic in getAppType() implementation, if it's reuse lib type, odata source should be unknown
     if (applicationType === 'Fiori Reuse') {
         odataSource = types_1.ODataSource.UNKNOWN;
     }
     const sourceTemplate = await getSourceTemplate(appPath);
-    const appProgrammingLanguage = await (0, info_1.getAppProgrammingLanguage)(appPath);
+    const appProgrammingLanguage = await (0, project_access_1.getAppProgrammingLanguage)(appPath);
     const output = {};
     output[types_1.CommonProperties.TemplateType] = templateType;
     output[types_1.CommonProperties.DeployTargetType] = deployTarget;
@@ -167,7 +153,7 @@ async function getODataSource(appPath) {
         // is ABAP.
         let projectRoot;
         try {
-            projectRoot = await (0, search_1.findProjectRoot)(appPath);
+            projectRoot = await (0, project_access_1.findProjectRoot)(appPath);
         }
         catch {
             // No project root can be found
@@ -178,7 +164,7 @@ async function getODataSource(appPath) {
         if (!projectRoot) {
             try {
                 const appParentFolder = path_1.default.dirname(appPath);
-                projectRoot = await (0, search_1.findProjectRoot)(appParentFolder, false);
+                projectRoot = await (0, project_access_1.findProjectRoot)(appParentFolder, false);
             }
             catch (e) {
                 // No project root can be found at parent folder.
@@ -192,13 +178,13 @@ async function getODataSource(appPath) {
         if (!projectRoot) {
             const directParentFolder = path_1.default.dirname(appPath);
             const twoLevelUpParentFolder = path_1.default.dirname(directParentFolder);
-            isCapJavaWithoutPackageJson = await (0, cap_1.isCapJavaProject)(twoLevelUpParentFolder);
+            isCapJavaWithoutPackageJson = await (0, project_access_1.isCapJavaProject)(twoLevelUpParentFolder);
             projectRoot = isCapJavaWithoutPackageJson ? twoLevelUpParentFolder : appPath;
         }
         if (isCapJavaWithoutPackageJson) {
             return types_1.ODataSource.CAPJava;
         }
-        const projectType = await (0, info_1.getProjectType)(projectRoot);
+        const projectType = await (0, project_access_1.getProjectType)(projectRoot);
         return getProjectTypeForTelemetry(projectType);
     }
     catch (e) {
@@ -306,47 +292,17 @@ function populateSourceTemplate(sourceTemplate) {
     };
 }
 /**
- * Get node.js runtime version.
+ * Get node.js runtime version installed in the operating system.
  *
- * @returns Node.js version
+ * @returns Node.js version or 'unknown' if it cannot be determined.
  */
-async function getProcessVersions() {
+async function getOSNodeVersion() {
     try {
-        const output = await spawnCommand('node', ['-p', 'JSON.stringify(process.versions)']);
-        return JSON.parse(output);
+        const nodeVer = (await new nodejs_utils_1.CommandRunner().run('node', ['-v'])) ?? 'unknown';
+        return nodeVer.replaceAll(/(?:^v)|([\r\n]{1,100})/g, '');
     }
     catch {
-        return {};
+        return 'unknown';
     }
 }
-/**
- * Spawn a command to find out node.js version used for the runtime.
- *
- * @param command command name
- * @param commandArgs command arguments
- * @returns Node.js version
- */
-function spawnCommand(command, commandArgs) {
-    const spawnOptions = process.platform.startsWith('win')
-        ? { windowsVerbatimArguments: true, shell: true, cwd: os_1.default.homedir() }
-        : { cwd: os_1.default.homedir() };
-    return new Promise((resolve, reject) => {
-        let output = '';
-        const spawnProcess = (0, child_process_1.spawn)(command, commandArgs, spawnOptions);
-        spawnProcess.stdout.on('data', (data) => {
-            const newData = data.toString();
-            output += newData;
-        });
-        spawnProcess.stderr.on('data', (data) => {
-            const newData = data.toString();
-            output += newData;
-        });
-        spawnProcess.on('exit', () => {
-            resolve(output);
-        });
-        spawnProcess.on('error', (error) => {
-            reject(error);
-        });
-    });
-}
 //# sourceMappingURL=data-processor.js.map

package/dist/tooling-telemetry/types.d.ts

@@ -1,5 +1,5 @@
 import type { ProjectInfo, TelemetryMeasurements, TelemetryProperties } from '../base/types';
-import type { AppType } from '@sap-ux/project-access/dist/types';
+import type { AppType } from '@sap-ux/project-access';
 export type TelemetryHelperProperties = {
     appPath: string;
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sap-ux/telemetry",
-  "version": "0.6.12",
+  "version": "0.6.14",
   "description": "Library for sending usage telemetry data",
   "repository": {
     "type": "git",
@@ -19,10 +19,11 @@
     "performance-now": "2.1.0",
     "yaml": "2.3.3",
     "@sap-ux/store": "1.1.2",
-    "@sap-ux/project-access": "1.30.9",
+    "@sap-ux/project-access": "1.30.10",
     "@sap-ux/btp-utils": "1.1.0",
-    "@sap-ux/ui5-config": "0.29.0",
-    "@sap-ux/logger": "0.7.0"
+    "@sap-ux/ui5-config": "0.29.1",
+    "@sap-ux/logger": "0.7.0",
+    "@sap-ux/nodejs-utils": "0.2.2"
   },
   "devDependencies": {
     "jest-extended": "6.0.0",