@lls/lls-audio 0.0.69 → 0.0.71

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lls/lls-audio",
-  "version": "0.0.69",
+  "version": "0.0.71",
   "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/wordDetector/index.js

@@ -87,8 +87,7 @@ var WordDetector = function (_Component) {
   _createClass(WordDetector, [{
     key: 'onSuccess',
     value: function onSuccess(res, attempts) {
-      var _props$onSuccess = this.props.onSuccess,
-          onSuccess = _props$onSuccess === undefined ? function () {} : _props$onSuccess;
+      var onSuccess = this.props.onSuccess;
 
       this.setState({
         attempts: attempts
@@ -98,8 +97,7 @@ var WordDetector = function (_Component) {
   }, {
     key: 'onFailure',
     value: function onFailure(res, attempts) {
-      var _props$onFailure = this.props.onFailure,
-          onFailure = _props$onFailure === undefined ? function () {} : _props$onFailure;
+      var onFailure = this.props.onFailure;
 
       this.setState({
         attempts: attempts
@@ -109,8 +107,7 @@ var WordDetector = function (_Component) {
   }, {
     key: 'onError',
     value: function onError(e) {
-      var _props$onError = this.props.onError,
-          onError = _props$onError === undefined ? function () {} : _props$onError;
+      var onError = this.props.onError;
 
       onError(e);
     }
@@ -122,8 +119,7 @@ var WordDetector = function (_Component) {
       var attempts = this.state.attempts;
       var _props = this.props,
           word = _props.word,
-          _props$compare = _props.compare,
-          compare = _props$compare === undefined ? defaultCompare : _props$compare;
+          compare = _props.compare;
 
       var incrementedAttempts = attempts + 1;
       var success = compare(word, transcript);
@@ -137,16 +133,17 @@ var WordDetector = function (_Component) {
 
       //debug(wav)
       var _props2 = this.props,
-          _props2$config = _props2.config,
-          config = _props2$config === undefined ? {} : _props2$config,
-          _props2$onRecordCompl = _props2.onRecordComplete,
-          onRecordComplete = _props2$onRecordCompl === undefined ? function () {} : _props2$onRecordCompl;
+          alwaysUseApi = _props2.alwaysUseApi,
+          config = _props2.config,
+          onRecordComplete = _props2.onRecordComplete;
       var API_URL = config.API_URL;
       var browserApiAvailable = this.state.browserApiAvailable;
 
-      // Upload to Speech to text Api
 
-      if (!isSpeechRecognitionAvailable) {
+      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'));
         }
@@ -164,17 +161,17 @@ var WordDetector = function (_Component) {
     key: 'render',
     value: function render() {
       var _props3 = this.props,
-          _props3$record = _props3.record,
-          record = _props3$record === undefined ? false : _props3$record,
+          record = _props3.record,
           word = _props3.word,
-          _props3$compare = _props3.compare,
-          compare = _props3$compare === undefined ? defaultCompare : _props3$compare;
+          compare = _props3.compare,
+          alwaysUseApi = _props3.alwaysUseApi;
 
+      var useHtmlDetector = isSpeechRecognitionAvailable && !alwaysUseApi;
       return _react2.default.createElement(
         'div',
         null,
-        isSpeechRecognitionAvailable ? _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 }),
-        isSpeechRecognitionAvailable && record && _react2.default.createElement(_recorder2.default, { onError: this.onError, onRecordComplete: this.onRecordComplete })
+        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 })
       );
     }
   }]);
@@ -182,6 +179,18 @@ var WordDetector = function (_Component) {
   return WordDetector;
 }(_react.Component);
 
+WordDetector.defaultProps = {
+  alwaysUseApi: true,
+  config: {},
+  record: false,
+  word: '',
+  compare: defaultCompare,
+  onRecordComplete: function onRecordComplete() {},
+  onError: function onError() {},
+  onSucces: function onSucces() {},
+  onFailure: function onFailure() {}
+};
+
 exports.default = WordDetector;
 var createWordDetector = exports.createWordDetector = function createWordDetector(config) {
   return function (props) {