Merge pull request #9 from sjdonado/feat/#7-parse-mobile-links

Feat/#7 parse mobile links
sjdonado · Oct 19, 2023 · 1ce83dc · 1ce83dc
2 parents 3af9156 + f108b9f
commit 1ce83dc
Show file tree

Hide file tree

Showing 13 changed files with 600 additions and 77 deletions.
diff --git a/bun.lockb b/bun.lockb
diff --git a/src/config/constants.ts b/src/config/constants.ts
@@ -1,5 +1,8 @@
 export const SPOTIFY_LINK_REGEX =
-  /^https:\/\/open\.spotify\.com\/(track|album|playlist|artist|episode|show)\/.*$/;
+  /^https:\/\/(open\.spotify\.com\/(track|album|playlist|artist|episode|show)|spotify\.link)\/[^?#]+/;
+
+export const SPOTIFY_LINK_MOBILE_REGEX = /^https:\/\/spotify\.link\/.*$/;
+export const SPOTIFY_LINK_DESKTOP_REGEX = /https:\/\/open\.spotify\.com\/[^?]+/;
 
 export const SPOTIFY_ID_REGEX =
   /(?<=\/(track|album|playlist|artist|episode|show)\/)[^/?]+/;
diff --git a/src/index.ts b/src/index.ts
@@ -10,11 +10,9 @@ import { pageRouter } from './routes/page';
 export const app = new Elysia()
   .use(html())
   .use(staticPlugin({ prefix: '' }))
-  .on('beforeHandle', ({ request }) => {
+  .on('beforeHandle', async ({ request }) => {
     logger.info(
-      `${request.method} ${request.url} - ${request.headers.get('user-agent')} - ${
-        request.body ? JSON.stringify(request.body) : 'no body'
-      }`
+      `${request.method} ${request.url} - ${request.headers.get('user-agent')}`
     );
   })
   .use(apiRouter)

diff --git a/src/parsers/spotify.ts b/src/parsers/spotify.ts
@@ -1,4 +1,8 @@
 import axios from 'axios';
+import {
+  SPOTIFY_LINK_DESKTOP_REGEX,
+  SPOTIFY_LINK_MOBILE_REGEX,
+} from '~/config/constants';
 
 import { getCheerioDoc, metaTagContent } from '~/utils/scraper';
 
@@ -21,9 +25,21 @@ export type SpotifyMetadata = {
 
 export const parseSpotifyMetadata = async (
   spotifyLink: string
-): Promise<SpotifyMetadata> => {
+): Promise<{ metadata: SpotifyMetadata; url: string }> => {
   try {
-    const { data: html } = await axios.get(spotifyLink);
+    let url = spotifyLink;
+    let { data: html } = await axios.get(url, { maxRedirects: 3 });
+
+    if (SPOTIFY_LINK_MOBILE_REGEX.test(spotifyLink)) {
+      url = html.match(SPOTIFY_LINK_DESKTOP_REGEX)?.[0];
+
+      if (!url) {
+        throw new Error(`Could not parse Spotify metadata. Desktop link not found.`);
+      }
+
+      html = (await axios.get(url)).data;
+    }
+
     const doc = getCheerioDoc(html);
 
     const title = metaTagContent(doc, 'og:title', 'property');
@@ -40,11 +56,14 @@ export const parseSpotifyMetadata = async (
     }
 
     return {
-      title,
-      description,
-      type: type as SpotifyMetadataType,
-      image,
-      audio,
+      metadata: {
+        title,
+        description,
+        type: type as SpotifyMetadataType,
+        image,
+        audio,
+      },
+      url,
     };
   } catch (err) {
     throw new Error(`[Spotify Parser] (${spotifyLink}) ${err}`);

diff --git a/src/routes/api.ts b/src/routes/api.ts
@@ -1,7 +1,8 @@
 import { Elysia } from 'elysia';
 
 import { logger } from '~/utils/logger';
-import { searchPayloadValidator } from '~/validations/search';
+
+import { apiVersionValidator, searchPayloadValidator } from '~/validations/search';
 
 import { spotifySearch } from '~/services/search';
 
@@ -15,15 +16,16 @@ export const apiRouter = new Elysia().group('/api', app =>
         message: error.message,
       };
     })
-    .get(
+    .post(
       '/search',
-      async ({ query: { spotifyLink } }) => {
+      async ({ body: { spotifyLink } }) => {
         const spotifyContent = await spotifySearch(spotifyLink);
 
         return spotifyContent;
       },
       {
-        query: searchPayloadValidator,
+        body: searchPayloadValidator,
+        query: apiVersionValidator,
       }
     )
 );
diff --git a/src/routes/page.tsx b/src/routes/page.tsx
@@ -1,6 +1,7 @@
 import { Elysia } from 'elysia';
 
 import { logger } from '~/utils/logger';
+
 import { searchPayloadValidator } from '~/validations/search';
 
 import { spotifySearch } from '~/services/search';
@@ -17,7 +18,6 @@ export const pageRouter = new Elysia()
     logger.error(error);
 
     set.status = 200;
-
     return <ErrorMessage />;
   })
   .get('/', async () => {

diff --git a/src/services/search.ts b/src/services/search.ts
@@ -38,17 +38,17 @@ export interface SpotifyContent {
 }
 
 export const spotifySearch = async (spotifyLink: string): Promise<SpotifyContent> => {
-  const metadata = await parseSpotifyMetadata(spotifyLink);
+  const { metadata, url } = await parseSpotifyMetadata(spotifyLink);
 
-  const id = (spotifyLink.match(SPOTIFY_ID_REGEX) ?? [])[0]!;
+  const id = (url.match(SPOTIFY_ID_REGEX) ?? [])[0]!;
 
-  logger.info(`Searching for: ${id}`);
+  logger.info(`Searching for: ${url}`);
 
   const cache = await getSpotifySearchFromCache(id);
   if (cache) {
     await incrementSearchCount();
 
-    logger.info(`Found in cache: ${id}`);
+    logger.info(`Found in cache: ${url} - ${id}`);
 
     return cache;
   }
@@ -85,7 +85,7 @@ export const spotifySearch = async (spotifyLink: string): Promise<SpotifyContent
     description: metadata.description,
     image: metadata.image,
     audio: metadata.audio,
-    source: spotifyLink,
+    source: url,
     links,
   };
 

diff --git a/src/utils/logger.ts b/src/utils/logger.ts
@@ -5,4 +5,9 @@ export const stream = pretty({
   colorize: true,
 });
 
-export const logger = pino(stream);
+export const logger = pino(
+  {
+    level: process.env.NODE_ENV === 'test' ? 'fatal' : 'info',
+  },
+  stream
+);
diff --git a/src/validations/search.ts b/src/validations/search.ts
@@ -1,7 +1,14 @@
 import { t } from 'elysia';
 
-import { SPOTIFY_ID_REGEX } from '~/config/constants';
+import { SPOTIFY_LINK_REGEX } from '~/config/constants';
 
 export const searchPayloadValidator = t.Object({
-  spotifyLink: t.RegExp(SPOTIFY_ID_REGEX, { error: 'Invalid spotify link' }),
+  spotifyLink: t.RegExp(SPOTIFY_LINK_REGEX, { error: 'Invalid spotify link' }),
+});
+
+export const apiVersionValidator = t.Object({
+  v: t.String({
+    pattern: '1.3',
+    error: 'Unsupported API version',
+  }),
 });