Merge pull request #83 from saibendalam/main

fix: fixed regex pattern to work with all playlist links

Author: sumitkolhe

bun.lockb

@@ -70,4 +70,4 @@
     "typescript": "^5.4.3",
     "vitest": "^1.4.0"
   }
-}
+}

package.json

@@ -11,14 +11,30 @@ describe('PlaylistController', () => {
     playlistController.initRoutes()
   })
 
-  it('retrieve playlist by link', async () => {
+  it('retrieve playlist by featured link', async () => {
     const response = await playlistController.controller.request(
       '/playlists?link=https://www.jiosaavn.com/featured/its-indie-english/AMoxtXyKHoU_'
     )
 
     const { data } = (await response.json()) as { data: z.infer<typeof PlaylistModel> }
     expect(() => PlaylistModel.parse(data)).not.toThrow()
   })
+  it('retrieve playlist by saavn domain link', async () => {
+    const response = await playlistController.controller.request(
+      '/playlists?link=https://www.saavn.com/s/playlist/cf3c2fb07449311f87f53670da0e3d20/gautham-menon-telugu-hits/4sylrSC21MjvZ3uUE6bUVw__'
+    )
+
+    const { data } = (await response.json()) as { data: z.infer<typeof PlaylistModel> }
+    expect(() => PlaylistModel.parse(data)).not.toThrow()
+  })
+  it('retrieve playlist by jiosaavn domain link', async () => {
+    const response = await playlistController.controller.request(
+      '/playlists?link=https://www.jiosaavn.com/s/playlist/cf3c2fb07449311f87f53670da0e3d20/best-of-2022/BD9hSFlc9ubvZ3uUE6bUVw__'
+    )
+
+    const { data } = (await response.json()) as { data: z.infer<typeof PlaylistModel> }
+    expect(() => PlaylistModel.parse(data)).not.toThrow()
+  })
 
   it('retrieve playlist by ID', async () => {
     const response = await playlistController.controller.request('/playlists?id=82914609')

src/modules/playlists/controllers/playlist.controller.spec.ts

@@ -34,7 +34,13 @@ export class PlaylistController implements Routes {
               .string()
               .url()
               .optional()
-              .transform((value) => value?.match(/jiosaavn\.com\/featured\/[^/]+\/([^/]+)$/)?.[1])
+              .transform((value) => {
+                const matches = value?.match(
+                  /(?:jiosaavn\.com|saavn\.com)\/(?:featured|s\/playlist)\/[^/]+\/([^/]+)$|(?:\/([^/]+)$)/
+                )
+                const filteredMatches = matches?.filter((each) => each !== undefined)
+                return (filteredMatches && filteredMatches[filteredMatches?.length - 1 || 0]) || undefined
+              })
               .openapi({
                 title: 'Playlist Link',
                 description: 'A direct link to the playlist on JioSaavn',