android-emulator-webrtc 1.0.16 → 1.0.18

package/dist/components/emulator/views/webrtc_view.js

@@ -1,207 +1,138 @@
 "use strict";
 
 var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
-
 var _typeof = require("@babel/runtime/helpers/typeof");
-
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports["default"] = void 0;
-
-var _classCallCheck2 = _interopRequireDefault(require("@babel/runtime/helpers/classCallCheck"));
-
-var _createClass2 = _interopRequireDefault(require("@babel/runtime/helpers/createClass"));
-
-var _assertThisInitialized2 = _interopRequireDefault(require("@babel/runtime/helpers/assertThisInitialized"));
-
-var _inherits2 = _interopRequireDefault(require("@babel/runtime/helpers/inherits"));
-
-var _possibleConstructorReturn2 = _interopRequireDefault(require("@babel/runtime/helpers/possibleConstructorReturn"));
-
-var _getPrototypeOf2 = _interopRequireDefault(require("@babel/runtime/helpers/getPrototypeOf"));
-
-var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
-
+var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
 var _propTypes = _interopRequireDefault(require("prop-types"));
-
 var _react = _interopRequireWildcard(require("react"));
-
 function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
-
 function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || _typeof(obj) !== "object" && typeof obj !== "function") { return { "default": obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj["default"] = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
-
-function _createSuper(Derived) { var hasNativeReflectConstruct = _isNativeReflectConstruct(); return function _createSuperInternal() { var Super = (0, _getPrototypeOf2["default"])(Derived), result; if (hasNativeReflectConstruct) { var NewTarget = (0, _getPrototypeOf2["default"])(this).constructor; result = Reflect.construct(Super, arguments, NewTarget); } else { result = Super.apply(this, arguments); } return (0, _possibleConstructorReturn2["default"])(this, result); }; }
-
-function _isNativeReflectConstruct() { if (typeof Reflect === "undefined" || !Reflect.construct) return false; if (Reflect.construct.sham) return false; if (typeof Proxy === "function") return true; try { Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); return true; } catch (e) { return false; } }
-
-/**
- * A view on the emulator that is using WebRTC. It will use the Jsep protocol over gRPC to
- * establish the video streams.
+/*
+ * Copyright 2019 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  */
-var EmulatorWebrtcView = /*#__PURE__*/function (_Component) {
-  (0, _inherits2["default"])(EmulatorWebrtcView, _Component);
-
-  var _super = _createSuper(EmulatorWebrtcView);
-
-  function EmulatorWebrtcView(props) {
-    var _this;
-
-    (0, _classCallCheck2["default"])(this, EmulatorWebrtcView);
-    _this = _super.call(this, props);
-    (0, _defineProperty2["default"])((0, _assertThisInitialized2["default"])(_this), "state", {
-      audio: false
-    });
-    (0, _defineProperty2["default"])((0, _assertThisInitialized2["default"])(_this), "onDisconnect", function () {
-      _this.setState({
-        connect: "disconnected"
-      }, _this.broadcastState);
-
-      _this.setState({
-        audio: false
-      }, function () {
-        _this.props.onAudioStateChange(false);
-      });
-    });
-    (0, _defineProperty2["default"])((0, _assertThisInitialized2["default"])(_this), "onConnect", function (track) {
-      _this.setState({
-        connect: "connected"
-      }, _this.broadcastState);
-
-      var video = _this.video.current;
-
-      if (!video) {
-        // Component was unmounted.
-        return;
-      }
 
-      if (!video.srcObject) {
-        video.srcObject = new MediaStream();
-      }
-
-      video.srcObject.addTrack(track);
-
-      if (track.kind === "audio") {
-        _this.setState({
-          audio: true
-        }, function () {
-          _this.props.onAudioStateChange(true);
-        });
-      }
-    });
-    (0, _defineProperty2["default"])((0, _assertThisInitialized2["default"])(_this), "safePlay", function () {
-      var video = _this.video.current;
-      var self = (0, _assertThisInitialized2["default"])(_this);
-
-      if (!video) {
-        // Component was unmounted.
-        return;
-      } // See https://developer.mozilla.org/en-US/docs/Web/API/HTMLMediaElement/play
-
-
-      var possiblePromise = video.play();
-
-      if (possiblePromise) {
-        possiblePromise.then(function (_) {
-          console.debug("Automatic playback started!");
-        })["catch"](function (error) {
-          // Notify listeners that we cannot start.
-          self.onError(error);
-        });
-      }
-    });
-    (0, _defineProperty2["default"])((0, _assertThisInitialized2["default"])(_this), "onCanPlay", function (e) {
-      _this.safePlay();
-    });
-    (0, _defineProperty2["default"])((0, _assertThisInitialized2["default"])(_this), "onContextMenu", function (e) {
-      e.preventDefault();
-    });
-    _this.video = /*#__PURE__*/_react["default"].createRef();
-    return _this;
-  }
-
-  (0, _createClass2["default"])(EmulatorWebrtcView, [{
-    key: "broadcastState",
-    value: function broadcastState() {
-      var onStateChange = this.props.onStateChange;
-
-      if (onStateChange) {
-        onStateChange(this.state.connect);
-      }
+var EmulatorWebrtcView = function EmulatorWebrtcView(_ref) {
+  var jsep = _ref.jsep,
+    onStateChange = _ref.onStateChange,
+    onAudioStateChange = _ref.onAudioStateChange,
+    muted = _ref.muted,
+    volume = _ref.volume,
+    onError = _ref.onError;
+  var _useState = (0, _react.useState)(false),
+    _useState2 = (0, _slicedToArray2["default"])(_useState, 2),
+    audio = _useState2[0],
+    setAudio = _useState2[1];
+  var videoRef = (0, _react.useRef)(null);
+  var _useState3 = (0, _react.useState)("connecting"),
+    _useState4 = (0, _slicedToArray2["default"])(_useState3, 2),
+    connect = _useState4[0],
+    setConnect = _useState4[1];
+  (0, _react.useEffect)(function () {
+    if (onStateChange) {
+      onStateChange(connect);
     }
-  }, {
-    key: "componentWillUnmount",
-    value: function componentWillUnmount() {
-      this.props.jsep.disconnect();
+  }, [connect]);
+  (0, _react.useEffect)(function () {
+    if (onAudioStateChange) {
+      onAudioStateChange(audio);
     }
-  }, {
-    key: "componentDidMount",
-    value: function componentDidMount() {
-      var _this2 = this;
-
-      this.props.jsep.on("connected", this.onConnect);
-      this.props.jsep.on("disconnected", this.onDisconnect);
-      this.setState({
-        connect: "connecting"
-      }, function () {
-        _this2.props.jsep.startStream();
-
-        _this2.broadcastState();
-      });
+  }, [audio]);
+  var onDisconnect = function onDisconnect() {
+    setConnect("disconnected");
+    setAudio(false);
+  };
+  var onConnect = function onConnect(track) {
+    setConnect("connected");
+    var video = videoRef.current;
+    if (!video) {
+      // Component was unmounted.
+      return;
+    }
+    if (!video.srcObject) {
+      video.srcObject = new MediaStream();
+    }
+    video.srcObject.addTrack(track);
+    if (track.kind === "audio") {
+      setAudio(true);
     }
-  }, {
-    key: "render",
-    value: function render() {
-      var _this$props = this.props,
-          muted = _this$props.muted,
-          volume = _this$props.volume;
-      return /*#__PURE__*/_react["default"].createElement("video", {
-        ref: this.video,
-        style: {
-          display: "block",
-          position: "relative",
-          width: "100%",
-          height: "100%",
-          objectFit: "contain",
-          objectPosition: "center"
-        },
-        volume: volume,
-        muted: muted,
-        onContextMenu: this.onContextMenu,
-        onCanPlay: this.onCanPlay
+  };
+  var safePlay = function safePlay() {
+    var video = videoRef.current;
+    if (!video) {
+      // Component was unmounted.
+      return;
+    }
+    var possiblePromise = video.play();
+    if (possiblePromise) {
+      possiblePromise.then(function (_) {
+        console.debug("Automatic playback started!");
+      })["catch"](function (error) {
+        // Notify listeners that we cannot start.
+        onError(error);
       });
     }
-  }]);
-  return EmulatorWebrtcView;
-}(_react.Component);
-
-exports["default"] = EmulatorWebrtcView;
-(0, _defineProperty2["default"])(EmulatorWebrtcView, "propTypes", {
-  /** Jsep protocol driver, used to establish the video stream. */
+  };
+  var onCanPlay = function onCanPlay() {
+    safePlay();
+  };
+  var onContextMenu = function onContextMenu(e) {
+    e.preventDefault();
+  };
+  (0, _react.useEffect)(function () {
+    jsep.on("connected", onConnect);
+    jsep.on("disconnected", onDisconnect);
+    jsep.startStream();
+    setConnect("connecting");
+    return function () {
+      jsep.disconnect();
+    };
+  }, []);
+  return /*#__PURE__*/_react["default"].createElement("video", {
+    ref: videoRef,
+    style: {
+      display: "block",
+      position: "relative",
+      width: "100%",
+      height: "100%",
+      objectFit: "contain",
+      objectPosition: "center"
+    },
+    volume: volume,
+    muted: muted,
+    onContextMenu: onContextMenu,
+    onCanPlay: onCanPlay
+  });
+};
+EmulatorWebrtcView.propTypes = {
   jsep: _propTypes["default"].object,
-
-  /** Function called when the connection state of the emulator changes */
   onStateChange: _propTypes["default"].func,
-
-  /** Function called when the audio track becomes available */
   onAudioStateChange: _propTypes["default"].func,
-
-  /** True if you wish to mute the audio */
   muted: _propTypes["default"].bool,
-
-  /** Volume of the video element, value between 0 and 1.  */
   volume: _propTypes["default"].number,
-
-  /** Function called when an error arises, like play failures due to muting */
   onError: _propTypes["default"].func
-});
-(0, _defineProperty2["default"])(EmulatorWebrtcView, "defaultProps", {
+};
+EmulatorWebrtcView.defaultProps = {
   muted: true,
   volume: 1.0,
   onError: function onError(e) {
     return console.error("WebRTC error: " + e);
-  },
-  onAudioStateChange: function onAudioStateChange(e) {
-    return console.log("Webrtc audio became available: " + e);
   }
-});
+};
+var _default = EmulatorWebrtcView;
+exports["default"] = _default;

package/dist/index.js

@@ -1,7 +1,6 @@
 "use strict";
 
 var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
-
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
@@ -11,21 +10,18 @@ Object.defineProperty(exports, "Emulator", {
     return _emulator["default"];
   }
 });
-Object.defineProperty(exports, "Logcat", {
+Object.defineProperty(exports, "EmulatorStatus", {
   enumerable: true,
   get: function get() {
-    return _logcat["default"];
+    return _emulator_status["default"];
   }
 });
-Object.defineProperty(exports, "EmulatorStatus", {
+Object.defineProperty(exports, "Logcat", {
   enumerable: true,
   get: function get() {
-    return _emulator_status["default"];
+    return _logcat["default"];
   }
 });
-
 var _emulator = _interopRequireDefault(require("./components/emulator/emulator"));
-
 var _logcat = _interopRequireDefault(require("./components/emulator/net/logcat"));
-
 var _emulator_status = _interopRequireDefault(require("./components/emulator/net/emulator_status"));