✨ feat: Update - October 3rd, 2024 (#25)

.eslintrc.json

@@ -23,12 +23,24 @@
     "plugin:tailwindcss/recommended"
   ],
   "rules": {
+    "react": {
+      "version": "detect"
+    },
+    "formComponents": ["Form"],
+    "linkComponents": [
+      { "name": "Link", "linkAttribute": "to" },
+      { "name": "NavLink", "linkAttribute": "to" }
+    ],
+    "import/resolver": {
+      "typescript": {}
+    },
     "tailwindcss/classnames-order": [
       "warn",
       {
         "officialSorting": true
       }
     ],
-    "implicit-arrow-linebreak": "off"
+    "implicit-arrow-linebreak": "off",
+    "operator-linebreak": "off"
   }
 }

apps/backend/src/services/search.service.ts

@@ -169,8 +169,8 @@ export class SearchService extends UnimplementedSearchService {
             const r = await requestToMxm(parsedMxmUrl);
             if (!r.ok) {
               throw new Error(
-                "The track hasn't been imported yet. Please try again after 1-5 minutes.\n" +
-                  'If the problem persists after 15 minutes, please contact to the developer.',
+                "The track hasn't been imported yet. Please request Mxm team to import this track.\n" +
+                  'You can request them by sending the track URL in #catalogue-issues in Community Slack.',
               );
             }
 
@@ -196,8 +196,8 @@ export class SearchService extends UnimplementedSearchService {
           const r = await requestToMxm(parsedMxmUrl);
           if (!r.ok) {
             throw new Error(
-              "The album hasn't been imported yet. Please try again after 1-5 minutes.\n" +
-                'If the problem persists after 15 minutes, please contact to the developer.',
+              "The album hasn't been imported yet. Please request Mxm team to import this album.\n" +
+                'You can request them by sending the album URL in #catalogue-issues in Community Slack.',
             );
           }
 

apps/backend/src/utils/parseUrl.util.ts

@@ -11,43 +11,54 @@ const STOREFRONT_REGEX =
 const MXM_PARSE_REGEX =
   /album\/([^?]+\/[^?]+)|album\/(\d+)|lyrics\/([^?]+\/[^?]+)/;
 
+const ISRC_REGEX = /^[A-Z]{2}-?\w{3}-?\d{2}-?\d{5}$/;
+
 export function parseAppleUrl(url: string): IAppleMusicUrl {
-  const urlObj = new URL(url);
-  const path = urlObj.pathname.split('/');
-  path.shift(); // remove the first empty string
+  if (!ISRC_REGEX.test(url)) {
+    const urlObj = new URL(url);
+    const path = urlObj.pathname.split('/');
+    path.shift(); // remove the first empty string
 
-  // URL: https://music.apple.com/kr/album/blue-ep/1748504604
-  // id: 1748504604
-  // storefront: kr
-  // type: EAplleMusicUrlType.ALBUM
+    // URL: https://music.apple.com/kr/album/blue-ep/1748504604
+    // id: 1748504604
+    // storefront: kr
+    // type: EAplleMusicUrlType.ALBUM
 
-  if (path[0].length !== 2) {
-    // assume the country code is `us`
-    path.unshift('us');
-  }
+    if (path[0].length !== 2) {
+      // assume the country code is `us`
+      path.unshift('us');
+    }
 
-  if (
-    urlObj.hostname !== 'music.apple.com' ||
-    path.length < 4 ||
-    path.length > 5 ||
-    !STOREFRONT_REGEX.test(path[0]) ||
-    !['album', 'song'].includes(path[1]) ||
-    !/^\d+$/.test(path[path.length - 1])
-  ) {
-    throw new BadRequestError(
-      'Unsupported URL format. Please check the URL again.\n' +
-        'Working example: https://music.apple.com/kr/album/blue-ep/1748504604',
-    );
-  }
+    if (
+      urlObj.hostname !== 'music.apple.com' ||
+      path.length < 4 ||
+      path.length > 5 ||
+      !STOREFRONT_REGEX.test(path[0]) ||
+      !['album', 'song'].includes(path[1]) ||
+      !/^\d+$/.test(path[path.length - 1])
+    ) {
+      throw new BadRequestError(
+        'Unsupported URL format. Please check the URL again.\n' +
+          'Working example: https://music.apple.com/kr/album/blue-ep/1748504604',
+      );
+    }
 
-  return {
-    id: path[path.length - 1],
-    storefront: path[0],
-    type: EAppleMusicUrlType[
-      path[1].toUpperCase() as keyof typeof EAppleMusicUrlType
-    ],
-    url,
-  };
+    return {
+      id: path[path.length - 1],
+      storefront: path[0],
+      type: EAppleMusicUrlType[
+        path[1].toUpperCase() as keyof typeof EAppleMusicUrlType
+      ],
+      url,
+    };
+  } else {
+    return {
+      id: url, // ISRC
+      storefront: 'us',
+      type: EAppleMusicUrlType.SONG,
+      url: 'ISRC',
+    };
+  }
 }
 
 export function parseMxmUrl(url: string): IMxmUrl {

apps/backend/src/utils/request.util.ts

@@ -6,7 +6,13 @@ import { EMxmUrlType, IMxmUrl } from '../types/mxmUrl.type';
 import { getAppleDeveloperToken } from './appleToken.util';
 
 export async function requestToApple(data: IAppleMusicUrl) {
-  const url = `https://api.music.apple.com/v1/catalog/${data.storefront}/${data.type}/${data.id}`;
+  let url = `https://api.music.apple.com/v1/catalog/${data.storefront}/${data.type}`;
+
+  if (data.url === 'ISRC') {
+    url += `?filter[isrc]=${data.id}`;
+  } else {
+    url += `/${data.id}`;
+  }
 
   return fetch(url, {
     headers: {