refactor: check script according to binaries changes

package.json

@@ -57,7 +57,7 @@
     "prepare-release": "ts-node scripts/release/prepare-release.js",
     "pre-release:python-bridge": "ts-node scripts/release/pre-release-binaries.js python-bridge",
     "pre-release:tcp-server": "ts-node scripts/release/pre-release-binaries.js tcp-server",
-    "check": "ts-node scripts/run-check.js",
+    "check": "ts-node scripts/check.js",
     "docker:build": "docker build -t leon-ai/leon .",
     "docker:run": "docker compose up",
     "docker:dev": "docker compose --file=docker-compose.dev.yml up",

scripts/check.js

@@ -1,24 +1,25 @@
 import fs from 'node:fs'
 import os from 'node:os'
+import { spawn } from 'node:child_process'
 
 import dotenv from 'dotenv'
 import { command } from 'execa'
 import semver from 'semver'
+import kill from 'tree-kill'
 
 import { version } from '@@/package.json'
 import { LogHelper } from '@/helpers/log-helper'
-import { PYTHON_BRIDGE_BIN_PATH } from '@/constants'
+import { PYTHON_BRIDGE_BIN_PATH, TCP_SERVER_BIN_PATH } from '@/constants'
 
 dotenv.config()
 
 /**
  * Checking script
- * Help to figure out what is installed or not
+ * Help to figure out the setup state
  */
-export default () =>
+;(async () => {
-  new Promise(async (resolve, reject) => {
   try {
-      const nodeMinRequiredVersion = '10'
+    const nodeMinRequiredVersion = '16'
     const npmMinRequiredVersion = '5'
     const flitePath = 'bin/flite/flite'
     const coquiLanguageModelPath = 'bin/coqui/huge-vocabulary.scorer'
@@ -31,10 +32,41 @@ export default () =>
     const skillsResolversNlpModelPath =
       'core/data/models/leon-skills-resolvers-model.nlp'
     const mainNlpModelPath = 'core/data/models/leon-main-model.nlp'
+    const pastebinData = {
+      leonVersion: null,
+      environment: {
+        osDetails: null,
+        nodeVersion: null,
+        npmVersion: null
+      },
+      nlpModels: {
+        globalResolversModelState: null,
+        skillsResolversModelState: null,
+        mainModelState: null
+      },
+      skillExecution: {
+        executionTime: null,
+        command: null,
+        output: null,
+        error: null
+      },
+      tcpServer: {
+        startTime: null,
+        command: null,
+        output: null,
+        error: null
+      },
+      report: null
+    }
     const report = {
       can_run: { title: 'Run', type: 'error', v: true },
       can_run_skill: { title: 'Run skills', type: 'error', v: true },
       can_text: { title: 'Reply you by texting', type: 'error', v: true },
+      can_start_tcp_server: {
+        title: 'Start the TCP server',
+        type: 'error',
+        v: true
+      },
       can_amazon_polly_tts: {
         title: 'Amazon Polly text-to-speech',
         type: 'warning',
@@ -80,6 +112,7 @@ export default () =>
 
     LogHelper.info('Leon version')
     LogHelper.success(`${version}\n`)
+    pastebinData.leonVersion = version
 
     /**
      * Environment checking
@@ -95,6 +128,7 @@ export default () =>
       release: os.release()
     }
     LogHelper.success(`${JSON.stringify(osInfo)}\n`)
+    pastebinData.environment.osDetails = osInfo
     ;(
       await Promise.all([
         command('node --version', { shell: true }),
@@ -105,10 +139,7 @@ export default () =>
 
       if (
         p.command.indexOf('node --version') !== -1 &&
-          !semver.satisfies(
+        !semver.satisfies(semver.clean(p.stdout), `>=${nodeMinRequiredVersion}`)
-            semver.clean(p.stdout),
-            `>=${nodeMinRequiredVersion}`
-          )
       ) {
         Object.keys(report).forEach((item) => {
           if (report[item].type === 'error') report[item].v = false
@@ -118,10 +149,7 @@ export default () =>
         )
       } else if (
         p.command.indexOf('npm --version') !== -1 &&
-          !semver.satisfies(
+        !semver.satisfies(semver.clean(p.stdout), `>=${npmMinRequiredVersion}`)
-            semver.clean(p.stdout),
-            `>=${npmMinRequiredVersion}`
-          )
       ) {
         Object.keys(report).forEach((item) => {
           if (report[item].type === 'error') report[item].v = false
@@ -131,6 +159,11 @@ export default () =>
         )
       } else {
         LogHelper.success(`${p.stdout}\n`)
+        if (p.command.includes('node --version')) {
+          pastebinData.environment.nodeVersion = p.stdout
+        } else if (p.command.includes('npm --version')) {
+          pastebinData.environment.npmVersion = p.stdout
+        }
       }
     })
 
@@ -138,21 +171,87 @@ export default () =>
      * Skill execution checking
      */
 
+    LogHelper.info('Executing a skill...')
+
     try {
-        LogHelper.time('Skill execution time')
+      const executionStart = Date.now()
       const p = await command(
         `${PYTHON_BRIDGE_BIN_PATH} scripts/assets/intent-object.json`,
         { shell: true }
       )
-        LogHelper.timeEnd('Skill execution time')
+      const executionEnd = Date.now()
+      const executionTime = executionEnd - executionStart
       LogHelper.info(p.command)
-        LogHelper.success(`${p.stdout}\n`)
+      pastebinData.skillExecution.command = p.command
+      LogHelper.success(p.stdout)
+      pastebinData.skillExecution.output = p.stdout
+      LogHelper.info(`Skill execution time: ${executionTime}ms\n`)
+      pastebinData.skillExecution.executionTime = `${executionTime}ms`
     } catch (e) {
       LogHelper.info(e.command)
       report.can_run_skill.v = false
       LogHelper.error(`${e}\n`)
+      pastebinData.skillExecution.error = JSON.stringify(e)
     }
 
+    /**
+     * TCP server startup checking
+     */
+
+    LogHelper.info('Starting the TCP server...')
+
+    const tcpServerCommand = `${TCP_SERVER_BIN_PATH} en`
+    const tcpServerStart = Date.now()
+    const p = spawn(tcpServerCommand, { shell: true })
+
+    LogHelper.info(tcpServerCommand)
+    pastebinData.tcpServer.command = tcpServerCommand
+
+    if (osInfo.platform === 'darwin') {
+      LogHelper.info(
+        'For the first start, it may take a few minutes to cold start the TCP server on macOS. No worries it is a one-time thing'
+      )
+    }
+
+    let tcpServerOutput = ''
+
+    p.stdout.on('data', (data) => {
+      const newData = data.toString()
+      tcpServerOutput += newData
+
+      if (newData?.toLowerCase().includes('waiting for')) {
+        kill(p.pid)
+        LogHelper.success('The TCP server can successfully start')
+      }
+    })
+
+    p.stderr.on('data', (data) => {
+      const newData = data.toString()
+      tcpServerOutput += newData
+      report.can_start_tcp_server.v = false
+      pastebinData.tcpServer.error = newData
+      LogHelper.error(`Cannot start the TCP server: ${newData}`)
+    })
+
+    const timeout = 3 * 60_000
+    // In case it takes too long, force kill
+    setTimeout(() => {
+      kill(p.pid)
+
+      const error = `The TCP server timed out after ${timeout}ms`
+      LogHelper.error(error)
+      pastebinData.tcpServer.error = error
+      report.can_start_tcp_server.v = false
+    }, timeout)
+
+    p.stdout.on('end', () => {
+      const tcpServerEnd = Date.now()
+      pastebinData.tcpServer.output = tcpServerOutput
+      pastebinData.tcpServer.startTime = `${tcpServerEnd - tcpServerStart}ms`
+      LogHelper.info(
+        `TCP server startup time: ${pastebinData.tcpServer.startTime}ms\n`
+      )
+
       /**
        * Global resolvers NLP model checking
        */
@@ -163,16 +262,22 @@ export default () =>
         !fs.existsSync(globalResolversNlpModelPath) ||
         !Object.keys(fs.readFileSync(globalResolversNlpModelPath)).length
       ) {
+        const state = 'Global resolvers NLP model not found or broken'
+
         report.can_text.v = false
         Object.keys(report).forEach((item) => {
           if (item.indexOf('stt') !== -1 || item.indexOf('tts') !== -1)
             report[item].v = false
         })
         LogHelper.error(
-          'Global resolvers NLP model not found or broken. Try to generate a new one: "npm run train"\n'
+          `${state}. Try to generate a new one: "npm run train"\n`
         )
+        pastebinData.nlpModels.globalResolversModelState = state
       } else {
-        LogHelper.success('Found and valid\n')
+        const state = 'Found and valid'
+
+        LogHelper.success(`${state}\n`)
+        pastebinData.nlpModels.globalResolversModelState = state
       }
 
       /**
@@ -185,16 +290,22 @@ export default () =>
         !fs.existsSync(skillsResolversNlpModelPath) ||
         !Object.keys(fs.readFileSync(skillsResolversNlpModelPath)).length
       ) {
+        const state = 'Skills resolvers NLP model not found or broken'
+
         report.can_text.v = false
         Object.keys(report).forEach((item) => {
           if (item.indexOf('stt') !== -1 || item.indexOf('tts') !== -1)
             report[item].v = false
         })
         LogHelper.error(
-          'Skills resolvers NLP model not found or broken. Try to generate a new one: "npm run train"\n'
+          `${state}. Try to generate a new one: "npm run train"\n`
         )
+        pastebinData.nlpModels.skillsResolversModelState = state
       } else {
-        LogHelper.success('Found and valid\n')
+        const state = 'Found and valid'
+
+        LogHelper.success(`${state}\n`)
+        pastebinData.nlpModels.skillsResolversModelState = state
       }
 
       /**
@@ -207,16 +318,22 @@ export default () =>
         !fs.existsSync(mainNlpModelPath) ||
         !Object.keys(fs.readFileSync(mainNlpModelPath)).length
       ) {
+        const state = 'Main NLP model not found or broken'
+
         report.can_text.v = false
         Object.keys(report).forEach((item) => {
           if (item.indexOf('stt') !== -1 || item.indexOf('tts') !== -1)
             report[item].v = false
         })
         LogHelper.error(
-          'Main NLP model not found or broken. Try to generate a new one: "npm run train"\n'
+          `${state}. Try to generate a new one: "npm run train"\n`
         )
+        pastebinData.nlpModels.mainModelState = state
       } else {
-        LogHelper.success('Found and valid\n')
+        const state = 'Found and valid'
+
+        LogHelper.success(`${state}\n`)
+        pastebinData.nlpModels.mainModelState = state
       }
 
       /**
@@ -340,7 +457,12 @@ export default () =>
       })
 
       LogHelper.default('')
-      if (report.can_run.v && report.can_run_skill.v && report.can_text.v) {
+      if (
+        report.can_run.v &&
+        report.can_run_skill.v &&
+        report.can_text.v &&
+        report.can_start_tcp_server.v
+      ) {
         LogHelper.success('Hooray! Leon can run correctly')
         LogHelper.info(
           'If you have some yellow warnings, it is all good. It means some entities are not yet configured'
@@ -349,9 +471,13 @@ export default () =>
         LogHelper.error('Please fix the errors above')
       }
 
-      resolve()
+      pastebinData.report = report
+
+      console.log('pastebinData', pastebinData)
+
+      process.exit(0)
+    })
   } catch (e) {
     LogHelper.error(e)
-      reject()
   }
-  })
+})()

scripts/run-check.js

@@ -1,16 +0,0 @@
-import { LoaderHelper } from '@/helpers/loader-helper'
-
-import check from './check'
-
-/**
- * Execute the checking script
- */
-;(async () => {
-  try {
-    LoaderHelper.start()
-    await check()
-    LoaderHelper.stop()
-  } catch (e) {
-    LoaderHelper.stop()
-  }
-})()

tcp_server/src/lib/TCPServer.py

@@ -21,7 +21,8 @@ class TCPServer:
 		self.tcp_socket.listen()
 
 		while True:
-			print('Waiting for connection...')
+			# Flush buffered output to make it IPC friendly (readable on stdout)
+			print('Waiting for connection...', flush=True)
 
 			# Our TCP server only needs to support one connection
 			self.conn, self.addr = self.tcp_socket.accept()