Migrate music-metadata-browser to music-metadata

Author: Borewit

docs/README.md

@@ -65,12 +65,10 @@ And all the developers and artists, for the following resources:
 
 ### JavaScript libraries <!-- {docsify-ignore} -->
 
-* [buffer](https://www.npmjs.com/package/buffer) - Node.js Buffer API, for the browser
 * [http-server](https://www.npmjs.com/package/http-server) - a simple zero-configuration command-line http server
 * [idb-keyval](https://www.npmjs.com/package/idb-keyval) - super-simple promise-based keyval store implemented with IndexedDB
-* [music-metadata-browser](https://www.npmjs.com/package/music-metadata-browser) - stream and file based music metadata parser for the browser
+* [music-metadata](https://www.npmjs.com/package/music-metadata) - comprehensive metadata parser for audio and video files, supporting both file and stream inputs in Node.js and the browser
 * [notie](https://www.npmjs.com/package/notie) - clean and simple notification, input, and selection suite for javascript, with no dependencies
-* [process](https://www.npmjs.com/package/process) - process information for node.js and browsers
 * [scrollIntoViewIfNeeded 4 everyone](https://gist.github.com/hsablonniere/2581101) - polyfill for non-standard scrollIntoViewIfNeeded() method
 * [sortablejs](https://www.npmjs.com/package/sortablejs) - JavaScript library for reorderable drag-and-drop lists
 * [webpack](https://www.npmjs.com/package/webpack) - JavaScript module bundler for the browser

package.json

@@ -12,15 +12,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.7.0",
     "notie": "^4.3.1",
-    "process": "^0.11.10",
     "sortablejs": "^1.15.2",
     "style-loader": "^4.0.0",
     "webpack": "^5.91.0",

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, parseBuffer, parseWebStream} from 'music-metadata';
 import './scrollIntoViewIfNeeded-polyfill.js';
 import { get, set, del } from 'idb-keyval';
 
@@ -840,7 +840,6 @@ let audioElement = [],
 	supportsFileSystemAPI,		// browser supports File System API (may be disabled via config.json)
 	useFileSystemAPI,			// load music from local device when in web server mode
 	userPresets,
-	waitingMetadata = 0,
 	wasMuted,					// mute status before switching to microphone input
 	webServer;					// web server available? (boolean)
 
@@ -2016,7 +2015,7 @@ function keyboardControls( event ) {
 }
 
 /**
- * Sets (or removes) the `src` attribute of a audio element and
+ * Sets (or removes) the `src` attribute of an audio element and
  * releases any data blob (File System API) previously in use by it
  *
  * @param {object} audio element
@@ -2120,7 +2119,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 ) {
@@ -2129,11 +2129,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);
+		}
 	}
 }
 
@@ -3297,57 +3300,54 @@ async function retrieveBackgrounds() {
  * Retrieve metadata for files in the play queue
  */
 async function retrieveMetadata() {
-	// leave when we already have enough concurrent requests pending
-	if ( waitingMetadata >= MAX_METADATA_REQUESTS )
-		return;
 
-	// find the first play queue item for which we haven't retrieved the metadata yet
-	const queueItem = Array.from( playlist.children ).find( el => el.dataset.retrieve );
+	// find the first MAX_METADATA_REQUESTS items for which we haven't retrieved the metadata yet
+	const retrievalQueue = Array.from(playlist.children).filter(el => el.dataset.retrieve).slice(0, MAX_METADATA_REQUESTS);
 
-	if ( queueItem ) {
+	let file;
 
-		let uri    = queueItem.dataset.file,
-			revoke = false;
+	// Execute in parallel
+	return Promise.all(retrievalQueue.map(async queueItem => {
 
-		waitingMetadata++;
 		delete queueItem.dataset.retrieve;
+		let metadata;
 
-		queryMetadata: {
+		try {
 			if ( queueItem.handle ) {
-				try {
-					if ( await queueItem.handle.requestPermission() != 'granted' )
-						break queryMetadata;
 
-					uri = URL.createObjectURL( await queueItem.handle.getFile() );
-					revoke = true;
-				}
-				catch( e ) {
-					break queryMetadata;
-				}
-			}
+				// Fetch metadata from File object
+				if (await queueItem.handle.requestPermission() !== 'granted')
+					return;
 
-			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 );
-						});
-					}
+				file = await queueItem.handle.getFile();
+				metadata = await parseBlob(file);
+			}
+			else
+			{
+				// Fetch metadata from URI
+				const response = await fetch(uri);
+				if (response.body && typeof response.body.getReader === 'function') {
+					metadata = await parseWebStream(response.body, {skipPostHeaders: true});
+				} else {
+					// Fallback to Blob, in case the HTTP Result cannot be streamed
+					metadata = await parseBlob(await response.blob());
 				}
 			}
-			catch( e ) {}
+		}
+		catch( e ) {
+			consoleLog(`Error converting queued file="${queueItem.handle.file}" to URI`, e);
+			return;
+		}
 
-			if ( revoke )
-				URL.revokeObjectURL( uri );
+		addMetadata( metadata, queueItem ); // add metadata to play queue item
+		syncMetadataToAudioElements( queueItem );
+		queueItem.dataset.cover = await getFolderCover( queueItem );
+		if ( ! queueItem.handle && ! ( metadata.common.picture && metadata.common.picture.length ) ) {
+			queueItem.dataset.cover = await getFolderCover( queueItem );
+			syncMetadataToAudioElements( queueItem );
 		}
 
-		waitingMetadata--;
-		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 => {

webpack.dev.js

@@ -30,10 +30,6 @@ module.exports = {
 	},
 	plugins: [
 		new webpack.HotModuleReplacementPlugin(),
-		new webpack.ProvidePlugin({
-			Buffer: ['buffer', 'Buffer'],
-			process: 'process/browser.js',
-		}),
 	],
 	output: {
 		filename: 'audioMotion.js',