refactor(server): remove skill answer type complexity

server/src/core/brain/brain.ts

@@ -15,11 +15,7 @@ import type {
   IntentObject,
   SkillResult
 } from '@/core/brain/types'
-import {
-  SkillActionTypes,
-  SkillBridges,
-  SkillOutputTypes
-} from '@/core/brain/types'
+import { SkillActionTypes, SkillBridges } from '@/core/brain/types'
 import { langs } from '@@/core/langs.json'
 import {
   HAS_TTS,
@@ -199,8 +195,7 @@ export default class Brain {
       const obj = JSON.parse(data.toString())
 
       if (typeof obj === 'object') {
-        if (obj.output.type === SkillOutputTypes.Intermediate) {
-          LogHelper.title(`${this.skillFriendlyName} skill`)
+        LogHelper.title(`${this.skillFriendlyName} skill (on data)`)
         LogHelper.info(data.toString())
 
         const speech = obj.output.speech.toString()
@@ -208,9 +203,7 @@ export default class Brain {
           this.talk(speech)
         }
         this.speeches.push(speech)
-        } else {
         this.skillOutput = data.toString()
-        }
 
         return Promise.resolve(null)
       } else {
@@ -388,7 +381,7 @@ export default class Brain {
 
           // Catch the end of the skill execution
           this.skillProcess?.stdout.on('end', () => {
-            LogHelper.title(`${this.skillFriendlyName} skill`)
+            LogHelper.title(`${this.skillFriendlyName} skill (on end)`)
             LogHelper.info(this.skillOutput)
 
             let skillResult: SkillResult | undefined = undefined
@@ -398,21 +391,12 @@ export default class Brain {
               try {
                 skillResult = JSON.parse(this.skillOutput)
 
-                if (skillResult?.output.speech) {
-                  skillResult.output.speech =
-                    skillResult.output.speech.toString()
-                  if (!this.isMuted) {
-                    this.talk(skillResult.output.speech, true)
-                  }
-                  speeches.push(skillResult.output.speech)
-
                 // Synchronize the downloaded content if enabled
                 if (
-                    skillResult.output.type === SkillOutputTypes.End &&
+                  skillResult &&
                   skillResult.output.options['synchronization'] &&
                   skillResult.output.options['synchronization'].enabled &&
-                    skillResult.output.options['synchronization'].enabled ===
-                      true
+                  skillResult.output.options['synchronization'].enabled === true
                 ) {
                   const sync = new Synchronizer(
                     this,
@@ -428,7 +412,6 @@ export default class Brain {
                     speeches.push(speech)
                   })
                 }
-                }
               } catch (e) {
                 LogHelper.title(`${this.skillFriendlyName} skill`)
                 LogHelper.error(

server/src/core/brain/types.ts

@@ -28,7 +28,6 @@ export interface SkillResult {
   entities: NEREntity[]
   slots: NLUSlots
   output: {
-    type: SkillOutputTypes
     codes: string[]
     speech: string
     core: SkillCoreData | undefined
@@ -41,10 +40,6 @@ export enum SkillBridges {
   Python = 'python',
   NodeJS = 'nodejs'
 }
-export enum SkillOutputTypes {
-  Intermediate = 'inter',
-  End = 'end'
-}
 export enum SkillActionTypes {
   Logic = 'logic',
   Dialog = 'dialog'