@realsee/vreo 2.6.4-alpha.1 → 2.6.4-alpha.3

package/lib/fivePlugins/ModelTVVideoPlugin/index.js

@@ -1,9 +1,20 @@
 import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
 import _asyncToGenerator from "@babel/runtime/helpers/esm/asyncToGenerator";
-import _regeneratorRuntime from "@babel/runtime/regenerator";
+function _regenerator() { /*! regenerator-runtime -- Copyright (c) 2014-present, Facebook, Inc. -- license (MIT): https://github.com/babel/babel/blob/main/packages/babel-helpers/LICENSE */ var e, t, r = "function" == typeof Symbol ? Symbol : {}, n = r.iterator || "@@iterator", o = r.toStringTag || "@@toStringTag"; function i(r, n, o, i) { var c = n && n.prototype instanceof Generator ? n : Generator, u = Object.create(c.prototype); return _regeneratorDefine2(u, "_invoke", function (r, n, o) { var i, c, u, f = 0, p = o || [], y = !1, G = { p: 0, n: 0, v: e, a: d, f: d.bind(e, 4), d: function d(t, r) { return i = t, c = 0, u = e, G.n = r, a; } }; function d(r, n) { for (c = r, u = n, t = 0; !y && f && !o && t < p.length; t++) { var o, i = p[t], d = G.p, l = i[2]; r > 3 ? (o = l === n) && (u = i[(c = i[4]) ? 5 : (c = 3, 3)], i[4] = i[5] = e) : i[0] <= d && ((o = r < 2 && d < i[1]) ? (c = 0, G.v = n, G.n = i[1]) : d < l && (o = r < 3 || i[0] > n || n > l) && (i[4] = r, i[5] = n, G.n = l, c = 0)); } if (o || r > 1) return a; throw y = !0, n; } return function (o, p, l) { if (f > 1) throw TypeError("Generator is already running"); for (y && 1 === p && d(p, l), c = p, u = l; (t = c < 2 ? e : u) || !y;) { i || (c ? c < 3 ? (c > 1 && (G.n = -1), d(c, u)) : G.n = u : G.v = u); try { if (f = 2, i) { if (c || (o = "next"), t = i[o]) { if (!(t = t.call(i, u))) throw TypeError("iterator result is not an object"); if (!t.done) return t; u = t.value, c < 2 && (c = 0); } else 1 === c && (t = i.return) && t.call(i), c < 2 && (u = TypeError("The iterator does not provide a '" + o + "' method"), c = 1); i = e; } else if ((t = (y = G.n < 0) ? u : r.call(n, G)) !== a) break; } catch (t) { i = e, c = 1, u = t; } finally { f = 1; } } return { value: t, done: y }; }; }(r, o, i), !0), u; } var a = {}; function Generator() {} function GeneratorFunction() {} function GeneratorFunctionPrototype() {} t = Object.getPrototypeOf; var c = [][n] ? t(t([][n]())) : (_regeneratorDefine2(t = {}, n, function () { return this; }), t), u = GeneratorFunctionPrototype.prototype = Generator.prototype = Object.create(c); function f(e) { return Object.setPrototypeOf ? Object.setPrototypeOf(e, GeneratorFunctionPrototype) : (e.__proto__ = GeneratorFunctionPrototype, _regeneratorDefine2(e, o, "GeneratorFunction")), e.prototype = Object.create(u), e; } return GeneratorFunction.prototype = GeneratorFunctionPrototype, _regeneratorDefine2(u, "constructor", GeneratorFunctionPrototype), _regeneratorDefine2(GeneratorFunctionPrototype, "constructor", GeneratorFunction), GeneratorFunction.displayName = "GeneratorFunction", _regeneratorDefine2(GeneratorFunctionPrototype, o, "GeneratorFunction"), _regeneratorDefine2(u), _regeneratorDefine2(u, o, "Generator"), _regeneratorDefine2(u, n, function () { return this; }), _regeneratorDefine2(u, "toString", function () { return "[object Generator]"; }), (_regenerator = function _regenerator() { return { w: i, m: f }; })(); }
+function _regeneratorDefine2(e, r, n, t) { var i = Object.defineProperty; try { i({}, "", {}); } catch (e) { i = 0; } _regeneratorDefine2 = function _regeneratorDefine(e, r, n, t) { function o(r, n) { _regeneratorDefine2(e, r, function (e) { return this._invoke(r, n, e); }); } r ? i ? i(e, r, { value: n, enumerable: !t, configurable: !t, writable: !t }) : e[r] = n : (o("next", 0), o("throw", 1), o("return", 2)); }, _regeneratorDefine2(e, r, n, t); }
 import * as THREE from 'three';
 export var ModelTVVideoPlugin = function ModelTVVideoPlugin(five, _ref) {
-  var videoElement = _ref.videoElement;
+  var videoElement = _ref.videoElement,
+    mediaManager = _ref.mediaManager;
+  var listeners = [];
+  var on = function on(name, callback) {
+    listeners.push(function () {
+      five.off(name, callback);
+    });
+    return five.on(name, callback);
+  };
+  var generation = 0;
+  var disposed = false;
   var state = {
     videoMeshes: [],
     videoTextureEnabled: false,
@@ -12,57 +23,115 @@ export var ModelTVVideoPlugin = function ModelTVVideoPlugin(five, _ref) {
     enabled: false,
     videoElement: videoElement
   };
+  var session;
+  var output;
+  var removeReady;
+  var stop = function stop() {
+    var _removeReady;
+    ++generation;
+    (_removeReady = removeReady) === null || _removeReady === void 0 || _removeReady();
+    removeReady = undefined;
+    if (output) {
+      output.muted = true;
+      output.pause();
+    }
+    output = undefined;
+    session = undefined;
+    state.enabled = false;
+    state.videoMeshes.forEach(function (mesh) {
+      mesh.geometry.dispose();
+      mesh.material.dispose();
+      five.scene.remove(mesh);
+    });
+    state.videoMeshes = [];
+    five.needsRender = true;
+  };
+  var controller = mediaManager === null || mediaManager === void 0 ? void 0 : mediaManager.createController({
+    label: 'vreo-model-video',
+    onCancel: stop
+  });
+  var bind = function bind(userAction, audible) {
+    var _state$videoTexture, _controller$begin;
+    var element = (_state$videoTexture = state.videoTexture) === null || _state$videoTexture === void 0 ? void 0 : _state$videoTexture.image;
+    if (!element) return undefined;
+    var next = (_controller$begin = controller === null || controller === void 0 ? void 0 : controller.begin({
+      userAction: userAction,
+      audible: audible
+    })) !== null && _controller$begin !== void 0 ? _controller$begin : undefined;
+    if (controller && !next) return undefined;
+    session = next;
+    return output = next ? next.bind(element) : element;
+  };
   var setMuted = function setMuted(muted) {
-    if (state.videoTexture) {
-      state.videoTexture.image.muted = muted;
-      state.videoTexture.image.play();
+    var userAction = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : false;
+    var wasEnabled = state.enabled;
+    var media = !muted ? bind(userAction, true) : output;
+    if (!media) return;
+    media.muted = muted;
+    if (wasEnabled && !state.enabled) {
+      state.enabled = true;
+      state.videoMeshes = createPanoVideoMeshes();
+      state.videoMeshes.forEach(function (mesh) {
+        return five.scene.add(mesh);
+      });
     }
+    var run = session;
+    var current = generation;
+    if (state.enabled) void media.play().catch(function (error) {
+      if (current === generation && !(run !== null && run !== void 0 && run.signal.aborted)) {
+        disable();
+        console.error(error);
+      }
+    });
   };
   var getMuted = function getMuted() {
-    if (state.videoTexture) return state.videoTexture.image.muted;else return true;
+    var _output$muted, _output;
+    return (_output$muted = (_output = output) === null || _output === void 0 ? void 0 : _output.muted) !== null && _output$muted !== void 0 ? _output$muted : true;
   };
   var enable = function enable() {
-    if (state.enabled) return;
-    if (!state.videoTexture) return;
+    if (disposed || state.enabled || !state.videoTexture) return;
+    var media = bind(false, false);
+    if (!media) return;
+    var current = generation;
+    var run = session;
+    var element = state.videoTexture.image;
+    var valid = function valid() {
+      return current === generation && !disposed && state.enabled && !(run !== null && run !== void 0 && run.signal.aborted);
+    };
     state.enabled = true;
     state.videoMeshes = createPanoVideoMeshes();
     state.videoMeshes.forEach(function (mesh) {
       return five.scene.add(mesh);
     });
-    var play = function play() {
-      if (!state.videoTexture) return;
-      var timeupdate = function timeupdate() {
-        var _state$videoTexture;
-        if (!state.videoTexture) return;
-        (_state$videoTexture = state.videoTexture) === null || _state$videoTexture === void 0 ? void 0 : _state$videoTexture.image.removeEventListener('timeupdate', timeupdate);
-        state.videoTextureEnabled = true;
-        state.videoMeshes.forEach(function (mesh) {
-          if (mesh.material.map !== state.videoTexture) mesh.material.map = state.videoTexture;
-        });
-        five.needsRender = true;
-      };
-      state.videoTexture.image.addEventListener('timeupdate', timeupdate);
-      if (state.videoTexture && state.videoMeshes.length) {
-        state.videoTexture.image.play();
-      }
+    var _timeupdate = function timeupdate() {
+      element.removeEventListener('timeupdate', _timeupdate);
+      if (!valid()) return;
+      state.videoTextureEnabled = true;
+      state.videoMeshes.forEach(function (mesh) {
+        mesh.material.map = state.videoTexture;
+      });
+      five.needsRender = true;
     };
-    if (five.model.loaded) play();else {
-      return five.once('modelLoaded', function () {
-        return play();
+    var _play = function play() {
+      five.off('modelLoaded', _play);
+      if (!valid()) return;
+      element.addEventListener('timeupdate', _timeupdate);
+      void media.play().catch(function (error) {
+        if (valid()) {
+          disable();
+          console.error(error);
+        }
       });
-    }
+    };
+    removeReady = function removeReady() {
+      five.off('modelLoaded', _play);
+      element.removeEventListener('timeupdate', _timeupdate);
+    };
+    if (five.model.loaded) _play();else five.on('modelLoaded', _play);
   };
   var disable = function disable() {
-    if (!state.enabled) return;
-    state.enabled = false;
-    state.videoMeshes.forEach(function (mesh) {
-      mesh.geometry.dispose();
-      mesh.material.dispose();
-      five.scene.remove(mesh);
-      if (state.videoTexture) state.videoTexture.image.pause();
-    });
-    state.videoMeshes = [];
-    five.needsRender = true;
+    controller === null || controller === void 0 || controller.cancel();
+    stop();
   };
   var createPanoVideoMeshes = function createPanoVideoMeshes() {
     return state.rectPoints.map(function (points, index) {
@@ -115,15 +184,22 @@ export var ModelTVVideoPlugin = function ModelTVVideoPlugin(five, _ref) {
     return texture;
   };
   var getVideoTexture = function getVideoTexture(source, video) {
+    var valid = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : function () {
+      return true;
+    };
     return new Promise(function (resolve, reject) {
       var xhr = new XMLHttpRequest();
       xhr.onreadystatechange = function () {
         if (xhr.readyState == 4) {
+          if (!valid()) {
+            reject(new DOMException('Playback cancelled', 'AbortError'));
+            return;
+          }
           if (xhr.status == 200) {
             var url = window.URL || window.webkitURL;
             video = video || document.createElement('video');
             video.crossOrigin = 'anonymous';
-            video.autoplay = true;
+            video.autoplay = false;
             video.muted = true;
             video.loop = true;
             video.playsInline = true;
@@ -149,36 +225,51 @@ export var ModelTVVideoPlugin = function ModelTVVideoPlugin(five, _ref) {
     });
   };
   var load = /*#__PURE__*/function () {
-    var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee(data, videoElement) {
-      var video_src, video_poster_src, points;
-      return _regeneratorRuntime.wrap(function _callee$(_context) {
-        while (1) {
-          switch (_context.prev = _context.next) {
-            case 0:
-              video_src = data.video_src, video_poster_src = data.video_poster_src, points = data.points;
-              state.videoSource = video_src;
-              state.rectPoints = points.map(function (items) {
-                return items.map(function (_ref3) {
-                  var x = _ref3.x,
-                    y = _ref3.y,
-                    z = _ref3.z;
-                  return new THREE.Vector3(x, y, z);
-                });
+    var _ref2 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee(data, videoElement) {
+      var current, video_src, video_poster_src, points, texture;
+      return _regenerator().w(function (_context) {
+        while (1) switch (_context.n) {
+          case 0:
+            current = ++generation;
+            video_src = data.video_src, video_poster_src = data.video_poster_src, points = data.points;
+            state.videoSource = video_src;
+            state.rectPoints = points.map(function (items) {
+              return items.map(function (_ref3) {
+                var x = _ref3.x,
+                  y = _ref3.y,
+                  z = _ref3.z;
+                return new THREE.Vector3(x, y, z);
               });
-              state.imageTexture = getImageTexture(video_poster_src);
-              if (videoElement) {
-                state.videoElement = videoElement;
-              }
-              _context.next = 7;
-              return getVideoTexture(state.videoSource, state.videoElement);
-            case 7:
-              state.videoTexture = _context.sent;
-              state.enabled = !!data.enable;
-              if (state.enabled) enable();
-            case 10:
-            case "end":
-              return _context.stop();
-          }
+            });
+            state.imageTexture = getImageTexture(video_poster_src);
+            if (videoElement) {
+              state.videoElement = videoElement;
+            }
+            _context.n = 1;
+            return getVideoTexture(state.videoSource, state.videoElement, function () {
+              return !disposed && current === generation;
+            });
+          case 1:
+            texture = _context.v;
+            if (!(disposed || current !== generation)) {
+              _context.n = 2;
+              break;
+            }
+            texture.image.muted = true;
+            texture.image.pause();
+            URL.revokeObjectURL(texture.image.src);
+            texture.dispose();
+            return _context.a(2);
+          case 2:
+            if (state.videoTexture) {
+              state.videoTexture.image.pause();
+              URL.revokeObjectURL(state.videoTexture.image.src);
+              state.videoTexture.dispose();
+            }
+            state.videoTexture = texture;
+            if (data.enable) enable();
+          case 3:
+            return _context.a(2);
         }
       }, _callee);
     }));
@@ -186,20 +277,20 @@ export var ModelTVVideoPlugin = function ModelTVVideoPlugin(five, _ref) {
       return _ref2.apply(this, arguments);
     };
   }();
-  five.on('modeChange', function () {
+  on('modeChange', function () {
     return setMuted(true);
   });
-  five.on('wantsTapGesture', function (raycaster) {
+  on('wantsTapGesture', function (raycaster) {
     if (!state.enabled) return;
     var _raycaster$intersectO = raycaster.intersectObjects(five.scene.children, true),
       _raycaster$intersectO2 = _slicedToArray(_raycaster$intersectO, 1),
       intersect = _raycaster$intersectO2[0];
     if (!!intersect && /^video/.test(intersect.object.name)) {
-      if (state.videoTexture) setMuted(!state.videoTexture.image.muted);
+      if (state.videoTexture) setMuted(!state.videoTexture.image.muted, true);
       return false;
     }
   });
-  five.on('panoArrived', function () {
+  on('panoArrived', function () {
     if (!state.enabled) return;
     if (getMuted()) return;
     var cameraPosition = five.camera.position;
@@ -220,21 +311,37 @@ export var ModelTVVideoPlugin = function ModelTVVideoPlugin(five, _ref) {
     });
     if (!visible) setMuted(true);
   });
-  five.on('renderFrame', function () {
+  on('renderFrame', function () {
     state.videoMeshes.forEach(function (meshes) {
       if (meshes)
         //@ts-ignore
         meshes.needsRender = true;
     });
   });
-  five.on('load', function (input) {
+  on('load', function (input) {
     if (input.modelTVVideoData) {
       load(input.modelTVVideoData);
     }
   });
+  var dispose = function dispose() {
+    var _state$imageTexture;
+    disposed = true;
+    ++generation;
+    disable();
+    controller === null || controller === void 0 || controller.dispose();
+    listeners.splice(0).forEach(function (remove) {
+      return remove();
+    });
+    (_state$imageTexture = state.imageTexture) === null || _state$imageTexture === void 0 || _state$imageTexture.dispose();
+    if (state.videoTexture) {
+      URL.revokeObjectURL(state.videoTexture.image.src);
+      state.videoTexture.dispose();
+    }
+  };
   return {
     enable: enable,
     disable: disable,
-    load: load
+    load: load,
+    dispose: dispose
   };
 };

package/lib/index.d.ts

@@ -1 +1,2 @@
 export { Player } from './Player';
+export type { PlaybackManager, PlaybackController, PlaybackSession, MediaOperations } from './Player/playback-types';

package/lib/react/index.js

@@ -38,7 +38,7 @@ export var VreoProvider = function VreoProvider(props) {
     setPlayer(playerRef.current);
     return function () {
       var _playerRef$current;
-      (_playerRef$current = playerRef.current) === null || _playerRef$current === void 0 ? void 0 : _playerRef$current.dispose();
+      (_playerRef$current = playerRef.current) === null || _playerRef$current === void 0 || _playerRef$current.dispose();
     };
   }, []);
   if (!player) return /*#__PURE__*/React.createElement(React.Fragment, null);

package/lib/shared-utils/Audio.js

@@ -1,16 +1,17 @@
 import _classCallCheck from "@babel/runtime/helpers/esm/classCallCheck";
 import _createClass from "@babel/runtime/helpers/esm/createClass";
-import _assertThisInitialized from "@babel/runtime/helpers/esm/assertThisInitialized";
-import _inherits from "@babel/runtime/helpers/esm/inherits";
 import _possibleConstructorReturn from "@babel/runtime/helpers/esm/possibleConstructorReturn";
-import _get from "@babel/runtime/helpers/esm/get";
+import _inherits from "@babel/runtime/helpers/esm/inherits";
 import _getPrototypeOf from "@babel/runtime/helpers/esm/getPrototypeOf";
+import _get from "@babel/runtime/helpers/esm/get";
 import _wrapNativeSuper from "@babel/runtime/helpers/esm/wrapNativeSuper";
 import _defineProperty from "@babel/runtime/helpers/esm/defineProperty";
 import _asyncToGenerator from "@babel/runtime/helpers/esm/asyncToGenerator";
-import _regeneratorRuntime from "@babel/runtime/regenerator";
-function _createSuper(Derived) { var hasNativeReflectConstruct = _isNativeReflectConstruct(); return function _createSuperInternal() { var Super = _getPrototypeOf(Derived), result; if (hasNativeReflectConstruct) { var NewTarget = _getPrototypeOf(this).constructor; result = Reflect.construct(Super, arguments, NewTarget); } else { result = Super.apply(this, arguments); } return _possibleConstructorReturn(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; } }
+function _regenerator() { /*! regenerator-runtime -- Copyright (c) 2014-present, Facebook, Inc. -- license (MIT): https://github.com/babel/babel/blob/main/packages/babel-helpers/LICENSE */ var e, t, r = "function" == typeof Symbol ? Symbol : {}, n = r.iterator || "@@iterator", o = r.toStringTag || "@@toStringTag"; function i(r, n, o, i) { var c = n && n.prototype instanceof Generator ? n : Generator, u = Object.create(c.prototype); return _regeneratorDefine2(u, "_invoke", function (r, n, o) { var i, c, u, f = 0, p = o || [], y = !1, G = { p: 0, n: 0, v: e, a: d, f: d.bind(e, 4), d: function d(t, r) { return i = t, c = 0, u = e, G.n = r, a; } }; function d(r, n) { for (c = r, u = n, t = 0; !y && f && !o && t < p.length; t++) { var o, i = p[t], d = G.p, l = i[2]; r > 3 ? (o = l === n) && (u = i[(c = i[4]) ? 5 : (c = 3, 3)], i[4] = i[5] = e) : i[0] <= d && ((o = r < 2 && d < i[1]) ? (c = 0, G.v = n, G.n = i[1]) : d < l && (o = r < 3 || i[0] > n || n > l) && (i[4] = r, i[5] = n, G.n = l, c = 0)); } if (o || r > 1) return a; throw y = !0, n; } return function (o, p, l) { if (f > 1) throw TypeError("Generator is already running"); for (y && 1 === p && d(p, l), c = p, u = l; (t = c < 2 ? e : u) || !y;) { i || (c ? c < 3 ? (c > 1 && (G.n = -1), d(c, u)) : G.n = u : G.v = u); try { if (f = 2, i) { if (c || (o = "next"), t = i[o]) { if (!(t = t.call(i, u))) throw TypeError("iterator result is not an object"); if (!t.done) return t; u = t.value, c < 2 && (c = 0); } else 1 === c && (t = i.return) && t.call(i), c < 2 && (u = TypeError("The iterator does not provide a '" + o + "' method"), c = 1); i = e; } else if ((t = (y = G.n < 0) ? u : r.call(n, G)) !== a) break; } catch (t) { i = e, c = 1, u = t; } finally { f = 1; } } return { value: t, done: y }; }; }(r, o, i), !0), u; } var a = {}; function Generator() {} function GeneratorFunction() {} function GeneratorFunctionPrototype() {} t = Object.getPrototypeOf; var c = [][n] ? t(t([][n]())) : (_regeneratorDefine2(t = {}, n, function () { return this; }), t), u = GeneratorFunctionPrototype.prototype = Generator.prototype = Object.create(c); function f(e) { return Object.setPrototypeOf ? Object.setPrototypeOf(e, GeneratorFunctionPrototype) : (e.__proto__ = GeneratorFunctionPrototype, _regeneratorDefine2(e, o, "GeneratorFunction")), e.prototype = Object.create(u), e; } return GeneratorFunction.prototype = GeneratorFunctionPrototype, _regeneratorDefine2(u, "constructor", GeneratorFunctionPrototype), _regeneratorDefine2(GeneratorFunctionPrototype, "constructor", GeneratorFunction), GeneratorFunction.displayName = "GeneratorFunction", _regeneratorDefine2(GeneratorFunctionPrototype, o, "GeneratorFunction"), _regeneratorDefine2(u), _regeneratorDefine2(u, o, "Generator"), _regeneratorDefine2(u, n, function () { return this; }), _regeneratorDefine2(u, "toString", function () { return "[object Generator]"; }), (_regenerator = function _regenerator() { return { w: i, m: f }; })(); }
+function _regeneratorDefine2(e, r, n, t) { var i = Object.defineProperty; try { i({}, "", {}); } catch (e) { i = 0; } _regeneratorDefine2 = function _regeneratorDefine(e, r, n, t) { function o(r, n) { _regeneratorDefine2(e, r, function (e) { return this._invoke(r, n, e); }); } r ? i ? i(e, r, { value: n, enumerable: !t, configurable: !t, writable: !t }) : e[r] = n : (o("next", 0), o("throw", 1), o("return", 2)); }, _regeneratorDefine2(e, r, n, t); }
+function _callSuper(t, o, e) { return o = _getPrototypeOf(o), _possibleConstructorReturn(t, _isNativeReflectConstruct() ? Reflect.construct(o, e || [], _getPrototypeOf(t).constructor) : o.apply(t, e)); }
+function _isNativeReflectConstruct() { try { var t = !Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); } catch (t) {} return (_isNativeReflectConstruct = function _isNativeReflectConstruct() { return !!t; })(); }
+function _superPropGet(t, o, e, r) { var p = _get(_getPrototypeOf(1 & r ? t.prototype : t), o, e); return 2 & r && "function" == typeof p ? function (t) { return p.apply(e, t); } : p; }
 var blankAudioSrc = 'data:audio/mpeg;base64,//uQxAAAAAAAAAAAAAAAAAAAAAAASW5mbwAAAA8AAAADAAAGhgBVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVWqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqr///////////////////////////////////////////8AAAA5TEFNRTMuOThyAc0AAAAAAAAAABSAJAiqQgAAgAAABobxtI73AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA//uQxAACFEII9ACZ/sJZwWEoEb8w/////N//////JcxjHjf+7/v/H2PzCCFAiDtGeyBCIx7bJJ1mmEEMy6g8mm2c8nrGABB4h2Mkmn//4z/73u773R5qHHu/j/w7Kxkzh5lWRWdsifCkNAnY9Zc1HvDAhjhSHdFkHFzLmabt/AQxSg2wwzLhHIJOBnAWwVY4zrhIYhhc2kvhYDfQ4hDi2Gmh5KyFn8EcGIrHAngNgIwVIEMf5bzbAiTRoAD///8z/KVhkkWEle6IX+d/z4fvH3BShK1e5kmjkCMoxVmXhd4ROlTKo3iipasvTilY21q19ta30/v/0/idPX1v8PNxJL6ramnOVsdvMv2akO0iSYIzdJFirtzWXCZicS9vHqvSKyqm5XJBdqBwPxyfJdykhWTZ0G0ZyTZGpLKxsNwwoRhsx3tZfhwmeOBVISm3impAC/IT/8hP/EKEM1KMdVdVKM2rHV4x7HVXZvbVVKN/qq8CiV9VL9jjH/6l6qf7MBCjZmOqsAibjcP+qqqv0oxqpa/NVW286hPo1nz2L/h8+jXt//uSxCmDU2IK/ECN98KKtE5IYzNoCfbw+u9i5r8PoadUMFPKqWL4LK3T/LCraMSHGkW4bpLXR/E6LlHOVQxmslKVJ8IULktMN06N0FKCpHCoYsjC4F+Z0NVqdNFoGSTjSiyjzLdnZ2fNqTi2eHKONONKLMPMKLONKLMPQRJGlFxZRoKcJFAYEeIFiRQkUWUeYfef//Ko04soswso40UJAgMw8wosososy0EalnZyjQUGBRQGIFggOWUacWUeYmuadrZziQKKEgQsQLAhQkUJAgMQDghltLO1onp0cpkNInSFMqlYeSEJ5AHsqFdOwy1DA2sRmRJKxdKRfLhfLw5BzUxBTUUzLjk4LjJVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVUxBTUUzLjk4LjJVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVf/7ksRRA8AAAaQAAAAgAAA0gAAABFVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVU=';
 // 下面这段空音频居然在11pro和xr上播不出来
 // const blankAudioSrc = 'data:audio/mpeg;base64,//AAAAHGZ0eXBNNEEgAAAAAE00QSBpc29tbXA0MgAAAAFtZGF0AAAAAAAAABwA0AAHANAABwDQAAcAAAM+bW9vdgAAAGxtdmhkAAAAAN+jti7fo7YuAACsRAAADAAAAQAAAQAAAAAAAAAAAAAAAAEAAAAAAAAAAAAAAAAAAAABAAAAAAAAAAAAAAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAdB0cmFrAAAAXHRraGQAAAAB36O2Lt+jti4AAAABAAAAAAAADAAAAAAAAAAAAAAAAAABAAAAAAEAAAAAAAAAAAAAAAAAAAABAAAAAAAAAAAAAAAAAABAAAAAAAAAAAAAAAAAAAFsbWRpYQAAACBtZGhkAAAAAN+jti7fo7YuAACsRAAADABVxAAAAAAAMWhkbHIAAAAAAAAAAHNvdW4AAAAAAAAAAAAAAABDb3JlIE1lZGlhIEF1ZGlvAAAAARNtaW5mAAAAEHNtaGQAAAAAAAAAAAAAACRkaW5mAAAAHGRyZWYAAAAAAAAAAQAAAAx1cmwgAAAAAQAAANdzdGJsAAAAZ3N0c2QAAAAAAAAAAQAAAFdtcDRhAAAAAAAAAAEAAAAAAAAAAAACABAAAAAArEQAAAAAADNlc2RzAAAAAAOAgIAiAAAABICAgBRAFAAYAAAA+gAAAPoABYCAgAISCAaAgIABAgAAABhzdHRzAAAAAAAAAAEAAAADAAAEAAAAABxzdHNjAAAAAAAAAAEAAAABAAAAAwAAAAEAAAAgc3RzegAAAAAAAAAAAAAAAwAAAAQAAAAEAAAABAAAABRzdGNvAAAAAAAAAAEAAAAsAAAA+nVkdGEAAADybWV0YQAAAAAAAAAiaGRscgAAAAAAAAAAbWRpcgAAAAAAAAAAAAAAAAAAAAAAxGlsc3QAAAC8LS0tLQAAABxtZWFuAAAAAGNvbS5hcHBsZS5pVHVuZXMAAAAUbmFtZQAAAABpVHVuU01QQgAAAIRkYXRhAAAAAQAAAAAgMDAwMDAwMDAgMDAwMDA4NDAgMDAwMDAzQzAgMDAwMDAwMDAwMDAwMDAwMCAwMDAwMDAwMCAwMDAwMDAwMCAwMDAwMDAwMCAwMDAwMDAwMCAwMDAwMDAwMCAwMDAwMDAwMCAwMDAwMDAwMA=='
@@ -34,49 +35,46 @@ export function waitForBlankAudioGenerated() {
   return _waitForBlankAudioGenerated.apply(this, arguments);
 }
 function _waitForBlankAudioGenerated() {
-  _waitForBlankAudioGenerated = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee() {
+  _waitForBlankAudioGenerated = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee() {
     var checkInterval,
       timeout,
       startTime,
       isTimedOut,
       _args = arguments;
-    return _regeneratorRuntime.wrap(function _callee$(_context) {
-      while (1) {
-        switch (_context.prev = _context.next) {
-          case 0:
-            checkInterval = _args.length > 0 && _args[0] !== undefined ? _args[0] : 100;
-            timeout = _args.length > 1 && _args[1] !== undefined ? _args[1] : 2000;
-            console.log('waitForBlankAudioGenerated, needGenerate: ', audioList.some(function (audio) {
-              return !audio.ended && audio.src === blankAudioSrc;
-            }));
-            // while any audioList not ended
-            startTime = Date.now();
-            isTimedOut = false;
-          case 5:
-            if (!(audioList.some(function (audio) {
-              return !audio.ended && audio.src === blankAudioSrc;
-            }) && !isTimedOut)) {
-              _context.next = 13;
-              break;
-            }
-            if (!(Date.now() - startTime > timeout)) {
-              _context.next = 9;
-              break;
-            }
-            isTimedOut = true;
-            return _context.abrupt("return", Promise.resolve());
-          case 9:
-            _context.next = 11;
-            return new Promise(function (resolve) {
-              return setTimeout(resolve, checkInterval);
-            });
-          case 11:
-            _context.next = 5;
+    return _regenerator().w(function (_context) {
+      while (1) switch (_context.n) {
+        case 0:
+          checkInterval = _args.length > 0 && _args[0] !== undefined ? _args[0] : 100;
+          timeout = _args.length > 1 && _args[1] !== undefined ? _args[1] : 2000;
+          console.log('waitForBlankAudioGenerated, needGenerate: ', audioList.some(function (audio) {
+            return !audio.ended && audio.src === blankAudioSrc;
+          }));
+          // while any audioList not ended
+          startTime = Date.now();
+          isTimedOut = false;
+        case 1:
+          if (!(audioList.some(function (audio) {
+            return !audio.ended && audio.src === blankAudioSrc;
+          }) && !isTimedOut)) {
+            _context.n = 4;
             break;
-          case 13:
-          case "end":
-            return _context.stop();
-        }
+          }
+          if (!(Date.now() - startTime > timeout)) {
+            _context.n = 2;
+            break;
+          }
+          isTimedOut = true;
+          return _context.a(2, Promise.resolve());
+        case 2:
+          _context.n = 3;
+          return new Promise(function (resolve) {
+            return setTimeout(resolve, checkInterval);
+          });
+        case 3:
+          _context.n = 1;
+          break;
+        case 4:
+          return _context.a(2);
       }
     }, _callee);
   }));
@@ -101,21 +99,20 @@ function initAudio(audio) {
   }
 }
 var IAudio = /*#__PURE__*/function (_Audio) {
-  _inherits(IAudio, _Audio);
-  var _super = _createSuper(IAudio);
   function IAudio(src) {
-    var _thisSuper, _this;
+    var _this;
     _classCallCheck(this, IAudio);
-    _this = _super.call(this, src);
-    _defineProperty(_assertThisInitialized(_this), "preload", 'auto');
-    _defineProperty(_assertThisInitialized(_this), "realSrc", '');
-    _defineProperty(_assertThisInitialized(_this), "inited", false);
+    _this = _callSuper(this, IAudio, [src]);
+    _defineProperty(_this, "preload", 'auto');
+    _defineProperty(_this, "realSrc", '');
+    _defineProperty(_this, "inited", false);
     _this.realSrc = src !== null && src !== void 0 ? src : '';
-    _get((_thisSuper = _assertThisInitialized(_this), _getPrototypeOf(IAudio.prototype)), "addEventListener", _thisSuper).call(_thisSuper, 'ended', function () {
-      _this.src = '';
-    });
+    _this.muted = true;
+    _superPropGet((_this, IAudio), "addEventListener", _this, 3)(['ended', function () {
+      if (_this.src === blankAudioSrc) _this.src = '';
+    }]);
     var init = function init() {
-      return initAudio(_assertThisInitialized(_this));
+      return initAudio(_this);
     };
     document.addEventListener('click', init);
     document.addEventListener('touchend', init);
@@ -125,7 +122,8 @@ var IAudio = /*#__PURE__*/function (_Audio) {
     };
     return _this;
   }
-  _createClass(IAudio, [{
+  _inherits(IAudio, _Audio);
+  return _createClass(IAudio, [{
     key: "src",
     get:
     /**
@@ -141,9 +139,9 @@ var IAudio = /*#__PURE__*/function (_Audio) {
      * @param paramsSrc - 音频源 URL
      */,
     set: function set(paramsSrc) {
+      this.muted = true;
       this.setAttribute('src', paramsSrc);
       this.realSrc = paramsSrc;
     }
   }]);
-  return IAudio;
-}( /*#__PURE__*/_wrapNativeSuper(Audio));
+}(/*#__PURE__*/_wrapNativeSuper(Audio));

package/lib/shared-utils/AudioLike.js

@@ -1,12 +1,11 @@
 import _classCallCheck from "@babel/runtime/helpers/esm/classCallCheck";
 import _createClass from "@babel/runtime/helpers/esm/createClass";
-import _assertThisInitialized from "@babel/runtime/helpers/esm/assertThisInitialized";
-import _inherits from "@babel/runtime/helpers/esm/inherits";
 import _possibleConstructorReturn from "@babel/runtime/helpers/esm/possibleConstructorReturn";
 import _getPrototypeOf from "@babel/runtime/helpers/esm/getPrototypeOf";
+import _inherits from "@babel/runtime/helpers/esm/inherits";
 import _defineProperty from "@babel/runtime/helpers/esm/defineProperty";
-function _createSuper(Derived) { var hasNativeReflectConstruct = _isNativeReflectConstruct(); return function _createSuperInternal() { var Super = _getPrototypeOf(Derived), result; if (hasNativeReflectConstruct) { var NewTarget = _getPrototypeOf(this).constructor; result = Reflect.construct(Super, arguments, NewTarget); } else { result = Super.apply(this, arguments); } return _possibleConstructorReturn(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; } }
+function _callSuper(t, o, e) { return o = _getPrototypeOf(o), _possibleConstructorReturn(t, _isNativeReflectConstruct() ? Reflect.construct(o, e || [], _getPrototypeOf(t).constructor) : o.apply(t, e)); }
+function _isNativeReflectConstruct() { try { var t = !Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); } catch (t) {} return (_isNativeReflectConstruct = function _isNativeReflectConstruct() { return !!t; })(); }
 import { Subscribe } from '@realsee/five';
 import { requestAnimationFrameInterval } from "./animationFrame/index.js";
 /**
@@ -16,25 +15,24 @@ import { requestAnimationFrameInterval } from "./animationFrame/index.js";
  * 模拟 `<Audio>` 功能：没有音频，但执行逻辑跟 `<Audio>` 相似。
  */
 export var AudioLike = /*#__PURE__*/function (_Subscribe) {
-  _inherits(AudioLike, _Subscribe);
-  var _super = _createSuper(AudioLike);
   function AudioLike() {
     var _this;
     var _ref = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {},
       duration = _ref.duration;
     _classCallCheck(this, AudioLike);
-    _this = _super.call(this);
-    _defineProperty(_assertThisInitialized(_this), "$timestamp", null);
-    _defineProperty(_assertThisInitialized(_this), "$currentTime", 0);
-    _defineProperty(_assertThisInitialized(_this), "$duration", 0);
-    _defineProperty(_assertThisInitialized(_this), "muted", false);
-    _defineProperty(_assertThisInitialized(_this), "src", '');
+    _this = _callSuper(this, AudioLike);
+    _defineProperty(_this, "$timestamp", null);
+    _defineProperty(_this, "$currentTime", 0);
+    _defineProperty(_this, "$duration", 0);
+    _defineProperty(_this, "muted", false);
+    _defineProperty(_this, "src", '');
     if (duration) {
       _this.$duration = duration;
     }
     return _this;
   }
-  _createClass(AudioLike, [{
+  _inherits(AudioLike, _Subscribe);
+  return _createClass(AudioLike, [{
     key: "setAttribute",
     value: function setAttribute(name, value) {
       // nothing todo
@@ -43,6 +41,7 @@ export var AudioLike = /*#__PURE__*/function (_Subscribe) {
     key: "play",
     value: function play() {
       var _this2 = this;
+      if (this.stopInterval) return;
       if (this.$currentTime === this.$duration) {
         this.$currentTime = 0;
       }
@@ -117,6 +116,5 @@ export var AudioLike = /*#__PURE__*/function (_Subscribe) {
       this.off(evtName, callback);
     }
   }]);
-  return AudioLike;
 }(Subscribe);
 export default AudioLike;