@realsee/dnalogel 3.81.10-alpha.0 → 3.81.10-alpha.2

package/libs/PanoTagPlugin/controller/index.js

@@ -1,15 +1,15 @@
-var I = Object.defineProperty, w = Object.defineProperties;
+var w = Object.defineProperty, F = Object.defineProperties;
 var _ = Object.getOwnPropertyDescriptors;
 var S = Object.getOwnPropertySymbols;
 var L = Object.prototype.hasOwnProperty, B = Object.prototype.propertyIsEnumerable;
-var C = (d, p, e) => p in d ? I(d, p, { enumerable: !0, configurable: !0, writable: !0, value: e }) : d[p] = e, c = (d, p) => {
+var C = (d, p, e) => p in d ? w(d, p, { enumerable: !0, configurable: !0, writable: !0, value: e }) : d[p] = e, g = (d, p) => {
   for (var e in p || (p = {}))
     L.call(p, e) && C(d, e, p[e]);
   if (S)
     for (var e of S(p))
       B.call(p, e) && C(d, e, p[e]);
   return d;
-}, y = (d, p) => w(d, _(p));
+}, y = (d, p) => F(d, _(p));
 var l = (d, p, e) => (C(d, typeof p != "symbol" ? p + "" : p, e), e);
 var m = (d, p, e) => new Promise((t, i) => {
   var o = (s) => {
@@ -31,11 +31,11 @@ import * as P from "three";
 import { objectAssignDeepExports as v } from "../../vendor/object-assign-deep/objectAssignDeep.js";
 import { arrayPositionToVector3 as k } from "../../shared-utils/positionToVector3.js";
 import { isAutoLookAtModelTag as R, isMediaModelTag as G } from "../utils/tag/tagCheck.js";
-import { debounce as D } from "../utils/debounce.js";
+import { debounce as M } from "../utils/debounce.js";
 import { throttle as O } from "../utils/throttle.js";
 import x, { getTagStickType as N } from "../utils/tag/format.js";
 import { generateBlankAudio as V, AudioNamespace as z } from "../../shared-utils/audio.js";
-import { resizeObserver as M } from "../../shared-utils/dom/resizeObserver.js";
+import { resizeObserver as D } from "../../shared-utils/dom/resizeObserver.js";
 import { TagRender as $ } from "./TagRender.js";
 import "../../shared-utils/tag.js";
 import { isModelLike as A } from "../../shared-utils/five/mode.js";
@@ -61,7 +61,7 @@ import { ModelTag as J } from "./Tag/ModelTag.js";
 import { PlaneTag as Z } from "./Tag/PlaneTag.js";
 import { BoxTag as Y } from "./Tag/BoxTag.js";
 import { PolygonTag as K } from "./Tag/PolygonTag.js";
-import { MaskTag as g } from "./Tag/MaskTag.js";
+import { MaskTag as c } from "./Tag/MaskTag.js";
 import X from "../Components/TagContainer.js";
 import { fiveEveryReadyListener as ee } from "../../shared-utils/five/fiveEveryReadyListener.js";
 import { vector3ToArray as U } from "../../shared-utils/three/vector3ToArray.js";
@@ -76,7 +76,6 @@ import "../../vendor/svelte/internal/index.js";
 import "../../shared-utils/device.js";
 import "@realsee/five";
 import "../utils/model/mediaPlane.js";
-import "../../shared-utils/audioFocus.js";
 import "../../shared-utils/three/centerPoint.js";
 import "../../shared-utils/three/loadTexture.js";
 import "../../shared-utils/three/Quadrangle.js";
@@ -337,11 +336,11 @@ import "../Components/Common/TagPopover/TagPopoverToolBar.js";
 import "../Components/Common/TagPopover/ArrowRightIcon.js";
 import "../Components/Common/TagPopover/ShareIcon.js";
 import "../utils/popoverContainer.js";
-const F = "Dnalogel-PanoTagPlugin", $s = (d) => `${F}--${d}`;
-class js extends $ {
+const I = "Dnalogel-PanoTagPlugin", zs = (d) => `${I}--${d}`;
+class $s extends $ {
   constructor(e, t) {
     super(e);
-    l(this, "audioFocus");
+    l(this, "mediaManager");
     /** state */
     l(this, "state", { enabled: !0, visible: !0 });
     /** debug */
@@ -414,7 +413,7 @@ class js extends $ {
     l(this, "handleFiveModelShownFloorChange", () => {
       this.tagsDo(this.tags, (e) => e.updateVisible());
     });
-    l(this, "onFiveRefined", D(() => {
+    l(this, "onFiveRefined", M(() => {
       A(this.five.getCurrentState().mode) ? this.setUnfoldedByCamera() : this.tags.forEach((e) => e.cache.clear()), this.tagsDo(this.tags, (e) => e.updateVisible());
     }));
     l(this, "onFiveEveryReady", () => {
@@ -447,7 +446,7 @@ class js extends $ {
               return console.error("updateRenderPlaneTag: tag2DContainer not found");
             this.TagContainerSvelte = new X({
               target: this.container,
-              props: y(c({}, a), { state: y(c({}, this.state), { enabled: !1 }) })
+              props: y(g({}, a), { state: y(g({}, this.state), { enabled: !1 }) })
             }), H(() => {
               var s;
               (s = this.TagContainerSvelte) == null || s.$set({ state: this.state });
@@ -456,9 +455,9 @@ class js extends $ {
         }
       }), this.renderQueue.clear();
     });
-    this.audioFocus = t == null ? void 0 : t.audioFocus, this.params = v({}, { debug: !1, config: this.config }, y(c({}, t), { audioFocus: void 0 })), this.debug = this.params.debug, this.config = this.params.config, this.debug && this.debugUtil.bindLog(), V(1, { namespace: z.PlayAudio });
+    this.mediaManager = t == null ? void 0 : t.mediaManager, this.params = v({}, { debug: !1, config: this.config }, y(g({}, t), { mediaManager: void 0 })), this.debug = this.params.debug, this.config = this.params.config, this.debug && this.debugUtil.bindLog(), V(1, { namespace: z.PlayAudio });
     try {
-      Array.isArray(window.__PANOTAGPLUGIN_DEBUG_LIST__) || (window.__PANOTAGPLUGIN_DEBUG_LIST__ = []), this.NAME = F + "-" + window.__PANOTAGPLUGIN_DEBUG_LIST__.length, window.__PANOTAGPLUGIN_DEBUG_LIST__.push(this), window.__PANOTAGPLUGIN_DEBUG__ || Object.defineProperty(window, "__PANOTAGPLUGIN_DEBUG__", {
+      Array.isArray(window.__PANOTAGPLUGIN_DEBUG_LIST__) || (window.__PANOTAGPLUGIN_DEBUG_LIST__ = []), this.NAME = I + "-" + window.__PANOTAGPLUGIN_DEBUG_LIST__.length, window.__PANOTAGPLUGIN_DEBUG_LIST__.push(this), window.__PANOTAGPLUGIN_DEBUG__ || Object.defineProperty(window, "__PANOTAGPLUGIN_DEBUG__", {
         get: function() {
           return window.__PANOTAGPLUGIN_DEBUG_LIST__.sort((i, o) => o.tags.length - i.tags.length)[0];
         }
@@ -478,7 +477,7 @@ class js extends $ {
   load(e) {
     return m(this, null, function* () {
       var o, n;
-      g.clearSharedMeshRegistry(), this.clearTags();
+      c.clearSharedMeshRegistry(), this.clearTags();
       try {
         console.debug(this.NAME, " load:", { data: JSON.parse(JSON.stringify(e)) });
       } catch (a) {
@@ -519,12 +518,12 @@ class js extends $ {
         const r = o[0], h = (a = r.maskUrl) != null ? a : r.mask, f = (s = r.fiveState) == null ? void 0 : s.panoIndex;
         h && typeof f == "number" && this.tags.filter((u) => {
           var T;
-          return u instanceof g && ((T = u.fiveState) == null ? void 0 : T.panoIndex) === f;
+          return u instanceof c && ((T = u.fiveState) == null ? void 0 : T.panoIndex) === f;
         }).forEach((u) => u.set({ mask: h }));
       }
       const n = o.map((r) => {
         const h = N(r);
-        return h === "2DPoint" || h === "3DPoint" ? new q(this, r) : h === "Model" ? new J(this, r) : h === "Plane" ? new Z(this, r) : h === "3DBox" ? new Y(this, r) : h === "Polygon" ? new K(this, r) : h === "Mask" ? new g(this, r) : null;
+        return h === "2DPoint" || h === "3DPoint" ? new q(this, r) : h === "Model" ? new J(this, r) : h === "Plane" ? new Z(this, r) : h === "3DBox" ? new Y(this, r) : h === "Polygon" ? new K(this, r) : h === "Mask" ? new c(this, r) : null;
       });
       return n.forEach((r) => x(r)), this.tags.push(...n), this.tagsLengthWillUpdate = !0, j(this.five).then(() => m(this, null, function* () {
         var r, h;
@@ -593,7 +592,7 @@ class js extends $ {
   setState(e, t) {
     if (this.checkDisposed())
       return;
-    const { userAction: i = !0 } = t != null ? t : {}, o = c({}, this.state);
+    const { userAction: i = !0 } = t != null ? t : {}, o = g({}, this.state);
     this.state = Object.assign(this.state, e), o.visible !== this.state.visible && (e.visible ? this.handleShow() : this.handleHide()), o.enabled !== this.state.enabled && (e.enabled ? this.handleEnable() : this.handleDisable()), this.hooks.emit("stateChange", { state: this.state, prevState: o, userAction: i });
   }
   /**
@@ -676,13 +675,13 @@ class js extends $ {
     if (o) {
       if (t.stickType && t.stickType !== o.stickType) {
         console.log(`[PanoTagPlugin] stickType changed from ${o.stickType} to ${t.stickType}, recreating tag`);
-        const n = c({}, o);
+        const n = g({}, o);
         this.destroyTagById(e), this.five.ready().then(() => {
-          this.addTag(c(c({}, n), t));
+          this.addTag(g(g({}, n), t));
         });
         return;
       }
-      o.set(t), o instanceof g && o.updateMaskStyle(), o.updateVisible(), this.clearUnusedPanelTag(), o.hooks.emit("dataChanged", o.data);
+      o.set(t), o instanceof c && o.updateMaskStyle(), o.updateVisible(), this.clearUnusedPanelTag(), o.hooks.emit("dataChanged", o.data);
     }
   }
   /**
@@ -710,7 +709,7 @@ class js extends $ {
       }
       const o = this.tags.filter((n) => {
         var a;
-        return n instanceof g && ((a = n.fiveState) == null ? void 0 : a.panoIndex) === t;
+        return n instanceof c && ((a = n.fiveState) == null ? void 0 : a.panoIndex) === t;
       });
       if (o.length === 0) {
         console.debug(`[PanoTagPlugin] changeMask: no MaskTag found at panoIndex ${t}`);
@@ -743,7 +742,7 @@ class js extends $ {
     var e;
     this.tags.length && (this.tags.forEach((t) => {
       var i, o, n, a, s, r, h, f, b, u, T;
-      (i = t.tag3DContentSvelte) == null || i.dispose(), (n = (o = t.mediaPlane) == null ? void 0 : o.parent) == null || n.remove(t.mediaPlane), (r = (s = (a = t.model) == null ? void 0 : a.object) == null ? void 0 : s.parent) == null || r.remove(t.model.object), (f = (h = t.rectanglePlane) == null ? void 0 : h.parent) == null || f.remove(t.rectanglePlane), (b = t.boxShape) != null && b.parent && t.boxShape.parent.remove(t.boxShape), (T = (u = t.polygonShape) == null ? void 0 : u.parent) == null || T.remove(t.polygonShape), t != null && t.tagNormalLine && (t == null || t.removeTagNormalLine()), t instanceof g && t.dispose();
+      (i = t.tag3DContentSvelte) == null || i.dispose(), (n = (o = t.mediaPlane) == null ? void 0 : o.parent) == null || n.remove(t.mediaPlane), (r = (s = (a = t.model) == null ? void 0 : a.object) == null ? void 0 : s.parent) == null || r.remove(t.model.object), (f = (h = t.rectanglePlane) == null ? void 0 : h.parent) == null || f.remove(t.rectanglePlane), (b = t.boxShape) != null && b.parent && t.boxShape.parent.remove(t.boxShape), (T = (u = t.polygonShape) == null ? void 0 : u.parent) == null || T.remove(t.polygonShape), t != null && t.tagNormalLine && (t == null || t.removeTagNormalLine()), t instanceof c && t.dispose();
     }), this.tags = [], this.tagsLengthWillUpdate = !0, this.hooks.emit("tagsLengthChange"), (e = this.TagContainerSvelte) == null || e.$destroy(), this.TagContainerSvelte = void 0, this.disposeAllCSS3DContainer()), this.enabledModelTagSet.clear(), this.cache.clear();
   }
   /**
@@ -789,13 +788,13 @@ class js extends $ {
       this.state.enabled && (this.filterPointTag.forEach((r) => r.updateScreenPosition({ force: !0 })), this.temporaryState.visible = !0, this.addRenderQueue({ type: "TagContainerSvelte", keys: ["temporaryState"] }));
     }, i = () => {
       this.state.enabled && (this.temporaryState.visible = !1, this.addRenderQueue({ type: "TagContainerSvelte", keys: ["temporaryState"] }));
-    }, { observe: o, unobserve: n } = M(
+    }, { observe: o, unobserve: n } = D(
       O(() => {
         this.store.resizeObserverDisposer && i();
       }, 500),
       e
-    ), { observe: a, unobserve: s } = M(
-      D(() => t(), 400),
+    ), { observe: a, unobserve: s } = D(
+      M(() => t(), 400),
       e
     );
     return o(), a(), () => {
@@ -900,7 +899,7 @@ class js extends $ {
    * @returns 性能统计信息
    */
   getMaskTagPerformanceStats() {
-    const e = g.getCacheStats(), t = this.filterMaskTag.length, i = this.filterMaskTag.filter((o) => o.visible).length;
+    const e = c.getCacheStats(), t = this.filterMaskTag.length, i = this.filterMaskTag.filter((o) => o.visible).length;
     return {
       // 标签统计
       totalMaskTags: t,
@@ -916,11 +915,11 @@ class js extends $ {
    * 注意：这会释放所有纹理缓存，谨慎使用
    */
   clearMaskTagCache() {
-    g.clearAllCache();
+    c.clearAllCache();
   }
 }
 export {
-  js as PanoTagPluginController,
-  js as default,
-  $s as pluginFlag
+  $s as PanoTagPluginController,
+  $s as default,
+  zs as pluginFlag
 };

package/libs/PanoTagPlugin/index.js

@@ -1,7 +1,7 @@
 import r from "./controller/index.js";
-import { pluginFlag as Vi } from "./controller/index.js";
-import { defaultGlobalConfig as Xi } from "./typings/tag/TagConfig.js";
-import { ContentType as Zi, DimensionType as _i, PointType as $i } from "./Archive/deprecated.js";
+import { pluginFlag as Ui } from "./controller/index.js";
+import { defaultGlobalConfig as Wi } from "./typings/tag/TagConfig.js";
+import { ContentType as Yi, DimensionType as Zi, PointType as _i } from "./Archive/deprecated.js";
 import "three";
 import "../vendor/object-assign-deep/objectAssignDeep.js";
 import "../shared-utils/positionToVector3.js";
@@ -85,7 +85,6 @@ import "../vendor/svelte/store/index.js";
 import "../vendor/svelte/internal/index.js";
 import "../shared-utils/device.js";
 import "./utils/model/mediaPlane.js";
-import "../shared-utils/audioFocus.js";
 import "../shared-utils/three/loadTexture.js";
 import "../shared-utils/three/Quadrangle.js";
 import "../shared-utils/math/pointsIsRectangle.js";
@@ -311,14 +310,14 @@ import "./Components/Common/TagPopover/ArrowRightIcon.js";
 import "./Components/Common/TagPopover/ShareIcon.js";
 import "./utils/popoverContainer.js";
 import "../shared-utils/animationFrame/BetterTween.js";
-const Ri = (o, t) => new r(o, t);
+const Qi = (o, t) => new r(o, t);
 export {
-  Zi as ContentType,
-  _i as DimensionType,
-  Ri as PanoTagPlugin,
+  Yi as ContentType,
+  Zi as DimensionType,
+  Qi as PanoTagPlugin,
   r as PanoTagPluginController,
-  $i as PointType,
-  Ri as default,
-  Xi as defaultGlobalConfig,
-  Vi as pluginFlag
+  _i as PointType,
+  Qi as default,
+  Wi as defaultGlobalConfig,
+  Ui as pluginFlag
 };

package/libs/PanoTagPlugin/utils/audio/SharedAudio.d.ts

@@ -1,4 +1,4 @@
-import { type AudioFocusHost, type AudioIntent } from '../../../shared-utils/audioFocus';
+import type { PlaybackManager } from '../../../shared-utils/playback';
 import { AudioDiagnostics } from './AudioDiagnostics';
 export { AudioDiagnostics };
 export declare class SharedAudio extends Audio {
@@ -11,11 +11,14 @@ export declare class SharedAudio extends Audio {
     private tryplaying;
     private audioInstance?;
     private eventListenerDisposer?;
-    private task;
+    private controller?;
+    private session?;
+    private playGeneration;
+    private disposed;
     private poolGeneration;
-    constructor(src?: string, audioFocus?: AudioFocusHost);
-    play(intent?: AudioIntent): Promise<void>;
-    setAudioFocus(host?: AudioFocusHost): void;
+    constructor(src?: string, mediaManager?: PlaybackManager);
+    play(userAction?: boolean): Promise<void>;
+    setMediaManager(manager?: PlaybackManager): void;
     pause(e?: Event): void;
     private stopOutput;
     dispose(): void;

package/libs/PanoTagPlugin/utils/audio/SharedAudio.js

@@ -1,37 +1,39 @@
-var y = Object.defineProperty;
-var f = (l, c, e) => c in l ? y(l, c, { enumerable: !0, configurable: !0, writable: !0, value: e }) : l[c] = e;
-var h = (l, c, e) => (f(l, typeof c != "symbol" ? c + "" : c, e), e);
-var v = (l, c, e) => new Promise((o, t) => {
-  var a = (r) => {
+var A = Object.defineProperty;
+var E = (h, l, e) => l in h ? A(h, l, { enumerable: !0, configurable: !0, writable: !0, value: e }) : h[l] = e;
+var c = (h, l, e) => (E(h, typeof l != "symbol" ? l + "" : l, e), e);
+var y = (h, l, e) => new Promise((t, o) => {
+  var i = (r) => {
     try {
       u(e.next(r));
     } catch (d) {
-      t(d);
+      o(d);
     }
-  }, i = (r) => {
+  }, a = (r) => {
     try {
       u(e.throw(r));
     } catch (d) {
-      t(d);
+      o(d);
     }
-  }, u = (r) => r.done ? o(r.value) : Promise.resolve(r.value).then(a, i);
-  u((e = e.apply(l, c)).next());
+  }, u = (r) => r.done ? t(r.value) : Promise.resolve(r.value).then(i, a);
+  u((e = e.apply(h, l)).next());
 });
-import { AudioTask as A } from "../../../shared-utils/audioFocus.js";
-import { getAudio as E, AudioNamespace as w } from "../../../shared-utils/audio.js";
-import { AudioDiagnostics as g } from "./AudioDiagnostics.js";
-class k extends Audio {
-  constructor(e, o) {
+import { getAudio as L, AudioNamespace as w } from "../../../shared-utils/audio.js";
+import { AudioDiagnostics as f } from "./AudioDiagnostics.js";
+class C extends Audio {
+  constructor(e, t) {
     super();
-    h(this, "sharedAudioSrc");
-    h(this, "sharedAudioPaused", !0);
-    h(this, "sharedAudioCurrentTime", 0);
-    h(this, "tryplaying", !1);
-    h(this, "audioInstance");
-    h(this, "eventListenerDisposer");
-    h(this, "task");
-    h(this, "poolGeneration", -1);
-    this.task = new A(o, "tag-audio", () => this.stopOutput()), this.sharedAudioSrc = e, e && this.validateAudioSource(e);
+    c(this, "sharedAudioSrc");
+    c(this, "sharedAudioPaused", !0);
+    c(this, "sharedAudioCurrentTime", 0);
+    c(this, "tryplaying", !1);
+    c(this, "audioInstance");
+    c(this, "eventListenerDisposer");
+    c(this, "controller");
+    c(this, "session");
+    c(this, "playGeneration", 0);
+    c(this, "disposed", !1);
+    c(this, "poolGeneration", -1);
+    this.setMediaManager(t), this.sharedAudioSrc = e, e && this.validateAudioSource(e);
   }
   get paused() {
     var e;
@@ -44,79 +46,90 @@ class k extends Audio {
     var e;
     return ((e = this.audioInstance) == null ? void 0 : e.duration) || 0;
   }
-  play(e = "auto") {
-    return v(this, null, function* () {
-      var i, u, r;
-      if (this.tryplaying)
+  play(e = !1) {
+    return y(this, null, function* () {
+      var d, p, m, n, s, g;
+      if (this.tryplaying || this.disposed)
         return;
-      const o = this.task.begin(e);
-      if (!o)
+      const t = (d = this.controller) == null ? void 0 : d.begin({ userAction: e, audible: !0 });
+      if (this.controller && !t)
         return;
-      this.tryplaying = !0, (!this.audioInstance || this.audioInstance.realSrc !== this.sharedAudioSrc || this.audioInstance.generation !== this.poolGeneration) && (this.audioInstance = E(this.sharedAudioSrc, { namespace: w.PlayAudio }), this.poolGeneration = this.audioInstance.generation);
-      const t = this.audioInstance, a = this.poolGeneration;
-      (i = this.eventListenerDisposer) == null || i.call(this), this.eventListenerDisposer = this.addEventListeners(), t.currentTime = (u = this.currentTime) != null ? u : 0;
+      this.session = t;
+      const o = ++this.playGeneration, i = () => o === this.playGeneration && !(t != null && t.signal.aborted);
+      this.tryplaying = !0, (!this.audioInstance || this.audioInstance.realSrc !== this.sharedAudioSrc || this.audioInstance.generation !== this.poolGeneration) && (this.audioInstance = L(this.sharedAudioSrc, { namespace: w.PlayAudio }), this.poolGeneration = this.audioInstance.generation);
+      const a = this.audioInstance, u = this.poolGeneration;
+      (p = this.eventListenerDisposer) == null || p.call(this), this.eventListenerDisposer = this.addEventListeners();
+      const r = (m = t == null ? void 0 : t.bind(a)) != null ? m : a;
+      r.currentTime = (n = this.currentTime) != null ? n : 0;
       try {
-        if (yield t.play(), !o() || t.generation !== a)
+        if (r.muted = !1, yield r.play(), !i() || a.generation !== u)
           return;
-        t.muted = !1, this.sharedAudioPaused = !1;
-      } catch (d) {
-        if (!o())
+        this.sharedAudioPaused = !1;
+      } catch (v) {
+        if (!i())
           return;
-        throw this.stopOutput(), this.task.release(), this.handlePlayError(d), (r = this.onerror) == null || r.call(this, d), d;
+        if (v.name === "AbortError") {
+          this.pause();
+          return;
+        }
+        throw (s = this.controller) == null || s.cancel(), this.stopOutput(), this.handlePlayError(v), (g = this.onerror) == null || g.call(this, v), v;
       } finally {
-        t.generation === a && (this.tryplaying = !1);
+        a.generation === u && (this.tryplaying = !1);
       }
     });
   }
-  setAudioFocus(e) {
-    this.task.setHost(e);
+  setMediaManager(e) {
+    var t;
+    (t = this.controller) == null || t.dispose(), this.stopOutput(), this.controller = e == null ? void 0 : e.createController({ label: "tag-audio", onCancel: () => this.stopOutput() });
   }
   pause(e) {
-    this.task.cancel("paused");
+    var t;
+    (t = this.controller) == null || t.cancel(), this.stopOutput();
   }
   stopOutput() {
-    var e, o, t;
-    this.tryplaying = !1, this.sharedAudioPaused = !0, (e = this.eventListenerDisposer) == null || e.call(this), this.eventListenerDisposer = void 0, ((o = this.audioInstance) == null ? void 0 : o.generation) === this.poolGeneration && (this.sharedAudioCurrentTime = this.audioInstance.currentTime, this.audioInstance.muted = !0, this.audioInstance.pause(), this.audioInstance.clear()), this.audioInstance = void 0, (t = this.onpause) == null || t.call(this, new Event("pause"));
+    var e, t, o;
+    this.playGeneration++, this.session = void 0, this.tryplaying = !1, this.sharedAudioPaused = !0, (e = this.eventListenerDisposer) == null || e.call(this), this.eventListenerDisposer = void 0, ((t = this.audioInstance) == null ? void 0 : t.generation) === this.poolGeneration && (this.sharedAudioCurrentTime = this.audioInstance.currentTime, this.audioInstance.muted = !0, this.audioInstance.pause(), this.audioInstance.clear()), this.audioInstance = void 0, (o = this.onpause) == null || o.call(this, new Event("pause"));
   }
   dispose() {
-    this.task.dispose();
+    var e;
+    this.disposed = !0, (e = this.controller) == null || e.dispose(), this.stopOutput();
   }
   clear() {
     var e;
     ((e = this.audioInstance) == null ? void 0 : e.generation) === this.poolGeneration && this.audioInstance.clear(), this.audioInstance = void 0;
   }
   handlePlayError(e) {
-    var a, i, u, r;
-    const o = navigator.userAgent, t = this.sharedAudioSrc;
-    if (console.group("🎵 音频播放错误详情"), console.error("错误对象:", e), console.error("错误名称:", e.name), console.error("错误信息:", e.message), console.error("音频文件路径:", t), console.error("浏览器信息:", o), console.error("音频实例状态:", {
+    var i, a, u, r;
+    const t = navigator.userAgent, o = this.sharedAudioSrc;
+    if (console.group("🎵 音频播放错误详情"), console.error("错误对象:", e), console.error("错误名称:", e.name), console.error("错误信息:", e.message), console.error("音频文件路径:", o), console.error("浏览器信息:", t), console.error("音频实例状态:", {
       exists: !!this.audioInstance,
-      readyState: (a = this.audioInstance) == null ? void 0 : a.readyState,
-      networkState: (i = this.audioInstance) == null ? void 0 : i.networkState,
+      readyState: (i = this.audioInstance) == null ? void 0 : i.readyState,
+      networkState: (a = this.audioInstance) == null ? void 0 : a.networkState,
       error: (u = this.audioInstance) == null ? void 0 : u.error
     }), e.name === "NotSupportedError") {
-      if (e.message.includes("no supported source was found") && (console.error("❌ 错误原因: 无法找到支持的音频源"), console.error("💡 可能的解决方案:"), console.error("   1. 检查音频文件路径是否正确"), console.error("   2. 检查音频文件是否存在"), console.error("   3. 检查音频文件格式是否被浏览器支持 (推荐: MP3, OGG, WAV)"), console.error("   4. 检查CORS设置，确保可以跨域访问音频文件"), t)) {
-        const d = (r = t.split(".").pop()) == null ? void 0 : r.toLowerCase(), p = ["mp3", "ogg", "wav", "m4a", "aac"];
+      if (e.message.includes("no supported source was found") && (console.error("❌ 错误原因: 无法找到支持的音频源"), console.error("💡 可能的解决方案:"), console.error("   1. 检查音频文件路径是否正确"), console.error("   2. 检查音频文件是否存在"), console.error("   3. 检查音频文件格式是否被浏览器支持 (推荐: MP3, OGG, WAV)"), console.error("   4. 检查CORS设置，确保可以跨域访问音频文件"), o)) {
+        const d = (r = o.split(".").pop()) == null ? void 0 : r.toLowerCase(), p = ["mp3", "ogg", "wav", "m4a", "aac"];
         d && !p.includes(d) && (console.error(`   ⚠️  检测到不常见的音频格式: .${d}`), console.error(`   📝 建议使用: ${p.join(", ")}`));
       }
     } else
       e.name === "AbortError" ? console.error("❌ 错误原因: 音频播放被中断") : e.name === "NotAllowedError" ? console.error("❌ 错误原因: 浏览器阻止了音频播放 (通常需要用户交互)") : e.message === "The operation is not supported." ? console.error("❌ 错误原因: 音频文件可能损坏或格式有问题") : console.error("❌ 未知的音频播放错误");
-    console.groupEnd(), e.name === "NotSupportedError" && t && (console.error("💡 建议运行完整音频诊断来查找问题根源："), console.error(`AudioDiagnostics.diagnoseAudio("${t}")`), process.env.NODE_ENV === "development" && (console.warn("🔍 自动运行音频诊断..."), g.diagnoseAudio(t)));
+    console.groupEnd(), e.name === "NotSupportedError" && o && (console.error("💡 建议运行完整音频诊断来查找问题根源："), console.error(`AudioDiagnostics.diagnoseAudio("${o}")`), process.env.NODE_ENV === "development" && (console.warn("🔍 自动运行音频诊断..."), f.diagnoseAudio(o)));
   }
   validateAudioSource(e) {
-    var a;
+    var i;
     try {
       new URL(e, window.location.href);
-    } catch (i) {
-      console.warn("🎵 音频URL格式可能有问题:", e), g.diagnoseAudio(e);
+    } catch (a) {
+      console.warn("🎵 音频URL格式可能有问题:", e), f.diagnoseAudio(e);
       return;
     }
-    const o = (a = e.split(".").pop()) == null ? void 0 : a.toLowerCase(), t = ["mp3", "ogg", "wav", "m4a", "aac", "webm"];
-    o && !t.includes(o) && (console.warn("🎵 音频格式可能不被广泛支持:", o), console.warn("💡 建议使用常见格式:", t.join(", ")), console.warn('💡 运行音频诊断：AudioDiagnostics.diagnoseAudio("' + e + '")')), this.checkBrowserSupport(o);
+    const t = (i = e.split(".").pop()) == null ? void 0 : i.toLowerCase(), o = ["mp3", "ogg", "wav", "m4a", "aac", "webm"];
+    t && !o.includes(t) && (console.warn("🎵 音频格式可能不被广泛支持:", t), console.warn("💡 建议使用常见格式:", o.join(", ")), console.warn('💡 运行音频诊断：AudioDiagnostics.diagnoseAudio("' + e + '")')), this.checkBrowserSupport(t);
   }
   checkBrowserSupport(e) {
     if (!e)
       return;
-    const o = document.createElement("audio"), a = {
+    const t = document.createElement("audio"), i = {
       mp3: "audio/mpeg",
       ogg: "audio/ogg",
       wav: "audio/wav",
@@ -124,28 +137,28 @@ class k extends Audio {
       aac: "audio/aac",
       webm: "audio/webm"
     }[e];
-    if (a) {
-      const i = o.canPlayType(a);
-      i === "" ? (console.warn(`🎵 当前浏览器可能不支持 ${e.toUpperCase()} 格式`), console.warn("💡 建议提供多种格式的音频文件作为备选")) : console.info(i === "maybe" ? `🎵 当前浏览器可能支持 ${e.toUpperCase()} 格式 (不确定)` : `🎵 当前浏览器支持 ${e.toUpperCase()} 格式`);
+    if (i) {
+      const a = t.canPlayType(i);
+      a === "" ? (console.warn(`🎵 当前浏览器可能不支持 ${e.toUpperCase()} 格式`), console.warn("💡 建议提供多种格式的音频文件作为备选")) : console.info(a === "maybe" ? `🎵 当前浏览器可能支持 ${e.toUpperCase()} 格式 (不确定)` : `🎵 当前浏览器支持 ${e.toUpperCase()} 格式`);
     }
   }
   endedHandler(e) {
-    var o, t;
-    this.task.release(), (o = this.onended) == null || o.call(this, e != null ? e : new Event("ended")), (t = this.eventListenerDisposer) == null || t.call(this), this.sharedAudioPaused = !0, this.sharedAudioCurrentTime = 0, this.clear();
+    var t, o, i;
+    (t = this.session) == null || t.finish(), this.session = void 0, (o = this.onended) == null || o.call(this, e != null ? e : new Event("ended")), (i = this.eventListenerDisposer) == null || i.call(this), this.sharedAudioPaused = !0, this.sharedAudioCurrentTime = 0, this.clear();
   }
   addEventListeners() {
     const e = this.audioInstance;
     if (!e)
       return;
-    const o = (n) => {
+    const t = (n) => {
       var s;
       this.sharedAudioCurrentTime = e.currentTime, (s = this.ontimeupdate) == null || s.call(this, n);
-    }, t = (n) => {
+    }, o = (n) => {
       var s;
       e.isBlankAudio || (this.sharedAudioPaused = !1, (s = this.onplay) == null || s.call(this, n));
-    }, a = (n) => {
-      this.pause(n);
     }, i = (n) => {
+      this.pause(n);
+    }, a = (n) => {
       this.endedHandler(n);
     }, u = (n) => {
       var s;
@@ -163,12 +176,12 @@ class k extends Audio {
       var s;
       return (s = this.onloadedmetadata) == null ? void 0 : s.call(this, n);
     };
-    return e.addEventListener("timeupdate", o), e.addEventListener("play", t), e.addEventListener("pause", a), e.addEventListener("ended", i), e.addEventListener("error", u), e.addEventListener("canplay", r), e.addEventListener("canplaythrough", d), e.addEventListener("loadeddata", p), e.addEventListener("loadedmetadata", m), () => {
-      e.removeEventListener("timeupdate", o), e.removeEventListener("play", t), e.removeEventListener("pause", a), e.removeEventListener("ended", i), e.removeEventListener("error", u), e.removeEventListener("canplay", r), e.removeEventListener("canplaythrough", d), e.removeEventListener("loadeddata", p), e.removeEventListener("loadedmetadata", m);
+    return e.addEventListener("timeupdate", t), e.addEventListener("play", o), e.addEventListener("pause", i), e.addEventListener("ended", a), e.addEventListener("error", u), e.addEventListener("canplay", r), e.addEventListener("canplaythrough", d), e.addEventListener("loadeddata", p), e.addEventListener("loadedmetadata", m), () => {
+      e.removeEventListener("timeupdate", t), e.removeEventListener("play", o), e.removeEventListener("pause", i), e.removeEventListener("ended", a), e.removeEventListener("error", u), e.removeEventListener("canplay", r), e.removeEventListener("canplaythrough", d), e.removeEventListener("loadeddata", p), e.removeEventListener("loadedmetadata", m);
     };
   }
 }
 export {
-  g as AudioDiagnostics,
-  k as SharedAudio
+  f as AudioDiagnostics,
+  C as SharedAudio
 };

package/libs/PanoTagPlugin/utils/model/mediaPlane.d.ts

@@ -1,4 +1,4 @@
-import { type AudioFocusHost, type AudioIntent } from '../../../shared-utils/audioFocus';
+import type { PlaybackManager } from '../../../shared-utils/playback';
 import * as THREE from 'three';
 import { Vector3 } from 'three';
 import type { FiveDomEvents } from '../../../shared-utils/five/FiveDomEvents';
@@ -55,9 +55,12 @@ declare class VideoPlane extends MediaPlane {
     private videoTextureMap;
     private ImageTextureMap;
     private initialOpacity;
-    private audioTask;
+    private playbackController?;
+    private session?;
+    private loadGeneration;
+    private playbackDisposed;
     constructor(videoSrc: string, cornerPoints: Vector3[], params?: {
-        audioFocus?: AudioFocusHost;
+        mediaManager?: PlaybackManager;
         paused?: boolean;
         playButton?: 'withText' | 'withoutText' | string;
         videoCoverSrc?: string;
@@ -71,8 +74,8 @@ declare class VideoPlane extends MediaPlane {
         opacity?: number;
     });
     dispose(): void;
-    setAudioFocus(host?: AudioFocusHost): void;
-    play(muted?: boolean, intent?: AudioIntent): Promise<void>;
+    setMediaManager(manager?: PlaybackManager): void;
+    play(muted?: boolean, userAction?: boolean): Promise<void>;
     pause(): void;
     private stopOutput;
     onDispose(dispose: () => void): void;