Merge pull request #452 from chughts/ogg

OGG mime type of audio/opus correction

Author: chughts

README.md

@@ -7,6 +7,9 @@ Node-RED Watson Nodes for IBM Cloud
 
 <a href="https://cla-assistant.io/watson-developer-cloud/node-red-node-watson"><img src="https://cla-assistant.io/readme/badge/watson-developer-cloud/node-red-node-watson" alt="CLA assistant" /></a>
 
+### New in version 0.7.7
+- STT Node - Set correct content-type when File-Type reports a mime type of audio/opus for ogg;codec=opus files. 
+
 ### New in version 0.7.6
 - Bump SDK Dependency to 3.18.2
 - STT Node To use iam-utils in place of removed iam-token-manager

package.json

@@ -1,11 +1,11 @@
 {
   "name": "node-red-node-watson",
-  "version": "0.7.6",
+  "version": "0.7.7",
   "description": "A collection of Node-RED nodes for IBM Watson services",
   "dependencies": {
     "async": "^1.5.2",
     "cfenv": "~1.0.0",
-    "file-type": "^10.7.0",
+    "file-type": "^10.9.0",
     "request": "~2.86.0",
     "temp": "^0.9.0",
     "qs": "6.x",

services/speech_to_text/v1.js

@@ -176,7 +176,9 @@ module.exports = function (RED) {
         case 'mpeg':
           break;
         default:
-          message = 'Audio format (' + f + ') not supported, must be encoded as WAV, MP3, FLAC or OGG.';
+          if (! ft.mime.toLowerCase().includes('audio')) {
+            message = 'Audio format (' + f + ') not supported, must be encoded as WAV, MP3, FLAC or OGG.';
+          }
         }
       }
       if (message) {
@@ -192,6 +194,24 @@ module.exports = function (RED) {
       return payloadNonStreamCheck(msg);
     }
 
+    function setFormat(format) {
+      // if the format is being seen as either opus or vorbis, then it
+      // could be one of
+      //      audio/ogg;codecs=opus
+      //      audio/ogg;codecs=vorbis
+      //      audio/webm;codecs=opus
+      //      audio/webm;codecs=vorbis
+      // there isn't enough information to decide between audio/ogg and audio/webm
+      // so lets go with audio/ogg
+      switch (format) {
+      case 'opus':
+      case 'vorbis':
+        return 'ogg;codecs=' + format;
+      default:
+        return format;
+      }
+    }
+
     function processInputBuffer(msg) {
       var p = new Promise(function resolver(resolve, reject){
         temp.open({suffix: '.' + fileType(msg.payload).ext}, (err, info) => {
@@ -203,7 +223,8 @@ module.exports = function (RED) {
               audio = fs.createReadStream(info.path);
 
             audioData.audio = audio;
-            audioData.format = format;
+            audioData.format = setFormat(format);
+
             resolve(audioData);
           });
         });
@@ -225,7 +246,7 @@ module.exports = function (RED) {
               audio = fs.createReadStream(info.path);
 
             audioData.audio = audio;
-            audioData.format = format;
+            audioData.format = setFormat(format);
             resolve(audioData);
           });
         });