some more fixes, URI stuff

utils/axios.js

@@ -32,7 +32,12 @@ axiosInstance.interceptors.request.use(request => {
 axiosInstance.interceptors.response.use(
 	(response) => response,
 	(error) => {
-		if (error.response) {
+		if (error.response && error.response.status === 429) {
+			// Rate limiting
+			logger.warn("Spotify API: Too many requests");
+			return error.response;
+		}
+		else if (error.response) {
 			// Server has responded
 			logger.error(
 				"Spotify API: Error", {

utils/jsonTransformer.js

@@ -2,7 +2,7 @@
  * Returns a single string of the values of all keys in the given JSON object, even nested ones.
  * 
  * @param {*} obj 
- * @returns
+ * @returns {string}
  */
 const getNestedValuesString = (obj) => {
 	let values = [];

utils/logger.js

@@ -10,12 +10,14 @@ const getLabel = (callingModule) => {
     return path.join(parts[parts.length - 2], parts.pop());
 };
 
+const allowedErrorKeys = ["name", "message", "stack"];
+
 const logMetaReplacer = (key, value) => {
     if (key === "error") {
         return {
             name: value.name,
             message: value.message,
-            stack: value.stack
+            stack: value.stack,
         };
     }
     return value;
@@ -28,11 +30,10 @@ const metaFormat = (meta) => {
 }
 
 const logFormat = printf(({ level, message, label, timestamp, ...meta }) => {
-    if (meta.error) {
+    if (meta.error) { // if the error was passed
         for (const key in meta.error) {
-            const allowedErrorKeys = ["name", "message", "stack"]
-            if (typeof key !== "symbol" && !allowedErrorKeys.includes(key)) {
-                delete meta.error[key]
+            if (!allowedErrorKeys.includes(key)) {
+                delete meta.error[key];
             }
         }
     }

utils/spotifyUriTransformer.js

@@ -0,0 +1,108 @@
+const typedefs = require("../typedefs");
+
+/** @type {RegExp} */
+const base62Pattern = /^[A-Za-z0-9]+$/;
+
+/**
+ * Returns type and ID from a Spotify URI
+ * @see {@link https://developer.spotify.com/documentation/web-api/concepts/spotify-uris-ids|Spotify URIs and IDs}
+ * @param {string} uri Spotify URI - can be of an album, track, playlist, user, episode, etc.
+ * @returns {typedefs.UriObject}
+ * @throws {TypeError} If the input is not a valid Spotify URI
+ */
+const parseSpotifyUri = (uri) => {
+	const parts = uri.split(":");
+
+	if (parts[0] !== "spotify") {
+		throw new TypeError(`${uri} is not a valid Spotify URI`);
+	}
+
+	let type = parts[1];
+
+	if (type === "local") {
+		// Local file format: spotify:local:<artist>:<album>:<title>:<duration>
+		let idParts = parts.slice(2);
+		if (idParts.length < 4) {
+			throw new TypeError(`${uri} is not a valid local file URI`);
+		}
+
+		// URL decode artist, album, and title
+		const artist = decodeURIComponent(idParts[0] || '');
+		const album = decodeURIComponent(idParts[1] || '');
+		const title = decodeURIComponent(idParts[2]);
+		const duration = parseInt(idParts[3], 10);
+
+		if (isNaN(duration)) {
+			throw new TypeError(`${uri} has an invalid duration`);
+		}
+
+		return { type: "track", is_local: true, artist, album, title, duration };
+	} else {
+		// Not a local file
+		if (parts.length !== 3) {
+			throw new TypeError(`${uri} is not a valid Spotify URI`);
+		}
+
+		const id = parts[2];
+
+		if (!base62Pattern.test(id)) {
+			throw new TypeError(`${uri} has an invalid ID`);
+		}
+
+		return { type, is_local: false, id };
+	}
+}
+
+/**
+ * Returns type and ID from a Spotify link
+ * @see {@link https://developer.spotify.com/documentation/web-api/concepts/spotify-uris-ids|Spotify URIs and IDs}
+ * @param {string} link Spotify URL - can be of an album, track, playlist, user, episode, etc.
+ * @returns {typedefs.UriObject}
+ * @throws {TypeError} If the input is not a valid Spotify link
+ */
+const parseSpotifyLink = (link) => {
+	const localPattern = /^https:\/\/open\.spotify\.com\/local\/([^\/]*)\/([^\/]*)\/([^\/]+)\/(\d+)$/;
+	const standardPattern = /^https:\/\/open\.spotify\.com\/([^\/]+)\/([^\/?]+)/;
+
+	if (localPattern.test(link)) {
+		// Local file format: https://open.spotify.com/local/artist/album/title/duration
+		const matches = link.match(localPattern);
+		if (!matches) {
+			throw new TypeError(`${link} is not a valid Spotify local file link`);
+		}
+
+		// URL decode artist, album, and title
+		const artist = decodeURIComponent(matches[1] || '');
+		const album = decodeURIComponent(matches[2] || '');
+		const title = decodeURIComponent(matches[3]);
+		const duration = parseInt(matches[4], 10);
+
+		if (isNaN(duration)) {
+			throw new TypeError(`${link} has an invalid duration`);
+		}
+
+		return { type: "track", is_local: true, artist, album, title, duration };
+	} else if (standardPattern.test(link)) {
+		// Not a local file
+		const matches = link.match(standardPattern);
+		if (!matches || matches.length < 3) {
+			throw new TypeError(`${link} is not a valid Spotify link`);
+		}
+
+		const type = matches[1];
+		const id = matches[2];
+
+		if (!base62Pattern.test(id)) {
+			throw new TypeError(`${link} has an invalid ID`);
+		}
+
+		return { type, is_local: false, id };
+	} else {
+		throw new TypeError(`${link} is not a valid Spotify link`);
+	}
+}
+
+module.exports = {
+	parseSpotifyUri,
+	parseSpotifyLink
+}