Expose OS type, version & real arch to the UI

This may be useful to know how to configure some interception scenarios
and to know when we can drop OS versions support.

Author: pimterry

src/index.ts

@@ -3,7 +3,7 @@ const DEV_MODE = process.env.HTK_DEV === 'true';
 // Set up error handling before everything else:
 import { logError, addBreadcrumb } from './errors';
 
-import { spawn, ChildProcess } from 'child_process';
+import { spawn, exec, ChildProcess } from 'child_process';
 import * as os from 'os';
 import { promises as fs, createWriteStream, WriteStream } from 'fs'
 import * as net from 'net';
@@ -16,7 +16,9 @@ import { app, BrowserWindow, shell, Menu, dialog, session, ipcMain } from 'elect
 import * as yargs from 'yargs';
 import * as semver from 'semver';
 import * as rimraf from 'rimraf';
+
 const rmRF = promisify(rimraf);
+const execAsync = promisify(exec);
 
 import * as windowStateKeeper from 'electron-window-state';
 import { getSystemProxy } from 'os-proxy-config';
@@ -648,6 +650,54 @@ ipcMain.handle('open-context-menu', ipcHandler((options: ContextMenuDefinition)
 
 ipcMain.handle('get-desktop-version', ipcHandler(() => DESKTOP_VERSION));
 ipcMain.handle('get-server-auth-token', ipcHandler(() => AUTH_TOKEN));
+ipcMain.handle('get-device-info', ipcHandler(async () => {
+    const realArch = await getRealArch();
+
+    return {
+        platform: os.platform(),
+        release: os.release(),
+        runtimeArch: os.arch(),
+        realArch: realArch
+    }
+}));
+
+// Detect the 'real' architecture of the system. We're concerned here with detecting the real arch
+// despite emulation here, to help with launch subprocs. Not too worried about x86 vs x64.
+async function getRealArch() {
+    try {
+        switch (process.platform) {
+            case 'darwin':
+                const { stdout: armCheck } = await execAsync('sysctl -n hw.optional.arm64')
+                    .catch((e: any) => {
+                        const output = e.message + e.stdout + e.stderr;
+                        // This id may not be available:
+                        if (output?.includes?.("unknown oid")) return { stdout: "0" };
+                        else throw e;
+                    });
+                if (armCheck.trim() === '1') {
+                    return 'arm64';
+                }
+
+            case 'linux':
+                const { stdout: cpuInfo } = await execAsync('cat /proc/cpuinfo');
+                const lcCpuInfo = cpuInfo.toLowerCase();
+                if (lcCpuInfo.includes('aarch64') || lcCpuInfo.includes('arm64')) {
+                    return 'arm64';
+                }
+
+            case 'win32':
+                const arch = process.env.PROCESSOR_ARCHITEW6432 || process.env.PROCESSOR_ARCHITECTURE;
+                if (arch?.toLowerCase() === 'arm64') {
+                    return 'arm64';
+                }
+        }
+    } catch (e) {
+        console.warn(`Error querying system arch: ${e.message}`);
+        logError(e);
+    }
+
+    return os.arch();
+}
 
 let restarting = false;
 ipcMain.handle('restart-app', ipcHandler(() => {

src/preload.ts

@@ -9,21 +9,31 @@ import type { ContextMenuDefinition } from './context-menu';
 // the preload promise here to confirm it's definitely ready.
 let desktopVersion: string | undefined;
 let authToken: string | undefined;
+let deviceInfo: {} | undefined;
 
 const preloadPromise = Promise.all([
     ipcRenderer.invoke('get-desktop-version').then(result => {
         desktopVersion = result;
     }),
     ipcRenderer.invoke('get-server-auth-token').then(result => {
         authToken = result;
-    })
+    }),
+    Promise.race([
+        ipcRenderer.invoke('get-device-info').then(result => {
+            deviceInfo = result;
+        }),
+        // Give up after 500m - might complete later, but we don't
+        // want to block 'API ready' for this info.
+        new Promise((resolve) => setTimeout(resolve, 500))
+    ])
 ]);
 
 contextBridge.exposeInMainWorld('desktopApi', {
     waitUntilDesktopApiReady: () => preloadPromise.then(() => {}),
 
     getDesktopVersion: () => desktopVersion,
     getServerAuthToken: () => authToken,
+    getDeviceInfo: () => deviceInfo,
 
     selectApplication: () =>
         ipcRenderer.invoke('select-application'),