Migrate music-metadata-browser to music-metadata

Includes some code refactoring using `async`/`await` to simplify promise chaining.

Author: Borewit

package.json

@@ -11,15 +11,13 @@
   },
   "devDependencies": {
     "audiomotion-analyzer": "^4.5.1",
-    "buffer": "^6.0.3",
     "css-loader": "^7.1.2",
     "css-minimizer-webpack-plugin": "^7.0.0",
     "http-server": "^14.1.1",
     "idb-keyval": "^6.2.1",
     "mini-css-extract-plugin": "^2.9.0",
-    "music-metadata-browser": "^2.5.10",
+    "music-metadata": "^11.6.1",
     "notie": "^4.3.1",
-    "process": "^0.11.10",
     "sortablejs": "^1.15.2",
     "webpack": "^5.91.0",
     "webpack-cli": "^5.1.4"

src/index.js

@@ -32,7 +32,7 @@
 import AudioMotionAnalyzer from 'audiomotion-analyzer';
 import packageJson from '../package.json';
 import * as fileExplorer from './file-explorer.js';
-import * as mm from 'music-metadata-browser';
+import { parseBlob, parseWebStream } from 'music-metadata';
 import './scrollIntoViewIfNeeded-polyfill.js';
 import { get, set, del } from 'idb-keyval';
 
@@ -2072,7 +2072,8 @@ function loadGradientIntoCurrentGradient(gradientKey) {
 /**
  * Load a music file from the user's computer
  */
-function loadLocalFile( obj ) {
+async function loadLocalFile( obj ) {
+
 	const fileBlob = obj.files[0];
 
 	if ( fileBlob ) {
@@ -2081,11 +2082,14 @@ function loadLocalFile( obj ) {
 		audioEl.dataset.file = fileBlob.name;
 		audioEl.dataset.title = parsePath( fileBlob.name ).baseName;
 
-		// load and play
-		loadFileBlob( fileBlob, audioEl, true )
-			.then( url => mm.fetchFromUrl( url ) )
-			.then( metadata => addMetadata( metadata, audioEl ) )
-			.catch( e => {} );
+		try {
+			await loadFileBlob( fileBlob, audioEl, true );
+			// Maybe do this parallel?
+			const metadata = await parseBlob( fileBlob );
+			await addMetadata( metadata, audioEl );
+		} catch( error ) {
+			consoleLog("Failed to load local file", error);
+		}
 	}
 }
 
@@ -3247,47 +3251,44 @@ async function retrieveMetadata() {
 
 	if ( queueItem ) {
 
-		let uri    = queueItem.dataset.file,
-			revoke = false;
+		let uri    = queueItem.dataset.file;
+		let file;
 
 		waitingMetadata++;
 		delete queueItem.dataset.retrieve;
+		let metadata;
 
-		queryMetadata: {
-			if ( queueItem.handle ) {
-				try {
-					if ( await queueItem.handle.requestPermission() != 'granted' )
-						break queryMetadata;
+		if ( queueItem.handle ) {
+			// Fetch metadata from File object
+			if ( await queueItem.handle.requestPermission() !== 'granted' )
+				return;
 
-					uri = URL.createObjectURL( await queueItem.handle.getFile() );
-					revoke = true;
-				}
-				catch( e ) {
-					break queryMetadata;
-				}
+			file = await queueItem.handle.getFile();
+			uri = URL.createObjectURL( file );
+			metadata = await parseBlob( file, { skipPostHeaders: true } );
+		} else {
+			// Fetch metadata from URI
+			const response = await fetch(uri);
+			if (response.body) {
+				metadata = await parseWebStream( response.body, { skipPostHeaders: true } );
+			} else {
+				throw new Error('Failed to stream response.body');
 			}
+		}
 
-			try {
-				const metadata = await mm.fetchFromUrl( uri, { skipPostHeaders: true } );
-				if ( metadata ) {
-					addMetadata( metadata, queueItem ); // add metadata to play queue item
-					syncMetadataToAudioElements( queueItem );
-					if ( ! ( metadata.common.picture && metadata.common.picture.length ) ) {
-						getFolderCover( queueItem ).then( cover => {
-							queueItem.dataset.cover = cover;
-							syncMetadataToAudioElements( queueItem );
-						});
-					}
-				}
-			}
-			catch( e ) {}
+		addMetadata( metadata, queueItem ); // add metadata to play queue item
+		syncMetadataToAudioElements( queueItem );
+		if ( ! queueItem.handle && ! ( metadata.common.picture && metadata.common.picture.length ) ) {
+			queueItem.dataset.cover = await getFolderCover( uri );
+			syncMetadataToAudioElements( queueItem );
+		}
 
-			if ( revoke )
-				URL.revokeObjectURL( uri );
+		if ( file ) {
+			URL.revokeObjectURL( uri );
 		}
 
 		waitingMetadata--;
-		retrieveMetadata(); // call again to continue processing the queue
+		await retrieveMetadata(); // call again to continue processing the queue
 	}
 }
 

webpack.config.js

@@ -36,10 +36,6 @@ module.exports = {
     new MiniCssExtractPlugin({
       filename: 'styles.css',
     }),
-    new webpack.ProvidePlugin({
-      Buffer: ['buffer', 'Buffer'],
-      process: 'process/browser.js',
-    }),
   ],
   output: {
     filename: pathData => {