Simplify util

api/src/utils/telemetry.ts

@@ -0,0 +1,24 @@
+import { machineId } from 'node-machine-id';
+import { version } from '../../package.json';
+import env from '../env';
+import logger from '../logger';
+
+export async function collectTelemetry(): Promise<void> {
+	const axios = (await import('axios')).default;
+
+	if (env['TELEMETRY'] !== false) {
+		try {
+			await axios.post('https://telemetry.directus.io/', {
+				version: version,
+				public_url: env['PUBLIC_URL'],
+				project_id: env['KEY'],
+				machine_id: await machineId(),
+				db_client: env['DB_CLIENT'],
+			});
+		} catch (err: any) {
+			if (env['NODE_ENV'] === 'development') {
+				logger.error(err);
+			}
+		}
+	}
+}

api/src/utils/track.ts

@@ -1,80 +0,0 @@
-import { machineId } from 'node-machine-id';
-import os from 'os';
-// @ts-ignore
-import { toArray } from '@directus/shared/utils';
-import { version } from '../../package.json';
-import env from '../env';
-import logger from '../logger';
-import { getMilliseconds } from './get-milliseconds';
-
-export async function track(event: string): Promise<void> {
-	const axios = (await import('axios')).default;
-
-	if (env['TELEMETRY'] !== false) {
-		const info = await getEnvInfo(event);
-
-		try {
-			await axios.post('https://telemetry.directus.io/', info);
-		} catch (err: any) {
-			if (env['NODE_ENV'] === 'development') {
-				logger.error(err);
-			}
-		}
-	}
-}
-
-async function getEnvInfo(event: string) {
-	return {
-		version: version,
-		event: event,
-		project_id: env['KEY'],
-		machine_id: await machineId(),
-		environment: env['NODE_ENV'],
-		stack: 'node',
-		os: {
-			arch: os.arch(),
-			platform: os.platform(),
-			release: os.release(),
-		},
-		rate_limiter: {
-			enabled: env['RATE_LIMITER_ENABLED'],
-			points: +env['RATE_LIMITER_POINTS'],
-			duration: +env['RATE_LIMITER_DURATION'],
-			store: env['RATE_LIMITER_STORE'],
-		},
-		cache: {
-			enabled: env['CACHE_ENABLED'],
-			ttl: getMilliseconds(env['CACHE_TTL']),
-			store: env['CACHE_STORE'],
-		},
-		storage: {
-			drivers: getStorageDrivers(),
-		},
-		cors: {
-			enabled: env['CORS_ENABLED'],
-		},
-		email: {
-			transport: env['EMAIL_TRANSPORT'],
-		},
-		auth: {
-			providers: toArray(env['AUTH_PROVIDERS'])
-				.map((v: string) => v.trim())
-				.filter((v: string) => v),
-		},
-		db_client: env['DB_CLIENT'],
-	};
-}
-
-function getStorageDrivers() {
-	const drivers: string[] = [];
-	const locations = toArray(env['STORAGE_LOCATIONS'])
-		.map((v: string) => v.trim())
-		.filter((v: string) => v);
-
-	for (const location of locations) {
-		const driver = env[`STORAGE_${location.toUpperCase()}_DRIVER`];
-		drivers.push(driver);
-	}
-
-	return drivers;
-}