@94ai/nf-audio 3.3.64 → 3.3.66

package/lib/nf-audio.cjs.js

@@ -285,29 +285,36 @@ const _sfc_main = {
       return window.location.protocol === "https:" || window.location.hostname === "localhost";
     },
     async startAudioCtx() {
+      var _a, _b;
       if (this.isHighPrecision()) {
-        if (!this.audioCtx) {
-          this.audioCtx = new (window.AudioContext || window.webkitAudioContext)();
-          this.audioSource = this.audioCtx.createMediaElementSource(this.audio);
-          await this.audioCtx.audioWorklet.addModule("data:application/javascript," + encodeURIComponent(this.audioWorkletProcessor));
-          this.processor = new AudioWorkletNode(this.audioCtx, "tick");
-          this.audioSource.connect(this.processor).connect(this.audioCtx.destination);
-          this.processor.port.onmessage = (event) => {
-            if (event.data.command === "tick") {
-              if (this.betweenPlaying) {
-                if (this.betweenEnd) {
-                  if (this.debuglog) {
-                    console.log(this.audio.currentTime);
-                  }
-                  if (this.audio.currentTime >= this.betweenEnd) {
-                    this.pause();
+        try {
+          if (!this.audioCtx) {
+            this.audioCtx = new (window.AudioContext || window.webkitAudioContext)();
+            this.audioSource = this.audioCtx.createMediaElementSource(this.audio);
+            await ((_a = this.audioCtx.audioWorklet) == null ? void 0 : _a.addModule("data:application/javascript," + encodeURIComponent(this.audioWorkletProcessor)));
+            this.processor = new AudioWorkletNode(this.audioCtx, "tick");
+            this.audioSource.connect(this.processor).connect(this.audioCtx.destination);
+            if ((_b = this.processor) == null ? void 0 : _b.port) {
+              this.processor.port.onmessage = (event) => {
+                if (event.data.command === "tick") {
+                  if (this.betweenPlaying) {
+                    if (this.betweenEnd) {
+                      if (this.debuglog) {
+                        console.log(this.audio.currentTime);
+                      }
+                      if (this.audio.currentTime >= this.betweenEnd) {
+                        this.pause();
+                      }
+                    }
                   }
                 }
-              }
+              };
             }
-          };
-        } else {
-          this.audioCtx.resume();
+          } else {
+            this.audioCtx.resume();
+          }
+        } catch (e) {
+          console.log(e);
         }
         this.processor.port.postMessage({
           command: "start"
@@ -333,10 +340,14 @@ const _sfc_main = {
       await this.startAudioCtx();
       this.audio.play();
     },
+    loadError(e) {
+      this.$emit("error", e);
+    },
     //视频在可以播放时触发
     getDuration() {
       this.totalTime = timeFormat(this.audio.duration);
       this.audio.volume = this.volume;
+      this.$emit("canPlay", this.totalTime);
     },
     //进度条发生变化时触发
     updateTime() {
@@ -386,10 +397,8 @@ const _sfc_main = {
           this.betweenPlaying = false;
           return false;
         }
-        if (!this.audio.paused) {
-          this.updateProgress(e.offsetX);
-          this.$emit("updateProgress", e.offsetX);
-        }
+        this.updateProgress(e.offsetX);
+        this.$emit("updateProgress", e.offsetX);
       }
     },
     //更新进度
@@ -545,6 +554,7 @@ var _sfc_render = function render() {
     },
     on: {
       "canplay": _vm.getDuration,
+      "error": _vm.loadError,
       "timeupdate": _vm.updateTime,
       "ended": _vm.handleAudioEnded
     }
@@ -643,7 +653,10 @@ var _sfc_render = function render() {
       ref: "progressBar",
       staticClass: "nf-audio-progress-bar",
       on: {
-        "mousedown": _vm.handleMousedown
+        "mousedown": _vm.handleMousedown,
+        "click": function($event) {
+          $event.stopPropagation();
+        }
       }
     })])])];
   }), _vm.forwardSecond ? _vm._t("fastForward", function() {

package/lib/nf-audio.esm-bundler.js

@@ -283,29 +283,36 @@ const _sfc_main = {
       return window.location.protocol === "https:" || window.location.hostname === "localhost";
     },
     async startAudioCtx() {
+      var _a, _b;
       if (this.isHighPrecision()) {
-        if (!this.audioCtx) {
-          this.audioCtx = new (window.AudioContext || window.webkitAudioContext)();
-          this.audioSource = this.audioCtx.createMediaElementSource(this.audio);
-          await this.audioCtx.audioWorklet.addModule("data:application/javascript," + encodeURIComponent(this.audioWorkletProcessor));
-          this.processor = new AudioWorkletNode(this.audioCtx, "tick");
-          this.audioSource.connect(this.processor).connect(this.audioCtx.destination);
-          this.processor.port.onmessage = (event) => {
-            if (event.data.command === "tick") {
-              if (this.betweenPlaying) {
-                if (this.betweenEnd) {
-                  if (this.debuglog) {
-                    console.log(this.audio.currentTime);
-                  }
-                  if (this.audio.currentTime >= this.betweenEnd) {
-                    this.pause();
+        try {
+          if (!this.audioCtx) {
+            this.audioCtx = new (window.AudioContext || window.webkitAudioContext)();
+            this.audioSource = this.audioCtx.createMediaElementSource(this.audio);
+            await ((_a = this.audioCtx.audioWorklet) == null ? void 0 : _a.addModule("data:application/javascript," + encodeURIComponent(this.audioWorkletProcessor)));
+            this.processor = new AudioWorkletNode(this.audioCtx, "tick");
+            this.audioSource.connect(this.processor).connect(this.audioCtx.destination);
+            if ((_b = this.processor) == null ? void 0 : _b.port) {
+              this.processor.port.onmessage = (event) => {
+                if (event.data.command === "tick") {
+                  if (this.betweenPlaying) {
+                    if (this.betweenEnd) {
+                      if (this.debuglog) {
+                        console.log(this.audio.currentTime);
+                      }
+                      if (this.audio.currentTime >= this.betweenEnd) {
+                        this.pause();
+                      }
+                    }
                   }
                 }
-              }
+              };
             }
-          };
-        } else {
-          this.audioCtx.resume();
+          } else {
+            this.audioCtx.resume();
+          }
+        } catch (e) {
+          console.log(e);
         }
         this.processor.port.postMessage({
           command: "start"
@@ -331,10 +338,14 @@ const _sfc_main = {
       await this.startAudioCtx();
       this.audio.play();
     },
+    loadError(e) {
+      this.$emit("error", e);
+    },
     //视频在可以播放时触发
     getDuration() {
       this.totalTime = timeFormat(this.audio.duration);
       this.audio.volume = this.volume;
+      this.$emit("canPlay", this.totalTime);
     },
     //进度条发生变化时触发
     updateTime() {
@@ -384,10 +395,8 @@ const _sfc_main = {
           this.betweenPlaying = false;
           return false;
         }
-        if (!this.audio.paused) {
-          this.updateProgress(e.offsetX);
-          this.$emit("updateProgress", e.offsetX);
-        }
+        this.updateProgress(e.offsetX);
+        this.$emit("updateProgress", e.offsetX);
       }
     },
     //更新进度
@@ -543,6 +552,7 @@ var _sfc_render = function render() {
     },
     on: {
       "canplay": _vm.getDuration,
+      "error": _vm.loadError,
       "timeupdate": _vm.updateTime,
       "ended": _vm.handleAudioEnded
     }
@@ -641,7 +651,10 @@ var _sfc_render = function render() {
       ref: "progressBar",
       staticClass: "nf-audio-progress-bar",
       on: {
-        "mousedown": _vm.handleMousedown
+        "mousedown": _vm.handleMousedown,
+        "click": function($event) {
+          $event.stopPropagation();
+        }
       }
     })])])];
   }), _vm.forwardSecond ? _vm._t("fastForward", function() {

package/package/nf-audio.vue

@@ -11,6 +11,7 @@
            :src="src"
            v-show="false"
            @canplay="getDuration"
+           @error="loadError"
            @timeupdate="updateTime"
            @ended="handleAudioEnded"
     />
@@ -70,6 +71,7 @@
           <span class="nf-audio-progress-bar"
                 ref="progressBar"
                 @mousedown="handleMousedown"
+                @click.stop
           />
           </div>
         </div>
@@ -449,28 +451,34 @@ export default {
     },
     async startAudioCtx() {
       if (this.isHighPrecision()) {
-        if (!this.audioCtx) {
-          this.audioCtx = new (window.AudioContext || window.webkitAudioContext)();
-          this.audioSource = this.audioCtx.createMediaElementSource(this.audio);
-          await this.audioCtx.audioWorklet.addModule('data:application/javascript,' + encodeURIComponent(this.audioWorkletProcessor));
-          this.processor = new AudioWorkletNode(this.audioCtx, 'tick');
-          this.audioSource.connect(this.processor).connect(this.audioCtx.destination);
-          this.processor.port.onmessage = (event) => {
-            if (event.data.command === 'tick') {
-              if (this.betweenPlaying) {
-                if (this.betweenEnd) {
-                  if (this.debuglog) {
-                    console.log(this.audio.currentTime)
-                  }
-                  if (this.audio.currentTime >= this.betweenEnd) {
-                    this.pause()
+        try {
+          if (!this.audioCtx) {
+            this.audioCtx = new (window.AudioContext || window.webkitAudioContext)();
+            this.audioSource = this.audioCtx.createMediaElementSource(this.audio);
+            await this.audioCtx.audioWorklet?.addModule('data:application/javascript,' + encodeURIComponent(this.audioWorkletProcessor));
+            this.processor = new AudioWorkletNode(this.audioCtx, 'tick');
+            this.audioSource.connect(this.processor).connect(this.audioCtx.destination);
+            if (this.processor?.port) {
+              this.processor.port.onmessage = (event) => {
+                if (event.data.command === 'tick') {
+                  if (this.betweenPlaying) {
+                    if (this.betweenEnd) {
+                      if (this.debuglog) {
+                        console.log(this.audio.currentTime)
+                      }
+                      if (this.audio.currentTime >= this.betweenEnd) {
+                        this.pause()
+                      }
+                    }
                   }
                 }
-              }
+              };
             }
-          };
-        } else {
-          this.audioCtx.resume()
+          } else {
+            this.audioCtx.resume()
+          }
+        } catch(e) {
+          console.log(e)
         }
         this.processor.port.postMessage({ command: 'start' });
       }
@@ -494,10 +502,14 @@ export default {
       await this.startAudioCtx()
       this.audio.play()
     },
+    loadError(e) {
+      this.$emit('error', e)
+    },
     //视频在可以播放时触发
     getDuration() {
       this.totalTime = timeFormat(this.audio.duration)
       this.audio.volume = this.volume
+      this.$emit('canPlay', this.totalTime)
     },
     //进度条发生变化时触发
     updateTime() {
@@ -549,11 +561,8 @@ export default {
           this.betweenPlaying = false
           return false
         }
-        //如果不是正在移动 和 没有暂停播放就执行
-        if (!this.audio.paused) {
-          this.updateProgress(e.offsetX)
-          this.$emit('updateProgress', e.offsetX)
-        }
+        this.updateProgress(e.offsetX)
+        this.$emit('updateProgress', e.offsetX)
       }
     },
     //更新进度

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@94ai/nf-audio",
-  "version": "3.3.64",
+  "version": "3.3.66",
   "description": "> TODO: description",
   "keywords": [],
   "author": "liuxiangxiang <liuxiangxiang@94ai.com>",
@@ -14,7 +14,7 @@
     "url": "http://94ai.gitlab.com/zoujiahe/common-ui.git"
   },
   "dependencies": {
-    "@94ai/nf-theme-chalk": "^3.3.64",
+    "@94ai/nf-theme-chalk": "^3.3.66",
     "vue-demi": "^0.14.5"
   },
   "peerDependenciesMeta": {
@@ -30,5 +30,5 @@
   "types": "lib/index.d.ts",
   "main": "lib/nf-audio.cjs.js",
   "module": "lib/nf-audio.esm-bundler.js",
-  "gitHead": "e4fb754b3e4a7deb29d4200826491496fd813aa9"
+  "gitHead": "0b5045a8e003b4ddc7da70fc5d839120d6ccba94"
 }