android-emulator-webrtc 1.0.17 → 1.0.18

package/cloudbuilders/Dockerfile

@@ -1,8 +1,8 @@
 FROM debian:buster-slim
 
-ARG VERS=3.12.4
+ARG VERS=23.1
 ARG ARCH=linux-x86_64
-ARG GRPC_WEB=1.2.1
+ARG GRPC_WEB=1.4.2
 
 RUN echo "Building protoc Cloud Builder ${VERS}-${ARCH}" && \
     apt-get update -y && apt-get upgrade -y && \

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

@@ -38,7 +38,6 @@ var EmulatorPngView = function EmulatorPngView(_ref) {
     };
   }, [width, height]);
   (0, _react.useEffect)(function () {
-    console.log("Png state changed to: " + connect);
     if (onStateChange) {
       onStateChange(connect);
     }

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

@@ -44,13 +44,11 @@ var EmulatorWebrtcView = function EmulatorWebrtcView(_ref) {
     connect = _useState4[0],
     setConnect = _useState4[1];
   (0, _react.useEffect)(function () {
-    console.log("Webrtc state changed to: " + connect);
     if (onStateChange) {
       onStateChange(connect);
     }
   }, [connect]);
   (0, _react.useEffect)(function () {
-    console.log("Webrtc audio state changed to: " + audio);
     if (onAudioStateChange) {
       onAudioStateChange(audio);
     }
@@ -134,9 +132,6 @@ EmulatorWebrtcView.defaultProps = {
   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;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "android-emulator-webrtc",
-  "version": "1.0.17",
+  "version": "1.0.18",
   "description": "Android Emulator WebRTC module",
   "scripts": {
     "build": "babel src -d dist",
@@ -22,7 +22,6 @@
     ]
   },
   "dependencies": {
-    "@react-hook/resize-observer": "^1.2.6",
     "google-protobuf": "^3.21.2",
     "grpc-web": "^1.4.2",
     "prop-types": "^15.8.1"

package/src/components/emulator/views/simple_png_view.js

@@ -1,5 +1,5 @@
 import PropTypes from "prop-types";
-import React, { useState, useEffect, useRef } from "react";
+import React, { useState, useEffect } from "react";
 import * as Proto from "../../../proto/emulator_controller_pb";
 
 const EmulatorPngView = ({
@@ -25,7 +25,6 @@ const EmulatorPngView = ({
   }, [width, height]);
 
   useEffect(() => {
-    console.log("Png state changed to: " + connect);
     if (onStateChange) {
       onStateChange(connect);
     }

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

@@ -30,7 +30,6 @@ const EmulatorWebrtcView = ({
 
 
   useEffect(() => {
-    console.log("Webrtc state changed to: " + connect);
     if (onStateChange) {
       onStateChange(connect);
     }
@@ -38,7 +37,6 @@ const EmulatorWebrtcView = ({
 
 
   useEffect(() => {
-    console.log("Webrtc audio state changed to: " + audio);
     if (onAudioStateChange) {
       onAudioStateChange(audio);
     }
@@ -138,8 +136,6 @@ EmulatorWebrtcView.defaultProps = {
   muted: true,
   volume: 1.0,
   onError: (e) => console.error("WebRTC error: " + e),
-  onAudioStateChange: (e) =>
-    console.log("Webrtc audio became available: " + e),
 };
 
 export default EmulatorWebrtcView;

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

@@ -1,86 +0,0 @@
-"use strict";
-
-var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports["default"] = void 0;
-var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
-var _propTypes = _interopRequireDefault(require("prop-types"));
-var _react = _interopRequireDefault(require("react"));
-var _resizeObserver = _interopRequireDefault(require("@react-hook/resize-observer"));
-/**
- * @jest-environment jsdom
- */
-/*
- * Copyright 2023 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.
- */
-
-function useSize(target, onResize) {
-  var _React$useState = _react["default"].useState(),
-    _React$useState2 = (0, _slicedToArray2["default"])(_React$useState, 2),
-    size = _React$useState2[0],
-    setSize = _React$useState2[1];
-  _react["default"].useLayoutEffect(function () {
-    if (target) {
-      var newSize = target.getBoundingClientRect();
-      console.log("Resizing to ".concat(JSON.stringify(newSize)));
-      setSize(newSize);
-      if (onResize) {
-        onResize(newSize);
-      }
-    }
-  }, [target]);
-
-  // Where the magic happens
-  (0, _resizeObserver["default"])(target, function (entry) {
-    setSize(entry.contentRect);
-    if (onResize) {
-      console.log("Resizing to ".concat(JSON.stringify(entry.contentRect)));
-      onResize(entry.contentRect);
-    }
-  });
-  return size;
-}
-function ResizingComponent(_ref) {
-  var children = _ref.children,
-    onResize = _ref.onResize,
-    dataTestId = _ref["data-testid"];
-  // const ref = useRef();
-  var _React$useState3 = _react["default"].useState(),
-    _React$useState4 = (0, _slicedToArray2["default"])(_React$useState3, 2),
-    target = _React$useState4[0],
-    setTarget = _React$useState4[1];
-  var size = useSize(target, onResize);
-  return /*#__PURE__*/_react["default"].createElement("div", {
-    style: {
-      width: "100%",
-      height: "100%"
-    },
-    ref: setTarget,
-    "data-testid": dataTestId
-  }, /*#__PURE__*/_react["default"].createElement("div", {
-    style: {
-      width: size === null || size === void 0 ? void 0 : size.width,
-      height: size === null || size === void 0 ? void 0 : size.height
-    }
-  }, children));
-}
-ResizingComponent.propTypes = {
-  onResize: _propTypes["default"].func,
-  "data-testid": _propTypes["default"].string
-};
-var _default = ResizingComponent;
-exports["default"] = _default;

package/src/components/emulator/views/resizing_component.js

@@ -1,65 +0,0 @@
-/**
- * @jest-environment jsdom
- */
-/*
- * Copyright 2023 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.
- */
-import PropTypes from "prop-types";
-import React from "react";
-import useResizeObserver from "@react-hook/resize-observer";
-
-function useSize(target, onResize) {
-  const [size, setSize] = React.useState();
-
-  React.useLayoutEffect(() => {
-    if (target) {
-      const newSize = target.getBoundingClientRect();
-      console.log(`Resizing to ${JSON.stringify(newSize)}`)
-      setSize(newSize);
-      if (onResize) {
-        onResize(newSize);
-      }
-    }
-  }, [target]);
-
-  // Where the magic happens
-  useResizeObserver(target, (entry) => {
-    setSize(entry.contentRect);
-    if (onResize) {
-      console.log(`Resizing to ${JSON.stringify(entry.contentRect)}`)
-      onResize(entry.contentRect);
-    }
-  });
-  return size;
-}
-
-function ResizingComponent({ children, onResize, "data-testid": dataTestId, }) {
-  // const ref = useRef();
-  const [target, setTarget] = React.useState();
-  const size = useSize(target, onResize);
-
-  return (
-    <div style={{ width: "100%", height: "100%" }} ref={setTarget} data-testid={dataTestId}>
-      <div style={{ width: size?.width, height: size?.height }}>{children}</div>
-    </div>
-  );
-}
-
-ResizingComponent.propTypes = {
-  onResize: PropTypes.func,
-  "data-testid": PropTypes.string,
-};
-
-export default ResizingComponent;

package/test/resizing_component.test.js

@@ -1,37 +0,0 @@
-
-/**
- * @jest-environment jsdom
- */
-/*
- * Copyright 2023 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.
- */
-import React from "react";
-import { render, act, waitFor, fireEvent, getByText } from "@testing-library/react";
-import ResizingComponent from "../src/components/emulator/views/resizing_component"
-import { toBeInTheDocument, toHaveBeenCalledWith } from '@testing-library/jest-dom';
-
-
-
-describe("ResizingComponent", () => {
-  it("renders children", () => {
-    const { getByText } = render(
-      <ResizingComponent>
-        <p>Hello, world!</p>
-      </ResizingComponent>
-    );
-    expect(getByText("Hello, world!")).toBeInTheDocument();
-  });
-
-});