fix: always get unraid version from var (#638)

api/.env.development

@@ -0,0 +1,18 @@
+PATHS_UNRAID_DATA=./dev/data # Where we store plugin data (e.g. permissions.json)
+PATHS_STATES=./dev/states # Where .ini files live (e.g. vars.ini)
+PATHS_DYNAMIX_BASE=./dev/dynamix # Dynamix's data directory
+PATHS_DYNAMIX_CONFIG=./dev/dynamix/dynamix.cfg # Dynamix's config file
+PATHS_MY_SERVERS_CONFIG=./dev/Unraid.net/myservers.cfg # My servers config file
+PATHS_KEYFILE_BASE=./dev/Unraid.net # Keyfile location
+PATHS_MACHINE_ID=./dev/data/machine-id
+
+ENVIRONMENT="development"
+NODE_ENV="development"
+PORT="3001"
+PLAYGROUND=true
+INTROSPECTION=true
+MOTHERSHIP_GRAPHQL_LINK="http://authenticator:3000/graphql"
+NODE_TLS_REJECT_UNAUTHORIZED=0
+BYPASS_PERMISSION_CHECKS=true
+BYPASS_CORS_CHECKS=false
+CHOKIDAR_USEPOLLING=true

api/dev/Unraid.net/myservers.cfg

@@ -1,5 +1,5 @@
 [api]
-version="3.1.0"
+version="3.1.0+948d5ecf"
 [local]
 [notifier]
 apikey="unnotify_30994bfaccf839c65bae75f7fa12dd5ee16e69389f754c3b98ed7d5"

api/dev/states/myservers.cfg

@@ -1,5 +1,5 @@
 [api]
-version="3.1.0"
+version="3.1.0+948d5ecf"
 [local]
 [notifier]
 apikey="unnotify_30994bfaccf839c65bae75f7fa12dd5ee16e69389f754c3b98ed7d5"

api/src/__test__/store/modules/paths.test.ts

@@ -7,7 +7,6 @@ test('Returns paths', async () => {
 		[
 		  "core",
 		  "unraid-api-base",
-		  "unraid-version",
 		  "unraid-data",
 		  "docker-autostart",
 		  "docker-socket",

api/src/cli/commands/report.ts

@@ -182,17 +182,6 @@ const getAllowedOrigins = (
     }
 };
 
-const getUnraidVersionFromDisk = async (
-    paths: ReturnType<typeof getters.paths>
-): Promise<string> => {
-    // Get unraid OS version
-    const unraidVersion = existsSync(paths['unraid-version'])
-        ? readFileSync(paths['unraid-version'], 'utf8').split('"')[1]
-        : 'unknown';
-    cliLogger.trace('Got unraid OS version "%s"', unraidVersion);
-    return unraidVersion;
-};
-
 const getReadableCloudDetails = (
     reportObject: ReportObject,
     v: Verbosity
@@ -272,28 +261,6 @@ ALLOWED_ORIGINS: ${cloud.allowedOrigins.join(', ').trim()}`;
     return '';
 };
 
-const getServerName = async (
-    paths: ReturnType<typeof getters.paths>
-): Promise<string> => {
-    // Load the var.ini file
-    let serverName = 'Tower';
-    try {
-        const varIni = parseConfig<{ name: string }>({
-            filePath: resolve(paths.states, 'var.ini'),
-            type: 'ini',
-        });
-        if (varIni?.name) {
-            serverName = varIni.name;
-        }
-    } catch (error: unknown) {
-        cliLogger.error(
-            'Error loading states ini for report, defaulting server name to Tower'
-        );
-    }
-
-    return serverName;
-};
-
 const getVerbosity = (argv: string[]): Verbosity => {
     if (argv.includes('-v')) {
         return '-v';
@@ -340,13 +307,11 @@ export const report = async (...argv: string[]) => {
         // Find all processes called "unraid-api" which aren't this process
         const unraidApiPid = await getUnraidApiPid();
 
-        const paths = getters.paths();
-
         // Load my servers config file into store
         await store.dispatch(loadConfigFile());
         await store.dispatch(loadStateFiles());
 
-        const { config } = store.getState();
+        const { config, emhttp } = store.getState();
         if (!config.upc.apikey) throw new Error('Missing UPC API key');
 
         const client = getApiApolloClient({ upcApiKey: config.upc.apikey });
@@ -365,8 +330,8 @@ export const report = async (...argv: string[]) => {
 
         const reportObject: ReportObject = {
             os: {
-                serverName: await getServerName(paths),
-                version: await getUnraidVersionFromDisk(paths),
+                serverName: emhttp.var.name,
+                version: emhttp.var.version
             },
             api: {
                 version: API_VERSION,

api/src/store/modules/paths.ts

@@ -4,7 +4,6 @@ import { join, resolve as resolvePath } from 'path';
 const initialState = {
 	core: __dirname,
 	'unraid-api-base': '/usr/local/bin/unraid-api/' as const,
-	'unraid-version': resolvePath(process.env.PATHS_UNRAID_VERSION ?? '/etc/unraid-version' as const),
 	'unraid-data': resolvePath(process.env.PATHS_UNRAID_DATA ?? '/boot/config/plugins/dynamix.my.servers/data/' as const),
 	'docker-autostart': '/var/lib/docker/unraid-autostart' as const,
 	'docker-socket': '/var/run/docker.sock' as const,