android-emulator-webrtc 1.0.18 → 2.0.1

package/dist/components/emulator/emulator.js

@@ -6,48 +6,64 @@ 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"));
-var _simple_png_view = _interopRequireDefault(require("./views/simple_png_view.js"));
-var _webrtc_view = _interopRequireDefault(require("./views/webrtc_view.js"));
+var _webrtc_view = _interopRequireDefault(require("./views/webrtc_view"));
 var _event_handler = _interopRequireDefault(require("./views/event_handler"));
-var _jsep_protocol_driver = _interopRequireDefault(require("./net/jsep_protocol_driver.js"));
-var Proto = _interopRequireWildcard(require("../../proto/emulator_controller_pb"));
-var _emulator_web_client = require("../../proto/emulator_web_client");
+var _ws_jsep_protocol_driver = _interopRequireDefault(require("./net/ws_jsep_protocol_driver"));
+var _logger = _interopRequireDefault(require("./net/logger"));
+var _emulator_controller_pb = _interopRequireDefault(require("../../proto/emulator_controller_pb"));
 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; } } /*
-                                                                                                                                                                                                                                                                                                                                           * 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 PngView = (0, _event_handler["default"])(_simple_png_view["default"]);
+/*
+ * 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 RtcView = (0, _event_handler["default"])(_webrtc_view["default"]);
 
+/**
+ * Resolves the given URI into the required REST and WebSocket endpoints for the emulator.
+ *
+ * @param {string} uri The base URI of the emulator gateway.
+ * @returns {Object} An object containing the resolved URLs:
+ *                   - status: The REST endpoint for retrieving emulator status.
+ *                   - gps: The REST endpoint for setting GPS coordinates.
+ *                   - jsep: The WebSocket endpoint for WebRTC JSEP signaling.
+ */
+var getUrls = function getUrls(uri) {
+  var restBase = uri;
+  if (!/^https?:\/\//i.test(uri)) {
+    restBase = "http://" + uri;
+  }
+  var wsUrl = restBase.replace(/^http/i, "ws");
+  restBase = restBase.replace(/\/$/, "");
+  wsUrl = wsUrl.replace(/\/$/, "");
+  return {
+    status: "".concat(restBase, "/api/v1/emulator/status"),
+    gps: "".concat(restBase, "/api/v1/emulator/gps"),
+    jsep: "".concat(wsUrl, "/api/v1/emulator/ws-jsep")
+  };
+};
+
 /**
  * A React component that displays a remote android emulator.
  *
- * The emulator will mount a png or webrtc view component to display the current state
- * of the emulator. It will translate mouse events on this component and send them
- * to the actual emulator.
+ * The emulator will mount a webrtc view component to display the current state
+ * of the emulator. It will translate mouse and touch events on this component and send them
+ * to the actual emulator over WebRTC Data Channels.
  *
  * #### Authentication Service
  *
@@ -56,12 +72,6 @@ var RtcView = (0, _event_handler["default"])(_webrtc_view["default"]);
  * - `authHeader()` which must return a set of headers that should be send along with a request.
  * - `unauthorized()` a function that gets called when a 401 was received.
  *
- * #### Type of view
- *
- * You usually want this to be webrtc as this will make use of the efficient
- * webrtc implementation. The png view will request screenshots, which are
- * very slow, and require the envoy proxy. You should not use this for remote emulators.
- *
  * Note that chrome will not autoplay the video if it is not muted and no interaction
  * with the page has taken place. See https://developers.google.com/web/updates/2017/09/autoplay-policy-changes.
  *
@@ -77,126 +87,125 @@ var RtcView = (0, _event_handler["default"])(_webrtc_view["default"]);
  * "GoHome"          -  Go to the home screen.
  * "GoBack"          -  Open the previous screen you were looking at.
  *
+ * **Note**: The user must have interacted with the page before you can set the volume to "unmuted" (muted = false). Otherwise the video
+ * will not play and will throw an error, which is currently not handled.
+ *
+ * **Note**: The volume is the volume of the video element that is displayed, this is not the actual volume used inside the emulator. You can change the audio inside the emulator by sending the proper keys as documented
+ * above, or follow the steps in the [support](https://support.google.com/android/answer/9082609?hl=en) document
+ * on how to change the audio volume.
+ *
  */
-var Emulator = /*#__PURE__*/function (_Component) {
-  (0, _inherits2["default"])(Emulator, _Component);
-  var _super = _createSuper(Emulator);
-  function Emulator(props) {
-    var _this;
-    (0, _classCallCheck2["default"])(this, Emulator);
-    _this = _super.call(this, props);
-    (0, _defineProperty2["default"])((0, _assertThisInitialized2["default"])(_this), "components", {
-      webrtc: RtcView,
-      png: PngView
-    });
-    (0, _defineProperty2["default"])((0, _assertThisInitialized2["default"])(_this), "state", {
-      audio: false
-    });
-    (0, _defineProperty2["default"])((0, _assertThisInitialized2["default"])(_this), "componentDidMount", function () {
-      _this.updateLocation();
-    });
-    (0, _defineProperty2["default"])((0, _assertThisInitialized2["default"])(_this), "componentDidUpdate", function (prevProps) {
-      if (prevProps.gps !== _this.props.gps) {
-        _this.updateLocation();
-      }
-    });
-    (0, _defineProperty2["default"])((0, _assertThisInitialized2["default"])(_this), "updateLocation", function () {
-      var gps = _this.props.gps;
-      if (typeof gps === "undefined") {
-        return;
+var Emulator = /*#__PURE__*/(0, _react.forwardRef)(function (_ref, ref) {
+  var uri = _ref.uri,
+    _ref$auth = _ref.auth,
+    auth = _ref$auth === void 0 ? null : _ref$auth,
+    _ref$muted = _ref.muted,
+    muted = _ref$muted === void 0 ? true : _ref$muted,
+    _ref$volume = _ref.volume,
+    volume = _ref$volume === void 0 ? 1.0 : _ref$volume,
+    _ref$onStateChange = _ref.onStateChange,
+    onStateChange = _ref$onStateChange === void 0 ? function (s) {
+      _logger["default"].debug("emulator state: " + s);
+    } : _ref$onStateChange,
+    _ref$onAudioStateChan = _ref.onAudioStateChange,
+    onAudioStateChange = _ref$onAudioStateChan === void 0 ? function (s) {
+      _logger["default"].debug("emulator audio: " + s);
+    } : _ref$onAudioStateChan,
+    width = _ref.width,
+    height = _ref.height,
+    gps = _ref.gps,
+    _ref$onError = _ref.onError,
+    onError = _ref$onError === void 0 ? function (e) {
+      _logger["default"].error(e);
+    } : _ref$onError;
+  var _useState = (0, _react.useState)(false),
+    _useState2 = (0, _slicedToArray2["default"])(_useState, 2),
+    audio = _useState2[0],
+    setAudio = _useState2[1];
+  var jsep = (0, _react.useRef)(null);
+  var viewRef = (0, _react.useRef)(null);
+  var onErrorRef = (0, _react.useRef)(onError);
+  (0, _react.useEffect)(function () {
+    onErrorRef.current = onError;
+  }, [onError]);
+  var urls = getUrls(uri);
+  if (!jsep.current) {
+    jsep.current = new _ws_jsep_protocol_driver["default"](urls.jsep, null, {
+      onError: function onError(err) {
+        if (onErrorRef.current) {
+          onErrorRef.current(err);
+        }
       }
-      var state = new Proto.GpsState();
-      state.setLatitude(gps.latitude);
-      state.setLongitude(gps.longitude);
-      state.setAltitude(gps.altitude);
-      state.setBearing(gps.heading);
-      state.setSpeed(gps.speed);
-      _this.emulator.setGps(state);
     });
-    /**
-     * Sends the given key to the emulator.
-     *
-     * You can use this to send physical hardware events to the emulator for example:
-     *
-     * "AudioVolumeDown" - 	Decreases the audio volume.
-     * "AudioVolumeUp"   -	Increases the audio volume.
-     * "Power"	         -  The Power button or key, turn off the device.
-     * "AppSwitch"       -  Should bring up the application switcher dialog.
-     * "GoHome"          -  Go to the home screen.
-     * "GoBack"          -  Open the previous screen you were looking at.
-     *
-     * See https://developer.mozilla.org/en-US/docs/Web/API/KeyboardEvent/key/Key_Values for
-     * a list of valid values you can send as well.
-     */
-    (0, _defineProperty2["default"])((0, _assertThisInitialized2["default"])(_this), "sendKey", function (key) {
-      var request = new Proto.KeyboardEvent();
-      request.setEventtype(Proto.KeyboardEvent.KeyEventType.KEYPRESS);
-      request.setKey(key);
-      _this.jsep.send("keyboard", request);
-    });
-    (0, _defineProperty2["default"])((0, _assertThisInitialized2["default"])(_this), "_onAudioStateChange", function (s) {
-      var onAudioStateChange = _this.props.onAudioStateChange;
-      _this.setState({
-        audio: s
-      }, function () {
-        onAudioStateChange(s);
-      });
-    });
-    var uri = props.uri,
-      auth = props.auth,
-      poll = props.poll,
-      onError = props.onError;
-    _this.emulator = new _emulator_web_client.EmulatorControllerService(uri, auth, onError);
-    _this.rtc = new _emulator_web_client.RtcService(uri, auth, onError);
-    _this.jsep = new _jsep_protocol_driver["default"](_this.emulator, _this.rtc, poll);
-    _this.view = /*#__PURE__*/_react["default"].createRef();
-    return _this;
+    _logger["default"].info("Created JSEP:", jsep.current);
   }
-  (0, _createClass2["default"])(Emulator, [{
-    key: "render",
-    value: function render() {
-      var _this$props = this.props,
-        width = _this$props.width,
-        height = _this$props.height,
-        view = _this$props.view,
-        poll = _this$props.poll,
-        muted = _this$props.muted,
-        onStateChange = _this$props.onStateChange,
-        onError = _this$props.onError,
-        volume = _this$props.volume;
-      var SpecificView = this.components[view] || RtcView;
-      console.log("render ".concat(width, "x").concat(height));
-      return /*#__PURE__*/_react["default"].createElement(SpecificView, {
-        ref: this.view,
-        width: width,
-        height: height,
-        emulator: this.emulator,
-        jsep: this.jsep,
-        onStateChange: onStateChange,
-        poll: poll,
-        muted: muted,
-        volume: volume,
-        onError: onError,
-        onAudioStateChange: this._onAudioStateChange
-      });
+  (0, _react.useEffect)(function () {
+    if (typeof gps === "undefined") {
+      return;
     }
-  }], [{
-    key: "getDerivedStateFromProps",
-    value: function getDerivedStateFromProps(nextProps, prevState) {
-      if (nextProps.view === "png") return {
-        audio: false
-      };
-      return prevState;
+    var headers = {
+      'Content-Type': 'application/json'
+    };
+    if (auth && auth.authHeader) {
+      Object.assign(headers, auth.authHeader());
     }
-  }]);
-  return Emulator;
-}(_react.Component);
-(0, _defineProperty2["default"])(Emulator, "propTypes", {
-  /** gRPC Endpoint where we can reach the emulator. */
+    var body = JSON.stringify({
+      latitude: gps.latitude,
+      longitude: gps.longitude,
+      altitude: gps.altitude,
+      heading: gps.heading,
+      speed: gps.speed
+    });
+    fetch(urls.gps, {
+      method: 'POST',
+      headers: headers,
+      body: body
+    })["catch"](function (err) {
+      if (onError) onError(err);
+    });
+  }, [gps, uri, auth]);
+  (0, _react.useEffect)(function () {
+    return function () {
+      if (jsep.current) {
+        jsep.current.cleanup();
+      }
+    };
+  }, []);
+  (0, _react.useImperativeHandle)(ref, function () {
+    return {
+      sendKey: function sendKey(key) {
+        var request = new _emulator_controller_pb["default"].KeyboardEvent();
+        request.setEventtype(_emulator_controller_pb["default"].KeyboardEvent.KeyEventType.KEYPRESS);
+        request.setKey(key);
+        jsep.current.send("keyboard", request);
+      }
+    };
+  });
+  var _onAudioStateChange = function _onAudioStateChange(s) {
+    setAudio(s);
+    onAudioStateChange(s);
+  };
+  _logger["default"].debug("render ".concat(width, "x").concat(height));
+  return /*#__PURE__*/_react["default"].createElement(RtcView, {
+    ref: viewRef,
+    width: width,
+    height: height,
+    statusUrl: urls.status,
+    jsep: jsep.current,
+    onStateChange: onStateChange,
+    muted: muted,
+    volume: volume,
+    onError: onError,
+    onAudioStateChange: _onAudioStateChange,
+    auth: auth
+  });
+});
+Emulator.propTypes = {
+  /** Endpoint where we can reach the emulator gateway (host:port or http(s)://host:port). */
   uri: _propTypes["default"].string.isRequired,
   /** The authentication service to use, or null for no authentication. */
   auth: _propTypes["default"].object,
-  /** True if the audio should be disabled. This is only relevant when using the webrtc engine. */
+  /** True if the audio should be disabled. */
   muted: _propTypes["default"].bool,
   /** Volume between [0, 1] when audio is enabled. 0 is muted, 1.0 is 100% */
   volume: _propTypes["default"].number,
@@ -208,30 +217,9 @@ var Emulator = /*#__PURE__*/function (_Component) {
   width: _propTypes["default"].number,
   /** The height of the component */
   height: _propTypes["default"].number,
-  /** The underlying view used to display the emulator, one of ["webrtc", "png"] */
-  view: _propTypes["default"].oneOf(["webrtc", "png"]).isRequired,
   /** A [GeolocationCoordinates](https://developer.mozilla.org/en-US/docs/Web/API/GeolocationCoordinates) like object indicating where the device is. */
   gps: _propTypes["default"].object,
-  /** True if polling should be used, only set this to true if you are using the go webgrpc proxy. */
-  poll: _propTypes["default"].bool,
-  /** Callback that will be invoked in case of gRPC errors. */
+  /** Callback that will be invoked in case of errors. */
   onError: _propTypes["default"].func
-});
-(0, _defineProperty2["default"])(Emulator, "defaultProps", {
-  view: "webrtc",
-  auth: null,
-  poll: false,
-  muted: true,
-  volume: 1.0,
-  onError: function onError(e) {
-    console.error(e);
-  },
-  onAudioStateChange: function onAudioStateChange(s) {
-    console.debug("emulator audio: " + s);
-  },
-  onStateChange: function onStateChange(s) {
-    console.debug("emulator state: " + s);
-  }
-});
-var _default = Emulator;
-exports["default"] = _default;
+};
+var _default = exports["default"] = Emulator;

package/dist/components/emulator/net/emulator_status.d.ts

@@ -0,0 +1,45 @@
+export interface AuthService {
+    authHeader?(): Record<string, string>;
+    unauthorized?(): void;
+}
+export interface EmulatorStatusData {
+    status?: string;
+    hardwareConfig?: Record<string, string>;
+    [key: string]: any;
+}
+/**
+ * Utility class to query and manage the emulator's status by communicating
+ * with its REST configuration endpoint. It parses the hardware configuration
+ * and caches the status.
+ *
+ * @export
+ * @class EmulatorStatus
+ */
+declare class EmulatorStatus {
+    statusUrl: string;
+    auth: AuthService | null;
+    status: EmulatorStatusData | null;
+    /**
+     * Creates an EmulatorStatus object that can retrieve the status of the running emulator.
+     *
+     * @param statusUrl The REST endpoint to retrieve status.
+     * @param auth The authentication service to use, or null for no authentication.
+     */
+    constructor(statusUrl: string, auth?: AuthService | null);
+    /**
+     * Gets the cached status object.
+     *
+     * @returns The cached emulator status or null if not yet loaded.
+     * @memberof EmulatorStatus
+     */
+    getStatus: () => EmulatorStatusData | null;
+    /**
+     * Retrieves the current status from the emulator REST endpoint.
+     *
+     * @param fnNotify Callback invoked when the status is retrieved. Receives the status object.
+     * @param cache If true, uses the cached status if available instead of fetching.
+     * @memberof EmulatorStatus
+     */
+    updateStatus: (fnNotify: (status: EmulatorStatusData) => void, cache?: boolean) => EmulatorStatusData;
+}
+export default EmulatorStatus;

package/dist/components/emulator/net/emulator_status.js

@@ -8,8 +8,7 @@ exports["default"] = void 0;
 var _createClass2 = _interopRequireDefault(require("@babel/runtime/helpers/createClass"));
 var _classCallCheck2 = _interopRequireDefault(require("@babel/runtime/helpers/classCallCheck"));
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
-var _empty_pb = require("google-protobuf/google/protobuf/empty_pb");
-var _emulator_web_client = require("../../../proto/emulator_web_client");
+var _logger = _interopRequireDefault(require("./logger"));
 /*
  * Copyright 2020 The Android Open Source Project
  *
@@ -26,8 +25,9 @@ var _emulator_web_client = require("../../../proto/emulator_web_client");
  * limitations under the License.
  */
 /**
- * Gets the status of the emulator, parsing the hardware config into something
- * easy to digest.
+ * Utility class to query and manage the emulator's status by communicating
+ * with its REST configuration endpoint. It parses the hardware configuration
+ * and caches the status.
  *
  * @export
  * @class EmulatorStatus
@@ -36,66 +36,59 @@ var EmulatorStatus = /*#__PURE__*/(0, _createClass2["default"])(
 /**
  * Creates an EmulatorStatus object that can retrieve the status of the running emulator.
  *
- * @param {object} uriOrEmulator An emulator controller service, or a URI to a gRPC endpoint.
- * @param {object} auth The authentication service to use, or null for no authentication.
- *
- *  The authentication service should implement the following methods:
- * - `authHeader()` which must return a set of headers that should be send along with a request.
- * - `unauthorized()` a function that gets called when a 401 was received.
+ * @param {string} statusUrl The REST endpoint to retrieve status.
+ * @param {Object} [auth] The authentication service to use, or null for no authentication.
+ * @param {function} [auth.authHeader] Function returning authorization headers.
  */
-function EmulatorStatus(uriOrEmulator, auth) {
+function EmulatorStatus(statusUrl, auth) {
   var _this = this;
   (0, _classCallCheck2["default"])(this, EmulatorStatus);
   /**
-   * Gets the cached status.
+   * Gets the cached status object.
    *
+   * @returns {Object|null} The cached emulator status or null if not yet loaded.
    * @memberof EmulatorStatus
    */
   (0, _defineProperty2["default"])(this, "getStatus", function () {
     return _this.status;
   });
   /**
-   * Retrieves the current status from the emulator.
+   * Retrieves the current status from the emulator REST endpoint.
    *
-   * @param  {Callback} fnNotify when the status is available, returns the retrieved status.
-   * @param  {boolean} cache True if the cache can be used.
+   * @param {function(Object): void} fnNotify Callback invoked when the status is retrieved. Receives the status object.
+   * @param {boolean} [cache=false] If true, uses the cached status if available instead of fetching.
    * @memberof EmulatorStatus
    */
   (0, _defineProperty2["default"])(this, "updateStatus", function (fnNotify, cache) {
-    var request = new _empty_pb.Empty();
+    if (!_this.statusUrl) {
+      return;
+    }
     if (cache && _this.status) {
       fnNotify(_this.status);
       return _this.status;
     }
-    _this.emulator.getStatus(request, {}, function (err, response) {
-      var hwConfig = {};
-      var entryList = response.getHardwareconfig().getEntryList();
-      for (var i = 0; i < entryList.length; i++) {
-        var key = entryList[i].getKey();
-        var val = entryList[i].getValue();
-        hwConfig[key] = val;
+    var headers = {
+      Accept: "application/json"
+    };
+    if (_this.auth && _this.auth.authHeader) {
+      Object.assign(headers, _this.auth.authHeader());
+    }
+    fetch(_this.statusUrl, {
+      headers: headers
+    }).then(function (response) {
+      if (!response.ok) {
+        throw new Error("HTTP error! status: ".concat(response.status));
       }
-      var vmConfig = response.getVmconfig();
-      _this.status = {
-        version: response.getVersion(),
-        uptime: response.getUptime(),
-        booted: response.getBooted(),
-        hardwareConfig: hwConfig,
-        vmConfig: {
-          hypervisorType: vmConfig.getHypervisortype(),
-          numberOfCpuCores: vmConfig.getNumberofcpucores(),
-          ramSizeBytes: vmConfig.getRamsizebytes()
-        }
-      };
+      return response.json();
+    }).then(function (data) {
+      _this.status = data;
       fnNotify(_this.status);
+    })["catch"](function (err) {
+      _logger["default"].error("Failed to get emulator status:", err);
     });
   });
-  if (uriOrEmulator instanceof _emulator_web_client.EmulatorControllerService) {
-    this.emulator = uriOrEmulator;
-  } else {
-    this.emulator = new _emulator_web_client.EmulatorControllerService(uriOrEmulator, auth);
-  }
+  this.statusUrl = statusUrl;
+  this.auth = auth;
   this.status = null;
 });
-var _default = EmulatorStatus;
-exports["default"] = _default;
+var _default = exports["default"] = EmulatorStatus;