wavesurfer.js 7.8.4-beta.0 → 7.8.4-beta.1

package/dist/wavesurfer.js

@@ -1,12 +1,3 @@
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
 import BasePlugin from './base-plugin.js';
 import Decoder from './decoder.js';
 import * as dom from './dom.js';
@@ -28,6 +19,16 @@ const defaultOptions = {
     sampleRate: 8000,
 };
 class WaveSurfer extends Player {
+    options;
+    renderer;
+    timer;
+    plugins = [];
+    decodedData = null;
+    subscriptions = [];
+    mediaSubscriptions = [];
+    abortController = null;
+    static BasePlugin = BasePlugin;
+    static dom = dom;
     /** Create a new WaveSurfer instance */
     static create(options) {
         return new WaveSurfer(options);
@@ -42,11 +43,6 @@ class WaveSurfer extends Player {
             autoplay: options.autoplay,
             playbackRate: options.audioRate,
         });
-        this.plugins = [];
-        this.decodedData = null;
-        this.subscriptions = [];
-        this.mediaSubscriptions = [];
-        this.abortController = null;
         this.options = Object.assign({}, defaultOptions, options);
         this.timer = new Timer();
         const audioElement = media ? undefined : this.getMediaElement();
@@ -172,8 +168,7 @@ class WaveSurfer extends Player {
         }
     }
     initPlugins() {
-        var _a;
-        if (!((_a = this.options.plugins) === null || _a === void 0 ? void 0 : _a.length))
+        if (!this.options.plugins?.length)
             return;
         this.options.plugins.forEach((plugin) => {
             this.registerPlugin(plugin);
@@ -229,80 +224,73 @@ class WaveSurfer extends Player {
     getActivePlugins() {
         return this.plugins;
     }
-    loadAudio(url, blob, channelData, duration) {
-        return __awaiter(this, void 0, void 0, function* () {
-            var _a;
-            this.emit('load', url);
-            if (!this.options.media && this.isPlaying())
-                this.pause();
-            this.decodedData = null;
-            // Fetch the entire audio as a blob if pre-decoded data is not provided
-            if (!blob && !channelData) {
-                const fetchParams = this.options.fetchParams || {};
-                if (window.AbortController && !fetchParams.signal) {
-                    this.abortController = new AbortController();
-                    fetchParams.signal = (_a = this.abortController) === null || _a === void 0 ? void 0 : _a.signal;
-                }
-                const onProgress = (percentage) => this.emit('loading', percentage);
-                blob = yield Fetcher.fetchBlob(url, onProgress, fetchParams);
-            }
-            // Set the mediaelement source
-            this.setSrc(url, blob);
-            // Wait for the audio duration
-            const audioDuration = yield new Promise((resolve) => {
-                const staticDuration = duration || this.getDuration();
-                if (staticDuration) {
-                    resolve(staticDuration);
-                }
-                else {
-                    this.mediaSubscriptions.push(this.onMediaEvent('loadedmetadata', () => resolve(this.getDuration()), { once: true }));
-                }
-            });
-            // Set the duration if the player is a WebAudioPlayer without a URL
-            if (!url && !blob) {
-                const media = this.getMediaElement();
-                if (media instanceof WebAudioPlayer) {
-                    media.duration = audioDuration;
-                }
-            }
-            // Decode the audio data or use user-provided peaks
-            if (channelData) {
-                this.decodedData = Decoder.createBuffer(channelData, audioDuration || 0);
+    async loadAudio(url, blob, channelData, duration) {
+        this.emit('load', url);
+        if (!this.options.media && this.isPlaying())
+            this.pause();
+        this.decodedData = null;
+        // Fetch the entire audio as a blob if pre-decoded data is not provided
+        if (!blob && !channelData) {
+            const fetchParams = this.options.fetchParams || {};
+            if (window.AbortController && !fetchParams.signal) {
+                this.abortController = new AbortController();
+                fetchParams.signal = this.abortController?.signal;
             }
-            else if (blob) {
-                const arrayBuffer = yield blob.arrayBuffer();
-                this.decodedData = yield Decoder.decode(arrayBuffer, this.options.sampleRate);
+            const onProgress = (percentage) => this.emit('loading', percentage);
+            blob = await Fetcher.fetchBlob(url, onProgress, fetchParams);
+        }
+        // Set the mediaelement source
+        this.setSrc(url, blob);
+        // Wait for the audio duration
+        const audioDuration = await new Promise((resolve) => {
+            const staticDuration = duration || this.getDuration();
+            if (staticDuration) {
+                resolve(staticDuration);
             }
-            if (this.decodedData) {
-                this.emit('decode', this.getDuration());
-                this.renderer.render(this.decodedData);
+            else {
+                this.mediaSubscriptions.push(this.onMediaEvent('loadedmetadata', () => resolve(this.getDuration()), { once: true }));
             }
-            this.emit('ready', this.getDuration());
         });
+        // Set the duration if the player is a WebAudioPlayer without a URL
+        if (!url && !blob) {
+            const media = this.getMediaElement();
+            if (media instanceof WebAudioPlayer) {
+                media.duration = audioDuration;
+            }
+        }
+        // Decode the audio data or use user-provided peaks
+        if (channelData) {
+            this.decodedData = Decoder.createBuffer(channelData, audioDuration || 0);
+        }
+        else if (blob) {
+            const arrayBuffer = await blob.arrayBuffer();
+            this.decodedData = await Decoder.decode(arrayBuffer, this.options.sampleRate);
+        }
+        if (this.decodedData) {
+            this.emit('decode', this.getDuration());
+            this.renderer.render(this.decodedData);
+        }
+        this.emit('ready', this.getDuration());
     }
     /** Load an audio file by URL, with optional pre-decoded audio data */
-    load(url, channelData, duration) {
-        return __awaiter(this, void 0, void 0, function* () {
-            try {
-                return yield this.loadAudio(url, undefined, channelData, duration);
-            }
-            catch (err) {
-                this.emit('error', err);
-                throw err;
-            }
-        });
+    async load(url, channelData, duration) {
+        try {
+            return await this.loadAudio(url, undefined, channelData, duration);
+        }
+        catch (err) {
+            this.emit('error', err);
+            throw err;
+        }
     }
     /** Load an audio blob */
-    loadBlob(blob, channelData, duration) {
-        return __awaiter(this, void 0, void 0, function* () {
-            try {
-                return yield this.loadAudio('', blob, channelData, duration);
-            }
-            catch (err) {
-                this.emit('error', err);
-                throw err;
-            }
-        });
+    async loadBlob(blob, channelData, duration) {
+        try {
+            return await this.loadAudio('', blob, channelData, duration);
+        }
+        catch (err) {
+            this.emit('error', err);
+            throw err;
+        }
     }
     /** Zoom the waveform by a given pixels-per-second factor */
     zoom(minPxPerSec) {
@@ -317,7 +305,7 @@ class WaveSurfer extends Player {
         return this.decodedData;
     }
     /** Get decoded peaks */
-    exportPeaks({ channels = 2, maxLength = 8000, precision = 10000 } = {}) {
+    exportPeaks({ channels = 2, maxLength = 8000, precision = 10_000 } = {}) {
         if (!this.decodedData) {
             throw new Error('The audio has not been decoded yet');
         }
@@ -366,10 +354,8 @@ class WaveSurfer extends Player {
         this.setTime(time);
     }
     /** Play or pause the audio */
-    playPause() {
-        return __awaiter(this, void 0, void 0, function* () {
-            return this.isPlaying() ? this.pause() : this.play();
-        });
+    async playPause() {
+        return this.isPlaying() ? this.pause() : this.play();
     }
     /** Stop the audio and go to the beginning */
     stop() {
@@ -390,16 +376,13 @@ class WaveSurfer extends Player {
         super.setMediaElement(element);
         this.initPlayerEvents();
     }
-    exportImage() {
-        return __awaiter(this, arguments, void 0, function* (format = 'image/png', quality = 1, type = 'dataURL') {
-            return this.renderer.exportImage(format, quality, type);
-        });
+    async exportImage(format = 'image/png', quality = 1, type = 'dataURL') {
+        return this.renderer.exportImage(format, quality, type);
     }
     /** Unmount wavesurfer */
     destroy() {
-        var _a;
         this.emit('destroy');
-        (_a = this.abortController) === null || _a === void 0 ? void 0 : _a.abort();
+        this.abortController?.abort();
         this.plugins.forEach((plugin) => plugin.destroy());
         this.subscriptions.forEach((unsubscribe) => unsubscribe());
         this.unsubscribePlayerEvents();
@@ -408,6 +391,4 @@ class WaveSurfer extends Player {
         super.destroy();
     }
 }
-WaveSurfer.BasePlugin = BasePlugin;
-WaveSurfer.dom = dom;
 export default WaveSurfer;

package/dist/webaudio.js

@@ -1,43 +1,34 @@
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
 import EventEmitter from './event-emitter.js';
 /**
  * A Web Audio buffer player emulating the behavior of an HTML5 Audio element.
  */
 class WebAudioPlayer extends EventEmitter {
+    audioContext;
+    gainNode;
+    bufferNode = null;
+    playStartTime = 0;
+    playedDuration = 0;
+    _muted = false;
+    _playbackRate = 1;
+    _duration = undefined;
+    buffer = null;
+    currentSrc = '';
+    paused = true;
+    crossOrigin = null;
+    seeking = false;
+    autoplay = false;
     constructor(audioContext = new AudioContext()) {
         super();
-        this.bufferNode = null;
-        this.playStartTime = 0;
-        this.playedDuration = 0;
-        this._muted = false;
-        this._playbackRate = 1;
-        this._duration = undefined;
-        this.buffer = null;
-        this.currentSrc = '';
-        this.paused = true;
-        this.crossOrigin = null;
-        this.seeking = false;
-        this.autoplay = false;
-        /** Subscribe to an event. Returns an unsubscribe function. */
-        this.addEventListener = this.on;
-        /** Unsubscribe from an event */
-        this.removeEventListener = this.un;
         this.audioContext = audioContext;
         this.gainNode = this.audioContext.createGain();
         this.gainNode.connect(this.audioContext.destination);
     }
-    load() {
-        return __awaiter(this, void 0, void 0, function* () {
-            return;
-        });
+    /** Subscribe to an event. Returns an unsubscribe function. */
+    addEventListener = this.on;
+    /** Unsubscribe from an event */
+    removeEventListener = this.un;
+    async load() {
+        return;
     }
     get src() {
         return this.currentSrc;
@@ -73,11 +64,10 @@ class WebAudioPlayer extends EventEmitter {
         });
     }
     _play() {
-        var _a;
         if (!this.paused)
             return;
         this.paused = false;
-        (_a = this.bufferNode) === null || _a === void 0 ? void 0 : _a.disconnect();
+        this.bufferNode?.disconnect();
         this.bufferNode = this.audioContext.createBufferSource();
         if (this.buffer) {
             this.bufferNode.buffer = this.buffer;
@@ -99,18 +89,15 @@ class WebAudioPlayer extends EventEmitter {
         };
     }
     _pause() {
-        var _a;
         this.paused = true;
-        (_a = this.bufferNode) === null || _a === void 0 ? void 0 : _a.stop();
+        this.bufferNode?.stop();
         this.playedDuration += this.audioContext.currentTime - this.playStartTime;
     }
-    play() {
-        return __awaiter(this, void 0, void 0, function* () {
-            if (!this.paused)
-                return;
-            this._play();
-            this.emit('play');
-        });
+    async play() {
+        if (!this.paused)
+            return;
+        this._play();
+        this.emit('play');
     }
     pause() {
         if (this.paused)
@@ -119,19 +106,16 @@ class WebAudioPlayer extends EventEmitter {
         this.emit('pause');
     }
     stopAt(timeSeconds) {
-        var _a, _b;
         const delay = timeSeconds - this.currentTime;
-        (_a = this.bufferNode) === null || _a === void 0 ? void 0 : _a.stop(this.audioContext.currentTime + delay);
-        (_b = this.bufferNode) === null || _b === void 0 ? void 0 : _b.addEventListener('ended', () => {
+        this.bufferNode?.stop(this.audioContext.currentTime + delay);
+        this.bufferNode?.addEventListener('ended', () => {
             this.bufferNode = null;
             this.pause();
         }, { once: true });
     }
-    setSinkId(deviceId) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const ac = this.audioContext;
-            return ac.setSinkId(deviceId);
-        });
+    async setSinkId(deviceId) {
+        const ac = this.audioContext;
+        return ac.setSinkId(deviceId);
     }
     get playbackRate() {
         return this._playbackRate;
@@ -157,8 +141,7 @@ class WebAudioPlayer extends EventEmitter {
         this.emit('timeupdate');
     }
     get duration() {
-        var _a, _b;
-        return (_a = this._duration) !== null && _a !== void 0 ? _a : (((_b = this.buffer) === null || _b === void 0 ? void 0 : _b.duration) || 0);
+        return this._duration ?? (this.buffer?.duration || 0);
     }
     set duration(value) {
         this._duration = value;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "wavesurfer.js",
-  "version": "7.8.4-beta.0",
+  "version": "7.8.4-beta.1",
   "license": "BSD-3-Clause",
   "author": "katspaugh",
   "description": "Audio waveform player",