@netless/app-slide 0.2.47-alpha.5 → 0.2.47-alpha.7

package/dist/main.es.js

@@ -23108,8 +23108,7 @@ var Slide = function(t) {
       return t2;
     }
     applyOptions(t2) {
-      var e2, i2;
-      super.applyOptions(t2), this.material.uniforms.direction = { value: ((i2 = (e2 = this.options) === null || e2 === void 0 ? void 0 : e2[0]) === null || i2 === void 0 ? void 0 : i2.value) === "horz" ? 0 : 1 };
+      super.applyOptions(t2), this.material.uniforms.direction = { value: this.options[0].value === "horz" ? 1 : 0 };
     }
     setSize(t2, e2) {
       super.setSize(t2, e2), this.material.uniforms.lines = { value: this.genRandomLines() }, this.material.vertexShader = ol.a;
@@ -23123,10 +23122,10 @@ var Slide = function(t) {
       super(...arguments), this.duration = 1400, this.fragmentShader = cl.a, this.options = [{ name: "dir", value: "center" }], this.optionsMap = { center: 0, ru: 1, lu: 2, ld: 3, rd: 4 };
     }
     applyOptions(t2) {
-      var e2, i2;
+      var e2, i2, n2, r2;
       super.applyOptions(t2);
-      const n2 = this.options.find((t3) => t3.name === "dir");
-      this.material.uniforms.option = { value: (e2 = this.optionsMap) === null || e2 === void 0 ? void 0 : e2[(i2 = n2 == null ? void 0 : n2.value) !== null && i2 !== void 0 ? i2 : "center"] };
+      const o2 = this.options.find((t3) => t3.name === "dir");
+      console.log((e2 = this.optionsMap) === null || e2 === void 0 ? void 0 : e2[(i2 = o2 == null ? void 0 : o2.value) !== null && i2 !== void 0 ? i2 : "center"]), this.material.uniforms.option = { value: (n2 = this.optionsMap) === null || n2 === void 0 ? void 0 : n2[(r2 = o2 == null ? void 0 : o2.value) !== null && r2 !== void 0 ? r2 : "center"] };
     }
   }, Erase: class extends nl {
     constructor() {
@@ -31224,7 +31223,7 @@ void main(void){
         t3.stopPropagation(), this.hide();
       }, this.mediaTimeUpdate = () => r_(this, void 0, void 0, function* () {
         const t3 = this.media.currentTime - this.start;
-        if ((this.duration > 0 && Math.abs(t3 - this.duration) < 0.3 || t3 > this.duration) && (yield this.pauseMedia(), this.medianIsEnd = true, this.jumpToTime(), this.ctx.eventHub.emit(jy.mediaStop, { id: this.targetId }), this.onClickCancelFullScreenButtonHandle()), this.currentTime.innerText = a_.formatTime(t3), this.currentProgress.style.flex = (t3 / this.duration).toString(), this.bookmarkList && this.bookmarkList.length > 0) {
+        if (this.duration > 0 && (Math.abs(t3 - this.duration) < 0.3 || t3 > this.duration) && (yield this.pauseMedia(), this.medianIsEnd = true, this.jumpToTime(), this.ctx.eventHub.emit(jy.mediaStop, { id: this.targetId }), this.onClickCancelFullScreenButtonHandle()), this.currentTime.innerText = a_.formatTime(t3), this.currentProgress.style.flex = (t3 / this.duration).toString(), this.bookmarkList && this.bookmarkList.length > 0) {
           const t4 = this.bookmarkList[this.pickBookmarkIndex];
           t4 && t4.time.toFixed(0) === this.media.currentTime.toFixed(0) && (this.ctx.timingEventHub.emit(`shape ${this.shapeId} onMediaBookmark ${t4.name}`), this.pickBookmarkIndex += 1);
         }
@@ -31234,7 +31233,7 @@ void main(void){
       }, this.onPlayMedia = () => {
         this.fadeState = { in: false, out: false }, this.fadeHit(0), this.playButton.style.display = "none", this.pauseButton.style.display = "block", this.playCallBackList.forEach((t3) => {
           t3();
-        });
+        }), this.media.currentTime < this.start && this.jumpToTime();
       }, this._playMediaFromCtrl = () => {
         this.playMediaFromCtrl(false);
       }, this._pauseMediaFromCtrl = () => {
@@ -31403,13 +31402,16 @@ void main(void){
   }
   var l_ = i(120);
   class h_ extends Za.a {
-    constructor(t2, e2) {
-      super(), this.isGlobalPause = false, this.lastTime = -1, this.howl = null, this.rctClient = null, this.isHowlEnd = false, this.isHowlLoadEmit = false, this.staticEventId = 1001, this.url = t2, this.runningAudio = e2, zy.RtcAudioClazz ? (this.rctClient = new zy.RtcAudioClazz(t2), this.rctClient.on("load", () => this.emit("load")), this.rctClient.on("pause", () => this.emit("pause")), this.rctClient.on("play", () => this.emit("play")), this.rctClient.on("resumeAllAudioInterruptByAudioSessionChanged", () => {
+    constructor(t2, e2, i2) {
+      var n2, r2;
+      super(), this.isGlobalPause = false, this.lastTime = -1, this.howl = null, this.rctClient = null, this.isHowlEnd = false, this.isHowlLoadEmit = false, this.staticEventId = 1001, this._catParams = void 0, this.url = t2, this.runningAudio = e2, i2 && (this._catParams = i2), zy.RtcAudioClazz ? (this.rctClient = new zy.RtcAudioClazz(t2, (n2 = this._catParams) === null || n2 === void 0 ? void 0 : n2.start, (r2 = this._catParams) === null || r2 === void 0 ? void 0 : r2.end), console.log("rctClient", this.rctClient), this.rctClient.on("load", () => this.emit("load")), this.rctClient.on("pause", () => this.emit("pause")), this.rctClient.on("play", () => {
+        this.startTimeChangeEmit(), this.emit("play");
+      }), this.rctClient.on("resumeAllAudioInterruptByAudioSessionChanged", () => {
         this.emit("resumeAllAudioInterruptByAudioSessionChanged");
       })) : (this.howl = new l_.Howl({ src: [t2] }), [this.staticEventId] = this.howl._getSoundIds(), this.howl.load(), this.howl.on("load", () => {
         this.isHowlLoadEmit = true, this.emit("load");
       }), this.howl.on("pause", () => this.emit("pause")), this.howl.on("play", () => {
-        this.isHowlLoadEmit || this.emit("load"), this.isHowlEnd = false, this.emit("play");
+        this.isHowlLoadEmit || this.emit("load"), this.isHowlEnd = false, this.startTimeChangeEmit(), this.emit("play");
       }), this.howl.on("end", () => {
         this.isHowlEnd = true;
       }));
@@ -31421,7 +31423,7 @@ void main(void){
     }
     play() {
       var t2, e2, i2;
-      this.runningAudio.has(this.url) && ((t2 = this.runningAudio.get(this.url)) === null || t2 === void 0 || t2.stop(), this.runningAudio.delete(this.url)), this.isHowlEnd = false, this.lastTime = -1, (e2 = this.howl) === null || e2 === void 0 || e2.play(this.staticEventId), (i2 = this.rctClient) === null || i2 === void 0 || i2.play(), this.startTimeChangeEmit(), this.runningAudio.set(this.url, this);
+      this.runningAudio.has(this.url) && ((t2 = this.runningAudio.get(this.url)) === null || t2 === void 0 || t2.stop(), this.runningAudio.delete(this.url)), this.isHowlEnd = false, this.lastTime = -1, (e2 = this.howl) === null || e2 === void 0 || e2.play(this.staticEventId), (i2 = this.rctClient) === null || i2 === void 0 || i2.play(), this.runningAudio.set(this.url, this);
     }
     fade(t2, e2, i2) {
       this.howl && this.howl.fade(t2, e2, i2);
@@ -31438,7 +31440,10 @@ void main(void){
     }
     stop() {
       var t2;
-      (t2 = this.howl) === null || t2 === void 0 || t2.pause(this.staticEventId), this.rctClient && (this.rctClient.pause(), this.rctClient.currentTime = 0), this.runningAudio.has(this.url) && this.runningAudio.delete(this.url);
+      (t2 = this.howl) === null || t2 === void 0 || t2.pause(this.staticEventId), this.rctClient && (this.rctClient.pause(), this.rctClient.currentTime = 0, setTimeout(() => {
+        var t3;
+        console.log("current time: " + ((t3 = this.rctClient) === null || t3 === void 0 ? void 0 : t3.currentTime));
+      })), this.runningAudio.has(this.url) && this.runningAudio.delete(this.url);
     }
     destroy() {
       var t2, e2, i2, n2, r2, o2, s2, a2;
@@ -31487,7 +31492,7 @@ void main(void){
   };
   class c_ extends Za.a {
     constructor(t2) {
-      var e2, i2, n2, r2, o2;
+      var e2, i2, n2, r2, o2, s2, a2;
       super(), this.type = "video", this.sprite = new ep(), this.isPlaying = false, this.isGlobalPause = false, this.fullscreen = false, this.url = "", this.isLoaded = false, this.onVideoResourceLoaded = () => {
         this.isLoaded = true;
       }, this.onVideoStalled = () => {
@@ -31498,13 +31503,13 @@ void main(void){
         const { targetId: e3, state: i3, slideIndex: n3 } = t3;
         n3 === this.ctx.slideIndex && e3 === this.id && (i3 ? (this.requestFullscreen(), this.ctx.latestChangeFullscreenTargetId = e3) : this.requestCancelFullscreen());
       }, this.id = t2.id, this.start = (e2 = t2.video.cut) === null || e2 === void 0 ? void 0 : e2.start, this.end = (i2 = t2.video.cut) === null || i2 === void 0 ? void 0 : i2.end, this.fullscreen = (n2 = t2.video.fullscreen) !== null && n2 !== void 0 && n2, this.container = t2.container, this.ctx = t2.ctx, this.ctx.medias[this.id] = this;
-      const s2 = t2.video.src;
-      this.videoResource = new Vh.w(s2, { autoLoad: true, autoPlay: false, updateFPS: 30, crossorigin: true }), (r2 = this.videoElement) === null || r2 === void 0 || r2.addEventListener("stalled", this.onVideoStalled), (o2 = this.videoElement) === null || o2 === void 0 || o2.addEventListener("loadedmetadata", this.onVideoResourceLoaded), this.url = t2.video.src;
-      let a2 = t2.video.src.replace(/4$/, "3");
-      this.ctx.loaderDelegate && (a2 = this.ctx.loaderDelegate.redirectMedia(a2), this.ctx.logger.info(`redirect media url from ${t2.video.src.replace(/4$/, "3")} to ${a2} by delegate.`, t2.ctx.taskId)), this.rtcAudio = new h_(a2, t2.ctx.runningAudio), this.rtcAudio.on("timeupdate", (t3) => {
-        if (this.videoElement) {
+      const l2 = t2.video.src;
+      this.videoResource = new Vh.w(l2, { autoLoad: true, autoPlay: false, updateFPS: 30, crossorigin: true }), (r2 = this.videoElement) === null || r2 === void 0 || r2.addEventListener("stalled", this.onVideoStalled), (o2 = this.videoElement) === null || o2 === void 0 || o2.addEventListener("loadedmetadata", this.onVideoResourceLoaded), this.url = t2.video.src;
+      let h2 = t2.video.src.replace(/4$/, "3");
+      this.ctx.loaderDelegate && (h2 = this.ctx.loaderDelegate.redirectMedia(h2), this.ctx.logger.info(`redirect media url from ${t2.video.src.replace(/4$/, "3")} to ${h2} by delegate.`, t2.ctx.taskId)), this.rtcAudio = new h_(h2, t2.ctx.runningAudio, { start: (s2 = t2.video.cut) === null || s2 === void 0 ? void 0 : s2.start, end: (a2 = t2.video.cut) === null || a2 === void 0 ? void 0 : a2.end }), this.rtcAudio.on("timeupdate", (t3) => {
+        if (console.log(t3), this.videoElement) {
           const e3 = this.videoElement.currentTime;
-          Math.abs(e3 - t3) > 0.5 && this.videoElement.fastSeek(t3);
+          Math.abs(e3 - t3) > 0.5 && (this.videoElement.currentTime = t3);
         }
       }), this.rtcAudio.on("resumeAllAudioInterruptByAudioSessionChanged", () => {
         var t3;
@@ -31513,14 +31518,14 @@ void main(void){
           this.rtcAudio.isPaused || (t4 = this.videoElement) === null || t4 === void 0 || t4.play();
         }, 200);
       });
-      const { video: l2, width: h2, height: u2, target: c2 } = t2;
-      this.controller = new a_({ targetId: t2.id, shapeId: t2.shapeId, ctx: t2.ctx, width: h2, height: u2, target: c2, media: this, info: l2, canvasElement: t2.canvasElement }), this.controller.addPlayCallBack(() => {
-        this.sprite.width = h2, this.sprite.height = u2, this.ctx.clock.setTimeout(() => {
+      const { video: u2, width: c2, height: d2, target: p2 } = t2;
+      this.controller = new a_({ targetId: t2.id, shapeId: t2.shapeId, ctx: t2.ctx, width: c2, height: d2, target: p2, media: this, info: u2, canvasElement: t2.canvasElement }), this.controller.addPlayCallBack(() => {
+        this.sprite.width = c2, this.sprite.height = d2, this.ctx.clock.setTimeout(() => {
           this.sprite.visible = true;
         }, 50);
       });
-      const d2 = new Vh.c(null, { height: u2, width: h2 });
-      d2.resource = this.videoResource, this.videoResource.bind(d2), this.sprite = new ep(), this.sprite.visible = false, this.sprite.texture = new Vh.t(d2), this.sprite.interactive = true, this.container.addChild(this.sprite), this.sprite.on("mouseover", (t3) => {
+      const f2 = new Vh.c(null, { height: d2, width: c2 });
+      f2.resource = this.videoResource, this.videoResource.bind(f2), this.sprite = new ep(), this.sprite.visible = false, this.sprite.texture = new Vh.t(f2), this.sprite.interactive = true, this.container.addChild(this.sprite), this.sprite.on("mouseover", (t3) => {
         t3.stopPropagation(), this.controller.show();
       }), this.sprite.on("mouseout", (t3) => {
         t3.stopPropagation(), this.controller.hide();
@@ -31593,7 +31598,7 @@ void main(void){
       this.controller.jumpToTime(t2);
     }
     stop() {
-      this.seek(0), this.pause(), this.ctx.eventHub.emit(jy.mediaStop, { id: this.id });
+      this.rtcAudio.stop(), this.seek(0), this.pause(), this.ctx.eventHub.emit(jy.mediaStop, { id: this.id });
     }
     requestFullscreen() {
       return u_(this, void 0, void 0, function* () {
@@ -31643,13 +31648,14 @@ void main(void){
   };
   class p_ extends Za.a {
     constructor(t2) {
+      var e2, i2;
       super(), this.type = "audio", this.isPlaying = false, this.isGlobalPause = false, this.updateVolume = (t3) => {
         this.audioPlayer.volume(t3);
       }, this.id = t2.id;
-      const e2 = t2.audio.src;
-      this.audioPlayer = new h_(e2, t2.ctx.runningAudio), t2.audio.cut && (this.start = t2.audio.cut.start, this.end = t2.audio.cut.end), this.ctx = t2.ctx, this.ctx.medias[this.id] = this;
-      const { width: i2, height: n2, target: r2 } = t2;
-      this.controller = new a_({ targetId: t2.id, shapeId: t2.shapeId, ctx: t2.ctx, height: n2, width: i2, target: r2, media: this, info: t2.audio, canvasElement: t2.canvasElement }), this.audioPlayer.on("load", () => this.emit("durationchange")), this.audioPlayer.on("timeupdate", () => this.emit("timeupdate")), this.audioPlayer.on("pause", () => this.emit("pause")), this.audioPlayer.on("play", () => this.emit("play")), this.ctx.activeMedia.add(this), this.ctx.volumeAdjuster.on("update", this.updateVolume);
+      const n2 = t2.audio.src;
+      this.audioPlayer = new h_(n2, t2.ctx.runningAudio, { start: (e2 = t2.audio.cut) === null || e2 === void 0 ? void 0 : e2.start, end: (i2 = t2.audio.cut) === null || i2 === void 0 ? void 0 : i2.end }), t2.audio.cut && (this.start = t2.audio.cut.start, this.end = t2.audio.cut.end), this.ctx = t2.ctx, this.ctx.medias[this.id] = this;
+      const { width: r2, height: o2, target: s2 } = t2;
+      this.controller = new a_({ targetId: t2.id, shapeId: t2.shapeId, ctx: t2.ctx, height: o2, width: r2, target: s2, media: this, info: t2.audio, canvasElement: t2.canvasElement }), this.audioPlayer.on("load", () => this.emit("durationchange")), this.audioPlayer.on("timeupdate", () => this.emit("timeupdate")), this.audioPlayer.on("pause", () => this.emit("pause")), this.audioPlayer.on("play", () => this.emit("play")), this.ctx.activeMedia.add(this), this.ctx.volumeAdjuster.on("update", this.updateVolume);
     }
     get currentTime() {
       return this.audioPlayer.currentTime;
@@ -31699,7 +31705,7 @@ void main(void){
       this.ctx.isPlayerPaused() ? this.ctx.logger.info("Audio player prevent seek event with paused state", this.ctx.taskId) : this.controller.jumpToTime(t2);
     }
     stop() {
-      this.seek(0), this.pause(), this.ctx.eventHub.emit(jy.mediaStop, { id: this.id });
+      this.audioPlayer.stop(), this.seek(0), this.pause(), this.ctx.eventHub.emit(jy.mediaStop, { id: this.id });
     }
     requestFullscreen() {
     }
@@ -35970,7 +35976,7 @@ void main(void){
   }
   var pT = { syncDispatch: "syncDispatch", syncReceive: "syncReceive", syncEventLag: "syncEventLag", renderStart: "renderStart", renderEnd: "renderEnd", renderError: "renderError", slideChange: "slideChange", mainSeqStepStart: "mainSeqStepStart", mainSeqStepEnd: "mainSeqStepEnd", animateStart: "animateStart", animateEnd: "animateEnd", stateChange: "stateChange", slideStepEnd: "slideEnd", slideStepStart: "slideStart" }, fT = { taskId: "", url: "", currentSlideIndex: -1, mainSeqStep: -1, mainSeqState: null, mediaState: /* @__PURE__ */ Object.create(null), interactiveSeqState: /* @__PURE__ */ Object.create(null) }, mT = "";
   try {
-    mT = "1.1.9-beta.1";
+    mT = "1.1.9-beta.6";
   } catch (t2) {
     mT = "dev -";
   }
@@ -39092,7 +39098,7 @@ class SlidePreviewer {
   }
 }
 const usePlugin = /* @__PURE__ */ Slide.Slide.usePlugin.bind(Slide.Slide);
-const version = "0.2.47-alpha.5";
+const version = "0.2.47-alpha.7";
 const SlideApp = {
   kind: "Slide",
   setup(context) {