chore(server) Slightly Improved Linux Support

package.json

@@ -71,6 +71,7 @@
     "fastify": "^3.17.0",
     "fastify-static": "^4.0.1",
     "fluent-ffmpeg": "^2.1.2",
+    "getos": "^3.2.1",
     "googleapis": "^67.1.1",
     "ibm-watson": "^6.1.1",
     "moment-timezone": "^0.5.33",

scripts/check-os.js

@@ -9,7 +9,7 @@ import os from '@/helpers/os'
 export default () => new Promise(async (resolve, reject) => {
   log.info('Checking OS environment...')
 
-  const info = os.get()
+  const info = await os.get()
 
   if (info.type === 'windows') {
     log.error('Voice offline mode is not available on Windows')
@@ -33,8 +33,21 @@ export default () => new Promise(async (resolve, reject) => {
         await execa('curl', ['--version'])
         log.success('"curl" found')
       } else if (info.type === 'linux') {
-        await execa('apt-get', ['--version'])
-        log.success('"apt-get" found')
+        switch (info.distro) {
+          // Add distros as needed
+          case 'Arch Linux':
+            await execa('pacman', ['--version'])
+            log.success('"pacman" found')
+            break
+          case 'Fedora':
+            await execa('dnf', ['--version'])
+            log.success('"dnf" found')
+            break
+          default: 
+            await execa('apt-get', ['--version'])
+            log.success('"apt-get" found')
+        }
+
         await execa('wget', ['--version'])
         log.success('"wget" found')
       }

scripts/setup-offline/setup-hotword.js

@@ -9,21 +9,41 @@ import os from '@/helpers/os'
 export default () => new Promise(async (resolve, reject) => {
   log.info('Setting up offline hotword detection...')
 
-  const info = os.get()
-  let pkgm = 'apt-get install'
+  const info = await os.get()
+  let pkgm = ''
   if (info.type === 'macos') {
     pkgm = 'brew'
   }
+
+  if (info.name === 'Linux') {
+    // Add distros as needed
+    switch (info.distro) {
+      case 'Arch Linux':
+        pkgm = 'pacman -S'
+        break
+      default:
+        pkgm = 'apt-get install'
+    }
+  }
 
   if (info.type === 'windows') {
     log.error('Voice offline mode is not available on Windows')
     reject()
   } else {
     try {
       log.info('Installing dependencies...')
+      let cmd = ''
 
-      let cmd = `sudo ${pkgm} sox libsox-fmt-all -y`
       if (info.type === 'linux') {
+        // Add distros as needed
+        switch (info.distro) {
+          case 'Arch Linux':
+            cmd = `sudo ${pkgm} sox libsoxr`
+            break
+          default:
+            cmd = `sudo ${pkgm} sox libsox-fmt-all -y`
+        }
+
         log.info(`Executing the following command: ${cmd}`)
         await command(cmd, { shell: true })
       } else if (info.type === 'macos') {

scripts/setup-offline/setup-stt.js

@@ -14,7 +14,9 @@ export default () => new Promise(async (resolve, reject) => {
   const tmpDir = 'scripts/tmp'
   const deepSpeechVersion = '0.9.3'
   let downloader = 'wget'
-  if (os.get().type === 'macos') {
+  const info = await os.get()
+
+  if (info.type === 'macos') {
     downloader = 'curl -L -O'
   }
 

scripts/setup-offline/setup-tts.js

@@ -17,7 +17,8 @@ export default () => new Promise(async (resolve, reject) => {
     makeCores = `-j ${os.cpus().length - 2}`
   }
   let downloader = 'wget'
-  if (os.get().type === 'macos') {
+  const info = await os.get()
+  if (info.type === 'macos') {
     downloader = 'curl -L -O'
   }
 

scripts/setup/setup.js

@@ -17,7 +17,7 @@ import setupPythonPackages from './setup-python-packages'
  */
 (async () => {
   try {
-    const info = os.get()
+    const info = await os.get()
 
     // Required env vars to setup
     process.env.LEON_LANG = 'en-US'

server/src/helpers/os.js

@@ -1,26 +1,38 @@
+import getos from 'getos'
 import o from 'os'
 
+import { promisify } from 'util'
+
+/** change from a callback function to promise */
+const getosPromise = promisify(getos)
+
 const os = { }
 
 /**
  * Returns information about your OS
  */
-os.get = () => {
+os.get = async () => {
   let type = 'unknown'
   let name = ''
+  let distro
+
+  const result = await getosPromise()
+  const osName = result.os.toLowerCase()
 
-  if (o.type().indexOf('Windows') !== -1) {
+  if (osName.indexOf('windows') !== -1) {
     type = 'windows'
     name = 'Windows'
-  } else if (o.type() === 'Darwin') {
+  } else if (osName === 'darwin') {
     type = 'macos'
     name = 'macOS'
-  } else if (o.type() === 'Linux') {
+  } else if (osName === 'linux') {
     type = 'linux'
     name = 'Linux'
+    // e.g "Arch Linux". Linux Examples https://github.com/retrohacker/getos/blob/master/os.json
+    distro = result.dist
   }
 
-  return { type, name }
+  return { type, name, distro }
 }
 
 /**

test/unit/server/helpers/os.spec.js

@@ -1,36 +1,40 @@
+import getos from 'getos'
+
+jest.mock('getos')
+
+// Import after mock, so we can change the OS
+// eslint-disable-next-line
 import os from '@/helpers/os'
 
+const setupTest = (osName) => {
+  getos.mockImplementation((cb) => cb(null, { os: osName, dist: osName === 'Linux' ? 'Arch' : undefined }))
+}
+
 describe('OS helper', () => {
   describe('get()', () => {
-    test('returns information about the OS', () => {
-      const info = os.get()
+    test('returns information about the OS', async () => {
+      const info = await os.get()
 
       expect(info.type).toBeOneOf(['windows', 'linux', 'macos'])
       expect(info.name).toBeOneOf(['Windows', 'Linux', 'macOS'])
     })
 
-    test('returns information for Windows', () => {
-      jest.unmock('os')
-      const o = jest.requireActual('os')
-      o.type = jest.fn(() => 'Windows_NT')
+    test('returns information for Windows', async () => {
+      setupTest('Windows')
 
-      expect(os.get()).toEqual({ name: 'Windows', type: 'windows' })
+      expect(await os.get()).toEqual({ name: 'Windows', type: 'windows' })
     })
 
-    test('returns information for Linux', () => {
-      jest.unmock('os')
-      const o = jest.requireActual('os')
-      o.type = jest.fn(() => 'Linux')
+    test('returns information for Linux', async () => {
+      setupTest('Linux')
 
-      expect(os.get()).toEqual({ name: 'Linux', type: 'linux' })
+      expect(await os.get()).toEqual({ name: 'Linux', type: 'linux', distro: 'Arch' })
     })
 
-    test('returns information for macOS', () => {
-      jest.unmock('os')
-      const o = jest.requireActual('os')
-      o.type = jest.fn(() => 'Darwin')
+    test('returns information for macOS', async () => {
+      setupTest('Darwin')
 
-      expect(os.get()).toEqual({ name: 'macOS', type: 'macos' })
+      expect(await os.get()).toEqual({ name: 'macOS', type: 'macos' })
     })
   })