@lls/lls-audio 0.0.70 → 0.0.72

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lls/lls-audio",
-  "version": "0.0.70",
+  "version": "0.0.72",
   "main": "index.js",
   "devDependencies": {
     "@kadira/storybook": "2.21.0",

package/recorder/index.js

@@ -115,6 +115,7 @@ var Recorder = function (_Component) {
     // Data
     _this.recordStart = null;
     _this.audioBuffer = [];
+    _this.audioStream = null;
 
     // Methods
     _this.init = _this.init.bind(_this);
@@ -127,6 +128,20 @@ var Recorder = function (_Component) {
     value: function componentDidMount() {
       this.init(this.props);
     }
+  }, {
+    key: 'componentWillUnmount',
+    value: function componentWillUnmount() {
+      if (this.audioStream.getTracks) {
+        var tracks = this.audioStream.getTracks();
+        tracks.forEach(function (track) {
+          return track.stop();
+        });
+      }
+
+      this.audioStream.stop && this.audioStream.stop();
+
+      this.speechEvents.stop();
+    }
   }, {
     key: 'init',
     value: function init(props) {
@@ -166,6 +181,7 @@ var Recorder = function (_Component) {
           onRecordComplete = _ref4.onRecordComplete;
 
       // Init worker that will do heavy calculation
+      this.audioStream = stream;
       this.worker = initWorker({ onMessage: function onMessage(e) {
           switch (e.data.command) {
             case 'send_buffers':

package/stories/wordDetector.js

@@ -37,15 +37,15 @@ var onNotAvailable = function onNotAvailable() {
 var onError = function onError(e) {
   return console.log("onError", e);
 };
-var onSuccess = function onSuccess(res, attempts) {
-  return console.log({ res: res, attempts: attempts });
+var onSuccess = function onSuccess(res) {
+  return console.log("onSucces", res);
 };
-var onFailure = function onFailure(res, attempts) {
-  return console.log({ res: res, attempts: attempts });
+var onFailure = function onFailure(res) {
+  return console.log("onFailure", res);
 };
 
 var CONFIG = {
-  API_URL: 'http://localhost:3004/speechtotext'
+  API_URL: 'https://api-dev.lelivrescolaire.fr/speechtotext'
 
   // Instanciate component with config
 };var WordDetectorComponent = (0, _wordDetector.createWordDetector)(CONFIG);
@@ -84,7 +84,6 @@ var WordDetectorExample = function (_Component) {
           onError: onError,
           onSuccess: onSuccess,
           onFailure: onFailure,
-          record: true,
           onRecordComplete: onRecordComplete
         })
       );

package/wordDetector/index.js

@@ -73,8 +73,7 @@ var WordDetector = function (_Component) {
     var _this = _possibleConstructorReturn(this, (WordDetector.__proto__ || Object.getPrototypeOf(WordDetector)).call(this, props));
 
     _this.state = {
-      attempts: 0,
-      browserApiAvailable: true
+      attempts: 0
     };
     _this.onError = _this.onError.bind(_this);
     _this.onSuccess = _this.onSuccess.bind(_this);
@@ -86,23 +85,27 @@ var WordDetector = function (_Component) {
 
   _createClass(WordDetector, [{
     key: 'onSuccess',
-    value: function onSuccess(res, attempts) {
+    value: function onSuccess(res, attempts, url) {
       var onSuccess = this.props.onSuccess;
 
       this.setState({
-        attempts: attempts
+        attempts: 0
+      });
+      onSuccess({
+        res: res, attempts: attempts, url: url
       });
-      onSuccess(res, attempts);
     }
   }, {
     key: 'onFailure',
-    value: function onFailure(res, attempts) {
+    value: function onFailure(res, attempts, url) {
       var onFailure = this.props.onFailure;
 
       this.setState({
         attempts: attempts
       });
-      onFailure(res, attempts);
+      onFailure({
+        res: res, attempts: attempts, url: url
+      });
     }
   }, {
     key: 'onError',
@@ -114,8 +117,10 @@ var WordDetector = function (_Component) {
   }, {
     key: 'onApiResult',
     value: function onApiResult(_ref) {
-      var _ref$transcript = _ref.transcript,
-          transcript = _ref$transcript === undefined ? '' : _ref$transcript;
+      var speechToText = _ref.speechToText,
+          url = _ref.url;
+
+      var transcript = speechToText && speechToText[0];
       var attempts = this.state.attempts;
       var _props = this.props,
           word = _props.word,
@@ -124,7 +129,7 @@ var WordDetector = function (_Component) {
       var incrementedAttempts = attempts + 1;
       var success = compare(word, transcript);
       var cb = success ? this.onSuccess : this.onFailure;
-      cb(transcript, incrementedAttempts);
+      cb(transcript, incrementedAttempts, url);
     }
   }, {
     key: 'onRecordComplete',
@@ -133,46 +138,27 @@ var WordDetector = function (_Component) {
 
       //debug(wav)
       var _props2 = this.props,
-          alwaysUseApi = _props2.alwaysUseApi,
           config = _props2.config,
           onRecordComplete = _props2.onRecordComplete;
       var API_URL = config.API_URL;
-      var browserApiAvailable = this.state.browserApiAvailable;
 
 
-      var useHtmlDetector = isSpeechRecognitionAvailable && !alwaysUseApi;
-
-      // Upload to Speech to text Api
-      if (!useHtmlDetector) {
-        if (!API_URL) {
-          return this.onError(new Error('Missing API_URL in CONF'));
-        }
-
-        sendFileToSpeechToTextApi(API_URL, wav).then(function (res) {
-          _this2.onApiResult(res);
-        }).catch(function (e) {
-          _this2.onError(e);
-        });
+      if (!API_URL) {
+        return this.onError(new Error('Missing API_URL in CONF'));
       }
 
+      sendFileToSpeechToTextApi(API_URL, wav).then(function (res) {
+        _this2.onApiResult(JSON.parse(res));
+      }).catch(function (e) {
+        _this2.onError(e);
+      });
+
       onRecordComplete(wav);
     }
   }, {
     key: 'render',
     value: function render() {
-      var _props3 = this.props,
-          record = _props3.record,
-          word = _props3.word,
-          compare = _props3.compare,
-          alwaysUseApi = _props3.alwaysUseApi;
-
-      var useHtmlDetector = isSpeechRecognitionAvailable && !alwaysUseApi;
-      return _react2.default.createElement(
-        'div',
-        null,
-        useHtmlDetector ? _react2.default.createElement(_reactSpeechRecognizer.WordDetector, { word: word, compare: compare, onFailure: this.onFailure, onSuccess: this.onSuccess }) : _react2.default.createElement(_recorder2.default, { onError: this.onError, onRecordComplete: this.onRecordComplete }),
-        useHtmlDetector && record && _react2.default.createElement(_recorder2.default, { onError: this.onError, onRecordComplete: this.onRecordComplete })
-      );
+      return _react2.default.createElement(_recorder2.default, { onError: this.onError, onRecordComplete: this.onRecordComplete });
     }
   }]);
 
@@ -180,9 +166,7 @@ var WordDetector = function (_Component) {
 }(_react.Component);
 
 WordDetector.defaultProps = {
-  alwaysUseApi: true,
   config: {},
-  record: false,
   word: '',
   compare: defaultCompare,
   onRecordComplete: function onRecordComplete() {},