@lls/lls-audio 0.0.65 → 0.0.67

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lls/lls-audio",
-  "version": "0.0.65",
+  "version": "0.0.67",
   "main": "index.js",
   "devDependencies": {
     "@kadira/storybook": "2.21.0",
@@ -19,7 +19,6 @@
     "react": "15.3.1",
     "react-dom": "15.3.1",
     "release-it": "2.4.0",
-    "similarity": "1.1.1",
     "style-loader": "0.13.1",
     "superheroes": "1.0.0"
   },
@@ -28,7 +27,8 @@
     "inline-worker": "1.1.0",
     "is_js": "0.9.0",
     "react-input-range": "0.9.3",
-    "react-speech-recognizer": "0.0.9",
+    "react-speech-recognizer": "0.1.1",
+    "similarity": "1.1.1",
     "waveform-data": "2.0.0"
   },
   "peerDependencies": {

package/recorder/AudioWorker.js

@@ -56,7 +56,6 @@ var AudioWorker = function AudioWorker(self) {
     };
 
     var encodeWAV = function encodeWAV(samples) {
-      console.log("samples", samples.length);
       var buffer = new ArrayBuffer(44 + samples.length * 2);
       var view = new DataView(buffer);
 

package/recorder/index.js

@@ -99,14 +99,14 @@ var initSpeechEvents = function initSpeechEvents(_ref3) {
   return speechEvents;
 };
 
-var DesktopAudioRecorder = function (_Component) {
-  _inherits(DesktopAudioRecorder, _Component);
+var Recorder = function (_Component) {
+  _inherits(Recorder, _Component);
 
-  function DesktopAudioRecorder(props) {
-    _classCallCheck(this, DesktopAudioRecorder);
+  function Recorder(props) {
+    _classCallCheck(this, Recorder);
 
     // Instances
-    var _this = _possibleConstructorReturn(this, (DesktopAudioRecorder.__proto__ || Object.getPrototypeOf(DesktopAudioRecorder)).call(this, props));
+    var _this = _possibleConstructorReturn(this, (Recorder.__proto__ || Object.getPrototypeOf(Recorder)).call(this, props));
 
     _this.worker = null;
     _this.recorder = null;
@@ -122,7 +122,7 @@ var DesktopAudioRecorder = function (_Component) {
     return _this;
   }
 
-  _createClass(DesktopAudioRecorder, [{
+  _createClass(Recorder, [{
     key: 'componentDidMount',
     value: function componentDidMount() {
       this.init(this.props);
@@ -132,7 +132,9 @@ var DesktopAudioRecorder = function (_Component) {
     value: function init(props) {
       var _this2 = this;
 
-      var _props$onError = props.onError,
+      var _props$onNotAvailable = props.onNotAvailable,
+          onNotAvailable = _props$onNotAvailable === undefined ? function () {} : _props$onNotAvailable,
+          _props$onError = props.onError,
           onError = _props$onError === undefined ? function () {} : _props$onError,
           _props$onVolumeChange = props.onVolumeChange,
           onVolumeChange = _props$onVolumeChange === undefined ? function () {} : _props$onVolumeChange,
@@ -150,7 +152,7 @@ var DesktopAudioRecorder = function (_Component) {
           onRecordComplete: onRecordComplete
         });
       }).catch(function (err) {
-        onError(err);
+        onNotAvailable(err);
       });
     }
   }, {
@@ -216,7 +218,7 @@ var DesktopAudioRecorder = function (_Component) {
     }
   }]);
 
-  return DesktopAudioRecorder;
+  return Recorder;
 }(_react.Component);
 
-exports.default = DesktopAudioRecorder;
+exports.default = Recorder;

package/stories/wordDetector.js

@@ -28,6 +28,12 @@ function _possibleConstructorReturn(self, call) { if (!self) { throw new Referen
 
 function _inherits(subClass, superClass) { if (typeof superClass !== "function" && superClass !== null) { throw new TypeError("Super expression must either be null or a function, not " + typeof superClass); } subClass.prototype = Object.create(superClass && superClass.prototype, { constructor: { value: subClass, enumerable: false, writable: true, configurable: true } }); if (superClass) Object.setPrototypeOf ? Object.setPrototypeOf(subClass, superClass) : subClass.__proto__ = superClass; }
 
+var onRecordComplete = function onRecordComplete() {
+  return console.log("onRecordComplete");
+};
+var onNotAvailable = function onNotAvailable() {
+  return console.log("onNotAvailable");
+};
 var onError = function onError(e) {
   return console.log("onError", e);
 };
@@ -74,9 +80,12 @@ var WordDetectorExample = function (_Component) {
         _react2.default.createElement(WordDetectorComponent, {
           word: 'hello',
           onVolumeChange: this.setVolume,
+          onNotAvailable: onNotAvailable,
           onError: onError,
           onSuccess: onSuccess,
-          onFailure: onFailure
+          onFailure: onFailure,
+          record: true,
+          onRecordComplete: onRecordComplete
         })
       );
     }

package/wordDetector/index.js

@@ -36,6 +36,7 @@ function _possibleConstructorReturn(self, call) { if (!self) { throw new Referen
 function _inherits(subClass, superClass) { if (typeof superClass !== "function" && superClass !== null) { throw new TypeError("Super expression must either be null or a function, not " + typeof superClass); } subClass.prototype = Object.create(superClass && superClass.prototype, { constructor: { value: subClass, enumerable: false, writable: true, configurable: true } }); if (superClass) Object.setPrototypeOf ? Object.setPrototypeOf(subClass, superClass) : subClass.__proto__ = superClass; }
 
 var SIMILARITY_THRESHOLD = 0.8;
+var isSpeechRecognitionAvailable = (0, _reactSpeechRecognizer.speechRecognitionAvailable)();
 
 var debug = function debug(wav) {
   _fileSaver2.default.saveAs(wav, 'test.wav');
@@ -78,7 +79,6 @@ var WordDetector = function (_Component) {
       browserApiAvailable: true
     };
     _this.onError = _this.onError.bind(_this);
-    _this.onNotAvailable = _this.onNotAvailable.bind(_this);
     _this.onSuccess = _this.onSuccess.bind(_this);
     _this.onFailure = _this.onFailure.bind(_this);
     _this.onApiResult = _this.onApiResult.bind(_this);
@@ -87,13 +87,6 @@ var WordDetector = function (_Component) {
   }
 
   _createClass(WordDetector, [{
-    key: 'onNotAvailable',
-    value: function onNotAvailable() {
-      this.setState({
-        browserApiAvailable: false
-      });
-    }
-  }, {
     key: 'onSuccess',
     value: function onSuccess(res, attempts) {
       var _props$onSuccess = this.props.onSuccess,
@@ -145,34 +138,46 @@ var WordDetector = function (_Component) {
       var _this2 = this;
 
       //debug(wav)
-      var _props$config = this.props.config,
-          config = _props$config === undefined ? {} : _props$config;
+      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;
       var API_URL = config.API_URL;
+      var browserApiAvailable = this.state.browserApiAvailable;
 
+      // Upload to Speech to text Api
 
-      if (!API_URL) {
-        return this.onError(new Error('Missing API_URL in CONF'));
+      if (!isSpeechRecognitionAvailable) {
+        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);
+        });
       }
 
-      sendFileToSpeechToTextApi(API_URL, wav).then(function (res) {
-        _this2.onApiResult(res);
-      }).catch(function (e) {
-        _this2.onError(e);
-      });
+      onRecordComplete(wav);
     }
   }, {
     key: 'render',
     value: function render() {
-      var _props2 = this.props,
-          _props2$config = _props2.config,
-          config = _props2$config === undefined ? {} : _props2$config,
-          word = _props2.word,
-          _props2$compare = _props2.compare,
-          compare = _props2$compare === undefined ? defaultCompare : _props2$compare;
-      var API_URL = config.API_URL;
-      var browserApiAvailable = this.state.browserApiAvailable;
-
-      return browserApiAvailable ? _react2.default.createElement(_reactSpeechRecognizer.WordDetector, { word: word, compare: compare, onNotAvailable: this.onNotAvailable, onFailure: this.onFailure, onSuccess: this.onSuccess }) : API_URL ? _react2.default.createElement(_recorder2.default, { onError: this.onError, onRecordComplete: this.onRecordComplete }) : null;
+      var _props3 = this.props,
+          _props3$record = _props3.record,
+          record = _props3$record === undefined ? false : _props3$record,
+          word = _props3.word,
+          _props3$compare = _props3.compare,
+          compare = _props3$compare === undefined ? defaultCompare : _props3$compare;
+
+      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 })
+      );
     }
   }]);